| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_move_c = |
2 | * static char *rcsid_move_c = |
| 3 | * "$Id: move.c,v 1.1.1.2 2006/02/22 18:03:22 elmex Exp $"; |
3 | * "$Id: move.c,v 1.4 2006/02/22 18:53:56 elmex Exp $"; |
| 4 | */ |
4 | */ |
| 5 | |
5 | |
| 6 | /* |
6 | /* |
| 7 | CrossFire, A Multiplayer game for X-windows |
7 | CrossFire, A Multiplayer game for X-windows |
| 8 | |
8 | |
| … | |
… | |
| 27 | */ |
27 | */ |
| 28 | |
28 | |
| 29 | #include <global.h> |
29 | #include <global.h> |
| 30 | #ifndef __CEXTRACT__ |
30 | #ifndef __CEXTRACT__ |
| 31 | #include <sproto.h> |
31 | #include <sproto.h> |
|
|
32 | #endif |
|
|
33 | |
|
|
34 | #ifdef COZY_SERVER |
|
|
35 | // use a ptotoype |
|
|
36 | extern int same_party (partylist *a, partylist *b); |
| 32 | #endif |
37 | #endif |
| 33 | |
38 | |
| 34 | /* |
39 | /* |
| 35 | * move_object() tries to move object op in the direction "dir". |
40 | * move_object() tries to move object op in the direction "dir". |
| 36 | * If it fails (something blocks the passage), it returns 0, |
41 | * If it fails (something blocks the passage), it returns 0, |
| … | |
… | |
| 410 | /* Wake up sleeping monsters that may be pushed */ |
415 | /* Wake up sleeping monsters that may be pushed */ |
| 411 | CLEAR_FLAG(who,FLAG_SLEEP); |
416 | CLEAR_FLAG(who,FLAG_SLEEP); |
| 412 | |
417 | |
| 413 | /* player change place with his pets or summoned creature */ |
418 | /* player change place with his pets or summoned creature */ |
| 414 | /* TODO: allow multi arch pushing. Can't be very difficult */ |
419 | /* TODO: allow multi arch pushing. Can't be very difficult */ |
| 415 | if (who->more == NULL && owner == pusher) { |
420 | if (who->more == NULL |
|
|
421 | #ifdef COZY_SERVER |
|
|
422 | && |
|
|
423 | ( |
|
|
424 | (owner && owner->contr && pusher->contr |
|
|
425 | && same_party (owner->contr->party, pusher->contr->party)) |
|
|
426 | || owner == pusher |
|
|
427 | ) |
|
|
428 | #else |
|
|
429 | && owner == pusher |
|
|
430 | #endif |
|
|
431 | ) { |
| 416 | int temp; |
432 | int temp; |
| 417 | mapstruct *m; |
433 | mapstruct *m; |
| 418 | |
434 | |
| 419 | remove_ob(who); |
435 | remove_ob(who); |
| 420 | remove_ob(pusher); |
436 | remove_ob(pusher); |
