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.30 by root, Sun Dec 28 15:28:47 2008 UTC

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

Diff Legend

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