ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.10 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.17 by root, Thu Aug 31 06:23:19 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.10 2006/08/28 14:05:23 root Exp $"; 3 * "$Id: map.C,v 1.17 2006/08/31 06:23:19 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
173 * Can not use strcat because we need to cycle through 173 * Can not use strcat because we need to cycle through
174 * all the names. 174 * all the names.
175 */ 175 */
176 endbuf = buf + strlen(buf); 176 endbuf = buf + strlen(buf);
177 177
178 for (i = 0; i < NROF_COMPRESS_METHODS; i++) {
179 if (uncomp[i][0])
180 strcpy(endbuf, uncomp[i][0]);
181 else
182 *endbuf = '\0';
183 if (!stat (buf, &statbuf)) 178 if (stat (buf, &statbuf))
184 break;
185 }
186 if (i == NROF_COMPRESS_METHODS)
187 return (-1); 179 return -1;
188 if (!S_ISREG (statbuf.st_mode)) 180 if (!S_ISREG (statbuf.st_mode))
189 return (-1); 181 return (-1);
190 182
191 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) || 183 if (((statbuf.st_mode & S_IRGRP) && getegid() == statbuf.st_gid) ||
192 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) || 184 ((statbuf.st_mode & S_IRUSR) && geteuid() == statbuf.st_uid) ||
… …
793 * currently, there are few enough fields this is not a big deal. 785 * currently, there are few enough fields this is not a big deal.
794 * MSW 2001-07-01 786 * MSW 2001-07-01
795 * return 0 on success, 1 on failure. 787 * return 0 on success, 1 on failure.
796 */ 788 */
797 789
798static int load_map_header(FILE *fp, mapstruct *m) 790static int load_map_header(object_thawer &fp, mapstruct *m)
799{ 791{
800 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 792 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end;
801 int msgpos=0; 793 int msgpos=0;
802 int maplorepos=0; 794 int maplorepos=0;
803 795
… …
893 } 885 }
894 /* first strcmp value on these are old names supported 886 /* first strcmp value on these are old names supported
895 * for compatibility reasons. The new values (second) are 887 * for compatibility reasons. The new values (second) are
896 * what really should be used. 888 * what really should be used.
897 */ 889 */
890 else if (!strcmp(key,"oid")) {
891 fp.get (m, atoi(value));
892 } else if (!strcmp(key, "attach")) {
893 m->attach = add_string (value);
898 else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 894 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
899 m->enter_x = atoi(value); 895 m->enter_x = atoi(value);
900 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 896 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
901 m->enter_y = atoi(value); 897 m->enter_y = atoi(value);
902 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 898 } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
903 m->width = atoi(value); 899 m->width = atoi(value);
… …
945 m->winddir = atoi(value); 941 m->winddir = atoi(value);
946 } else if (!strcmp(key, "sky")) { 942 } else if (!strcmp(key, "sky")) {
947 m->sky = atoi(value); 943 m->sky = atoi(value);
948 } else if (!strcmp(key, "nosmooth")) { 944 } else if (!strcmp(key, "nosmooth")) {
949 m->nosmooth = atoi(value); 945 m->nosmooth = atoi(value);
950 } else if (!strcmp(key, "safe_map")) {
951 m->safe_map = atoi(value);
952 } 946 }
953 else if (!strncmp(key,"tile_path_", 10)) { 947 else if (!strncmp(key,"tile_path_", 10)) {
954 int tile=atoi(key+10); 948 int tile=atoi(key+10);
955 949
956 if (tile<1 || tile>4) { 950 if (tile<1 || tile>4) {
… …
1013 * MAP_STYLE: style map - don't add active objects, don't add to server 1007 * MAP_STYLE: style map - don't add active objects, don't add to server
1014 * managed map list. 1008 * managed map list.
1015 */ 1009 */
1016 1010
1017mapstruct *load_original_map(const char *filename, int flags) { 1011mapstruct *load_original_map(const char *filename, int flags) {
1018 FILE *fp;
1019 mapstruct *m; 1012 mapstruct *m;
1020 int comp;
1021 char pathname[MAX_BUF]; 1013 char pathname[MAX_BUF];
1022 1014
1023 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); 1015 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1024 if (flags & MAP_PLAYER_UNIQUE) 1016 if (flags & MAP_PLAYER_UNIQUE)
1025 strcpy(pathname, filename); 1017 strcpy(pathname, filename);
1026 else if (flags & MAP_OVERLAY) 1018 else if (flags & MAP_OVERLAY)
1027 strcpy(pathname, create_overlay_pathname(filename)); 1019 strcpy(pathname, create_overlay_pathname(filename));
1028 else 1020 else
1029 strcpy(pathname, create_pathname(filename)); 1021 strcpy(pathname, create_pathname(filename));
1030 1022
1031 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1032 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
1033 return (NULL);
1034 }
1035
1036 object_thawer thawer (fp, filename); 1023 object_thawer thawer (pathname);
1024
1025 if (!thawer)
1026 return 0;
1037 1027
1038 m = get_linked_map(); 1028 m = get_linked_map();
1039 1029
1040 strcpy (m->path, filename); 1030 strcpy (m->path, filename);
1041 if (load_map_header(fp, m)) { 1031 if (load_map_header(thawer, m)) {
1042 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1032 LOG(llevError,"Error loading map header for %s, flags=%d\n",
1043 filename, flags); 1033 filename, flags);
1044 delete_map(m); 1034 delete_map(m);
1045 return NULL; 1035 return NULL;
1046 } 1036 }
1047 1037
1048 allocate_map(m); 1038 allocate_map(m);
1049 1039
1050 m->in_memory=MAP_LOADING; 1040 m->in_memory=MAP_LOADING;
1051 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); 1041 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1052 close_and_delete(fp, comp); 1042
1053 m->in_memory=MAP_IN_MEMORY; 1043 m->in_memory=MAP_IN_MEMORY;
1054 if (!MAP_DIFFICULTY(m)) 1044 if (!MAP_DIFFICULTY(m))
1055 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1045 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1056 set_map_reset_time(m); 1046 set_map_reset_time(m);
1057 INVOKE_MAP (INSTANTIATE, m); 1047 m->instantiate ();
1058 return (m); 1048 return (m);
1059} 1049}
1060 1050
1061/* 1051/*
1062 * Loads a map, which has been loaded earlier, from file. 1052 * Loads a map, which has been loaded earlier, from file.
1063 * Return the map object we load into (this can change from the passed 1053 * Return the map object we load into (this can change from the passed
1064 * option if we can't find the original map) 1054 * option if we can't find the original map)
1065 */ 1055 */
1066 1056
1067static mapstruct *load_temporary_map(mapstruct *m) { 1057static mapstruct *load_temporary_map(mapstruct *m) {
1068 FILE *fp;
1069 int comp; 1058 int comp;
1070 char buf[MAX_BUF]; 1059 char buf[MAX_BUF];
1071 1060
1072 if (!m->tmpname) { 1061 if (!m->tmpname) {
1073 LOG(llevError, "No temporary filename for map %s\n", m->path); 1062 LOG(llevError, "No temporary filename for map %s\n", m->path);
… …
1077 if(m==NULL) return NULL; 1066 if(m==NULL) return NULL;
1078 fix_auto_apply(m); /* Chests which open as default */ 1067 fix_auto_apply(m); /* Chests which open as default */
1079 return m; 1068 return m;
1080 } 1069 }
1081 1070
1082 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) { 1071 object_thawer thawer (m->tmpname);
1083 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno)); 1072
1073 if (!thawer)
1074 {
1084 strcpy(buf, m->path); 1075 strcpy (buf, m->path);
1085 delete_map(m); 1076 delete_map (m);
1086 m = load_original_map(buf, 0); 1077 m = load_original_map (buf, 0);
1087 if(m==NULL) return NULL; 1078 if (!m) return NULL;
1088 fix_auto_apply(m); /* Chests which open as default */ 1079 fix_auto_apply (m); /* Chests which open as default */
1089 return m; 1080 return m;
1090 } 1081 }
1091
1092 object_thawer thawer (fp, m->tmpname);
1093 1082
1094 if (load_map_header(thawer, m)) { 1083 if (load_map_header(thawer, m)) {
1095 LOG(llevError,"Error loading map header for %s (%s)\n", 1084 LOG(llevError,"Error loading map header for %s (%s)\n",
1096 m->path, m->tmpname); 1085 m->path, m->tmpname);
1097 delete_map(m); 1086 delete_map(m);
… …
1100 } 1089 }
1101 allocate_map(m); 1090 allocate_map(m);
1102 1091
1103 m->in_memory=MAP_LOADING; 1092 m->in_memory=MAP_LOADING;
1104 load_objects (m, thawer, 0); 1093 load_objects (m, thawer, 0);
1105 close_and_delete(fp, comp); 1094
1106 m->in_memory=MAP_IN_MEMORY; 1095 m->in_memory=MAP_IN_MEMORY;
1107 INVOKE_MAP (SWAPIN, m); 1096 INVOKE_MAP (SWAPIN, m);
1108 return m; 1097 return m;
1109} 1098}
1110 1099
… …
1113 * Return the map object we load into (this can change from the passed 1102 * Return the map object we load into (this can change from the passed
1114 * option if we can't find the original map) 1103 * option if we can't find the original map)
1115 */ 1104 */
1116 1105
1117mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1106mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
1118 FILE *fp;
1119 int comp;
1120 char pathname[MAX_BUF]; 1107 char pathname[MAX_BUF];
1121 1108
1122 strcpy(pathname, create_overlay_pathname(filename)); 1109 strcpy(pathname, create_overlay_pathname(filename));
1123 1110
1124 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1125/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
1126 return m;
1127 }
1128
1129 object_thawer thawer (fp, pathname); 1111 object_thawer thawer (pathname);
1112
1113 if (!thawer)
1114 return m;
1130 1115
1131 if (load_map_header(thawer, m)) { 1116 if (load_map_header(thawer, m)) {
1132 LOG(llevError,"Error loading map header for overlay %s (%s)\n", 1117 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1133 m->path, pathname); 1118 m->path, pathname);
1134 delete_map(m); 1119 delete_map(m);
… …
1137 } 1122 }
1138 /*allocate_map(m);*/ 1123 /*allocate_map(m);*/
1139 1124
1140 m->in_memory=MAP_LOADING; 1125 m->in_memory=MAP_LOADING;
1141 load_objects (m, thawer, MAP_OVERLAY); 1126 load_objects (m, thawer, MAP_OVERLAY);
1142 close_and_delete(fp, comp); 1127
1143 m->in_memory=MAP_IN_MEMORY; 1128 m->in_memory=MAP_IN_MEMORY;
1144 return m; 1129 return m;
1145} 1130}
1146 1131
1147/****************************************************************************** 1132/******************************************************************************
… …
1176/* 1161/*
1177 * Loads unique objects from file(s) into the map which is in memory 1162 * Loads unique objects from file(s) into the map which is in memory
1178 * m is the map to load unique items into. 1163 * m is the map to load unique items into.
1179 */ 1164 */
1180static void load_unique_objects(mapstruct *m) { 1165static void load_unique_objects(mapstruct *m) {
1181 FILE *fp;
1182 int comp,count; 1166 int count;
1183 char firstname[MAX_BUF]; 1167 char firstname[MAX_BUF];
1184 1168
1185 for (count=0; count<10; count++) { 1169 for (count=0; count<10; count++) {
1186 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1170 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1187 if (!access(firstname, R_OK)) break; 1171 if (!access(firstname, R_OK)) break;
1188 } 1172 }
1189 /* If we get here, we did not find any map */ 1173 /* If we get here, we did not find any map */
1190 if (count==10) return; 1174 if (count==10) return;
1191 1175
1192 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) {
1193 /* There is no expectation that every map will have unique items, but this
1194 * is debug output, so leave it in.
1195 */
1196 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1197 return;
1198 }
1199
1200 object_thawer thawer (fp, firstname); 1176 object_thawer thawer (firstname);
1177
1178 if (!thawer)
1179 return;
1201 1180
1202 m->in_memory=MAP_LOADING; 1181 m->in_memory=MAP_LOADING;
1203 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1182 if (m->tmpname == NULL) /* if we have loaded unique items from */
1204 delete_unique_items(m); /* original map before, don't duplicate them */ 1183 delete_unique_items(m); /* original map before, don't duplicate them */
1205 load_object(thawer, NULL, LO_NOREAD,0); 1184 load_object(thawer, NULL, LO_NOREAD,0);
1206 load_objects (m, thawer, 0); 1185 load_objects (m, thawer, 0);
1207 close_and_delete(fp, comp); 1186
1208 m->in_memory=MAP_IN_MEMORY; 1187 m->in_memory=MAP_IN_MEMORY;
1209} 1188}
1210 1189
1211 1190
1212/* 1191/*
… …
1246 } 1225 }
1247 else 1226 else
1248 { 1227 {
1249 if (!m->tmpname) 1228 if (!m->tmpname)
1250 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1229 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1230
1251 strcpy (filename, m->tmpname); 1231 strcpy (filename, m->tmpname);
1252 } 1232 }
1253 1233
1254 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1234 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1255 m->in_memory = MAP_SAVING; 1235 m->in_memory = MAP_SAVING;
1256 1236
1257 object_freezer fp (filename); 1237 object_freezer freezer;
1258 1238
1259 /* legacy */ 1239 /* legacy */
1260 fprintf (fp, "arch map\n"); 1240 fprintf (freezer, "arch map\n");
1261 if (m->name) 1241 if (m->name)
1262 fprintf (fp, "name %s\n", m->name); 1242 fprintf (freezer, "name %s\n", m->name);
1263 if (!flag) 1243 if (!flag)
1264 fprintf (fp, "swap_time %d\n", m->swap_time); 1244 fprintf (freezer, "swap_time %d\n", m->swap_time);
1265 if (m->reset_timeout) 1245 if (m->reset_timeout)
1266 fprintf (fp, "reset_timeout %d\n", m->reset_timeout); 1246 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1267 if (m->fixed_resettime) 1247 if (m->fixed_resettime)
1268 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime); 1248 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1269 /* we unfortunately have no idea if this is a value the creator set 1249 /* we unfortunately have no idea if this is a value the creator set
1270 * or a difficulty value we generated when the map was first loaded 1250 * or a difficulty value we generated when the map was first loaded
1271 */ 1251 */
1272 if (m->difficulty) 1252 if (m->difficulty)
1273 fprintf (fp, "difficulty %d\n", m->difficulty); 1253 fprintf (freezer, "difficulty %d\n", m->difficulty);
1274 if (m->region) 1254 if (m->region)
1275 fprintf (fp, "region %s\n", m->region->name); 1255 fprintf (freezer, "region %s\n", m->region->name);
1276 if (m->shopitems) 1256 if (m->shopitems)
1277 { 1257 {
1278 print_shop_string (m, shop); 1258 print_shop_string (m, shop);
1279 fprintf (fp, "shopitems %s\n", shop); 1259 fprintf (freezer, "shopitems %s\n", shop);
1280 } 1260 }
1281 if (m->shopgreed) 1261 if (m->shopgreed)
1282 fprintf (fp, "shopgreed %f\n", m->shopgreed); 1262 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1283#ifndef WIN32 1263#ifndef WIN32
1284 if (m->shopmin) 1264 if (m->shopmin)
1285 fprintf (fp, "shopmin %llu\n", m->shopmin); 1265 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1286 if (m->shopmax) 1266 if (m->shopmax)
1287 fprintf (fp, "shopmax %llu\n", m->shopmax); 1267 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1288#else 1268#else
1289 if (m->shopmin) 1269 if (m->shopmin)
1290 fprintf (fp, "shopmin %I64u\n", m->shopmin); 1270 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1291 if (m->shopmax) 1271 if (m->shopmax)
1292 fprintf (fp, "shopmax %I64u\n", m->shopmax); 1272 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1293#endif 1273#endif
1294 if (m->shoprace) 1274 if (m->shoprace)
1295 fprintf (fp, "shoprace %s\n", m->shoprace); 1275 fprintf (freezer, "shoprace %s\n", m->shoprace);
1296 if (m->darkness) 1276 if (m->darkness)
1297 fprintf (fp, "darkness %d\n", m->darkness); 1277 fprintf (freezer, "darkness %d\n", m->darkness);
1298 if (m->width) 1278 if (m->width)
1299 fprintf (fp, "width %d\n", m->width); 1279 fprintf (freezer, "width %d\n", m->width);
1300 if (m->height) 1280 if (m->height)
1301 fprintf (fp, "height %d\n", m->height); 1281 fprintf (freezer, "height %d\n", m->height);
1302 if (m->enter_x) 1282 if (m->enter_x)
1303 fprintf (fp, "enter_x %d\n", m->enter_x); 1283 fprintf (freezer, "enter_x %d\n", m->enter_x);
1304 if (m->enter_y) 1284 if (m->enter_y)
1305 fprintf (fp, "enter_y %d\n", m->enter_y); 1285 fprintf (freezer, "enter_y %d\n", m->enter_y);
1306 if (m->msg) 1286 if (m->msg)
1307 fprintf (fp, "msg\n%sendmsg\n", m->msg); 1287 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1308 if (m->maplore) 1288 if (m->maplore)
1309 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore); 1289 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1310 if (m->unique) 1290 if (m->unique)
1311 fprintf (fp, "unique %d\n", m->unique); 1291 fprintf (freezer, "unique %d\n", m->unique);
1312 if (m->templatemap) 1292 if (m->templatemap)
1313 fprintf (fp, "template %d\n", m->templatemap); 1293 fprintf (freezer, "template %d\n", m->templatemap);
1314 if (m->outdoor) 1294 if (m->outdoor)
1315 fprintf (fp, "outdoor %d\n", m->outdoor); 1295 fprintf (freezer, "outdoor %d\n", m->outdoor);
1316 if (m->temp) 1296 if (m->temp)
1317 fprintf (fp, "temp %d\n", m->temp); 1297 fprintf (freezer, "temp %d\n", m->temp);
1318 if (m->pressure) 1298 if (m->pressure)
1319 fprintf (fp, "pressure %d\n", m->pressure); 1299 fprintf (freezer, "pressure %d\n", m->pressure);
1320 if (m->humid) 1300 if (m->humid)
1321 fprintf (fp, "humid %d\n", m->humid); 1301 fprintf (freezer, "humid %d\n", m->humid);
1322 if (m->windspeed) 1302 if (m->windspeed)
1323 fprintf (fp, "windspeed %d\n", m->windspeed); 1303 fprintf (freezer, "windspeed %d\n", m->windspeed);
1324 if (m->winddir) 1304 if (m->winddir)
1325 fprintf (fp, "winddir %d\n", m->winddir); 1305 fprintf (freezer, "winddir %d\n", m->winddir);
1326 if (m->sky) 1306 if (m->sky)
1327 fprintf (fp, "sky %d\n", m->sky); 1307 fprintf (freezer, "sky %d\n", m->sky);
1328 if (m->nosmooth) 1308 if (m->nosmooth)
1329 fprintf (fp, "nosmooth %d\n", m->nosmooth); 1309 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1330 if (m->safe_map)
1331 fprintf (fp, "safe_map %d\n", m->safe_map);
1332 1310
1333 /* Save any tiling information, except on overlays */ 1311 /* Save any tiling information, except on overlays */
1334 if (flag != 2) 1312 if (flag != 2)
1335 for (i = 0; i < 4; i++) 1313 for (i = 0; i < 4; i++)
1336 if (m->tile_path[i]) 1314 if (m->tile_path[i])
1337 fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]); 1315 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1338 1316
1317 freezer.put (m);
1339 fprintf (fp, "end\n"); 1318 fprintf (freezer, "end\n");
1340 1319
1341 /* In the game save unique items in the different file, but 1320 /* In the game save unique items in the different file, but
1342 * in the editor save them to the normal map file. 1321 * in the editor save them to the normal map file.
1343 * If unique map, save files in the proper destination (set by 1322 * If unique map, save files in the proper destination (set by
1344 * player) 1323 * player)
1345 */ 1324 */
1346 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) 1325 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1347 { 1326 {
1327 object_freezer unique;
1328
1329 if (flag == 2)
1330 save_objects (m, freezer, unique, 2);
1331 else
1332 save_objects (m, freezer, unique, 0);
1333
1348 sprintf (buf, "%s.v00", create_items_path (m->path)); 1334 sprintf (buf, "%s.v00", create_items_path (m->path));
1349 1335
1350 object_freezer fp2 (buf); 1336 unique.save (buf);
1351
1352 if (flag == 2)
1353 save_objects (m, fp, fp2, 2);
1354 else
1355 save_objects (m, fp, fp2, 0);
1356 } 1337 }
1357 else 1338 else
1358 { /* save same file when not playing, like in editor */ 1339 { /* save same file when not playing, like in editor */
1359 save_objects (m, fp, fp, 0); 1340 save_objects (m, freezer, freezer, 0);
1360 } 1341 }
1342
1343 freezer.save (filename);
1361 1344
1362 return 0; 1345 return 0;
1363} 1346}
1364 1347
1365 1348
… …
1466 mapstruct *tmp, *last; 1449 mapstruct *tmp, *last;
1467 int i; 1450 int i;
1468 1451
1469 if (!m) 1452 if (!m)
1470 return; 1453 return;
1454
1455 m->clear ();
1456
1471 if (m->in_memory == MAP_IN_MEMORY) { 1457 if (m->in_memory == MAP_IN_MEMORY) {
1472 /* change to MAP_SAVING, even though we are not, 1458 /* change to MAP_SAVING, even though we are not,
1473 * so that remove_ob doesn't do as much work. 1459 * so that remove_ob doesn't do as much work.
1474 */ 1460 */
1475 m->in_memory = MAP_SAVING; 1461 m->in_memory = MAP_SAVING;
… …
1577 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1563 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1578 m=load_overlay_map(name, m); 1564 m=load_overlay_map(name, m);
1579 if (m==NULL) 1565 if (m==NULL)
1580 return NULL; 1566 return NULL;
1581 } 1567 }
1568
1569 if (flags & MAP_PLAYER_UNIQUE)
1570 INVOKE_MAP (SWAPIN, m);
1582 1571
1583 } else { 1572 } else {
1584 /* If in this loop, we found a temporary map, so load it up. */ 1573 /* If in this loop, we found a temporary map, so load it up. */
1585 1574
1586 m=load_temporary_map (m); 1575 m=load_temporary_map (m);

Diff Legend

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