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.8 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.28 by root, Sat Dec 27 02:31:19 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)
… …
59move_ob (object *op, int dir, object *originator) 53move_ob (object *op, int dir, object *originator)
60{ 54{
61 sint16 newx = op->x + freearr_x[dir]; 55 sint16 newx = op->x + freearr_x[dir];
62 sint16 newy = op->y + freearr_y[dir]; 56 sint16 newy = op->y + freearr_y[dir];
63 object *tmp; 57 object *tmp;
64 mapstruct *m; 58 maptile *m;
65 int mflags; 59 int mflags;
66 60
67 if (op == NULL) 61 if (op == NULL)
68 { 62 {
69 LOG (llevError, "Trying to move NULL.\n"); 63 LOG (llevError, "Trying to move NULL.\n");
… …
76 /* If the space the player is trying to is out of the map, 70 /* If the space the player is trying to is out of the map,
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
82 75
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))
… …
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
… …
199teleport (object *teleporter, uint8 tele_type, object *user) 207teleport (object *teleporter, uint8 tele_type, object *user)
200{ 208{
201 object *altern; 209 object *altern;
202 int i, j, k, nrofalt = 0; 210 int i, j, k, nrofalt = 0;
203 object *other_teleporter, *tmp; 211 object *other_teleporter, *tmp;
204 mapstruct *m; 212 maptile *m;
205 sint16 sx, sy; 213 sint16 sx, sy;
206 214
207 if (user == NULL) 215 if (user == NULL)
208 return 0; 216 return 0;
209 if (user->head != NULL) 217 if (user->head != NULL)
… …
216 for (i = -5; i < 6; i++) 224 for (i = -5; i < 6; i++)
217 for (j = -5; j < 6; j++) 225 for (j = -5; j < 6; j++)
218 { 226 {
219 if (i == 0 && j == 0) 227 if (i == 0 && j == 0)
220 continue; 228 continue;
229
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;
233
224 other_teleporter = get_map_ob (teleporter->map, teleporter->x + i, teleporter->y + j); 234 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
225 235
226 while (other_teleporter) 236 while (other_teleporter)
227 { 237 {
228 if (other_teleporter->type == tele_type) 238 if (other_teleporter->type == tele_type)
229 break; 239 break;
230 other_teleporter = other_teleporter->above; 240 other_teleporter = other_teleporter->above;
231 } 241 }
242
232 if (other_teleporter && !(RANDOM () % ++nrofalt)) 243 if (other_teleporter && !rndm (++nrofalt))
233 altern = other_teleporter; 244 altern = other_teleporter;
234 } 245 }
235 246
236 if (!nrofalt) 247 if (!nrofalt)
237 { 248 {
238 LOG (llevError, "No alternative teleporters around!\n"); 249 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
250 teleporter->debug_desc (), user->debug_desc ());
239 return 0; 251 return 0;
240 } 252 }
241 253
242 other_teleporter = altern; 254 other_teleporter = altern;
243 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 255 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
… …
272 } 284 }
273 else 285 else
274 return 0; 286 return 0;
275 } 287 }
276 288
277 remove_ob (user); 289 user->remove ();
278 290
279 /* Update location for the object */ 291 /* Update location for the object */
280 for (tmp = user; tmp != NULL; tmp = tmp->more) 292 for (tmp = user; tmp; tmp = tmp->more)
281 { 293 {
282 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 294 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
283 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 295 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
284 } 296 }
297
285 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 298 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
286 return (tmp == NULL); 299 return !tmp;
287} 300}
288 301
289void 302void
290recursive_roll (object *op, int dir, object *pusher) 303recursive_roll (object *op, int dir, object *pusher)
291{ 304{
… …
307 * This is currently only used for the boulder roll code. 320 * This is currently only used for the boulder roll code.
308 * Returns 1 if object does not fit, 0 if it does. 321 * Returns 1 if object does not fit, 0 if it does.
309 */ 322 */
310 323
311int 324int
312try_fit (object *op, mapstruct *m, int x, int y) 325try_fit (object *op, maptile *m, int x, int y)
313{ 326{
314 object *tmp, *more; 327 object *tmp, *more;
315 sint16 tx, ty; 328 sint16 tx, ty;
316 int mflags; 329 int mflags;
317 mapstruct *m2; 330 maptile *m2;
318 331
319 if (op->head) 332 if (op->head)
320 op = op->head; 333 op = op->head;
321 334
322 for (more = op; more; more = more->more) 335 for (more = op; more; more = more->more)
… …
327 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty); 340 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty);
328 341
329 if (mflags & P_OUT_OF_MAP) 342 if (mflags & P_OUT_OF_MAP)
330 return 1; 343 return 1;
331 344
332 for (tmp = get_map_ob (m2, tx, ty); tmp; tmp = tmp->above) 345 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
333 { 346 {
334 if (tmp->head == op || tmp == op) 347 if (tmp->head == op || tmp == op)
335 continue; 348 continue;
336 349
337 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 350 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR))
… …
355roll_ob (object *op, int dir, object *pusher) 368roll_ob (object *op, int dir, object *pusher)
356{ 369{
357 object *tmp; 370 object *tmp;
358 sint16 x, y; 371 sint16 x, y;
359 int flags; 372 int flags;
360 mapstruct *m; 373 maptile *m;
361 MoveType move_block; 374 MoveType move_block;
362 375
363 if (op->head) 376 if (op->head)
364 op = op->head; 377 op = op->head;
365 378
366 x = op->x + freearr_x[dir]; 379 x = op->x + freearr_x[dir];
367 y = op->y + freearr_y[dir]; 380 y = op->y + freearr_y[dir];
368 381
369 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 382 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
383 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
384 > pusher->stats.Str))
370 return 0; 385 return 0;
371 386
372 m = op->map; 387 m = op->map;
373 flags = get_map_flags (m, &m, x, y, &x, &y); 388 flags = get_map_flags (m, &m, x, y, &x, &y);
374 389
… …
378 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 393 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
379 394
380 /* If the target space is not blocked, no need to look at the objects on it */ 395 /* 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) 396 if ((op->move_type & move_block) == op->move_type)
382 { 397 {
383 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 398 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
384 { 399 {
385 if (tmp->head == op) 400 if (tmp->head == op)
386 continue; 401 continue;
387 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 402 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
388 return 0; 403 return 0;
389 } 404 }
390 } 405 }
391 if (try_fit (op, m, x, y)) 406 if (try_fit (op, m, x, y))
392 return 0; 407 return 0;
393 408
394 remove_ob (op); 409 op->remove ();
395 for (tmp = op; tmp != NULL; tmp = tmp->more) 410 for (tmp = op; tmp != NULL; tmp = tmp->more)
396 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir]; 411 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
397 insert_ob_in_map (op, op->map, pusher, 0); 412 insert_ob_in_map (op, op->map, pusher, 0);
398 return 1; 413 return 1;
399} 414}
… …
405 int str1, str2; 420 int str1, str2;
406 object *owner; 421 object *owner;
407 422
408 if (who->head != NULL) 423 if (who->head != NULL)
409 who = who->head; 424 who = who->head;
410 owner = get_owner (who); 425 owner = who->owner;
411 426
412 /* Wake up sleeping monsters that may be pushed */ 427 /* Wake up sleeping monsters that may be pushed */
413 CLEAR_FLAG (who, FLAG_SLEEP); 428 CLEAR_FLAG (who, FLAG_SLEEP);
414 429
415 /* player change place with his pets or summoned creature */ 430 /* player change place with his pets or summoned creature */
416 /* TODO: allow multi arch pushing. Can't be very difficult */ 431 /* TODO: allow multi arch pushing. Can't be very difficult */
417 if (who->more == NULL 432 if (who->more == NULL
418#ifdef COZY_SERVER
419 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 433 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
420#else
421 && owner == pusher 434 || owner == pusher)
422#endif
423 ) 435 )
424 { 436 {
425 int temp; 437 int temp;
426 mapstruct *m; 438 maptile *m;
427 439
428 remove_ob (who); 440 who->remove ();
429 remove_ob (pusher); 441 pusher->remove ();
430 temp = pusher->x; 442 temp = pusher->x;
431 pusher->x = who->x; 443 pusher->x = who->x;
432 who->x = temp; 444 who->x = temp;
433 445
434 temp = pusher->y; 446 temp = pusher->y;
… …
441 453
442 insert_ob_in_map (who, who->map, pusher, 0); 454 insert_ob_in_map (who, who->map, pusher, 0);
443 insert_ob_in_map (pusher, pusher->map, pusher, 0); 455 insert_ob_in_map (pusher, pusher->map, pusher, 0);
444 return 0; 456 return 0;
445 } 457 }
446
447 458
448 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 459 /* 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 */ 460 /* In original we have here a unaggressive check only - that was the reason why */
450 /* we so often become an enemy of friendly monsters... */ 461 /* we so often become an enemy of friendly monsters... */
451 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 462 /* 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 && 463 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
454 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 464 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
455 { 465 {
456 if (pusher->contr->run_on) /* only when we run */ 466 if (pusher->contr->run_on) /* only when we run */
457 { 467 {
458 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 468 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 */ 469 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
460 who->enemy = pusher; 470 who->enemy = pusher;
461 return 1; 471 return 1;
462 } 472 }
463 else 473 else
464 {
465 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 474 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
466 }
467 } 475 }
468 476
469 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 477 /* now, lets test stand still. we NEVER can push stand_still monsters. */
470 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 478 if (QUERY_FLAG (who, FLAG_STAND_STILL))
471 { 479 {
… …
481 */ 489 */
482 490
483 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 491 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
484 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 492 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
485 if (QUERY_FLAG (who, FLAG_WIZ) || 493 if (QUERY_FLAG (who, FLAG_WIZ) ||
486 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 494 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
487 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 495 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
488 { 496 {
489 if (who->type == PLAYER) 497 if (who->type == PLAYER)
490 {
491 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 498 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
492 } 499
493 return 0; 500 return 0;
494 } 501 }
495 502
496 /* If we get here, the push succeeded. 503 /* If we get here, the push succeeded.
497 * Let everyone know the status. 504 * Let everyone know the status.

Diff Legend

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