[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
   /* Everything passes, must be OK. */
   return 1;
 }
+void
+player::set_range (rangetype r)
+{
+  shoottype = r;
+}
 /*
  * sum_weight() is a recursive function which calculates the weight
  * an object is carrying.  It goes through in figures out how much
  * containers are carrying, and sums it up.
  */
   if (flag [FLAG_IS_LINKED])
     remove_button_link (this);
   if (flag [FLAG_FRIENDLY])
-    {
-      remove_friendly_object (this);
+    remove_friendly_object (this);
-      if (type == GOLEM
-          && owner
-          && owner->type == PLAYER
-          && owner->contr->ranges[range_golem] == this)
-        owner->contr->ranges[range_golem] = 0;
-    }
   if (!flag [FLAG_REMOVED])
     remove ();
   destroy_inv (true);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines