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

Timestamp:

Mar 18, 2008, 11:22:51 PM (14 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/objects.cpp (modified) (2 diffs)

abuse/trunk/src/objects.cpp

@@ -442 +442 @@
 }
 
-int game_object::can_hurt(game_object *who)     // collision checking will ask first to see if you
-{
-  int is_attacker=current_level->is_attacker(this);
-  // it's you against them!  Damage only if it you are attacking or they are attacking you
-  // I.E. don't let them hurt themselves, this can change if you over-ride this virtual function
-
-  if (who->hurtable() && (is_attacker || current_level->is_attacker(who) || hurt_all()))
-    return 1;
-  else return 0;
+// collision checking will ask first to see if you
+int game_object::can_hurt(game_object *who)
+{
+    int is_attacker = current_level->is_attacker(this);
+
+    // it's you against them!  Damage only if it you are attacking or they are
+    // attacking you, ie. don't let them hurt themselves. This can change if
+    // you override this virtual function
+
+    if(who->hurtable()
+        && ((_team == -1) || (_team != who->get_team()))
+        && (is_attacker || current_level->is_attacker(who) || hurt_all()))
+        return 1;
+
+    return 0;
 }
 
 void game_object::note_attack(game_object *whom)
 {
-  return ;   // nevermind
+    return; // nevermind
 }
 
@@ -470 +476 @@
                 int32_t push_xvel, int32_t push_yvel)
 {
+  // No friendly fire
+  if((_team != -1) && (_team == from->get_team()))
+    return;
 
   void *d=figures[otype]->get_fun(OFUN_DAMAGE);