ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/move.C
(Generate patch)

Comparing deliantra/server/server/move.C (file contents):
Revision 1.16 by root, Mon Apr 16 06:23:42 2007 UTC vs.
Revision 1.18 by root, Thu May 17 14:14:55 2007 UTC

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
32extern 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
43int 38int
44move_object (object *op, int dir) 39move_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
492 */ 483 */
493 484
494 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 485 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
495 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 486 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
496 if (QUERY_FLAG (who, FLAG_WIZ) || 487 if (QUERY_FLAG (who, FLAG_WIZ) ||
497 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 488 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
498 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 489 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
499 { 490 {
500 if (who->type == PLAYER) 491 if (who->type == PLAYER)
501 {
502 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 492 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
503 } 493
504 return 0; 494 return 0;
505 } 495 }
506 496
507 /* If we get here, the push succeeded. 497 /* If we get here, the push succeeded.
508 * Let everyone know the status. 498 * Let everyone know the status.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines