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.21 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.31 by root, Wed Sep 2 22:52:36 2009 UTC

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

Diff Legend

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