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.14 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.21 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21
22 The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23*/ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#ifndef __CEXTRACT__ 25#ifndef __CEXTRACT__
27# include <sproto.h> 26# include <sproto.h>
28#endif
29
30#ifdef COZY_SERVER
31// use a ptotoype
32extern int same_party (partylist *a, partylist *b);
33#endif 27#endif
34 28
35/* 29/*
36 * move_object() tries to move object op in the direction "dir". 30 * move_object() tries to move object op in the direction "dir".
37 * If it fails (something blocks the passage), it returns 0, 31 * If it fails (something blocks the passage), it returns 0,
… …
43int 37int
44move_object (object *op, int dir) 38move_object (object *op, int dir)
45{ 39{
46 return move_ob (op, dir, op); 40 return move_ob (op, dir, op);
47} 41}
48
49 42
50/* object op is trying to move in direction dir. 43/* object op is trying to move in direction dir.
51 * originator is typically the same as op, but 44 * originator is typically the same as op, but
52 * can be different if originator is causing op to 45 * can be different if originator is causing op to
53 * move (originator is pushing op) 46 * move (originator is pushing op)
… …
186 179
187 if (op->head != NULL) 180 if (op->head != NULL)
188 op = op->head; 181 op = op->head;
189 op->remove (); 182 op->remove ();
190 for (tmp = op; tmp != NULL; tmp = tmp->more) 183 for (tmp = op; tmp != NULL; tmp = tmp->more)
191 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 184 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x),
192 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 185 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y);
193 186
194 tmp = insert_ob_in_map (op, op->map, originator, 0); 187 tmp = insert_ob_in_map (op, op->map, originator, 0);
195 if (tmp) 188 if (tmp)
196 return 0; 189 return 0;
197 else 190 else
… …
292 user->remove (); 285 user->remove ();
293 286
294 /* Update location for the object */ 287 /* Update location for the object */
295 for (tmp = user; tmp != NULL; tmp = tmp->more) 288 for (tmp = user; tmp != NULL; tmp = tmp->more)
296 { 289 {
297 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 290 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x);
298 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 291 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
299 } 292 }
300 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
301 return (tmp == NULL); 294 return (tmp == NULL);
302} 295}
303 296
… …
428 CLEAR_FLAG (who, FLAG_SLEEP); 421 CLEAR_FLAG (who, FLAG_SLEEP);
429 422
430 /* player change place with his pets or summoned creature */ 423 /* player change place with his pets or summoned creature */
431 /* TODO: allow multi arch pushing. Can't be very difficult */ 424 /* TODO: allow multi arch pushing. Can't be very difficult */
432 if (who->more == NULL 425 if (who->more == NULL
433#ifdef COZY_SERVER
434 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 426 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
435#else
436 && owner == pusher 427 || owner == pusher)
437#endif
438 ) 428 )
439 { 429 {
440 int temp; 430 int temp;
441 maptile *m; 431 maptile *m;
442 432
… …
457 insert_ob_in_map (who, who->map, pusher, 0); 447 insert_ob_in_map (who, who->map, pusher, 0);
458 insert_ob_in_map (pusher, pusher->map, pusher, 0); 448 insert_ob_in_map (pusher, pusher->map, pusher, 0);
459 return 0; 449 return 0;
460 } 450 }
461 451
462
463 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 452 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
464 /* In original we have here a unaggressive check only - that was the reason why */ 453 /* In original we have here a unaggressive check only - that was the reason why */
465 /* we so often become an enemy of friendly monsters... */ 454 /* we so often become an enemy of friendly monsters... */
466 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 455 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
467
468 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 456 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
469 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 457 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
470 { 458 {
471 if (pusher->contr->run_on) /* only when we run */ 459 if (pusher->contr->run_on) /* only when we run */
472 { 460 {
473 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 461 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
474 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 462 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
475 who->enemy = pusher; 463 who->enemy = pusher;
476 return 1; 464 return 1;
477 } 465 }
478 else 466 else
479 {
480 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 467 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
481 }
482 } 468 }
483 469
484 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 470 /* now, lets test stand still. we NEVER can push stand_still monsters. */
485 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 471 if (QUERY_FLAG (who, FLAG_STAND_STILL))
486 { 472 {
… …
496 */ 482 */
497 483
498 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 484 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
499 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 485 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
500 if (QUERY_FLAG (who, FLAG_WIZ) || 486 if (QUERY_FLAG (who, FLAG_WIZ) ||
501 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 487 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
502 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 488 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
503 { 489 {
504 if (who->type == PLAYER) 490 if (who->type == PLAYER)
505 {
506 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 491 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
507 } 492
508 return 0; 493 return 0;
509 } 494 }
510 495
511 /* If we get here, the push succeeded. 496 /* If we get here, the push succeeded.
512 * Let everyone know the status. 497 * Let everyone know the status.

Diff Legend

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