… | |
… | |
550 | } |
550 | } |
551 | |
551 | |
552 | |
552 | |
553 | switch (i) |
553 | switch (i) |
554 | { |
554 | { |
555 | case LL_NORMAL: |
555 | case LL_NORMAL: |
556 | /* if we are loading an overlay, put the floors on the bottom */ |
556 | /* if we are loading an overlay, put the floors on the bottom */ |
557 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
557 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
558 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
558 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
559 | else |
559 | else |
560 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
560 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
561 | |
561 | |
562 | if (op->inv) |
562 | if (op->inv) |
563 | sum_weight (op); |
563 | sum_weight (op); |
564 | |
564 | |
565 | prev = op, last_more = op; |
565 | prev = op, last_more = op; |
566 | break; |
566 | break; |
567 | |
567 | |
568 | case LL_MORE: |
568 | case LL_MORE: |
569 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
569 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
570 | op->head = prev, last_more->more = op, last_more = op; |
570 | op->head = prev, last_more->more = op, last_more = op; |
571 | break; |
571 | break; |
572 | } |
572 | } |
573 | |
573 | |
574 | if (mapflags & MAP_STYLE) |
574 | if (mapflags & MAP_STYLE) |
575 | remove_from_active_list (op); |
575 | remove_from_active_list (op); |
576 | |
576 | |
… | |
… | |
586 | /* check for unique items, or unique squares */ |
586 | /* check for unique items, or unique squares */ |
587 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
587 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
588 | { |
588 | { |
589 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
589 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
590 | unique = 1; |
590 | unique = 1; |
|
|
591 | |
591 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
592 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
592 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
593 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
593 | } |
594 | } |
594 | } |
595 | } |
595 | } |
596 | } |
… | |
… | |
967 | /* first strcmp value on these are old names supported |
968 | /* first strcmp value on these are old names supported |
968 | * for compatibility reasons. The new values (second) are |
969 | * for compatibility reasons. The new values (second) are |
969 | * what really should be used. |
970 | * what really should be used. |
970 | */ |
971 | */ |
971 | else if (!strcmp (key, "oid")) |
972 | else if (!strcmp (key, "oid")) |
972 | { |
|
|
973 | fp.get (m, atoi (value)); |
973 | fp.get (m, atoi (value)); |
974 | } |
|
|
975 | else if (!strcmp (key, "attach")) |
974 | else if (!strcmp (key, "attach")) |
976 | { |
|
|
977 | m->attach = value; |
975 | m->attach = value; |
978 | } |
|
|
979 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
976 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
980 | { |
|
|
981 | m->enter_x = atoi (value); |
977 | m->enter_x = atoi (value); |
982 | } |
|
|
983 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
978 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
984 | { |
|
|
985 | m->enter_y = atoi (value); |
979 | m->enter_y = atoi (value); |
986 | } |
|
|
987 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
980 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
988 | { |
|
|
989 | m->width = atoi (value); |
981 | m->width = atoi (value); |
990 | } |
|
|
991 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
982 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
992 | { |
|
|
993 | m->height = atoi (value); |
983 | m->height = atoi (value); |
994 | } |
|
|
995 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
984 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
996 | { |
|
|
997 | m->reset_timeout = atoi (value); |
985 | m->reset_timeout = atoi (value); |
998 | } |
|
|
999 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
986 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
1000 | { |
|
|
1001 | m->timeout = atoi (value); |
987 | m->timeout = atoi (value); |
1002 | } |
|
|
1003 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
988 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
1004 | { |
989 | m->difficulty = clamp (atoi (value), 1, settings.max_level); |
1005 | m->difficulty = atoi (value); |
|
|
1006 | } |
|
|
1007 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
990 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
1008 | { |
|
|
1009 | m->darkness = atoi (value); |
991 | m->darkness = atoi (value); |
1010 | } |
|
|
1011 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
992 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
1012 | { |
|
|
1013 | m->fixed_resettime = atoi (value); |
993 | m->fixed_resettime = atoi (value); |
1014 | } |
|
|
1015 | else if (!strcmp (key, "unique")) |
994 | else if (!strcmp (key, "unique")) |
1016 | { |
|
|
1017 | m->unique = atoi (value); |
995 | m->unique = atoi (value); |
1018 | } |
|
|
1019 | else if (!strcmp (key, "template")) |
996 | else if (!strcmp (key, "template")) |
1020 | { |
|
|
1021 | m->templatemap = atoi (value); |
997 | m->templatemap = atoi (value); |
1022 | } |
|
|
1023 | else if (!strcmp (key, "region")) |
998 | else if (!strcmp (key, "region")) |
1024 | { |
|
|
1025 | m->region = get_region_by_name (value); |
999 | m->region = get_region_by_name (value); |
1026 | } |
|
|
1027 | else if (!strcmp (key, "shopitems")) |
1000 | else if (!strcmp (key, "shopitems")) |
1028 | { |
1001 | { |
1029 | *end = 0; |
1002 | *end = 0; |
1030 | m->shopitems = parse_shop_string (value); |
1003 | m->shopitems = parse_shop_string (value); |
1031 | } |
1004 | } |
1032 | else if (!strcmp (key, "shopgreed")) |
1005 | else if (!strcmp (key, "shopgreed")) |
1033 | { |
|
|
1034 | m->shopgreed = atof (value); |
1006 | m->shopgreed = atof (value); |
1035 | } |
|
|
1036 | else if (!strcmp (key, "shopmin")) |
1007 | else if (!strcmp (key, "shopmin")) |
1037 | { |
|
|
1038 | m->shopmin = atol (value); |
1008 | m->shopmin = atol (value); |
1039 | } |
|
|
1040 | else if (!strcmp (key, "shopmax")) |
1009 | else if (!strcmp (key, "shopmax")) |
1041 | { |
|
|
1042 | m->shopmax = atol (value); |
1010 | m->shopmax = atol (value); |
1043 | } |
|
|
1044 | else if (!strcmp (key, "shoprace")) |
1011 | else if (!strcmp (key, "shoprace")) |
1045 | { |
1012 | { |
1046 | *end = 0; |
1013 | *end = 0; |
1047 | m->shoprace = strdup_local (value); |
1014 | m->shoprace = strdup_local (value); |
1048 | } |
1015 | } |
1049 | else if (!strcmp (key, "outdoor")) |
1016 | else if (!strcmp (key, "outdoor")) |
1050 | { |
|
|
1051 | m->outdoor = atoi (value); |
1017 | m->outdoor = atoi (value); |
1052 | } |
|
|
1053 | else if (!strcmp (key, "temp")) |
1018 | else if (!strcmp (key, "temp")) |
1054 | { |
|
|
1055 | m->temp = atoi (value); |
1019 | m->temp = atoi (value); |
1056 | } |
|
|
1057 | else if (!strcmp (key, "pressure")) |
1020 | else if (!strcmp (key, "pressure")) |
1058 | { |
|
|
1059 | m->pressure = atoi (value); |
1021 | m->pressure = atoi (value); |
1060 | } |
|
|
1061 | else if (!strcmp (key, "humid")) |
1022 | else if (!strcmp (key, "humid")) |
1062 | { |
|
|
1063 | m->humid = atoi (value); |
1023 | m->humid = atoi (value); |
1064 | } |
|
|
1065 | else if (!strcmp (key, "windspeed")) |
1024 | else if (!strcmp (key, "windspeed")) |
1066 | { |
|
|
1067 | m->windspeed = atoi (value); |
1025 | m->windspeed = atoi (value); |
1068 | } |
|
|
1069 | else if (!strcmp (key, "winddir")) |
1026 | else if (!strcmp (key, "winddir")) |
1070 | { |
|
|
1071 | m->winddir = atoi (value); |
1027 | m->winddir = atoi (value); |
1072 | } |
|
|
1073 | else if (!strcmp (key, "sky")) |
1028 | else if (!strcmp (key, "sky")) |
1074 | { |
|
|
1075 | m->sky = atoi (value); |
1029 | m->sky = atoi (value); |
1076 | } |
|
|
1077 | else if (!strcmp (key, "nosmooth")) |
1030 | else if (!strcmp (key, "nosmooth")) |
1078 | { |
|
|
1079 | m->nosmooth = atoi (value); |
1031 | m->nosmooth = atoi (value); |
1080 | } |
|
|
1081 | else if (!strncmp (key, "tile_path_", 10)) |
1032 | else if (!strncmp (key, "tile_path_", 10)) |
1082 | { |
1033 | { |
1083 | int tile = atoi (key + 10); |
1034 | int tile = atoi (key + 10); |
1084 | |
1035 | |
1085 | if (tile < 1 || tile > 4) |
1036 | if (tile < 1 || tile > 4) |
… | |
… | |
1128 | m->tile_path[tile - 1] = strdup_local (path); |
1079 | m->tile_path[tile - 1] = strdup_local (path); |
1129 | } |
1080 | } |
1130 | } /* end if tile direction (in)valid */ |
1081 | } /* end if tile direction (in)valid */ |
1131 | } |
1082 | } |
1132 | else |
1083 | else |
1133 | { |
|
|
1134 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1084 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1135 | } |
|
|
1136 | } |
1085 | } |
|
|
1086 | |
1137 | if (!key || strcmp (key, "end")) |
1087 | if (!key || strcmp (key, "end")) |
1138 | { |
1088 | { |
1139 | LOG (llevError, "Got premature eof on map header!\n"); |
1089 | LOG (llevError, "Got premature eof on map header!\n"); |
1140 | return 1; |
1090 | return 1; |
1141 | } |
1091 | } |
|
|
1092 | |
1142 | return 0; |
1093 | return 0; |
1143 | } |
1094 | } |
1144 | |
1095 | |
1145 | /* |
1096 | /* |
1146 | * Opens the file "filename" and reads information about the map |
1097 | * Opens the file "filename" and reads information about the map |