]> granicus.if.org Git - nethack/commitdiff
x64 64 bit pointers, 32 bit longs
authornhmall <nhmall@nethack.org>
Wed, 29 Apr 2020 19:58:55 +0000 (15:58 -0400)
committernhmall <nhmall@nethack.org>
Wed, 29 Apr 2020 19:58:55 +0000 (15:58 -0400)
../src/sp_lev.c: In function 'flip_level':
../src/sp_lev.c:816:24: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
             long ty = ((long) timer->arg.a_void) & 0xffff;
                        ^
../src/sp_lev.c:817:25: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
             long tx = (((long) timer->arg.a_void) >> 16) & 0xffff;
                         ^
../src/sp_lev.c:823:33: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
             timer->arg.a_void = (genericptr_t) ((tx << 16) | ty);

src/sp_lev.c

index 9cda8a50fae641f30e4032327951984ce86690a9..b85c4ab752bc5015abe93d272807cbd84fc69c62 100755 (executable)
@@ -813,14 +813,14 @@ boolean extras;
     /* timed effects */
     for (timer = g.timer_base; timer; timer = timer->next) {
         if (timer->func_index == MELT_ICE_AWAY) {
-            long ty = ((long) timer->arg.a_void) & 0xffff;
-            long tx = (((long) timer->arg.a_void) >> 16) & 0xffff;
+            long ty = timer->arg.a_long & 0xffff;
+            long tx = (timer->arg.a_long >> 16) & 0xffff;
 
             if (flp & 1)
                 ty = FlipY(ty);
             if (flp & 2)
                 tx = FlipX(tx);
-            timer->arg.a_void = (genericptr_t) ((tx << 16) | ty);
+            timer->arg.a_long = ((tx << 16) | ty);
         }
     }