Changeset 16 for abuse/trunk/src/include/objects.hppTweet

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/include/objects.hpp (modified) (7 diffs)

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