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.23 by root, Fri Nov 16 04:18:10 2007 UTC vs.
Revision 1.32 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
31 * If it fails (something blocks the passage), it returns 0, 32 * If it fails (something blocks the passage), it returns 0,
32 * otherwise 1. 33 * otherwise 1.
33 * This is an improvement from the previous move_ob(), which 34 * This is an improvement from the previous move_ob(), which
34 * removed and inserted objects even if they were unable to move. 35 * removed and inserted objects even if they were unable to move.
35 */ 36 */
36
37int 37int
38move_object (object *op, int dir) 38move_object (object *op, int dir)
39{ 39{
40 return move_ob (op, dir, op); 40 return op->move (dir);
41} 41}
42 42
43/* object op is trying to move in direction dir. 43/* object op is trying to move in direction dir.
44 * originator is typically the same as op, but 44 * originator is typically the same as op, but
45 * can be different if originator is causing op to 45 * can be different if originator is causing op to
… …
50 * very similiar to move_object. 50 * very similiar to move_object.
51 */ 51 */
52int 52int
53move_ob (object *op, int dir, object *originator) 53move_ob (object *op, int dir, object *originator)
54{ 54{
55 return op->move (dir, originator);
56}
57
58int
59object::move (int dir, object *originator)
60{
55 sint16 newx = op->x + freearr_x[dir]; 61 sint16 newx = x + freearr_x[dir];
56 sint16 newy = op->y + freearr_y[dir]; 62 sint16 newy = y + freearr_y[dir];
57 object *tmp;
58 maptile *m;
59 int mflags;
60 63
61 if (op == NULL) 64 mapxy pos (this);
62 { 65 pos.move (dir);
63 LOG (llevError, "Trying to move NULL.\n");
64 return 0;
65 }
66 66
67 m = op->map;
68 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
69
70 /* If the space the player is trying to is out of the map, 67 /* If the space the object is moving to is out of the map,
71 * bail now - we know it can't work. 68 * bail now - we know it can't work.
72 */ 69 */
73 if (mflags & P_OUT_OF_MAP) 70 if (!pos.normalise ())
74 return 0; 71 return 0;
75 72
76 /* Is this space blocked? Players with wizpass are immune to 73 /* Is this space blocked? Players with wizpass are immune to
77 * this condition. 74 * this condition.
78 */ 75 */
79 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 76 if (blocked_link (this, pos.m, pos.x, pos.y) && !flag [FLAG_WIZPASS])
80 return 0; 77 return 0;
81 78
79 // check tail movability
80 if (more && !more->move (dir, more->head))
81 return 0;
82
82 /* 0.94.2 - we need to set the direction for the new animation code. 83 /* we need to set the direction for the new animation code.
83 * 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
84 * breaking anything, but it might. 85 * breaking anything, but it might.
85 */ 86 */
86 if (op->more && !move_ob (op->more, dir, op->more->head))
87 return 0;
88
89 op->direction = dir; 87 direction = dir;
90 88
91 if (op->will_apply & 4) 89 if (will_apply & 4)
92 check_earthwalls (op, m, newx, newy); 90 check_earthwalls (this, pos.m, pos.x, pos.y);
93 91
94 if (op->will_apply & 8) 92 if (will_apply & 8)
95 check_doors (op, m, newx, newy); 93 check_doors (this, pos.m, pos.x, pos.y);
96
97 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
98 * to remove a removed object, and this function was the culprit. A possible
99 * guess I have is that check_doors above ran into a trap, killing the
100 * monster.
101 *
102 * Unfortunately, it doesn't appear that the calling functions of move_object
103 * deal very well with op being killed, so all this might do is just
104 * migrate the problem someplace else.
105 */
106
107 if (QUERY_FLAG (op, FLAG_REMOVED))
108 {
109 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
110 /* Was not successful, but don't want to try and move again */
111 return 1;
112 }
113 94
114 /* If this is a tail portion, just want to tell caller that move is 95 /* If this is a tail portion, just want to tell caller that move is
115 * ok - the caller will deal with actual object removal/insertion 96 * ok - the caller will deal with actual object removal/insertion
116 */ 97 */
117 if (op->head) 98 if (head)
118 return 1; 99 return 1;
119 100
120 if (m != op->map && op->contr) 101 if (pos.m != map && contr)
121 { 102 {
122 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 103 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
123 return 0; 104 return 0;
124 105
125 op->remove (); 106 remove ();
126 107
127 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 108 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
128 return 0; 109 return 0;
129 110
130 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 111 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
131 return 0; 112 return 0;
132 } 113 }
133 else
134 op->remove ();
135
136 /* we already have newx, newy, and m, so lets use them.
137 * In addition, this fixes potential crashes, because multipart object was
138 * on edge of map, +=x, +=y doesn't make correct coordinates.
139 */
140 for (tmp = op; tmp != NULL; tmp = tmp->more)
141 {
142 tmp->x += freearr_x[dir];
143 tmp->y += freearr_y[dir];
144 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
145 }
146 114
147 /* insert_ob_in_map will deal with any tiling issues */ 115 /* insert_ob_in_map will deal with any tiling issues */
148 insert_ob_in_map (op, m, originator, 0); 116 pos.insert (this, originator);
149 117
150 return 1; 118 return 1;
151} 119}
152
153 120
154/* 121/*
155 * transfer_ob(): Move an object (even linked objects) to another spot 122 * transfer_ob(): Move an object (even linked objects) to another spot
156 * on the same map. 123 * on the same map.
157 * 124 *
… …
175 i = find_first_free_spot (op, op->map, x, y); 142 i = find_first_free_spot (op, op->map, x, y);
176 143
177 if (i == -1) 144 if (i == -1)
178 return 0; /* No free spot */ 145 return 0; /* No free spot */
179 146
180 if (op->head != NULL)
181 op = op->head; 147 op = op->head_ ();
182 op->remove (); 148 op->remove ();
149
183 for (tmp = op; tmp != NULL; tmp = tmp->more) 150 for (object *tmp = op; tmp; tmp = tmp->more)
184 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x), 151 {
152 tmp->x = x + freearr_x[i] + tmp->arch->x;
185 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y); 153 tmp->y = y + freearr_y[i] + tmp->arch->y;
154 }
186 155
187 tmp = insert_ob_in_map (op, op->map, originator, 0); 156 op = insert_ob_in_map (op, op->map, originator, 0);
188 if (tmp) 157
189 return 0; 158 return !op;
190 else
191 return 1;
192} 159}
193 160
194/* 161/*
195 * Return value: 1 if object was destroyed, 0 otherwise. 162 * Return value: 1 if object was destroyed, 0 otherwise.
196 * Modified so that instead of passing the 'originator' that had no 163 * Modified so that instead of passing the 'originator' that had no
… …
204 * one of another type. 171 * one of another type.
205 */ 172 */
206int 173int
207teleport (object *teleporter, uint8 tele_type, object *user) 174teleport (object *teleporter, uint8 tele_type, object *user)
208{ 175{
209 object *altern; 176 if (!user)
210 int i, j, k, nrofalt = 0; 177 return 0;
178
211 object *other_teleporter, *tmp; 179 object *other_teleporter = 0;
212 maptile *m; 180 int nrofalt = 0;
213 sint16 sx, sy;
214 181
215 if (user == NULL)
216 return 0;
217 if (user->head != NULL)
218 user = user->head; 182 user = user->head_ ();
219 183
220 /* Find all other teleporters within range. This range 184 /* Find all other teleporters within range. This range
221 * should really be setable by some object attribute instead of 185 * should really be setable by some object attribute instead of
222 * using hard coded values. 186 * using hard coded values.
223 */ 187 */
224 for (i = -5; i < 6; i++) 188 unordered_mapwalk (teleporter, -5, -5, 5, 5)
225 for (j = -5; j < 6; j++)
226 { 189 {
227 if (i == 0 && j == 0) 190 mapspace &ms = m->at (nx, ny);
228 continue;
229 /* Perhaps this should be extended to support tiled maps */
230 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
231 continue;
232 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
233 191
234 while (other_teleporter) 192 for (object *tmp = ms.top; tmp; tmp = tmp->below)
193 if (tmp->type == tele_type)
235 { 194 {
236 if (other_teleporter->type == tele_type) 195 if ((dx || dy) && !rndm (++nrofalt))
196 other_teleporter = tmp;
197
237 break; 198 break;
238 other_teleporter = other_teleporter->above;
239 } 199 }
240 if (other_teleporter && !(RANDOM () % ++nrofalt))
241 altern = other_teleporter;
242 } 200 }
243 201
244 if (!nrofalt) 202 if (!nrofalt)
245 { 203 {
246 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 204 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
247 teleporter->debug_desc (), user->debug_desc ()); 205 teleporter->debug_desc (), user->debug_desc ());
248 return 0; 206 return 0;
249 } 207 }
250 208
251 other_teleporter = altern;
252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 209 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
253 210
254 /* if k==-1, unable to find a free spot. If this is shop 211 /* if k==-1, unable to find a free spot. If this is shop
255 * mat that the player is using, find someplace to move 212 * mat that the player is using, find someplace to move
256 * the player - otherwise, player can get trapped in the shops 213 * the player - otherwise, player can get trapped in the shops
257 * that appear in random dungeons. We basically just make 214 * that appear in random dungeons. We basically just make
258 * sure the space isn't no pass (eg wall), and don't care 215 * sure the space isn't no pass (eg wall), and don't care
259 * about is alive. 216 * about is alive.
260 */ 217 */
261 if (k == -1) 218 if (k == -1)
262 { 219 {
263 if (tele_type == SHOP_MAT && user->type == PLAYER) 220 if (tele_type == SHOP_MAT && user->is_player ())
264 { 221 {
265 for (k = 1; k < 9; k++) 222 for (k = 1; k < 9; k++)
266 { 223 {
224 maptile *m;
225 sint16 sx, sy;
226
267 if (get_map_flags (other_teleporter->map, &m, 227 if (get_map_flags (other_teleporter->map, &m,
268 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP) 228 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
269 continue; 229 continue;
270 230
271 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy))) 231 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
272 break; 232 break;
273
274 } 233 }
234
275 if (k == 9) 235 if (k == 9)
276 { 236 {
277 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n", 237 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n",
278 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 238 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
279 return 0; 239 return 0;
… …
281 } 241 }
282 else 242 else
283 return 0; 243 return 0;
284 } 244 }
285 245
286 user->remove (); 246 return !other_teleporter->map->insert (
287 247 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
288 /* Update location for the object */ 248 );
289 for (tmp = user; tmp != NULL; tmp = tmp->more)
290 {
291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x);
292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
293 }
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL);
296} 249}
297 250
298void 251void
299recursive_roll (object *op, int dir, object *pusher) 252recursive_roll (object *op, int dir, object *pusher)
300{ 253{
301 if (!roll_ob (op, dir, pusher)) 254 if (!roll_ob (op, dir, pusher))
302 { 255 {
303 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); 256 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
304 return; 257 return;
305 } 258 }
259
306 (void) move_ob (pusher, dir, pusher); 260 move_ob (pusher, dir, pusher);
307 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); 261 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
308 return; 262 return;
309} 263}
310 264
311/* 265/*
… …
357/* 311/*
358 * this is not perfect yet. 312 * this is not perfect yet.
359 * it does not roll objects behind multipart objects properly. 313 * it does not roll objects behind multipart objects properly.
360 * Support for rolling multipart objects is questionable. 314 * Support for rolling multipart objects is questionable.
361 */ 315 */
362
363int 316int
364roll_ob (object *op, int dir, object *pusher) 317roll_ob (object *op, int dir, object *pusher)
365{ 318{
366 object *tmp;
367 sint16 x, y; 319 sint16 x, y;
368 int flags; 320 int flags;
369 maptile *m; 321 maptile *m;
370 MoveType move_block; 322 MoveType move_block;
371 323
… …
373 op = op->head; 325 op = op->head;
374 326
375 x = op->x + freearr_x[dir]; 327 x = op->x + freearr_x[dir];
376 y = op->y + freearr_y[dir]; 328 y = op->y + freearr_y[dir];
377 329
378 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 330 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
331 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
332 > pusher->stats.Str))
379 return 0; 333 return 0;
380 334
381 m = op->map; 335 m = op->map;
382 flags = get_map_flags (m, &m, x, y, &x, &y); 336 flags = get_map_flags (m, &m, x, y, &x, &y);
383 337
… …
387 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 341 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
388 342
389 /* If the target space is not blocked, no need to look at the objects on it */ 343 /* If the target space is not blocked, no need to look at the objects on it */
390 if ((op->move_type & move_block) == op->move_type) 344 if ((op->move_type & move_block) == op->move_type)
391 { 345 {
392 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 346 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
393 { 347 {
394 if (tmp->head == op) 348 if (tmp->head == op)
395 continue; 349 continue;
350
396 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 351 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
397 return 0; 352 return 0;
398 } 353 }
399 } 354 }
355
400 if (try_fit (op, m, x, y)) 356 if (try_fit (op, m, x, y))
401 return 0; 357 return 0;
402 358
403 op->remove (); 359 op->move (dir);
404 for (tmp = op; tmp != NULL; tmp = tmp->more) 360
405 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
406 insert_ob_in_map (op, op->map, pusher, 0);
407 return 1; 361 return 1;
408} 362}
409 363
410/* returns 1 if pushing invokes a attack, 0 when not */ 364/* returns 1 if pushing invokes a attack, 0 when not */
411int 365int
… …
445 pusher->map = who->map; 399 pusher->map = who->map;
446 who->map = m; 400 who->map = m;
447 401
448 insert_ob_in_map (who, who->map, pusher, 0); 402 insert_ob_in_map (who, who->map, pusher, 0);
449 insert_ob_in_map (pusher, pusher->map, pusher, 0); 403 insert_ob_in_map (pusher, pusher->map, pusher, 0);
404
450 return 0; 405 return 0;
451 } 406 }
452 407
453 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 408 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
454 /* In original we have here a unaggressive check only - that was the reason why */ 409 /* In original we have here a unaggressive check only - that was the reason why */

Diff Legend

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