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.13 by elmex, Tue Aug 29 09:35:51 2006 UTC vs.
Revision 1.19 by root, Thu Aug 31 18:59:23 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.13 2006/08/29 09:35:51 elmex Exp $"; 3 * "$Id: map.C,v 1.19 2006/08/31 18:59:23 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) ||
… …
536 /* if the archetype for the object is null, means that we 528 /* if the archetype for the object is null, means that we
537 * got an invalid object. Don't do anything with it - the game 529 * 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. 530 * or editor will not be able to do anything with it either.
539 */ 531 */
540 if (op->arch==NULL) { 532 if (op->arch==NULL) {
541 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)"); 533 LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
542 continue; 534 continue;
543 } 535 }
544 536
545 537
546 switch(i) { 538 switch(i) {
… …
1015 * 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
1016 * managed map list. 1008 * managed map list.
1017 */ 1009 */
1018 1010
1019mapstruct *load_original_map(const char *filename, int flags) { 1011mapstruct *load_original_map(const char *filename, int flags) {
1020 FILE *fp;
1021 mapstruct *m; 1012 mapstruct *m;
1022 int comp;
1023 char pathname[MAX_BUF]; 1013 char pathname[MAX_BUF];
1024 1014
1025 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); 1015 LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1026 if (flags & MAP_PLAYER_UNIQUE) 1016 if (flags & MAP_PLAYER_UNIQUE)
1027 strcpy(pathname, filename); 1017 strcpy(pathname, filename);
1028 else if (flags & MAP_OVERLAY) 1018 else if (flags & MAP_OVERLAY)
1029 strcpy(pathname, create_overlay_pathname(filename)); 1019 strcpy(pathname, create_overlay_pathname(filename));
1030 else 1020 else
1031 strcpy(pathname, create_pathname(filename)); 1021 strcpy(pathname, create_pathname(filename));
1032 1022
1033 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1034 LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
1035 return (NULL);
1036 }
1037
1038 object_thawer thawer (fp, filename); 1023 object_thawer thawer (pathname);
1024
1025 if (!thawer)
1026 return 0;
1039 1027
1040 m = get_linked_map(); 1028 m = get_linked_map();
1041 1029
1042 strcpy (m->path, filename); 1030 strcpy (m->path, filename);
1043 if (load_map_header(thawer, m)) { 1031 if (load_map_header(thawer, m)) {
… …
1049 1037
1050 allocate_map(m); 1038 allocate_map(m);
1051 1039
1052 m->in_memory=MAP_LOADING; 1040 m->in_memory=MAP_LOADING;
1053 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); 1041 load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
1054 close_and_delete(fp, comp); 1042
1055 m->in_memory=MAP_IN_MEMORY; 1043 m->in_memory=MAP_IN_MEMORY;
1056 if (!MAP_DIFFICULTY(m)) 1044 if (!MAP_DIFFICULTY(m))
1057 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1045 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1058 set_map_reset_time(m); 1046 set_map_reset_time(m);
1059 m->instantiate (); 1047 m->instantiate ();
… …
1065 * 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
1066 * option if we can't find the original map) 1054 * option if we can't find the original map)
1067 */ 1055 */
1068 1056
1069static mapstruct *load_temporary_map(mapstruct *m) { 1057static mapstruct *load_temporary_map(mapstruct *m) {
1070 FILE *fp;
1071 int comp; 1058 int comp;
1072 char buf[MAX_BUF]; 1059 char buf[MAX_BUF];
1073 1060
1074 if (!m->tmpname) { 1061 if (!m->tmpname) {
1075 LOG(llevError, "No temporary filename for map %s\n", m->path); 1062 LOG(llevError, "No temporary filename for map %s\n", m->path);
… …
1079 if(m==NULL) return NULL; 1066 if(m==NULL) return NULL;
1080 fix_auto_apply(m); /* Chests which open as default */ 1067 fix_auto_apply(m); /* Chests which open as default */
1081 return m; 1068 return m;
1082 } 1069 }
1083 1070
1084 if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) { 1071 object_thawer thawer (m->tmpname);
1085 LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno)); 1072
1073 if (!thawer)
1074 {
1086 strcpy(buf, m->path); 1075 strcpy (buf, m->path);
1087 delete_map(m); 1076 delete_map (m);
1088 m = load_original_map(buf, 0); 1077 m = load_original_map (buf, 0);
1089 if(m==NULL) return NULL; 1078 if (!m) return NULL;
1090 fix_auto_apply(m); /* Chests which open as default */ 1079 fix_auto_apply (m); /* Chests which open as default */
1091 return m; 1080 return m;
1092 } 1081 }
1093
1094 object_thawer thawer (fp, m->tmpname);
1095 1082
1096 if (load_map_header(thawer, m)) { 1083 if (load_map_header(thawer, m)) {
1097 LOG(llevError,"Error loading map header for %s (%s)\n", 1084 LOG(llevError,"Error loading map header for %s (%s)\n",
1098 m->path, m->tmpname); 1085 m->path, m->tmpname);
1099 delete_map(m); 1086 delete_map(m);
… …
1102 } 1089 }
1103 allocate_map(m); 1090 allocate_map(m);
1104 1091
1105 m->in_memory=MAP_LOADING; 1092 m->in_memory=MAP_LOADING;
1106 load_objects (m, thawer, 0); 1093 load_objects (m, thawer, 0);
1107 close_and_delete(fp, comp); 1094
1108 m->in_memory=MAP_IN_MEMORY; 1095 m->in_memory=MAP_IN_MEMORY;
1109 INVOKE_MAP (SWAPIN, m); 1096 INVOKE_MAP (SWAPIN, m);
1110 return m; 1097 return m;
1111} 1098}
1112 1099
… …
1115 * 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
1116 * option if we can't find the original map) 1103 * option if we can't find the original map)
1117 */ 1104 */
1118 1105
1119mapstruct *load_overlay_map(const char *filename, mapstruct *m) { 1106mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
1120 FILE *fp;
1121 int comp;
1122 char pathname[MAX_BUF]; 1107 char pathname[MAX_BUF];
1123 1108
1124 strcpy(pathname, create_overlay_pathname(filename)); 1109 strcpy(pathname, create_overlay_pathname(filename));
1125 1110
1126 if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
1127/* LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
1128 return m;
1129 }
1130
1131 object_thawer thawer (fp, pathname); 1111 object_thawer thawer (pathname);
1112
1113 if (!thawer)
1114 return m;
1132 1115
1133 if (load_map_header(thawer, m)) { 1116 if (load_map_header(thawer, m)) {
1134 LOG(llevError,"Error loading map header for overlay %s (%s)\n", 1117 LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1135 m->path, pathname); 1118 m->path, pathname);
1136 delete_map(m); 1119 delete_map(m);
… …
1139 } 1122 }
1140 /*allocate_map(m);*/ 1123 /*allocate_map(m);*/
1141 1124
1142 m->in_memory=MAP_LOADING; 1125 m->in_memory=MAP_LOADING;
1143 load_objects (m, thawer, MAP_OVERLAY); 1126 load_objects (m, thawer, MAP_OVERLAY);
1144 close_and_delete(fp, comp); 1127
1145 m->in_memory=MAP_IN_MEMORY; 1128 m->in_memory=MAP_IN_MEMORY;
1146 return m; 1129 return m;
1147} 1130}
1148 1131
1149/****************************************************************************** 1132/******************************************************************************
… …
1178/* 1161/*
1179 * 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
1180 * m is the map to load unique items into. 1163 * m is the map to load unique items into.
1181 */ 1164 */
1182static void load_unique_objects(mapstruct *m) { 1165static void load_unique_objects(mapstruct *m) {
1183 FILE *fp;
1184 int comp,count; 1166 int count;
1185 char firstname[MAX_BUF]; 1167 char firstname[MAX_BUF];
1186 1168
1187 for (count=0; count<10; count++) { 1169 for (count=0; count<10; count++) {
1188 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count); 1170 sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1189 if (!access(firstname, R_OK)) break; 1171 if (!access(firstname, R_OK)) break;
1190 } 1172 }
1191 /* If we get here, we did not find any map */ 1173 /* If we get here, we did not find any map */
1192 if (count==10) return; 1174 if (count==10) return;
1193 1175
1194 if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) {
1195 /* There is no expectation that every map will have unique items, but this
1196 * is debug output, so leave it in.
1197 */
1198 LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
1199 return;
1200 }
1201
1202 object_thawer thawer (fp, firstname); 1176 object_thawer thawer (firstname);
1177
1178 if (!thawer)
1179 return;
1203 1180
1204 m->in_memory=MAP_LOADING; 1181 m->in_memory=MAP_LOADING;
1205 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1182 if (m->tmpname == NULL) /* if we have loaded unique items from */
1206 delete_unique_items(m); /* original map before, don't duplicate them */ 1183 delete_unique_items(m); /* original map before, don't duplicate them */
1207 load_object(thawer, NULL, LO_NOREAD,0); 1184 load_object(thawer, NULL, LO_NOREAD,0);
1208 load_objects (m, thawer, 0); 1185 load_objects (m, thawer, 0);
1209 close_and_delete(fp, comp); 1186
1210 m->in_memory=MAP_IN_MEMORY; 1187 m->in_memory=MAP_IN_MEMORY;
1211} 1188}
1212 1189
1213 1190
1214/* 1191/*
… …
1248 } 1225 }
1249 else 1226 else
1250 { 1227 {
1251 if (!m->tmpname) 1228 if (!m->tmpname)
1252 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1229 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1230
1253 strcpy (filename, m->tmpname); 1231 strcpy (filename, m->tmpname);
1254 } 1232 }
1255 1233
1256 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1234 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1257 m->in_memory = MAP_SAVING; 1235 m->in_memory = MAP_SAVING;
1258 1236
1259 object_freezer fp (filename); 1237 object_freezer freezer;
1260 1238
1261 /* legacy */ 1239 /* legacy */
1262 fprintf (fp, "arch map\n"); 1240 fprintf (freezer, "arch map\n");
1263 if (m->name) 1241 if (m->name)
1264 fprintf (fp, "name %s\n", m->name); 1242 fprintf (freezer, "name %s\n", m->name);
1265 if (!flag) 1243 if (!flag)
1266 fprintf (fp, "swap_time %d\n", m->swap_time); 1244 fprintf (freezer, "swap_time %d\n", m->swap_time);
1267 if (m->reset_timeout) 1245 if (m->reset_timeout)
1268 fprintf (fp, "reset_timeout %d\n", m->reset_timeout); 1246 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1269 if (m->fixed_resettime) 1247 if (m->fixed_resettime)
1270 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime); 1248 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1271 /* 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
1272 * 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
1273 */ 1251 */
1274 if (m->difficulty) 1252 if (m->difficulty)
1275 fprintf (fp, "difficulty %d\n", m->difficulty); 1253 fprintf (freezer, "difficulty %d\n", m->difficulty);
1276 if (m->region) 1254 if (m->region)
1277 fprintf (fp, "region %s\n", m->region->name); 1255 fprintf (freezer, "region %s\n", m->region->name);
1278 if (m->shopitems) 1256 if (m->shopitems)
1279 { 1257 {
1280 print_shop_string (m, shop); 1258 print_shop_string (m, shop);
1281 fprintf (fp, "shopitems %s\n", shop); 1259 fprintf (freezer, "shopitems %s\n", shop);
1282 } 1260 }
1283 if (m->shopgreed) 1261 if (m->shopgreed)
1284 fprintf (fp, "shopgreed %f\n", m->shopgreed); 1262 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1285#ifndef WIN32 1263#ifndef WIN32
1286 if (m->shopmin) 1264 if (m->shopmin)
1287 fprintf (fp, "shopmin %llu\n", m->shopmin); 1265 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1288 if (m->shopmax) 1266 if (m->shopmax)
1289 fprintf (fp, "shopmax %llu\n", m->shopmax); 1267 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1290#else 1268#else
1291 if (m->shopmin) 1269 if (m->shopmin)
1292 fprintf (fp, "shopmin %I64u\n", m->shopmin); 1270 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1293 if (m->shopmax) 1271 if (m->shopmax)
1294 fprintf (fp, "shopmax %I64u\n", m->shopmax); 1272 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1295#endif 1273#endif
1296 if (m->shoprace) 1274 if (m->shoprace)
1297 fprintf (fp, "shoprace %s\n", m->shoprace); 1275 fprintf (freezer, "shoprace %s\n", m->shoprace);
1298 if (m->darkness) 1276 if (m->darkness)
1299 fprintf (fp, "darkness %d\n", m->darkness); 1277 fprintf (freezer, "darkness %d\n", m->darkness);
1300 if (m->width) 1278 if (m->width)
1301 fprintf (fp, "width %d\n", m->width); 1279 fprintf (freezer, "width %d\n", m->width);
1302 if (m->height) 1280 if (m->height)
1303 fprintf (fp, "height %d\n", m->height); 1281 fprintf (freezer, "height %d\n", m->height);
1304 if (m->enter_x) 1282 if (m->enter_x)
1305 fprintf (fp, "enter_x %d\n", m->enter_x); 1283 fprintf (freezer, "enter_x %d\n", m->enter_x);
1306 if (m->enter_y) 1284 if (m->enter_y)
1307 fprintf (fp, "enter_y %d\n", m->enter_y); 1285 fprintf (freezer, "enter_y %d\n", m->enter_y);
1308 if (m->msg) 1286 if (m->msg)
1309 fprintf (fp, "msg\n%sendmsg\n", m->msg); 1287 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1310 if (m->maplore) 1288 if (m->maplore)
1311 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore); 1289 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1312 if (m->unique) 1290 if (m->unique)
1313 fprintf (fp, "unique %d\n", m->unique); 1291 fprintf (freezer, "unique %d\n", m->unique);
1314 if (m->templatemap) 1292 if (m->templatemap)
1315 fprintf (fp, "template %d\n", m->templatemap); 1293 fprintf (freezer, "template %d\n", m->templatemap);
1316 if (m->outdoor) 1294 if (m->outdoor)
1317 fprintf (fp, "outdoor %d\n", m->outdoor); 1295 fprintf (freezer, "outdoor %d\n", m->outdoor);
1318 if (m->temp) 1296 if (m->temp)
1319 fprintf (fp, "temp %d\n", m->temp); 1297 fprintf (freezer, "temp %d\n", m->temp);
1320 if (m->pressure) 1298 if (m->pressure)
1321 fprintf (fp, "pressure %d\n", m->pressure); 1299 fprintf (freezer, "pressure %d\n", m->pressure);
1322 if (m->humid) 1300 if (m->humid)
1323 fprintf (fp, "humid %d\n", m->humid); 1301 fprintf (freezer, "humid %d\n", m->humid);
1324 if (m->windspeed) 1302 if (m->windspeed)
1325 fprintf (fp, "windspeed %d\n", m->windspeed); 1303 fprintf (freezer, "windspeed %d\n", m->windspeed);
1326 if (m->winddir) 1304 if (m->winddir)
1327 fprintf (fp, "winddir %d\n", m->winddir); 1305 fprintf (freezer, "winddir %d\n", m->winddir);
1328 if (m->sky) 1306 if (m->sky)
1329 fprintf (fp, "sky %d\n", m->sky); 1307 fprintf (freezer, "sky %d\n", m->sky);
1330 if (m->nosmooth) 1308 if (m->nosmooth)
1331 fprintf (fp, "nosmooth %d\n", m->nosmooth); 1309 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
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
1339 fp.put (m); 1317 freezer.put (m);
1340 fprintf (fp, "end\n"); 1318 fprintf (freezer, "end\n");
1341 1319
1342 /* In the game save unique items in the different file, but 1320 /* In the game save unique items in the different file, but
1343 * in the editor save them to the normal map file. 1321 * in the editor save them to the normal map file.
1344 * If unique map, save files in the proper destination (set by 1322 * If unique map, save files in the proper destination (set by
1345 * player) 1323 * player)
1346 */ 1324 */
1347 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) 1325 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1348 { 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
1349 sprintf (buf, "%s.v00", create_items_path (m->path)); 1334 sprintf (buf, "%s.v00", create_items_path (m->path));
1350 1335
1351 object_freezer fp2 (buf); 1336 unique.save (buf);
1352
1353 if (flag == 2)
1354 save_objects (m, fp, fp2, 2);
1355 else
1356 save_objects (m, fp, fp2, 0);
1357 } 1337 }
1358 else 1338 else
1359 { /* save same file when not playing, like in editor */ 1339 { /* save same file when not playing, like in editor */
1360 save_objects (m, fp, fp, 0); 1340 save_objects (m, freezer, freezer, 0);
1361 } 1341 }
1342
1343 freezer.save (filename);
1362 1344
1363 return 0; 1345 return 0;
1364} 1346}
1365 1347
1366 1348
… …
1411 clean_object(op); 1393 clean_object(op);
1412 remove_ob(op); 1394 remove_ob(op);
1413 free_object(op); 1395 free_object(op);
1414 } 1396 }
1415 } 1397 }
1416#ifdef MANY_CORES
1417 /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
1418 * an item on that map was not saved - look for that condition and die as appropriate -
1419 * this leaves more of the map data intact for better debugging.
1420 */
1421 for (op=objects; op!=NULL; op=op->next) {
1422 if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
1423 LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
1424 abort();
1425 }
1426 }
1427#endif
1428} 1398}
1429 1399
1430/* 1400/*
1431 * Frees everything allocated by the given mapstructure. 1401 * Frees everything allocated by the given mapstructure.
1432 * don't free tmpname - our caller is left to do that 1402 * don't free tmpname - our caller is left to do that
… …
1581 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { 1551 if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) {
1582 m=load_overlay_map(name, m); 1552 m=load_overlay_map(name, m);
1583 if (m==NULL) 1553 if (m==NULL)
1584 return NULL; 1554 return NULL;
1585 } 1555 }
1556
1557 if (flags & MAP_PLAYER_UNIQUE)
1558 INVOKE_MAP (SWAPIN, m);
1586 1559
1587 } else { 1560 } else {
1588 /* If in this loop, we found a temporary map, so load it up. */ 1561 /* If in this loop, we found a temporary map, so load it up. */
1589 1562
1590 m=load_temporary_map (m); 1563 m=load_temporary_map (m);

Diff Legend

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