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.29 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.32 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 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 op->move (dir); 40 return op->move (dir);
41} 41}
… …
58int 58int
59object::move (int dir, object *originator) 59object::move (int dir, object *originator)
60{ 60{
61 sint16 newx = x + freearr_x[dir]; 61 sint16 newx = x + freearr_x[dir];
62 sint16 newy = y + freearr_y[dir]; 62 sint16 newy = y + freearr_y[dir];
63 object *tmp;
64 maptile *m;
65 int mflags;
66 63
67 m = map; 64 mapxy pos (this);
68 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy); 65 pos.move (dir);
69 66
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 (this, m, newx, newy) && !flag [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 (more && !more->move (dir, more->head))
87 return 0;
88
89 direction = dir; 87 direction = dir;
90 88
91 if (will_apply & 4) 89 if (will_apply & 4)
92 check_earthwalls (this, m, newx, newy); 90 check_earthwalls (this, pos.m, pos.x, pos.y);
93 91
94 if (will_apply & 8) 92 if (will_apply & 8)
95 check_doors (this, 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 if (flag [FLAG_REMOVED])//D remove or fix?
107 {
108 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
109 /* Was not successful, but don't want to try and move again */
110 return 1;
111 }
112 94
113 /* 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
114 * ok - the caller will deal with actual object removal/insertion 96 * ok - the caller will deal with actual object removal/insertion
115 */ 97 */
116 if (head) 98 if (head)
117 return 1; 99 return 1;
118 100
119 if (m != map && contr) 101 if (pos.m != map && contr)
120 { 102 {
121 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 103 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
122 return 0; 104 return 0;
123 105
124 remove (); 106 remove ();
125 107
126 if (INVOKE_PLAYER (MAP_CHANGE, 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)))
127 return 0; 109 return 0;
128 110
129 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (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)))
130 return 0; 112 return 0;
131 } 113 }
132 else
133 remove ();
134
135 for (tmp = this; tmp; tmp = tmp->more)
136 {
137 tmp->x += freearr_x[dir];
138 tmp->y += freearr_y[dir];
139 xy_normalise (tmp->map, tmp->x, tmp->y);
140 }
141 114
142 /* insert_ob_in_map will deal with any tiling issues */ 115 /* insert_ob_in_map will deal with any tiling issues */
143 insert_ob_in_map (this, map, originator, 0); 116 pos.insert (this, originator);
144 117
145 return 1; 118 return 1;
146} 119}
147
148 120
149/* 121/*
150 * transfer_ob(): Move an object (even linked objects) to another spot 122 * transfer_ob(): Move an object (even linked objects) to another spot
151 * on the same map. 123 * on the same map.
152 * 124 *
… …
175 op = op->head_ (); 147 op = op->head_ ();
176 op->remove (); 148 op->remove ();
177 149
178 for (object *tmp = op; tmp; tmp = tmp->more) 150 for (object *tmp = op; tmp; tmp = tmp->more)
179 { 151 {
180 tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x); 152 tmp->x = x + freearr_x[i] + tmp->arch->x;
181 tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y); 153 tmp->y = y + freearr_y[i] + tmp->arch->y;
182 } 154 }
183 155
184 op = insert_ob_in_map (op, op->map, originator, 0); 156 op = insert_ob_in_map (op, op->map, originator, 0);
185 157
186 return !op; 158 return !op;
… …
199 * one of another type. 171 * one of another type.
200 */ 172 */
201int 173int
202teleport (object *teleporter, uint8 tele_type, object *user) 174teleport (object *teleporter, uint8 tele_type, object *user)
203{ 175{
204 object *altern; 176 if (!user)
205 int i, j, k, nrofalt = 0; 177 return 0;
178
206 object *other_teleporter, *tmp; 179 object *other_teleporter = 0;
207 maptile *m; 180 int nrofalt = 0;
208 sint16 sx, sy;
209 181
210 if (user == NULL)
211 return 0;
212 if (user->head != NULL)
213 user = user->head; 182 user = user->head_ ();
214 183
215 /* Find all other teleporters within range. This range 184 /* Find all other teleporters within range. This range
216 * should really be setable by some object attribute instead of 185 * should really be setable by some object attribute instead of
217 * using hard coded values. 186 * using hard coded values.
218 */ 187 */
219 for (i = -5; i < 6; i++) 188 unordered_mapwalk (teleporter, -5, -5, 5, 5)
220 for (j = -5; j < 6; j++)
221 { 189 {
222 if (i == 0 && j == 0) 190 mapspace &ms = m->at (nx, ny);
223 continue;
224 191
225 /* Perhaps this should be extended to support tiled maps */ 192 for (object *tmp = ms.top; tmp; tmp = tmp->below)
226 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 193 if (tmp->type == tele_type)
227 continue;
228
229 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
230
231 while (other_teleporter)
232 { 194 {
233 if (other_teleporter->type == tele_type) 195 if ((dx || dy) && !rndm (++nrofalt))
196 other_teleporter = tmp;
197
234 break; 198 break;
235 other_teleporter = other_teleporter->above;
236 } 199 }
237
238 if (other_teleporter && !rndm (++nrofalt))
239 altern = other_teleporter;
240 } 200 }
241 201
242 if (!nrofalt) 202 if (!nrofalt)
243 { 203 {
244 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 204 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
245 teleporter->debug_desc (), user->debug_desc ()); 205 teleporter->debug_desc (), user->debug_desc ());
246 return 0; 206 return 0;
247 } 207 }
248 208
249 other_teleporter = altern;
250 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);
251 210
252 /* 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
253 * mat that the player is using, find someplace to move 212 * mat that the player is using, find someplace to move
254 * the player - otherwise, player can get trapped in the shops 213 * the player - otherwise, player can get trapped in the shops
255 * that appear in random dungeons. We basically just make 214 * that appear in random dungeons. We basically just make
256 * 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
257 * about is alive. 216 * about is alive.
258 */ 217 */
259 if (k == -1) 218 if (k == -1)
260 { 219 {
261 if (tele_type == SHOP_MAT && user->type == PLAYER) 220 if (tele_type == SHOP_MAT && user->is_player ())
262 { 221 {
263 for (k = 1; k < 9; k++) 222 for (k = 1; k < 9; k++)
264 { 223 {
224 maptile *m;
225 sint16 sx, sy;
226
265 if (get_map_flags (other_teleporter->map, &m, 227 if (get_map_flags (other_teleporter->map, &m,
266 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)
267 continue; 229 continue;
268 230
269 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)))
270 break; 232 break;
271
272 } 233 }
234
273 if (k == 9) 235 if (k == 9)
274 { 236 {
275 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",
276 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 238 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
277 return 0; 239 return 0;
… …
279 } 241 }
280 else 242 else
281 return 0; 243 return 0;
282 } 244 }
283 245
284 user->remove (); 246 return !other_teleporter->map->insert (
285 247 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
286 /* Update location for the object */ 248 );
287 for (tmp = user; tmp; tmp = tmp->more)
288 {
289 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
290 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
291 }
292
293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
294 return !tmp;
295} 249}
296 250
297void 251void
298recursive_roll (object *op, int dir, object *pusher) 252recursive_roll (object *op, int dir, object *pusher)
299{ 253{
300 if (!roll_ob (op, dir, pusher)) 254 if (!roll_ob (op, dir, pusher))
301 { 255 {
302 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));
303 return; 257 return;
304 } 258 }
259
305 (void) move_ob (pusher, dir, pusher); 260 move_ob (pusher, dir, pusher);
306 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));
307 return; 262 return;
308} 263}
309 264
310/* 265/*
… …
356/* 311/*
357 * this is not perfect yet. 312 * this is not perfect yet.
358 * it does not roll objects behind multipart objects properly. 313 * it does not roll objects behind multipart objects properly.
359 * Support for rolling multipart objects is questionable. 314 * Support for rolling multipart objects is questionable.
360 */ 315 */
361
362int 316int
363roll_ob (object *op, int dir, object *pusher) 317roll_ob (object *op, int dir, object *pusher)
364{ 318{
365 object *tmp;
366 sint16 x, y; 319 sint16 x, y;
367 int flags; 320 int flags;
368 maptile *m; 321 maptile *m;
369 MoveType move_block; 322 MoveType move_block;
370 323
… …
388 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 341 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
389 342
390 /* 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 */
391 if ((op->move_type & move_block) == op->move_type) 344 if ((op->move_type & move_block) == op->move_type)
392 { 345 {
393 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)
394 { 347 {
395 if (tmp->head == op) 348 if (tmp->head == op)
396 continue; 349 continue;
350
397 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 351 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
398 return 0; 352 return 0;
399 } 353 }
400 } 354 }
355
401 if (try_fit (op, m, x, y)) 356 if (try_fit (op, m, x, y))
402 return 0; 357 return 0;
403 358
404 op->remove (); 359 op->move (dir);
405 for (tmp = op; tmp != NULL; tmp = tmp->more) 360
406 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
407 insert_ob_in_map (op, op->map, pusher, 0);
408 return 1; 361 return 1;
409} 362}
410 363
411/* returns 1 if pushing invokes a attack, 0 when not */ 364/* returns 1 if pushing invokes a attack, 0 when not */
412int 365int
… …
446 pusher->map = who->map; 399 pusher->map = who->map;
447 who->map = m; 400 who->map = m;
448 401
449 insert_ob_in_map (who, who->map, pusher, 0); 402 insert_ob_in_map (who, who->map, pusher, 0);
450 insert_ob_in_map (pusher, pusher->map, pusher, 0); 403 insert_ob_in_map (pusher, pusher->map, pusher, 0);
404
451 return 0; 405 return 0;
452 } 406 }
453 407
454 /* 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 */
455 /* 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