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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
186	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
189	return 0;	190	return 0;
190		191
191	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	195	return 0;
198		196
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		205
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		208
211	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	210	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	211	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	212	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	213	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	214	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	215	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	216	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	217	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	218	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	219	\|\| ob1->animation_id != ob2->animation_id
		220	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	221	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	222	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	223	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	224	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	225	\|\| ob1->move_type != ob2->move_type
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	234	return 0;
236		235
237	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
241	.any ())	239	.any ())
242	return 0;	240	return 0;
243		241
244	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
326	{	324	{
327	// see if we are in a container of sorts	325	// see if we are in a container of sorts
328	if (env)	326	if (env)
329	{	327	{
330	// the player inventory itself is always visible	328	// the player inventory itself is always visible
331	if (env->type == PLAYER)	329	if (env->is_player ())
332	return env;	330	return env;
333		331
334	// else a player could have our env open	332	// else a player could have our env open
335	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
336		334
337	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	336	// even if our inv is in a player.
339	if (envest->is_on_map ())	337	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
344	else	342	else
345	{	343	{
346	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
350	return pl;	349	return pl;
351	}	350	}
352	}	351	}
353		352
354	return 0;	353	return 0;
…		…
478	*/	477	*/
479	object *	478	object *
480	find_object_name (const char *str)	479	find_object_name (const char *str)
481	{	480	{
482	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
483	object *op;
484		482
		483	if (str_)
485	for_all_objects (op)	484	for_all_objects (op)
486	if (op->name == str_)	485	if (op->name == str_)
487	break;	486	return op;
488		487
489	return op;	488	return 0;
490	}	489	}
491		490
492	/*	491	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	493	* skill and experience objects.
…		…
556	update_stats ();	555	update_stats ();
557		556
558	new_draw_info_format (NDI_UNIQUE, 0, this,	557	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "	558	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "	559	"but the %s is just too much for your body. "
561	"[You need to unapply some items first.]", &ob->name);	560	"[You need to unapply some items first - use the 'body' command to see "
		561	"how many items you cna wera on a specific body part.]", &ob->name);
562	return false;	562	return false;
563	}	563	}
564		564
565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566	}	566	}
…		…
638	}	638	}
639		639
640	if (speed < 0)	640	if (speed < 0)
641	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
642		642
643	dst->set_speed (dst->speed);	643	dst->activate ();
644	}	644	}
645		645
646	void	646	void
647	object::instantiate ()	647	object::instantiate ()
648	{	648	{
…		…
760	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
761	{	761	{
762	// this is likely overkill, TODO: revisit (schmorp)	762	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	765	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	769	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	770	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	771	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	772	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	773	* have move_allow right now.
774	*/	774	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777	m.flags_ = 0;	777	m.invalidate ();
778	}	778	}
779	/* if the object is being removed, we can't make intelligent	779	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	780	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	781	* that is being removed.
782	*/	782	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	784	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	785	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	786	/* Nothing to do for that case */ ;
787	else	787	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	788	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		789
…		…
793		793
794	object::object ()	794	object::object ()
795	{	795	{
796	SET_FLAG (this, FLAG_REMOVED);	796	SET_FLAG (this, FLAG_REMOVED);
797		797
798	expmul = 1.0;	798	//expmul = 1.0; declared const for the time being
799	face = blank_face;	799	face = blank_face;
800	}	800	}
801		801
802	object::~object ()	802	object::~object ()
803	{	803	{
…		…
833	/* If already on active list, don't do anything */	833	/* If already on active list, don't do anything */
834	if (active)	834	if (active)
835	return;	835	return;
836		836
837	if (has_active_speed ())	837	if (has_active_speed ())
		838	{
		839	if (flag [FLAG_FREED])
		840	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		841
838	actives.insert (this);	842	actives.insert (this);
		843	}
839	}	844	}
840		845
841	void	846	void
842	object::activate_recursive ()	847	object::activate_recursive ()
843	{	848	{
…		…
908	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->no_drop	914	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
911	{	916	{
912	while (inv)	917	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	918	inv->destroy ();
916	}
917	}	919	}
918	else	920	else
919	{ /* Put objects in inventory onto this space */	921	{ /* Put objects in inventory onto this space */
920	while (inv)	922	while (inv)
921	{	923	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	927	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	928	\|\| op->type == RUNE
927	\|\| op->type == TRAP	929	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	930	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	931	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	932	op->destroy ();
931	else	933	else
932	map->insert (op, x, y);	934	map->insert (op, x, y);
933	}	935	}
934	}	936	}
935	}	937	}
…		…
964		966
965	void	967	void
966	object::do_destroy ()	968	object::do_destroy ()
967	{	969	{
968	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
969	remove_button_link (this);	971	remove_link ();
970		972
971	if (flag [FLAG_FRIENDLY])	973	if (flag [FLAG_FRIENDLY])
972	remove_friendly_object (this);	974	remove_friendly_object (this);
973		975
974	remove ();	976	remove ();
…		…
999	attacked_by = 0;	1001	attacked_by = 0;
1000	current_weapon = 0;	1002	current_weapon = 0;
1001	}	1003	}
1002		1004
1003	void	1005	void
1004	object::destroy (bool destroy_inventory)	1006	object::destroy ()
1005	{	1007	{
1006	if (destroyed ())	1008	if (destroyed ())
1007	return;	1009	return;
1008		1010
1009	if (!is_head () && !head->destroyed ())	1011	if (!is_head () && !head->destroyed ())
1010	{	1012	{
1011	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1013	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1012	head->destroy (destroy_inventory);	1014	head->destroy ();
1013	return;	1015	return;
1014	}	1016	}
1015		1017
1016	destroy_inv (!destroy_inventory);	1018	destroy_inv (false);
1017		1019
1018	if (is_head ())	1020	if (is_head ())
1019	if (sound_destroy)	1021	if (sound_destroy)
1020	play_sound (sound_destroy);	1022	play_sound (sound_destroy);
1021	else if (flag [FLAG_MONSTER])	1023	else if (flag [FLAG_MONSTER])
…		…
1057	if (object *pl = visible_to ())	1059	if (object *pl = visible_to ())
1058	esrv_del_item (pl->contr, count);	1060	esrv_del_item (pl->contr, count);
1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1060		1062
1061	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
		1064
		1065	object *pl = in_player ();
1062		1066
1063	/* we set up values so that it could be inserted into	1067	/* we set up values so that it could be inserted into
1064	* the map, but we don't actually do that - it is up	1068	* the map, but we don't actually do that - it is up
1065	* to the caller to decide what we want to do.	1069	* to the caller to decide what we want to do.
1066	*/	1070	*/
…		…
1078		1082
1079	/* NO_FIX_PLAYER is set when a great many changes are being	1083	/* NO_FIX_PLAYER is set when a great many changes are being
1080	* made to players inventory. If set, avoiding the call	1084	* made to players inventory. If set, avoiding the call
1081	* to save cpu time.	1085	* to save cpu time.
1082	*/	1086	*/
1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1087	if (pl)
		1088	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1089	{
1084	otmp->update_stats ();	1090	pl->update_stats ();
		1091
		1092	if (glow_radius && pl->is_on_map ())
		1093	update_all_los (pl->map, pl->x, pl->y);
		1094	}
1085	}	1095	}
1086	else if (map)	1096	else if (map)
1087	{	1097	{
1088	map->dirty = true;	1098	map->dirty = true;
1089	mapspace &ms = this->ms ();	1099	mapspace &ms = this->ms ();
1090		1100
1091	if (object *pl = ms.player ())	1101	if (object *pl = ms.player ())
1092	{	1102	{
1093	if (type == PLAYER) // this == pl(!)	1103	if (is_player ())
1094	{	1104	{
		1105	if (!flag [FLAG_WIZPASS])
		1106	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1107
1095	// leaving a spot always closes any open container on the ground	1108	// leaving a spot always closes any open container on the ground
1096	if (container && !container->env)	1109	if (container && !container->env)
1097	// this causes spurious floorbox updates, but it ensures	1110	// this causes spurious floorbox updates, but it ensures
1098	// that the CLOSE event is being sent.	1111	// that the CLOSE event is being sent.
1099	close_container ();	1112	close_container ();
…		…
1116	*(below ? &below->above : &ms.bot) = above;	1129	*(below ? &below->above : &ms.bot) = above;
1117		1130
1118	above = 0;	1131	above = 0;
1119	below = 0;	1132	below = 0;
1120		1133
		1134	ms.invalidate ();
		1135
1121	if (map->in_memory == MAP_SAVING)	1136	if (map->in_memory == MAP_SAVING)
1122	return;	1137	return;
1123		1138
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1139	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1140
…		…
1157	}	1172	}
1158		1173
1159	last = tmp;	1174	last = tmp;
1160	}	1175	}
1161		1176
1162	/* last == NULL if there are no objects on this space */	1177	if (affects_los ())
1163	//TODO: this makes little sense, why only update the topmost object?
1164	if (!last)
1165	map->at (x, y).flags_ = 0;
1166	else
1167	update_object (last, UP_OBJ_REMOVE);
1168
1169	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1170	update_all_los (map, x, y);	1178	update_all_los (map, x, y);
1171	}	1179	}
1172	}	1180	}
1173		1181
1174	/*	1182	/*
…		…
1198	esrv_update_item (UPD_NROF, pl, top);	1206	esrv_update_item (UPD_NROF, pl, top);
1199		1207
1200	op->weight = 0; // cancel the addition above	1208	op->weight = 0; // cancel the addition above
1201	op->carrying = 0; // must be 0 already	1209	op->carrying = 0; // must be 0 already
1202		1210
1203	op->destroy (1);	1211	op->destroy ();
1204		1212
1205	return top;	1213	return top;
1206	}	1214	}
1207		1215
1208	return 0;	1216	return 0;
…		…
1236	* job preparing multi-part monsters.	1244	* job preparing multi-part monsters.
1237	*/	1245	*/
1238	object *	1246	object *
1239	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1247	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1240	{	1248	{
		1249	op->remove ();
		1250
1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1251	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242	{	1252	{
1243	tmp->x = x + tmp->arch->x;	1253	tmp->x = x + tmp->arch->x;
1244	tmp->y = y + tmp->arch->y;	1254	tmp->y = y + tmp->arch->y;
1245	}	1255	}
…		…
1270	object *	1280	object *
1271	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1281	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1272	{	1282	{
1273	op->remove ();	1283	op->remove ();
1274		1284
		1285	if (m == &freed_map)//D TODO: remove soon
		1286	{//D
		1287	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1288	}//D
		1289
1275	/* Ideally, the caller figures this out. However, it complicates a lot	1290	/* Ideally, the caller figures this out. However, it complicates a lot
1276	* of areas of callers (eg, anything that uses find_free_spot would now	1291	* of areas of callers (eg, anything that uses find_free_spot would now
1277	* need extra work	1292	* need extra work
1278	*/	1293	*/
		1294	maptile *newmap = m;
1279	if (!xy_normalise (m, op->x, op->y))	1295	if (!xy_normalise (newmap, op->x, op->y))
1280	{	1296	{
1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1297	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282	return 0;	1298	return 0;
1283	}	1299	}
1284		1300
1285	if (object *more = op->more)	1301	if (object *more = op->more)
1286	if (!insert_ob_in_map (more, m, originator, flag))	1302	if (!insert_ob_in_map (more, m, originator, flag))
1287	return 0;	1303	return 0;
1288		1304
1289	CLEAR_FLAG (op, FLAG_REMOVED);	1305	op->flag [FLAG_REMOVED] = false;
1290		1306	op->env = 0;
1291	op->map = m;	1307	op->map = newmap;
		1308
1292	mapspace &ms = op->ms ();	1309	mapspace &ms = op->ms ();
1293		1310
1294	/* this has to be done after we translate the coordinates.	1311	/* this has to be done after we translate the coordinates.
1295	*/	1312	*/
1296	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1299	{	1316	{
1300	// TODO: we actually want to update tmp, not op,	1317	// TODO: we actually want to update tmp, not op,
1301	// but some caller surely breaks when we return tmp	1318	// but some caller surely breaks when we return tmp
1302	// from here :/	1319	// from here :/
1303	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1304	tmp->destroy (1);	1321	tmp->destroy ();
1305	}	1322	}
1306		1323
1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1309		1326
…		…
1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1318	abort ();	1335	abort ();
1319	}	1336	}
1320		1337
1321	if (!originator->is_on_map ())	1338	if (!originator->is_on_map ())
		1339	{
1322	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1340	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323	op->debug_desc (), originator->debug_desc ());	1341	op->debug_desc (), originator->debug_desc ());
		1342	abort ();
		1343	}
1324		1344
1325	op->above = originator;	1345	op->above = originator;
1326	op->below = originator->below;	1346	op->below = originator->below;
1327	originator->below = op;	1347	originator->below = op;
1328		1348
…		…
1414	op->below = top;	1434	op->below = top;
1415	*(op->above ? &op->above->below : &ms.top) = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1416	}	1436	}
1417	}	1437	}
1418		1438
1419	if (op->type == PLAYER)	1439	if (op->is_player ())
1420	{	1440	{
1421	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1422	++op->map->players;	1442	++op->map->players;
1423	op->map->touch ();	1443	op->map->touch ();
1424	}	1444	}
…		…
1439	* be far away from this change and not affected in any way -	1459	* be far away from this change and not affected in any way -
1440	* this should get redone to only look for players within range,	1460	* this should get redone to only look for players within range,
1441	* or just updating the P_UPTODATE for spaces within this area	1461	* or just updating the P_UPTODATE for spaces within this area
1442	* of effect may be sufficient.	1462	* of effect may be sufficient.
1443	*/	1463	*/
1444	if (op->map->darkness && (op->glow_radius != 0))	1464	if (op->affects_los ())
		1465	{
		1466	op->ms ().invalidate ();
1445	update_all_los (op->map, op->x, op->y);	1467	update_all_los (op->map, op->x, op->y);
		1468	}
1446		1469
1447	/* updates flags (blocked, alive, no magic, etc) for this map space */	1470	/* updates flags (blocked, alive, no magic, etc) for this map space */
1448	update_object (op, UP_OBJ_INSERT);	1471	update_object (op, UP_OBJ_INSERT);
1449		1472
1450	INVOKE_OBJECT (INSERT, op);	1473	INVOKE_OBJECT (INSERT, op);
…		…
1457	* blocked() and wall() work properly), and these flags are updated by	1480	* blocked() and wall() work properly), and these flags are updated by
1458	* update_object().	1481	* update_object().
1459	*/	1482	*/
1460		1483
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1484	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1485	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1463	{	1486	{
1464	if (check_move_on (op, originator))	1487	if (check_move_on (op, originator))
1465	return 0;	1488	return 0;
1466		1489
1467	/* If we are a multi part object, lets work our way through the check	1490	/* If we are a multi part object, lets work our way through the check
…		…
1478	/* this function inserts an object in the map, but if it	1501	/* this function inserts an object in the map, but if it
1479	* finds an object of its own type, it'll remove that one first.	1502	* finds an object of its own type, it'll remove that one first.
1480	* op is the object to insert it under: supplies x and the map.	1503	* op is the object to insert it under: supplies x and the map.
1481	*/	1504	*/
1482	void	1505	void
1483	replace_insert_ob_in_map (const char arch_string, object op)	1506	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1484	{	1507	{
1485	/* first search for itself and remove any old instances */	1508	/* first search for itself and remove any old instances */
1486		1509
1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1510	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1511	if (tmp->arch->archname == archname) /* same archetype */
1489	tmp->destroy (1);	1512	tmp->destroy ();
1490		1513
1491	object *tmp = arch_to_object (archetype::find (arch_string));	1514	object *tmp = arch_to_object (archetype::find (archname));
1492		1515
1493	tmp->x = op->x;	1516	tmp->x = op->x;
1494	tmp->y = op->y;	1517	tmp->y = op->y;
1495		1518
1496	insert_ob_in_map (tmp, op->map, op, 0);	1519	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1518	if (!nr)	1541	if (!nr)
1519	return true;	1542	return true;
1520		1543
1521	nr = min (nr, nrof);	1544	nr = min (nr, nrof);
1522		1545
		1546	if (nrof > nr)
		1547	{
1523	nrof -= nr;	1548	nrof -= nr;
1524
1525	if (nrof)
1526	{
1527	adjust_weight (env, -weight * nr); // carrying == 0	1549	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1528		1550
1529	if (object *pl = visible_to ())	1551	if (object *pl = visible_to ())
1530	esrv_update_item (UPD_NROF, pl, this);	1552	esrv_update_item (UPD_NROF, pl, this);
1531		1553
1532	return true;	1554	return true;
1533	}	1555	}
1534	else	1556	else
1535	{	1557	{
1536	destroy (1);	1558	destroy ();
1537	return false;	1559	return false;
1538	}	1560	}
1539	}	1561	}
1540		1562
1541	/*	1563	/*
…		…
1618	if (object *pl = tmp->visible_to ())	1640	if (object *pl = tmp->visible_to ())
1619	esrv_update_item (UPD_NROF, pl, tmp);	1641	esrv_update_item (UPD_NROF, pl, tmp);
1620		1642
1621	adjust_weight (this, op->total_weight ());	1643	adjust_weight (this, op->total_weight ());
1622		1644
1623	op->destroy (1);	1645	op->destroy ();
1624	op = tmp;	1646	op = tmp;
1625	goto inserted;	1647	goto inserted;
1626	}	1648	}
1627		1649
1628	op->owner = 0; // it's his/hers now. period.	1650	op->owner = 0; // it's his/hers now. period.
…		…
1646		1668
1647	adjust_weight (this, op->total_weight ());	1669	adjust_weight (this, op->total_weight ());
1648		1670
1649	inserted:	1671	inserted:
1650	/* reset the light list and los of the players on the map */	1672	/* reset the light list and los of the players on the map */
1651	if (op->glow_radius && map && map->darkness)	1673	if (op->glow_radius && is_on_map ())
		1674	{
		1675	update_stats ();
1652	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1653		1677	}
		1678	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1654	// if this is a player's inventory, update stats	1679	// if this is a player's inventory, update stats
1655	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1656	update_stats ();	1680	update_stats ();
1657		1681
1658	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1659		1683
1660	return op;	1684	return op;
…		…
1681	* on top.	1705	* on top.
1682	*/	1706	*/
1683	int	1707	int
1684	check_move_on (object op, object originator)	1708	check_move_on (object op, object originator)
1685	{	1709	{
		1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1711	return 0;
		1712
1686	object *tmp;	1713	object *tmp;
1687	maptile *m = op->map;	1714	maptile *m = op->map;
1688	int x = op->x, y = op->y;	1715	int x = op->x, y = op->y;
1689		1716
1690	MoveType move_on, move_slow, move_block;	1717	mapspace &ms = m->at (x, y);
1691		1718
1692	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1719	ms.update ();
1693	return 0;
1694		1720
1695	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1721	MoveType move_on = ms.move_on;
1696	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1722	MoveType move_slow = ms.move_slow;
1697	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1723	MoveType move_block = ms.move_block;
1698		1724
1699	/* if nothing on this space will slow op down or be applied,	1725	/* if nothing on this space will slow op down or be applied,
1700	* no need to do checking below. have to make sure move_type	1726	* no need to do checking below. have to make sure move_type
1701	* is set, as lots of objects don't have it set - we treat that	1727	* is set, as lots of objects don't have it set - we treat that
1702	* as walking.	1728	* as walking.
…		…
1713	return 0;	1739	return 0;
1714		1740
1715	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1716	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1717	*/	1743	*/
1718		1744	for (object next, tmp = ms.top; tmp; tmp = next)
1719	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1720	{
1721	/* Trim the search when we find the first other spell effect
1722	* this helps performance so that if a space has 50 spell objects,
1723	* we don't need to check all of them.
1724	*/
1725	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1726	break;
1727	}	1745	{
		1746	next = tmp->below;
1728		1747
1729	for (; tmp; tmp = tmp->below)
1730	{
1731	if (tmp == op)	1748	if (tmp == op)
1732	continue; /* Can't apply yourself */	1749	continue; /* Can't apply yourself */
1733		1750
1734	/* Check to see if one of the movement types should be slowed down.	1751	/* Check to see if one of the movement types should be slowed down.
1735	* Second check makes sure that the movement types not being slowed	1752	* Second check makes sure that the movement types not being slowed
…		…
1740	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1741	{	1758	{
1742	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1743	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1744	{	1761	{
1745
1746	float
1747	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	float diff = tmp->move_slow_penalty * fabs (op->speed);
1748		1763
1749	if (op->type == PLAYER)	1764	if (op->is_player ())
1750	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1765	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1751	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1766	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1752	diff /= 4.0;	1767	diff /= 4.0;
1753		1768
1754	op->speed_left -= diff;	1769	op->speed_left -= diff;
1755	}	1770	}
1756	}	1771	}
…		…
1962	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
1963	*/	1978	*/
1964	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1965	continue;	1980	continue;
1966		1981
1967	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
1968	continue;	1983	continue;
1969		1984
1970	altern [index++] = i;	1985	altern [index++] = i;
1971	}	1986	}
1972		1987
…		…
2040	* there is capable of.	2055	* there is capable of.
2041	*/	2056	*/
2042	int	2057	int
2043	find_dir (maptile m, int x, int y, object exclude)	2058	find_dir (maptile m, int x, int y, object exclude)
2044	{	2059	{
2045	int i, max = SIZEOFFREE, mflags;	2060	int max = SIZEOFFREE, mflags;
2046
2047	sint16 nx, ny;
2048	object *tmp;
2049	maptile *mp;
2050
2051	MoveType blocked, move_type;	2061	MoveType move_type;
2052		2062
2053	if (exclude && exclude->head_ () != exclude)	2063	if (exclude && exclude->head_ () != exclude)
2054	{	2064	{
2055	exclude = exclude->head;	2065	exclude = exclude->head;
2056	move_type = exclude->move_type;	2066	move_type = exclude->move_type;
…		…
2059	{	2069	{
2060	/* If we don't have anything, presume it can use all movement types. */	2070	/* If we don't have anything, presume it can use all movement types. */
2061	move_type = MOVE_ALL;	2071	move_type = MOVE_ALL;
2062	}	2072	}
2063		2073
2064	for (i = 1; i < max; i++)	2074	for (int i = 1; i < max; i++)
2065	{	2075	{
2066	mp = m;	2076	mapxy pos (m, x, y);
2067	nx = x + freearr_x[i];	2077	pos.move (i);
2068	ny = y + freearr_y[i];
2069		2078
2070	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2079	if (!pos.normalise ())
2071
2072	if (mflags & P_OUT_OF_MAP)
2073	max = maxfree[i];	2080	max = maxfree[i];
2074	else	2081	else
2075	{	2082	{
2076	mapspace &ms = mp->at (nx, ny);	2083	mapspace &ms = *pos;
2077		2084
2078	blocked = ms.move_block;
2079
2080	if ((move_type & blocked) == move_type)	2085	if ((move_type & ms.move_block) == move_type)
2081	max = maxfree[i];	2086	max = maxfree [i];
2082	else if (mflags & P_IS_ALIVE)	2087	else if (ms.flags () & P_IS_ALIVE)
2083	{	2088	{
2084	for (tmp = ms.bot; tmp; tmp = tmp->above)	2089	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2085	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2090	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2086	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2091	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2087	break;
2088
2089	if (tmp)
2090	return freedir[i];	2092	return freedir [i];
2091	}	2093	}
2092	}	2094	}
2093	}	2095	}
2094		2096
2095	return 0;	2097	return 0;
…		…
2170	* This basically means that if direction is 15, then it could either go	2172	* This basically means that if direction is 15, then it could either go
2171	* direction 4, 14, or 16 to get back to where we are.	2173	* direction 4, 14, or 16 to get back to where we are.
2172	* Moved from spell_util.c to object.c with the other related direction	2174	* Moved from spell_util.c to object.c with the other related direction
2173	* functions.	2175	* functions.
2174	*/	2176	*/
2175	int reduction_dir[SIZEOFFREE][3] = {	2177	const int reduction_dir[SIZEOFFREE][3] = {
2176	{0, 0, 0}, /* 0 */	2178	{0, 0, 0}, /* 0 */
2177	{0, 0, 0}, /* 1 */	2179	{0, 0, 0}, /* 1 */
2178	{0, 0, 0}, /* 2 */	2180	{0, 0, 0}, /* 2 */
2179	{0, 0, 0}, /* 3 */	2181	{0, 0, 0}, /* 3 */
2180	{0, 0, 0}, /* 4 */	2182	{0, 0, 0}, /* 4 */
…		…
2276	int	2278	int
2277	can_pick (const object who, const object item)	2279	can_pick (const object who, const object item)
2278	{	2280	{
2279	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2281	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2280	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2282	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2281	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2283	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2282	}	2284	}
2283		2285
2284	/*	2286	/*
2285	* create clone from object to another	2287	* create clone from object to another
2286	*/	2288	*/
…		…
2318	return tmp;	2320	return tmp;
2319		2321
2320	return 0;	2322	return 0;
2321	}	2323	}
2322		2324
2323	const shstr &	2325	shstr_tmp
2324	object::kv_get (const shstr &key) const	2326	object::kv_get (shstr_tmp key) const
2325	{	2327	{
2326	for (key_value *kv = key_values; kv; kv = kv->next)	2328	for (key_value *kv = key_values; kv; kv = kv->next)
2327	if (kv->key == key)	2329	if (kv->key == key)
2328	return kv->value;	2330	return kv->value;
2329		2331
2330	return shstr_null;	2332	return shstr ();
2331	}	2333	}
2332		2334
2333	void	2335	void
2334	object::kv_set (const shstr &key, const shstr &value)	2336	object::kv_set (shstr_tmp key, shstr_tmp value)
2335	{	2337	{
2336	for (key_value *kv = key_values; kv; kv = kv->next)	2338	for (key_value *kv = key_values; kv; kv = kv->next)
2337	if (kv->key == key)	2339	if (kv->key == key)
2338	{	2340	{
2339	kv->value = value;	2341	kv->value = value;
…		…
2348		2350
2349	key_values = kv;	2351	key_values = kv;
2350	}	2352	}
2351		2353
2352	void	2354	void
2353	object::kv_del (const shstr &key)	2355	object::kv_del (shstr_tmp key)
2354	{	2356	{
2355	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2357	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2356	if ((*kvp)->key == key)	2358	if ((*kvp)->key == key)
2357	{	2359	{
2358	key_value kv = kvp;	2360	key_value kv = kvp;
…		…
2417	{	2419	{
2418	char flagdesc[512];	2420	char flagdesc[512];
2419	char info2[256 * 4];	2421	char info2[256 * 4];
2420	char *p = info;	2422	char *p = info;
2421		2423
2422	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2424	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2423	count,	2425	count,
2424	uuid.c_str (),	2426	uuid.c_str (),
2425	&name,	2427	&name,
2426	title ? "\",title:\"" : "",	2428	title ? ",title:\"" : "",
2427	title ? (const char *)title : "",	2429	title ? (const char *)title : "",
		2430	title ? "\"" : "",
2428	flag_desc (flagdesc, 512), type);	2431	flag_desc (flagdesc, 512), type);
2429		2432
2430	if (!flag[FLAG_REMOVED] && env)	2433	if (!flag[FLAG_REMOVED] && env)
2431	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2434	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2432		2435
…		…
2488	container = 0;	2491	container = 0;
2489		2492
2490	// client needs item update to make it work, client bug requires this to be separate	2493	// client needs item update to make it work, client bug requires this to be separate
2491	esrv_update_item (UPD_FLAGS, this, old_container);	2494	esrv_update_item (UPD_FLAGS, this, old_container);
2492		2495
2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2496	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2494	play_sound (sound_find ("chest_close"));	2497	play_sound (sound_find ("chest_close"));
2495	}	2498	}
2496		2499
2497	if (new_container)	2500	if (new_container)
2498	{	2501	{
…		…
2508	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2511	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2509	new_container->insert (closer);	2512	new_container->insert (closer);
2510	}	2513	}
2511	#endif	2514	#endif
2512		2515
2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2516	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2514		2517
2515	// make sure the container is available, client bug requires this to be separate	2518	// make sure the container is available, client bug requires this to be separate
2516	esrv_send_item (this, new_container);	2519	esrv_send_item (this, new_container);
2517		2520
2518	new_container->flag [FLAG_APPLIED] = true;	2521	new_container->flag [FLAG_APPLIED] = true;
…		…
2526	// else if (!old_container->env && contr && contr->ns)	2529	// else if (!old_container->env && contr && contr->ns)
2527	// contr->ns->floorbox_reset ();	2530	// contr->ns->floorbox_reset ();
2528	}	2531	}
2529		2532
2530	object *	2533	object *
2531	object::force_find (const shstr name)	2534	object::force_find (shstr_tmp name)
2532	{	2535	{
2533	/* cycle through his inventory to look for the MARK we want to	2536	/* cycle through his inventory to look for the MARK we want to
2534	* place	2537	* place
2535	*/	2538	*/
2536	for (object *tmp = inv; tmp; tmp = tmp->below)	2539	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2538	return splay (tmp);	2541	return splay (tmp);
2539		2542
2540	return 0;	2543	return 0;
2541	}	2544	}
2542		2545
2543	void	2546	object *
2544	object::force_add (const shstr name, int duration)	2547	object::force_add (shstr_tmp name, int duration)
2545	{	2548	{
2546	if (object *force = force_find (name))	2549	if (object *force = force_find (name))
2547	force->destroy ();	2550	force->destroy ();
2548		2551
2549	object *force = get_archetype (FORCE_NAME);	2552	object *force = get_archetype (FORCE_NAME);
…		…
2554		2557
2555	force->set_speed (duration ? 1.f / duration : 0.f);	2558	force->set_speed (duration ? 1.f / duration : 0.f);
2556	force->flag [FLAG_IS_USED_UP] = true;	2559	force->flag [FLAG_IS_USED_UP] = true;
2557	force->flag [FLAG_APPLIED] = true;	2560	force->flag [FLAG_APPLIED] = true;
2558		2561
2559	insert (force);	2562	return insert (force);
2560	}	2563	}
2561		2564
2562	void	2565	void
2563	object::play_sound (faceidx sound)	2566	object::play_sound (faceidx sound) const
2564	{	2567	{
2565	if (!sound)	2568	if (!sound)
2566	return;	2569	return;
2567		2570
2568	if (flag [FLAG_REMOVED])	2571	if (is_on_map ())
		2572	map->play_sound (sound, x, y);
		2573	else if (object *pl = in_player ())
		2574	pl->contr->play_sound (sound);
		2575	}
		2576
		2577	void
		2578	object::say_msg (const char *msg) const
		2579	{
		2580	if (is_on_map ())
		2581	map->say_msg (msg, x, y);
		2582	else if (object *pl = in_player ())
		2583	pl->contr->play_sound (sound);
		2584	}
		2585
		2586	void
		2587	object::make_noise ()
		2588	{
		2589	// we do not model noise in the map, so instead put
		2590	// a temporary light into the noise source
		2591	// could use the map instead, but that's less reliable for our
		2592	// goal, which is to make invisibility a bit harder to exploit
		2593
		2594	// currently only works sensibly for players
		2595	if (!is_player ())
2569	return;	2596	return;
2570		2597
2571	if (env)	2598	// find old force, or create new one
2572	{	2599	object *force = force_find (shstr_noise_force);
2573	if (object *pl = in_player ())	2600
2574	pl->contr->play_sound (sound);	2601	if (force)
2575	}	2602	force->speed_left = -1.f; // patch old speed up
2576	else	2603	else
2577	map->play_sound (sound, x, y);	2604	{
2578	}	2605	force = archetype::get (shstr_noise_force);
2579		2606
		2607	force->slaying = shstr_noise_force;
		2608	force->stats.food = 1;
		2609	force->speed_left = -1.f;
		2610
		2611	force->set_speed (1.f / 4.f);
		2612	force->flag [FLAG_IS_USED_UP] = true;
		2613	force->flag [FLAG_APPLIED] = true;
		2614
		2615	insert (force);
		2616	}
		2617	}
		2618

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC vs. Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC