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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.277 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.280 by root, Thu Jan 8 19:23:44 2009 UTC

 void
 object::do_destroy ()
 {
   if (flag [FLAG_IS_LINKED])
-    remove_button_link (this);
+    remove_link ();
   if (flag [FLAG_FRIENDLY])
     remove_friendly_object (this);
   remove ();
  * This basically means that if direction is 15, then it could either go
  * direction 4, 14, or 16 to get back to where we are.
  * Moved from spell_util.c to object.c with the other related direction
  * functions.
  */
-int reduction_dir[SIZEOFFREE][3] = {
+const int reduction_dir[SIZEOFFREE][3] = {
   {0, 0, 0},                    /* 0 */
   {0, 0, 0},                    /* 1 */
   {0, 0, 0},                    /* 2 */
   {0, 0, 0},                    /* 3 */
   {0, 0, 0},                    /* 4 */
   return insert (force);
 }
 void
-object::play_sound (faceidx sound)
+object::play_sound (faceidx sound) const
 {
   if (!sound)
     return;
-  if (flag [FLAG_REMOVED])
+  if (is_on_map ())
-    return;
-  if (env)
-    {
-      if (object *pl = in_player ())
-        pl->contr->play_sound (sound);
-    }
-  else
     map->play_sound (sound, x, y);
+  else if (object *pl = in_player ())
+    pl->contr->play_sound (sound);
+}
+void
+object::say_msg (const char *msg) const
+{
+  if (is_on_map ())
+    map->say_msg (msg, x, y);
+  else if (object *pl = in_player ())
+    pl->contr->play_sound (sound);
 }
 void
 object::make_noise ()
 {

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