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.13 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.17 by root, Sat Apr 28 05:55:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__ 26#ifndef __CEXTRACT__
26# include <sproto.h> 27# include <sproto.h>
27#endif 28#endif
… …
456 insert_ob_in_map (who, who->map, pusher, 0); 457 insert_ob_in_map (who, who->map, pusher, 0);
457 insert_ob_in_map (pusher, pusher->map, pusher, 0); 458 insert_ob_in_map (pusher, pusher->map, pusher, 0);
458 return 0; 459 return 0;
459 } 460 }
460 461
461
462 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 462 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
463 /* In original we have here a unaggressive check only - that was the reason why */ 463 /* In original we have here a unaggressive check only - that was the reason why */
464 /* we so often become an enemy of friendly monsters... */ 464 /* we so often become an enemy of friendly monsters... */
465 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 465 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
466
467 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 466 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
468 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 467 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
469 { 468 {
470 if (pusher->contr->run_on) /* only when we run */ 469 if (pusher->contr->run_on) /* only when we run */
471 { 470 {
472 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 471 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
473 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 472 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
474 who->enemy = pusher; 473 who->enemy = pusher;
475 return 1; 474 return 1;
476 } 475 }
477 else 476 else
478 {
479 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 477 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
480 }
481 } 478 }
482 479
483 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 480 /* now, lets test stand still. we NEVER can push stand_still monsters. */
484 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 481 if (QUERY_FLAG (who, FLAG_STAND_STILL))
485 { 482 {
… …
495 */ 492 */
496 493
497 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 494 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
498 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 495 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
499 if (QUERY_FLAG (who, FLAG_WIZ) || 496 if (QUERY_FLAG (who, FLAG_WIZ) ||
500 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 497 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
501 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 498 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
502 { 499 {
503 if (who->type == PLAYER) 500 if (who->type == PLAYER)
504 {
505 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 501 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
506 } 502
507 return 0; 503 return 0;
508 } 504 }
509 505
510 /* If we get here, the push succeeded. 506 /* If we get here, the push succeeded.
511 * Let everyone know the status. 507 * Let everyone know the status.

Diff Legend

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