Changeset 60


Ignore:
Timestamp:
Mar 2, 2008, 4:41:48 PM (10 years ago)
Author:
Sam Hocevar
Message:
  • Make a few symbols static (Ref #7).
Location:
abuse/trunk/src
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/ant.cpp

    r58 r60  
    4949}
    5050
    51 int ant_congestion(game_object *o)
     51static int ant_congestion(game_object *o)
    5252{
    5353  for (game_object *d=current_level->first_active_object();d;d=d->next_active)
     
    5858}
    5959
    60 int ant_dodge(game_object *o)
     60static int ant_dodge(game_object *o)
    6161{
    6262  if (o->lvars[ANT_need_to_dodge]==1)
  • abuse/trunk/src/cache.cpp

    r58 r60  
    663663}
    664664
    665 void cache_cleanup2()
     665static void cache_cleanup2()
    666666{ unlink(lfname);
    667667}
    668668
    669 void cache_cleanup(int ret, void *arg)
     669static void cache_cleanup(int ret, void *arg)
    670670{ unlink(lfname);
    671671}
  • abuse/trunk/src/config.cpp

    r56 r60  
    3232player_keys *key_map = NULL;
    3333
    34 int binding_for_player( int player )
     34static int binding_for_player( int player )
    3535{
    3636        char tmp[40];
  • abuse/trunk/src/cop.cpp

    r56 r60  
    199199
    200200
    201 int player_fire_weapon(game_object *o, int type, game_object *target, int angle, signed char *fire_off)
     201static int player_fire_weapon(game_object *o, int type, game_object *target, int angle, signed char *fire_off)
    202202{
    203203
  • abuse/trunk/src/dev.cpp

    r56 r60  
    195195}
    196196
    197 void show_object_number (game_object *who)
     197static void show_object_number (game_object *who)
    198198{
    199199  int total=0,number=0;
     
    214214
    215215
    216 void single_render()
     216static void single_render()
    217217{
    218218  // enlarge clip area
     
    226226}
    227227
    228 void double_render()
     228static void double_render()
    229229{
    230230  small_render_on=1;
     
    330330}
    331331
    332 void load_dev_icons()
     332static void load_dev_icons()
    333333{
    334334  char const *artf="art/dev.spe";
     
    545545}
    546546
    547 light_source *find_light(int32_t x, int32_t y)
     547static light_source *find_light(int32_t x, int32_t y)
    548548{
    549549  image *i=cash.img(light_buttons[0]);
     
    707707}
    708708
    709 int get_omenu_item(int x)
     709static int get_omenu_item(int x)
    710710{
    711711  for (int i=0;i<total_objects;i++)
     
    33673367}
    33683368
    3369 int get_char_mem(int type, int print)
     3369static int get_char_mem(int type, int print)
    33703370{
    33713371  int t=0;
  • abuse/trunk/src/endgame.cpp

    r56 r60  
    4040extern int text_draw(int y, int x1, int y1, int x2, int y2, char const *buf, JCFont *font, uint8_t *cmap, char color);
    4141
    42 mask_line *make_mask_lines(image *mask, int map_width)
     42static mask_line *make_mask_lines(image *mask, int map_width)
    4343{
    4444  mask_line *p=(mask_line *)jmalloc(mask->height()*sizeof(mask_line),"mask_line");
  • abuse/trunk/src/game.cpp

    r56 r60  
    17161716
    17171717extern int start_edit;
    1718 
    1719 void single_render();
    1720 void double_render();
    17211718
    17221719void game::get_input()
  • abuse/trunk/src/lisp.cpp

    r58 r60  
    3333#endif
    3434
    35 /* To bypass the whole garbage collection issue of lisp I am going to have seperate spaces
    36    where lisp objects can reside.  Compiled code and gloabal varibles will reside in permanant
    37    space.  Eveything else will reside in tmp space which gets thrown away after completion of eval.
    38      system functions reside in permant space.
    39 */
     35/* To bypass the whole garbage collection issue of lisp I am going to have
     36 * separate spaces where lisp objects can reside.  Compiled code and gloabal
     37 * varibles will reside in permanant space.  Eveything else will reside in
     38 * tmp space which gets thrown away after completion of eval.  system
     39 * functions reside in permant space. */
    4040
    4141bFILE *current_print_file=NULL;
  • abuse/trunk/src/menu.cpp

    r58 r60  
    5252  for (y=y1;y<=y2;y++)
    5353  {
    54     unsigned char *sl=screen->scan_line(y)+x1;
     54    uint8_t *sl=screen->scan_line(y)+x1;
    5555    for (x=x1;x<=x2;x++,sl++)
    5656    {
    57       unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
    58       unsigned char r=((*(paddr++))-r_to)*percent/256+r_to;
    59       unsigned char g=((*(paddr++))-g_to)*percent/256+g_to;
    60       unsigned char b=((*(paddr++))-b_to)*percent/256+b_to;
     57      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
     58      uint8_t r=((*(paddr++))-r_to)*percent/256+r_to;
     59      uint8_t g=((*(paddr++))-g_to)*percent/256+g_to;
     60      uint8_t b=((*(paddr++))-b_to)*percent/256+b_to;
    6161      *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
    6262    }
     
    7878  for (y=y1;y<=y2;y++)
    7979  {
    80     unsigned char *sl=screen->scan_line(y)+x1;
     80    uint8_t *sl=screen->scan_line(y)+x1;
    8181    for (x=x1;x<=x2;x++,sl++)
    8282    {
    83       unsigned char *paddr=(unsigned char *)pal->addr()+(*sl)*3;
    84       unsigned char r=(*(paddr++))*amount/256;
    85       unsigned char g=(*(paddr++))*amount/256;
    86       unsigned char b=(*(paddr++))*amount/256;
     83      uint8_t *paddr=(uint8_t *)pal->addr()+(*sl)*3;
     84      uint8_t r=(*(paddr++))*amount/256;
     85      uint8_t g=(*(paddr++))*amount/256;
     86      uint8_t b=(*(paddr++))*amount/256;
    8787      *sl=color_table->lookup_color((r)>>3,(g)>>3,(b)>>3);
    8888    }
Note: See TracChangeset for help on using the changeset viewer.