r14135 - packages/trunk/gunroar/debian/patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2013-05-23 19:34:23 +0000 (Thu, 23 May 2013)
New Revision: 14135

Modified:
   packages/trunk/gunroar/debian/patches/02_d_language_changes.diff
   packages/trunk/gunroar/debian/patches/dlang_v2.patch
Log:
gunroar: a few small patch cleanups


Modified: packages/trunk/gunroar/debian/patches/02_d_language_changes.diff
===================================================================
--- packages/trunk/gunroar/debian/patches/02_d_language_changes.diff	2013-05-23 19:28:49 UTC (rev 14134)
+++ packages/trunk/gunroar/debian/patches/02_d_language_changes.diff	2013-05-23 19:34:23 UTC (rev 14135)
@@ -3,9 +3,8 @@
 
 Sun Aug 26 01:06:20 CEST 2007  pdewacht at gmail.com
   * 02_d_language_changes
-diff -rN -u old-gr/src/abagames/gr/bullet.d new-gr/src/abagames/gr/bullet.d
---- old-gr/src/abagames/gr/bullet.d	2007-08-26 01:08:26.000000000 +0200
-+++ new-gr/src/abagames/gr/bullet.d	2007-08-26 01:08:26.000000000 +0200
+--- a/src/abagames/gr/bullet.d
++++ b/src/abagames/gr/bullet.d
 @@ -172,7 +172,7 @@
      glPopMatrix();
    }
@@ -15,9 +14,8 @@
      float ox = fabs(pos.x - p.x), oy = fabs(pos.y - p.y);
      if (ox + oy < 0.5f) {
      //if (shape.checkCollision(ox, oy, s)) {
-diff -rN -u old-gr/src/abagames/gr/stagemanager.d new-gr/src/abagames/gr/stagemanager.d
---- old-gr/src/abagames/gr/stagemanager.d	2007-08-26 01:08:26.000000000 +0200
-+++ new-gr/src/abagames/gr/stagemanager.d	2007-08-26 01:08:26.000000000 +0200
+--- a/src/abagames/gr/stagemanager.d
++++ b/src/abagames/gr/stagemanager.d
 @@ -261,11 +261,11 @@
          (cast(int) platformPos[ppi].pos.x, cast(int) platformPos[ppi].pos.y);
        if (!platformEnemySpec.setFirstState(en.state, p.x, p.y, platformPos[ppi].deg))
@@ -35,15 +33,14 @@
            ppn--;
          }
        }
-diff -rN -u old-gr/src/abagames/util/rand.d new-gr/src/abagames/util/rand.d
---- old-gr/src/abagames/util/rand.d	2007-08-26 01:08:26.000000000 +0200
-+++ new-gr/src/abagames/util/rand.d	2007-08-26 01:08:26.000000000 +0200
+--- a/src/abagames/util/rand.d
++++ b/src/abagames/util/rand.d
 @@ -165,14 +165,14 @@
  
  void next_state()
  {
 -    uint *p=state;
-+    uint *p = cast(uint *)state;
++    uint *p=state.ptr;
  
      /* if init_genrand() has not been called, */
      /* a default initial seed is used         */
@@ -51,13 +48,12 @@
  
      left = N;
 -    next = state;
-+    next = cast(uint *)state;
++    next = state.ptr;
      
      for (int j=N-M+1; --j; p++) 
          *p = p[M] ^ TWIST(p[0], p[1]);
-diff -rN -u old-gr/src/abagames/util/sdl/luminous.d new-gr/src/abagames/util/sdl/luminous.d
---- old-gr/src/abagames/util/sdl/luminous.d	2007-08-26 01:08:26.000000000 +0200
-+++ new-gr/src/abagames/util/sdl/luminous.d	2007-08-26 01:08:26.000000000 +0200
+--- a/src/abagames/util/sdl/luminous.d
++++ b/src/abagames/util/sdl/luminous.d
 @@ -7,6 +7,7 @@
  
  private import std.math;
@@ -71,13 +67,12 @@
  
    private void makeLuminousTexture() {
 -    uint *data = td;
-+    uint *data = cast(uint *)td;
++    uint *data = td.ptr;
      int i;
      memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof);
      glGenTextures(1, &luminousTexture);
-diff -rN -u old-gr/src/abagames/util/sdl/texture.d new-gr/src/abagames/util/sdl/texture.d
---- old-gr/src/abagames/util/sdl/texture.d	2007-08-26 01:08:26.000000000 +0200
-+++ new-gr/src/abagames/util/sdl/texture.d	2007-08-26 01:08:26.000000000 +0200
+--- a/src/abagames/util/sdl/texture.d
++++ b/src/abagames/util/sdl/texture.d
 @@ -103,13 +103,13 @@
          }
          glBindTexture(GL_TEXTURE_2D, num + ti);
@@ -94,4 +89,3 @@
            glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
            glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
          }
-

Modified: packages/trunk/gunroar/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/gunroar/debian/patches/dlang_v2.patch	2013-05-23 19:28:49 UTC (rev 14134)
+++ packages/trunk/gunroar/debian/patches/dlang_v2.patch	2013-05-23 19:34:23 UTC (rev 14135)
@@ -2248,18 +2248,15 @@
            - i; /* non linear */
          state[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
          i++;
-@@ -167,9 +167,9 @@
- {
-     uint *p = cast(uint *)state;
+@@ -169,7 +169,7 @@
  
--    /* if init_genrand() has not been called, */
-+    /* if init_genrand(cast(uint)) has not been called, */
+     /* if init_genrand() has not been called, */
      /* a default initial seed is used         */
 -    if (initf==0) init_genrand(5489UL);
 +    if (initf==0) init_genrand(cast(uint)5489UL);
  
      left = N;
-     next = cast(uint *)state;
+     next = state.ptr;
 --- a/src/abagames/util/sdl/mainloop.d
 +++ b/src/abagames/util/sdl/mainloop.d
 @@ -93,7 +93,7 @@