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