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.26 by root, Tue Aug 26 02:35:05 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#ifndef __CEXTRACT__ 25#ifndef __CEXTRACT__
26# include <sproto.h> 26# include <sproto.h>
27#endif
28
29#ifdef COZY_SERVER
30// use a ptotoype
31extern int same_party (partylist *a, partylist *b);
32#endif 27#endif
33 28
34/* 29/*
35 * move_object() tries to move object op in the direction "dir". 30 * move_object() tries to move object op in the direction "dir".
36 * If it fails (something blocks the passage), it returns 0, 31 * If it fails (something blocks the passage), it returns 0,
… …
42int 37int
43move_object (object *op, int dir) 38move_object (object *op, int dir)
44{ 39{
45 return move_ob (op, dir, op); 40 return move_ob (op, dir, op);
46} 41}
47
48 42
49/* object op is trying to move in direction dir. 43/* object op is trying to move in direction dir.
50 * originator is typically the same as op, but 44 * originator is typically the same as op, but
51 * can be different if originator is causing op to 45 * can be different if originator is causing op to
52 * move (originator is pushing op) 46 * move (originator is pushing op)
… …
77 * bail now - we know it can't work. 71 * bail now - we know it can't work.
78 */ 72 */
79 if (mflags & P_OUT_OF_MAP) 73 if (mflags & P_OUT_OF_MAP)
80 return 0; 74 return 0;
81 75
82
83 /* Is this space blocked? Players with wizpass are immune to 76 /* Is this space blocked? Players with wizpass are immune to
84 * this condition. 77 * this condition.
85 */ 78 */
86 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 79 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS))
87 return 0; 80 return 0;
88 81
89 /* 0.94.2 - we need to set the direction for the new animation code. 82 /* 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 83 * it uses it to figure out face to use - I can't see it
91 * breaking anything, but it might. 84 * breaking anything, but it might.
92 */ 85 */
93 if (op->more != NULL && !move_ob (op->more, dir, op->more->head)) 86 if (op->more && !move_ob (op->more, dir, op->more->head))
94 return 0; 87 return 0;
95 88
96 op->direction = dir; 89 op->direction = dir;
97 90
98 if (op->will_apply & 4) 91 if (op->will_apply & 4)
99 check_earthwalls (op, m, newx, newy); 92 check_earthwalls (op, m, newx, newy);
93
100 if (op->will_apply & 8) 94 if (op->will_apply & 8)
101 check_doors (op, m, newx, newy); 95 check_doors (op, m, newx, newy);
102 96
103 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying 97 /* 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 98 * to remove a removed object, and this function was the culprit. A possible
… …
121 * ok - the caller will deal with actual object removal/insertion 115 * ok - the caller will deal with actual object removal/insertion
122 */ 116 */
123 if (op->head) 117 if (op->head)
124 return 1; 118 return 1;
125 119
126 remove_ob (op); 120 if (m != op->map && op->contr)
121 {
122 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)))
123 return 0;
124
125 op->remove ();
126
127 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
128 return 0;
129
130 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy)))
131 return 0;
132 }
133 else
134 op->remove ();
127 135
128 /* we already have newx, newy, and m, so lets use them. 136 /* we already have newx, newy, and m, so lets use them.
129 * In addition, this fixes potential crashes, because multipart object was 137 * In addition, this fixes potential crashes, because multipart object was
130 * on edge of map, +=x, +=y doesn't make correct coordinates. 138 * on edge of map, +=x, +=y doesn't make correct coordinates.
131 */ 139 */
… …
167 i = find_first_free_spot (op, op->map, x, y); 175 i = find_first_free_spot (op, op->map, x, y);
168 176
169 if (i == -1) 177 if (i == -1)
170 return 0; /* No free spot */ 178 return 0; /* No free spot */
171 179
172 if (op->head != NULL)
173 op = op->head; 180 op = op->head_ ();
174 remove_ob (op); 181 op->remove ();
182
175 for (tmp = op; tmp != NULL; tmp = tmp->more) 183 for (object *tmp = op; tmp; tmp = tmp->more)
184 {
176 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 185 tmp->x = x + freearr_x[i] + (!tmp->arch ? 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 ? 0 : tmp->arch->y);
187 }
178 188
179 tmp = insert_ob_in_map (op, op->map, originator, 0); 189 op = insert_ob_in_map (op, op->map, originator, 0);
180 if (tmp) 190
181 return 0; 191 return !op;
182 else
183 return 1;
184} 192}
185 193
186/* 194/*
187 * Return value: 1 if object was destroyed, 0 otherwise. 195 * Return value: 1 if object was destroyed, 0 otherwise.
188 * Modified so that instead of passing the 'originator' that had no 196 * Modified so that instead of passing the 'originator' that had no
… …
219 if (i == 0 && j == 0) 227 if (i == 0 && j == 0)
220 continue; 228 continue;
221 /* Perhaps this should be extended to support tiled maps */ 229 /* Perhaps this should be extended to support tiled maps */
222 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 230 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
223 continue; 231 continue;
224 other_teleporter = get_map_ob (teleporter->map, teleporter->x + i, teleporter->y + j); 232 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
225 233
226 while (other_teleporter) 234 while (other_teleporter)
227 { 235 {
228 if (other_teleporter->type == tele_type) 236 if (other_teleporter->type == tele_type)
229 break; 237 break;
… …
233 altern = other_teleporter; 241 altern = other_teleporter;
234 } 242 }
235 243
236 if (!nrofalt) 244 if (!nrofalt)
237 { 245 {
238 LOG (llevError, "No alternative teleporters around!\n"); 246 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
247 teleporter->debug_desc (), user->debug_desc ());
239 return 0; 248 return 0;
240 } 249 }
241 250
242 other_teleporter = altern; 251 other_teleporter = altern;
243 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
… …
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))
… …
364 op = op->head; 373 op = op->head;
365 374
366 x = op->x + freearr_x[dir]; 375 x = op->x + freearr_x[dir];
367 y = op->y + freearr_y[dir]; 376 y = op->y + freearr_y[dir];
368 377
369 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 378 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
379 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
380 > pusher->stats.Str))
370 return 0; 381 return 0;
371 382
372 m = op->map; 383 m = op->map;
373 flags = get_map_flags (m, &m, x, y, &x, &y); 384 flags = get_map_flags (m, &m, x, y, &x, &y);
374 385
… …
378 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 389 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
379 390
380 /* If the target space is not blocked, no need to look at the objects on it */ 391 /* 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) 392 if ((op->move_type & move_block) == op->move_type)
382 { 393 {
383 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 394 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
384 { 395 {
385 if (tmp->head == op) 396 if (tmp->head == op)
386 continue; 397 continue;
387 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 398 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
388 return 0; 399 return 0;
389 } 400 }
390 } 401 }
391 if (try_fit (op, m, x, y)) 402 if (try_fit (op, m, x, y))
392 return 0; 403 return 0;
393 404
394 remove_ob (op); 405 op->remove ();
395 for (tmp = op; tmp != NULL; tmp = tmp->more) 406 for (tmp = op; tmp != NULL; tmp = tmp->more)
396 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir]; 407 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
397 insert_ob_in_map (op, op->map, pusher, 0); 408 insert_ob_in_map (op, op->map, pusher, 0);
398 return 1; 409 return 1;
399} 410}
… …
405 int str1, str2; 416 int str1, str2;
406 object *owner; 417 object *owner;
407 418
408 if (who->head != NULL) 419 if (who->head != NULL)
409 who = who->head; 420 who = who->head;
410 owner = get_owner (who); 421 owner = who->owner;
411 422
412 /* Wake up sleeping monsters that may be pushed */ 423 /* Wake up sleeping monsters that may be pushed */
413 CLEAR_FLAG (who, FLAG_SLEEP); 424 CLEAR_FLAG (who, FLAG_SLEEP);
414 425
415 /* player change place with his pets or summoned creature */ 426 /* player change place with his pets or summoned creature */
416 /* TODO: allow multi arch pushing. Can't be very difficult */ 427 /* TODO: allow multi arch pushing. Can't be very difficult */
417 if (who->more == NULL 428 if (who->more == NULL
418#ifdef COZY_SERVER
419 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 429 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
420#else
421 && owner == pusher 430 || owner == pusher)
422#endif
423 ) 431 )
424 { 432 {
425 int temp; 433 int temp;
426 maptile *m; 434 maptile *m;
427 435
428 remove_ob (who); 436 who->remove ();
429 remove_ob (pusher); 437 pusher->remove ();
430 temp = pusher->x; 438 temp = pusher->x;
431 pusher->x = who->x; 439 pusher->x = who->x;
432 who->x = temp; 440 who->x = temp;
433 441
434 temp = pusher->y; 442 temp = pusher->y;
… …
441 449
442 insert_ob_in_map (who, who->map, pusher, 0); 450 insert_ob_in_map (who, who->map, pusher, 0);
443 insert_ob_in_map (pusher, pusher->map, pusher, 0); 451 insert_ob_in_map (pusher, pusher->map, pusher, 0);
444 return 0; 452 return 0;
445 } 453 }
446
447 454
448 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 455 /* 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 */ 456 /* In original we have here a unaggressive check only - that was the reason why */
450 /* we so often become an enemy of friendly monsters... */ 457 /* we so often become an enemy of friendly monsters... */
451 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 458 /* 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 && 459 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
454 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 460 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
455 { 461 {
456 if (pusher->contr->run_on) /* only when we run */ 462 if (pusher->contr->run_on) /* only when we run */
457 { 463 {
458 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 464 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 */ 465 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
460 who->enemy = pusher; 466 who->enemy = pusher;
461 return 1; 467 return 1;
462 } 468 }
463 else 469 else
464 {
465 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 470 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
466 }
467 } 471 }
468 472
469 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 473 /* now, lets test stand still. we NEVER can push stand_still monsters. */
470 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 474 if (QUERY_FLAG (who, FLAG_STAND_STILL))
471 { 475 {
… …
481 */ 485 */
482 486
483 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 487 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
484 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 488 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
485 if (QUERY_FLAG (who, FLAG_WIZ) || 489 if (QUERY_FLAG (who, FLAG_WIZ) ||
486 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 490 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
487 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 491 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
488 { 492 {
489 if (who->type == PLAYER) 493 if (who->type == PLAYER)
490 {
491 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 494 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
492 } 495
493 return 0; 496 return 0;
494 } 497 }
495 498
496 /* If we get here, the push succeeded. 499 /* If we get here, the push succeeded.
497 * Let everyone know the status. 500 * Let everyone know the status.

Diff Legend

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