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.12 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.29 by root, Sun Dec 28 06:59:27 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,
… …
40 */ 35 */
41 36
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 op->move (dir);
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)
… …
56 * very similiar to move_object. 50 * very similiar to move_object.
57 */ 51 */
58int 52int
59move_ob (object *op, int dir, object *originator) 53move_ob (object *op, int dir, object *originator)
60{ 54{
55 return op->move (dir, originator);
56}
57
58int
59object::move (int dir, object *originator)
60{
61 sint16 newx = op->x + freearr_x[dir]; 61 sint16 newx = x + freearr_x[dir];
62 sint16 newy = op->y + freearr_y[dir]; 62 sint16 newy = y + freearr_y[dir];
63 object *tmp; 63 object *tmp;
64 maptile *m; 64 maptile *m;
65 int mflags; 65 int mflags;
66 66
67 if (op == NULL)
68 {
69 LOG (llevError, "Trying to move NULL.\n");
70 return 0;
71 }
72
73 m = op->map; 67 m = map;
74 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy); 68 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
75 69
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 */
… …
80 return 0; 74 return 0;
81 75
82 /* Is this space blocked? Players with wizpass are immune to 76 /* Is this space blocked? Players with wizpass are immune to
83 * this condition. 77 * this condition.
84 */ 78 */
85 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 79 if (blocked_link (this, m, newx, newy) && !flag [FLAG_WIZPASS])
86 return 0; 80 return 0;
87 81
88 /* 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.
89 * 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
90 * breaking anything, but it might. 84 * breaking anything, but it might.
91 */ 85 */
92 if (op->more && !move_ob (op->more, dir, op->more->head)) 86 if (more && !more->move (dir, more->head))
93 return 0; 87 return 0;
94 88
95 op->direction = dir; 89 direction = dir;
96 90
97 if (op->will_apply & 4) 91 if (will_apply & 4)
98 check_earthwalls (op, m, newx, newy); 92 check_earthwalls (this, m, newx, newy);
99 93
100 if (op->will_apply & 8) 94 if (will_apply & 8)
101 check_doors (op, m, newx, newy); 95 check_doors (this, 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
105 * guess I have is that check_doors above ran into a trap, killing the 99 * guess I have is that check_doors above ran into a trap, killing the
106 * monster. 100 * monster.
107 * 101 *
108 * Unfortunately, it doesn't appear that the calling functions of move_object 102 * Unfortunately, it doesn't appear that the calling functions of move_object
109 * deal very well with op being killed, so all this might do is just 103 * deal very well with op being killed, so all this might do is just
110 * migrate the problem someplace else. 104 * migrate the problem someplace else.
111 */ 105 */
112 106 if (flag [FLAG_REMOVED])//D remove or fix?
113 if (QUERY_FLAG (op, FLAG_REMOVED))
114 { 107 {
115 LOG (llevDebug, "move_object: monster has been removed - will not process further\n"); 108 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
116 /* Was not successful, but don't want to try and move again */ 109 /* Was not successful, but don't want to try and move again */
117 return 1; 110 return 1;
118 } 111 }
119 112
120 /* If this is a tail portion, just want to tell caller that move is 113 /* If this is a tail portion, just want to tell caller that move is
121 * ok - the caller will deal with actual object removal/insertion 114 * ok - the caller will deal with actual object removal/insertion
122 */ 115 */
123 if (op->head) 116 if (head)
124 return 1; 117 return 1;
125 118
119 if (m != map && contr)
120 {
121 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
122 return 0;
123
124 remove ();
125
126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
127 return 0;
128
129 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (contr), ARG_INT (newx), ARG_INT (newy)))
130 return 0;
131 }
132 else
126 op->remove (); 133 remove ();
127 134
128 /* we already have newx, newy, and m, so lets use them.
129 * In addition, this fixes potential crashes, because multipart object was
130 * on edge of map, +=x, +=y doesn't make correct coordinates.
131 */
132 for (tmp = op; tmp != NULL; tmp = tmp->more) 135 for (tmp = this; tmp; tmp = tmp->more)
133 { 136 {
134 tmp->x += freearr_x[dir]; 137 tmp->x += freearr_x[dir];
135 tmp->y += freearr_y[dir]; 138 tmp->y += freearr_y[dir];
136 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y); 139 xy_normalise (tmp->map, tmp->x, tmp->y);
137 } 140 }
138 141
139 /* insert_ob_in_map will deal with any tiling issues */ 142 /* insert_ob_in_map will deal with any tiling issues */
140 insert_ob_in_map (op, m, originator, 0); 143 insert_ob_in_map (this, map, originator, 0);
141 144
142 return 1; 145 return 1;
143} 146}
144 147
145 148
… …
167 i = find_first_free_spot (op, op->map, x, y); 170 i = find_first_free_spot (op, op->map, x, y);
168 171
169 if (i == -1) 172 if (i == -1)
170 return 0; /* No free spot */ 173 return 0; /* No free spot */
171 174
172 if (op->head != NULL)
173 op = op->head; 175 op = op->head_ ();
174 op->remove (); 176 op->remove ();
177
175 for (tmp = op; tmp != NULL; tmp = tmp->more) 178 for (object *tmp = op; tmp; tmp = tmp->more)
179 {
176 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 180 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); 181 tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
182 }
178 183
179 tmp = insert_ob_in_map (op, op->map, originator, 0); 184 op = insert_ob_in_map (op, op->map, originator, 0);
180 if (tmp) 185
181 return 0; 186 return !op;
182 else
183 return 1;
184} 187}
185 188
186/* 189/*
187 * Return value: 1 if object was destroyed, 0 otherwise. 190 * Return value: 1 if object was destroyed, 0 otherwise.
188 * Modified so that instead of passing the 'originator' that had no 191 * Modified so that instead of passing the 'originator' that had no
… …
216 for (i = -5; i < 6; i++) 219 for (i = -5; i < 6; i++)
217 for (j = -5; j < 6; j++) 220 for (j = -5; j < 6; j++)
218 { 221 {
219 if (i == 0 && j == 0) 222 if (i == 0 && j == 0)
220 continue; 223 continue;
224
221 /* Perhaps this should be extended to support tiled maps */ 225 /* Perhaps this should be extended to support tiled maps */
222 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 226 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
223 continue; 227 continue;
228
224 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j); 229 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
225 230
226 while (other_teleporter) 231 while (other_teleporter)
227 { 232 {
228 if (other_teleporter->type == tele_type) 233 if (other_teleporter->type == tele_type)
229 break; 234 break;
230 other_teleporter = other_teleporter->above; 235 other_teleporter = other_teleporter->above;
231 } 236 }
237
232 if (other_teleporter && !(RANDOM () % ++nrofalt)) 238 if (other_teleporter && !rndm (++nrofalt))
233 altern = other_teleporter; 239 altern = other_teleporter;
234 } 240 }
235 241
236 if (!nrofalt) 242 if (!nrofalt)
237 { 243 {
238 LOG (llevError, "No alternative teleporters around!\n"); 244 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
245 teleporter->debug_desc (), user->debug_desc ());
239 return 0; 246 return 0;
240 } 247 }
241 248
242 other_teleporter = altern; 249 other_teleporter = altern;
243 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 250 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
… …
275 } 282 }
276 283
277 user->remove (); 284 user->remove ();
278 285
279 /* Update location for the object */ 286 /* Update location for the object */
280 for (tmp = user; tmp != NULL; tmp = tmp->more) 287 for (tmp = user; tmp; tmp = tmp->more)
281 { 288 {
282 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 289 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); 290 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
284 } 291 }
292
285 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
286 return (tmp == NULL); 294 return !tmp;
287} 295}
288 296
289void 297void
290recursive_roll (object *op, int dir, object *pusher) 298recursive_roll (object *op, int dir, object *pusher)
291{ 299{
… …
364 op = op->head; 372 op = op->head;
365 373
366 x = op->x + freearr_x[dir]; 374 x = op->x + freearr_x[dir];
367 y = op->y + freearr_y[dir]; 375 y = op->y + freearr_y[dir];
368 376
369 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 377 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
378 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
379 > pusher->stats.Str))
370 return 0; 380 return 0;
371 381
372 m = op->map; 382 m = op->map;
373 flags = get_map_flags (m, &m, x, y, &x, &y); 383 flags = get_map_flags (m, &m, x, y, &x, &y);
374 384
… …
413 CLEAR_FLAG (who, FLAG_SLEEP); 423 CLEAR_FLAG (who, FLAG_SLEEP);
414 424
415 /* player change place with his pets or summoned creature */ 425 /* player change place with his pets or summoned creature */
416 /* TODO: allow multi arch pushing. Can't be very difficult */ 426 /* TODO: allow multi arch pushing. Can't be very difficult */
417 if (who->more == NULL 427 if (who->more == NULL
418#ifdef COZY_SERVER
419 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 428 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
420#else
421 && owner == pusher 429 || owner == pusher)
422#endif
423 ) 430 )
424 { 431 {
425 int temp; 432 int temp;
426 maptile *m; 433 maptile *m;
427 434
… …
442 insert_ob_in_map (who, who->map, pusher, 0); 449 insert_ob_in_map (who, who->map, pusher, 0);
443 insert_ob_in_map (pusher, pusher->map, pusher, 0); 450 insert_ob_in_map (pusher, pusher->map, pusher, 0);
444 return 0; 451 return 0;
445 } 452 }
446 453
447
448 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 454 /* 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 */ 455 /* In original we have here a unaggressive check only - that was the reason why */
450 /* we so often become an enemy of friendly monsters... */ 456 /* we so often become an enemy of friendly monsters... */
451 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 457 /* 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 && 458 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
454 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 459 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
455 { 460 {
456 if (pusher->contr->run_on) /* only when we run */ 461 if (pusher->contr->run_on) /* only when we run */
457 { 462 {
458 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s !!", &who->name); 463 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 */ 464 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
460 who->enemy = pusher; 465 who->enemy = pusher;
461 return 1; 466 return 1;
462 } 467 }
463 else 468 else
464 {
465 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 469 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
466 }
467 } 470 }
468 471
469 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 472 /* now, lets test stand still. we NEVER can push stand_still monsters. */
470 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 473 if (QUERY_FLAG (who, FLAG_STAND_STILL))
471 { 474 {
… …
481 */ 484 */
482 485
483 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 486 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
484 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 487 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
485 if (QUERY_FLAG (who, FLAG_WIZ) || 488 if (QUERY_FLAG (who, FLAG_WIZ) ||
486 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 489 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
487 random_roll (str2, str2 / 2 + str2 * 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 490 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir))
488 { 491 {
489 if (who->type == PLAYER) 492 if (who->type == PLAYER)
490 {
491 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 493 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
492 } 494
493 return 0; 495 return 0;
494 } 496 }
495 497
496 /* If we get here, the push succeeded. 498 /* If we get here, the push succeeded.
497 * Let everyone know the status. 499 * Let everyone know the status.

Diff Legend

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