1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | * |
7 | * |
… | |
… | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #ifndef __CEXTRACT__ |
26 | #ifndef __CEXTRACT__ |
27 | # include <sproto.h> |
27 | # include <sproto.h> |
28 | #endif |
28 | #endif |
29 | |
29 | |
30 | #ifdef COZY_SERVER |
|
|
31 | // use a ptotoype |
|
|
32 | extern int same_party (partylist *a, partylist *b); |
|
|
33 | #endif |
|
|
34 | |
|
|
35 | /* |
30 | /* |
36 | * move_object() tries to move object op in the direction "dir". |
31 | * move_object() tries to move object op in the direction "dir". |
37 | * If it fails (something blocks the passage), it returns 0, |
32 | * If it fails (something blocks the passage), it returns 0, |
38 | * otherwise 1. |
33 | * otherwise 1. |
39 | * This is an improvement from the previous move_ob(), which |
34 | * This is an improvement from the previous move_ob(), which |
… | |
… | |
43 | int |
38 | int |
44 | move_object (object *op, int dir) |
39 | move_object (object *op, int dir) |
45 | { |
40 | { |
46 | return move_ob (op, dir, op); |
41 | return move_ob (op, dir, op); |
47 | } |
42 | } |
48 | |
|
|
49 | |
43 | |
50 | /* object op is trying to move in direction dir. |
44 | /* object op is trying to move in direction dir. |
51 | * originator is typically the same as op, but |
45 | * originator is typically the same as op, but |
52 | * can be different if originator is causing op to |
46 | * can be different if originator is causing op to |
53 | * move (originator is pushing op) |
47 | * move (originator is pushing op) |
… | |
… | |
428 | CLEAR_FLAG (who, FLAG_SLEEP); |
422 | CLEAR_FLAG (who, FLAG_SLEEP); |
429 | |
423 | |
430 | /* player change place with his pets or summoned creature */ |
424 | /* player change place with his pets or summoned creature */ |
431 | /* TODO: allow multi arch pushing. Can't be very difficult */ |
425 | /* TODO: allow multi arch pushing. Can't be very difficult */ |
432 | if (who->more == NULL |
426 | if (who->more == NULL |
433 | #ifdef COZY_SERVER |
|
|
434 | && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) |
427 | && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) |
435 | #else |
|
|
436 | && owner == pusher |
428 | || owner == pusher) |
437 | #endif |
|
|
438 | ) |
429 | ) |
439 | { |
430 | { |
440 | int temp; |
431 | int temp; |
441 | maptile *m; |
432 | maptile *m; |
442 | |
433 | |