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

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.

File:

• abuse/trunk/src/objects.cpp (modified) (34 diffs)

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);
     }