Changeset 16 for abuse/trunk/src/level.cppTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

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

File:

• abuse/trunk/src/level.cpp (modified) (74 diffs)

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;