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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC

…		…
217	}	217	}
218		218
219	return 0;	219	return 0;
220	}	220	}
221		221
222	/* When the map is loaded, load_object does not actually insert objects
223	* into inventory, but just links them. What this does is go through
224	* and insert them properly.
225	* The object 'container' is the object that contains the inventory.
226	* This is needed so that we can update the containers weight.
227	*/
228	void
229	fix_container (object *container)
230	{
231	object tmp = container->inv, next;
232
233	container->inv = 0;
234	while (tmp)
235	{
236	next = tmp->below;
237	if (tmp->inv)
238	fix_container (tmp);
239
240	insert_ob_in_ob (tmp, container);
241	tmp = next;
242	}
243
244	// go through and calculate what all the containers are carrying.
245	//TODO: remove
246	container->update_weight ();
247	}
248
249	//-GPL	222	//-GPL
250		223
251	void	224	void
252	maptile::set_object_flag (int flag, int value)	225	maptile::set_object_flag (int flag, int value)
253	{	226	{
…		…
268	set_object_flag (FLAG_OBJ_ORIGINAL);	241	set_object_flag (FLAG_OBJ_ORIGINAL);
269		242
270	for (mapspace *ms = spaces + size (); ms-- > spaces; )	243	for (mapspace *ms = spaces + size (); ms-- > spaces; )
271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	244	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272	INVOKE_OBJECT (RESET, tmp);	245	INVOKE_OBJECT (RESET, tmp);
		246	}
		247
		248	void
		249	maptile::post_load ()
		250	{
		251	#if 0
		252	if (!spaces)
		253	return;
		254
		255	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		256	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
		257	; // nop
		258	#endif
273	}	259	}
274		260
275	//+GPL	261	//+GPL
276		262
277	/* link_multipart_objects go through all the objects on the map looking	263	/* link_multipart_objects go through all the objects on the map looking
…		…
448	* map archetype. Mimic that behaviour.	434	* map archetype. Mimic that behaviour.
449	*/	435	*/
450	width = 16;	436	width = 16;
451	height = 16;	437	height = 16;
452	timeout = 300;	438	timeout = 300;
453	max_nrof = 1000; // 1000 items of anything	439	max_items = MAX_ITEM_PER_ACTION;
454	max_volume = 2000000; // 2m³	440	max_volume = 2000000; // 2m³
455	}	441	}
456		442
457	maptile::maptile (int w, int h)	443	maptile::maptile (int w, int h)
458	{	444	{
…		…
728	//-GPL	714	//-GPL
729		715
730	bool	716	bool
731	maptile::_save_header (object_freezer &freezer)	717	maptile::_save_header (object_freezer &freezer)
732	{	718	{
733	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	719	#define MAP_OUT(k) freezer.put (KW(k), k)
734	#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)	720	#define MAP_OUT2(k,v) freezer.put (KW(k), v)
735		721
736	MAP_OUT2 (arch, "map");	722	MAP_OUT2 (arch, CS(map));
737		723
738	if (name) MAP_OUT (name);	724	if (name) MAP_OUT (name);
739	MAP_OUT (swap_time);	725	MAP_OUT (swap_time);
740	MAP_OUT (reset_time);	726	MAP_OUT (reset_time);
741	MAP_OUT (reset_timeout);	727	MAP_OUT (reset_timeout);
…		…
755	MAP_OUT (width);	741	MAP_OUT (width);
756	MAP_OUT (height);	742	MAP_OUT (height);
757	MAP_OUT (enter_x);	743	MAP_OUT (enter_x);
758	MAP_OUT (enter_y);	744	MAP_OUT (enter_y);
759		745
760	if (msg) freezer.put (KW_msg , KW_endmsg , msg);	746	if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
761	if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);	747	if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
762		748
763	MAP_OUT (outdoor);	749	MAP_OUT (outdoor);
764	MAP_OUT (temp);	750	MAP_OUT (temp);
765	MAP_OUT (pressure);	751	MAP_OUT (pressure);
766	MAP_OUT (humid);	752	MAP_OUT (humid);
…		…
775	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);	761	if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
776	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);	762	if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
777	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);	763	if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
778		764
779	freezer.put (this);	765	freezer.put (this);
780	freezer.put (KW_end);	766	freezer.put (KW(end));
781		767
782	return true;	768	return true;
783	}	769	}
784		770
785	bool	771	bool
…		…
1027	*/	1013	*/
1028	void	1014	void
1029	mapspace::update_ ()	1015	mapspace::update_ ()
1030	{	1016	{
1031	object *last = 0;	1017	object *last = 0;
1032	uint8 flags = P_UPTODATE, anywhere = 0;	1018	uint8 flags = P_UPTODATE;
1033	sint8 light = 0;	1019	sint8 light = 0;
1034	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1020	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
		1021	uint64_t volume = 0;
		1022	uint32_t items = 0;
		1023	object *anywhere = 0;
		1024	uint8_t middle_visibility = 0;
1035		1025
1036	//object *middle = 0;	1026	//object *middle = 0;
1037	//object *top = 0;	1027	//object *top = 0;
1038	//object *floor = 0;	1028	//object *floor = 0;
1039	// this seems to generate better code than using locals, above	1029	// this seems to generate better code than using locals, above
1040	object *&top = faces_obj[0] = 0;	1030	object *&top = faces_obj[0] = 0;
1041	object *&middle = faces_obj[1] = 0;	1031	object *&middle = faces_obj[1] = 0;
1042	object *&floor = faces_obj[2] = 0;	1032	object *&floor = faces_obj[2] = 0;
		1033
		1034	object::flags_t allflags; // all flags of all objects or'ed together
1043		1035
1044	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)	1036	for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1045	{	1037	{
1046	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)	1038	// Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1047	light += tmp->glow_radius;	1039	light += tmp->glow_radius;
…		…
1052	* 3 times each time the player moves, because many of the	1044	* 3 times each time the player moves, because many of the
1053	* functions the move_player calls eventualy call this.	1045	* functions the move_player calls eventualy call this.
1054	*	1046	*
1055	* Always put the player down for drawing.	1047	* Always put the player down for drawing.
1056	*/	1048	*/
1057	if (!tmp->invisible)	1049	if (expect_true (!tmp->invisible))
1058	{	1050	{
1059	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1051	if (expect_false (tmp->type == PLAYER \|\| tmp->flag [FLAG_MONSTER]))
1060	top = tmp;	1052	top = tmp;
1061	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1053	else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1062	{	1054	{
1063	/* If we got a floor, that means middle and top were below it,	1055	/* If we got a floor, that means middle and top were below it,
1064	* so should not be visible, so we clear them.	1056	* so should not be visible, so we clear them.
1065	*/	1057	*/
1066	middle = 0;	1058	middle = 0;
1067	top = 0;	1059	top = 0;
1068	floor = tmp;	1060	floor = tmp;
		1061	volume = 0;
		1062	items = 0;
1069	}	1063	}
1070	/* Flag anywhere have high priority */	1064	else
1071	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1072	{	1065	{
		1066	if (expect_true (!tmp->flag [FLAG_NO_PICK]))
		1067	{
		1068	++items;
		1069	volume += tmp->volume ();
		1070	}
		1071
		1072	/* Flag anywhere have high priority */
		1073	if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
		1074	anywhere = tmp;
		1075
		1076	/* Find the highest visible face around. If equal
		1077	* visibilities, we still want the one nearer to the
		1078	* top
		1079	*/
		1080	if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
		1081	{
		1082	middle_visibility = ::faces [tmp->face].visibility;
1073	middle = tmp;	1083	middle = tmp;
1074	anywhere = 1;	1084	}
1075	}	1085	}
1076
1077	/* Find the highest visible face around. If equal
1078	* visibilities, we still want the one nearer to the
1079	* top
1080	*/
1081	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1082	middle = tmp;
1083	}
1084
1085	if (tmp == tmp->above)
1086	{
1087	LOG (llevError, "Error in structure of map\n");
1088	exit (-1);
1089	}	1086	}
1090		1087
1091	move_slow \|= tmp->move_slow;	1088	move_slow \|= tmp->move_slow;
1092	move_block \|= tmp->move_block;	1089	move_block \|= tmp->move_block;
1093	move_on \|= tmp->move_on;	1090	move_on \|= tmp->move_on;
1094	move_off \|= tmp->move_off;	1091	move_off \|= tmp->move_off;
1095	move_allow \|= tmp->move_allow;	1092	move_allow \|= tmp->move_allow;
1096		1093
1097	if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags \|= P_BLOCKSVIEW;	1094	allflags \|= tmp->flag;
1098	if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags \|= P_NO_MAGIC;	1095
1099	if (tmp->type == PLAYER) flags \|= P_PLAYER;	1096	if (tmp->type == PLAYER) flags \|= P_PLAYER;
1100	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;	1097	if (tmp->type == SAFE_GROUND) flags \|= P_SAFE;
1101	if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags \|= P_IS_ALIVE;
1102	if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags \|= P_NO_CLERIC;
1103	}	1098	}
		1099
		1100	// FLAG_SEE_ANYWHERE takes precedence
		1101	if (anywhere)
		1102	middle = anywhere;
		1103
		1104	// ORing all flags together and checking them here is much faster
		1105	if (allflags [FLAG_BLOCKSVIEW]) flags \|= P_BLOCKSVIEW;
		1106	if (allflags [FLAG_NO_MAGIC] ) flags \|= P_NO_MAGIC;
		1107	if (allflags [FLAG_ALIVE] ) flags \|= P_IS_ALIVE;
		1108	if (allflags [FLAG_DAMNED] ) flags \|= P_NO_CLERIC;
1104		1109
1105	this->light = min (light, MAX_LIGHT_RADIUS);	1110	this->light = min (light, MAX_LIGHT_RADIUS);
1106	this->flags_ = flags;	1111	this->flags_ = flags;
1107	this->move_block = move_block & ~move_allow;	1112	this->move_block = move_block & ~move_allow;
1108	this->move_on = move_on;	1113	this->move_on = move_on;
1109	this->move_off = move_off;	1114	this->move_off = move_off;
1110	this->move_slow = move_slow;	1115	this->move_slow = move_slow;
		1116	this->volume_ = (volume + 1023) / 1024;
		1117	this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1111		1118
1112	/* At this point, we have a floor face (if there is a floor),	1119	/* At this point, we have a floor face (if there is a floor),
1113	* and the floor is set - we are not going to touch it at	1120	* and the floor is set - we are not going to touch it at
1114	* this point.	1121	* this point.
1115	* middle contains the highest visibility face.	1122	* middle contains the highest visibility face.
…		…
1181	faces_obj [1] = middle;	1188	faces_obj [1] = middle;
1182	faces_obj [2] = floor;	1189	faces_obj [2] = floor;
1183	#endif	1190	#endif
1184	}	1191	}
1185		1192
1186	uint64
1187	mapspace::volume () const
1188	{
1189	uint64 vol = 0;
1190
1191	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1192	vol += op->volume ();
1193
1194	return vol;
1195	}
1196
1197	maptile *	1193	maptile *
1198	maptile::tile_available (int dir, bool load)	1194	maptile::tile_available (int dir, bool load)
1199	{	1195	{
1200	if (tile_path[dir])	1196	if (tile_path[dir])
1201	{	1197	{
…		…
1586	if (pick && pick->is_head ())	1582	if (pick && pick->is_head ())
1587	return pick->head_ ();	1583	return pick->head_ ();
1588	}	1584	}
1589		1585
1590	// instead of crashing in the unlikely(?) case, try to return something	1586	// instead of crashing in the unlikely(?) case, try to return something
1591	return archetype::find ("bug");	1587	return archetype::find (shstr_bug);
1592	}	1588	}
1593		1589
1594	//-GPL	1590	//-GPL
1595		1591
1596	void	1592	void

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs. Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.167 by root, Thu Nov 5 15:43:21 2009 UTC vs.
Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC