Changeset 1154

Timestamp:

11/20/07 09:54:10 (9 months ago)

Author:

javelin

Message:

Complete fix to #7489

Files:

• 1.8.2/branches/devel/src/move.c (modified) (3 diffs)

1.8.2/branches/devel/src/move.c

@@ -101 +101 @@
-        /* The tricky bit here is that we only care about the zone of
-         * the outermost contents */
-
-
+
+
+
-          did_it_interact(what, Zone(absold), "ZLEAVE", NULL, "OZLEAVE", NULL,
-                          "AZLEAVE", old, NA_INTER_SEE);
@@ -112 +113 @@
-                          NA_INTER_SEE);
-        /* If the player is entering a new zone, do zone messages */
-!GoodObject(absold)
-|| (GoodObject(absloc) &&
-   GoodObject(Zone(absloc)) && 
+GoodObject(absloc) && GoodObject(Zone(absloc)) &&
+(!GoodObject(absold) || !GoodObject(Zone(absold)) ||
+
-          did_it_interact(what, Zone(absloc), "ZENTER", NULL, "OZENTER", NULL,
-                          "AZENTER", where, NA_INTER_SEE);
- T("has arrived."),
-
+
+T("has arrived."), 
-      } else {
-        /* non-listeners only trigger the actions not the messages */
-        did_it(what, old, NULL, NULL, NULL, NULL, "ALEAVE", old);
-
-
+
+
+
-          did_it(what, Zone(absold), NULL, NULL, NULL, NULL, "AZLEAVE", old);
-
-
+
+
+
-          did_it(what, Zone(absloc), NULL, NULL, NULL, NULL, "AZENTER", where);
-        did_it(what, where, NULL, NULL, NULL, NULL, "AENTER", where);
@@ -132 +135 @@
-    }
-  if (!nomovemsgs)
- "AMOVE", where,
-
+
+"AMOVE", where, 
-}
-