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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.8 by root, Sat Aug 26 08:44:04 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.C,v 1.1 2006/08/13 17:16:00 elmex Exp $"; 3 * "$Id: map.C,v 1.8 2006/08/26 08:44:04 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
… …
37 37
38#include "path.h" 38#include "path.h"
39 39
40 40
41extern int nrofallocobjects,nroffreeobjects; 41extern int nrofallocobjects,nroffreeobjects;
42
43void (*load_original_map_callback)(mapstruct *map);
44void (*load_temporary_map_callback)(mapstruct *map);
45void (*clean_temporary_map_callback)(mapstruct *map);
46 42
47/* 43/*
48 * Returns the mapstruct which has a name matching the given argument. 44 * Returns the mapstruct which has a name matching the given argument.
49 * return NULL if no match is found. 45 * return NULL if no match is found.
50 */ 46 */
… …
268 retval |= P_NEW_MAP; 264 retval |= P_NEW_MAP;
269 if (newmap) *newmap = mp; 265 if (newmap) *newmap = mp;
270 if (nx) *nx = newx; 266 if (nx) *nx = newx;
271 if (ny) *ny = newy; 267 if (ny) *ny = newy;
272 retval |= mp->spaces[newx + mp->width * newy].flags; 268 retval |= mp->spaces[newx + mp->width * newy].flags;
269
270 if (retval & P_SAFE)
271 retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
272
273 return retval; 273 return retval;
274} 274}
275 275
276 276
277/* 277/*
… …
945 m->winddir = atoi(value); 945 m->winddir = atoi(value);
946 } else if (!strcmp(key, "sky")) { 946 } else if (!strcmp(key, "sky")) {
947 m->sky = atoi(value); 947 m->sky = atoi(value);
948 } else if (!strcmp(key, "nosmooth")) { 948 } else if (!strcmp(key, "nosmooth")) {
949 m->nosmooth = atoi(value); 949 m->nosmooth = atoi(value);
950 } else if (!strcmp(key, "safe_map")) {
951 m->safe_map = atoi(value);
950 } 952 }
951 else if (!strncmp(key,"tile_path_", 10)) { 953 else if (!strncmp(key,"tile_path_", 10)) {
952 int tile=atoi(key+10); 954 int tile=atoi(key+10);
953 955
954 if (tile<1 || tile>4) { 956 if (tile<1 || tile>4) {
… …
1049 close_and_delete(fp, comp); 1051 close_and_delete(fp, comp);
1050 m->in_memory=MAP_IN_MEMORY; 1052 m->in_memory=MAP_IN_MEMORY;
1051 if (!MAP_DIFFICULTY(m)) 1053 if (!MAP_DIFFICULTY(m))
1052 MAP_DIFFICULTY(m)=calculate_difficulty(m); 1054 MAP_DIFFICULTY(m)=calculate_difficulty(m);
1053 set_map_reset_time(m); 1055 set_map_reset_time(m);
1054 if (load_original_map_callback) 1056 INVOKE_MAP (LOAD, m);
1055 load_original_map_callback(m);
1056 return (m); 1057 return (m);
1057} 1058}
1058 1059
1059/* 1060/*
1060 * Loads a map, which has been loaded earlier, from file. 1061 * Loads a map, which has been loaded earlier, from file.
… …
1100 1101
1101 m->in_memory=MAP_LOADING; 1102 m->in_memory=MAP_LOADING;
1102 load_objects (m, fp, 0); 1103 load_objects (m, fp, 0);
1103 close_and_delete(fp, comp); 1104 close_and_delete(fp, comp);
1104 m->in_memory=MAP_IN_MEMORY; 1105 m->in_memory=MAP_IN_MEMORY;
1105 if (load_temporary_map_callback) 1106 INVOKE_MAP (SWAPIN, m);
1106 load_temporary_map_callback(m);
1107 return m; 1107 return m;
1108} 1108}
1109 1109
1110/* 1110/*
1111 * Loads a map, which has been loaded earlier, from file. 1111 * Loads a map, which has been loaded earlier, from file.
… …
1214 * (this should have been updated when first loaded) 1214 * (this should have been updated when first loaded)
1215 */ 1215 */
1216 1216
1217int new_save_map(mapstruct *m, int flag) { 1217int new_save_map(mapstruct *m, int flag) {
1218 FILE *fp, *fp2; 1218 FILE *fp, *fp2;
1219 char filename[MAX_BUF],buf[MAX_BUF], shop[MAX_BUF]; 1219 char filename[MAX_BUF],buf[MAX_BUF], buf_s[MAX_BUF],
1220 shop[MAX_BUF], filename_s[MAX_BUF];
1220 int i; 1221 int i;
1221 1222
1222 if (flag && !*m->path) { 1223 if (flag && !*m->path) {
1223 LOG(llevError,"Tried to save map without path.\n"); 1224 LOG(llevError,"Tried to save map without path.\n");
1224 return -1; 1225 return -1;
… …
1245 } else { 1246 } else {
1246 if (!m->tmpname) 1247 if (!m->tmpname)
1247 m->tmpname = tempnam_local(settings.tmpdir,NULL); 1248 m->tmpname = tempnam_local(settings.tmpdir,NULL);
1248 strcpy(filename, m->tmpname); 1249 strcpy(filename, m->tmpname);
1249 } 1250 }
1250 LOG(llevDebug,"Saving map %s\n",m->path); 1251 LOG(llevDebug,"Saving map %s to %s\n", m->path, filename);
1251 m->in_memory = MAP_SAVING; 1252 m->in_memory = MAP_SAVING;
1252 1253
1253 unlink (filename); // do not overwrite backups if done via hardlinks 1254 sprintf (filename_s, "%s~", filename);
1254 1255
1255 /* Compress if it isn't a temporary save. Do compress if unique */ 1256 /* Compress if it isn't a temporary save. Do compress if unique */
1256 if (m->compressed && (m->unique || m->templatemap || flag)) { 1257 if (m->compressed && (m->unique || m->templatemap || flag)) {
1257 char buf[MAX_BUF]; 1258 char buf[MAX_BUF];
1258 strcpy(buf, uncomp[m->compressed][2]); 1259 strcpy(buf, uncomp[m->compressed][2]);
1259 strcat(buf, " > "); 1260 strcat(buf, " > ");
1260 strcat(buf, filename); 1261 strcat(buf, filename_s);
1261 fp = popen(buf, "w"); 1262 fp = popen(buf, "w");
1262 } else 1263 } else
1263 fp = fopen(filename, "w"); 1264 fp = fopen(filename_s, "w");
1264 1265
1265 if(fp == NULL) { 1266 if(fp == NULL) {
1266 LOG(llevError, "Cannot write %s: %s\n", filename, strerror_local(errno)); 1267 LOG(llevError, "Cannot write %s: %s\n", filename_s, strerror_local(errno));
1267 return -1; 1268 return -1;
1268 } 1269 }
1269 1270
1270 /* legacy */ 1271 /* legacy */
1271 fprintf(fp,"arch map\n"); 1272 fprintf(fp,"arch map\n");
… …
1306 if (m->humid) fprintf(fp, "humid %d\n", m->humid); 1307 if (m->humid) fprintf(fp, "humid %d\n", m->humid);
1307 if (m->windspeed) fprintf(fp, "windspeed %d\n", m->windspeed); 1308 if (m->windspeed) fprintf(fp, "windspeed %d\n", m->windspeed);
1308 if (m->winddir) fprintf(fp, "winddir %d\n", m->winddir); 1309 if (m->winddir) fprintf(fp, "winddir %d\n", m->winddir);
1309 if (m->sky) fprintf(fp, "sky %d\n", m->sky); 1310 if (m->sky) fprintf(fp, "sky %d\n", m->sky);
1310 if (m->nosmooth) fprintf(fp, "nosmooth %d\n", m->nosmooth); 1311 if (m->nosmooth) fprintf(fp, "nosmooth %d\n", m->nosmooth);
1312 if (m->safe_map) fprintf(fp, "safe_map %d\n", m->safe_map);
1311 1313
1312 /* Save any tiling information, except on overlays */ 1314 /* Save any tiling information, except on overlays */
1313 if (flag != 2) 1315 if (flag != 2)
1314 for (i=0; i<4; i++) 1316 for (i=0; i<4; i++)
1315 if (m->tile_path[i]) 1317 if (m->tile_path[i])
… …
1320 /* In the game save unique items in the different file, but 1322 /* In the game save unique items in the different file, but
1321 * in the editor save them to the normal map file. 1323 * in the editor save them to the normal map file.
1322 * If unique map, save files in the proper destination (set by 1324 * If unique map, save files in the proper destination (set by
1323 * player) 1325 * player)
1324 */ 1326 */
1325 fp2 = fp; /* save unique items into fp2 */
1326 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) { 1327 if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) {
1327 sprintf (buf,"%s.v00",create_items_path (m->path)); 1328 sprintf (buf,"%s.v00",create_items_path (m->path));
1329 sprintf (buf_s, "%s~", buf);
1328 if ((fp2 = fopen (buf, "w")) == NULL) { 1330 if ((fp2 = fopen (buf_s, "w")) == NULL) {
1329 LOG(llevError, "Can't open unique items file %s\n", buf); 1331 LOG(llevError, "Can't open unique items file %s\n", buf_s);
1330 } 1332 }
1331 if (flag == 2) 1333 if (flag == 2)
1332 save_objects(m, fp, fp2, 2); 1334 save_objects(m, fp, fp2, 2);
1333 else 1335 else
1334 save_objects (m, fp, fp2, 0); 1336 save_objects (m, fp, fp2, 0);
1335 if (fp2 != NULL) { 1337 if (fp2 != NULL) {
1336 if (ftell (fp2) == 0) { 1338 if (ftell (fp2) == 0) {
1337 fclose (fp2); 1339 fclose (fp2);
1340 rename (buf_s, buf);
1338 unlink (buf); 1341 unlink (buf);
1339 } else { 1342 } else {
1340 fclose (fp2); 1343 fclose (fp2);
1344 rename (buf_s, buf);
1341 chmod (buf, SAVE_MODE); 1345 chmod (buf, SAVE_MODE);
1342 } 1346 }
1343 } 1347 }
1344 } else { /* save same file when not playing, like in editor */ 1348 } else { /* save same file when not playing, like in editor */
1345 save_objects(m, fp, fp, 0); 1349 save_objects(m, fp, fp, 0);
… …
1347 1351
1348 if (m->compressed && (m->unique || m->templatemap || flag)) 1352 if (m->compressed && (m->unique || m->templatemap || flag))
1349 pclose(fp); 1353 pclose(fp);
1350 else 1354 else
1351 fclose(fp); 1355 fclose(fp);
1356
1357 rename (filename_s, filename);
1352 1358
1353 chmod (filename, SAVE_MODE); 1359 chmod (filename, SAVE_MODE);
1354 return 0; 1360 return 0;
1355} 1361}
1356 1362
… …
1669} 1675}
1670 1676
1671void clean_tmp_map(mapstruct *m) { 1677void clean_tmp_map(mapstruct *m) {
1672 if(m->tmpname == NULL) 1678 if(m->tmpname == NULL)
1673 return; 1679 return;
1674 if (clean_temporary_map_callback) 1680 INVOKE_MAP (CLEAN, m);
1675 clean_temporary_map_callback (m);
1676 (void) unlink(m->tmpname); 1681 (void) unlink(m->tmpname);
1677} 1682}
1678 1683
1679void free_all_maps(void) 1684void free_all_maps(void)
1680{ 1685{
… …
1819 flags |= P_IS_ALIVE; 1824 flags |= P_IS_ALIVE;
1820 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 1825 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC))
1821 flags |= P_NO_MAGIC; 1826 flags |= P_NO_MAGIC;
1822 if (QUERY_FLAG(tmp,FLAG_DAMNED)) 1827 if (QUERY_FLAG(tmp,FLAG_DAMNED))
1823 flags |= P_NO_CLERIC; 1828 flags |= P_NO_CLERIC;
1829 if (tmp->type == SAFE_GROUND)
1830 flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC;
1824 1831
1825 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) 1832 if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW))
1826 flags |= P_BLOCKSVIEW; 1833 flags |= P_BLOCKSVIEW;
1827 } /* for stack of objects */ 1834 } /* for stack of objects */
1828 1835

Diff Legend

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