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

Comparing deliantra/server/server/move.C (file contents):
Revision 1.17 by root, Sat Apr 28 05:55:55 2007 UTC vs.
Revision 1.18 by root, Thu May 17 14:14:55 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) 2002 Mark Wedel & Crossfire Development Team
  * Copyright (C) 1992 Frank Tore Johansen
  *
 #include <global.h>
 #ifndef __CEXTRACT__
 # include <sproto.h>
 #endif
-#ifdef COZY_SERVER
-// use a ptotoype
-extern int same_party (partylist *a, partylist *b);
-#endif
 /*
  * move_object() tries to move object op in the direction "dir".
  * If it fails (something blocks the passage), it returns 0,
  * otherwise 1.
  * This is an improvement from the previous move_ob(), which
 int
 move_object (object *op, int dir)
 {
   return move_ob (op, dir, op);
 }
 /* object op is trying to move in direction dir.
  * originator is typically the same as op, but
  * can be different if originator is causing op to
  * move (originator is pushing op)
   CLEAR_FLAG (who, FLAG_SLEEP);
   /* player change place with his pets or summoned creature */
   /* TODO: allow multi arch pushing. Can't be very difficult */
   if (who->more == NULL
-#ifdef COZY_SERVER
-      && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher)
+      && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
-#else
-      && owner == pusher
+          || owner == pusher)
-#endif
     )
     {
       int temp;
       maptile *m;

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