Changeset 126 for abuse/trunk/src/cop.cppTweet

Timestamp:

Mar 18, 2008, 11:22:51 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Implement game_object::set_tint, get_tint, set_team and get_team, as well as the corresponding set_object_tint, get_object_tint, set_object_team and get_object_team LISP functions. They'll be useful for CTF mode.

Inspired by Abuse Win32 changelog from February 18, 2001:

• Changed lisp function (set_player_color x) to

(set_object_tint x)

• Added lisp function (get_object_tint)

Inspired by Abuse Win32 changelog from February 17, 2001:

• Added lisp function (set_player_color x) to switch player

to color number x
see chat.lsp for details

File:

• abuse/trunk/src/cop.cpp (modified) (7 diffs)

abuse/trunk/src/cop.cpp

@@ -755 +755 @@
       p_ref r1(ret);
 
-      push_onto_list(new_lisp_number(bot->controller()->player_number),ret);
+      push_onto_list(new_lisp_number(bot->get_tint()),ret);
 
       if (bot->lvars[special_power]==SNEAKY_POWER)
       {
     if (bot->lvars[used_special_power]==0)
-      player_draw(top_just_fired,bot->controller()->player_number);
+      player_draw(top_just_fired,bot->get_tint());
     else if (bot->lvars[used_special_power]<15)
       o->draw_trans(bot->lvars[used_special_power],16);
@@ -818 +818 @@
     {
       case NO_POWER :
-      { player_draw(just_fired,o->controller()->player_number); } break;
+      { player_draw(just_fired,o->get_tint()); } break;
 
       case HEALTH_POWER :
       {
-    player_draw(just_fired,o->controller()->player_number);
+    player_draw(just_fired,o->get_tint());
     if (o->controller() && o->controller()->local_player())
       cache.img(S_health_image)->put_image(screen,o->controller()->cx2-20,
@@ -842 +842 @@
     }
 
-    player_draw(just_fired,o->controller()->player_number);
+    player_draw(just_fired,o->get_tint());
     o->state=(character_state)old_state;
     if (o->controller() && o->controller()->local_player())
@@ -862 +862 @@
     }
 
-    player_draw(just_fired,o->controller()->player_number);
+    player_draw(just_fired,o->get_tint());
     o->state=(character_state)old_state;
 
@@ -872 +872 @@
       {
     if (o->lvars[used_special_power]==0)
-      player_draw(just_fired,o->controller()->player_number);
+      player_draw(just_fired,o->get_tint());
     else if (o->lvars[used_special_power]<15)
       o->draw_trans(o->lvars[used_special_power],16);
@@ -1021 +1021 @@
     for (i=0;i<tp;i++)
     {
-      int color=lnumber_value(lget_array_element(symbol_value(l_player_text_color),sorted_players[i]->player_number));
+      int color=lnumber_value(lget_array_element(symbol_value(l_player_text_color),sorted_players[i]->get_tint()));
       sprintf(msg,"%3ld %s",(long)sorted_players[i]->kills,sorted_players[i]->name);
       if (sorted_players[i]==local)
@@ -1062 +1062 @@
   {
     enum { NAME_LEN=18 } ;
-    int color=lnumber_value(lget_array_element(symbol_value(l_player_text_color),v->player_number));
+    int color=lnumber_value(lget_array_element(symbol_value(l_player_text_color),v->get_tint()));
     char max_name[NAME_LEN];
     strncpy(max_name,v->name,NAME_LEN-1);