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.20 by root, Sun Sep 3 00:18:40 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.20 2006/09/03 00:18:40 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) ||
… …
490 op->x += tmp->x; 482 op->x += tmp->x;
491 op->y += tmp->y; 483 op->y += tmp->y;
492 op->head = tmp; 484 op->head = tmp;
493 op->map = m; 485 op->map = m;
494 last->more = op; 486 last->more = op;
495 if (tmp->name != op->name) {
496 if (op->name) free_string(op->name);
497 op->name = add_string(tmp->name); 487 op->name = tmp->name;
498 }
499 if (tmp->title != op->title) {
500 if (op->title) free_string(op->title);
501 op->title = add_string(tmp->title); 488 op->title = tmp->title;
502 }
503 /* we could link all the parts onto tmp, and then just 489 /* we could link all the parts onto tmp, and then just
504 * call insert_ob_in_map once, but the effect is the same, 490 * call insert_ob_in_map once, but the effect is the same,
505 * as insert_ob_in_map will call itself with each part, and 491 * as insert_ob_in_map will call itself with each part, and
506 * the coding is simpler to just to it here with each part. 492 * the coding is simpler to just to it here with each part.
507 */ 493 */
… …
536 /* if the archetype for the object is null, means that we 522 /* if the archetype for the object is null, means that we
537 * got an invalid object. Don't do anything with it - the game 523 * got an invalid object. Don't do anything with it - the game
538 * or editor will not be able to do anything with it either. 524 * or editor will not be able to do anything with it either.
539 */ 525 */
540 if (op->arch==NULL) { 526 if (op->arch==NULL) {
541 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)"); 527 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
542 continue; 528 continue;
543 } 529 }
544 530
545 531
546 switch(i) { 532 switch(i) {
… …
626 * Modified to no longer take a path option which was not being 612 * Modified to no longer take a path option which was not being
627 * used anyways. MSW 2001-07-01 613 * used anyways. MSW 2001-07-01
628 */ 614 */
629 615
630mapstruct *get_linked_map(void) { 616mapstruct *get_linked_map(void) {
631 mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct)); 617 mapstruct *map = new mapstruct;
632 mapstruct *mp; 618 mapstruct *mp;
633
634 if(map==NULL)
635 fatal(OUT_OF_MEMORY);
636 619
637 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); 620 for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next);
638 if(mp==NULL) 621 if(mp==NULL)
639 first_map=map; 622 first_map=map;
640 else 623 else
… …
793 * currently, there are few enough fields this is not a big deal. 776 * currently, there are few enough fields this is not a big deal.
794 * MSW 2001-07-01 777 * MSW 2001-07-01
795 * return 0 on success, 1 on failure. 778 * return 0 on success, 1 on failure.
796 */ 779 */
797 780
798static int load_map_header(FILE *fp, mapstruct *m) 781static int load_map_header(object_thawer &fp, mapstruct *m)
799{ 782{
800 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end; 783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end;
801 int msgpos=0; 784 int msgpos=0;
802 int maplorepos=0; 785 int maplorepos=0;
803 786
… …
893 } 876 }
894 /* first strcmp value on these are old names supported 877 /* first strcmp value on these are old names supported
895 * for compatibility reasons. The new values (second) are 878 * for compatibility reasons. The new values (second) are
896 * what really should be used. 879 * what really should be used.
897 */ 880 */
881 else if (!strcmp(key,"oid")) {
882 fp.get (m, atoi(value));
883 } else if (!strcmp(key, "attach")) {
884 m->attach = value;
898 else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) { 885 } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
899 m->enter_x = atoi(value); 886 m->enter_x = atoi(value);
900 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) { 887 } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
901 m->enter_y = atoi(value); 888 m->enter_y = atoi(value);
902 } else if (!strcmp(key,"x") || !strcmp(key, "width")) { 889 } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
903 m->width = atoi(value); 890 m->width = atoi(value);
… …
945 m->winddir = atoi(value); 932 m->winddir = atoi(value);
946 } else if (!strcmp(key, "sky")) { 933 } else if (!strcmp(key, "sky")) {
947 m->sky = atoi(value); 934 m->sky = atoi(value);
948 } else if (!strcmp(key, "nosmooth")) { 935 } else if (!strcmp(key, "nosmooth")) {
949 m->nosmooth = atoi(value); 936 m->nosmooth = atoi(value);
950 } else if (!strcmp(key, "safe_map")) {
951 m->safe_map = atoi(value);
952 } 937 }
953 else if (!strncmp(key,"tile_path_", 10)) { 938 else if (!strncmp(key,"tile_path_", 10)) {
954 int tile=atoi(key+10); 939 int tile=atoi(key+10);
955 940
956 if (tile<1 || tile>4) { 941 if (tile<1 || tile>4) {
… …
1013 * MAP_STYLE: style map - don't add active objects, don't add to server 998 * MAP_STYLE: style map - don't add active objects, don't add to server
1014 * managed map list. 999 * managed map list.
1015 */ 1000 */
1016 1001
1017mapstruct *load_original_map(const char *filename, int flags) { 1002mapstruct *load_original_map(const char *filename, int flags) {
1018 FILE *fp;
1019 mapstruct *m; 1003 mapstruct *m;
1020 int comp;
1021 char pathname[MAX_BUF]; 1004 char pathname[MAX_BUF];
1022 1005
1023 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); 1006 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1024 if (flags & MAP_PLAYER_UNIQUE) 1007 if (flags & MAP_PLAYER_UNIQUE)
1025 strcpy(pathname, filename); 1008 strcpy(pathname, filename);
1026 else if (flags & MAP_OVERLAY) 1009 else if (flags & MAP_OVERLAY)
1027 strcpy(pathname, create_overlay_pathname(filename)); 1010 strcpy(pathname, create_overlay_pathname(filename));
1028 else 1011 else
1029 strcpy(pathname, create_pathname(filename)); 1012 strcpy(pathname, create_pathname(filename));
1030 1013
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); 1014 object_thawer thawer (pathname);
1015
1016 if (!thawer)
1017 return 0;
1037 1018
1038 m = get_linked_map(); 1019 m = get_linked_map();
1039 1020
1040 strcpy (m->path, filename); 1021 strcpy (m->path, filename);
1041 if (load_map_header(fp, m)) { 1022 if (load_map_header(thawer, m)) {
1042 LOG(llevError,"Error loading map header for %s, flags=%d\n", 1023 LOG(llevError,"Error loading map header for %s, flags=%d\n",
1043 filename, flags); 1024 filename, flags);
1044 delete_map(m); 1025 delete_map(m);
1045 return NULL; 1026 return NULL;
1046 } 1027 }
1047 1028
1048 allocate_map(m); 1029 allocate_map(m);
1049 1030
1050 m->in_memory=MAP_LOADING; 1031 m->in_memory=MAP_LOADING;
1051 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); 1032 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1052 close_and_delete(fp, comp); 1033
1053 m->in_memory=MAP_IN_MEMORY; 1034 m->in_memory=MAP_IN_MEMORY;
1054 if (!MAP_DIFFICULTY(m)) 1035 if (!MAP_DIFFICULTY(m))
1055 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1036 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1056 set_map_reset_time(m); 1037 set_map_reset_time(m);
1057 INVOKE_MAP (INSTANTIATE, m); 1038 m->instantiate ();
1058 return (m); 1039 return (m);
1059} 1040}
1060 1041
1061/* 1042/*
1062 * Loads a map, which has been loaded earlier, from file. 1043 * Loads a map, which has been loaded earlier, from file.
1063 * Return the map object we load into (this can change from the passed 1044 * Return the map object we load into (this can change from the passed
1064 * option if we can't find the original map) 1045 * option if we can't find the original map)
1065 */ 1046 */
1066 1047
1067static mapstruct *load_temporary_map(mapstruct *m) { 1048static mapstruct *load_temporary_map(mapstruct *m) {
1068 FILE *fp;
1069 int comp; 1049 int comp;
1070 char buf[MAX_BUF]; 1050 char buf[MAX_BUF];
1071 1051
1072 if (!m->tmpname) { 1052 if (!m->tmpname) {
1073 LOG(llevError, "No temporary filename for map %s\n", m->path); 1053 LOG(llevError, "No temporary filename for map %s\n", m->path);
… …
1077 if(m==NULL) return NULL; 1057 if(m==NULL) return NULL;
1078 fix_auto_apply(m); /* Chests which open as default */ 1058 fix_auto_apply(m); /* Chests which open as default */
1079 return m; 1059 return m;
1080 } 1060 }
1081 1061
1082 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) { 1062 object_thawer thawer (m->tmpname);
1083 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno)); 1063
1064 if (!thawer)
1065 {
1084 strcpy(buf, m->path); 1066 strcpy (buf, m->path);
1085 delete_map(m); 1067 delete_map (m);
1086 m = load_original_map(buf, 0); 1068 m = load_original_map (buf, 0);
1087 if(m==NULL) return NULL; 1069 if (!m) return NULL;
1088 fix_auto_apply(m); /* Chests which open as default */ 1070 fix_auto_apply (m); /* Chests which open as default */
1089 return m; 1071 return m;
1090 } 1072 }
1091
1092 object_thawer thawer (fp, m->tmpname);
1093 1073
1094 if (load_map_header(thawer, m)) { 1074 if (load_map_header(thawer, m)) {
1095 LOG(llevError,"Error loading map header for %s (%s)\n", 1075 LOG(llevError,"Error loading map header for %s (%s)\n",
1096 m->path, m->tmpname); 1076 m->path, m->tmpname);
1097 delete_map(m); 1077 delete_map(m);
… …
1100 } 1080 }
1101 allocate_map(m); 1081 allocate_map(m);
1102 1082
1103 m->in_memory=MAP_LOADING; 1083 m->in_memory=MAP_LOADING;
1104 load_objects (m, thawer, 0); 1084 load_objects (m, thawer, 0);
1105 close_and_delete(fp, comp); 1085
1106 m->in_memory=MAP_IN_MEMORY; 1086 m->in_memory=MAP_IN_MEMORY;
1107 INVOKE_MAP (SWAPIN, m); 1087 INVOKE_MAP (SWAPIN, m);
1108 return m; 1088 return m;
1109} 1089}
1110 1090
… …
1113 * Return the map object we load into (this can change from the passed 1093 * Return the map object we load into (this can change from the passed
1114 * option if we can't find the original map) 1094 * option if we can't find the original map)
1115 */ 1095 */
1116 1096
1117mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1097mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
1118 FILE *fp;
1119 int comp;
1120 char pathname[MAX_BUF]; 1098 char pathname[MAX_BUF];
1121 1099
1122 strcpy(pathname, create_overlay_pathname(filename)); 1100 strcpy(pathname, create_overlay_pathname(filename));
1123 1101
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); 1102 object_thawer thawer (pathname);
1103
1104 if (!thawer)
1105 return m;
1130 1106
1131 if (load_map_header(thawer, m)) { 1107 if (load_map_header(thawer, m)) {
1132 LOG(llevError,"Error loading map header for overlay %s (%s)\n", 1108 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1133 m->path, pathname); 1109 m->path, pathname);
1134 delete_map(m); 1110 delete_map(m);
… …
1137 } 1113 }
1138 /*allocate_map(m);*/ 1114 /*allocate_map(m);*/
1139 1115
1140 m->in_memory=MAP_LOADING; 1116 m->in_memory=MAP_LOADING;
1141 load_objects (m, thawer, MAP_OVERLAY); 1117 load_objects (m, thawer, MAP_OVERLAY);
1142 close_and_delete(fp, comp); 1118
1143 m->in_memory=MAP_IN_MEMORY; 1119 m->in_memory=MAP_IN_MEMORY;
1144 return m; 1120 return m;
1145} 1121}
1146 1122
1147/****************************************************************************** 1123/******************************************************************************
… …
1176/* 1152/*
1177 * Loads unique objects from file(s) into the map which is in memory 1153 * Loads unique objects from file(s) into the map which is in memory
1178 * m is the map to load unique items into. 1154 * m is the map to load unique items into.
1179 */ 1155 */
1180static void load_unique_objects(mapstruct *m) { 1156static void load_unique_objects(mapstruct *m) {
1181 FILE *fp;
1182 int comp,count; 1157 int count;
1183 char firstname[MAX_BUF]; 1158 char firstname[MAX_BUF];
1184 1159
1185 for (count=0; count<10; count++) { 1160 for (count=0; count<10; count++) {
1186 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1161 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1187 if (!access(firstname, R_OK)) break; 1162 if (!access(firstname, R_OK)) break;
1188 } 1163 }
1189 /* If we get here, we did not find any map */ 1164 /* If we get here, we did not find any map */
1190 if (count==10) return; 1165 if (count==10) return;
1191 1166
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); 1167 object_thawer thawer (firstname);
1168
1169 if (!thawer)
1170 return;
1201 1171
1202 m->in_memory=MAP_LOADING; 1172 m->in_memory=MAP_LOADING;
1203 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1173 if (m->tmpname == NULL) /* if we have loaded unique items from */
1204 delete_unique_items(m); /* original map before, don't duplicate them */ 1174 delete_unique_items(m); /* original map before, don't duplicate them */
1205 load_object(thawer, NULL, LO_NOREAD,0); 1175 load_object(thawer, NULL, LO_NOREAD,0);
1206 load_objects (m, thawer, 0); 1176 load_objects (m, thawer, 0);
1207 close_and_delete(fp, comp); 1177
1208 m->in_memory=MAP_IN_MEMORY; 1178 m->in_memory=MAP_IN_MEMORY;
1209} 1179}
1210 1180
1211 1181
1212/* 1182/*
… …
1246 } 1216 }
1247 else 1217 else
1248 { 1218 {
1249 if (!m->tmpname) 1219 if (!m->tmpname)
1250 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1220 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1221
1251 strcpy (filename, m->tmpname); 1222 strcpy (filename, m->tmpname);
1252 } 1223 }
1253 1224
1254 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1225 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1255 m->in_memory = MAP_SAVING; 1226 m->in_memory = MAP_SAVING;
1256 1227
1257 object_freezer fp (filename); 1228 object_freezer freezer;
1258 1229
1259 /* legacy */ 1230 /* legacy */
1260 fprintf (fp, "arch map\n"); 1231 fprintf (freezer, "arch map\n");
1261 if (m->name) 1232 if (m->name)
1262 fprintf (fp, "name %s\n", m->name); 1233 fprintf (freezer, "name %s\n", m->name);
1263 if (!flag) 1234 if (!flag)
1264 fprintf (fp, "swap_time %d\n", m->swap_time); 1235 fprintf (freezer, "swap_time %d\n", m->swap_time);
1265 if (m->reset_timeout) 1236 if (m->reset_timeout)
1266 fprintf (fp, "reset_timeout %d\n", m->reset_timeout); 1237 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1267 if (m->fixed_resettime) 1238 if (m->fixed_resettime)
1268 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime); 1239 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1269 /* we unfortunately have no idea if this is a value the creator set 1240 /* 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 1241 * or a difficulty value we generated when the map was first loaded
1271 */ 1242 */
1272 if (m->difficulty) 1243 if (m->difficulty)
1273 fprintf (fp, "difficulty %d\n", m->difficulty); 1244 fprintf (freezer, "difficulty %d\n", m->difficulty);
1274 if (m->region) 1245 if (m->region)
1275 fprintf (fp, "region %s\n", m->region->name); 1246 fprintf (freezer, "region %s\n", m->region->name);
1276 if (m->shopitems) 1247 if (m->shopitems)
1277 { 1248 {
1278 print_shop_string (m, shop); 1249 print_shop_string (m, shop);
1279 fprintf (fp, "shopitems %s\n", shop); 1250 fprintf (freezer, "shopitems %s\n", shop);
1280 } 1251 }
1281 if (m->shopgreed) 1252 if (m->shopgreed)
1282 fprintf (fp, "shopgreed %f\n", m->shopgreed); 1253 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1283#ifndef WIN32 1254#ifndef WIN32
1284 if (m->shopmin) 1255 if (m->shopmin)
1285 fprintf (fp, "shopmin %llu\n", m->shopmin); 1256 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1286 if (m->shopmax) 1257 if (m->shopmax)
1287 fprintf (fp, "shopmax %llu\n", m->shopmax); 1258 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1288#else 1259#else
1289 if (m->shopmin) 1260 if (m->shopmin)
1290 fprintf (fp, "shopmin %I64u\n", m->shopmin); 1261 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1291 if (m->shopmax) 1262 if (m->shopmax)
1292 fprintf (fp, "shopmax %I64u\n", m->shopmax); 1263 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1293#endif 1264#endif
1294 if (m->shoprace) 1265 if (m->shoprace)
1295 fprintf (fp, "shoprace %s\n", m->shoprace); 1266 fprintf (freezer, "shoprace %s\n", m->shoprace);
1296 if (m->darkness) 1267 if (m->darkness)
1297 fprintf (fp, "darkness %d\n", m->darkness); 1268 fprintf (freezer, "darkness %d\n", m->darkness);
1298 if (m->width) 1269 if (m->width)
1299 fprintf (fp, "width %d\n", m->width); 1270 fprintf (freezer, "width %d\n", m->width);
1300 if (m->height) 1271 if (m->height)
1301 fprintf (fp, "height %d\n", m->height); 1272 fprintf (freezer, "height %d\n", m->height);
1302 if (m->enter_x) 1273 if (m->enter_x)
1303 fprintf (fp, "enter_x %d\n", m->enter_x); 1274 fprintf (freezer, "enter_x %d\n", m->enter_x);
1304 if (m->enter_y) 1275 if (m->enter_y)
1305 fprintf (fp, "enter_y %d\n", m->enter_y); 1276 fprintf (freezer, "enter_y %d\n", m->enter_y);
1306 if (m->msg) 1277 if (m->msg)
1307 fprintf (fp, "msg\n%sendmsg\n", m->msg); 1278 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1308 if (m->maplore) 1279 if (m->maplore)
1309 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore); 1280 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1310 if (m->unique) 1281 if (m->unique)
1311 fprintf (fp, "unique %d\n", m->unique); 1282 fprintf (freezer, "unique %d\n", m->unique);
1312 if (m->templatemap) 1283 if (m->templatemap)
1313 fprintf (fp, "template %d\n", m->templatemap); 1284 fprintf (freezer, "template %d\n", m->templatemap);
1314 if (m->outdoor) 1285 if (m->outdoor)
1315 fprintf (fp, "outdoor %d\n", m->outdoor); 1286 fprintf (freezer, "outdoor %d\n", m->outdoor);
1316 if (m->temp) 1287 if (m->temp)
1317 fprintf (fp, "temp %d\n", m->temp); 1288 fprintf (freezer, "temp %d\n", m->temp);
1318 if (m->pressure) 1289 if (m->pressure)
1319 fprintf (fp, "pressure %d\n", m->pressure); 1290 fprintf (freezer, "pressure %d\n", m->pressure);
1320 if (m->humid) 1291 if (m->humid)
1321 fprintf (fp, "humid %d\n", m->humid); 1292 fprintf (freezer, "humid %d\n", m->humid);
1322 if (m->windspeed) 1293 if (m->windspeed)
1323 fprintf (fp, "windspeed %d\n", m->windspeed); 1294 fprintf (freezer, "windspeed %d\n", m->windspeed);
1324 if (m->winddir) 1295 if (m->winddir)
1325 fprintf (fp, "winddir %d\n", m->winddir); 1296 fprintf (freezer, "winddir %d\n", m->winddir);
1326 if (m->sky) 1297 if (m->sky)
1327 fprintf (fp, "sky %d\n", m->sky); 1298 fprintf (freezer, "sky %d\n", m->sky);
1328 if (m->nosmooth) 1299 if (m->nosmooth)
1329 fprintf (fp, "nosmooth %d\n", m->nosmooth); 1300 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1330 if (m->safe_map)
1331 fprintf (fp, "safe_map %d\n", m->safe_map);
1332 1301
1333 /* Save any tiling information, except on overlays */ 1302 /* Save any tiling information, except on overlays */
1334 if (flag != 2) 1303 if (flag != 2)
1335 for (i = 0; i < 4; i++) 1304 for (i = 0; i < 4; i++)
1336 if (m->tile_path[i]) 1305 if (m->tile_path[i])
1337 fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]); 1306 fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1338 1307
1308 freezer.put (m);
1339 fprintf (fp, "end\n"); 1309 fprintf (freezer, "end\n");
1340 1310
1341 /* In the game save unique items in the different file, but 1311 /* In the game save unique items in the different file, but
1342 * in the editor save them to the normal map file. 1312 * in the editor save them to the normal map file.
1343 * If unique map, save files in the proper destination (set by 1313 * If unique map, save files in the proper destination (set by
1344 * player) 1314 * player)
1345 */ 1315 */
1346 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) 1316 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1347 { 1317 {
1318 object_freezer unique;
1319
1320 if (flag == 2)
1321 save_objects (m, freezer, unique, 2);
1322 else
1323 save_objects (m, freezer, unique, 0);
1324
1348 sprintf (buf, "%s.v00", create_items_path (m->path)); 1325 sprintf (buf, "%s.v00", create_items_path (m->path));
1349 1326
1350 object_freezer fp2 (buf); 1327 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 } 1328 }
1357 else 1329 else
1358 { /* save same file when not playing, like in editor */ 1330 { /* save same file when not playing, like in editor */
1359 save_objects (m, fp, fp, 0); 1331 save_objects (m, freezer, freezer, 0);
1360 } 1332 }
1333
1334 freezer.save (filename);
1361 1335
1362 return 0; 1336 return 0;
1363} 1337}
1364 1338
1365 1339
… …
1410 clean_object(op); 1384 clean_object(op);
1411 remove_ob(op); 1385 remove_ob(op);
1412 free_object(op); 1386 free_object(op);
1413 } 1387 }
1414 } 1388 }
1415#ifdef MANY_CORES
1416 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1417 * an item on that map was not saved - look for that condition and die as appropriate -
1418 * this leaves more of the map data intact for better debugging.
1419 */
1420 for (op=objects; op!=NULL; op=op->next) {
1421 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1422 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1423 abort();
1424 }
1425 }
1426#endif
1427} 1389}
1428 1390
1429/* 1391/*
1430 * Frees everything allocated by the given mapstructure. 1392 * Frees everything allocated by the given mapstructure.
1431 * don't free tmpname - our caller is left to do that 1393 * don't free tmpname - our caller is left to do that
… …
1466 mapstruct *tmp, *last; 1428 mapstruct *tmp, *last;
1467 int i; 1429 int i;
1468 1430
1469 if (!m) 1431 if (!m)
1470 return; 1432 return;
1433
1434 m->clear ();
1435
1471 if (m->in_memory == MAP_IN_MEMORY) { 1436 if (m->in_memory == MAP_IN_MEMORY) {
1472 /* change to MAP_SAVING, even though we are not, 1437 /* change to MAP_SAVING, even though we are not,
1473 * so that remove_ob doesn't do as much work. 1438 * so that remove_ob doesn't do as much work.
1474 */ 1439 */
1475 m->in_memory = MAP_SAVING; 1440 m->in_memory = MAP_SAVING;
… …
1508 m->path); 1473 m->path);
1509 } 1474 }
1510 else 1475 else
1511 last->next = m->next; 1476 last->next = m->next;
1512 1477
1513 free (m); 1478 delete m;
1514} 1479}
1515 1480
1516 1481
1517 1482
1518/* 1483/*
… …
1577 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1542 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1578 m=load_overlay_map(name, m); 1543 m=load_overlay_map(name, m);
1579 if (m==NULL) 1544 if (m==NULL)
1580 return NULL; 1545 return NULL;
1581 } 1546 }
1547
1548 if (flags & MAP_PLAYER_UNIQUE)
1549 INVOKE_MAP (SWAPIN, m);
1582 1550
1583 } else { 1551 } else {
1584 /* If in this loop, we found a temporary map, so load it up. */ 1552 /* If in this loop, we found a temporary map, so load it up. */
1585 1553
1586 m=load_temporary_map (m); 1554 m=load_temporary_map (m);

Diff Legend

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