Changeset 60Tweet

Timestamp:

Mar 2, 2008, 4:41:48 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Make a few symbols static (Ref #7).

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (2 diffs)
• cache.cpp (modified) (1 diff)
• config.cpp (modified) (1 diff)
• cop.cpp (modified) (1 diff)
• dev.cpp (modified) (7 diffs)
• endgame.cpp (modified) (1 diff)
• game.cpp (modified) (1 diff)
• lisp.cpp (modified) (1 diff)
• menu.cpp (modified) (2 diffs)

abuse/trunk/src/ant.cpp

@@ -49 +49 @@
 }
 
-int ant_congestion(game_object *o)
+static int ant_congestion(game_object *o)
 {
   for (game_object *d=current_level->first_active_object();d;d=d->next_active)
@@ -58 +58 @@
 }
 
-int ant_dodge(game_object *o)
+static int ant_dodge(game_object *o)
 {
   if (o->lvars[ANT_need_to_dodge]==1)

abuse/trunk/src/cache.cpp

@@ -663 +663 @@
 }
 
-void cache_cleanup2()
+static void cache_cleanup2()
 { unlink(lfname); 
 }
 
-void cache_cleanup(int ret, void *arg)
+static void cache_cleanup(int ret, void *arg)
 { unlink(lfname); 
 }

abuse/trunk/src/config.cpp

@@ -32 +32 @@
 player_keys *key_map = NULL;
 
-int binding_for_player( int player )
+static int binding_for_player( int player )
 {
         char tmp[40];

abuse/trunk/src/cop.cpp

@@ -199 +199 @@
 
 
-int player_fire_weapon(game_object *o, int type, game_object *target, int angle, signed char *fire_off)
+static int player_fire_weapon(game_object *o, int type, game_object *target, int angle, signed char *fire_off)
 {
 

abuse/trunk/src/dev.cpp

@@ -195 +195 @@
 }
 
-void show_object_number (game_object *who)
+static void show_object_number (game_object *who)
 {
   int total=0,number=0;
@@ -214 +214 @@
 
 
-void single_render()
+static void single_render()
 {
   // enlarge clip area
@@ -226 +226 @@
 }
 
-void double_render()
+static void double_render()
 {
   small_render_on=1;
@@ -330 +330 @@
 }
 
-void load_dev_icons()
+static void load_dev_icons()
 {
   char const *artf="art/dev.spe";
@@ -545 +545 @@
 }
 
-light_source *find_light(int32_t x, int32_t y)
+static light_source *find_light(int32_t x, int32_t y)
 {
   image *i=cash.img(light_buttons[0]);
@@ -707 +707 @@
 } 
 
-int get_omenu_item(int x)
+static int get_omenu_item(int x)
 {
   for (int i=0;i<total_objects;i++)
@@ -3367 +3367 @@
 }
 
-int get_char_mem(int type, int print)
+static int get_char_mem(int type, int print)
 {
   int t=0;

abuse/trunk/src/endgame.cpp

@@ -40 +40 @@
 extern int text_draw(int y, int x1, int y1, int x2, int y2, char const *buf, JCFont *font, uint8_t *cmap, char color);
 
-mask_line *make_mask_lines(image *mask, int map_width)
+static mask_line *make_mask_lines(image *mask, int map_width)
 {
   mask_line *p=(mask_line *)jmalloc(mask->height()*sizeof(mask_line),"mask_line");

abuse/trunk/src/game.cpp

@@ -1716 +1716 @@
 
 extern int start_edit;
-
-void single_render();
-void double_render();
 
 void game::get_input()

abuse/trunk/src/lisp.cpp

@@ -33 +33 @@
 #endif
 
-/* To bypass the whole garbage collection issue of lisp I am going to have seperate spaces
-   where lisp objects can reside.  Compiled code and gloabal varibles will reside in permanant
-   space.  Eveything else will reside in tmp space which gets thrown away after completion of eval. 
-     system functions reside in permant space.
-*/
+/* To bypass the whole garbage collection issue of lisp I am going to have
+ * separate spaces where lisp objects can reside.  Compiled code and gloabal
+ * varibles will reside in permanant space.  Eveything else will reside in
+ * tmp space which gets thrown away after completion of eval.  system
+ * functions reside in permant space. */
 
 bFILE *current_print_file=NULL;

abuse/trunk/src/menu.cpp

@@ -52 +52 @@
   for (y=y1;y<=y2;y++)
   {
-    unsigned char *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=screen->scan_line(y)+x1;
     for (x=x1;x<=x2;x++,sl++)
     {
-      unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
-      unsigned char r=((*(paddr++))-r_to)*percent/256+r_to;
-      unsigned char g=((*(paddr++))-g_to)*percent/256+g_to;
-      unsigned char b=((*(paddr++))-b_to)*percent/256+b_to;
+      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
+      uint8_t r=((*(paddr++))-r_to)*percent/256+r_to;
+      uint8_t g=((*(paddr++))-g_to)*percent/256+g_to;
+      uint8_t b=((*(paddr++))-b_to)*percent/256+b_to;
       *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
     }
@@ -78 +78 @@
   for (y=y1;y<=y2;y++)
   {
-    unsigned char *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=screen->scan_line(y)+x1;
     for (x=x1;x<=x2;x++,sl++)
     {
-      unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
-      unsigned char r=(*(paddr++))*amount/256;
-      unsigned char g=(*(paddr++))*amount/256;
-      unsigned char b=(*(paddr++))*amount/256;
+      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
+      uint8_t r=(*(paddr++))*amount/256;
+      uint8_t g=(*(paddr++))*amount/256;
+      uint8_t b=(*(paddr++))*amount/256;
       *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
     }