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.13 by root, Thu Jan 4 16:19:32 2007 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
126 if (m != op->map && op->contr) 119 if (m != map && contr)
127 { 120 {
128 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 121 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
129 return 0; 122 return 0;
130 123
131 op->remove (); 124 remove ();
132 125
133 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
134 return 0; 127 return 0;
135 128
136 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 129 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (contr), ARG_INT (newx), ARG_INT (newy)))
137 return 0; 130 return 0;
138 } 131 }
139 else 132 else
140 op->remove (); 133 remove ();
141 134
142 /* we already have newx, newy, and m, so lets use them.
143 * In addition, this fixes potential crashes, because multipart object was
144 * on edge of map, +=x, +=y doesn't make correct coordinates.
145 */
146 for (tmp = op; tmp != NULL; tmp = tmp->more) 135 for (tmp = this; tmp; tmp = tmp->more)
147 { 136 {
148 tmp->x += freearr_x[dir]; 137 tmp->x += freearr_x[dir];
149 tmp->y += freearr_y[dir]; 138 tmp->y += freearr_y[dir];
150 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y); 139 xy_normalise (tmp->map, tmp->x, tmp->y);
151 } 140 }
152 141
153 /* insert_ob_in_map will deal with any tiling issues */ 142 /* insert_ob_in_map will deal with any tiling issues */
154 insert_ob_in_map (op, m, originator, 0); 143 insert_ob_in_map (this, map, originator, 0);
155 144
156 return 1; 145 return 1;
157} 146}
158 147
159 148
… …
181 i = find_first_free_spot (op, op->map, x, y); 170 i = find_first_free_spot (op, op->map, x, y);
182 171
183 if (i == -1) 172 if (i == -1)
184 return 0; /* No free spot */ 173 return 0; /* No free spot */
185 174
186 if (op->head != NULL)
187 op = op->head; 175 op = op->head_ ();
188 op->remove (); 176 op->remove ();
177
189 for (tmp = op; tmp != NULL; tmp = tmp->more) 178 for (object *tmp = op; tmp; tmp = tmp->more)
179 {
190 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);
191 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 }
192 183
193 tmp = insert_ob_in_map (op, op->map, originator, 0); 184 op = insert_ob_in_map (op, op->map, originator, 0);
194 if (tmp) 185
195 return 0; 186 return !op;
196 else
197 return 1;
198} 187}
199 188
200/* 189/*
201 * Return value: 1 if object was destroyed, 0 otherwise. 190 * Return value: 1 if object was destroyed, 0 otherwise.
202 * Modified so that instead of passing the 'originator' that had no 191 * Modified so that instead of passing the 'originator' that had no
… …
230 for (i = -5; i < 6; i++) 219 for (i = -5; i < 6; i++)
231 for (j = -5; j < 6; j++) 220 for (j = -5; j < 6; j++)
232 { 221 {
233 if (i == 0 && j == 0) 222 if (i == 0 && j == 0)
234 continue; 223 continue;
224
235 /* Perhaps this should be extended to support tiled maps */ 225 /* Perhaps this should be extended to support tiled maps */
236 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))
237 continue; 227 continue;
228
238 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);
239 230
240 while (other_teleporter) 231 while (other_teleporter)
241 { 232 {
242 if (other_teleporter->type == tele_type) 233 if (other_teleporter->type == tele_type)
243 break; 234 break;
244 other_teleporter = other_teleporter->above; 235 other_teleporter = other_teleporter->above;
245 } 236 }
237
246 if (other_teleporter && !(RANDOM () % ++nrofalt)) 238 if (other_teleporter && !rndm (++nrofalt))
247 altern = other_teleporter; 239 altern = other_teleporter;
248 } 240 }
249 241
250 if (!nrofalt) 242 if (!nrofalt)
251 { 243 {
252 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 ());
253 return 0; 246 return 0;
254 } 247 }
255 248
256 other_teleporter = altern; 249 other_teleporter = altern;
257 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);
… …
289 } 282 }
290 283
291 user->remove (); 284 user->remove ();
292 285
293 /* Update location for the object */ 286 /* Update location for the object */
294 for (tmp = user; tmp != NULL; tmp = tmp->more) 287 for (tmp = user; tmp; tmp = tmp->more)
295 { 288 {
296 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);
297 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);
298 } 291 }
292
299 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
300 return (tmp == NULL); 294 return !tmp;
301} 295}
302 296
303void 297void
304recursive_roll (object *op, int dir, object *pusher) 298recursive_roll (object *op, int dir, object *pusher)
305{ 299{
… …
378 op = op->head; 372 op = op->head;
379 373
380 x = op->x + freearr_x[dir]; 374 x = op->x + freearr_x[dir];
381 y = op->y + freearr_y[dir]; 375 y = op->y + freearr_y[dir];
382 376
383 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))
384 return 0; 380 return 0;
385 381
386 m = op->map; 382 m = op->map;
387 flags = get_map_flags (m, &m, x, y, &x, &y); 383 flags = get_map_flags (m, &m, x, y, &x, &y);
388 384
… …
427 CLEAR_FLAG (who, FLAG_SLEEP); 423 CLEAR_FLAG (who, FLAG_SLEEP);
428 424
429 /* player change place with his pets or summoned creature */ 425 /* player change place with his pets or summoned creature */
430 /* TODO: allow multi arch pushing. Can't be very difficult */ 426 /* TODO: allow multi arch pushing. Can't be very difficult */
431 if (who->more == NULL 427 if (who->more == NULL
432#ifdef COZY_SERVER
433 && ((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))
434#else
435 && owner == pusher 429 || owner == pusher)
436#endif
437 ) 430 )
438 { 431 {
439 int temp; 432 int temp;
440 maptile *m; 433 maptile *m;
441 434
… …
456 insert_ob_in_map (who, who->map, pusher, 0); 449 insert_ob_in_map (who, who->map, pusher, 0);
457 insert_ob_in_map (pusher, pusher->map, pusher, 0); 450 insert_ob_in_map (pusher, pusher->map, pusher, 0);
458 return 0; 451 return 0;
459 } 452 }
460 453
461
462 /* 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 */
463 /* 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 */
464 /* we so often become an enemy of friendly monsters... */ 456 /* we so often become an enemy of friendly monsters... */
465 /* 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 */
466
467 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 458 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
468 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 459 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
469 { 460 {
470 if (pusher->contr->run_on) /* only when we run */ 461 if (pusher->contr->run_on) /* only when we run */
471 { 462 {
472 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);
473 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 */
474 who->enemy = pusher; 465 who->enemy = pusher;
475 return 1; 466 return 1;
476 } 467 }
477 else 468 else
478 {
479 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);
480 }
481 } 470 }
482 471
483 /* 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. */
484 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 473 if (QUERY_FLAG (who, FLAG_STAND_STILL))
485 { 474 {
… …
495 */ 484 */
496 485
497 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 486 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
498 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 487 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
499 if (QUERY_FLAG (who, FLAG_WIZ) || 488 if (QUERY_FLAG (who, FLAG_WIZ) ||
500 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 489 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
501 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))
502 { 491 {
503 if (who->type == PLAYER) 492 if (who->type == PLAYER)
504 {
505 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);
506 } 494
507 return 0; 495 return 0;
508 } 496 }
509 497
510 /* If we get here, the push succeeded. 498 /* If we get here, the push succeeded.
511 * Let everyone know the status. 499 * Let everyone know the status.

Diff Legend

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