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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.124 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.127 by root, Fri Sep 7 18:03:31 2007 UTC

  * Remove and free all objects in the given map.
  */
 void
 maptile::clear ()
 {
-  sfree (regions, size ()); regions = 0;
-  delete [] regionmap; regionmap = 0;
   if (spaces)
     {
       for (mapspace *ms = spaces + size (); ms-- > spaces; )
         while (object *op = ms->bot)
           {
+            // manually remove, as to not trigger anything
+            if (ms->bot = op->above)
+              ms->bot->below = 0;
+            op->flag [FLAG_REMOVED] = true;
-            op = op->head_ ();
+            if (op == op->head_ ())
+              {
-            op->destroy_inv (false);
+                op->destroy_inv (false);
-            op->destroy ();
+                op->destroy ();
+              }
           }
       sfree (spaces, size ()), spaces = 0;
     }
   if (buttons)
     free_objectlinkpt (buttons), buttons = 0;
+  sfree (regions, size ()); regions = 0;
+  delete [] regionmap; regionmap = 0;
 }
 void
 maptile::clear_header ()
 {
 {
   if (!sound)
     return;
   for_all_players (pl)
-    if (pl->ob->map == this)
+    if (pl->observe->map == this)
       if (client *ns = pl->ns)
         {
-          int dx = x - pl->ob->x;
+          int dx = x - pl->observe->x;
-          int dy = y - pl->ob->y;
+          int dy = y - pl->observe->y;
           int distance = idistance (dx, dy);
           if (distance <= MAX_SOUND_DISTANCE)
             ns->play_sound (sound, dx, dy);

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