[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.10 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.14 by root, Wed Aug 30 06:06:26 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.14 2006/08/30 06:06:26 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
793	* currently, there are few enough fields this is not a big deal.	793	* currently, there are few enough fields this is not a big deal.
794	* MSW 2001-07-01	794	* MSW 2001-07-01
795	* return 0 on success, 1 on failure.	795	* return 0 on success, 1 on failure.
796	*/	796	*/
797		797
798	static int load_map_header(FILE fp, mapstruct m)	798	static int load_map_header(object_thawer &fp, mapstruct *m)
799	{	799	{
800	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], key=NULL, value, *end;	800	char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], key=NULL, value, *end;
801	int msgpos=0;	801	int msgpos=0;
802	int maplorepos=0;	802	int maplorepos=0;
803		803
…		…
893	}	893	}
894	/* first strcmp value on these are old names supported	894	/* first strcmp value on these are old names supported
895	* for compatibility reasons. The new values (second) are	895	* for compatibility reasons. The new values (second) are
896	* what really should be used.	896	* what really should be used.
897	*/	897	*/
		898	else if (!strcmp(key,"oid")) {
		899	fp.get (m, atoi(value));
		900	} else if (!strcmp(key, "attach")) {
		901	m->attach = add_string (value);
898	else if (!strcmp(key,"hp") \|\| !strcmp(key, "enter_x")) {	902	} else if (!strcmp(key,"hp") \|\| !strcmp(key, "enter_x")) {
899	m->enter_x = atoi(value);	903	m->enter_x = atoi(value);
900	} else if (!strcmp(key,"sp") \|\| !strcmp(key, "enter_y")) {	904	} else if (!strcmp(key,"sp") \|\| !strcmp(key, "enter_y")) {
901	m->enter_y = atoi(value);	905	m->enter_y = atoi(value);
902	} else if (!strcmp(key,"x") \|\| !strcmp(key, "width")) {	906	} else if (!strcmp(key,"x") \|\| !strcmp(key, "width")) {
903	m->width = atoi(value);	907	m->width = atoi(value);
…		…
945	m->winddir = atoi(value);	949	m->winddir = atoi(value);
946	} else if (!strcmp(key, "sky")) {	950	} else if (!strcmp(key, "sky")) {
947	m->sky = atoi(value);	951	m->sky = atoi(value);
948	} else if (!strcmp(key, "nosmooth")) {	952	} else if (!strcmp(key, "nosmooth")) {
949	m->nosmooth = atoi(value);	953	m->nosmooth = atoi(value);
950	} else if (!strcmp(key, "safe_map")) {
951	m->safe_map = atoi(value);
952	}	954	}
953	else if (!strncmp(key,"tile_path_", 10)) {	955	else if (!strncmp(key,"tile_path_", 10)) {
954	int tile=atoi(key+10);	956	int tile=atoi(key+10);
955		957
956	if (tile<1 \|\| tile>4) {	958	if (tile<1 \|\| tile>4) {
…		…
1013	* MAP_STYLE: style map - don't add active objects, don't add to server	1015	* MAP_STYLE: style map - don't add active objects, don't add to server
1014	* managed map list.	1016	* managed map list.
1015	*/	1017	*/
1016		1018
1017	mapstruct load_original_map(const char filename, int flags) {	1019	mapstruct load_original_map(const char filename, int flags) {
1018	FILE *fp;
1019	mapstruct *m;	1020	mapstruct *m;
1020	int comp;
1021	char pathname[MAX_BUF];	1021	char pathname[MAX_BUF];
1022		1022
1023	LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);	1023	LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
1024	if (flags & MAP_PLAYER_UNIQUE)	1024	if (flags & MAP_PLAYER_UNIQUE)
1025	strcpy(pathname, filename);	1025	strcpy(pathname, filename);
1026	else if (flags & MAP_OVERLAY)	1026	else if (flags & MAP_OVERLAY)
1027	strcpy(pathname, create_overlay_pathname(filename));	1027	strcpy(pathname, create_overlay_pathname(filename));
1028	else	1028	else
1029	strcpy(pathname, create_pathname(filename));	1029	strcpy(pathname, create_pathname(filename));
1030		1030
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);	1031	object_thawer thawer (pathname);
		1032
		1033	if (!thawer)
		1034	return 0;
1037		1035
1038	m = get_linked_map();	1036	m = get_linked_map();
1039		1037
1040	strcpy (m->path, filename);	1038	strcpy (m->path, filename);
1041	if (load_map_header(fp, m)) {	1039	if (load_map_header(thawer, m)) {
1042	LOG(llevError,"Error loading map header for %s, flags=%d\n",	1040	LOG(llevError,"Error loading map header for %s, flags=%d\n",
1043	filename, flags);	1041	filename, flags);
1044	delete_map(m);	1042	delete_map(m);
1045	return NULL;	1043	return NULL;
1046	}	1044	}
1047		1045
1048	allocate_map(m);	1046	allocate_map(m);
1049		1047
1050	m->in_memory=MAP_LOADING;	1048	m->in_memory=MAP_LOADING;
1051	load_objects (m, thawer, flags & (MAP_BLOCK\|MAP_STYLE));	1049	load_objects (m, thawer, flags & (MAP_BLOCK\|MAP_STYLE));
1052	close_and_delete(fp, comp);	1050
1053	m->in_memory=MAP_IN_MEMORY;	1051	m->in_memory=MAP_IN_MEMORY;
1054	if (!MAP_DIFFICULTY(m))	1052	if (!MAP_DIFFICULTY(m))
1055	MAP_DIFFICULTY(m)=calculate_difficulty(m);	1053	MAP_DIFFICULTY(m)=calculate_difficulty(m);
1056	set_map_reset_time(m);	1054	set_map_reset_time(m);
1057	INVOKE_MAP (INSTANTIATE, m);	1055	m->instantiate ();
1058	return (m);	1056	return (m);
1059	}	1057	}
1060		1058
1061	/*	1059	/*
1062	* Loads a map, which has been loaded earlier, from file.	1060	* Loads a map, which has been loaded earlier, from file.
1063	* Return the map object we load into (this can change from the passed	1061	* Return the map object we load into (this can change from the passed
1064	* option if we can't find the original map)	1062	* option if we can't find the original map)
1065	*/	1063	*/
1066		1064
1067	static mapstruct load_temporary_map(mapstruct m) {	1065	static mapstruct load_temporary_map(mapstruct m) {
1068	FILE *fp;
1069	int comp;	1066	int comp;
1070	char buf[MAX_BUF];	1067	char buf[MAX_BUF];
1071		1068
1072	if (!m->tmpname) {	1069	if (!m->tmpname) {
1073	LOG(llevError, "No temporary filename for map %s\n", m->path);	1070	LOG(llevError, "No temporary filename for map %s\n", m->path);
…		…
1077	if(m==NULL) return NULL;	1074	if(m==NULL) return NULL;
1078	fix_auto_apply(m); /* Chests which open as default */	1075	fix_auto_apply(m); /* Chests which open as default */
1079	return m;	1076	return m;
1080	}	1077	}
1081		1078
1082	if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) {	1079	object_thawer thawer (m->tmpname);
1083	LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno));	1080
		1081	if (!thawer)
		1082	{
1084	strcpy(buf, m->path);	1083	strcpy (buf, m->path);
1085	delete_map(m);	1084	delete_map (m);
1086	m = load_original_map(buf, 0);	1085	m = load_original_map (buf, 0);
1087	if(m==NULL) return NULL;	1086	if (!m) return NULL;
1088	fix_auto_apply(m); /* Chests which open as default */	1087	fix_auto_apply (m); /* Chests which open as default */
1089	return m;	1088	return m;
1090	}	1089	}
1091
1092	object_thawer thawer (fp, m->tmpname);
1093		1090
1094	if (load_map_header(thawer, m)) {	1091	if (load_map_header(thawer, m)) {
1095	LOG(llevError,"Error loading map header for %s (%s)\n",	1092	LOG(llevError,"Error loading map header for %s (%s)\n",
1096	m->path, m->tmpname);	1093	m->path, m->tmpname);
1097	delete_map(m);	1094	delete_map(m);
…		…
1100	}	1097	}
1101	allocate_map(m);	1098	allocate_map(m);
1102		1099
1103	m->in_memory=MAP_LOADING;	1100	m->in_memory=MAP_LOADING;
1104	load_objects (m, thawer, 0);	1101	load_objects (m, thawer, 0);
1105	close_and_delete(fp, comp);	1102
1106	m->in_memory=MAP_IN_MEMORY;	1103	m->in_memory=MAP_IN_MEMORY;
1107	INVOKE_MAP (SWAPIN, m);	1104	INVOKE_MAP (SWAPIN, m);
1108	return m;	1105	return m;
1109	}	1106	}
1110		1107
…		…
1113	* Return the map object we load into (this can change from the passed	1110	* Return the map object we load into (this can change from the passed
1114	* option if we can't find the original map)	1111	* option if we can't find the original map)
1115	*/	1112	*/
1116		1113
1117	mapstruct load_overlay_map(const char filename, mapstruct *m) {	1114	mapstruct load_overlay_map(const char filename, mapstruct *m) {
1118	FILE *fp;
1119	int comp;
1120	char pathname[MAX_BUF];	1115	char pathname[MAX_BUF];
1121		1116
1122	strcpy(pathname, create_overlay_pathname(filename));	1117	strcpy(pathname, create_overlay_pathname(filename));
1123		1118
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);	1119	object_thawer thawer (pathname);
		1120
		1121	if (!thawer)
		1122	return m;
1130		1123
1131	if (load_map_header(thawer, m)) {	1124	if (load_map_header(thawer, m)) {
1132	LOG(llevError,"Error loading map header for overlay %s (%s)\n",	1125	LOG(llevError,"Error loading map header for overlay %s (%s)\n",
1133	m->path, pathname);	1126	m->path, pathname);
1134	delete_map(m);	1127	delete_map(m);
…		…
1137	}	1130	}
1138	/allocate_map(m);/	1131	/allocate_map(m);/
1139		1132
1140	m->in_memory=MAP_LOADING;	1133	m->in_memory=MAP_LOADING;
1141	load_objects (m, thawer, MAP_OVERLAY);	1134	load_objects (m, thawer, MAP_OVERLAY);
1142	close_and_delete(fp, comp);	1135
1143	m->in_memory=MAP_IN_MEMORY;	1136	m->in_memory=MAP_IN_MEMORY;
1144	return m;	1137	return m;
1145	}	1138	}
1146		1139
1147	/******************************************************************************	1140	/******************************************************************************
…		…
1176	/*	1169	/*
1177	* Loads unique objects from file(s) into the map which is in memory	1170	* Loads unique objects from file(s) into the map which is in memory
1178	* m is the map to load unique items into.	1171	* m is the map to load unique items into.
1179	*/	1172	*/
1180	static void load_unique_objects(mapstruct *m) {	1173	static void load_unique_objects(mapstruct *m) {
1181	FILE *fp;
1182	int comp,count;	1174	int count;
1183	char firstname[MAX_BUF];	1175	char firstname[MAX_BUF];
1184		1176
1185	for (count=0; count<10; count++) {	1177	for (count=0; count<10; count++) {
1186	sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);	1178	sprintf(firstname, "%s.v%02d", create_items_path(m->path), count);
1187	if (!access(firstname, R_OK)) break;	1179	if (!access(firstname, R_OK)) break;
1188	}	1180	}
1189	/* If we get here, we did not find any map */	1181	/* If we get here, we did not find any map */
1190	if (count==10) return;	1182	if (count==10) return;
1191		1183
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);	1184	object_thawer thawer (firstname);
1201		1185
1202	m->in_memory=MAP_LOADING;	1186	m->in_memory=MAP_LOADING;
1203	if (m->tmpname == NULL) /* if we have loaded unique items from */	1187	if (m->tmpname == NULL) /* if we have loaded unique items from */
1204	delete_unique_items(m); /* original map before, don't duplicate them */	1188	delete_unique_items(m); /* original map before, don't duplicate them */
1205	load_object(thawer, NULL, LO_NOREAD,0);	1189	load_object(thawer, NULL, LO_NOREAD,0);
1206	load_objects (m, thawer, 0);	1190	load_objects (m, thawer, 0);
1207	close_and_delete(fp, comp);	1191
1208	m->in_memory=MAP_IN_MEMORY;	1192	m->in_memory=MAP_IN_MEMORY;
1209	}	1193	}
1210		1194
1211		1195
1212	/*	1196	/*
…		…
1325	fprintf (fp, "winddir %d\n", m->winddir);	1309	fprintf (fp, "winddir %d\n", m->winddir);
1326	if (m->sky)	1310	if (m->sky)
1327	fprintf (fp, "sky %d\n", m->sky);	1311	fprintf (fp, "sky %d\n", m->sky);
1328	if (m->nosmooth)	1312	if (m->nosmooth)
1329	fprintf (fp, "nosmooth %d\n", m->nosmooth);	1313	fprintf (fp, "nosmooth %d\n", m->nosmooth);
1330	if (m->safe_map)
1331	fprintf (fp, "safe_map %d\n", m->safe_map);
1332		1314
1333	/* Save any tiling information, except on overlays */	1315	/* Save any tiling information, except on overlays */
1334	if (flag != 2)	1316	if (flag != 2)
1335	for (i = 0; i < 4; i++)	1317	for (i = 0; i < 4; i++)
1336	if (m->tile_path[i])	1318	if (m->tile_path[i])
1337	fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]);	1319	fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
1338		1320
		1321	fp.put (m);
1339	fprintf (fp, "end\n");	1322	fprintf (fp, "end\n");
1340		1323
1341	/* In the game save unique items in the different file, but	1324	/* In the game save unique items in the different file, but
1342	* in the editor save them to the normal map file.	1325	* in the editor save them to the normal map file.
1343	* If unique map, save files in the proper destination (set by	1326	* If unique map, save files in the proper destination (set by
…		…
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;

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.10 by root, Mon Aug 28 14:05:23 2006 UTC vs. Revision 1.14 by root, Wed Aug 30 06:06:26 2006 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.10 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.14 by root, Wed Aug 30 06:06:26 2006 UTC