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.9 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.20 by root, Mon Jun 4 13:04:00 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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 it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors 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
29#ifdef COZY_SERVER
30// use a ptotoype
31extern int same_party (partylist *a, partylist *b);
32#endif 28#endif
33 29
34/* 30/*
35 * move_object() tries to move object op in the direction "dir". 31 * move_object() tries to move object op in the direction "dir".
36 * If it fails (something blocks the passage), it returns 0, 32 * If it fails (something blocks the passage), it returns 0,
… …
42int 38int
43move_object (object *op, int dir) 39move_object (object *op, int dir)
44{ 40{
45 return move_ob (op, dir, op); 41 return move_ob (op, dir, op);
46} 42}
47
48 43
49/* object op is trying to move in direction dir. 44/* object op is trying to move in direction dir.
50 * originator is typically the same as op, but 45 * originator is typically the same as op, but
51 * can be different if originator is causing op to 46 * can be different if originator is causing op to
52 * move (originator is pushing op) 47 * move (originator is pushing op)
… …
77 * bail now - we know it can't work. 72 * bail now - we know it can't work.
78 */ 73 */
79 if (mflags & P_OUT_OF_MAP) 74 if (mflags & P_OUT_OF_MAP)
80 return 0; 75 return 0;
81 76
82
83 /* Is this space blocked? Players with wizpass are immune to 77 /* Is this space blocked? Players with wizpass are immune to
84 * this condition. 78 * this condition.
85 */ 79 */
86 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 80 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS))
87 return 0; 81 return 0;
88 82
89 /* 0.94.2 - we need to set the direction for the new animation code. 83 /* 0.94.2 - we need to set the direction for the new animation code.
90 * it uses it to figure out face to use - I can't see it 84 * it uses it to figure out face to use - I can't see it
91 * breaking anything, but it might. 85 * breaking anything, but it might.
92 */ 86 */
93 if (op->more != NULL && !move_ob (op->more, dir, op->more->head)) 87 if (op->more && !move_ob (op->more, dir, op->more->head))
94 return 0; 88 return 0;
95 89
96 op->direction = dir; 90 op->direction = dir;
97 91
98 if (op->will_apply & 4) 92 if (op->will_apply & 4)
99 check_earthwalls (op, m, newx, newy); 93 check_earthwalls (op, m, newx, newy);
94
100 if (op->will_apply & 8) 95 if (op->will_apply & 8)
101 check_doors (op, m, newx, newy); 96 check_doors (op, m, newx, newy);
102 97
103 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying 98 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
104 * to remove a removed object, and this function was the culprit. A possible 99 * to remove a removed object, and this function was the culprit. A possible
… …
121 * ok - the caller will deal with actual object removal/insertion 116 * ok - the caller will deal with actual object removal/insertion
122 */ 117 */
123 if (op->head) 118 if (op->head)
124 return 1; 119 return 1;
125 120
126 remove_ob (op); 121 if (m != op->map && op->contr)
122 {
123 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)))
124 return 0;
125
126 op->remove ();
127
128 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
129 return 0;
130
131 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy)))
132 return 0;
133 }
134 else
135 op->remove ();
127 136
128 /* we already have newx, newy, and m, so lets use them. 137 /* we already have newx, newy, and m, so lets use them.
129 * In addition, this fixes potential crashes, because multipart object was 138 * In addition, this fixes potential crashes, because multipart object was
130 * on edge of map, +=x, +=y doesn't make correct coordinates. 139 * on edge of map, +=x, +=y doesn't make correct coordinates.
131 */ 140 */
… …
169 if (i == -1) 178 if (i == -1)
170 return 0; /* No free spot */ 179 return 0; /* No free spot */
171 180
172 if (op->head != NULL) 181 if (op->head != NULL)
173 op = op->head; 182 op = op->head;
174 remove_ob (op); 183 op->remove ();
175 for (tmp = op; tmp != NULL; tmp = tmp->more) 184 for (tmp = op; tmp != NULL; tmp = tmp->more)
176 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x),
177 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 186 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y);
178 187
179 tmp = insert_ob_in_map (op, op->map, originator, 0); 188 tmp = insert_ob_in_map (op, op->map, originator, 0);
180 if (tmp) 189 if (tmp)
181 return 0; 190 return 0;
182 else 191 else
… …
219 if (i == 0 && j == 0) 228 if (i == 0 && j == 0)
220 continue; 229 continue;
221 /* Perhaps this should be extended to support tiled maps */ 230 /* Perhaps this should be extended to support tiled maps */
222 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 231 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
223 continue; 232 continue;
224 other_teleporter = get_map_ob (teleporter->map, teleporter->x + i, teleporter->y + j); 233 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
225 234
226 while (other_teleporter) 235 while (other_teleporter)
227 { 236 {
228 if (other_teleporter->type == tele_type) 237 if (other_teleporter->type == tele_type)
229 break; 238 break;
… …
272 } 281 }
273 else 282 else
274 return 0; 283 return 0;
275 } 284 }
276 285
277 remove_ob (user); 286 user->remove ();
278 287
279 /* Update location for the object */ 288 /* Update location for the object */
280 for (tmp = user; tmp != NULL; tmp = tmp->more) 289 for (tmp = user; tmp != NULL; tmp = tmp->more)
281 { 290 {
282 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x);
283 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
284 } 293 }
285 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
286 return (tmp == NULL); 295 return (tmp == NULL);
287} 296}
288 297
… …
327 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty); 336 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty);
328 337
329 if (mflags & P_OUT_OF_MAP) 338 if (mflags & P_OUT_OF_MAP)
330 return 1; 339 return 1;
331 340
332 for (tmp = get_map_ob (m2, tx, ty); tmp; tmp = tmp->above) 341 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
333 { 342 {
334 if (tmp->head == op || tmp == op) 343 if (tmp->head == op || tmp == op)
335 continue; 344 continue;
336 345
337 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 346 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR))
… …
378 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 387 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
379 388
380 /* If the target space is not blocked, no need to look at the objects on it */ 389 /* If the target space is not blocked, no need to look at the objects on it */
381 if ((op->move_type & move_block) == op->move_type) 390 if ((op->move_type & move_block) == op->move_type)
382 { 391 {
383 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 392 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
384 { 393 {
385 if (tmp->head == op) 394 if (tmp->head == op)
386 continue; 395 continue;
387 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 396 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
388 return 0; 397 return 0;
389 } 398 }
390 } 399 }
391 if (try_fit (op, m, x, y)) 400 if (try_fit (op, m, x, y))
392 return 0; 401 return 0;
393 402
394 remove_ob (op); 403 op->remove ();
395 for (tmp = op; tmp != NULL; tmp = tmp->more) 404 for (tmp = op; tmp != NULL; tmp = tmp->more)
396 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir]; 405 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
397 insert_ob_in_map (op, op->map, pusher, 0); 406 insert_ob_in_map (op, op->map, pusher, 0);
398 return 1; 407 return 1;
399} 408}
… …
405 int str1, str2; 414 int str1, str2;
406 object *owner; 415 object *owner;
407 416
408 if (who->head != NULL) 417 if (who->head != NULL)
409 who = who->head; 418 who = who->head;
410 owner = get_owner (who); 419 owner = who->owner;
411 420
412 /* Wake up sleeping monsters that may be pushed */ 421 /* Wake up sleeping monsters that may be pushed */
413 CLEAR_FLAG (who, FLAG_SLEEP); 422 CLEAR_FLAG (who, FLAG_SLEEP);
414 423
415 /* player change place with his pets or summoned creature */ 424 /* player change place with his pets or summoned creature */
416 /* TODO: allow multi arch pushing. Can't be very difficult */ 425 /* TODO: allow multi arch pushing. Can't be very difficult */
417 if (who->more == NULL 426 if (who->more == NULL
418#ifdef COZY_SERVER
419 && ((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))
420#else
421 && owner == pusher 428 || owner == pusher)
422#endif
423 ) 429 )
424 { 430 {
425 int temp; 431 int temp;
426 maptile *m; 432 maptile *m;
427 433
428 remove_ob (who); 434 who->remove ();
429 remove_ob (pusher); 435 pusher->remove ();
430 temp = pusher->x; 436 temp = pusher->x;
431 pusher->x = who->x; 437 pusher->x = who->x;
432 who->x = temp; 438 who->x = temp;
433 439
434 temp = pusher->y; 440 temp = pusher->y;
… …
441 447
442 insert_ob_in_map (who, who->map, pusher, 0); 448 insert_ob_in_map (who, who->map, pusher, 0);
443 insert_ob_in_map (pusher, pusher->map, pusher, 0); 449 insert_ob_in_map (pusher, pusher->map, pusher, 0);
444 return 0; 450 return 0;
445 } 451 }
446
447 452
448 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 453 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
449 /* In original we have here a unaggressive check only - that was the reason why */ 454 /* In original we have here a unaggressive check only - that was the reason why */
450 /* we so often become an enemy of friendly monsters... */ 455 /* we so often become an enemy of friendly monsters... */
451 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 456 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
452
453 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 457 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
454 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 458 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
455 { 459 {
456 if (pusher->contr->run_on) /* only when we run */ 460 if (pusher->contr->run_on) /* only when we run */
457 { 461 {
458 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 462 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
459 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 463 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
460 who->enemy = pusher; 464 who->enemy = pusher;
461 return 1; 465 return 1;
462 } 466 }
463 else 467 else
464 {
465 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 468 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
466 }
467 } 469 }
468 470
469 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 471 /* now, lets test stand still. we NEVER can push stand_still monsters. */
470 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 472 if (QUERY_FLAG (who, FLAG_STAND_STILL))
471 { 473 {
… …
481 */ 483 */
482 484
483 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 485 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
484 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 486 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
485 if (QUERY_FLAG (who, FLAG_WIZ) || 487 if (QUERY_FLAG (who, FLAG_WIZ) ||
486 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 488 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
487 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))
488 { 490 {
489 if (who->type == PLAYER) 491 if (who->type == PLAYER)
490 {
491 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);
492 } 493
493 return 0; 494 return 0;
494 } 495 }
495 496
496 /* If we get here, the push succeeded. 497 /* If we get here, the push succeeded.
497 * Let everyone know the status. 498 * Let everyone know the status.

Diff Legend

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