… | |
… | |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
|
|
26 | #include <funcpoint.h> |
|
|
27 | |
|
|
28 | #include <loader.h> |
|
|
29 | #include <unistd.h> |
25 | #include <unistd.h> |
|
|
26 | |
|
|
27 | #include "global.h" |
|
|
28 | #include "funcpoint.h" |
|
|
29 | |
|
|
30 | #include "loader.h" |
30 | |
31 | |
31 | #include "path.h" |
32 | #include "path.h" |
32 | |
33 | |
33 | /* |
34 | /* |
34 | * This makes a path absolute outside the world of Crossfire. |
35 | * This makes a path absolute outside the world of Crossfire. |
… | |
… | |
67 | char *endbuf; |
68 | char *endbuf; |
68 | struct stat statbuf; |
69 | struct stat statbuf; |
69 | int mode = 0; |
70 | int mode = 0; |
70 | |
71 | |
71 | if (prepend_dir) |
72 | if (prepend_dir) |
72 | strcpy (buf, create_pathname (name)); |
73 | assign (buf, create_pathname (name)); |
73 | else |
74 | else |
74 | strcpy (buf, name); |
75 | assign (buf, name); |
75 | |
76 | |
76 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
77 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
77 | * this method should be equivalant and is clearer. |
78 | * this method should be equivalant and is clearer. |
78 | * Can not use strcat because we need to cycle through |
79 | * Can not use strcat because we need to cycle through |
79 | * all the names. |
80 | * all the names. |
… | |
… | |
568 | maptile::maptile () |
569 | maptile::maptile () |
569 | { |
570 | { |
570 | in_memory = MAP_SWAPPED; |
571 | in_memory = MAP_SWAPPED; |
571 | |
572 | |
572 | /* The maps used to pick up default x and y values from the |
573 | /* The maps used to pick up default x and y values from the |
573 | * map archetype. Mimic that behaviour. |
574 | * map archetype. Mimic that behaviour. |
574 | */ |
575 | */ |
575 | width = 16; |
576 | width = 16; |
576 | height = 16; |
577 | height = 16; |
577 | reset_timeout = 0; |
|
|
578 | timeout = 300; |
578 | timeout = 300; |
579 | enter_x = 0; |
579 | max_nrof = 1000; // 1000 items of anything |
580 | enter_y = 0; |
580 | max_volume = 2000000; // 2m³ |
581 | } |
581 | } |
582 | |
582 | |
583 | maptile::maptile (int w, int h) |
583 | maptile::maptile (int w, int h) |
584 | { |
584 | { |
585 | in_memory = MAP_SWAPPED; |
585 | in_memory = MAP_SWAPPED; |
… | |
… | |
739 | { |
739 | { |
740 | keyword kw = thawer.get_kv (); |
740 | keyword kw = thawer.get_kv (); |
741 | |
741 | |
742 | switch (kw) |
742 | switch (kw) |
743 | { |
743 | { |
744 | case KW_EOF: |
|
|
745 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
|
|
746 | return false; |
|
|
747 | |
|
|
748 | case KW_end: |
|
|
749 | return true; |
|
|
750 | |
|
|
751 | default: |
|
|
752 | case KW_ERROR: |
|
|
753 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
754 | break; |
|
|
755 | |
|
|
756 | case KW_msg: |
744 | case KW_msg: |
757 | thawer.get_ml (KW_endmsg, msg); |
745 | thawer.get_ml (KW_endmsg, msg); |
758 | break; |
746 | break; |
759 | |
747 | |
760 | case KW_lore: // CF+ extension |
748 | case KW_lore: // CF+ extension |
… | |
… | |
810 | |
798 | |
811 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
799 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
812 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
800 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
813 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
801 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
814 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
802 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
|
|
803 | |
|
|
804 | case KW_end: |
|
|
805 | return true; |
|
|
806 | |
|
|
807 | default: |
|
|
808 | if (!thawer.parse_error (kw, "map", 0)) |
|
|
809 | return false; |
|
|
810 | break; |
815 | } |
811 | } |
816 | } |
812 | } |
817 | |
813 | |
818 | abort (); |
814 | abort (); |
819 | } |
815 | } |
… | |
… | |
1280 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1276 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1281 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1277 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1282 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
1278 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
1283 | } |
1279 | } |
1284 | |
1280 | |
|
|
1281 | uint64 |
|
|
1282 | mapspace::volume () const |
|
|
1283 | { |
|
|
1284 | uint64 vol = 0; |
|
|
1285 | |
|
|
1286 | for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below) |
|
|
1287 | vol += op->volume (); |
|
|
1288 | |
|
|
1289 | return vol; |
|
|
1290 | } |
|
|
1291 | |
1285 | /* this updates the orig_map->tile_map[tile_num] value after finding |
1292 | /* this updates the orig_map->tile_map[tile_num] value after finding |
1286 | * the map. It also takes care of linking back the freshly found |
1293 | * the map. It also takes care of linking back the freshly found |
1287 | * maps tile_map values if it tiles back to this one. It returns |
1294 | * maps tile_map values if it tiles back to this one. It returns |
1288 | * the value of orig_map->tile_map[tile_num]. |
1295 | * the value of orig_map->tile_map[tile_num]. |
1289 | */ |
1296 | */ |
… | |
… | |
1697 | return default_region; |
1704 | return default_region; |
1698 | |
1705 | |
1699 | return ::region::default_region (); |
1706 | return ::region::default_region (); |
1700 | } |
1707 | } |
1701 | |
1708 | |
|
|
1709 | |