… | |
… | |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #include <funcpoint.h> |
26 | #include <funcpoint.h> |
27 | |
27 | |
28 | #include <loader.h> |
28 | #include <loader.h> |
29 | #ifndef WIN32 /* ---win32 exclude header */ |
|
|
30 | # include <unistd.h> |
29 | #include <unistd.h> |
31 | #endif /* win32 */ |
|
|
32 | |
30 | |
33 | #include "path.h" |
31 | #include "path.h" |
34 | |
|
|
35 | |
32 | |
36 | /* |
33 | /* |
37 | * Returns the maptile which has a name matching the given argument. |
34 | * Returns the maptile which has a name matching the given argument. |
38 | * return NULL if no match is found. |
35 | * return NULL if no match is found. |
39 | */ |
36 | */ |
40 | |
|
|
41 | maptile * |
37 | maptile * |
42 | has_been_loaded (const char *name) |
38 | has_been_loaded (const char *name) |
43 | { |
39 | { |
44 | maptile *map; |
|
|
45 | |
|
|
46 | if (!name || !*name) |
40 | if (!name || !*name) |
47 | return 0; |
41 | return 0; |
48 | for (map = first_map; map; map = map->next) |
42 | |
|
|
43 | for_all_maps (map) |
49 | if (!strcmp (name, map->path)) |
44 | if (!strcmp (name, map->path)) |
50 | break; |
|
|
51 | return (map); |
45 | return map; |
|
|
46 | |
|
|
47 | return 0; |
52 | } |
48 | } |
53 | |
49 | |
54 | /* |
50 | /* |
55 | * This makes a path absolute outside the world of Crossfire. |
51 | * This makes a path absolute outside the world of Crossfire. |
56 | * In other words, it prepends LIBDIR/MAPDIR/ to the given path |
52 | * In other words, it prepends LIBDIR/MAPDIR/ to the given path |
… | |
… | |
157 | int |
153 | int |
158 | check_path (const char *name, int prepend_dir) |
154 | check_path (const char *name, int prepend_dir) |
159 | { |
155 | { |
160 | char buf[MAX_BUF]; |
156 | char buf[MAX_BUF]; |
161 | |
157 | |
162 | #ifndef WIN32 |
|
|
163 | char *endbuf; |
158 | char *endbuf; |
164 | struct stat statbuf; |
159 | struct stat statbuf; |
165 | int mode = 0; |
160 | int mode = 0; |
166 | #endif |
|
|
167 | |
161 | |
168 | if (prepend_dir) |
162 | if (prepend_dir) |
169 | strcpy (buf, create_pathname (name)); |
163 | strcpy (buf, create_pathname (name)); |
170 | else |
164 | else |
171 | strcpy (buf, name); |
165 | strcpy (buf, name); |
172 | #ifdef WIN32 /* ***win32: check this sucker in windows style. */ |
|
|
173 | return (_access (buf, 0)); |
|
|
174 | #else |
|
|
175 | |
166 | |
176 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
167 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
177 | * this method should be equivalant and is clearer. |
168 | * this method should be equivalant and is clearer. |
178 | * Can not use strcat because we need to cycle through |
169 | * Can not use strcat because we need to cycle through |
179 | * all the names. |
170 | * all the names. |
… | |
… | |
192 | if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || |
183 | if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || |
193 | (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) |
184 | (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) |
194 | mode |= 2; |
185 | mode |= 2; |
195 | |
186 | |
196 | return (mode); |
187 | return (mode); |
197 | #endif |
|
|
198 | } |
188 | } |
199 | |
189 | |
200 | /* |
190 | /* |
201 | * Prints out debug-information about a map. |
191 | * Prints out debug-information about a map. |
202 | * Dumping these at llevError doesn't seem right, but is |
192 | * Dumping these at llevError doesn't seem right, but is |
… | |
… | |
205 | |
195 | |
206 | void |
196 | void |
207 | dump_map (const maptile *m) |
197 | dump_map (const maptile *m) |
208 | { |
198 | { |
209 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
199 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
210 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); |
200 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y); |
211 | |
201 | |
212 | if (m->msg != NULL) |
202 | if (m->msg != NULL) |
213 | LOG (llevError, "Message:\n%s", m->msg); |
203 | LOG (llevError, "Message:\n%s", m->msg); |
214 | |
204 | |
215 | if (m->maplore != NULL) |
205 | if (m->maplore != NULL) |
… | |
… | |
229 | */ |
219 | */ |
230 | |
220 | |
231 | void |
221 | void |
232 | dump_all_maps (void) |
222 | dump_all_maps (void) |
233 | { |
223 | { |
234 | maptile *m; |
224 | for_all_maps (m) |
235 | |
|
|
236 | for (m = first_map; m != NULL; m = m->next) |
|
|
237 | { |
|
|
238 | dump_map (m); |
225 | dump_map (m); |
239 | } |
|
|
240 | } |
226 | } |
241 | |
227 | |
242 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
228 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
243 | * one function that just returns a P_.. value (see map.h) |
229 | * one function that just returns a P_.. value (see map.h) |
244 | * it will also do map translation for tiled maps, returning |
230 | * it will also do map translation for tiled maps, returning |
… | |
… | |
248 | * is needed. The case of not passing values is if we're just |
234 | * is needed. The case of not passing values is if we're just |
249 | * checking for the existence of something on those spaces, but |
235 | * checking for the existence of something on those spaces, but |
250 | * don't expect to insert/remove anything from those spaces. |
236 | * don't expect to insert/remove anything from those spaces. |
251 | */ |
237 | */ |
252 | int |
238 | int |
253 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) |
239 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) |
254 | { |
240 | { |
255 | sint16 newx, newy; |
241 | sint16 newx, newy; |
256 | int retval = 0; |
242 | int retval = 0; |
257 | maptile *mp; |
243 | maptile *mp; |
258 | |
244 | |
259 | if (out_of_map (oldmap, x, y)) |
|
|
260 | return P_OUT_OF_MAP; |
|
|
261 | newx = x; |
245 | newx = x; |
262 | newy = y; |
246 | newy = y; |
|
|
247 | |
263 | mp = get_map_from_coord (oldmap, &newx, &newy); |
248 | mp = get_map_from_coord (oldmap, &newx, &newy); |
|
|
249 | |
|
|
250 | if (!mp) |
|
|
251 | return P_OUT_OF_MAP; |
|
|
252 | |
264 | if (mp != oldmap) |
253 | if (mp != oldmap) |
265 | retval |= P_NEW_MAP; |
254 | retval |= P_NEW_MAP; |
266 | if (newmap) |
|
|
267 | *newmap = mp; |
|
|
268 | if (nx) |
|
|
269 | *nx = newx; |
|
|
270 | if (ny) |
|
|
271 | *ny = newy; |
|
|
272 | |
255 | |
273 | retval |= mp->spaces[newx + mp->width * newy].flags; |
256 | if (newmap) *newmap = mp; |
|
|
257 | if (nx) *nx = newx; |
|
|
258 | if (ny) *ny = newy; |
274 | |
259 | |
275 | return retval; |
260 | return retval | mp->at (newx, newy).flags (); |
276 | } |
261 | } |
277 | |
262 | |
278 | /* |
263 | /* |
279 | * Returns true if the given coordinate is blocked except by the |
264 | * Returns true if the given coordinate is blocked except by the |
280 | * object passed is not blocking. This is used with |
265 | * object passed is not blocking. This is used with |
… | |
… | |
303 | } |
288 | } |
304 | |
289 | |
305 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
290 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
306 | * directly. |
291 | * directly. |
307 | */ |
292 | */ |
308 | mflags = m->spaces[sx + m->width * sy].flags; |
293 | mflags = m->at (sx, sy).flags (); |
309 | |
294 | |
310 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
295 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
311 | |
296 | |
312 | /* If space is currently not blocked by anything, no need to |
297 | /* If space is currently not blocked by anything, no need to |
313 | * go further. Not true for players - all sorts of special |
298 | * go further. Not true for players - all sorts of special |
… | |
… | |
332 | /* We basically go through the stack of objects, and if there is |
317 | /* We basically go through the stack of objects, and if there is |
333 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
318 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
334 | * true. If we get through the entire stack, that must mean |
319 | * true. If we get through the entire stack, that must mean |
335 | * ob is blocking it, so return 0. |
320 | * ob is blocking it, so return 0. |
336 | */ |
321 | */ |
337 | for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) |
322 | for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) |
338 | { |
323 | { |
339 | |
324 | |
340 | /* This must be before the checks below. Code for inventory checkers. */ |
325 | /* This must be before the checks below. Code for inventory checkers. */ |
341 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
326 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
342 | { |
327 | { |
… | |
… | |
406 | * |
391 | * |
407 | * Note this used to be arch_blocked, but with new movement |
392 | * Note this used to be arch_blocked, but with new movement |
408 | * code, we need to have actual object to check its move_type |
393 | * code, we need to have actual object to check its move_type |
409 | * against the move_block values. |
394 | * against the move_block values. |
410 | */ |
395 | */ |
411 | |
|
|
412 | int |
396 | int |
413 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
397 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
414 | { |
398 | { |
415 | archetype *tmp; |
399 | archetype *tmp; |
416 | int flag; |
400 | int flag; |
… | |
… | |
422 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
406 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
423 | if (flag & P_OUT_OF_MAP) |
407 | if (flag & P_OUT_OF_MAP) |
424 | return P_OUT_OF_MAP; |
408 | return P_OUT_OF_MAP; |
425 | |
409 | |
426 | /* don't have object, so don't know what types would block */ |
410 | /* don't have object, so don't know what types would block */ |
427 | return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); |
411 | return m1->at (sx, sy).move_block; |
428 | } |
412 | } |
429 | |
413 | |
430 | for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) |
414 | for (tmp = ob->arch; tmp; tmp = tmp->more) |
431 | { |
415 | { |
432 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
416 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
433 | |
417 | |
434 | if (flag & P_OUT_OF_MAP) |
418 | if (flag & P_OUT_OF_MAP) |
435 | return P_OUT_OF_MAP; |
419 | return P_OUT_OF_MAP; |
436 | if (flag & P_IS_ALIVE) |
420 | if (flag & P_IS_ALIVE) |
437 | return P_IS_ALIVE; |
421 | return P_IS_ALIVE; |
438 | |
422 | |
|
|
423 | mapspace &ms = m1->at (sx, sy); |
|
|
424 | |
|
|
425 | |
439 | /* find_first_free_spot() calls this function. However, often |
426 | /* find_first_free_spot() calls this function. However, often |
440 | * ob doesn't have any move type (when used to place exits) |
427 | * ob doesn't have any move type (when used to place exits) |
441 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
428 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
442 | */ |
429 | */ |
443 | |
430 | |
444 | if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) |
431 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
445 | continue; |
432 | continue; |
446 | |
433 | |
447 | /* Note it is intentional that we check ob - the movement type of the |
434 | /* Note it is intentional that we check ob - the movement type of the |
448 | * head of the object should correspond for the entire object. |
435 | * head of the object should correspond for the entire object. |
449 | */ |
436 | */ |
450 | if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) |
437 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
451 | return AB_NO_PASS; |
438 | return P_NO_PASS; |
452 | |
|
|
453 | } |
439 | } |
|
|
440 | |
454 | return 0; |
441 | return 0; |
455 | } |
442 | } |
456 | |
443 | |
457 | /* When the map is loaded, load_object does not actually insert objects |
444 | /* When the map is loaded, load_object does not actually insert objects |
458 | * into inventory, but just links them. What this does is go through |
445 | * into inventory, but just links them. What this does is go through |
… | |
… | |
485 | * for objects whose arch says they are multipart yet according to the |
472 | * for objects whose arch says they are multipart yet according to the |
486 | * info we have, they only have the head (as would be expected when |
473 | * info we have, they only have the head (as would be expected when |
487 | * they are saved). We do have to look for the old maps that did save |
474 | * they are saved). We do have to look for the old maps that did save |
488 | * the more sections and not re-add sections for them. |
475 | * the more sections and not re-add sections for them. |
489 | */ |
476 | */ |
490 | |
|
|
491 | static void |
477 | static void |
492 | link_multipart_objects (maptile *m) |
478 | link_multipart_objects (maptile *m) |
493 | { |
479 | { |
494 | int x, y; |
480 | int x, y; |
495 | object *tmp, *op, *last, *above; |
481 | object *tmp, *op, *last, *above; |
496 | archetype *at; |
482 | archetype *at; |
497 | |
483 | |
498 | for (x = 0; x < MAP_WIDTH (m); x++) |
484 | for (x = 0; x < m->width; x++) |
499 | for (y = 0; y < MAP_HEIGHT (m); y++) |
485 | for (y = 0; y < m->height; y++) |
500 | for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) |
486 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) |
501 | { |
487 | { |
502 | above = tmp->above; |
488 | above = tmp->above; |
503 | |
489 | |
504 | /* already multipart - don't do anything more */ |
490 | /* already multipart - don't do anything more */ |
505 | if (tmp->head || tmp->more) |
491 | if (tmp->head || tmp->more) |
… | |
… | |
540 | { |
526 | { |
541 | int i, j; |
527 | int i, j; |
542 | int unique; |
528 | int unique; |
543 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
529 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
544 | |
530 | |
545 | op = get_object (); |
531 | op = object::create (); |
546 | op->map = m; /* To handle buttons correctly */ |
532 | op->map = m; /* To handle buttons correctly */ |
547 | |
533 | |
548 | while ((i = load_object (fp, op, mapflags))) |
534 | while ((i = load_object (fp, op, mapflags))) |
549 | { |
535 | { |
550 | /* if the archetype for the object is null, means that we |
536 | /* if the archetype for the object is null, means that we |
… | |
… | |
555 | { |
541 | { |
556 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
542 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
557 | continue; |
543 | continue; |
558 | } |
544 | } |
559 | |
545 | |
560 | |
|
|
561 | switch (i) |
546 | switch (i) |
562 | { |
547 | { |
563 | case LL_NORMAL: |
548 | case LL_NORMAL: |
564 | /* if we are loading an overlay, put the floors on the bottom */ |
549 | /* if we are loading an overlay, put the floors on the bottom */ |
565 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
550 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
566 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
551 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
567 | else |
552 | else |
568 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
553 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
569 | |
554 | |
570 | if (op->inv) |
555 | if (op->inv) |
571 | sum_weight (op); |
556 | sum_weight (op); |
572 | |
557 | |
573 | prev = op, last_more = op; |
558 | prev = op, last_more = op; |
574 | break; |
559 | break; |
575 | |
560 | |
576 | case LL_MORE: |
561 | case LL_MORE: |
577 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
562 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
578 | op->head = prev, last_more->more = op, last_more = op; |
563 | op->head = prev, last_more->more = op, last_more = op; |
579 | break; |
564 | break; |
580 | } |
565 | } |
581 | |
566 | |
582 | if (mapflags & MAP_STYLE) |
567 | if (mapflags & MAP_STYLE) |
583 | remove_from_active_list (op); |
568 | remove_from_active_list (op); |
584 | |
569 | |
585 | op = get_object (); |
570 | op = object::create (); |
586 | op->map = m; |
571 | op->map = m; |
587 | } |
572 | } |
588 | |
573 | |
589 | for (i = 0; i < m->width; i++) |
574 | for (i = 0; i < m->width; i++) |
590 | { |
575 | { |
591 | for (j = 0; j < m->height; j++) |
576 | for (j = 0; j < m->height; j++) |
592 | { |
577 | { |
593 | unique = 0; |
578 | unique = 0; |
594 | /* check for unique items, or unique squares */ |
579 | /* check for unique items, or unique squares */ |
595 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
580 | for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) |
596 | { |
581 | { |
597 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
582 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
598 | unique = 1; |
583 | unique = 1; |
|
|
584 | |
599 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
585 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
600 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
586 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
601 | } |
587 | } |
602 | } |
588 | } |
603 | } |
589 | } |
604 | |
590 | |
605 | free_object (op); |
591 | op->destroy (); |
606 | link_multipart_objects (m); |
592 | link_multipart_objects (m); |
607 | } |
593 | } |
608 | |
594 | |
609 | /* This saves all the objects on the map in a non destructive fashion. |
595 | /* This saves all the objects on the map in a non destructive fashion. |
610 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
596 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
611 | * and we only save the head of multi part objects - this is needed |
597 | * and we only save the head of multi part objects - this is needed |
612 | * in order to do map tiling properly. |
598 | * in order to do map tiling properly. |
613 | */ |
599 | */ |
614 | void |
600 | void |
615 | save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) |
601 | save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag) |
616 | { |
602 | { |
617 | int i, j = 0, unique = 0; |
603 | int i, j = 0, unique = 0; |
618 | object *op; |
604 | object *op; |
619 | |
605 | |
620 | /* first pass - save one-part objects */ |
606 | /* first pass - save one-part objects */ |
621 | for (i = 0; i < MAP_WIDTH (m); i++) |
607 | for (i = 0; i < m->width; i++) |
622 | for (j = 0; j < MAP_HEIGHT (m); j++) |
608 | for (j = 0; j < m->height; j++) |
623 | { |
609 | { |
624 | unique = 0; |
610 | unique = 0; |
|
|
611 | |
625 | for (op = get_map_ob (m, i, j); op; op = op->above) |
612 | for (op = m->at (i, j).bot; op; op = op->above) |
626 | { |
613 | { |
627 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
614 | if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) |
628 | unique = 1; |
615 | unique = 1; |
629 | |
616 | |
630 | if (op->type == PLAYER) |
617 | if (op->type == PLAYER) |
631 | { |
|
|
632 | LOG (llevDebug, "Player on map that is being saved\n"); |
|
|
633 | continue; |
618 | continue; |
634 | } |
|
|
635 | |
619 | |
636 | if (op->head || op->owner) |
620 | if (op->head || op->owner) |
637 | continue; |
621 | continue; |
638 | |
622 | |
639 | if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) |
623 | if (unique || op->flag [FLAG_UNIQUE]) |
640 | save_object (fp2, op, 3); |
624 | save_object (fp2, op, 1); |
641 | else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) |
625 | else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID]))) |
642 | save_object (fp, op, 3); |
626 | save_object (fp, op, 1); |
|
|
627 | } |
|
|
628 | } |
|
|
629 | } |
643 | |
630 | |
644 | } /* for this space */ |
631 | maptile::maptile () |
645 | } /* for this j */ |
632 | { |
|
|
633 | in_memory = MAP_SWAPPED; |
|
|
634 | /* The maps used to pick up default x and y values from the |
|
|
635 | * map archetype. Mimic that behaviour. |
|
|
636 | */ |
|
|
637 | width = 16; |
|
|
638 | height = 16; |
|
|
639 | reset_timeout = 0; |
|
|
640 | timeout = 300; |
|
|
641 | enter_x = 0; |
|
|
642 | enter_y = 0; |
|
|
643 | /*set part to -1 indicating conversion to weather map not yet done */ |
|
|
644 | worldpartx = -1; |
|
|
645 | worldparty = -1; |
646 | } |
646 | } |
647 | |
647 | |
648 | /* |
648 | /* |
649 | * Allocates, initialises, and returns a pointer to a maptile. |
649 | * Allocates, initialises, and returns a pointer to a maptile. |
650 | * Modified to no longer take a path option which was not being |
650 | * Modified to no longer take a path option which was not being |
651 | * used anyways. MSW 2001-07-01 |
651 | * used anyways. MSW 2001-07-01 |
652 | */ |
652 | */ |
653 | |
|
|
654 | maptile * |
653 | maptile * |
655 | get_linked_map (void) |
654 | get_linked_map (void) |
656 | { |
655 | { |
657 | maptile *map = new maptile; |
656 | maptile *map = new maptile; |
658 | maptile *mp; |
|
|
659 | |
657 | |
660 | for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next); |
658 | map->next = first_map; |
661 | if (mp == NULL) |
|
|
662 | first_map = map; |
659 | first_map = map; |
663 | else |
|
|
664 | mp->next = map; |
|
|
665 | |
660 | |
666 | map->in_memory = MAP_SWAPPED; |
|
|
667 | /* The maps used to pick up default x and y values from the |
|
|
668 | * map archetype. Mimic that behaviour. |
|
|
669 | */ |
|
|
670 | MAP_WIDTH (map) = 16; |
|
|
671 | MAP_HEIGHT (map) = 16; |
|
|
672 | MAP_RESET_TIMEOUT (map) = 0; |
|
|
673 | MAP_TIMEOUT (map) = 300; |
|
|
674 | MAP_ENTER_X (map) = 0; |
|
|
675 | MAP_ENTER_Y (map) = 0; |
|
|
676 | /*set part to -1 indicating conversion to weather map not yet done */ |
|
|
677 | MAP_WORLDPARTX (map) = -1; |
|
|
678 | MAP_WORLDPARTY (map) = -1; |
|
|
679 | return map; |
661 | return map; |
680 | } |
662 | } |
681 | |
663 | |
682 | /* |
664 | /* |
683 | * Allocates the arrays contained in a maptile. |
665 | * Allocates the arrays contained in a maptile. |
684 | * This basically allocates the dynamic array of spaces for the |
666 | * This basically allocates the dynamic array of spaces for the |
685 | * map. |
667 | * map. |
686 | */ |
668 | */ |
687 | |
|
|
688 | void |
669 | void |
689 | allocate_map (maptile *m) |
670 | maptile::allocate () |
690 | { |
671 | { |
691 | m->in_memory = MAP_IN_MEMORY; |
672 | in_memory = MAP_IN_MEMORY; |
|
|
673 | |
692 | /* Log this condition and free the storage. We could I suppose |
674 | /* Log this condition and free the storage. We could I suppose |
693 | * realloc, but if the caller is presuming the data will be intact, |
675 | * realloc, but if the caller is presuming the data will be intact, |
694 | * that is their poor assumption. |
676 | * that is their poor assumption. |
695 | */ |
677 | */ |
696 | if (m->spaces) |
678 | if (spaces) |
697 | { |
679 | { |
698 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path); |
680 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
699 | free (m->spaces); |
681 | sfree (spaces, size ()); |
700 | } |
682 | } |
701 | |
683 | |
702 | m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace)); |
684 | spaces = salloc0<mapspace> (size ()); |
703 | |
|
|
704 | if (m->spaces == NULL) |
|
|
705 | fatal (OUT_OF_MEMORY); |
|
|
706 | } |
685 | } |
707 | |
686 | |
708 | /* Create and returns a map of the specific size. Used |
687 | /* Create and returns a map of the specific size. Used |
709 | * in random map code and the editor. |
688 | * in random map code and the editor. |
710 | */ |
689 | */ |
… | |
… | |
714 | maptile *m = get_linked_map (); |
693 | maptile *m = get_linked_map (); |
715 | |
694 | |
716 | m->width = sizex; |
695 | m->width = sizex; |
717 | m->height = sizey; |
696 | m->height = sizey; |
718 | m->in_memory = MAP_SWAPPED; |
697 | m->in_memory = MAP_SWAPPED; |
719 | allocate_map (m); |
698 | m->allocate (); |
|
|
699 | |
720 | return m; |
700 | return m; |
721 | } |
701 | } |
722 | |
702 | |
723 | /* Takes a string from a map definition and outputs a pointer to the array of shopitems |
703 | /* Takes a string from a map definition and outputs a pointer to the array of shopitems |
724 | * corresponding to that string. Memory is allocated for this, it must be freed |
704 | * corresponding to that string. Memory is allocated for this, it must be freed |
… | |
… | |
732 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
712 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
733 | shopitems *items = NULL; |
713 | shopitems *items = NULL; |
734 | int i = 0, number_of_entries = 0; |
714 | int i = 0, number_of_entries = 0; |
735 | const typedata *current_type; |
715 | const typedata *current_type; |
736 | |
716 | |
737 | shop_string = strdup_local (input_string); |
717 | shop_string = strdup (input_string); |
738 | p = shop_string; |
718 | p = shop_string; |
739 | /* first we'll count the entries, we'll need that for allocating the array shortly */ |
719 | /* first we'll count the entries, we'll need that for allocating the array shortly */ |
740 | while (p) |
720 | while (p) |
741 | { |
721 | { |
742 | p = strchr (p, ';'); |
722 | p = strchr (p, ';'); |
… | |
… | |
851 | { |
831 | { |
852 | char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; |
832 | char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; |
853 | int msgpos = 0; |
833 | int msgpos = 0; |
854 | int maplorepos = 0; |
834 | int maplorepos = 0; |
855 | |
835 | |
856 | while (fgets (buf, HUGE_BUF - 1, fp) != NULL) |
836 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
857 | { |
837 | { |
858 | buf[HUGE_BUF - 1] = 0; |
838 | buf[HUGE_BUF - 1] = 0; |
859 | key = buf; |
839 | key = buf; |
|
|
840 | |
860 | while (isspace (*key)) |
841 | while (isspace (*key)) |
861 | key++; |
842 | key++; |
|
|
843 | |
862 | if (*key == 0) |
844 | if (*key == 0) |
863 | continue; /* empty line */ |
845 | continue; /* empty line */ |
|
|
846 | |
864 | value = strchr (key, ' '); |
847 | value = strchr (key, ' '); |
|
|
848 | |
865 | if (!value) |
849 | if (!value) |
866 | { |
850 | { |
867 | end = strchr (key, '\n'); |
851 | if ((end = strchr (key, '\n'))) |
868 | if (end != NULL) |
|
|
869 | { |
|
|
870 | *end = 0; |
852 | *end = 0; |
871 | } |
|
|
872 | } |
853 | } |
873 | else |
854 | else |
874 | { |
855 | { |
875 | *value = 0; |
856 | *value = 0; |
876 | value++; |
857 | value++; |
877 | end = strchr (value, '\n'); |
858 | end = strchr (value, '\n'); |
|
|
859 | |
878 | while (isspace (*value)) |
860 | while (isspace (*value)) |
879 | { |
861 | { |
880 | value++; |
862 | value++; |
|
|
863 | |
881 | if (*value == '\0' || value == end) |
864 | if (*value == '\0' || value == end) |
882 | { |
865 | { |
883 | /* Nothing but spaces. */ |
866 | /* Nothing but spaces. */ |
884 | value = NULL; |
867 | value = NULL; |
885 | break; |
868 | break; |
… | |
… | |
908 | * that use the parameter. |
891 | * that use the parameter. |
909 | */ |
892 | */ |
910 | |
893 | |
911 | if (!strcmp (key, "msg")) |
894 | if (!strcmp (key, "msg")) |
912 | { |
895 | { |
913 | while (fgets (buf, HUGE_BUF - 1, fp) != NULL) |
896 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
914 | { |
897 | { |
915 | if (!strcmp (buf, "endmsg\n")) |
898 | if (!strcmp (buf, "endmsg\n")) |
916 | break; |
899 | break; |
917 | else |
900 | else |
918 | { |
901 | { |
… | |
… | |
925 | * with nothing between). There is no reason in those cases to |
908 | * with nothing between). There is no reason in those cases to |
926 | * keep the empty message. Also, msgbuf contains garbage data |
909 | * keep the empty message. Also, msgbuf contains garbage data |
927 | * when msgpos is zero, so copying it results in crashes |
910 | * when msgpos is zero, so copying it results in crashes |
928 | */ |
911 | */ |
929 | if (msgpos != 0) |
912 | if (msgpos != 0) |
930 | m->msg = strdup_local (msgbuf); |
913 | m->msg = strdup (msgbuf); |
931 | } |
914 | } |
932 | else if (!strcmp (key, "maplore")) |
915 | else if (!strcmp (key, "maplore")) |
933 | { |
916 | { |
934 | while (fgets (buf, HUGE_BUF - 1, fp) != NULL) |
917 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
935 | { |
918 | { |
936 | if (!strcmp (buf, "endmaplore\n")) |
919 | if (!strcmp (buf, "endmaplore\n")) |
937 | break; |
920 | break; |
938 | else |
921 | else |
939 | { |
922 | { |
… | |
… | |
941 | strcpy (maplorebuf + maplorepos, buf); |
924 | strcpy (maplorebuf + maplorepos, buf); |
942 | maplorepos += strlen (buf); |
925 | maplorepos += strlen (buf); |
943 | } |
926 | } |
944 | } |
927 | } |
945 | if (maplorepos != 0) |
928 | if (maplorepos != 0) |
946 | m->maplore = strdup_local (maplorebuf); |
929 | m->maplore = strdup (maplorebuf); |
947 | } |
930 | } |
948 | else if (!strcmp (key, "end")) |
931 | else if (!strcmp (key, "end")) |
949 | { |
932 | { |
950 | break; |
933 | break; |
951 | } |
934 | } |
… | |
… | |
960 | LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); |
943 | LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); |
961 | } |
944 | } |
962 | else if (!strcmp (key, "name")) |
945 | else if (!strcmp (key, "name")) |
963 | { |
946 | { |
964 | *end = 0; |
947 | *end = 0; |
965 | m->name = strdup_local (value); |
948 | m->name = strdup (value); |
966 | } |
949 | } |
967 | /* first strcmp value on these are old names supported |
950 | /* first strcmp value on these are old names supported |
968 | * for compatibility reasons. The new values (second) are |
951 | * for compatibility reasons. The new values (second) are |
969 | * what really should be used. |
952 | * what really should be used. |
970 | */ |
953 | */ |
971 | else if (!strcmp (key, "oid")) |
954 | else if (!strcmp (key, "oid")) |
972 | { |
|
|
973 | fp.get (m, atoi (value)); |
955 | fp.get (m, atoi (value)); |
974 | } |
|
|
975 | else if (!strcmp (key, "attach")) |
956 | else if (!strcmp (key, "attach")) |
976 | { |
|
|
977 | m->attach = value; |
957 | m->attach = value; |
978 | } |
|
|
979 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
958 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
980 | { |
|
|
981 | m->enter_x = atoi (value); |
959 | m->enter_x = atoi (value); |
982 | } |
|
|
983 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
960 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
984 | { |
|
|
985 | m->enter_y = atoi (value); |
961 | m->enter_y = atoi (value); |
986 | } |
|
|
987 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
962 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
988 | { |
|
|
989 | m->width = atoi (value); |
963 | m->width = atoi (value); |
990 | } |
|
|
991 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
964 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
992 | { |
|
|
993 | m->height = atoi (value); |
965 | m->height = atoi (value); |
994 | } |
|
|
995 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
966 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
996 | { |
|
|
997 | m->reset_timeout = atoi (value); |
967 | m->reset_timeout = atoi (value); |
998 | } |
|
|
999 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
968 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
1000 | { |
|
|
1001 | m->timeout = atoi (value); |
969 | m->timeout = atoi (value); |
1002 | } |
|
|
1003 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
970 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
1004 | { |
971 | m->difficulty = clamp (atoi (value), 1, settings.max_level); |
1005 | m->difficulty = atoi (value); |
|
|
1006 | } |
|
|
1007 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
972 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
1008 | { |
|
|
1009 | m->darkness = atoi (value); |
973 | m->darkness = atoi (value); |
1010 | } |
|
|
1011 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
974 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
1012 | { |
|
|
1013 | m->fixed_resettime = atoi (value); |
975 | m->fixed_resettime = atoi (value); |
1014 | } |
|
|
1015 | else if (!strcmp (key, "unique")) |
976 | else if (!strcmp (key, "unique")) |
1016 | { |
|
|
1017 | m->unique = atoi (value); |
977 | m->unique = atoi (value); |
1018 | } |
|
|
1019 | else if (!strcmp (key, "template")) |
978 | else if (!strcmp (key, "template")) |
1020 | { |
|
|
1021 | m->templatemap = atoi (value); |
979 | m->templatemap = atoi (value); |
1022 | } |
|
|
1023 | else if (!strcmp (key, "region")) |
980 | else if (!strcmp (key, "region")) |
1024 | { |
|
|
1025 | m->region = get_region_by_name (value); |
981 | m->region = get_region_by_name (value); |
1026 | } |
|
|
1027 | else if (!strcmp (key, "shopitems")) |
982 | else if (!strcmp (key, "shopitems")) |
1028 | { |
983 | { |
1029 | *end = 0; |
984 | *end = 0; |
1030 | m->shopitems = parse_shop_string (value); |
985 | m->shopitems = parse_shop_string (value); |
1031 | } |
986 | } |
1032 | else if (!strcmp (key, "shopgreed")) |
987 | else if (!strcmp (key, "shopgreed")) |
1033 | { |
|
|
1034 | m->shopgreed = atof (value); |
988 | m->shopgreed = atof (value); |
1035 | } |
|
|
1036 | else if (!strcmp (key, "shopmin")) |
989 | else if (!strcmp (key, "shopmin")) |
1037 | { |
|
|
1038 | m->shopmin = atol (value); |
990 | m->shopmin = atol (value); |
1039 | } |
|
|
1040 | else if (!strcmp (key, "shopmax")) |
991 | else if (!strcmp (key, "shopmax")) |
1041 | { |
|
|
1042 | m->shopmax = atol (value); |
992 | m->shopmax = atol (value); |
1043 | } |
|
|
1044 | else if (!strcmp (key, "shoprace")) |
993 | else if (!strcmp (key, "shoprace")) |
1045 | { |
994 | { |
1046 | *end = 0; |
995 | *end = 0; |
1047 | m->shoprace = strdup_local (value); |
996 | m->shoprace = strdup (value); |
1048 | } |
997 | } |
1049 | else if (!strcmp (key, "outdoor")) |
998 | else if (!strcmp (key, "outdoor")) |
1050 | { |
|
|
1051 | m->outdoor = atoi (value); |
999 | m->outdoor = atoi (value); |
1052 | } |
|
|
1053 | else if (!strcmp (key, "temp")) |
1000 | else if (!strcmp (key, "temp")) |
1054 | { |
|
|
1055 | m->temp = atoi (value); |
1001 | m->temp = atoi (value); |
1056 | } |
|
|
1057 | else if (!strcmp (key, "pressure")) |
1002 | else if (!strcmp (key, "pressure")) |
1058 | { |
|
|
1059 | m->pressure = atoi (value); |
1003 | m->pressure = atoi (value); |
1060 | } |
|
|
1061 | else if (!strcmp (key, "humid")) |
1004 | else if (!strcmp (key, "humid")) |
1062 | { |
|
|
1063 | m->humid = atoi (value); |
1005 | m->humid = atoi (value); |
1064 | } |
|
|
1065 | else if (!strcmp (key, "windspeed")) |
1006 | else if (!strcmp (key, "windspeed")) |
1066 | { |
|
|
1067 | m->windspeed = atoi (value); |
1007 | m->windspeed = atoi (value); |
1068 | } |
|
|
1069 | else if (!strcmp (key, "winddir")) |
1008 | else if (!strcmp (key, "winddir")) |
1070 | { |
|
|
1071 | m->winddir = atoi (value); |
1009 | m->winddir = atoi (value); |
1072 | } |
|
|
1073 | else if (!strcmp (key, "sky")) |
1010 | else if (!strcmp (key, "sky")) |
1074 | { |
|
|
1075 | m->sky = atoi (value); |
1011 | m->sky = atoi (value); |
1076 | } |
|
|
1077 | else if (!strcmp (key, "nosmooth")) |
1012 | else if (!strcmp (key, "nosmooth")) |
1078 | { |
|
|
1079 | m->nosmooth = atoi (value); |
1013 | m->nosmooth = atoi (value); |
1080 | } |
|
|
1081 | else if (!strncmp (key, "tile_path_", 10)) |
1014 | else if (!strncmp (key, "tile_path_", 10)) |
1082 | { |
1015 | { |
1083 | int tile = atoi (key + 10); |
1016 | int tile = atoi (key + 10); |
1084 | |
1017 | |
1085 | if (tile < 1 || tile > 4) |
1018 | if (tile < 1 || tile > 4) |
… | |
… | |
1118 | } |
1051 | } |
1119 | |
1052 | |
1120 | if (editor) |
1053 | if (editor) |
1121 | { |
1054 | { |
1122 | /* Use the value as in the file. */ |
1055 | /* Use the value as in the file. */ |
1123 | m->tile_path[tile - 1] = strdup_local (value); |
1056 | m->tile_path[tile - 1] = strdup (value); |
1124 | } |
1057 | } |
1125 | else if (path != NULL) |
1058 | else if (path != NULL) |
1126 | { |
1059 | { |
1127 | /* Use the normalized value. */ |
1060 | /* Use the normalized value. */ |
1128 | m->tile_path[tile - 1] = strdup_local (path); |
1061 | m->tile_path[tile - 1] = strdup (path); |
1129 | } |
1062 | } |
1130 | } /* end if tile direction (in)valid */ |
1063 | } /* end if tile direction (in)valid */ |
1131 | } |
1064 | } |
1132 | else |
1065 | else |
1133 | { |
|
|
1134 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1066 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1135 | } |
|
|
1136 | } |
1067 | } |
|
|
1068 | |
1137 | if (!key || strcmp (key, "end")) |
1069 | if (!key || strcmp (key, "end")) |
1138 | { |
1070 | { |
1139 | LOG (llevError, "Got premature eof on map header!\n"); |
1071 | LOG (llevError, "Got premature eof on map header!\n"); |
1140 | return 1; |
1072 | return 1; |
1141 | } |
1073 | } |
|
|
1074 | |
1142 | return 0; |
1075 | return 0; |
1143 | } |
1076 | } |
1144 | |
1077 | |
1145 | /* |
1078 | /* |
1146 | * Opens the file "filename" and reads information about the map |
1079 | * Opens the file "filename" and reads information about the map |
… | |
… | |
1179 | strcpy (m->path, filename); |
1112 | strcpy (m->path, filename); |
1180 | if (load_map_header (thawer, m)) |
1113 | if (load_map_header (thawer, m)) |
1181 | { |
1114 | { |
1182 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1115 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1183 | delete_map (m); |
1116 | delete_map (m); |
1184 | return NULL; |
1117 | return 0; |
1185 | } |
1118 | } |
1186 | |
1119 | |
1187 | allocate_map (m); |
1120 | m->allocate (); |
1188 | |
1121 | |
1189 | m->in_memory = MAP_LOADING; |
1122 | m->in_memory = MAP_LOADING; |
1190 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1123 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1191 | |
1124 | |
1192 | m->in_memory = MAP_IN_MEMORY; |
1125 | m->in_memory = MAP_IN_MEMORY; |
1193 | if (!MAP_DIFFICULTY (m)) |
1126 | if (!m->difficulty) |
1194 | MAP_DIFFICULTY (m) = calculate_difficulty (m); |
1127 | m->difficulty = calculate_difficulty (m); |
1195 | set_map_reset_time (m); |
1128 | set_map_reset_time (m); |
1196 | m->instantiate (); |
1129 | m->instantiate (); |
1197 | return (m); |
1130 | return (m); |
1198 | } |
1131 | } |
1199 | |
1132 | |
… | |
… | |
1238 | LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); |
1171 | LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); |
1239 | delete_map (m); |
1172 | delete_map (m); |
1240 | m = load_original_map (m->path, 0); |
1173 | m = load_original_map (m->path, 0); |
1241 | return NULL; |
1174 | return NULL; |
1242 | } |
1175 | } |
|
|
1176 | |
1243 | allocate_map (m); |
1177 | m->allocate (); |
1244 | |
1178 | |
1245 | m->in_memory = MAP_LOADING; |
1179 | m->in_memory = MAP_LOADING; |
1246 | load_objects (m, thawer, 0); |
1180 | load_objects (m, thawer, 0); |
1247 | |
1181 | |
1248 | m->in_memory = MAP_IN_MEMORY; |
1182 | m->in_memory = MAP_IN_MEMORY; |
… | |
… | |
1271 | if (load_map_header (thawer, m)) |
1205 | if (load_map_header (thawer, m)) |
1272 | { |
1206 | { |
1273 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1207 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1274 | delete_map (m); |
1208 | delete_map (m); |
1275 | m = load_original_map (m->path, 0); |
1209 | m = load_original_map (m->path, 0); |
1276 | return NULL; |
1210 | return 0; |
1277 | } |
1211 | } |
1278 | /*allocate_map(m); */ |
1212 | /*m->allocate ();*/ |
1279 | |
1213 | |
1280 | m->in_memory = MAP_LOADING; |
1214 | m->in_memory = MAP_LOADING; |
1281 | load_objects (m, thawer, MAP_OVERLAY); |
1215 | load_objects (m, thawer, MAP_OVERLAY); |
1282 | |
1216 | |
1283 | m->in_memory = MAP_IN_MEMORY; |
1217 | m->in_memory = MAP_IN_MEMORY; |
… | |
… | |
1293 | delete_unique_items (maptile *m) |
1227 | delete_unique_items (maptile *m) |
1294 | { |
1228 | { |
1295 | int i, j, unique; |
1229 | int i, j, unique; |
1296 | object *op, *next; |
1230 | object *op, *next; |
1297 | |
1231 | |
1298 | for (i = 0; i < MAP_WIDTH (m); i++) |
1232 | for (i = 0; i < m->width; i++) |
1299 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1233 | for (j = 0; j < m->height; j++) |
1300 | { |
1234 | { |
1301 | unique = 0; |
1235 | unique = 0; |
|
|
1236 | |
1302 | for (op = get_map_ob (m, i, j); op; op = next) |
1237 | for (op = GET_MAP_OB (m, i, j); op; op = next) |
1303 | { |
1238 | { |
1304 | next = op->above; |
1239 | next = op->above; |
|
|
1240 | |
1305 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1241 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1306 | unique = 1; |
1242 | unique = 1; |
|
|
1243 | |
1307 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1244 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1308 | { |
1245 | { |
1309 | clean_object (op); |
1246 | op->destroy_inv (false); |
1310 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
1247 | op->destroy (); |
1311 | remove_button_link (op); |
|
|
1312 | remove_ob (op); |
|
|
1313 | free_object (op); |
|
|
1314 | } |
1248 | } |
1315 | } |
1249 | } |
1316 | } |
1250 | } |
1317 | } |
1251 | } |
1318 | |
1252 | |
1319 | |
|
|
1320 | /* |
1253 | /* |
1321 | * Loads unique objects from file(s) into the map which is in memory |
1254 | * Loads unique objects from file(s) into the map which is in memory |
1322 | * m is the map to load unique items into. |
1255 | * m is the map to load unique items into. |
1323 | */ |
1256 | */ |
1324 | static void |
1257 | static void |
… | |
… | |
1343 | return; |
1276 | return; |
1344 | |
1277 | |
1345 | m->in_memory = MAP_LOADING; |
1278 | m->in_memory = MAP_LOADING; |
1346 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1279 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1347 | delete_unique_items (m); /* original map before, don't duplicate them */ |
1280 | delete_unique_items (m); /* original map before, don't duplicate them */ |
|
|
1281 | |
1348 | load_objects (m, thawer, 0); |
1282 | load_objects (m, thawer, 0); |
1349 | |
1283 | |
1350 | m->in_memory = MAP_IN_MEMORY; |
1284 | m->in_memory = MAP_IN_MEMORY; |
1351 | } |
1285 | } |
1352 | |
|
|
1353 | |
1286 | |
1354 | /* |
1287 | /* |
1355 | * Saves a map to file. If flag is set, it is saved into the same |
1288 | * Saves a map to file. If flag is set, it is saved into the same |
1356 | * file it was (originally) loaded from. Otherwise a temporary |
1289 | * file it was (originally) loaded from. Otherwise a temporary |
1357 | * filename will be genarated, and the file will be stored there. |
1290 | * filename will be genarated, and the file will be stored there. |
1358 | * The temporary filename will be stored in the maptileure. |
1291 | * The temporary filename will be stored in the maptileure. |
1359 | * If the map is unique, we also save to the filename in the map |
1292 | * If the map is unique, we also save to the filename in the map |
1360 | * (this should have been updated when first loaded) |
1293 | * (this should have been updated when first loaded) |
1361 | */ |
1294 | */ |
1362 | |
|
|
1363 | int |
1295 | int |
1364 | new_save_map (maptile *m, int flag) |
1296 | new_save_map (maptile *m, int flag) |
1365 | { |
1297 | { |
1366 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1298 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1367 | int i; |
1299 | int i; |
… | |
… | |
1387 | make_path_to_file (filename); |
1319 | make_path_to_file (filename); |
1388 | } |
1320 | } |
1389 | else |
1321 | else |
1390 | { |
1322 | { |
1391 | if (!m->tmpname) |
1323 | if (!m->tmpname) |
1392 | m->tmpname = tempnam_local (settings.tmpdir, NULL); |
1324 | m->tmpname = tempnam (settings.tmpdir, NULL); |
1393 | |
1325 | |
1394 | strcpy (filename, m->tmpname); |
1326 | strcpy (filename, m->tmpname); |
1395 | } |
1327 | } |
1396 | |
1328 | |
1397 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
1329 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
… | |
… | |
1421 | print_shop_string (m, shop); |
1353 | print_shop_string (m, shop); |
1422 | fprintf (freezer, "shopitems %s\n", shop); |
1354 | fprintf (freezer, "shopitems %s\n", shop); |
1423 | } |
1355 | } |
1424 | if (m->shopgreed) |
1356 | if (m->shopgreed) |
1425 | fprintf (freezer, "shopgreed %f\n", m->shopgreed); |
1357 | fprintf (freezer, "shopgreed %f\n", m->shopgreed); |
1426 | #ifndef WIN32 |
|
|
1427 | if (m->shopmin) |
1358 | if (m->shopmin) |
1428 | fprintf (freezer, "shopmin %llu\n", m->shopmin); |
1359 | fprintf (freezer, "shopmin %llu\n", m->shopmin); |
1429 | if (m->shopmax) |
1360 | if (m->shopmax) |
1430 | fprintf (freezer, "shopmax %llu\n", m->shopmax); |
1361 | fprintf (freezer, "shopmax %llu\n", m->shopmax); |
1431 | #else |
|
|
1432 | if (m->shopmin) |
|
|
1433 | fprintf (freezer, "shopmin %I64u\n", m->shopmin); |
|
|
1434 | if (m->shopmax) |
|
|
1435 | fprintf (freezer, "shopmax %I64u\n", m->shopmax); |
|
|
1436 | #endif |
|
|
1437 | if (m->shoprace) |
1362 | if (m->shoprace) |
1438 | fprintf (freezer, "shoprace %s\n", m->shoprace); |
1363 | fprintf (freezer, "shoprace %s\n", m->shoprace); |
1439 | if (m->darkness) |
1364 | if (m->darkness) |
1440 | fprintf (freezer, "darkness %d\n", m->darkness); |
1365 | fprintf (freezer, "darkness %d\n", m->darkness); |
1441 | if (m->width) |
1366 | if (m->width) |
… | |
… | |
1506 | freezer.save (filename); |
1431 | freezer.save (filename); |
1507 | |
1432 | |
1508 | return 0; |
1433 | return 0; |
1509 | } |
1434 | } |
1510 | |
1435 | |
1511 | |
|
|
1512 | /* |
|
|
1513 | * Remove and free all objects in the inventory of the given object. |
|
|
1514 | * object.c ? |
|
|
1515 | */ |
|
|
1516 | |
|
|
1517 | void |
|
|
1518 | clean_object (object *op) |
|
|
1519 | { |
|
|
1520 | object *tmp, *next; |
|
|
1521 | |
|
|
1522 | for (tmp = op->inv; tmp; tmp = next) |
|
|
1523 | { |
|
|
1524 | next = tmp->below; |
|
|
1525 | clean_object (tmp); |
|
|
1526 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
|
|
1527 | remove_button_link (tmp); |
|
|
1528 | remove_ob (tmp); |
|
|
1529 | free_object (tmp); |
|
|
1530 | } |
|
|
1531 | } |
|
|
1532 | |
|
|
1533 | /* |
1436 | /* |
1534 | * Remove and free all objects in the given map. |
1437 | * Remove and free all objects in the given map. |
1535 | */ |
1438 | */ |
1536 | |
|
|
1537 | void |
1439 | void |
1538 | free_all_objects (maptile *m) |
1440 | free_all_objects (maptile *m) |
1539 | { |
1441 | { |
1540 | int i, j; |
1442 | if (!m->spaces) |
1541 | object *op; |
1443 | return; |
1542 | |
1444 | |
1543 | for (i = 0; i < MAP_WIDTH (m); i++) |
1445 | for (int i = 0; i < m->width; i++) |
1544 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1446 | for (int j = 0; j < m->height; j++) |
1545 | { |
1447 | { |
1546 | object *previous_obj = NULL; |
1448 | mapspace &ms = m->at (i, j); |
1547 | |
1449 | |
1548 | while ((op = GET_MAP_OB (m, i, j)) != NULL) |
1450 | while (object *op = ms.bot) |
1549 | { |
1451 | { |
1550 | if (op == previous_obj) |
|
|
1551 | { |
|
|
1552 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
|
|
1553 | break; |
|
|
1554 | } |
|
|
1555 | previous_obj = op; |
|
|
1556 | if (op->head != NULL) |
1452 | if (op->head) |
1557 | op = op->head; |
1453 | op = op->head; |
1558 | |
1454 | |
1559 | /* If the map isn't in memory, free_object will remove and |
1455 | op->destroy_inv (false); |
1560 | * free objects in op's inventory. So let it do the job. |
1456 | op->destroy (); |
1561 | */ |
|
|
1562 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1563 | clean_object (op); |
|
|
1564 | remove_ob (op); |
|
|
1565 | free_object (op); |
|
|
1566 | } |
1457 | } |
1567 | } |
1458 | } |
1568 | } |
1459 | } |
1569 | |
1460 | |
1570 | /* |
1461 | /* |
1571 | * Frees everything allocated by the given maptileure. |
1462 | * Frees everything allocated by the given maptileure. |
1572 | * don't free tmpname - our caller is left to do that |
1463 | * don't free tmpname - our caller is left to do that |
1573 | */ |
1464 | */ |
1574 | |
|
|
1575 | void |
1465 | void |
1576 | free_map (maptile *m, int flag) |
1466 | free_map (maptile *m, int flag) |
1577 | { |
1467 | { |
1578 | int i; |
1468 | if (!m->in_memory) //TODO: makes no sense to me? |
1579 | |
|
|
1580 | if (!m->in_memory) |
|
|
1581 | { |
|
|
1582 | LOG (llevError, "Trying to free freed map.\n"); |
|
|
1583 | return; |
1469 | return; |
1584 | } |
1470 | |
|
|
1471 | m->in_memory = MAP_SAVING; |
|
|
1472 | |
|
|
1473 | // TODO: use new/delete |
|
|
1474 | |
1585 | if (flag && m->spaces) |
1475 | if (flag && m->spaces) |
1586 | free_all_objects (m); |
1476 | free_all_objects (m); |
1587 | if (m->name) |
1477 | |
1588 | FREE_AND_CLEAR (m->name); |
1478 | sfree (m->spaces, m->size ()), m->spaces = 0; |
1589 | if (m->spaces) |
1479 | |
1590 | FREE_AND_CLEAR (m->spaces); |
1480 | free (m->name), m->name = 0; |
1591 | if (m->msg) |
1481 | free (m->msg), m->msg = 0; |
1592 | FREE_AND_CLEAR (m->msg); |
1482 | free (m->maplore), m->maplore = 0; |
1593 | if (m->maplore) |
1483 | free (m->shoprace), m->shoprace = 0; |
1594 | FREE_AND_CLEAR (m->maplore); |
1484 | delete [] m->shopitems, m->shopitems = 0; |
1595 | if (m->shopitems) |
1485 | |
1596 | delete[]m->shopitems; |
|
|
1597 | m->shopitems = 0; |
|
|
1598 | if (m->shoprace) |
|
|
1599 | FREE_AND_CLEAR (m->shoprace); |
|
|
1600 | if (m->buttons) |
1486 | if (m->buttons) |
1601 | free_objectlinkpt (m->buttons); |
1487 | free_objectlinkpt (m->buttons), m->buttons = 0; |
1602 | m->buttons = NULL; |
1488 | |
1603 | for (i = 0; i < 4; i++) |
1489 | for (int i = 0; i < 4; i++) |
1604 | { |
1490 | free (m->tile_path[i]), m->tile_path[i] = 0; |
1605 | if (m->tile_path[i]) |
1491 | |
1606 | FREE_AND_CLEAR (m->tile_path[i]); |
|
|
1607 | m->tile_map[i] = NULL; |
|
|
1608 | } |
|
|
1609 | m->in_memory = MAP_SWAPPED; |
1492 | m->in_memory = MAP_SWAPPED; |
1610 | } |
1493 | } |
1611 | |
1494 | |
1612 | /* |
1495 | maptile::~maptile () |
1613 | * function: vanish maptile |
1496 | { |
1614 | * m : pointer to maptile, if NULL no action |
1497 | assert (destroyed ()); |
1615 | * this deletes all the data on the map (freeing pointers) |
1498 | } |
1616 | * and then removes this map from the global linked list of maps. |
1499 | |
|
|
1500 | void |
|
|
1501 | maptile::do_destroy () |
|
|
1502 | { |
|
|
1503 | attachable::do_destroy (); |
|
|
1504 | |
|
|
1505 | free_map (this, 1); |
|
|
1506 | free (tmpname), tmpname = 0; |
|
|
1507 | |
|
|
1508 | /* We need to look through all the maps and see if any maps |
|
|
1509 | * are pointing at this one for tiling information. Since |
|
|
1510 | * tiling can be asymetric, we just can not look to see which |
|
|
1511 | * maps this map tiles with and clears those. |
1617 | */ |
1512 | */ |
|
|
1513 | //TODO: non-euclidean-tiling MUST GO |
|
|
1514 | for_all_maps (m) |
|
|
1515 | for (int i = 0; i < 4; i++) |
|
|
1516 | if (m->tile_map[i] == this) |
|
|
1517 | m->tile_map[i] = 0; |
1618 | |
1518 | |
|
|
1519 | if (first_map == this) |
|
|
1520 | first_map = next; |
|
|
1521 | else |
|
|
1522 | for_all_maps (m) |
|
|
1523 | if (m->next = this) |
|
|
1524 | { |
|
|
1525 | m->next = next; |
|
|
1526 | break; |
|
|
1527 | } |
|
|
1528 | } |
|
|
1529 | |
|
|
1530 | //TODO: must go |
1619 | void |
1531 | void |
1620 | delete_map (maptile *m) |
1532 | delete_map (maptile *m) |
1621 | { |
1533 | { |
1622 | maptile *tmp, *last; |
|
|
1623 | int i; |
|
|
1624 | |
|
|
1625 | if (!m) |
1534 | if (m) |
1626 | return; |
1535 | m->destroy (); |
1627 | |
|
|
1628 | m->clear (); |
|
|
1629 | |
|
|
1630 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1631 | { |
|
|
1632 | /* change to MAP_SAVING, even though we are not, |
|
|
1633 | * so that remove_ob doesn't do as much work. |
|
|
1634 | */ |
|
|
1635 | m->in_memory = MAP_SAVING; |
|
|
1636 | free_map (m, 1); |
|
|
1637 | } |
|
|
1638 | /* move this out of free_map, since tmpname can still be needed if |
|
|
1639 | * the map is swapped out. |
|
|
1640 | */ |
|
|
1641 | if (m->tmpname) |
|
|
1642 | { |
|
|
1643 | free (m->tmpname); |
|
|
1644 | m->tmpname = NULL; |
|
|
1645 | } |
|
|
1646 | last = NULL; |
|
|
1647 | /* We need to look through all the maps and see if any maps |
|
|
1648 | * are pointing at this one for tiling information. Since |
|
|
1649 | * tiling can be assymetric, we just can not look to see which |
|
|
1650 | * maps this map tiles with and clears those. |
|
|
1651 | */ |
|
|
1652 | for (tmp = first_map; tmp != NULL; tmp = tmp->next) |
|
|
1653 | { |
|
|
1654 | if (tmp->next == m) |
|
|
1655 | last = tmp; |
|
|
1656 | |
|
|
1657 | /* This should hopefully get unrolled on a decent compiler */ |
|
|
1658 | for (i = 0; i < 4; i++) |
|
|
1659 | if (tmp->tile_map[i] == m) |
|
|
1660 | tmp->tile_map[i] = NULL; |
|
|
1661 | } |
|
|
1662 | |
|
|
1663 | /* If last is null, then this should be the first map in the list */ |
|
|
1664 | if (!last) |
|
|
1665 | { |
|
|
1666 | if (m == first_map) |
|
|
1667 | first_map = m->next; |
|
|
1668 | else |
|
|
1669 | /* m->path is a static char, so should hopefully still have |
|
|
1670 | * some useful data in it. |
|
|
1671 | */ |
|
|
1672 | LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path); |
|
|
1673 | } |
|
|
1674 | else |
|
|
1675 | last->next = m->next; |
|
|
1676 | |
|
|
1677 | delete m; |
|
|
1678 | } |
1536 | } |
1679 | |
|
|
1680 | |
|
|
1681 | |
1537 | |
1682 | /* |
1538 | /* |
1683 | * Makes sure the given map is loaded and swapped in. |
1539 | * Makes sure the given map is loaded and swapped in. |
1684 | * name is path name of the map. |
1540 | * name is path name of the map. |
1685 | * flags meaning: |
1541 | * flags meaning: |
… | |
… | |
1688 | * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. |
1544 | * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. |
1689 | * dont do any more name translation on it. |
1545 | * dont do any more name translation on it. |
1690 | * |
1546 | * |
1691 | * Returns a pointer to the given map. |
1547 | * Returns a pointer to the given map. |
1692 | */ |
1548 | */ |
1693 | |
|
|
1694 | maptile * |
1549 | maptile * |
1695 | ready_map_name (const char *name, int flags) |
1550 | ready_map_name (const char *name, int flags) |
1696 | { |
1551 | { |
1697 | maptile *m; |
|
|
1698 | |
|
|
1699 | if (!name) |
1552 | if (!name) |
1700 | return (NULL); |
1553 | return 0; |
1701 | |
1554 | |
1702 | /* Have we been at this level before? */ |
1555 | /* Have we been at this level before? */ |
1703 | m = has_been_loaded (name); |
1556 | maptile *m = has_been_loaded (name); |
1704 | |
1557 | |
1705 | /* Map is good to go, so just return it */ |
1558 | /* Map is good to go, so just return it */ |
1706 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1559 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1707 | { |
|
|
1708 | return m; |
1560 | return m; |
1709 | } |
|
|
1710 | |
1561 | |
1711 | /* unique maps always get loaded from their original location, and never |
1562 | /* unique maps always get loaded from their original location, and never |
1712 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1563 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1713 | * this map, load it now. I removed the reset checking from here - |
1564 | * this map, load it now. I removed the reset checking from here - |
1714 | * it seems the probability of a player trying to enter a map that should |
1565 | * it seems the probability of a player trying to enter a map that should |
… | |
… | |
1716 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1567 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1717 | * resets in any case - if they really care, they should use the 'maps command. |
1568 | * resets in any case - if they really care, they should use the 'maps command. |
1718 | */ |
1569 | */ |
1719 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1570 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1720 | { |
1571 | { |
1721 | |
|
|
1722 | /* first visit or time to reset */ |
1572 | /* first visit or time to reset */ |
1723 | if (m) |
1573 | if (m) |
1724 | { |
1574 | { |
1725 | clean_tmp_map (m); /* Doesn't make much difference */ |
1575 | clean_tmp_map (m); /* Doesn't make much difference */ |
1726 | delete_map (m); |
1576 | delete_map (m); |
… | |
… | |
1813 | int x, y, i; |
1663 | int x, y, i; |
1814 | long monster_cnt = 0; |
1664 | long monster_cnt = 0; |
1815 | double avgexp = 0; |
1665 | double avgexp = 0; |
1816 | sint64 total_exp = 0; |
1666 | sint64 total_exp = 0; |
1817 | |
1667 | |
1818 | if (MAP_DIFFICULTY (m)) |
1668 | if (m->difficulty) |
1819 | { |
1669 | { |
1820 | LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); |
1670 | LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty); |
1821 | return MAP_DIFFICULTY (m); |
1671 | return m->difficulty; |
1822 | } |
1672 | } |
1823 | |
1673 | |
1824 | for (x = 0; x < MAP_WIDTH (m); x++) |
1674 | for (x = 0; x < m->width; x++) |
1825 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1675 | for (y = 0; y < m->height; y++) |
1826 | for (op = get_map_ob (m, x, y); op != NULL; op = op->above) |
1676 | for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) |
1827 | { |
1677 | { |
1828 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1678 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1829 | { |
1679 | { |
1830 | total_exp += op->stats.exp; |
1680 | total_exp += op->stats.exp; |
1831 | monster_cnt++; |
1681 | monster_cnt++; |
… | |
… | |
1879 | if (first_map->in_memory == MAP_SAVING) |
1729 | if (first_map->in_memory == MAP_SAVING) |
1880 | first_map->in_memory = MAP_IN_MEMORY; |
1730 | first_map->in_memory = MAP_IN_MEMORY; |
1881 | delete_map (first_map); |
1731 | delete_map (first_map); |
1882 | real_maps++; |
1732 | real_maps++; |
1883 | } |
1733 | } |
|
|
1734 | |
1884 | LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); |
1735 | LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); |
1885 | } |
1736 | } |
1886 | |
1737 | |
1887 | /* change_map_light() - used to change map light level (darkness) |
1738 | /* change_map_light() - used to change map light level (darkness) |
1888 | * up or down. Returns true if successful. It should now be |
1739 | * up or down. Returns true if successful. It should now be |
… | |
… | |
1924 | /* All clients need to get re-updated for the change */ |
1775 | /* All clients need to get re-updated for the change */ |
1925 | update_all_map_los (m); |
1776 | update_all_map_los (m); |
1926 | return 1; |
1777 | return 1; |
1927 | } |
1778 | } |
1928 | |
1779 | |
1929 | |
|
|
1930 | /* |
1780 | /* |
1931 | * This function updates various attributes about a specific space |
1781 | * This function updates various attributes about a specific space |
1932 | * on the map (what it looks like, whether it blocks magic, |
1782 | * on the map (what it looks like, whether it blocks magic, |
1933 | * has a living creatures, prevents people from passing |
1783 | * has a living creatures, prevents people from passing |
1934 | * through, etc) |
1784 | * through, etc) |
1935 | */ |
1785 | */ |
1936 | void |
1786 | void |
1937 | update_position (maptile *m, int x, int y) |
1787 | mapspace::update_ () |
1938 | { |
1788 | { |
1939 | object *tmp, *last = NULL; |
1789 | object *tmp, *last = 0; |
1940 | uint8 flags = 0, oldflags, light = 0, anywhere = 0; |
1790 | uint8 flags = 0, light = 0, anywhere = 0; |
1941 | New_Face *top, *floor, *middle; |
1791 | New_Face *top, *floor, *middle; |
1942 | object *top_obj, *floor_obj, *middle_obj; |
1792 | object *top_obj, *floor_obj, *middle_obj; |
1943 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1793 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1944 | |
1794 | |
1945 | oldflags = GET_MAP_FLAGS (m, x, y); |
|
|
1946 | if (!(oldflags & P_NEED_UPDATE)) |
|
|
1947 | { |
|
|
1948 | LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y); |
|
|
1949 | return; |
|
|
1950 | } |
|
|
1951 | |
|
|
1952 | middle = blank_face; |
1795 | middle = blank_face; |
1953 | top = blank_face; |
1796 | top = blank_face; |
1954 | floor = blank_face; |
1797 | floor = blank_face; |
1955 | |
1798 | |
1956 | middle_obj = NULL; |
1799 | middle_obj = 0; |
1957 | top_obj = NULL; |
1800 | top_obj = 0; |
1958 | floor_obj = NULL; |
1801 | floor_obj = 0; |
1959 | |
1802 | |
1960 | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) |
1803 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1961 | { |
1804 | { |
1962 | |
|
|
1963 | /* This could be made additive I guess (two lights better than |
1805 | /* This could be made additive I guess (two lights better than |
1964 | * one). But if so, it shouldn't be a simple additive - 2 |
1806 | * one). But if so, it shouldn't be a simple additive - 2 |
1965 | * light bulbs do not illuminate twice as far as once since |
1807 | * light bulbs do not illuminate twice as far as once since |
1966 | * it is a disapation factor that is squared (or is it cubed?) |
1808 | * it is a dissapation factor that is cubed. |
1967 | */ |
1809 | */ |
1968 | if (tmp->glow_radius > light) |
1810 | if (tmp->glow_radius > light) |
1969 | light = tmp->glow_radius; |
1811 | light = tmp->glow_radius; |
1970 | |
1812 | |
1971 | /* This call is needed in order to update objects the player |
1813 | /* This call is needed in order to update objects the player |
… | |
… | |
2009 | { |
1851 | { |
2010 | middle = tmp->face; |
1852 | middle = tmp->face; |
2011 | middle_obj = tmp; |
1853 | middle_obj = tmp; |
2012 | } |
1854 | } |
2013 | } |
1855 | } |
|
|
1856 | |
2014 | if (tmp == tmp->above) |
1857 | if (tmp == tmp->above) |
2015 | { |
1858 | { |
2016 | LOG (llevError, "Error in structure of map\n"); |
1859 | LOG (llevError, "Error in structure of map\n"); |
2017 | exit (-1); |
1860 | exit (-1); |
2018 | } |
1861 | } |
2019 | |
1862 | |
2020 | move_slow |= tmp->move_slow; |
1863 | move_slow |= tmp->move_slow; |
2021 | move_block |= tmp->move_block; |
1864 | move_block |= tmp->move_block; |
2022 | move_on |= tmp->move_on; |
1865 | move_on |= tmp->move_on; |
2023 | move_off |= tmp->move_off; |
1866 | move_off |= tmp->move_off; |
2024 | move_allow |= tmp->move_allow; |
1867 | move_allow |= tmp->move_allow; |
2025 | |
1868 | |
2026 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
|
|
2027 | flags |= P_IS_ALIVE; |
|
|
2028 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) |
|
|
2029 | flags |= P_NO_MAGIC; |
|
|
2030 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) |
|
|
2031 | flags |= P_NO_CLERIC; |
|
|
2032 | if (tmp->type == SAFE_GROUND) |
|
|
2033 | flags |= P_SAFE; |
|
|
2034 | |
|
|
2035 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) |
1869 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; |
2036 | flags |= P_BLOCKSVIEW; |
1870 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; |
2037 | } /* for stack of objects */ |
1871 | if (tmp->type == PLAYER) flags |= P_PLAYER; |
2038 | |
1872 | if (tmp->type == SAFE_GROUND) flags |= P_SAFE; |
2039 | /* we don't want to rely on this function to have accurate flags, but |
1873 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; |
2040 | * since we're already doing the work, we calculate them here. |
1874 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; |
2041 | * if they don't match, logic is broken someplace. |
|
|
2042 | */ |
|
|
2043 | if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR))) |
|
|
2044 | { |
1875 | } |
2045 | LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", |
1876 | |
2046 | m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); |
1877 | this->light = light; |
2047 | } |
1878 | this->flags_ = flags; |
2048 | SET_MAP_FLAGS (m, x, y, flags); |
1879 | this->move_block = move_block & ~move_allow; |
2049 | SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); |
1880 | this->move_on = move_on; |
2050 | SET_MAP_MOVE_ON (m, x, y, move_on); |
1881 | this->move_off = move_off; |
2051 | SET_MAP_MOVE_OFF (m, x, y, move_off); |
1882 | this->move_slow = move_slow; |
2052 | SET_MAP_MOVE_SLOW (m, x, y, move_slow); |
|
|
2053 | |
1883 | |
2054 | /* At this point, we have a floor face (if there is a floor), |
1884 | /* At this point, we have a floor face (if there is a floor), |
2055 | * and the floor is set - we are not going to touch it at |
1885 | * and the floor is set - we are not going to touch it at |
2056 | * this point. |
1886 | * this point. |
2057 | * middle contains the highest visibility face. |
1887 | * middle contains the highest visibility face. |
… | |
… | |
2111 | break; |
1941 | break; |
2112 | } |
1942 | } |
2113 | } |
1943 | } |
2114 | } |
1944 | } |
2115 | } |
1945 | } |
|
|
1946 | |
2116 | if (middle == floor) |
1947 | if (middle == floor) |
2117 | middle = blank_face; |
1948 | middle = blank_face; |
|
|
1949 | |
2118 | if (top == middle) |
1950 | if (top == middle) |
2119 | middle = blank_face; |
1951 | middle = blank_face; |
2120 | SET_MAP_FACE (m, x, y, top, 0); |
|
|
2121 | if (top != blank_face) |
|
|
2122 | SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); |
|
|
2123 | else |
|
|
2124 | SET_MAP_FACE_OBJ (m, x, y, NULL, 0); |
|
|
2125 | SET_MAP_FACE (m, x, y, middle, 1); |
|
|
2126 | if (middle != blank_face) |
|
|
2127 | SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); |
|
|
2128 | else |
|
|
2129 | SET_MAP_FACE_OBJ (m, x, y, NULL, 1); |
|
|
2130 | SET_MAP_FACE (m, x, y, floor, 2); |
|
|
2131 | if (floor != blank_face) |
|
|
2132 | SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); |
|
|
2133 | else |
|
|
2134 | SET_MAP_FACE_OBJ (m, x, y, NULL, 2); |
|
|
2135 | SET_MAP_LIGHT (m, x, y, light); |
|
|
2136 | } |
|
|
2137 | |
1952 | |
|
|
1953 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
|
|
1954 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
|
|
1955 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
|
|
1956 | } |
2138 | |
1957 | |
2139 | void |
1958 | void |
2140 | set_map_reset_time (maptile *map) |
1959 | set_map_reset_time (maptile *map) |
2141 | { |
1960 | { |
2142 | int timeout; |
1961 | int timeout; |
2143 | |
1962 | |
2144 | timeout = MAP_RESET_TIMEOUT (map); |
1963 | timeout = map->reset_timeout; |
2145 | if (timeout <= 0) |
1964 | if (timeout <= 0) |
2146 | timeout = MAP_DEFAULTRESET; |
1965 | timeout = MAP_DEFAULTRESET; |
2147 | if (timeout >= MAP_MAXRESET) |
1966 | if (timeout >= MAP_MAXRESET) |
2148 | timeout = MAP_MAXRESET; |
1967 | timeout = MAP_MAXRESET; |
2149 | MAP_WHEN_RESET (map) = seconds () + timeout; |
1968 | map->reset_time = time (0) + timeout; |
2150 | } |
1969 | } |
2151 | |
1970 | |
2152 | /* this updates the orig_map->tile_map[tile_num] value after loading |
1971 | /* this updates the orig_map->tile_map[tile_num] value after loading |
2153 | * the map. It also takes care of linking back the freshly loaded |
1972 | * the map. It also takes care of linking back the freshly loaded |
2154 | * maps tile_map values if it tiles back to this one. It returns |
1973 | * maps tile_map values if it tiles back to this one. It returns |
… | |
… | |
2182 | * |
2001 | * |
2183 | */ |
2002 | */ |
2184 | int |
2003 | int |
2185 | out_of_map (maptile *m, int x, int y) |
2004 | out_of_map (maptile *m, int x, int y) |
2186 | { |
2005 | { |
2187 | |
|
|
2188 | /* If we get passed a null map, this is obviously the |
2006 | /* If we get passed a null map, this is obviously the |
2189 | * case. This generally shouldn't happen, but if the |
2007 | * case. This generally shouldn't happen, but if the |
2190 | * map loads fail below, it could happen. |
2008 | * map loads fail below, it could happen. |
2191 | */ |
2009 | */ |
2192 | if (!m) |
2010 | if (!m) |
… | |
… | |
2194 | |
2012 | |
2195 | if (x < 0) |
2013 | if (x < 0) |
2196 | { |
2014 | { |
2197 | if (!m->tile_path[3]) |
2015 | if (!m->tile_path[3]) |
2198 | return 1; |
2016 | return 1; |
|
|
2017 | |
2199 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2018 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2200 | { |
|
|
2201 | load_and_link_tiled_map (m, 3); |
2019 | load_and_link_tiled_map (m, 3); |
2202 | } |
2020 | |
2203 | return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); |
2021 | return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); |
2204 | } |
2022 | } |
2205 | if (x >= MAP_WIDTH (m)) |
2023 | |
|
|
2024 | if (x >= m->width) |
2206 | { |
2025 | { |
2207 | if (!m->tile_path[1]) |
2026 | if (!m->tile_path[1]) |
2208 | return 1; |
2027 | return 1; |
|
|
2028 | |
2209 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2029 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2210 | { |
|
|
2211 | load_and_link_tiled_map (m, 1); |
2030 | load_and_link_tiled_map (m, 1); |
2212 | } |
2031 | |
2213 | return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); |
2032 | return (out_of_map (m->tile_map[1], x - m->width, y)); |
2214 | } |
2033 | } |
|
|
2034 | |
2215 | if (y < 0) |
2035 | if (y < 0) |
2216 | { |
2036 | { |
2217 | if (!m->tile_path[0]) |
2037 | if (!m->tile_path[0]) |
2218 | return 1; |
2038 | return 1; |
|
|
2039 | |
2219 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2040 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2220 | { |
|
|
2221 | load_and_link_tiled_map (m, 0); |
2041 | load_and_link_tiled_map (m, 0); |
2222 | } |
2042 | |
2223 | return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); |
2043 | return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); |
2224 | } |
2044 | } |
2225 | if (y >= MAP_HEIGHT (m)) |
2045 | |
|
|
2046 | if (y >= m->height) |
2226 | { |
2047 | { |
2227 | if (!m->tile_path[2]) |
2048 | if (!m->tile_path[2]) |
2228 | return 1; |
2049 | return 1; |
|
|
2050 | |
2229 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2051 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2230 | { |
|
|
2231 | load_and_link_tiled_map (m, 2); |
2052 | load_and_link_tiled_map (m, 2); |
2232 | } |
2053 | |
2233 | return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); |
2054 | return (out_of_map (m->tile_map[2], x, y - m->height)); |
2234 | } |
2055 | } |
2235 | |
2056 | |
2236 | /* Simple case - coordinates are within this local |
2057 | /* Simple case - coordinates are within this local |
2237 | * map. |
2058 | * map. |
2238 | */ |
2059 | */ |
… | |
… | |
2252 | { |
2073 | { |
2253 | |
2074 | |
2254 | if (*x < 0) |
2075 | if (*x < 0) |
2255 | { |
2076 | { |
2256 | if (!m->tile_path[3]) |
2077 | if (!m->tile_path[3]) |
2257 | return NULL; |
2078 | return 0; |
2258 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2079 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2259 | load_and_link_tiled_map (m, 3); |
2080 | load_and_link_tiled_map (m, 3); |
2260 | |
2081 | |
2261 | *x += MAP_WIDTH (m->tile_map[3]); |
2082 | *x += m->tile_map[3]->width; |
2262 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2083 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2263 | } |
2084 | } |
2264 | if (*x >= MAP_WIDTH (m)) |
2085 | |
|
|
2086 | if (*x >= m->width) |
2265 | { |
2087 | { |
2266 | if (!m->tile_path[1]) |
2088 | if (!m->tile_path[1]) |
2267 | return NULL; |
2089 | return 0; |
|
|
2090 | |
2268 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2091 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2269 | load_and_link_tiled_map (m, 1); |
2092 | load_and_link_tiled_map (m, 1); |
2270 | |
2093 | |
2271 | *x -= MAP_WIDTH (m); |
2094 | *x -= m->width; |
2272 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2095 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2273 | } |
2096 | } |
|
|
2097 | |
2274 | if (*y < 0) |
2098 | if (*y < 0) |
2275 | { |
2099 | { |
2276 | if (!m->tile_path[0]) |
2100 | if (!m->tile_path[0]) |
2277 | return NULL; |
2101 | return 0; |
|
|
2102 | |
2278 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2103 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2279 | load_and_link_tiled_map (m, 0); |
2104 | load_and_link_tiled_map (m, 0); |
2280 | |
2105 | |
2281 | *y += MAP_HEIGHT (m->tile_map[0]); |
2106 | *y += m->tile_map[0]->height; |
2282 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2107 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2283 | } |
2108 | } |
2284 | if (*y >= MAP_HEIGHT (m)) |
2109 | |
|
|
2110 | if (*y >= m->height) |
2285 | { |
2111 | { |
2286 | if (!m->tile_path[2]) |
2112 | if (!m->tile_path[2]) |
2287 | return NULL; |
2113 | return 0; |
|
|
2114 | |
2288 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2115 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2289 | load_and_link_tiled_map (m, 2); |
2116 | load_and_link_tiled_map (m, 2); |
2290 | |
2117 | |
2291 | *y -= MAP_HEIGHT (m); |
2118 | *y -= m->height; |
2292 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2119 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2293 | } |
2120 | } |
2294 | |
2121 | |
2295 | /* Simple case - coordinates are within this local |
2122 | /* Simple case - coordinates are within this local |
2296 | * map. |
2123 | * map. |
… | |
… | |
2316 | |
2143 | |
2317 | } |
2144 | } |
2318 | else if (map1->tile_map[0] == map2) |
2145 | else if (map1->tile_map[0] == map2) |
2319 | { /* up */ |
2146 | { /* up */ |
2320 | *dx = 0; |
2147 | *dx = 0; |
2321 | *dy = -MAP_HEIGHT (map2); |
2148 | *dy = -map2->height; |
2322 | } |
2149 | } |
2323 | else if (map1->tile_map[1] == map2) |
2150 | else if (map1->tile_map[1] == map2) |
2324 | { /* right */ |
2151 | { /* right */ |
2325 | *dx = MAP_WIDTH (map1); |
2152 | *dx = map1->width; |
2326 | *dy = 0; |
2153 | *dy = 0; |
2327 | } |
2154 | } |
2328 | else if (map1->tile_map[2] == map2) |
2155 | else if (map1->tile_map[2] == map2) |
2329 | { /* down */ |
2156 | { /* down */ |
2330 | *dx = 0; |
2157 | *dx = 0; |
2331 | *dy = MAP_HEIGHT (map1); |
2158 | *dy = map1->height; |
2332 | } |
2159 | } |
2333 | else if (map1->tile_map[3] == map2) |
2160 | else if (map1->tile_map[3] == map2) |
2334 | { /* left */ |
2161 | { /* left */ |
2335 | *dx = -MAP_WIDTH (map2); |
2162 | *dx = -map2->width; |
2336 | *dy = 0; |
2163 | *dy = 0; |
2337 | |
2164 | |
2338 | } |
2165 | } |
2339 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2166 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2340 | { /* up right */ |
2167 | { /* up right */ |
2341 | *dx = MAP_WIDTH (map1->tile_map[0]); |
2168 | *dx = map1->tile_map[0]->width; |
2342 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2169 | *dy = -map1->tile_map[0]->height; |
2343 | } |
2170 | } |
2344 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2171 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2345 | { /* up left */ |
2172 | { /* up left */ |
2346 | *dx = -MAP_WIDTH (map2); |
2173 | *dx = -map2->width; |
2347 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2174 | *dy = -map1->tile_map[0]->height; |
2348 | } |
2175 | } |
2349 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2176 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2350 | { /* right up */ |
2177 | { /* right up */ |
2351 | *dx = MAP_WIDTH (map1); |
2178 | *dx = map1->width; |
2352 | *dy = -MAP_HEIGHT (map2); |
2179 | *dy = -map2->height; |
2353 | } |
2180 | } |
2354 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2181 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2355 | { /* right down */ |
2182 | { /* right down */ |
2356 | *dx = MAP_WIDTH (map1); |
2183 | *dx = map1->width; |
2357 | *dy = MAP_HEIGHT (map1->tile_map[1]); |
2184 | *dy = map1->tile_map[1]->height; |
2358 | } |
2185 | } |
2359 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2186 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2360 | { /* down right */ |
2187 | { /* down right */ |
2361 | *dx = MAP_WIDTH (map1->tile_map[2]); |
2188 | *dx = map1->tile_map[2]->width; |
2362 | *dy = MAP_HEIGHT (map1); |
2189 | *dy = map1->height; |
2363 | } |
2190 | } |
2364 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2191 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2365 | { /* down left */ |
2192 | { /* down left */ |
2366 | *dx = -MAP_WIDTH (map2); |
2193 | *dx = -map2->width; |
2367 | *dy = MAP_HEIGHT (map1); |
2194 | *dy = map1->height; |
2368 | } |
2195 | } |
2369 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2196 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2370 | { /* left up */ |
2197 | { /* left up */ |
2371 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2198 | *dx = -map1->tile_map[3]->width; |
2372 | *dy = -MAP_HEIGHT (map2); |
2199 | *dy = -map2->height; |
2373 | } |
2200 | } |
2374 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2201 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2375 | { /* left down */ |
2202 | { /* left down */ |
2376 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2203 | *dx = -map1->tile_map[3]->width; |
2377 | *dy = MAP_HEIGHT (map1->tile_map[3]); |
2204 | *dy = map1->tile_map[3]->height; |
2378 | |
2205 | |
2379 | } |
2206 | } |
2380 | else |
2207 | else |
2381 | { /* not "adjacent" enough */ |
2208 | { /* not "adjacent" enough */ |
2382 | return 0; |
2209 | return 0; |
… | |
… | |
2507 | { |
2334 | { |
2508 | int dx, dy; |
2335 | int dx, dy; |
2509 | |
2336 | |
2510 | return adjacent_map (op1->map, op2->map, &dx, &dy); |
2337 | return adjacent_map (op1->map, op2->map, &dx, &dy); |
2511 | } |
2338 | } |
|
|
2339 | |
|
|
2340 | object * |
|
|
2341 | maptile::insert (object *op, int x, int y, object *originator, int flags) |
|
|
2342 | { |
|
|
2343 | if (!op->flag [FLAG_REMOVED]) |
|
|
2344 | op->remove (); |
|
|
2345 | |
|
|
2346 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
|
|
2347 | } |
|
|
2348 | |