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.15 by root, Wed Aug 30 08:28:32 2006 UTC vs.
Revision 1.18 by root, Thu Aug 31 17:54:14 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.15 2006/08/30 08:28:32 root Exp $"; 3 * "$Id: map.C,v 1.18 2006/08/31 17:54:14 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) {
1233 } 1225 }
1234 else 1226 else
1235 { 1227 {
1236 if (!m->tmpname) 1228 if (!m->tmpname)
1237 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1229 m->tmpname = tempnam_local (settings.tmpdir, NULL);
1230
1238 strcpy (filename, m->tmpname); 1231 strcpy (filename, m->tmpname);
1239 } 1232 }
1240 1233
1241 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1234 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
1242 m->in_memory = MAP_SAVING; 1235 m->in_memory = MAP_SAVING;
1243 1236
1244 object_freezer fp (filename); 1237 object_freezer freezer;
1245 1238
1246 /* legacy */ 1239 /* legacy */
1247 fprintf (fp, "arch map\n"); 1240 fprintf (freezer, "arch map\n");
1248 if (m->name) 1241 if (m->name)
1249 fprintf (fp, "name %s\n", m->name); 1242 fprintf (freezer, "name %s\n", m->name);
1250 if (!flag) 1243 if (!flag)
1251 fprintf (fp, "swap_time %d\n", m->swap_time); 1244 fprintf (freezer, "swap_time %d\n", m->swap_time);
1252 if (m->reset_timeout) 1245 if (m->reset_timeout)
1253 fprintf (fp, "reset_timeout %d\n", m->reset_timeout); 1246 fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
1254 if (m->fixed_resettime) 1247 if (m->fixed_resettime)
1255 fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime); 1248 fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
1256 /* 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
1257 * 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
1258 */ 1251 */
1259 if (m->difficulty) 1252 if (m->difficulty)
1260 fprintf (fp, "difficulty %d\n", m->difficulty); 1253 fprintf (freezer, "difficulty %d\n", m->difficulty);
1261 if (m->region) 1254 if (m->region)
1262 fprintf (fp, "region %s\n", m->region->name); 1255 fprintf (freezer, "region %s\n", m->region->name);
1263 if (m->shopitems) 1256 if (m->shopitems)
1264 { 1257 {
1265 print_shop_string (m, shop); 1258 print_shop_string (m, shop);
1266 fprintf (fp, "shopitems %s\n", shop); 1259 fprintf (freezer, "shopitems %s\n", shop);
1267 } 1260 }
1268 if (m->shopgreed) 1261 if (m->shopgreed)
1269 fprintf (fp, "shopgreed %f\n", m->shopgreed); 1262 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1270#ifndef WIN32 1263#ifndef WIN32
1271 if (m->shopmin) 1264 if (m->shopmin)
1272 fprintf (fp, "shopmin %llu\n", m->shopmin); 1265 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1273 if (m->shopmax) 1266 if (m->shopmax)
1274 fprintf (fp, "shopmax %llu\n", m->shopmax); 1267 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1275#else 1268#else
1276 if (m->shopmin) 1269 if (m->shopmin)
1277 fprintf (fp, "shopmin %I64u\n", m->shopmin); 1270 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1278 if (m->shopmax) 1271 if (m->shopmax)
1279 fprintf (fp, "shopmax %I64u\n", m->shopmax); 1272 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1280#endif 1273#endif
1281 if (m->shoprace) 1274 if (m->shoprace)
1282 fprintf (fp, "shoprace %s\n", m->shoprace); 1275 fprintf (freezer, "shoprace %s\n", m->shoprace);
1283 if (m->darkness) 1276 if (m->darkness)
1284 fprintf (fp, "darkness %d\n", m->darkness); 1277 fprintf (freezer, "darkness %d\n", m->darkness);
1285 if (m->width) 1278 if (m->width)
1286 fprintf (fp, "width %d\n", m->width); 1279 fprintf (freezer, "width %d\n", m->width);
1287 if (m->height) 1280 if (m->height)
1288 fprintf (fp, "height %d\n", m->height); 1281 fprintf (freezer, "height %d\n", m->height);
1289 if (m->enter_x) 1282 if (m->enter_x)
1290 fprintf (fp, "enter_x %d\n", m->enter_x); 1283 fprintf (freezer, "enter_x %d\n", m->enter_x);
1291 if (m->enter_y) 1284 if (m->enter_y)
1292 fprintf (fp, "enter_y %d\n", m->enter_y); 1285 fprintf (freezer, "enter_y %d\n", m->enter_y);
1293 if (m->msg) 1286 if (m->msg)
1294 fprintf (fp, "msg\n%sendmsg\n", m->msg); 1287 fprintf (freezer, "msg\n%sendmsg\n", m->msg);
1295 if (m->maplore) 1288 if (m->maplore)
1296 fprintf (fp, "maplore\n%sendmaplore\n", m->maplore); 1289 fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
1297 if (m->unique) 1290 if (m->unique)
1298 fprintf (fp, "unique %d\n", m->unique); 1291 fprintf (freezer, "unique %d\n", m->unique);
1299 if (m->templatemap) 1292 if (m->templatemap)
1300 fprintf (fp, "template %d\n", m->templatemap); 1293 fprintf (freezer, "template %d\n", m->templatemap);
1301 if (m->outdoor) 1294 if (m->outdoor)
1302 fprintf (fp, "outdoor %d\n", m->outdoor); 1295 fprintf (freezer, "outdoor %d\n", m->outdoor);
1303 if (m->temp) 1296 if (m->temp)
1304 fprintf (fp, "temp %d\n", m->temp); 1297 fprintf (freezer, "temp %d\n", m->temp);
1305 if (m->pressure) 1298 if (m->pressure)
1306 fprintf (fp, "pressure %d\n", m->pressure); 1299 fprintf (freezer, "pressure %d\n", m->pressure);
1307 if (m->humid) 1300 if (m->humid)
1308 fprintf (fp, "humid %d\n", m->humid); 1301 fprintf (freezer, "humid %d\n", m->humid);
1309 if (m->windspeed) 1302 if (m->windspeed)
1310 fprintf (fp, "windspeed %d\n", m->windspeed); 1303 fprintf (freezer, "windspeed %d\n", m->windspeed);
1311 if (m->winddir) 1304 if (m->winddir)
1312 fprintf (fp, "winddir %d\n", m->winddir); 1305 fprintf (freezer, "winddir %d\n", m->winddir);
1313 if (m->sky) 1306 if (m->sky)
1314 fprintf (fp, "sky %d\n", m->sky); 1307 fprintf (freezer, "sky %d\n", m->sky);
1315 if (m->nosmooth) 1308 if (m->nosmooth)
1316 fprintf (fp, "nosmooth %d\n", m->nosmooth); 1309 fprintf (freezer, "nosmooth %d\n", m->nosmooth);
1317 1310
1318 /* Save any tiling information, except on overlays */ 1311 /* Save any tiling information, except on overlays */
1319 if (flag != 2) 1312 if (flag != 2)
1320 for (i = 0; i < 4; i++) 1313 for (i = 0; i < 4; i++)
1321 if (m->tile_path[i]) 1314 if (m->tile_path[i])
1322 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]);
1323 1316
1324 fp.put (m); 1317 freezer.put (m);
1325 fprintf (fp, "end\n"); 1318 fprintf (freezer, "end\n");
1326 1319
1327 /* In the game save unique items in the different file, but 1320 /* In the game save unique items in the different file, but
1328 * in the editor save them to the normal map file. 1321 * in the editor save them to the normal map file.
1329 * If unique map, save files in the proper destination (set by 1322 * If unique map, save files in the proper destination (set by
1330 * player) 1323 * player)
1331 */ 1324 */
1332 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) 1325 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
1333 { 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
1334 sprintf (buf, "%s.v00", create_items_path (m->path)); 1334 sprintf (buf, "%s.v00", create_items_path (m->path));
1335 1335
1336 object_freezer fp2 (buf); 1336 unique.save (buf);
1337
1338 if (flag == 2)
1339 save_objects (m, fp, fp2, 2);
1340 else
1341 save_objects (m, fp, fp2, 0);
1342 } 1337 }
1343 else 1338 else
1344 { /* save same file when not playing, like in editor */ 1339 { /* save same file when not playing, like in editor */
1345 save_objects (m, fp, fp, 0); 1340 save_objects (m, freezer, freezer, 0);
1346 } 1341 }
1342
1343 freezer.save (filename);
1347 1344
1348 return 0; 1345 return 0;
1349} 1346}
1350 1347
1351 1348

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines