… | |
… | |
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 | |
|
|
37 | int |
36 | int |
38 | move_object (object *op, int dir) |
37 | move_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 | */ |
52 | int |
51 | int |
53 | move_ob (object *op, int dir, object *originator) |
52 | move_ob (object *op, int dir, object *originator) |
54 | { |
53 | { |
|
|
54 | return op->move (dir, originator); |
|
|
55 | } |
|
|
56 | |
|
|
57 | int |
|
|
58 | object::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 | * |
… | |
… | |
180 | op = op->head_ (); |
146 | op = op->head_ (); |
181 | op->remove (); |
147 | op->remove (); |
182 | |
148 | |
183 | for (object *tmp = op; tmp; tmp = tmp->more) |
149 | for (object *tmp = op; tmp; tmp = tmp->more) |
184 | { |
150 | { |
185 | tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x); |
151 | tmp->x = x + freearr_x[i] + tmp->arch->x; |
186 | tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y); |
152 | tmp->y = y + freearr_y[i] + tmp->arch->y; |
187 | } |
153 | } |
188 | |
154 | |
189 | op = insert_ob_in_map (op, op->map, originator, 0); |
155 | op = insert_ob_in_map (op, op->map, originator, 0); |
190 | |
156 | |
191 | return !op; |
157 | return !op; |
… | |
… | |
204 | * one of another type. |
170 | * one of another type. |
205 | */ |
171 | */ |
206 | int |
172 | int |
207 | teleport (object *teleporter, uint8 tele_type, object *user) |
173 | teleport (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 | |
190 | |
230 | /* Perhaps this should be extended to support tiled maps */ |
191 | for (object *tmp = ms.top; tmp; tmp = tmp->below) |
231 | if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) |
192 | if (tmp->type == tele_type) |
232 | continue; |
|
|
233 | |
|
|
234 | other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j); |
|
|
235 | |
|
|
236 | while (other_teleporter) |
|
|
237 | { |
193 | { |
238 | if (other_teleporter->type == tele_type) |
194 | if ((dx || dy) && !rndm (++nrofalt)) |
|
|
195 | other_teleporter = tmp; |
|
|
196 | |
239 | break; |
197 | break; |
240 | other_teleporter = other_teleporter->above; |
|
|
241 | } |
198 | } |
242 | |
|
|
243 | if (other_teleporter && !rndm (++nrofalt)) |
|
|
244 | altern = other_teleporter; |
|
|
245 | } |
199 | } |
246 | |
200 | |
247 | if (!nrofalt) |
201 | if (!nrofalt) |
248 | { |
202 | { |
249 | LOG (llevError, "%s: no alternative teleporters around (user %s).\n", |
203 | LOG (llevError, "%s: no alternative teleporters around (user %s).\n", |
250 | teleporter->debug_desc (), user->debug_desc ()); |
204 | teleporter->debug_desc (), user->debug_desc ()); |
251 | return 0; |
205 | return 0; |
252 | } |
206 | } |
253 | |
207 | |
254 | other_teleporter = altern; |
|
|
255 | 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); |
256 | |
209 | |
257 | /* 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 |
258 | * mat that the player is using, find someplace to move |
211 | * mat that the player is using, find someplace to move |
259 | * the player - otherwise, player can get trapped in the shops |
212 | * the player - otherwise, player can get trapped in the shops |
260 | * that appear in random dungeons. We basically just make |
213 | * that appear in random dungeons. We basically just make |
261 | * 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 |
262 | * about is alive. |
215 | * about is alive. |
263 | */ |
216 | */ |
264 | if (k == -1) |
217 | if (k == -1) |
265 | { |
218 | { |
266 | if (tele_type == SHOP_MAT && user->type == PLAYER) |
219 | if (tele_type == SHOP_MAT && user->is_player ()) |
267 | { |
220 | { |
268 | for (k = 1; k < 9; k++) |
221 | for (k = 1; k < 9; k++) |
269 | { |
222 | { |
|
|
223 | maptile *m; |
|
|
224 | sint16 sx, sy; |
|
|
225 | |
270 | if (get_map_flags (other_teleporter->map, &m, |
226 | if (get_map_flags (other_teleporter->map, &m, |
271 | 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) |
272 | continue; |
228 | continue; |
273 | |
229 | |
274 | 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))) |
275 | break; |
231 | break; |
276 | |
|
|
277 | } |
232 | } |
|
|
233 | |
278 | if (k == 9) |
234 | if (k == 9) |
279 | { |
235 | { |
280 | 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", |
281 | &other_teleporter->name, other_teleporter->x, other_teleporter->y); |
237 | &other_teleporter->name, other_teleporter->x, other_teleporter->y); |
282 | return 0; |
238 | return 0; |
… | |
… | |
284 | } |
240 | } |
285 | else |
241 | else |
286 | return 0; |
242 | return 0; |
287 | } |
243 | } |
288 | |
244 | |
289 | user->remove (); |
245 | return !other_teleporter->map->insert ( |
290 | |
246 | user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k] |
291 | /* Update location for the object */ |
247 | ); |
292 | for (tmp = user; tmp; tmp = tmp->more) |
|
|
293 | { |
|
|
294 | tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0); |
|
|
295 | tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0); |
|
|
296 | } |
|
|
297 | |
|
|
298 | tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); |
|
|
299 | return !tmp; |
|
|
300 | } |
248 | } |
301 | |
249 | |
302 | void |
250 | void |
303 | recursive_roll (object *op, int dir, object *pusher) |
251 | recursive_roll (object *op, int dir, object *pusher) |
304 | { |
252 | { |
… | |
… | |
361 | /* |
309 | /* |
362 | * this is not perfect yet. |
310 | * this is not perfect yet. |
363 | * it does not roll objects behind multipart objects properly. |
311 | * it does not roll objects behind multipart objects properly. |
364 | * Support for rolling multipart objects is questionable. |
312 | * Support for rolling multipart objects is questionable. |
365 | */ |
313 | */ |
366 | |
|
|
367 | int |
314 | int |
368 | roll_ob (object *op, int dir, object *pusher) |
315 | roll_ob (object *op, int dir, object *pusher) |
369 | { |
316 | { |
370 | object *tmp; |
|
|
371 | sint16 x, y; |
317 | sint16 x, y; |
372 | int flags; |
318 | int flags; |
373 | maptile *m; |
319 | maptile *m; |
374 | MoveType move_block; |
320 | MoveType move_block; |
375 | |
321 | |
… | |
… | |
393 | move_block = GET_MAP_MOVE_BLOCK (m, x, y); |
339 | move_block = GET_MAP_MOVE_BLOCK (m, x, y); |
394 | |
340 | |
395 | /* If the target space is not blocked, no need to look at the objects on it */ |
341 | /* If the target space is not blocked, no need to look at the objects on it */ |
396 | if ((op->move_type & move_block) == op->move_type) |
342 | if ((op->move_type & move_block) == op->move_type) |
397 | { |
343 | { |
398 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
344 | for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
399 | { |
345 | { |
400 | if (tmp->head == op) |
346 | if (tmp->head == op) |
401 | continue; |
347 | continue; |
|
|
348 | |
402 | if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) |
349 | if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) |
403 | return 0; |
350 | return 0; |
404 | } |
351 | } |
405 | } |
352 | } |
|
|
353 | |
406 | if (try_fit (op, m, x, y)) |
354 | if (try_fit (op, m, x, y)) |
407 | return 0; |
355 | return 0; |
408 | |
356 | |
409 | op->remove (); |
357 | op->move (dir); |
410 | for (tmp = op; tmp != NULL; tmp = tmp->more) |
358 | |
411 | tmp->x += freearr_x[dir], tmp->y += freearr_y[dir]; |
|
|
412 | insert_ob_in_map (op, op->map, pusher, 0); |
|
|
413 | return 1; |
359 | return 1; |
414 | } |
360 | } |
415 | |
361 | |
416 | /* returns 1 if pushing invokes a attack, 0 when not */ |
362 | /* returns 1 if pushing invokes a attack, 0 when not */ |
417 | int |
363 | int |
… | |
… | |
451 | pusher->map = who->map; |
397 | pusher->map = who->map; |
452 | who->map = m; |
398 | who->map = m; |
453 | |
399 | |
454 | insert_ob_in_map (who, who->map, pusher, 0); |
400 | insert_ob_in_map (who, who->map, pusher, 0); |
455 | insert_ob_in_map (pusher, pusher->map, pusher, 0); |
401 | insert_ob_in_map (pusher, pusher->map, pusher, 0); |
|
|
402 | |
456 | return 0; |
403 | return 0; |
457 | } |
404 | } |
458 | |
405 | |
459 | /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ |
406 | /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ |
460 | /* In original we have here a unaggressive check only - that was the reason why */ |
407 | /* In original we have here a unaggressive check only - that was the reason why */ |