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 it |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, but |
13 | * This program is distributed in the hope that it will be useful, |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * 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 along |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 | * <http://www.gnu.org/licenses/>. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #ifndef __CEXTRACT__ |
26 | #ifndef __CEXTRACT__ |
27 | # include <sproto.h> |
27 | # include <sproto.h> |
… | |
… | |
32 | * If it fails (something blocks the passage), it returns 0, |
32 | * If it fails (something blocks the passage), it returns 0, |
33 | * otherwise 1. |
33 | * otherwise 1. |
34 | * This is an improvement from the previous move_ob(), which |
34 | * This is an improvement from the previous move_ob(), which |
35 | * removed and inserted objects even if they were unable to move. |
35 | * removed and inserted objects even if they were unable to move. |
36 | */ |
36 | */ |
37 | |
|
|
38 | int |
37 | int |
39 | move_object (object *op, int dir) |
38 | move_object (object *op, int dir) |
40 | { |
39 | { |
41 | return move_ob (op, dir, op); |
40 | return op->move (dir); |
42 | } |
41 | } |
43 | |
42 | |
44 | /* object op is trying to move in direction dir. |
43 | /* object op is trying to move in direction dir. |
45 | * originator is typically the same as op, but |
44 | * originator is typically the same as op, but |
46 | * can be different if originator is causing op to |
45 | * can be different if originator is causing op to |
… | |
… | |
51 | * very similiar to move_object. |
50 | * very similiar to move_object. |
52 | */ |
51 | */ |
53 | int |
52 | int |
54 | move_ob (object *op, int dir, object *originator) |
53 | move_ob (object *op, int dir, object *originator) |
55 | { |
54 | { |
|
|
55 | return op->move (dir, originator); |
|
|
56 | } |
|
|
57 | |
|
|
58 | int |
|
|
59 | object::move (int dir, object *originator) |
|
|
60 | { |
56 | sint16 newx = op->x + freearr_x[dir]; |
61 | sint16 newx = x + freearr_x[dir]; |
57 | sint16 newy = op->y + freearr_y[dir]; |
62 | sint16 newy = y + freearr_y[dir]; |
58 | object *tmp; |
|
|
59 | maptile *m; |
|
|
60 | int mflags; |
|
|
61 | |
63 | |
62 | if (op == NULL) |
64 | mapxy pos (this); |
63 | { |
65 | pos.move (dir); |
64 | LOG (llevError, "Trying to move NULL.\n"); |
|
|
65 | return 0; |
|
|
66 | } |
|
|
67 | |
66 | |
68 | m = op->map; |
|
|
69 | mflags = get_map_flags (m, &m, newx, newy, &newx, &newy); |
|
|
70 | |
|
|
71 | /* 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, |
72 | * bail now - we know it can't work. |
68 | * bail now - we know it can't work. |
73 | */ |
69 | */ |
74 | if (mflags & P_OUT_OF_MAP) |
70 | if (!pos.normalise ()) |
75 | return 0; |
71 | return 0; |
76 | |
72 | |
77 | /* Is this space blocked? Players with wizpass are immune to |
73 | /* Is this space blocked? Players with wizpass are immune to |
78 | * this condition. |
74 | * this condition. |
79 | */ |
75 | */ |
80 | 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]) |
81 | return 0; |
77 | return 0; |
82 | |
78 | |
|
|
79 | // check tail movability |
|
|
80 | if (more && !more->move (dir, more->head)) |
|
|
81 | return 0; |
|
|
82 | |
83 | /* 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. |
84 | * 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 |
85 | * breaking anything, but it might. |
85 | * breaking anything, but it might. |
86 | */ |
86 | */ |
87 | if (op->more && !move_ob (op->more, dir, op->more->head)) |
|
|
88 | return 0; |
|
|
89 | |
|
|
90 | op->direction = dir; |
87 | direction = dir; |
91 | |
88 | |
92 | if (op->will_apply & 4) |
89 | if (will_apply & 4) |
93 | check_earthwalls (op, m, newx, newy); |
90 | check_earthwalls (this, pos.m, pos.x, pos.y); |
94 | |
91 | |
95 | if (op->will_apply & 8) |
92 | if (will_apply & 8) |
96 | check_doors (op, m, newx, newy); |
93 | check_doors (this, pos.m, pos.x, pos.y); |
97 | |
|
|
98 | /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying |
|
|
99 | * to remove a removed object, and this function was the culprit. A possible |
|
|
100 | * guess I have is that check_doors above ran into a trap, killing the |
|
|
101 | * monster. |
|
|
102 | * |
|
|
103 | * Unfortunately, it doesn't appear that the calling functions of move_object |
|
|
104 | * deal very well with op being killed, so all this might do is just |
|
|
105 | * migrate the problem someplace else. |
|
|
106 | */ |
|
|
107 | |
|
|
108 | if (QUERY_FLAG (op, FLAG_REMOVED)) |
|
|
109 | { |
|
|
110 | LOG (llevDebug, "move_object: monster has been removed - will not process further\n"); |
|
|
111 | /* Was not successful, but don't want to try and move again */ |
|
|
112 | return 1; |
|
|
113 | } |
|
|
114 | |
94 | |
115 | /* 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 |
116 | * ok - the caller will deal with actual object removal/insertion |
96 | * ok - the caller will deal with actual object removal/insertion |
117 | */ |
97 | */ |
118 | if (op->head) |
98 | if (head) |
119 | return 1; |
99 | return 1; |
120 | |
100 | |
121 | if (m != op->map && op->contr) |
101 | if (pos.m != map && contr) |
122 | { |
102 | { |
123 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
103 | if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) |
124 | return 0; |
104 | return 0; |
125 | |
105 | |
126 | op->remove (); |
106 | remove (); |
127 | |
107 | |
128 | 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))) |
129 | return 0; |
109 | return 0; |
130 | |
110 | |
131 | 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))) |
132 | return 0; |
112 | return 0; |
133 | } |
113 | } |
134 | else |
|
|
135 | op->remove (); |
|
|
136 | |
|
|
137 | /* we already have newx, newy, and m, so lets use them. |
|
|
138 | * In addition, this fixes potential crashes, because multipart object was |
|
|
139 | * on edge of map, +=x, +=y doesn't make correct coordinates. |
|
|
140 | */ |
|
|
141 | for (tmp = op; tmp != NULL; tmp = tmp->more) |
|
|
142 | { |
|
|
143 | tmp->x += freearr_x[dir]; |
|
|
144 | tmp->y += freearr_y[dir]; |
|
|
145 | tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y); |
|
|
146 | } |
|
|
147 | |
114 | |
148 | /* insert_ob_in_map will deal with any tiling issues */ |
115 | /* insert_ob_in_map will deal with any tiling issues */ |
149 | insert_ob_in_map (op, m, originator, 0); |
116 | pos.insert (this, originator); |
150 | |
117 | |
151 | return 1; |
118 | return 1; |
152 | } |
119 | } |
153 | |
|
|
154 | |
120 | |
155 | /* |
121 | /* |
156 | * transfer_ob(): Move an object (even linked objects) to another spot |
122 | * transfer_ob(): Move an object (even linked objects) to another spot |
157 | * on the same map. |
123 | * on the same map. |
158 | * |
124 | * |
… | |
… | |
176 | i = find_first_free_spot (op, op->map, x, y); |
142 | i = find_first_free_spot (op, op->map, x, y); |
177 | |
143 | |
178 | if (i == -1) |
144 | if (i == -1) |
179 | return 0; /* No free spot */ |
145 | return 0; /* No free spot */ |
180 | |
146 | |
181 | if (op->head != NULL) |
|
|
182 | op = op->head; |
147 | op = op->head_ (); |
183 | op->remove (); |
148 | op->remove (); |
|
|
149 | |
184 | for (tmp = op; tmp != NULL; tmp = tmp->more) |
150 | for (object *tmp = op; tmp; tmp = tmp->more) |
185 | tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), |
151 | { |
186 | tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); |
152 | tmp->x = x + freearr_x[i] + tmp->arch->x; |
|
|
153 | tmp->y = y + freearr_y[i] + tmp->arch->y; |
|
|
154 | } |
187 | |
155 | |
188 | tmp = insert_ob_in_map (op, op->map, originator, 0); |
156 | op = insert_ob_in_map (op, op->map, originator, 0); |
189 | if (tmp) |
157 | |
190 | return 0; |
158 | return !op; |
191 | else |
|
|
192 | return 1; |
|
|
193 | } |
159 | } |
194 | |
160 | |
195 | /* |
161 | /* |
196 | * Return value: 1 if object was destroyed, 0 otherwise. |
162 | * Return value: 1 if object was destroyed, 0 otherwise. |
197 | * Modified so that instead of passing the 'originator' that had no |
163 | * Modified so that instead of passing the 'originator' that had no |
… | |
… | |
205 | * one of another type. |
171 | * one of another type. |
206 | */ |
172 | */ |
207 | int |
173 | int |
208 | teleport (object *teleporter, uint8 tele_type, object *user) |
174 | teleport (object *teleporter, uint8 tele_type, object *user) |
209 | { |
175 | { |
210 | object *altern; |
176 | if (!user) |
211 | int i, j, k, nrofalt = 0; |
177 | return 0; |
|
|
178 | |
212 | object *other_teleporter, *tmp; |
179 | object *other_teleporter = 0; |
213 | maptile *m; |
180 | int nrofalt = 0; |
214 | sint16 sx, sy; |
|
|
215 | |
181 | |
216 | if (user == NULL) |
|
|
217 | return 0; |
|
|
218 | if (user->head != NULL) |
|
|
219 | user = user->head; |
182 | user = user->head_ (); |
220 | |
183 | |
221 | /* Find all other teleporters within range. This range |
184 | /* Find all other teleporters within range. This range |
222 | * should really be setable by some object attribute instead of |
185 | * should really be setable by some object attribute instead of |
223 | * using hard coded values. |
186 | * using hard coded values. |
224 | */ |
187 | */ |
225 | for (i = -5; i < 6; i++) |
188 | unordered_mapwalk (teleporter, -5, -5, 5, 5) |
226 | for (j = -5; j < 6; j++) |
|
|
227 | { |
189 | { |
228 | if (i == 0 && j == 0) |
190 | mapspace &ms = m->at (nx, ny); |
229 | continue; |
|
|
230 | /* Perhaps this should be extended to support tiled maps */ |
|
|
231 | if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) |
|
|
232 | continue; |
|
|
233 | other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j); |
|
|
234 | |
191 | |
235 | while (other_teleporter) |
192 | for (object *tmp = ms.top; tmp; tmp = tmp->below) |
|
|
193 | if (tmp->type == tele_type) |
236 | { |
194 | { |
237 | if (other_teleporter->type == tele_type) |
195 | if ((dx || dy) && !rndm (++nrofalt)) |
|
|
196 | other_teleporter = tmp; |
|
|
197 | |
238 | break; |
198 | break; |
239 | other_teleporter = other_teleporter->above; |
|
|
240 | } |
199 | } |
241 | if (other_teleporter && !(RANDOM () % ++nrofalt)) |
|
|
242 | altern = other_teleporter; |
|
|
243 | } |
200 | } |
244 | |
201 | |
245 | if (!nrofalt) |
202 | if (!nrofalt) |
246 | { |
203 | { |
247 | LOG (llevError, "No alternative teleporters around!\n"); |
204 | LOG (llevError, "%s: no alternative teleporters around (user %s).\n", |
|
|
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->clone.x); |
|
|
292 | tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); |
|
|
293 | } |
|
|
294 | tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); |
|
|
295 | return (tmp == NULL); |
|
|
296 | } |
|
|
297 | |
|
|
298 | void |
|
|
299 | recursive_roll (object *op, int dir, object *pusher) |
|
|
300 | { |
|
|
301 | if (!roll_ob (op, dir, pusher)) |
|
|
302 | { |
|
|
303 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); |
|
|
304 | return; |
|
|
305 | } |
|
|
306 | (void) move_ob (pusher, dir, pusher); |
|
|
307 | new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); |
|
|
308 | return; |
|
|
309 | } |
249 | } |
310 | |
250 | |
311 | /* |
251 | /* |
312 | * This is a new version of blocked, this one handles objects |
252 | * This is a new version of blocked, this one handles objects |
313 | * that can be passed through by monsters with the CAN_PASS_THRU defined. |
253 | * that can be passed through by monsters with the CAN_PASS_THRU defined. |
314 | * |
254 | * |
315 | * very new version handles also multipart objects |
255 | * very new version handles also multipart objects |
316 | * This is currently only used for the boulder roll code. |
256 | * This is currently only used for the boulder roll code. |
317 | * Returns 1 if object does not fit, 0 if it does. |
257 | * Returns 1 if object does not fit, 0 if it does. |
318 | */ |
258 | */ |
319 | |
259 | static int |
320 | int |
|
|
321 | try_fit (object *op, maptile *m, int x, int y) |
260 | try_fit (object *op, maptile *m, int x, int y) |
322 | { |
261 | { |
323 | object *tmp, *more; |
262 | object *tmp, *more; |
324 | sint16 tx, ty; |
263 | sint16 tx, ty; |
325 | int mflags; |
264 | int mflags; |
… | |
… | |
357 | /* |
296 | /* |
358 | * this is not perfect yet. |
297 | * this is not perfect yet. |
359 | * it does not roll objects behind multipart objects properly. |
298 | * it does not roll objects behind multipart objects properly. |
360 | * Support for rolling multipart objects is questionable. |
299 | * Support for rolling multipart objects is questionable. |
361 | */ |
300 | */ |
362 | |
301 | static int |
363 | int |
|
|
364 | roll_ob (object *op, int dir, object *pusher) |
302 | roll_ob (object *op, int dir, object *pusher) |
365 | { |
303 | { |
366 | object *tmp; |
|
|
367 | sint16 x, y; |
304 | sint16 x, y; |
368 | int flags; |
305 | int flags; |
369 | maptile *m; |
306 | maptile *m; |
370 | MoveType move_block; |
307 | MoveType move_block; |
371 | |
308 | |
… | |
… | |
373 | op = op->head; |
310 | op = op->head; |
374 | |
311 | |
375 | x = op->x + freearr_x[dir]; |
312 | x = op->x + freearr_x[dir]; |
376 | y = op->y + freearr_y[dir]; |
313 | y = op->y + freearr_y[dir]; |
377 | |
314 | |
378 | if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) |
315 | if (!QUERY_FLAG (op, FLAG_CAN_ROLL) |
|
|
316 | || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) |
|
|
317 | > pusher->stats.Str)) |
379 | return 0; |
318 | return 0; |
380 | |
319 | |
381 | m = op->map; |
320 | m = op->map; |
382 | flags = get_map_flags (m, &m, x, y, &x, &y); |
321 | flags = get_map_flags (m, &m, x, y, &x, &y); |
383 | |
322 | |
… | |
… | |
387 | move_block = GET_MAP_MOVE_BLOCK (m, x, y); |
326 | move_block = GET_MAP_MOVE_BLOCK (m, x, y); |
388 | |
327 | |
389 | /* If the target space is not blocked, no need to look at the objects on it */ |
328 | /* 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) |
329 | if ((op->move_type & move_block) == op->move_type) |
391 | { |
330 | { |
392 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) |
331 | for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
393 | { |
332 | { |
394 | if (tmp->head == op) |
333 | if (tmp->head == op) |
395 | continue; |
334 | continue; |
|
|
335 | |
396 | if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) |
336 | if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) |
397 | return 0; |
337 | return 0; |
398 | } |
338 | } |
399 | } |
339 | } |
|
|
340 | |
400 | if (try_fit (op, m, x, y)) |
341 | if (try_fit (op, m, x, y)) |
401 | return 0; |
342 | return 0; |
402 | |
343 | |
403 | op->remove (); |
344 | op->move (dir); |
404 | for (tmp = op; tmp != NULL; tmp = tmp->more) |
345 | |
405 | tmp->x += freearr_x[dir], tmp->y += freearr_y[dir]; |
|
|
406 | insert_ob_in_map (op, op->map, pusher, 0); |
|
|
407 | return 1; |
346 | return 1; |
|
|
347 | } |
|
|
348 | |
|
|
349 | void |
|
|
350 | recursive_roll (object *op, int dir, object *pusher) |
|
|
351 | { |
|
|
352 | if (!roll_ob (op, dir, pusher)) |
|
|
353 | { |
|
|
354 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op)); |
|
|
355 | return; |
|
|
356 | } |
|
|
357 | |
|
|
358 | move_ob (pusher, dir, pusher); |
|
|
359 | new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op)); |
|
|
360 | return; |
408 | } |
361 | } |
409 | |
362 | |
410 | /* returns 1 if pushing invokes a attack, 0 when not */ |
363 | /* returns 1 if pushing invokes a attack, 0 when not */ |
411 | int |
364 | int |
412 | push_ob (object *who, int dir, object *pusher) |
365 | push_ob (object *who, int dir, object *pusher) |
… | |
… | |
445 | pusher->map = who->map; |
398 | pusher->map = who->map; |
446 | who->map = m; |
399 | who->map = m; |
447 | |
400 | |
448 | insert_ob_in_map (who, who->map, pusher, 0); |
401 | insert_ob_in_map (who, who->map, pusher, 0); |
449 | insert_ob_in_map (pusher, pusher->map, pusher, 0); |
402 | insert_ob_in_map (pusher, pusher->map, pusher, 0); |
|
|
403 | |
450 | return 0; |
404 | return 0; |
451 | } |
405 | } |
452 | |
406 | |
453 | /* 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 */ |
454 | /* 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 */ |
… | |
… | |
463 | CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ |
417 | CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ |
464 | who->enemy = pusher; |
418 | who->enemy = pusher; |
465 | return 1; |
419 | return 1; |
466 | } |
420 | } |
467 | else |
421 | else |
468 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); |
422 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s. H<You have to run if you wish to attack unnagressive NPCs.>", &who->name); |
469 | } |
423 | } |
470 | |
424 | |
471 | /* now, lets test stand still. we NEVER can push stand_still monsters. */ |
425 | /* now, let's test stand still. we NEVER can push stand_still monsters. */ |
472 | if (QUERY_FLAG (who, FLAG_STAND_STILL)) |
426 | if (QUERY_FLAG (who, FLAG_STAND_STILL)) |
473 | { |
427 | { |
474 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s.", &who->name); |
428 | new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name); |
475 | return 0; |
429 | return 0; |
476 | } |
430 | } |
477 | |
431 | |
478 | /* This block is basically if you are pushing friendly but |
432 | /* This block is basically if you are pushing friendly but |
479 | * non pet creaturs. |
433 | * non pet creaturs. |