Changeset 16Tweet

Timestamp:

Nov 10, 2005, 8:08:09 PM (17 years ago)

Author:

Sam Hocevar

Message:

• shitloads of long -> int32_t changes for 64 bit safety.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (5 diffs)
• clisp.cpp (modified) (36 diffs)
• collide.cpp (modified) (6 diffs)
• cop.cpp (modified) (12 diffs)
• demo.cpp (modified) (1 diff)
• dev.cpp (modified) (32 diffs)
• game.cpp (modified) (16 diffs)
• include/demo.hpp (modified) (1 diff)
• include/dev.hpp (modified) (2 diffs)
• include/extend.hpp (modified) (4 diffs)
• include/game.hpp (modified) (4 diffs)
• include/intsect.hpp (modified) (1 diff)
• include/level.hpp (modified) (5 diffs)
• include/light.hpp (modified) (6 diffs)
• include/lisp.hpp (modified) (1 diff)
• include/objects.hpp (modified) (7 diffs)
• include/view.hpp (modified) (6 diffs)
• intsect.cpp (modified) (8 diffs)
• level.cpp (modified) (74 diffs)
• light.cpp (modified) (27 diffs)
• lisp.cpp (modified) (2 diffs)
• morpher.cpp (modified) (1 diff)
• objects.cpp (modified) (34 diffs)
• view.cpp (modified) (16 diffs)

abuse/trunk/src/ant.cpp

@@ -17 +17 @@
 void *ant_ai();
 
-int can_see(game_object *o, long x1, long y1, long x2, long y2)
-{
-  long nx2=x2,ny2=y2;
+int can_see(game_object *o, int32_t x1, int32_t y1, int32_t x2, int32_t y2)
+{
+  int32_t nx2=x2,ny2=y2;
   current_level->foreground_intersect(x1,y1,x2,y2);
   if (x2!=nx2 || y2!=ny2) return 0;
@@ -95 +95 @@
 static void fire_at_player(game_object *o, game_object *b)
 {
-  long firex=o->x+(o->direction>0?15:-15),firey=o->y-15,
-       playerx=b->x+b->xvel()*8,playery=b->y-15+b->yvel()*2;
+  int32_t firex=o->x+(o->direction>0?15:-15),firey=o->y-15,
+          playerx=b->x+b->xvel()*8,playery=b->y-15+b->yvel()*2;
   if (can_see(o,o->x,o->y,firex,firey) && can_see(o,firex,firey,playerx,playery))
   {
@@ -224 +224 @@
       if (!o->next_picture())
       {
-        long xv=0,yv=2;
+        int32_t xv=0,yv=2;
         o->try_move(o->x,o->y,xv,yv,1);
         if (yv!=0)
@@ -264 +264 @@
           else 
           {
-            long xm=o->direction>0 ? get_ability(o->otype,run_top_speed) : -get_ability(o->otype,run_top_speed);
-            long ym=0,new_xm=xm;
+            int32_t xm=o->direction>0 ? get_ability(o->otype,run_top_speed) : -get_ability(o->otype,run_top_speed);
+            int32_t ym=0,new_xm=xm;
             if (o->state!=running) o->set_state(running);
 
@@ -349 +349 @@
 //      o->set_yvel(o->yvel()+1);
       o->set_xacel(0);
-      long xv=0,yv=o->yvel();
+      int32_t xv=0,yv=o->yvel();
       o->y-=31;
       o->try_move(o->x,o->y,xv,yv,1);

abuse/trunk/src/clisp.cpp

@@ -779 +779 @@
     case 24 :
     {
-      long x1=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      long y1=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      long x2=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      long y2=lnumber_value(eval(CAR(args)));
+      int32_t x1=lnumber_value(eval(CAR(args)));  args=CDR(args);
+      int32_t y1=lnumber_value(eval(CAR(args)));  args=CDR(args);
+      int32_t x2=lnumber_value(eval(CAR(args)));  args=CDR(args);
+      int32_t y2=lnumber_value(eval(CAR(args)));
       current_level->foreground_intersect(x1,y1,x2,y2);
       void *ret=NULL;
@@ -816 +816 @@
     {
       
-      long xm,ym,but;
+      int32_t xm,ym,but;
       xm=lnumber_value(CAR(args)); args=CDR(args);
       ym=lnumber_value(CAR(args)); args=CDR(args);
@@ -892 +892 @@
     case 49 :
     {
-      long x=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long y=lnumber_value(eval(CAR(args))); args=CDR(args);
-
-      long rx,ry;
+      int32_t x=lnumber_value(eval(CAR(args))); args=CDR(args);
+      int32_t y=lnumber_value(eval(CAR(args))); args=CDR(args);
+
+      int32_t rx,ry;
       the_game->mouse_to_game(x,y,rx,ry);
       void *ret=NULL;
@@ -907 +907 @@
     case 50 :
     {
-      long x=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long y=lnumber_value(eval(CAR(args))); args=CDR(args);
-
-      long rx,ry;
+      int32_t x=lnumber_value(eval(CAR(args))); args=CDR(args);
+      int32_t y=lnumber_value(eval(CAR(args))); args=CDR(args);
+
+      int32_t rx,ry;
       the_game->game_to_mouse(x,y,current_view,rx,ry);
       void *ret=NULL;
@@ -1003 +1003 @@
         long x;
         sscanf(lstring_value(eval(CAR(args))),"%lx",&x);
-        return new_lisp_pointer((void *)x);
+        return new_lisp_pointer((void *)(intptr_t)x);
     } break;
     case 64 :
@@ -1138 +1138 @@
     case 22 :
     {
-      long x1,y1,x2,y2,xp1,yp1,xp2,yp2;
+      int32_t x1,y1,x2,y2,xp1,yp1,xp2,yp2;
       current_level->attacker(current_object)->picture_space(x1,y1,x2,y2);
       current_object->picture_space(xp1,yp1,xp2,yp2);
@@ -1156 +1156 @@
     case 31 : return current_object->y; break;
     case 32 : 
-    { long v=lnumber_value(CAR(args));
+    { int32_t v=lnumber_value(CAR(args));
       current_object->x=v;
 //      current_object->last_x=v;
@@ -1162 +1162 @@
     } break;
     case 33 : 
-    { long v=lnumber_value(CAR(args));
+    { int32_t v=lnumber_value(CAR(args));
       current_object->y=v;
 //      current_object->last_y=v;
@@ -1174 +1174 @@
     case 37 : 
     {
-      long s=lnumber_value(CAR(args));
+      int32_t s=lnumber_value(CAR(args));
       current_object->set_state((character_state)s); 
       return (s==current_object->state);
@@ -1280 +1280 @@
     case 92 : 
     {
-      long cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
-      long c=lnumber_value(CAR(args));
+      int32_t cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t c=lnumber_value(CAR(args));
       the_game->game_to_mouse(x1,y1,current_view,cx1,cy1);
       the_game->game_to_mouse(x2,y2,current_view,cx2,cy2);
@@ -1302 +1302 @@
     case 104 :  
     { light_source *l=(light_source *)lpointer_value(CAR(args));
-      long x=lnumber_value(CAR(CDR(args)));
+      int32_t x=lnumber_value(CAR(CDR(args)));
       if (x>=1)
         l->inner_radius=x;
@@ -1310 +1310 @@
     case 105 :  
     { light_source *l=(light_source *)lpointer_value(CAR(args));
-      long x=lnumber_value(CAR(CDR(args)));
+      int32_t x=lnumber_value(CAR(CDR(args)));
       if (x>l->inner_radius)
         l->outer_radius=x;
@@ -1397 +1397 @@
         if (a)
         {
-          long x=lnumber_value(lcar(a)); a=CDR(a);
+          int32_t x=lnumber_value(lcar(a)); a=CDR(a);
           if (!a)
           {
@@ -1404 +1404 @@
             exit(1);
           }
-          long y=lnumber_value(lcar(a));
+          int32_t y=lnumber_value(lcar(a));
           the_game->play_sound(id,vol,x,y);
         } else cash.sfx(id)->play(vol);        
@@ -1414 +1414 @@
     case 138 :
     { int id=lnumber_value(CAR(args)); args=CDR(args);
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args)); args=CDR(args);
-      long dir=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t dir=lnumber_value(CAR(args));
       add_panim(id,x,y,dir);
     } break;
     case 142 :
     {
-      long x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
       if (x<0 || x>=total_weapons)
       { 
@@ -1431 +1431 @@
     case 143 :
     {
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args)); args=CDR(args);
-      long r=lnumber_value(CAR(args)); args=CDR(args);
-      long m=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t r=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t m=lnumber_value(CAR(args)); args=CDR(args);
       game_object *o=(game_object *)lpointer_value(CAR(args)); args=CDR(args);
-      long mp=lnumber_value(CAR(args));
+      int32_t mp=lnumber_value(CAR(args));
       current_level->hurt_radius(x,y,r,m,current_object,o,mp);
     } break;
@@ -1446 +1446 @@
       else
       {
-        long x=lnumber_value(CAR(args)); args=CDR(args);
-        long y=lnumber_value(CAR(args)); args=CDR(args);
+        int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+        int32_t y=lnumber_value(CAR(args)); args=CDR(args);
         if (x<0 || x>=total_weapons)
         { lbreak("weapon out of range (%d)\n",x); exit(0); }
@@ -1503 +1503 @@
     {
       game_object *o=(game_object *)lpointer_value(CAR(args));
-      long x=o->x-current_object->x,
+      int32_t x=o->x-current_object->x,
         y=-(o->y-o->picture()->height()/2-(current_object->y-(current_object->picture()->height()/2)));
       return lisp_atan2(y,x);
@@ -1509 +1509 @@
     case 154 :
     {
-      long ang=lnumber_value(CAR(args)); args=CDR(args);
-      long mag=lfixed_point_value(CAR(args));
-      long xvel=(lisp_cos(ang)>>8)*(mag>>8);
+      int32_t ang=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t mag=lfixed_point_value(CAR(args));
+      int32_t xvel=(lisp_cos(ang)>>8)*(mag>>8);
       current_object->set_xvel(xvel>>16);
       current_object->set_fxvel((xvel&0xffff)>>8);
-      long yvel=-(lisp_sin(ang)>>8)*(mag>>8);
+      int32_t yvel=-(lisp_sin(ang)>>8)*(mag>>8);
       current_object->set_yvel(yvel>>16);
       current_object->set_fyvel((yvel&0xffff)>>8);      
@@ -1522 +1522 @@
       int tframes=current_object->total_frames(),f;
 
-      long ang1=lnumber_value(CAR(args)); args=CDR(args);      
+      int32_t ang1=lnumber_value(CAR(args)); args=CDR(args);      
       if (ang1<0) ang1=(ang1%360)+360; 
       else if (ang1>=360) ang1=ang1%360;
-      long ang2=lnumber_value(CAR(args)); args=CDR(args);      
+      int32_t ang2=lnumber_value(CAR(args)); args=CDR(args);      
       if (ang2<0) ang2=(ang2%360)+360; 
       else if (ang2>=360) ang2=ang2%360;
 
-      long ang=(lnumber_value(CAR(args))+90/tframes)%360;
+      int32_t ang=(lnumber_value(CAR(args))+90/tframes)%360;
       if (ang1>ang2)
       {
@@ -1557 +1557 @@
     case 169 :
     {
-      long am=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t am=lnumber_value(CAR(args)); args=CDR(args);
       game_object *from=(game_object *)lpointer_value(CAR(args)); args=CDR(args);
-      long hitx=lnumber_value(CAR(args)); args=CDR(args);      
-      long hity=lnumber_value(CAR(args)); args=CDR(args);      
-      long px=lnumber_value(CAR(args)); args=CDR(args);      
-      long py=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t hitx=lnumber_value(CAR(args)); args=CDR(args);      
+      int32_t hity=lnumber_value(CAR(args)); args=CDR(args);      
+      int32_t px=lnumber_value(CAR(args)); args=CDR(args);      
+      int32_t py=lnumber_value(CAR(args)); args=CDR(args);
       current_object->damage_fun(am,from,hitx,hity,px,py);
     } break;
@@ -1629 +1629 @@
     {
       view *v=lget_view(CAR(args),"set_ambient_light");       args=CDR(args);
-      long x=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args));
       if (x>=0 && x<64) v->ambient=x;
     } break;
@@ -1657 +1657 @@
     case 192 : 
     {     
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args)); args=CDR(args);
-      long type=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t type=lnumber_value(CAR(args));
       if (x<0 || y<0 || x>=current_level->foreground_width() || y>=current_level->foreground_width())
         lbreak("%d %d is out of range of fg map",x,y);
@@ -1667 +1667 @@
     case 193 :
     { 
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args));
       if (x<0 || y<0 || x>=current_level->foreground_width() || y>=current_level->foreground_width())
         lbreak("%d %d is out of range of fg map",x,y);
@@ -1675 +1675 @@
     case 194 : 
     {     
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args)); args=CDR(args);
-      long type=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t type=lnumber_value(CAR(args));
       if (x<0 || y<0 || x>=current_level->background_width() || y>=current_level->background_width())
         lbreak("%d %d is out of range of fg map",x,y);
@@ -1685 +1685 @@
     case 195 :
     { 
-      long x=lnumber_value(CAR(args)); args=CDR(args);
-      long y=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args));
       if (x<0 || y<0 || x>=current_level->background_width() || y>=current_level->background_width())
         lbreak("%d %d is out of range of fg map",x,y);
@@ -1741 +1741 @@
     case 200 :
     {
-      long xv=lnumber_value(CAR(args));  args=CDR(args);
-      long yv=lnumber_value(CAR(args));  args=CDR(args);
+      int32_t xv=lnumber_value(CAR(args));  args=CDR(args);
+      int32_t yv=lnumber_value(CAR(args));  args=CDR(args);
       int top=2;
       if (args)
         if (!CAR(args)) top=0;
         
-      long oxv=xv,oyv=yv;
+      int32_t oxv=xv,oyv=yv;
       current_object->try_move(current_object->x,current_object->y,xv,yv,1|top);
       current_object->x+=xv;
@@ -1755 +1755 @@
     case 201 :
     {
-      long x=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args));
       return figures[current_object->otype]->get_sequence((character_state)x)->length();
     } break;
     case 202 :
     { 
-      long x1=lnumber_value(CAR(args)); args=CDR(args);
-      long y1=lnumber_value(CAR(args)); args=CDR(args);
-      long x2=lnumber_value(CAR(args)); args=CDR(args);
-      long y2=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t x1=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y1=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t x2=lnumber_value(CAR(args)); args=CDR(args);
+      int32_t y2=lnumber_value(CAR(args)); args=CDR(args);
       void *block_all=CAR(args);
-      long nx2=x2,ny2=y2;
+      int32_t nx2=x2,ny2=y2;
       current_level->foreground_intersect(x1,y1,x2,y2);
       if (x2!=nx2 || y2!=ny2) return 0;
@@ -1796 +1796 @@
     case 206 :
     {
-      long x=lnumber_value(CAR(args));
+      int32_t x=lnumber_value(CAR(args));
       if (x<current_object->total_frames())
         current_object->current_frame=x;
@@ -1834 +1834 @@
     case 216 :
     {
-      long x1=lnumber_value(CAR(args)); args=lcdr(args);
-      long y1=lnumber_value(CAR(args)); args=lcdr(args);
-      long id=lnumber_value(CAR(args));
+      int32_t x1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t y1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t id=lnumber_value(CAR(args));
       cash.img(id)->put_image(screen,x1,y1,1);
     } break;
@@ -1935 +1935 @@
       else 
       {
-        long x=lnumber_value(CAR(args));
+        int32_t x=lnumber_value(CAR(args));
         if (x<0 || x>=total_weapons)
         { lbreak("weapon out of range (%d)\n",x); exit(0); }
@@ -1957 +1957 @@
     case 234 :
     {
-      long cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
-      long c=lnumber_value(CAR(args)); args=lcdr(args);
-      long s=lnumber_value(CAR(args));
+      int32_t cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t c=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t s=lnumber_value(CAR(args));
       the_game->game_to_mouse(x1,y1,current_view,cx1,cy1);
       the_game->game_to_mouse(x2,y2,current_view,cx2,cy2);
@@ -2009 +2009 @@
     case 244 :
     {
-      long cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
-      long c1=lnumber_value(CAR(args)); args=lcdr(args);
-      long c2=lnumber_value(CAR(args)); args=lcdr(args);
-      long s=lnumber_value(CAR(args));
+      int32_t cx1,x1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy1,y1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cx2,x2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy2,y2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t c1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t c2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t s=lnumber_value(CAR(args));
       the_game->game_to_mouse(x1,y1,current_view,cx1,cy1);
       the_game->game_to_mouse(x2,y2,current_view,cx2,cy2);
@@ -2032 +2032 @@
     case 247 :
     {
-      long cx1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy1=lnumber_value(CAR(args)); args=lcdr(args);
-      long cx2=lnumber_value(CAR(args)); args=lcdr(args);
-      long cy2=lnumber_value(CAR(args)); args=lcdr(args);
-      long c1=lnumber_value(CAR(args)); args=lcdr(args);      
+      int32_t cx1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy1=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cx2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t cy2=lnumber_value(CAR(args)); args=lcdr(args);
+      int32_t c1=lnumber_value(CAR(args)); args=lcdr(args);      
       screen->bar(cx1,cy1,cx2,cy2,c1);
     } break;
@@ -2187 +2187 @@
     {
       JCFont *fnt=(JCFont *)lpointer_value(CAR(args)); args=CDR(args);
-      long x=lnumber_value(CAR(args));       args=CDR(args);
-      long y=lnumber_value(CAR(args));       args=CDR(args);
+      int32_t x=lnumber_value(CAR(args));       args=CDR(args);
+      int32_t y=lnumber_value(CAR(args));       args=CDR(args);
       char *st=lstring_value(CAR(args));     args=CDR(args);
       int color=-1;
@@ -2206 +2206 @@
     case 282 :
     {
-      long x1=lnumber_value(CAR(args));   args=CDR(args);
-      long y1=lnumber_value(CAR(args));   args=CDR(args);
-      long x2=lnumber_value(CAR(args));   args=CDR(args);
-      long y2=lnumber_value(CAR(args));   args=CDR(args);
-      long c=lnumber_value(CAR(args));
+      int32_t x1=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t y1=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t x2=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t y2=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t c=lnumber_value(CAR(args));
       screen->bar(x1,y1,x2,y2,c);
     } break;
     case 283 :
     {
-      long x1=lnumber_value(CAR(args));   args=CDR(args);
-      long y1=lnumber_value(CAR(args));   args=CDR(args);
-      long x2=lnumber_value(CAR(args));   args=CDR(args);
-      long y2=lnumber_value(CAR(args));   args=CDR(args);
-      long c=lnumber_value(CAR(args));
+      int32_t x1=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t y1=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t x2=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t y2=lnumber_value(CAR(args));   args=CDR(args);
+      int32_t c=lnumber_value(CAR(args));
       screen->rectangle(x1,y1,x2,y2,c);
     } break;

abuse/trunk/src/collide.cpp

@@ -5 +5 @@
 {
   public :
-  long total,x1,y1,x2,y2;
+  int32_t total,x1,y1,x2,y2;
   game_object **touch;  
   collide_patch *next;
-  collide_patch(long X1, long Y1, long X2, long Y2, collide_patch *Next)
+  collide_patch(int32_t X1, int32_t Y1, int32_t X2, int32_t Y2, collide_patch *Next)
   { 
     x1=X1; y1=Y1; x2=X2; y2=Y2;
@@ -15 +15 @@
     touch=NULL;
   }
-  void add_collide(long X1, long Y1, long X2, long Y2, game_object *who);
+  void add_collide(int32_t X1, int32_t Y1, int32_t X2, int32_t Y2, game_object *who);
   collide_patch *copy(collide_patch *Next);
   ~collide_patch() { if (total) jfree(touch); }
@@ -36 +36 @@
 
 
-void add_collide(collide_patch *&first, long x1, long y1, long x2, long y2, 
+void add_collide(collide_patch *&first, int32_t x1, int32_t y1, int32_t x2, int32_t y2, 
                             game_object *who)
 {
@@ -148 +148 @@
 {
   game_object *target,*rec,*subject;
-  long sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx=0,hity=0,t_centerx;
+  int32_t sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx=0,hity=0,t_centerx;
 
   for (int l=0;l<attack_total;l++)
@@ -184 +184 @@
             for (t_dat=t_damage->data,j=(int)t_damage->tot-1;j>0 && !rec;j--)
             {
-              long x1,y1,x2,y2,          // define the two line segments to check
+              int32_t x1,y1,x2,y2,          // define the two line segments to check
               xp1,yp1,xp2,yp2;
 
@@ -200 +200 @@
               // ok, now we know which line segemnts to check for intersection
               // now check to see if (x1,y1-x2,y2) intercest with (xp1,yp1-xp2,yp2)
-              int _x2=x2,_y2=y2;              
+              int32_t _x2=x2,_y2=y2;          
               setback_intersect(x1, y1, x2, y2, xp1, yp1, xp2, yp2,0);
 

abuse/trunk/src/cop.cpp

@@ -204 +204 @@
   // fire try to move up to gun level
 
-  long x2=o->x,y2=firey;
+  int32_t x2=o->x,y2=firey;
 //  current_level->foreground_intersect(other->x,other->y,x2,y2);      // find first location we can actuall "see"
 //  current_level->all_boundary_setback(o,other->x,other->y,x2,y2);       // to make we don't fire through walls
@@ -247 +247 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      long value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(eval(CAR(args)));
       if (value)                                   // do we have ammo ?
       {
@@ -289 +289 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      long value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(eval(CAR(args)));
       if (value)                                   // do we have ammo ?
       {
@@ -316 +316 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      long value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(eval(CAR(args)));
       if (value)                                   // do we have ammo ?
       {
@@ -340 +340 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      long value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(eval(CAR(args)));
       if (value)                                   // do we have ammo ?
       {
@@ -367 +367 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      long value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(eval(CAR(args)));
       if (value)                                   // do we have ammo ?
       {
@@ -466 +466 @@
       o->lvars[last1_x]=o->x;
       o->lvars[last1_y]=o->y;
-      long oyvel=o->yvel();
+      int32_t oyvel=o->yvel();
       int in=o->lvars[in_climbing_area];
 
@@ -532 +532 @@
 /*      if (o->lvars[special_power]==FAST_POWER)
         {
-          long xv=0,yv=4;
+          int32_t xv=0,yv=4;
           o->try_move(o->x,o->y,xv,yv,1);
           if (yv==4)
@@ -557 +557 @@
       if (xm)                     // trying to get off the ladder, check to see if that's ok
       {
-        long x2=0,y2=-20;
+        int32_t x2=0,y2=-20;
         o->try_move(o->x,o->y,x2,y2,3);
         if (y2==-20)
@@ -898 +898 @@
   o->lvars[sgb_speed]=o->lvars[sgb_speed]*6/5;
   
-  long ang=o->lvars[sgb_angle];
-  long mag=o->lvars[sgb_speed];
-
-  long xvel=(lisp_cos(ang))*(mag);
+  int32_t ang=o->lvars[sgb_angle];
+  int32_t mag=o->lvars[sgb_speed];
+
+  int32_t xvel=(lisp_cos(ang))*(mag);
   current_object->set_xvel(xvel>>16);
   current_object->set_fxvel((xvel&0xffff)>>8);
-  long yvel=-(lisp_sin(ang))*(mag);
+  int32_t yvel=-(lisp_sin(ang))*(mag);
   current_object->set_yvel(yvel>>16);
   current_object->set_fyvel((yvel&0xffff)>>8);      
@@ -1019 +1019 @@
     {
       int color=lnumber_value(lget_array_element(symbol_value(l_player_text_color),sorted_players[i]->player_number));  
-      sprintf(msg,"%3ld %s",sorted_players[i]->kills,sorted_players[i]->name);
+      sprintf(msg,"%3ld %s",(long)sorted_players[i]->kills,sorted_players[i]->name);
       if (sorted_players[i]==local)
         strcat(msg," <<");
@@ -1066 +1066 @@
 
 
-    sprintf(msg,"%-17s %3ld  %3ld",max_name,v->kills,v->tkills+v->kills);
+    sprintf(msg,"%-17s %3ld  %3ld",max_name,(long)v->kills,(long)(v->tkills+v->kills));
     fnt->put_string(screen,x,y,msg,color);
 

abuse/trunk/src/demo.cpp

@@ -107 +107 @@
       {
         process_packet_commands(buf,size);      
-        long mx,my;
+        int32_t mx,my;
         the_game->game_to_mouse(player_list->pointer_x,player_list->pointer_y,player_list,mx,my);
         eh->set_mouse_position(small_render ? mx*2 : mx, small_render ? my*2 : my);

abuse/trunk/src/dev.cpp

@@ -276 +276 @@
 
 
-long dev_controll::snap_x(long x)
+int32_t dev_controll::snap_x(int32_t x)
 {
   if (eh->key_pressed(JK_CTRL_L) || eh->key_pressed(JK_CTRL_R))
@@ -285 +285 @@
 }
 
-long dev_controll::snap_y(long y)
+int32_t dev_controll::snap_y(int32_t y)
 {
   if (eh->key_pressed(JK_CTRL_L) || eh->key_pressed(JK_CTRL_R))
@@ -341 +341 @@
 {
   unsigned char *sl1,*sl2;
-  long xstep=(im->width()<<16)/new_width,
+  int32_t xstep=(im->width()<<16)/new_width,
        ystep=(im->height()<<16)/new_height,iy,ix,sx,ix_start,iy_start;
   screen->add_dirty(x,y,x+new_width-1,y+new_height-1);
@@ -380 +380 @@
 {
   unsigned char *sl1,*sl2;
-  long xstep=(im->width()<<16)/new_width,
+  int32_t xstep=(im->width()<<16)/new_width,
        ystep=(im->height()<<16)/new_height,iy,ix,sx,ix_start,iy_start;
   screen->add_dirty(x,y,x+new_width-1,y+new_height-1);
@@ -438 +438 @@
 void dev_controll::dev_draw(view *v)
 {
-  long x1,y1,x2,y2;
+  int32_t x1,y1,x2,y2;
   if (dev&EDIT_MODE)
   {
-    long vx=v->xoff(),vy=v->yoff();
+    int32_t vx=v->xoff(),vy=v->yoff();
   
     if (dev&DRAW_LINKS)
@@ -459 +459 @@
     if (link_object)
     {
-      long rx1,ry1;
+      int32_t rx1,ry1;
       the_game->game_to_mouse(link_object->x,link_object->y,v,rx1,ry1);      
       screen->line(rx1,ry1,dlastx,dlasty,yellow);            
@@ -468 +468 @@
       image *i=cash.img(light_buttons[0]);
       int l=i->width()/2,h=i->height()/2;
-      long rx1,ry1;
+      int32_t rx1,ry1;
       the_game->game_to_mouse(selected_light->x,selected_light->y,v,rx1,ry1);      
       screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,eh->bright_color());
@@ -510 +510 @@
     {    
       selected_object->picture_space(x1,y1,x2,y2);    
-      long rx1,ry1,rx2,ry2;
+      int32_t rx1,ry1,rx2,ry2;
       the_game->game_to_mouse(x1,y1,v,rx1,ry1);
       the_game->game_to_mouse(x2,y2,v,rx2,ry2);
@@ -530 +530 @@
 }
 
-light_source *find_light(long x, long y)
+light_source *find_light(int32_t x, int32_t y)
 {
   image *i=cash.img(light_buttons[0]);
@@ -1031 +1031 @@
     {
       edit_object=selected_object=NULL;
-      long cx=player_list->focus->x,cy=player_list->focus->y;
+      int32_t cx=player_list->focus->x,cy=player_list->focus->y;
 
       // save the old weapon array
-      long *w=(long *)jmalloc(total_weapons*sizeof(long),"tmp weapon array");
-      memcpy(w,player_list->weapons,total_weapons*sizeof(long));
+      int32_t *w=(int32_t *)jmalloc(total_weapons*sizeof(int32_t),"tmp weapon array");
+      memcpy(w,player_list->weapons,total_weapons*sizeof(int32_t));
       
       char tmp[100];
@@ -1048 +1048 @@
       player_list->focus->y=cy;
 
-      memcpy(player_list->weapons,w,total_weapons*sizeof(long));     
+      memcpy(player_list->weapons,w,total_weapons*sizeof(int32_t));     
       jfree(w);
 
@@ -1057 +1057 @@
   if (!strcmp(fword,"unchop"))
   {
-    long rx,ry;
+    int32_t rx,ry;
     the_game->btile_on(dlastx,dlasty,rx,ry);
     if (rx>=0 && ry>=0)
@@ -1179 +1179 @@
     if (t>=0)                                 // did we find it?
     {
-      long rx,ry;
+      int32_t rx,ry;
       the_game->mouse_to_game(dlastx,dlasty,rx,ry);
       edit_object=create(t,rx,ry);
@@ -1216 +1216 @@
   if (!strcmp(fword,"clear_auto"))
   {
-    long i,j;
+    int32_t i,j;
     for (i=0;i<current_level->foreground_width();i++)
       for (j=0;j<current_level->foreground_height();j++)
@@ -1224 +1224 @@
   if (!strcmp(fword,"fg_select"))
   {
-    long x,y;
+    int32_t x,y;
     the_game->ftile_on(dlastx,dlasty,x,y);
     if (x>=0 && y>=0 && x<current_level->foreground_width() &&
@@ -1238 +1238 @@
   if (!strcmp(fword,"toggle_fg_raise"))
   {
-    long x,y;
+    int32_t x,y;
     the_game->ftile_on(dlastx,dlasty,x,y);
     if (x>=0 && y>=0 && x<current_level->foreground_width() &&
@@ -1487 +1487 @@
   {    
     game_object *o=ai_object;
-    long x;
+    int32_t x;
     if (o)
     {
@@ -1537 +1537 @@
   if (ev.type==EV_MOUSE_BUTTON && ev.mouse_button)
   {
-    long gx,gy;
+    int32_t gx,gy;
     the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
     if (!current_level) return ;
@@ -1577 +1577 @@
   if (ev.type==EV_MOUSE_BUTTON && ev.mouse_button)
   {
-    long mx=last_demo_mx,my=last_demo_my;
+    int32_t mx=last_demo_mx,my=last_demo_my;
     view *v=the_game->view_in(mx,my);
     for (area_controller *a=current_level->area_list;a;a=a->next)
     {
-      long x1,y1,x2,y2;
+      int32_t x1,y1,x2,y2;
       the_game->game_to_mouse(a->x,a->y,v,x1,y1);
       the_game->game_to_mouse(a->x+a->w,a->y+a->h,v,x2,y2);
@@ -1646 +1646 @@
 void dev_controll::handle_event(event &ev)
 {
-  long x,y;
+  int32_t x,y;
   if (link_object && (dlastx!=last_link_x || dlasty!=last_link_y))
   {
@@ -1724 +1724 @@
         if (ev.window==NULL && ev.type==EV_KEY && ev.key=='d')
         {
-          long xv=0,yv=100;
+          int32_t xv=0,yv=100;
           edit_object->try_move(edit_object->x,edit_object->y,xv,yv,1);
           edit_object->y+=yv;
@@ -1822 +1822 @@
       if (current_area)
       {
-        long gx,gy;
+        int32_t gx,gy;
         the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
         if (gx>current_area->x && gy>current_area->y)
@@ -1845 +1845 @@
       if (current_area)
       {
-        long gx,gy;
+        int32_t gx,gy;
         the_game->mouse_to_game(last_demo_mx,last_demo_my,gx,gy);
         if (gx<current_area->x+current_area->w && gy<current_area->y+current_area->h)
@@ -1872 +1872 @@
         if (ev.window==NULL)
         {       
-          long rx,ry;
+          int32_t rx,ry;
           the_game->mouse_to_game(last_demo_mx,last_demo_my,rx,ry);
 
@@ -1892 +1892 @@
             if (ev.mouse_button==1 && !selected_object && !selected_light)
             {
-              long xs,ys;
+              int32_t xs,ys;
               the_game->ftile_on(last_demo_mx,last_demo_my,xs,ys);
               if (xs>=0 && ys>=0 && xs<current_level->foreground_width() && 
@@ -1900 +1900 @@
             } else if (ev.mouse_button==1 && !selected_object && !selected_light)
             {
-              long xs,ys;
+              int32_t xs,ys;
               the_game->btile_on(last_demo_mx,last_demo_my,xs,ys);
               if (xs>=0 && ys>=0 && xs<current_level->background_width() && 
@@ -2518 +2518 @@
         case DEV_LIGHT9 :
         {
-          long lx,ly;
+          int32_t lx,ly;
           the_game->mouse_to_game(last_demo_mx,last_demo_my,lx,ly);
           lx=snap_x(lx);
@@ -2855 +2855 @@
           case 'w' : 
           {       
-            long rx,ry;
+            int32_t rx,ry;
             the_game->mouse_to_game(dlastx,dlasty,rx,ry);
             char msg[100]; sprintf(msg,symbol_str("mouse_at"),rx,ry);
@@ -2877 +2877 @@
             if (current_level && player_list && player_list->focus)
             {
-              long rx,ry;
+              int32_t rx,ry;
               the_game->mouse_to_game(dlastx,dlasty,rx,ry);
               player_list->focus->x=rx;
@@ -3150 +3150 @@
           case ' ' : 
           {
-            long xs,ys,xx,yy;
+            int32_t xs,ys,xx,yy;
             the_game->ftile_on(me->x,me->y,xs,ys);
 
@@ -3165 +3165 @@
           case 't' :
           {
-            long xs,ys;
+            int32_t xs,ys;
             the_game->ftile_on(me->x,me->y,xs,ys);
             dev_cont->fg_fill(-1,xs,ys,this);
@@ -3211 +3211 @@
   }
 
-  fprintf(fp,"(add_palette \"%s\" %ld %ld %ld %ld %ld ",name,w,h,x,y,scale);
+  fprintf(fp,"(add_palette \"%s\" %ld %ld %ld %ld %ld ",name,(long)w,(long)h,(long)x,(long)y,(long)scale);
   int i;
   for (i=0;i<w*h;i++)

abuse/trunk/src/game.cpp

@@ -58 +58 @@
 double sum_diffs=1,total_diffs=12;
 int total_active=0;
-long map_xoff=0,map_yoff=0;
-long current_vxadd,current_vyadd;
+int32_t map_xoff=0,map_yoff=0;
+int32_t current_vxadd,current_vyadd;
 int frame_panic=0,massive_frame_panic=0;
 int demo_start=0,idle_ticks=0;
@@ -136 +136 @@
 }
 
-void game::play_sound(int id, int vol, long x, long y)
+void game::play_sound(int id, int vol, int32_t x, int32_t y)
 {
         if( sound_avail & SFX_INITIALIZED )
@@ -145 +145 @@
                         return;
 
-                ulong mdist = 0xffffffff;
+                uint32_t mdist = 0xffffffff;
                 view *cd = NULL;
                 for( view *f = player_list; f ; f = f->next )
@@ -151 +151 @@
                         if( f->local_player() )
                         {
-                                long cx = abs(f->x_center()-x),cy = abs(f->y_center()-y), d;
+                                int32_t cx = abs(f->x_center()-x),cy = abs(f->y_center()-y), d;
                                 if( cx < cy )
                                         d = cx + cy - ( cx >> 1 );
@@ -277 +277 @@
 }
 
-void game::ftile_on(int screenx, int screeny, long &x, long &y)
+void game::ftile_on(int screenx, int screeny, int32_t &x, int32_t &y)
 {
   mouse_to_game(screenx,screeny,x,y);
@@ -285 +285 @@
   if (f)
   {
-    x=((long)(screenx)-(long)f->cx1+f->xoff())/(long)f_wid;
-    y=((long)(screeny)-(long)f->cy1+f->yoff())/(long)f_hi;
+    x=((int32_t)(screenx)-(int32_t)f->cx1+f->xoff())/(int32_t)f_wid;
+    y=((int32_t)(screeny)-(int32_t)f->cy1+f->yoff())/(int32_t)f_hi;
   }
   else
@@ -295 +295 @@
 }
 
-void game::btile_on(int screenx, int screeny, long &x, long &y)
+void game::btile_on(int screenx, int screeny, int32_t &x, int32_t &y)
 {
   view *f=view_in(screenx,screeny);
   if (f)
   {
-    x=((long)(screenx)-(long)f->cx1+f->xoff()*bg_xmul/bg_xdiv)/(long)b_wid; 
-    y=((long)(screeny)-(long)f->cy1+f->yoff()*bg_ymul/bg_ydiv)/(long)b_hi;
+    x=((int32_t)(screenx)-(int32_t)f->cx1+f->xoff()*bg_xmul/bg_xdiv)/(int32_t)b_wid; 
+    y=((int32_t)(screeny)-(int32_t)f->cy1+f->yoff()*bg_ymul/bg_ydiv)/(int32_t)b_hi;
   }
   else
@@ -311 +311 @@
 
 
-void game::mouse_to_game(long x, long y, long &gamex, long &gamey, view *f)
+void game::mouse_to_game(int32_t x, int32_t y, int32_t &gamex, int32_t &gamey, view *f)
 {
   if (!f)
@@ -324 +324 @@
       if (dev&MAP_MODE)
       {
-        gamex=((x-(long)f->cx1)*ftile_width()/AUTOTILE_WIDTH+map_xoff*ftile_width());
-        gamey=((y-(long)f->cy1)*ftile_height()/AUTOTILE_HEIGHT+map_yoff*ftile_height());
+        gamex=((x-(int32_t)f->cx1)*ftile_width()/AUTOTILE_WIDTH+map_xoff*ftile_width());
+        gamey=((y-(int32_t)f->cy1)*ftile_height()/AUTOTILE_HEIGHT+map_yoff*ftile_height());
       } else
       {
-        gamex=(x-(long)f->cx1+f->xoff());
-        gamey=(y-(long)f->cy1+f->yoff());
+        gamex=(x-(int32_t)f->cx1+f->xoff());
+        gamey=(y-(int32_t)f->cy1+f->yoff());
       }
 
@@ -336 +336 @@
 }
 
-void game::game_to_mouse(long gamex, long gamey, view *which, long &x, long &y)
+void game::game_to_mouse(int32_t gamex, int32_t gamey, view *which, int32_t &x, int32_t &y)
 {
   if (dev&MAP_MODE)
   {
-    long x1,y1;
+    int32_t x1,y1;
     if (dev&EDIT_MODE)
     {
@@ -757 +757 @@
   }
 
-  long old_cx1=0,old_cy1=0,old_cx2=0,old_cy2=0;   // if we do a small render, we need to restore these
+  int32_t old_cx1=0,old_cy1=0,old_cx2=0,old_cy2=0;   // if we do a small render, we need to restore these
   image *old_screen=NULL;
   if (small_render && (dev&DRAW_LIGHTS))  // cannot do this if we skip lighting
@@ -778 +778 @@
 
 
-//  long max_xoff=(current_level->foreground_width()-1)*ftile_width()-(v->cx2-v->cx1+1);
-//  long max_yoff=(current_level->foreground_height()-1)*ftile_height()-(v->cy2-v->cy1+1); 
-
-  long xoff,yoff;
+//  int32_t max_xoff=(current_level->foreground_width()-1)*ftile_width()-(v->cx2-v->cx1+1);
+//  int32_t max_yoff=(current_level->foreground_height()-1)*ftile_height()-(v->cy2-v->cy1+1); 
+
+  int32_t xoff,yoff;
   if (interpolate)
   {
@@ -803 +803 @@
   nyoff=yoff*bg_ymul/bg_ydiv;
 
-//  long max_bg_xoff=(current_level->background_width())*btile_width()-(v->cx2-v->cx1+1);
-//  long max_bg_yoff=(current_level->background_height())*btile_height()-(v->cy2-v->cy1+1);
+//  int32_t max_bg_xoff=(current_level->background_width())*btile_width()-(v->cx2-v->cx1+1);
+//  int32_t max_bg_yoff=(current_level->background_height())*btile_height()-(v->cy2-v->cy1+1);
 //  if (nxoff>max_bg_xoff) nxoff=max_xoff;
 //  if (nyoff>max_bg_yoff) nyoff=max_yoff;  
@@ -986 +986 @@
 //    server_check();
 
-  long ro=rand_on;
+  int32_t ro=rand_on;
   if (dev & DRAW_PEOPLE_LAYER)
   {
@@ -1667 +1667 @@
                 {
                         frame_panic = 0;
-                        long stime=(long)((1/15.0-1.0/possible_fps)*1000.0); 
+                        int32_t stime=(int32_t)((1/15.0-1.0/possible_fps)*1000.0); 
                         if (stime>0 && !no_delay)
                         {
@@ -2575 +2575 @@
         fprintf(stderr,"Mac Options: ");
         xres = 320; yres = 200;
-        GetKeys((unsigned long*)&km);
+        GetKeys((uint32_t*)&km);
         if ((km[ 0x3a >>3] >> (0x3a & 7)) &1 != 0)
         {

abuse/trunk/src/include/demo.hpp

@@ -34 +34 @@
 
 
-extern int last_demo_mx,last_demo_my,last_demo_mbut;
+extern int32_t last_demo_mx,last_demo_my,last_demo_mbut;
 //extern ulong demo_tick_on;
 #endif

abuse/trunk/src/include/dev.hpp

@@ -19 +19 @@
 class pal_win
 {
-  long scale,w,h,x,y,last_selected;
+  int32_t scale,w,h,x,y,last_selected;
   unsigned short *pat;
   void draw();
@@ -101 +101 @@
   void make_ambient();
   int ok_to_scroll();
-  long snap_x(long x);
-  long snap_y(long y);
+  int32_t snap_x(int32_t x);
+  int32_t snap_y(int32_t y);
   void area_handle_input(event &ev);
   void pick_handle_input(event &ev);

abuse/trunk/src/include/extend.hpp

@@ -26 +26 @@
   uchar Fade_count,Fade_max;
   uchar Flags,grav_on,targetable_on;
-  long Xvel,Yvel,Xacel,Yacel;
+  int32_t Xvel,Yvel,Xacel,Yacel;
   uchar Fx,Fy,Fxvel,Fyvel,Fxacel,Fyacel;
   uchar Aitype;
@@ -43 +43 @@
   char *var_name(int x);
   int   var_type(int x);
-  void set_var(int x, ulong v);
-  long get_var(int x);
+  void set_var(int x, uint32_t v);
+  int32_t get_var(int x);
 
   // leave these public, so I don't have monster code changes.
   simple_object();
-  long x,y,
+  int32_t x,y,
        last_x,last_y;              // used for frame interpolation on fast machines
   schar direction,active;
@@ -61 +61 @@
   int keep_ai_info()         { return 1; }
   uchar flags()              { return Flags; }
-  long xvel()                { return Xvel; }
-  long yvel()                { return Yvel; }
-  long xacel()               { return Xacel; }
-  long yacel()               { return Yacel; }
+  int32_t xvel()             { return Xvel; }
+  int32_t yvel()             { return Yvel; }
+  int32_t xacel()            { return Xacel; }
+  int32_t yacel()            { return Yacel; }
 
   uchar fx()                 { return Fx; }
@@ -102 +102 @@
   void set_targetable(uchar x)    { targetable_on=x; }
   void set_flags(uchar f)         { Flags=f; }
-  void set_xvel(long xv)          { Xvel=xv; }
-  void set_yvel(long yv)          { Yvel=yv; }
-  void set_xacel(long xa)         { Xacel=xa; }
-  void set_yacel(long ya)         { Yacel=ya; }
+  void set_xvel(int32_t xv)       { Xvel=xv; }
+  void set_yvel(int32_t yv)       { Yvel=yv; }
+  void set_xacel(int32_t xa)      { Xacel=xa; }
+  void set_yacel(int32_t ya)      { Yacel=ya; }
   void set_fx(uchar x)            { Fx=x; }
   void set_fy(uchar y)            { Fy=y; }

abuse/trunk/src/include/game.hpp

@@ -46 +46 @@
 extern char **start_argv;
 extern int start_argc;
-extern long current_vxadd,current_vyadd;
+extern int32_t current_vxadd,current_vyadd;
 extern int frame_panic,massive_frame_panic;
 extern int demo_start,idle_ticks;
@@ -58 +58 @@
       morph_bright_color,morph_med_color,morph_dark_color;
 
-  long last_time,fps;
+  int32_t last_time,fps;
   char mapname[100],command[200],help_text[200];
   int refresh,mousex,mousey,help_text_frames;
@@ -93 +93 @@
                            return cash.foret(foretiles[x]); }
 
-  void ftile_on(int screenx, int screeny, long &x, long &y);
-  void btile_on(int screenx, int screeny, long &x, long &y);
+  void ftile_on(int screenx, int screeny, int32_t &x, int32_t &y);
+  void btile_on(int screenx, int screeny, int32_t &x, int32_t &y);
   void toggle_delay();
   void set_delay(int on) { no_delay=!on; }
   void pan(int xv, int yv);
 
-  void mouse_to_game(long x, long y, long &gamex, long &gamey, view *v=NULL);
-  void game_to_mouse(long gamex, long gamey, view *which, long &x, long &y);
+  void mouse_to_game(int32_t x, int32_t y, int32_t &gamex, int32_t &gamey, view *v=NULL);
+  void game_to_mouse(int32_t gamex, int32_t gamey, view *which, int32_t &x, int32_t &y);
   view *view_in(int mousex, int mousey);
 
@@ -139 +139 @@
   int game_over();
   void grow_views(int amount);
-  void play_sound(int id, int vol, long x, long y);
+  void play_sound(int id, int vol, int32_t x, int32_t y);
   void request_level_load(char *name);
   void request_end();

abuse/trunk/src/include/intsect.hpp

@@ -2 +2 @@
 #define __INTSECT_HPP_
 
-int setback_intersect(long x1, long y1, long &x2, long &y2,
-                      long xp1, long yp1, long xp2, long yp2, long inside);
+int setback_intersect(int32_t x1, int32_t y1, int32_t &x2, int32_t &y2,
+                      int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, int32_t inside);
 
 #endif

abuse/trunk/src/include/level.hpp

@@ -27 +27 @@
 {
   public :
-  long x,y,w,h,active;
-  long ambient,view_xoff,view_yoff;
-  long ambient_speed, view_xoff_speed,view_yoff_speed;
+  int32_t x,y,w,h,active;
+  int32_t ambient,view_xoff,view_yoff;
+  int32_t ambient_speed, view_xoff_speed,view_yoff_speed;
   area_controller *next;
-  area_controller(long X, long Y, long W, long H, area_controller *Next);
+  area_controller(int32_t X, int32_t Y, int32_t W, int32_t H, area_controller *Next);
 } ;
 
-extern long last_tile_hit_x,last_tile_hit_y;
+extern int32_t last_tile_hit_x,last_tile_hit_y;
 extern int dev;
 class level        // contain map info and objects
@@ -43 +43 @@
                  fg_width,fg_height;  
   char *Name,*first_name;
-  long total_objs;
+  int32_t total_objs;
   game_object *first,*first_active,*last;
 
@@ -104 +104 @@
   void mark_seen(int x, int y) { CHECK(x>=0 && y>=0 && x<fg_width && y<fg_height);
                                           (*(map_fg+x+y*fg_width))|=0x8000; }
-  void clear_fg(long x, long y) { *(map_fg+x+y*fg_width)&=0x7fff; }
+  void clear_fg(int32_t x, int32_t y) { *(map_fg+x+y*fg_width)&=0x7fff; }
 
   unsigned short *get_fgline(int y) { CHECK(y>=0 && y<fg_height); return map_fg+y*fg_width; }
@@ -141 +141 @@
   void unactivate_all();
   // forms all the objects in processing range into a linked list
-  int add_actives(long x1, long y1, long x2, long y2);  //returns total added
+  int add_actives(int32_t x1, int32_t y1, int32_t x2, int32_t y2);  //returns total added
   void pull_actives(game_object *o, game_object *&last_active, int &t);
-  int add_drawables(long x1, long y1, long x2, long y2);  //returns total added
-
-  game_object *find_object(long x, long y);
-
-  game_object *damage_intersect(long x1, long y1, long &x2, long &y2, game_object *exclude);
-  game_object *boundary_setback(game_object *subject, long x1, long y1, long &x2, long &y2);
-  game_object *all_boundary_setback(game_object *subject, long x1, long y1, long &x2, long &y2);
+  int add_drawables(int32_t x1, int32_t y1, int32_t x2, int32_t y2);  //returns total added
+
+  game_object *find_object(int32_t x, int32_t y);
+
+  game_object *damage_intersect(int32_t x1, int32_t y1, int32_t &x2, int32_t &y2, game_object *exclude);
+  game_object *boundary_setback(game_object *subject, int32_t x1, int32_t y1, int32_t &x2, int32_t &y2);
+  game_object *all_boundary_setback(game_object *subject, int32_t x1, int32_t y1, int32_t &x2, int32_t &y2);
   int crush(game_object *by_who, int xamount, int yamount);
   int push_characters(game_object *by_who, int xamount, int yamount);  // return 0 if fail on any.
   int platform_push(game_object *by_who, int xamount, int yamount);
-  void foreground_intersect(long x1, long y1, long &x2, long &y2);
-  void vforeground_intersect(long x1, long y1, long &y2);
-
-  void hurt_radius(long x, long y,long r, long m, game_object *from, game_object *exclude,
+  void foreground_intersect(int32_t x1, int32_t y1, int32_t &x2, int32_t &y2);
+  void vforeground_intersect(int32_t x1, int32_t y1, int32_t &y2);
+
+  void hurt_radius(int32_t x, int32_t y,int32_t r, int32_t m, game_object *from, game_object *exclude,
                    int max_push);
-  void send_signal(long signal);
+  void send_signal(int32_t signal);
   void next_focus();
   void to_front(game_object *o);
@@ -182 +182 @@
                     object_node *save_list, object_node *exclude_list);
   view *make_view_list(int nplayers);
-  long total_light_links(object_node *list);
-  long total_object_links(object_node *save_list);
-  game_object *find_object_in_area(long x, long y, long x1, long y1, 
-                                   long x2, long y2, Cell *list, game_object *exclude);
-  game_object *find_object_in_angle(long x, long y, long start_angle, long end_angle,
+  int32_t total_light_links(object_node *list);
+  int32_t total_object_links(object_node *save_list);
+  game_object *find_object_in_area(int32_t x, int32_t y, int32_t x1, int32_t y1, 
+                                   int32_t x2, int32_t y2, Cell *list, game_object *exclude);
+  game_object *find_object_in_angle(int32_t x, int32_t y, int32_t start_angle, int32_t end_angle,
                                     void *list, game_object *exclude);
   object_node *make_not_list(object_node *list);

abuse/trunk/src/include/light.hpp

@@ -18 +18 @@
 {
   public :
-  long type,x,xshift,y,yshift;
-  long outer_radius,mul_div,inner_radius;
+  int32_t type,x,xshift,y,yshift;
+  int32_t outer_radius,mul_div,inner_radius;
 
-  long x1,y1,x2,y2;
+  int32_t x1,y1,x2,y2;
   char known;
   light_source *next;
 
   void calc_range();
-  light_source(char Type, long X, long Y, long Inner_radius, long Outer_radius, 
-               long Xshift, long Yshift,
+  light_source(char Type, int32_t X, int32_t Y, int32_t Inner_radius, int32_t Outer_radius, 
+               int32_t Xshift, int32_t Yshift,
                light_source *Next);
   light_source *copy();
@@ -35 +35 @@
 {
   public :
-  long total,x1,y1,x2,y2;
+  int32_t total,x1,y1,x2,y2;
   light_source **lights;  
   light_patch *next;
-  light_patch(long X1, long Y1, long X2, long Y2, light_patch *Next)
+  light_patch(int32_t X1, int32_t Y1, int32_t X2, int32_t Y2, light_patch *Next)
   { 
     x1=X1; y1=Y1; x2=X2; y2=Y2;
@@ -45 +45 @@
     lights=NULL;
   }
-  void add_light(long X1, long Y1, long X2, long Y2, light_source *who);
+  void add_light(int32_t X1, int32_t Y1, int32_t X2, int32_t Y2, light_source *who);
   light_patch *copy(light_patch *Next);
   ~light_patch() { if (total) jfree(lights); }
@@ -52 +52 @@
 void delete_all_lights();
 void delete_light(light_source *which);
-light_source *add_light_source(char type, long x, long y, 
-                               long inner, long outer, long xshift, long yshift);
+light_source *add_light_source(char type, int32_t x, int32_t y, 
+                               int32_t inner, int32_t outer, int32_t xshift, int32_t yshift);
 
 void add_light_spec(spec_directory *sd, char *level_name);
@@ -62 +62 @@
 void delete_patch_list(light_patch *first);
 light_patch *find_patch(int screenx, int screeny, light_patch *list);
-int calc_light_value(long x, long y, light_patch *which);                              
-void light_screen(image *sc, long screenx, long screeny, uchar *light_lookup, ushort ambient);
-void double_light_screen(image *sc, long screenx, long screeny, uchar *light_lookup, ushort ambient,
-                         image *out, long out_x, long out_y);
+int calc_light_value(int32_t x, int32_t y, light_patch *which);                        
+void light_screen(image *sc, int32_t screenx, int32_t screeny, uchar *light_lookup, ushort ambient);
+void double_light_screen(image *sc, int32_t screenx, int32_t screeny, uchar *light_lookup, ushort ambient,
+                         image *out, int32_t out_x, int32_t out_y);
 
 void calc_light_table(palette *pal);
@@ -71 +71 @@
 extern int light_detail;
 
-extern long light_to_number(light_source *l);
-extern light_source *number_to_light(long x);
+extern int32_t light_to_number(light_source *l);
+extern light_source *number_to_light(int32_t x);
 
 #endif

abuse/trunk/src/include/lisp.hpp

@@ -130 +130 @@
 void *lget_array_element(void *a, long x);
 void *lpointer_value(void *lpointer);
-long lnumber_value(void *lnumber);
+int32_t lnumber_value(void *lnumber);
 char *lstring_value(void *lstring);
 unsigned short lcharacter_value(void *c);

abuse/trunk/src/include/objects.hpp

@@ -48 +48 @@
 public :
   game_object *next,*next_active;
-  long *lvars;
+  int32_t *lvars;
 
   int size();
@@ -72 +72 @@
   void drawer();
   void draw_above(view *v);
-  void do_damage(int amount, game_object *from, long hitx, long hity, long push_xvel, long push_yvel);
-  void damage_fun(int amount, game_object *from, long hitx, long hity, long push_xvel, long push_yvel);
+  void do_damage(int amount, game_object *from, int32_t hitx, int32_t hity, int32_t push_xvel, int32_t push_yvel);
+  void damage_fun(int amount, game_object *from, int32_t hitx, int32_t hity, int32_t push_xvel, int32_t push_yvel);
 
 
@@ -94 +94 @@
   int has_sequence(character_state s) { return figures[otype]->has_sequence(s); }
 
-  game_object *try_move(long x, long y, long &xv, long &yv, int checks);  // 1=down,2=up,3=both
+  game_object *try_move(int32_t x, int32_t y, int32_t &xv, int32_t &yv, int checks);  // 1=down,2=up,3=both
   game_object *bmove(int &whit, game_object *exclude);  // ballestic move, return hit object, 
                                                         // or NULL (whit is 1 if hit wall)
@@ -100 +100 @@
                                                                                                     
   int next_picture();
-  long x_center();  
-  long height();
+  int32_t x_center();  
+  int32_t height();
 
   void stop_acel() { set_xacel(0);  set_yacel(0); set_fxacel(0); set_fyacel(0); }
@@ -115 +115 @@
   figure *current_figure() { return current_sequence()->get_figure(current_frame); }
   int total_frames() { return current_sequence()->length(); }
-  void picture_space(long &x1, long &y1,long &x2, long &y2);
+  void picture_space(int32_t &x1, int32_t &y1,int32_t &x2, int32_t &y2);
   int tx(int x) { if (direction>0) return x-x_center(); else return x_center()-x; }
   int ty(int y) { return y-picture()->height()+1; }
@@ -134 +134 @@
 
   void change_type(int new_type);
-  int set_var_by_name(char *name, long value);
-  long get_var_by_name(char *name, int &error);
+  int set_var_by_name(char *name, int32_t value);
+  int32_t get_var_by_name(char *name, int &error);
   game_object *copy();
   void change_aitype(int new_type);
@@ -151 +151 @@
 extern game_object *current_object;
 extern view *current_view;
-game_object *create(int type, long x, long y, int skip_constructor=0, int aitype=0);
+game_object *create(int type, int32_t x, int32_t y, int skip_constructor=0, int aitype=0);
 int base_size();
 
 void delete_object_list(object_node *first);
 int          object_to_number_in_list(game_object *who, object_node *list);
-game_object *number_to_object_in_list(long x, object_node *list);
+game_object *number_to_object_in_list(int32_t x, object_node *list);
 
 

abuse/trunk/src/include/view.hpp

@@ -12 +12 @@
 struct suggest_struct
 {
-  long cx1,cy1,cx2,cy2,shift_down,shift_right,pan_x,pan_y;
-  long new_weapon;
+  int32_t cx1,cy1,cx2,cy2,shift_down,shift_right,pan_x,pan_y;
+  int32_t new_weapon;
   uchar send_view,send_weapon_change;
 } ;
@@ -33 +33 @@
   char name[100];
   struct suggest_struct suggest;
-  long cx1,cy1,cx2,cy2,                    // view area to show
+  int32_t cx1,cy1,cx2,cy2,                    // view area to show
       shift_down,shift_right;             // shift of view
 
@@ -41 +41 @@
   int draw_solid;                         // -1 if don't draw solid
 
-  long *weapons;                          // [0..total_weapons-1]
-  long *last_weapons;                     // last history of above array (for updating statbar)
-  long current_weapon;
+  int32_t *weapons;                          // [0..total_weapons-1]
+  int32_t *last_weapons;                     // last history of above array (for updating statbar)
+  int32_t current_weapon;
 
 
@@ -59 +59 @@
 
   short ambient;                        // ambient lighting setting, used by draw
-  long pan_x,pan_y,no_xleft,no_xright,no_ytop,no_ybottom,
+  int32_t pan_x,pan_y,no_xleft,no_xright,no_ytop,no_ybottom,
        last_x,last_y,last_last_x,last_last_y,view_percent;
 
-  long last_left,last_right,last_up,last_down,   // how many frames ago were these pressed (<=0)
+  int32_t last_left,last_right,last_up,last_down,   // how many frames ago were these pressed (<=0)
        last_b1,last_b2,last_b3,last_b4,last_hp,last_ammo,last_type;
-  long secrets,kills,tsecrets,tkills;
+  int32_t secrets,kills,tsecrets,tkills;
 
   view(game_object *Focus, view *Next, int number);
   void draw_character_damage();           // draws the characters 'status' on the viewer
 
-  long x_center();                        // center of attention
-  long y_center();
-  long xoff();                            // top left and right corner of the screen
-  long interpolated_xoff();
-  long yoff();
-  long interpolated_yoff();
+  int32_t x_center();                        // center of attention
+  int32_t y_center();
+  int32_t xoff();                            // top left and right corner of the screen
+  int32_t interpolated_xoff();
+  int32_t yoff();
+  int32_t interpolated_yoff();
   int drawable();                        // network viewables are not drawable
   int local_player();                    //  just in case I ever need non-viewable local players.
@@ -94 +94 @@
   void draw_ammo();
   void draw_logo();
-  void resize_view(long Cx1, long Cy1, long Cx2, long Cy2);
+  void resize_view(int32_t Cx1, int32_t Cy1, int32_t Cx2, int32_t Cy2);
   void set_input(int cx, int cy, int b1, int b2, int b3, int b4, int px, int py);
   int view_changed() { return suggest.send_view; }
@@ -104 +104 @@
   void reset_player();
   int receive_failed() { return focus==NULL; }
-  long get_view_var_value(int num);
-  long set_view_var_value(int num, long x);
+  int32_t get_view_var_value(int num);
+  int32_t set_view_var_value(int num, int32_t x);
   void configure_for_area(area_controller *a);
   ~view();

abuse/trunk/src/intsect.cpp

@@ -2 +2 @@
 #include <stdlib.h>
 
-void pushback(long x1,long y1,long &x2,long &y2,
-                     long xp1, long yp1, long xp2, long yp2, int xdir, int ydir, int inside)
+void pushback(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                     int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, int xdir, int ydir, int inside)
 {
 
@@ -15 +15 @@
 
 
-/* int setback_intersect(long x1,long y1,long &x2,long &y2,
-                     long xp1, long yp1, long xp2, long yp2)
+/* int setback_intersect(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                     int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2)
 {
-  long mx1,my1,b1,mx2,my2,b2,side1,side2,tx2,ty2;
+  int32_t mx1,my1,b1,mx2,my2,b2,side1,side2,tx2,ty2;
   my1=(y2-y1);
   if (!my1)                  // is the first line strait across?
@@ -110 +110 @@
           if (abs(mx1)>abs(my1))
           {
-            long ae_bd=my1*mx2-mx1*my2;
+            int32_t ae_bd=my1*mx2-mx1*my2;
             CONDITION(ae_bd,"line intersect fuck up");
             tx2=(mx1*mx2*(b2-b1))/ae_bd+xadd;
@@ -117 +117 @@
           else
           {
-            long db_ea=(my2*mx1-mx2*my1);
+            int32_t db_ea=(my2*mx1-mx2*my1);
             CONDITION(db_ea,"line intersect fuck up");
             ty2=(mx1*b1*my2-my1*mx2*b2)/db_ea+yadd;
@@ -137 +137 @@
 
 
-int setback_intersect(long x1,long y1,long &x2,long &y2,
-                      long xp1, long yp1, long xp2, long yp2, 
-                     long inside)  // which side is inside the polygon? (0 always setback)
+int setback_intersect(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
+                      int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, 
+                     int32_t inside)  // which side is inside the polygon? (0 always setback)
 {
   // the line equations will be put in the form
@@ -145 +145 @@
   //     A        B        C  
 
-  long a1,b1,c1,a2,b2,c2,r1,r2;              
+  int32_t a1,b1,c1,a2,b2,c2,r1,r2;              
 
   a1=y2-y1;        
@@ -157 +157 @@
   } 
 
-  long xdiff,ydiff;
-/*  long xdiff=abs(xp1-xp2),ydiff=yp1-yp2;  
+  int32_t xdiff,ydiff;
+/*  int32_t xdiff=abs(xp1-xp2),ydiff=yp1-yp2;  
   if (xdiff>=ydiff)                              // increment the endpoints 
     if (xp2<xp1) { xp2--; xp1++; }                               
@@ -187 +187 @@
            inside==0 || r2==0) 
       { 
-        long ae=a1*b2,bd=b1*a2; 
+        int32_t ae=a1*b2,bd=b1*a2;      
         if (ae!=bd)         // co-linear returns 0
         {

abuse/trunk/src/level.cpp

@@ -24 +24 @@
 #endif
 
+#include <limits.h>
 #include <time.h>
 
@@ -30 +31 @@
 game_object *level::attacker(game_object *who)
 { 
-  long d=0x7fffffff;
+  int32_t d=0x7fffffff;
   game_object *c=NULL;
   view *f=the_game->first_view;
@@ -37 +38 @@
     if (f->focus)
     {
-      long tmp_d=abs(f->focus->x-who->x)+abs(f->focus->y-who->y);
+      int32_t tmp_d=abs(f->focus->x-who->x)+abs(f->focus->y-who->y);
       if (tmp_d<d)
       {
@@ -198 +199 @@
 }
 
-int level::add_actives(long x1, long y1, long x2, long y2)
+int level::add_actives(int32_t x1, int32_t y1, int32_t x2, int32_t y2)
 {
   int t=0;
@@ -210 +211 @@
     if (!o->active)
     {
-      long xr=figures[o->otype]->rangex,
+      int32_t xr=figures[o->otype]->rangex,
            yr=figures[o->otype]->rangey;
 
@@ -242 +243 @@
 
 
-int level::add_drawables(long x1, long y1, long x2, long y2)
+int level::add_drawables(int32_t x1, int32_t y1, int32_t x2, int32_t y2)
 {
   int t=0,ft=0;
@@ -256 +257 @@
     if (ft || !o->active)
     {
-      long xr=figures[o->otype]->draw_rangex,
+      int32_t xr=figures[o->otype]->draw_rangex,
       yr=figures[o->otype]->draw_rangey;
 
@@ -322 +323 @@
 void level::wall_push()
 {
-  long sx1,sy1,sx2,sy2,xv,yv;
+  int32_t sx1,sy1,sx2,sy2,xv,yv;
   game_object *o=first_active;
   for (;o;o=o->next_active)
@@ -362 +363 @@
     if (abs(subject->x-target->x)<b1+b2)
     {
-      long tmove=b1+b2-abs(subject->x-target->x),xv,yv=0,xv2;
+      int32_t tmove=b1+b2-abs(subject->x-target->x),xv,yv=0,xv2;
       if (subject->x>target->x)
         xv=tmove/2;
@@ -382 +383 @@
 {
   game_object *target,*reciever=NULL;
-  long sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx,hity,
+  int32_t sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx,hity,
       s_centerx,t_centerx;
 
@@ -416 +417 @@
               for (t_dat=t_damage->data,j=(int)t_damage->tot-1;j>0 && !hit;j--)
               {
-                long x1,y1,x2,y2,          // define the two line segments to check
+                int32_t x1,y1,x2,y2,          // define the two line segments to check
                 xp1,yp1,xp2,yp2;
 
@@ -459 +460 @@
 */
 
-game_object *level::boundary_setback(game_object *subject, long x1, long y1, long &x2, long &y2)
+game_object *level::boundary_setback(game_object *subject, int32_t x1, int32_t y1, int32_t &x2, int32_t &y2)
 {
   game_object *l=NULL;
-  long tx1,ty1,tx2,ty2,t_centerx;
+  int32_t tx1,ty1,tx2,ty2,t_centerx;
   game_object *target=first_active;
   game_object **blist=block_list;
@@ -485 +486 @@
         while(iter-->0)
         {
-          long xp1=target->x+target->tx(*t_dat);  t_dat++;            
-          long yp1=target->y+target->ty(*t_dat);  t_dat++;
-          long xp2=target->x+target->tx(*t_dat); 
-          long yp2=target->y+target->ty(t_dat[1]); 
+          int32_t xp1=target->x+target->tx(*t_dat);  t_dat++;         
+          int32_t yp1=target->y+target->ty(*t_dat);  t_dat++;
+          int32_t xp2=target->x+target->tx(*t_dat); 
+          int32_t yp2=target->y+target->ty(t_dat[1]); 
 
           // now check to see if (x1,y1-x2,y2) intercest with (xp1,yp1-xp2,yp2)
@@ -511 +512 @@
 
 
-game_object *level::all_boundary_setback(game_object *subject, long x1, long y1, long &x2, long &y2)
+game_object *level::all_boundary_setback(game_object *subject, int32_t x1, int32_t y1, int32_t &x2, int32_t &y2)
 {
   game_object *l=NULL;
-  long tx1,ty1,tx2,ty2,t_centerx;
+  int32_t tx1,ty1,tx2,ty2,t_centerx;
   game_object *target=first_active;
   game_object **blist=all_block_list;
@@ -537 +538 @@
         while(iter-->0)
         {
-          long xp1=target->x+target->tx(*t_dat);  t_dat++;            
-          long yp1=target->y+target->ty(*t_dat);  t_dat++;
-          long xp2=target->x+target->tx(*t_dat); 
-          long yp2=target->y+target->ty(t_dat[1]); 
+          int32_t xp1=target->x+target->tx(*t_dat);  t_dat++;         
+          int32_t yp1=target->y+target->ty(*t_dat);  t_dat++;
+          int32_t xp2=target->x+target->tx(*t_dat); 
+          int32_t yp2=target->y+target->ty(t_dat[1]); 
 
           // now check to see if (x1,y1-x2,y2) intercest with (xp1,yp1-xp2,yp2)
@@ -566 +567 @@
 void level::interpolate_draw_objects(view *v)
 {
-  long old_x,old_y;
+  int32_t old_x,old_y;
   current_view=v;
   
@@ -607 +608 @@
   {
     if (!rcheck) rcheck=open_file("rcheck","rb");
-    long x=rcheck->read_long();
+    int32_t x=rcheck->read_long();
     if (x!=rand_on)
       dprintf("off!\n");
@@ -645 +646 @@
       {      
         area_controller *a,*smallest=NULL;
-        long smallest_size=0xfffffff;
+        int32_t smallest_size=0xffffffff;
         for (a=area_list;a;a=a->next)
           if (o->x>=a->x && o->y>=a->y && o->x<=a->x+a->w && o->y<=a->y+a->h)
           {
-            long size=a->w*a->h;
+            int32_t size=a->w*a->h;
             if (size<smallest_size)
             {
@@ -693 +694 @@
         if (o->otype!=current_start_type)
         {
-          long fmp=o->fmp();      
+          int32_t fmp=o->fmp();      
           int reduce=figures[o->otype]->morph_power;
           if (reduce)
@@ -767 +768 @@
 void level::draw_areas(view *v)
 {
-  long sx1,sy1,sx2,sy2;
+  int32_t sx1,sy1,sx2,sy2;
   area_controller *a=area_list;
   for (;a;a=a->next)
@@ -807 +808 @@
 }  
 
-void calc_bgsize(unsigned short fgw, unsigned short  fgh, unsigned short  &bgw, unsigned short  &bgh)
+void calc_bgsize(uint16_t fgw, uint16_t  fgh, uint16_t  &bgw, uint16_t  &bgh)
 {
   bgw=fgw/ASPECT+8;
@@ -822 +823 @@
   }
 
-  unsigned short *new_fg,*new_bg;
-  new_fg=(unsigned short *)jmalloc(w*h*sizeof(short),"Map fg : resized");
-  memset(new_fg,0,w*h*sizeof(short));
+  uint16_t *new_fg,*new_bg;
+  new_fg=(uint16_t *)jmalloc(w*h*sizeof(int16_t),"Map fg : resized");
+  memset(new_fg,0,w*h*sizeof(int16_t));
 
   int x,y,miny=(h<fg_height)? h : fg_height,minx=(w<fg_width)? w : fg_width;
   
-  unsigned short nbw,nbh;
+  uint16_t nbw,nbh;
   calc_bgsize(w,h,nbw,nbh);
   
-  new_bg=(unsigned short *)jmalloc((int)nbw*(int)nbh*sizeof(short),"map bg : resized");
-  memset(new_bg,0,(int)nbw*(int)nbh*sizeof(short));
+  new_bg=(uint16_t *)jmalloc((int)nbw*(int)nbh*sizeof(int16_t),"map bg : resized");
+  memset(new_bg,0,(int)nbw*(int)nbh*sizeof(int16_t));
 
   for (y=0;y<miny;y++)
@@ -885 +886 @@
     fp->seek(se->offset,0);
     /******************************* Read debug info ******************************/
-    short old_tot=fp->read_short();  
-    unsigned short *o_remap=(unsigned short *)jmalloc(old_tot*2,"obj remap array");    
+    int16_t old_tot=fp->read_short();  
+    uint16_t *o_remap=(uint16_t *)jmalloc(old_tot*2,"obj remap array");    
     char old_name[150];      
     for (i=0;i<old_tot;i++)
@@ -1017 +1018 @@
   {
     fp->seek(se->offset,0);
-    short old_tot=fp->read_short();
+    int16_t old_tot=fp->read_short();
     se=sd->find("describe_names");
     if (!se || !old_tot)
       return ;
 
-    unsigned short *o_remap=(unsigned short *)jmalloc(old_tot*2,"obj remap array");    
-    unsigned short *o_backmap=(unsigned short *)jmalloc(total_objects*2,"obj remap array");    
+    uint16_t *o_remap=(uint16_t *)jmalloc(old_tot*2,"obj remap array");    
+    uint16_t *o_backmap=(uint16_t *)jmalloc(total_objects*2,"obj remap array");    
     memset(o_backmap,0xff,total_objects*2);
     char old_name[150];      
@@ -1041 +1042 @@
     se=sd->find("describe_states");
     if (!se) { jfree(o_remap); jfree(o_backmap); return ; }
-    short **s_remap=(short **)jmalloc(old_tot*sizeof(short *),"big state remap array");
-    short *s_remap_totals=(short *)jmalloc(old_tot*sizeof(short),"big state rmp totals");
+    int16_t **s_remap=(int16_t **)jmalloc(old_tot*sizeof(int16_t *),"big state remap array");
+    int16_t *s_remap_totals=(int16_t *)jmalloc(old_tot*sizeof(int16_t),"big state rmp totals");
     fp->seek(se->offset,0);
     int i=0;
     for (;i<old_tot;i++)
     {
-      short t=fp->read_short();
+      int16_t t=fp->read_short();
       s_remap_totals[i]=t;
       if (t)
       {
-        s_remap[i]=(short *)jmalloc(t*sizeof(short),"state remap");
+        s_remap[i]=(int16_t *)jmalloc(t*sizeof(int16_t),"state remap");
         int j=0;
         for (;j<t;j++)
@@ -1076 +1077 @@
     }
 
-    short **v_remap=NULL;
-    short *v_remap_totals=NULL;
+    int16_t **v_remap=NULL;
+    int16_t *v_remap_totals=NULL;
     int load_vars=1;
     se=sd->find("describe_lvars");
     if (se)
     {
-      v_remap=(short **)jmalloc(old_tot*sizeof(short *),"big var remap array");
-      v_remap_totals=(short *)jmalloc(old_tot*sizeof(short),"big var rmp totals");
+      v_remap=(int16_t **)jmalloc(old_tot*sizeof(int16_t *),"big var remap array");
+      v_remap_totals=(int16_t *)jmalloc(old_tot*sizeof(int16_t),"big var rmp totals");
 
       fp->seek(se->offset,0);
@@ -1089 +1090 @@
       for (;i<old_tot;i++)
       {
-        short t=fp->read_short();
+        int16_t t=fp->read_short();
         v_remap_totals[i]=t;
         if (t)
         {
-          v_remap[i]=(short *)jmalloc(t*sizeof(short),"var remap");
-          memset(v_remap[i],0xff,t*sizeof(short));
+          v_remap[i]=(int16_t *)jmalloc(t*sizeof(int16_t),"var remap");
+          memset(v_remap[i],0xff,t*sizeof(int16_t));
         } else { v_remap[i]=NULL; }
         int j=0;
@@ -1172 +1173 @@
             for (;o && !abort;o=o->next)
             {
-              short ot=fp->read_short();
+              int16_t ot=fp->read_short();
               int k=0;
               for (;k<ot;k++)
@@ -1179 +1180 @@
                 else
                 {
-                  long v=fp->read_long();
+                  int32_t v=fp->read_long();
                   if (o->otype!=0xffff)     // non-exstant object
                   {
@@ -1309 +1310 @@
     fg_width=fp->read_long();
     fg_height=fp->read_long();
-    map_fg=(unsigned short *)jmalloc(2*fg_width*fg_height,"Map fg : loaded");
+    map_fg=(uint16_t *)jmalloc(2*fg_width*fg_height,"Map fg : loaded");
     fp->read((char *)map_fg,2*fg_width*fg_height);
     int t=fg_width*fg_height;
-    unsigned short *map=map_fg;
+    uint16_t *map=map_fg;
     while (t) { *map=lstl(*map); map++; t--; }
   } else
@@ -1327 +1328 @@
     bg_width=fp->read_long();
     bg_height=fp->read_long();
-    map_bg=(unsigned short *)jmalloc(2*bg_width*bg_height,"Map bg : loaded");
+    map_bg=(uint16_t *)jmalloc(2*bg_width*bg_height,"Map bg : loaded");
     fp->read((char *)map_bg,2*bg_width*bg_height);
     int t=bg_width*bg_height;
-    unsigned short *map=map_bg;
+    uint16_t *map=map_bg;
     while (t) { *map=lstl(*map); map++; t--; } 
   } else
@@ -1342 +1343 @@
     fg_width=bg_width;
     fg_height=bg_height;
-    map_fg=(unsigned short *)jmalloc(2*fg_width*fg_height,"Map fg : loaded");
+    map_fg=(uint16_t *)jmalloc(2*fg_width*fg_height,"Map fg : loaded");
     memset(map_fg,0,2*fg_width*fg_height);
   }
@@ -1350 +1351 @@
     bg_width=fg_width/8+8;
     bg_height=fg_height/8+8;
-    map_bg=(unsigned short *)jmalloc(2*bg_width*bg_height,"Map bg : loaded");
+    map_bg=(uint16_t *)jmalloc(2*bg_width*bg_height,"Map bg : loaded");
     memset(map_bg,0,2*bg_width*bg_height);
   }
@@ -1356 +1357 @@
 
   /***************** Check map for non exsistant tiles **************************/
-  long i,w;
-  unsigned short *m;  
+  int32_t i,w;
+  uint16_t *m;  
   spec_entry *load_all=sd->find("player_info");
   for (i=0,w=fg_width*fg_height,m=map_fg;i<w;i++,m++)
@@ -1569 +1570 @@
  
 
-  // how many objects are we goint to save, use a long to specify how many
+  // how many objects are we goint to save, use a int32_t to specify how many
   sd.add_by_hand(new spec_entry(SPEC_DATA_ARRAY,"object_list",NULL,4,0)); 
   
-  long t=0;
+  int32_t t=0;
   object_node *o=save_list;
   for (;o;o=o->next)
@@ -1654 +1655 @@
 void level::write_player_info(bFILE *fp, object_node *save_list)
 {
-  long t=0;
+  int32_t t=0;
   view *v=player_list;
   for (;v;v=v->next) t++; 
@@ -1725 +1726 @@
     }
 
-    long total_players=fp->read_long();
+    int32_t total_players=fp->read_long();
     view *last=NULL;
     int i=0;
@@ -1775 +1776 @@
       if (fp->read_byte()==RC_L)
       {
-        long m=fp->read_long();  // read how many weapons exsisted when last saved
+        int32_t m=fp->read_long();  // read how many weapons exsisted when last saved
         int i;
         for (v=player_list;v;v=v->next)   
@@ -1781 +1782 @@
           for (i=0;i<m;i++)
           {
-            long x=fp->read_long();
+            int32_t x=fp->read_long();
             if (i<total_weapons)
             {
@@ -1794 +1795 @@
       for (v=player_list;v;v=v->next)     
       {
-        memset(v->last_weapons,0xff,total_weapons*sizeof(long));
-        memset(v->weapons,0xff,total_weapons*sizeof(long));
+        memset(v->last_weapons,0xff,total_weapons*sizeof(int32_t));
+        memset(v->weapons,0xff,total_weapons*sizeof(int32_t));
       }
     }
@@ -1902 +1903 @@
   }
   
-  long t=0;
+  int32_t t=0;
   object_node *o=save_list;
   for (;o;o=o->next) t++;
@@ -1919 +1920 @@
     for (i=0;i<figures[o->me->otype]->tv;i++) 
     {
-      fp->write_byte(RC_L);                           // for now the only type allowed is long
+      fp->write_byte(RC_L);                           // for now the only type allowed is int32_t
       fp->write_long(o->me->lvars[i]);
     }
@@ -1944 +1945 @@
 
 
-long level::total_object_links(object_node *list)
-{
-  long tl=0;
+int32_t level::total_object_links(object_node *list)
+{
+  int32_t tl=0;
   for (object_node *o=list;o;o=o->next)
     tl+=o->me->total_objects();
@@ -1952 +1953 @@
 }
 
-long level::total_light_links(object_node *list)
-{
-  long tl=0;
+int32_t level::total_light_links(object_node *list)
+{
+  int32_t tl=0;
   for (object_node *o=list;o;o=o->next)
     tl+=o->me->total_lights();
@@ -1974 +1975 @@
     {
       fp->write_long(x);
-      long x=object_to_number_in_list(o->me->get_object(i),save_list); 
+      int32_t x=object_to_number_in_list(o->me->get_object(i),save_list); 
       if (x)
         fp->write_long(x);
       else                            // save links to excluded items as negative
-        fp->write_long((long)(-(object_to_number_in_list(o->me,exclude_list))));
+        fp->write_long((int32_t)(-(object_to_number_in_list(o->me,exclude_list))));
     }
   }
@@ -2008 +2009 @@
     if (fp->read_byte()==RC_L)
     {
-      long t=fp->read_long();
+      int32_t t=fp->read_long();
       while (t)
       {
-        long x1=fp->read_long();
+        int32_t x1=fp->read_long();
         CONDITION(x1>=0,"expected x1 for object link to be > 0\n");
-        long x2=fp->read_long();
+        int32_t x2=fp->read_long();
         game_object *p,*q=number_to_object_in_list(x1,save_list);
         if (x2>0)
@@ -2033 +2034 @@
     if (fp->read_byte()==RC_L)
     {
-      long t=fp->read_long();
+      int32_t t=fp->read_long();
       while (t)
       {
-        long x1=fp->read_long();
-        long x2=fp->read_long();
+        int32_t x1=fp->read_long();
+        int32_t x2=fp->read_long();
         game_object *p=number_to_object_in_list(x1,save_list);
         if (p)
@@ -2107 +2108 @@
     {
       area_controller *l=NULL,*p;
-      long ta=fp->read_long();
+      int32_t ta=fp->read_long();
       int i=0;
       for (;i<ta;i++)
       {
-        long x,y,w,h;
+        int32_t x,y,w,h;
         x=fp->read_long();
         y=fp->read_long();
@@ -2203 +2204 @@
                         else
                         {
-                                long size = fp->file_size();
+                                int32_t size = fp->file_size();
                                 uchar *buf = (uchar *)jmalloc(0x1000,"copy buf");
                                 int tr = 1;
@@ -2367 +2368 @@
   calc_bgsize(fg_width,fg_height,bg_width,bg_height);
   
-  map_bg=(unsigned short *)jmalloc(sizeof(short)*bg_width*bg_height,"map bg");
-  map_fg=(unsigned short *)jmalloc(sizeof(short)*fg_width*fg_height,"map fg");
-
-
-
-  memset(map_bg,0,sizeof(short)*bg_width*bg_height);
-  memset(map_fg,0,sizeof(short)*fg_width*fg_height);
+  map_bg=(uint16_t *)jmalloc(sizeof(int16_t)*bg_width*bg_height,"map bg");
+  map_fg=(uint16_t *)jmalloc(sizeof(int16_t)*fg_width*fg_height,"map fg");
+
+
+
+  memset(map_bg,0,sizeof(int16_t)*bg_width*bg_height);
+  memset(map_fg,0,sizeof(int16_t)*fg_width*fg_height);
 
   int i;  
@@ -2576 +2577 @@
 }
 
-game_object *level::find_object(long x, long y)
-{
-  long x1,y1,x2,y2;  
+game_object *level::find_object(int32_t x, int32_t y)
+{
+  int32_t x1,y1,x2,y2;  
   game_object *o=first;
   for (;o;o=o->next)
@@ -2589 +2590 @@
 }
 
-long last_tile_hit_x,last_tile_hit_y;
+int32_t last_tile_hit_x,last_tile_hit_y;
 
 #define remapx(x) (x==0 ? -1 : x==tl-1 ? tl+1 : x)
 #define remapy(y) (y==0 ? -1 : y==th-1 ? th+1 : y)
 
-void level::foreground_intersect(long x1, long y1, long &x2, long &y2)
+void level::foreground_intersect(int32_t x1, int32_t y1, int32_t &x2, int32_t &y2)
 {
 /*  if (x1==x2)
@@ -2601 +2602 @@
   }  */
 
-  long tl=the_game->ftile_width(),th=the_game->ftile_height(),
+  int32_t tl=the_game->ftile_width(),th=the_game->ftile_height(),
     j,
     xp1,yp1,xp2,yp2,    // starting and ending points of block line segment 
     swap;               // temp var
-  long blockx1,blocky1,blockx2,blocky2,block,bx,by;
+  int32_t blockx1,blocky1,blockx2,blocky2,block,bx,by;
   point_list *block_list;
   unsigned char *bdat;
@@ -2642 +2643 @@
         bdat=block_list->data;
         unsigned char *ins=f->points->inside;
-        long xo=bx*tl,yo=by*th;
+        int32_t xo=bx*tl,yo=by*th;
         for (j=0;j<total-1;j++,ins++)
         {
@@ -2656 +2657 @@
 
 
-          long ox2=x2,oy2=y2;
+          int32_t ox2=x2,oy2=y2;
           if (*ins)       
             setback_intersect(x1,y1,x2,y2,xp1,yp1,xp2,yp2,1); 
@@ -2674 +2675 @@
 
 
-void level::vforeground_intersect(long x1, long y1, long &y2)
-{
-  long tl=f_wid,th=f_hi,
+void level::vforeground_intersect(int32_t x1, int32_t y1, int32_t &y2)
+{
+  int32_t tl=f_wid,th=f_hi,
     j,
     xp1,yp1,xp2,yp2;    // starting and ending points of block line segment temp var
-  long blocky1,blocky2,block,bx,by,checkx;
+  int32_t blocky1,blocky2,block,bx,by,checkx;
   point_list *block_list;
   unsigned char *bdat;
@@ -2717 +2718 @@
     unsigned char *ins=f->points->inside;
 
-//    long xo=bx*tl,yo=by*th;
+//    int32_t xo=bx*tl,yo=by*th;
     for (j=0;j<total-1;j++,ins++)
     {
@@ -2731 +2732 @@
 
 
-      long oy2=y2;
+      int32_t oy2=y2;
       if (*ins)   
         setback_intersect(checkx,y1,checkx,y2,xp1,yp1,xp2,yp2,1); 
@@ -2748 +2749 @@
 
 
-void level::send_signal(long signal)
+void level::send_signal(int32_t signal)
 {
   if (signal)   // signal 0 is never sent!
@@ -2761 +2762 @@
 int level::crush(game_object *by_who, int xamount, int yamount)
 {
-  long xv,yv,crushed=0;  
+  int32_t xv,yv,crushed=0;  
   game_object *o=first_active;
   for (;o;o=o->next_active)
@@ -2798 +2799 @@
 {
   int failed=0;
-  long xv,yv;
+  int32_t xv,yv;
   game_object *o=first_active;
   for (;o;o=o->next_active)  
@@ -2805 +2806 @@
     {      
       // check to see if the platform is going up and will run into us.      
-      long tvx,tvy;
+      int32_t tvx,tvy;
       if (yamount<0)
       {
@@ -2848 +2849 @@
 int level::push_characters(game_object *by_who, int xamount, int yamount)
 {
-  long xv,yv;
+  int32_t xv,yv;
   int failed=0;
   game_object *o=first_active;
@@ -2857 +2858 @@
       xv=-xamount;    
       yv=-yamount;
-      long tvx,tvy;
+      int32_t tvx,tvy;
       if (xv>0) tvx=xv+1; else if (xv<0) tvx=xv-1; else tvx=0;
       if (yv>0) tvy=yv+1; else if (yv<0) tvx=yv-1; else tvy=0;
@@ -2877 +2878 @@
 game_object *level::find_xrange(int x, int y, int type, int xd)
 {
-  long find_ydist=100000;
+  int32_t find_ydist=100000;
   game_object *find=NULL;
   game_object *o=first_active;
@@ -2900 +2901 @@
 game_object *level::find_xclosest(int x, int y, int type, game_object *who)
 {
-  long find_ydist=100000,find_xdist=0xffffff;
+  int32_t find_ydist=100000,find_xdist=0xffffff;
   game_object *find=NULL;
   game_object *o=first_active;
@@ -2930 +2931 @@
 game_object *level::find_closest(int x, int y, int type, game_object *who)
 {
-  long find_dist=100000;
+  int32_t find_dist=100000;
   game_object *find=NULL;
   game_object *o=first_active;
@@ -2985 +2986 @@
 }
 
-void level::hurt_radius(long x, long y,long r, long m, game_object *from, game_object *exclude, 
+void level::hurt_radius(int32_t x, int32_t y,int32_t r, int32_t m, game_object *from, game_object *exclude, 
                         int max_push)
 {
@@ -2994 +2995 @@
     if (o!=exclude && o->hurtable())
     {
-      long y1=o->y,y2=o->y-o->picture()->height();
-      long cx=abs(o->x-x),cy1=abs(y1-y),d1,d2,cy2=abs(y2-y);
+      int32_t y1=o->y,y2=o->y-o->picture()->height();
+      int32_t cx=abs(o->x-x),cy1=abs(y1-y),d1,d2,cy2=abs(y2-y);
       if (cx<cy1)
         d1=cx+cy1-(cx>>1);
@@ -3056 +3057 @@
       if (v!=exclude)
       {
-        long cx=abs(v->x_center()-o->x),cy=abs(v->y_center()-o->y),d;
+        int32_t cx=abs(v->x_center()-o->x),cy=abs(v->y_center()-o->y),d;
         if (cx<cy)
           d=cx+cy-(cx>>1);
@@ -3152 +3153 @@
 
 
-game_object *level::find_object_in_area(long x, long y, long x1, long y1, long x2, long y2,
+game_object *level::find_object_in_area(int32_t x, int32_t y, int32_t x1, int32_t y1, int32_t x2, int32_t y2,
                                      Cell *list, game_object *exclude)
 {
   game_object *closest=NULL;
-  long closest_distance=0xfffffff,distance,xo,yo;
+  int32_t closest_distance=0xfffffff,distance,xo,yo;
   game_object *o=first_active;
   for (;o;o=o->next_active)
   {
-    long xp1,yp1,xp2,yp2;
+    int32_t xp1,yp1,xp2,yp2;
     o->picture_space(xp1,yp1,xp2,yp2);
 
@@ -3188 +3189 @@
 
 
-game_object *level::find_object_in_angle(long x, long y, long start_angle, long end_angle,
+game_object *level::find_object_in_angle(int32_t x, int32_t y, int32_t start_angle, int32_t end_angle,
                                     void *list, game_object *exclude)
 {
   game_object *closest=NULL;
-  long closest_distance=0xfffffff,distance,xo,yo;
+  int32_t closest_distance=0xfffffff,distance,xo,yo;
   game_object *o=first_active;
   for (;o;o=o->next_active)
   {
-    long angle=lisp_atan2(o->y-y,o->x-x);
+    int32_t angle=lisp_atan2(o->y-y,o->x-x);
     if (((start_angle<=end_angle && (angle>=start_angle && angle<=end_angle))
         || (start_angle>end_angle && (angle>=start_angle || angle<=end_angle)))
@@ -3250 +3251 @@
     for (;o;o=o->next)
     {
-      fprintf(fp,"%3d %s %4ld %4ld %4ld %4ld %04d\n",i++,object_names[o->otype],o->x,o->y,
-              o->xvel(),o->yvel(),o->current_frame);
+      fprintf(fp,"%3d %s %4ld %4ld %4ld %4ld %04d\n",i++,object_names[o->otype],(long)o->x,(long)o->y,
+              (long)o->xvel(),(long)o->yvel(),o->current_frame);
     }
     fclose(fp);
@@ -3258 +3259 @@
 
 
-area_controller::area_controller(long X, long Y, long W, long H, area_controller *Next)
+area_controller::area_controller(int32_t X, int32_t Y, int32_t W, int32_t H, area_controller *Next)
 { 
   x=X; y=Y; w=W; h=H; 

abuse/trunk/src/light.cpp

@@ -20 +20 @@
 int light_detail=MEDIUM_DETAIL;
 
-long light_to_number(light_source *l)
+int32_t light_to_number(light_source *l)
 {
   
@@ -31 +31 @@
 
 
-light_source *number_to_light(long x)
+light_source *number_to_light(int32_t x)
 {
   if (x==0) return NULL;
@@ -135 +135 @@
 }
 
-light_source::light_source(char Type, long X, long Y, long Inner_radius, 
-                           long Outer_radius, long Xshift,  long Yshift, light_source *Next)
+light_source::light_source(char Type, int32_t X, int32_t Y, int32_t Inner_radius, 
+                           int32_t Outer_radius, int32_t Xshift,  int32_t Yshift, light_source *Next)
 { 
   type=Type; 
@@ -158 +158 @@
 }
 
-light_source *add_light_source(char type, long x, long y, 
-                               long inner, long outer, long xshift, long yshift)
+light_source *add_light_source(char type, int32_t x, int32_t y, 
+                               int32_t inner, int32_t outer, int32_t xshift, int32_t yshift)
 {
   first_light_source=new light_source(type,x,y,inner,outer,xshift,yshift,first_light_source);
@@ -392 +392 @@
 }
 
-void add_light(light_patch *&first, long x1, long y1, long x2, long y2, 
+void add_light(light_patch *&first, int32_t x1, int32_t y1, int32_t x2, int32_t y2, 
                             light_source *who)
 {  
@@ -523 +523 @@
 
 /* shit
-int calc_light_value(light_patch *which, long x, long y)
+int calc_light_value(light_patch *which, int32_t x, int32_t y)
 {
   int lv=0;
@@ -537 +537 @@
     else
     {
-      long dx=abs(fn->x-x)<<fn->xshift;
-      long dy=abs(fn->y-y)<<fn->yshift;
-      long  r2;
+      int32_t dx=abs(fn->x-x)<<fn->xshift;
+      int32_t dy=abs(fn->y-y)<<fn->yshift;
+      int32_t  r2;
       if (dx<dy)
         r2=dx+dy-(dx>>1);
@@ -564 +564 @@
 }
 
-light_patch *make_patch_list(int width, int height, long screenx, long screeny)
+light_patch *make_patch_list(int width, int height, int32_t screenx, int32_t screeny)
 {
   light_patch *first=new light_patch(0,0,width-1,height-1,NULL);
@@ -570 +570 @@
   for (light_source *f=first_light_source;f;f=f->next)   // determine which lights will have effect
   {
-    long x1=f->x1-screenx,y1=f->y1-screeny,
+    int32_t x1=f->x1-screenx,y1=f->y1-screeny,
         x2=f->x2-screenx,y2=f->y2-screeny;
     if (x1<0) x1=0;
@@ -599 +599 @@
 #ifdef __WATCOMC__
 extern "C" {
-extern long MAP_PUT(long pad, long screen_addr, long remap, long w);
+extern int32_t MAP_PUT(int32_t pad, int32_t screen_addr, int32_t remap, int32_t w);
 } ;
 #else*/
 
-inline void MAP_PUT(long screen_addr, long remap, long w)
+inline void MAP_PUT(uint8_t * screen_addr, uint8_t * remap, int w)
 { 
   register int cx=w;
-  register int di=screen_addr;
-  register int si=remap;
+  register uint8_t * di=screen_addr;
+  register uint8_t * si=remap;
   while (cx--) 
-    *((uchar *)(di++))=*((uchar *)si+*((uchar *)di)); 
-}
-
-inline void MAP_2PUT(long in_addr, long out_addr, long remap, long w)
+  {
+    uint8_t x=*((uint8_t *)si+*((uint8_t *)di));
+    *((uint8_t *)(di++))=x;
+  }
+}
+
+inline void MAP_2PUT(uint8_t * in_addr, uint8_t * out_addr, uint8_t * remap, int w)
 { 
   while (w--) 
   {
-    uchar x=*(((uchar *)remap)+(*(uchar *)(in_addr++)));
-    *((uchar *)(out_addr++))=x;
-    *((uchar *)(out_addr++))=x;
+    uint8_t x=*(((uint8_t *)remap)+(*(uint8_t *)(in_addr++)));
+    *((uint8_t *)(out_addr++))=x;
+    *((uint8_t *)(out_addr++))=x;
   }
 }
@@ -625 +628 @@
 #endif
 
-inline void PUT8(long *addr, uchar *remap)
-{
-  register ulong in_pixels;
-  register ulong pixel;
-  register ulong out_pixels;
+inline void PUT8(int32_t *addr, uchar *remap)
+{
+  register uint32_t in_pixels;
+  register uint32_t pixel;
+  register uint32_t out_pixels;
   in_pixels=*addr;
   pixel=in_pixels;
@@ -682 +685 @@
 }
 
-inline long MAP_PUT2(long dest_addr, long screen_addr, long remap, long w)
+inline int32_t MAP_PUT2(int32_t dest_addr, int32_t screen_addr, int32_t remap, int32_t w)
 { while (w--) 
   { 
@@ -697 +700 @@
 // calculate the light value for this block.  sum up all contritors
 inline int calc_light_value(light_patch *lp,   // light patch to look at
-                            long sx,           // screen x & y
-                            long sy)
+                            int32_t sx,           // screen x & y
+                            int32_t sy)
 {
   int lv=min_light_level,r2,light_count;
@@ -708 +711 @@
   {
     light_source *fn=*lon_p;
-    register long *dt=&(*lon_p)->type; 
+    register int32_t *dt=&(*lon_p)->type; 
                                      // note we are accessing structure members by bypassing the compiler
                                      // for speed, this may not work on all compilers, but don't
-                                     // see why it shouldn't..  all members are long
+                                     // see why it shouldn't..  all members are int32_t
     
     if (*dt==9)                      // (dt==type),  if light is a Solid rectangle, return it value
@@ -755 +758 @@
   while (count--)
   {
-    uchar *off=light_lookup+(((long)*remap_line)<<8); 
+    uchar *off=light_lookup+(((int32_t)*remap_line)<<8); 
     remap_line++;
 
@@ -780 +783 @@
   for (x=0;x<count;x++)                        
   {                                            
-    uchar *off=light_lookup+(((long)*remap)<<8);
+    uchar *off=light_lookup+(((int32_t)*remap)<<8);
 
     v=off[*(in_line++)];
@@ -819 +822 @@
 
 
-void light_screen(image *sc, long screenx, long screeny, uchar *light_lookup, ushort ambient)
+void light_screen(image *sc, int32_t screenx, int32_t screeny, uchar *light_lookup, ushort ambient)
 {
   int lx_run=0,ly_run;                     // light block x & y run size in pixels ==  (1<<lx_run)
@@ -859 +862 @@
   int suffix=(cx2-cx1-prefix+1)&7;
 
-  long remap_size=((cx2-cx1+1-prefix-suffix)>>lx_run);
+  int32_t remap_size=((cx2-cx1+1-prefix-suffix)>>lx_run);
 
   uchar *remap_line=(uchar *)jmalloc(remap_size,"light remap line");
@@ -885 +888 @@
       for (;(lp->y1>y-cy1 || lp->y2<y-cy1 || 
                               lp->x1>suffix_x || lp->x2<suffix_x);lp=lp->next);
-      long caddr=(long)screen_line+cx2-cx1+1-suffix;
-      uchar *r=light_lookup+(((long)calc_light_value(lp,suffix_x+screenx,calcy)<<8));
+      uint8_t * caddr=(uint8_t *)screen_line+cx2-cx1+1-suffix;
+      uint8_t *r=light_lookup+(((int32_t)calc_light_value(lp,suffix_x+screenx,calcy)<<8));
       switch (todoy)
       {
         case 4 :
         { 
-          MAP_PUT(caddr,(long)r,suffix); caddr+=scr_w;
+          MAP_PUT(caddr,r,suffix); caddr+=scr_w;
         }
         case 3 :
-        { MAP_PUT(caddr,(long)r,suffix); caddr+=scr_w;}
+        { MAP_PUT(caddr,r,suffix); caddr+=scr_w;}
         case 2 :
-        { MAP_PUT(caddr,(long)r,suffix); caddr+=scr_w;}
+        { MAP_PUT(caddr,r,suffix); caddr+=scr_w;}
         case 1 :
         { 
-          MAP_PUT(caddr,(long)r,suffix);
+          MAP_PUT(caddr,r,suffix);
         }
       }
@@ -910 +913 @@
                               lp->x1>prefix_x || lp->x2<prefix_x);lp=lp->next);
 
-      uchar *r=light_lookup+(((long)calc_light_value(lp,prefix_x+screenx,calcy)<<8));
-      long caddr=(long)screen_line;
+      uint8_t *r=light_lookup+(((int32_t)calc_light_value(lp,prefix_x+screenx,calcy)<<8));
+      uint8_t * caddr=(uint8_t *)screen_line;
       switch (todoy)
       {
         case 4 :
         { 
-          MAP_PUT(caddr,(long)r,prefix); 
+          MAP_PUT(caddr,r,prefix); 
           caddr+=scr_w; 
         }
         case 3 :
-        { MAP_PUT(caddr,(long)r,prefix); caddr+=scr_w; }
+        { MAP_PUT(caddr,r,prefix); caddr+=scr_w; }
         case 2 :
-        { MAP_PUT(caddr,(long)r,prefix); caddr+=scr_w; }
+        { MAP_PUT(caddr,r,prefix); caddr+=scr_w; }
         case 1 :
-        { MAP_PUT(caddr,(long)r,prefix); }
+        { MAP_PUT(caddr,r,prefix); }
       }
       screen_line+=prefix;
@@ -969 +972 @@
 
 
-void double_light_screen(image *sc, long screenx, long screeny, uchar *light_lookup, ushort ambient,
-                         image *out, long out_x, long out_y)
+void double_light_screen(image *sc, int32_t screenx, int32_t screeny, uchar *light_lookup, ushort ambient,
+                         image *out, int32_t out_x, int32_t out_y)
 {
   if (sc->width()*2+out_x>out->width() ||
@@ -1035 +1038 @@
   int suffix=(cx2-cx1-prefix+1)&7;
 
-  long remap_size=((cx2-cx1+1-prefix-suffix)>>lx_run);
+  int32_t remap_size=((cx2-cx1+1-prefix-suffix)>>lx_run);
 
   uchar *remap_line=(uchar *)jmalloc(remap_size,"light remap line");
@@ -1063 +1066 @@
       for (;(lp->y1>y-cy1 || lp->y2<y-cy1 || 
                               lp->x1>suffix_x || lp->x2<suffix_x);lp=lp->next);
-      long caddr=(long)in_line+cx2-cx1+1-suffix;
-      long daddr=(long)out_line+(cx2-cx1+1-suffix)*2;
-
-      uchar *r=light_lookup+(((long)calc_light_value(lp,suffix_x+screenx,calcy)<<8));
+      uint8_t * caddr=(uint8_t *)in_line+cx2-cx1+1-suffix;
+      uint8_t * daddr=(uint8_t *)out_line+(cx2-cx1+1-suffix)*2;
+
+      uint8_t *r=light_lookup+(((int32_t)calc_light_value(lp,suffix_x+screenx,calcy)<<8));
       switch (todoy)
       {
         case 4 : 
         { 
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 3 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 2 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 1 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,suffix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,suffix); daddr+=dscr_w; caddr+=scr_w;
         } break;
       }
@@ -1098 +1101 @@
                               lp->x1>prefix_x || lp->x2<prefix_x);lp=lp->next);
 
-      uchar *r=light_lookup+(((long)calc_light_value(lp,prefix_x+screenx,calcy)<<8));
-      long caddr=(long)in_line;
-      long daddr=(long)out_line;
+      uint8_t *r=light_lookup+(((int32_t)calc_light_value(lp,prefix_x+screenx,calcy)<<8));
+      uint8_t * caddr=(uint8_t *)in_line;
+      uint8_t * daddr=(uint8_t *)out_line;
       switch (todoy)
       {
         case 4 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 3 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 2 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w; caddr+=scr_w;
         }
         case 1 :
         { 
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w;
-          MAP_2PUT(caddr,daddr,(long)r,prefix); daddr+=dscr_w; caddr+=scr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w;
+          MAP_2PUT(caddr,daddr,r,prefix); daddr+=dscr_w; caddr+=scr_w;
         } break;
       }
@@ -1184 +1187 @@
 void add_light_spec(spec_directory *sd, char *level_name)
 {
-  long size=4+4;  // number of lights and minimum light levels
+  int32_t size=4+4;  // number of lights and minimum light levels
   for (light_source *f=first_light_source;f;f=f->next)
     size+=6*4+1;
@@ -1217 +1220 @@
   {
     fp->seek(se->offset,SEEK_SET);
-    long t=fp->read_long();
+    int32_t t=fp->read_long();
     min_light_level=fp->read_long();
     light_source *last=NULL;
@@ -1223 +1226 @@
     {
       t--;
-      long x=fp->read_long();
-      long y=fp->read_long();
-      long xshift=fp->read_long();
-      long yshift=fp->read_long();
-      long ir=fp->read_long();
-      long ora=fp->read_long();
-      long ty=fp->read_byte();
+      int32_t x=fp->read_long();
+      int32_t y=fp->read_long();
+      int32_t xshift=fp->read_long();
+      int32_t yshift=fp->read_long();
+      int32_t ir=fp->read_long();
+      int32_t ora=fp->read_long();
+      int32_t ty=fp->read_byte();
 
       light_source *p=new light_source(ty,x,y,ir,ora,xshift,yshift,NULL);

abuse/trunk/src/lisp.cpp

@@ -499 +499 @@
 }
 
-long lnumber_value(void *lnumber)
+int32_t lnumber_value(void *lnumber)
 {
   switch (item_type(lnumber))
@@ -2808 +2808 @@
     case 85 :  // num2str
     {
-      char str[10];
-      sprintf(str,"%ld",lnumber_value(eval(CAR(arg_list))));
+      char str[20];
+      sprintf(str,"%ld",(long int)lnumber_value(eval(CAR(arg_list))));
       ret=new_lisp_string(str);
     } break;

abuse/trunk/src/morpher.cpp

@@ -8 +8 @@
   if (fleft)
   {
-    long rx,ry;
+    int32_t rx,ry;
     the_game->game_to_mouse(who->x-(cx>>16),who->y-(cy>>16),v,rx,ry);
     mor->show(screen,rx,ry,color_table,pal,1000);

abuse/trunk/src/objects.cpp

@@ -82 +82 @@
                               };
   
-long game_object::get_var_by_name(char *name, int &error)
+int32_t game_object::get_var_by_name(char *name, int &error)
 {
   error=0;
@@ -112 +112 @@
 }
 
-int game_object::set_var_by_name(char *name, long value)
+int game_object::set_var_by_name(char *name, int32_t value)
 {
   int i=0;
@@ -144 +144 @@
 
 
-void simple_object::set_var(int xx, ulong v)
+void simple_object::set_var(int xx, uint32_t v)
 {
   switch (xx)
@@ -184 +184 @@
 }
 
-long simple_object::get_var(int xx)
+int32_t simple_object::get_var(int xx)
 {
   switch (xx)
@@ -370 +370 @@
 void game_object::draw_above(view *v)
 {
-  long x1,y1,x2,y2,sy1,sy2,sx,i;
+  int32_t x1,y1,x2,y2,sy1,sy2,sx,i;
   picture_space(x1,y1,x2,y2);    
 
@@ -376 +376 @@
   if (sy2>=v->cy1)
   {
-    long draw_to=y1-(sy2-v->cy1),tmp=x;
+    int32_t draw_to=y1-(sy2-v->cy1),tmp=x;
     current_level->foreground_intersect(x,y1,tmp,draw_to);     
     the_game->game_to_mouse(x1,draw_to,v,i,sy1);     // calculate sy1
@@ -456 +456 @@
 
    
-void game_object::do_damage(int amount, game_object *from, long hitx, long hity, 
-                            long push_xvel, long push_yvel) 
+void game_object::do_damage(int amount, game_object *from, int32_t hitx, int32_t hity, 
+                            int32_t push_xvel, int32_t push_yvel) 
 {
 
@@ -527 +527 @@
 }
 
-void game_object::damage_fun(int amount, game_object *from, long hitx, long hity, 
-                            long push_xvel, long push_yvel) 
+void game_object::damage_fun(int amount, game_object *from, int32_t hitx, int32_t hity, 
+                            int32_t push_xvel, int32_t push_yvel) 
 { 
   if (!hurtable() || !alive()) return ;
@@ -569 +569 @@
 
 
-void game_object::picture_space(long &x1, long &y1,long &x2, long &y2)
+void game_object::picture_space(int32_t &x1, int32_t &y1,int32_t &x2, int32_t &y2)
 {
   int xc=x_center(),w=picture()->width(),h=picture()->height();  
@@ -605 +605 @@
 
 
-long game_object::x_center()
+int32_t game_object::x_center()
 {
   return current_sequence()->x_center(current_frame);   
@@ -748 +748 @@
 }
 
-game_object *game_object::try_move(long x, long y, long &xv, long &yv, int checks)
+game_object *game_object::try_move(int32_t x, int32_t y, int32_t &xv, int32_t &yv, int checks)
 {
   if (xv || yv)  // make sure they are suggesting movement
   {    
     game_object *who1=NULL,*who2=NULL;      // who did we intersect?  
-    long x2,y2,h;  
+    int32_t x2,y2,h;  
 
     if (checks&1)
@@ -791 +791 @@
 void *game_object::float_tick()  // returns 1 if you hit something, 0 otherwise
 {
-  long ret=0;
+  int32_t ret=0;
   if (hp()<=0)
   {
@@ -816 +816 @@
   }
 
-  long fxv=sfxvel()+sfxacel(),fyv=sfyvel()+sfyacel();
-  long xv=xvel()+xacel()+(fxv>>8),yv=yvel()+yacel()+(fyv>>8);
+  int32_t fxv=sfxvel()+sfxacel(),fyv=sfyvel()+sfyacel();
+  int32_t xv=xvel()+xacel()+(fxv>>8),yv=yvel()+yacel()+(fyv>>8);
 
   if (xv!=xvel() || yv!=yvel())   // only store vel's if changed so we don't increase object size
@@ -834 +834 @@
   if (fxv || fyv || xv || yv)   // don't even try if there is no velocity
   {
-    long ffx=fx()+sfxvel(),ffy=fy()+sfyvel();
-    long nxv=xvel()+(ffx>>8);
-    long nyv=yvel()+(ffy>>8);
+    int32_t ffx=fx()+sfxvel(),ffy=fy()+sfyvel();
+    int32_t nxv=xvel()+(ffx>>8);
+    int32_t nyv=yvel()+(ffy>>8);
     set_fx(ffx&0xff);
     set_fy(ffy&0xff);
     
-    long old_nxv=nxv,old_nyv=nyv;
+    int32_t old_nxv=nxv,old_nyv=nyv;
     game_object *hit_object=try_move(x,y,nxv,nyv,3);   // now find out what velocity is safe to use
     
@@ -853 +853 @@
     if (old_nxv!=nxv || old_nyv!=nyv)
     {
-      long lx=last_tile_hit_x,ly=last_tile_hit_y;
+      int32_t lx=last_tile_hit_x,ly=last_tile_hit_y;
       stop();
       if (old_nxv==0)
@@ -865 +865 @@
       } else
       {
-        long tx=(old_nxv>0 ? 1 : -1),ty=0;
+        int32_t tx=(old_nxv>0 ? 1 : -1),ty=0;
         try_move(x,y,tx,ty,3);
         if (!tx)        
@@ -906 +906 @@
   int blocked=0;
 
-  long xt=0,yt=2;
+  int32_t xt=0,yt=2;
   try_move(x,y-2,xt,yt,1);    // make sure we are not falling through the floor
   y=y-2+yt;
@@ -926 +926 @@
   
   // first let's move the guy acording to his physics
-  long xa=xacel(),ya=yacel(),fxa=sfxacel(),fya=sfyacel();
+  int32_t xa=xacel(),ya=yacel(),fxa=sfxacel(),fya=sfyacel();
   if (xa || ya || fxa || fya)
   {
     int fxv=sfxvel(),fyv=sfyvel();
     fxv+=fxa;  fyv+=fya;    
-    long xv=xvel()+xa+(fxv>>8); 
+    int32_t xv=xvel()+xa+(fxv>>8); 
     set_xvel(xvel()+xa+(fxv>>8));
     set_yvel(yvel()+ya+(fyv>>8));
@@ -939 +939 @@
   
   // check to see if this advancement causes him to collide with objects
-  long old_vy=yvel(),old_vx=xvel();  // save the correct veloicties
+  int32_t old_vy=yvel(),old_vx=xvel();  // save the correct veloicties
 
   if (old_vx || old_vy)
@@ -946 +946 @@
     if (yvel()<=0)  // if we are going up or a strait across check up and down
     up=2;
-    long xv=xvel(),yv=yvel();
+    int32_t xv=xvel(),yv=yvel();
     game_object *h=try_move(x,y,xv,yv,1|up);       // now find out what velocity is safe to use
     set_xvel(xv);
@@ -959 +959 @@
       if (gravity())                         // was he going up or down?
       {                        
-        long fall_xv=0,old_fall_vy,fall_vy;
+        int32_t fall_xv=0,old_fall_vy,fall_vy;
         old_fall_vy=fall_vy=old_vy-yvel();             // make sure he gets all of his yvel
         try_move(x,y,fall_xv,fall_vy,1|up);
@@ -1001 +1001 @@
           if (old_vy!=0)
           {
-            long testx=old_vx<0 ? -1 : 1,testy=0;    // see if we were stopped left/right
+            int32_t testx=old_vx<0 ? -1 : 1,testy=0;    // see if we were stopped left/right
                                                      // or just up down
             try_move(x,y,testx,testy,1|up);
@@ -1032 +1032 @@
       else                  // see if we can make him 'climb' the hill
       {
-        long ox=x,oy=y;       // rember orginal position in case climb doesn't work
-
-        long climb_xvel=0,climb_yvel=-5;            // try to move up one pixel to step over the 
+        int32_t ox=x,oy=y;       // rember orginal position in case climb doesn't work
+
+        int32_t climb_xvel=0,climb_yvel=-5;         // try to move up one pixel to step over the 
         try_move(x,y,climb_xvel,climb_yvel,3);  // jutting polygon line
         y+=climb_yvel;
@@ -1082 +1082 @@
   if (yacel()==0 && !gravity())       // he is not falling, make sure he can't
   {
-    long nvx=0,nvy=yvel()+12;  // check three pixels below for ground
+    int32_t nvx=0,nvy=yvel()+12;  // check three pixels below for ground
     try_move(x,y,nvx,nvy,1); 
     if (nvy>11)                    // if he falls more than 2 pixels, then he falls
@@ -1117 +1117 @@
   if (ad && current_level)
   {
-    long xv;
+    int32_t xv;
     if (direction>0) xv=ad; else xv=-ad;
-    long yv=0;
+    int32_t yv=0;
     try_move(x,y,xv,yv,3);
     x+=xv;
@@ -1139 +1139 @@
 
 
-game_object *create(int type, long x, long y, int skip_constructor, int aitype)
+game_object *create(int type, int32_t x, int32_t y, int skip_constructor, int aitype)
 {
   game_object *g=new game_object(type,skip_constructor);
@@ -1299 +1299 @@
   else if (!gravity() && state!=start_run_jump)
   {    
-    long stop_acel;
+    int32_t stop_acel;
     if (xvel()<0)                                    // he was going left
     {
@@ -1448 +1448 @@
 
   // first let's move the guy acording to his physics
-  long xa=xacel(),ya=yacel(),fxa=sfxacel(),fya=sfyacel();
+  int32_t xa=xacel(),ya=yacel(),fxa=sfxacel(),fya=sfyacel();
   if (xa || ya || fxa || fya)
   {
     int fxv=sfxvel(),fyv=sfyvel();
     fxv+=fxa;  fyv+=fya;    
-    long xv=xvel()+xa+(fxv>>8); 
+    int32_t xv=xvel()+xa+(fxv>>8); 
     set_xvel(xvel()+xa+(fxv>>8));
     set_yvel(yvel()+ya+(fyv>>8));
@@ -1460 +1460 @@
   }
   
-  long ox2,oy2;
-
-  long nx=x+xvel(),nfx=fx()+fxvel(),ny=y+yvel(),nfy=fy()+fyvel();
+  int32_t ox2,oy2;
+
+  int32_t nx=x+xvel(),nfx=fx()+fxvel(),ny=y+yvel(),nfy=fy()+fyvel();
   nx+=nfx>>8;
   ny+=nfy>>8;
@@ -1506 +1506 @@
 }
 
-game_object *number_to_object_in_list(long x, object_node *list)
+game_object *number_to_object_in_list(int32_t x, object_node *list)
 {
   if (!x) return NULL; x--;
@@ -1526 +1526 @@
 
 
-long object_list_length(object_node *list)
-{
-  long x=0;
+int32_t object_list_length(object_node *list)
+{
+  int32_t x=0;
   while (list) { list=list->next; x++; }
   return x;
@@ -1543 +1543 @@
     if (t)
     {
-      lvars=(long *)jmalloc(t*4,"object vars");
+      lvars=(int32_t *)jmalloc(t*4,"object vars");
       memset(lvars,0,t*4);
     }
@@ -1556 +1556 @@
 int game_object::reduced_state()
 {
-  long x=0;
+  int32_t x=0;
   for (int i=0;i<figures[otype]->ts;i++)
   {
@@ -1607 +1607 @@
     if (t)
     {
-      lvars=(long *)jmalloc(t*4,"object vars");
+      lvars=(int32_t *)jmalloc(t*4,"object vars");
       memset(lvars,0,t*4);
     }

abuse/trunk/src/view.cpp

@@ -96 +96 @@
 
 
-long view::xoff()
+int32_t view::xoff()
 {
   if (focus)
@@ -106 +106 @@
 }
 
-long view::interpolated_xoff()
+int32_t view::interpolated_xoff()
 {
   if (focus)
@@ -117 +117 @@
 
 
-long view::yoff()
+int32_t view::yoff()
 {
   if (focus)
@@ -128 +128 @@
 
 
-long view::interpolated_yoff()
+int32_t view::interpolated_yoff()
 {
   if (focus)
@@ -249 +249 @@
   if (total_weapons)
   {
-    weapons=(long *)jmalloc(total_weapons*sizeof(long),"weapon array");
-    last_weapons=(long *)jmalloc(total_weapons*sizeof(long),"last weapon array");
-    memset(weapons,0xff,total_weapons*sizeof(long));   // set all to -1
-    memset(last_weapons,0xff,total_weapons*sizeof(long));   // set all to -1  
+    weapons=(int32_t *)jmalloc(total_weapons*sizeof(int32_t),"weapon array");
+    last_weapons=(int32_t *)jmalloc(total_weapons*sizeof(int32_t),"last weapon array");
+    memset(weapons,0xff,total_weapons*sizeof(int32_t));   // set all to -1
+    memset(last_weapons,0xff,total_weapons*sizeof(int32_t));   // set all to -1  
   }
 
@@ -262 +262 @@
 }
 
-long view::x_center() 
+int32_t view::x_center() 
 {
   if (!focus)
@@ -270 +270 @@
 }   
 
-long view::y_center() 
+int32_t view::y_center() 
 { 
   if (!focus)
@@ -321 +321 @@
 {
         int sug_x,sug_y,sug_b1,sug_b2,sug_b3,sug_b4;
-        long sug_px,sug_py;
+        int32_t sug_px,sug_py;
 
 // NOTE:(AK) I have commented this out so we don't use the lisp
@@ -352 +352 @@
                 else sug_b4 = 0;
 
-                long bx = lnumber_value( CAR( ret ) );
+                int32_t bx = lnumber_value( CAR( ret ) );
                 ret = CDR( ret );
-                long by = lnumber_value( CAR( ret ) );
+                int32_t by = lnumber_value( CAR( ret ) );
                 ret = CDR( ret );
                 the_game->mouse_to_game( bx, by, sug_px, sug_py, this );
@@ -480 +480 @@
     case SCMD_VIEW_RESIZE :
     { 
-      long x[8];
+      int32_t x[8];
       memcpy(x,pk,8*4);  pk+=8*4;
       cx1=lltl(x[0]);
@@ -503 +503 @@
     case SCMD_WEAPON_CHANGE :
     {
-      long x;
+      int32_t x;
       memcpy(&x,pk,4);  pk+=4;
       current_weapon=lltl(x);
@@ -818 +818 @@
 
 
-void view::resize_view(long Cx1, long Cy1, long Cx2, long Cy2)
+void view::resize_view(int32_t Cx1, int32_t Cy1, int32_t Cx2, int32_t Cy2)
 {
   if (cx1!=Cx1 || cx2!=Cx2 || cy1!=Cy1 || cy2!=Cy2)
@@ -858 +858 @@
     } 
     focus->set_state(stopped);
-    memset(weapons,0xff,total_weapons*sizeof(long));   
-    memset(last_weapons,0xff,total_weapons*sizeof(long));   
+    memset(weapons,0xff,total_weapons*sizeof(int32_t));   
+    memset(last_weapons,0xff,total_weapons*sizeof(int32_t));   
 
     shift_down=SHIFT_DOWN_DEFAULT;
@@ -980 +980 @@
 { return vv_names[num]; }
 
-long view::get_view_var_value(int num)
+int32_t view::get_view_var_value(int num)
 {
   switch (num)
@@ -1035 +1035 @@
 
 
-long view::set_view_var_value(int num, long x)
+int32_t view::set_view_var_value(int num, int32_t x)
 {
   switch (num)
@@ -1147 +1147 @@
 void process_packet_commands(uchar *pk, int size)
 {
-  long sync_short=-1;
+  int32_t sync_short=-1;
 
   if (!size) return ;