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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 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 it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
40		42
41	short freearr_x[SIZEOFFREE] = {	43	short freearr_x[SIZEOFFREE] = {
…		…
186	\|\| ob1->speed != ob2->speed	188	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	189	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	190	\|\| ob1->name != ob2->name)
189	return 0;	191	return 0;
190		192
191	// some objects are unmergable
192	if (!ob1->nrof \|\| !ob2->nrof)
193	return 0;
194
195	/* Do not merge objects if nrof would overflow. First part checks	193	/* Do not merge objects if nrof would overflow, assume nrof
196	* for unsigned overflow (2c), second part checks whether the result	194	* is always 0 .. 2*31-1 /
197	* would fit into a 32 bit signed int, which is often used to hold	195	if (ob1->nrof > 0x7fffffff - ob2->nrof)
198	* nrof values.
199	*/
200	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
201	return 0;	196	return 0;
202		197
203	/* If the objects have been identified, set the BEEN_APPLIED flag.	198	/* If the objects have been identified, set the BEEN_APPLIED flag.
204	* This is to the comparison of the flags below will be OK. We	199	* This is to the comparison of the flags below will be OK. We
205	* just can't ignore the been applied or identified flags, as they	200	* just can't ignore the been applied or identified flags, as they
…		…
239	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
240	return 0;	235	return 0;
241		236
242	if ((ob1->flag ^ ob2->flag)	237	if ((ob1->flag ^ ob2->flag)
243	.reset (FLAG_INV_LOCKED)	238	.reset (FLAG_INV_LOCKED)
244	.reset (FLAG_CLIENT_SENT)
245	.reset (FLAG_REMOVED)	239	.reset (FLAG_REMOVED)
246	.any ())	240	.any ())
247	return 0;	241	return 0;
248		242
249	/* This is really a spellbook check - we should in general	243	/* This is really a spellbook check - we should in general
…		…
331	{	325	{
332	// see if we are in a container of sorts	326	// see if we are in a container of sorts
333	if (env)	327	if (env)
334	{	328	{
335	// the player inventory itself is always visible	329	// the player inventory itself is always visible
336	if (env->type == PLAYER)	330	if (env->is_player ())
337	return env;	331	return env;
338		332
339	// else a player could have our env open	333	// else a player could have our env open
340	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
341		335
342	// the player itself is always on a map, so we will find him here	336	// the player itself is always on a map, so we will find him here
343	// even if our inv is in a player.	337	// even if our inv is in a player.
344	if (envest->is_on_map ())	338	if (envest->is_on_map ())
345	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
346	if (pl->container == env)	340	if (pl->container_ () == env)
347	return pl;	341	return pl;
348	}	342	}
349	else	343	else
350	{	344	{
351	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
352	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
353	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
354	if (!pl->container \|\| this == pl->container)	348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		349	\|\| pl->container_ () == this)
355	return pl;	350	return pl;
356	}	351	}
357	}	352	}
358		353
359	return 0;	354	return 0;
…		…
435	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
436		431
437	object_freezer freezer;	432	object_freezer freezer;
438	op->write (freezer);	433	op->write (freezer);
439	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
440	}	441	}
441		442
442	/*	443	/*
443	* get_nearest_part(multi-object, object 2) returns the part of the	444	* get_nearest_part(multi-object, object 2) returns the part of the
444	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
561	update_stats ();	562	update_stats ();
562		563
563	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
564	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
565	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
566	"[You need to unapply some items first.]", &ob->name);	567	"[You need to unapply some items first - use the 'body' command to see "
		568	"how many items you cna wera on a specific body part.]", &ob->name);
567	return false;	569	return false;
568	}	570	}
569		571
570	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
571	}	573	}
…		…
643	}	645	}
644		646
645	if (speed < 0)	647	if (speed < 0)
646	dst->speed_left -= rndm ();	648	dst->speed_left -= rndm ();
647		649
648	dst->set_speed (dst->speed);	650	dst->activate ();
649	}	651	}
650		652
651	void	653	void
652	object::instantiate ()	654	object::instantiate ()
653	{	655	{
…		…
765	else if (action == UP_OBJ_INSERT)	767	else if (action == UP_OBJ_INSERT)
766	{	768	{
767	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
768	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
769	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
771	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
772	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
773	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
775	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
776	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
777	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
778	* to have move_allow right now.	780	* have move_allow right now.
779	*/	781	*/
780	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
781	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	783	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
782	m.flags_ = 0;	784	m.invalidate ();
783	}	785	}
784	/* if the object is being removed, we can't make intelligent	786	/* if the object is being removed, we can't make intelligent
785	* decisions, because remove_ob can't really pass the object	787	* decisions, because remove_ob can't really pass the object
786	* that is being removed.	788	* that is being removed.
787	*/	789	*/
788	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	790	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
789	m.flags_ = 0;	791	m.invalidate ();
790	else if (action == UP_OBJ_FACE)	792	else if (action == UP_OBJ_FACE)
791	/* Nothing to do for that case */ ;	793	/* Nothing to do for that case */ ;
792	else	794	else
793	LOG (llevError, "update_object called with invalid action: %d\n", action);	795	LOG (llevError, "update_object called with invalid action: %d\n", action);
794		796
…		…
798		800
799	object::object ()	801	object::object ()
800	{	802	{
801	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
802		804
803	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
804	face = blank_face;	806	face = blank_face;
805	}	807	}
806		808
807	object::~object ()	809	object::~object ()
808	{	810	{
…		…
838	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
839	if (active)	841	if (active)
840	return;	842	return;
841		843
842	if (has_active_speed ())	844	if (has_active_speed ())
		845	{
		846	if (flag [FLAG_FREED])
		847	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		848
843	actives.insert (this);	849	actives.insert (this);
		850	}
844	}	851	}
845		852
846	void	853	void
847	object::activate_recursive ()	854	object::activate_recursive ()
848	{	855	{
…		…
913	\|\| map->in_memory != MAP_ACTIVE	920	\|\| map->in_memory != MAP_ACTIVE
914	\|\| map->no_drop	921	\|\| map->no_drop
915	\|\| ms ().move_block == MOVE_ALL)	922	\|\| ms ().move_block == MOVE_ALL)
916	{	923	{
917	while (inv)	924	while (inv)
918	{
919	inv->destroy_inv (false);
920	inv->destroy ();	925	inv->destroy ();
921	}
922	}	926	}
923	else	927	else
924	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
925	while (inv)	929	while (inv)
926	{	930	{
…		…
930	\|\| op->flag [FLAG_NO_DROP]	934	\|\| op->flag [FLAG_NO_DROP]
931	\|\| op->type == RUNE	935	\|\| op->type == RUNE
932	\|\| op->type == TRAP	936	\|\| op->type == TRAP
933	\|\| op->flag [FLAG_IS_A_TEMPLATE]	937	\|\| op->flag [FLAG_IS_A_TEMPLATE]
934	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	938	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
935	op->destroy (true);	939	op->destroy ();
936	else	940	else
937	map->insert (op, x, y);	941	map->insert (op, x, y);
938	}	942	}
939	}	943	}
940	}	944	}
…		…
969		973
970	void	974	void
971	object::do_destroy ()	975	object::do_destroy ()
972	{	976	{
973	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	978	remove_link ();
975		979
976	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	981	remove_friendly_object (this);
978		982
979	remove ();	983	remove ();
…		…
1004	attacked_by = 0;	1008	attacked_by = 0;
1005	current_weapon = 0;	1009	current_weapon = 0;
1006	}	1010	}
1007		1011
1008	void	1012	void
1009	object::destroy (bool destroy_inventory)	1013	object::destroy ()
1010	{	1014	{
1011	if (destroyed ())	1015	if (destroyed ())
1012	return;	1016	return;
1013		1017
1014	if (!is_head () && !head->destroyed ())	1018	if (!is_head () && !head->destroyed ())
1015	{	1019	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1021	head->destroy ();
1018	return;	1022	return;
1019	}	1023	}
1020		1024
1021	destroy_inv (!destroy_inventory);	1025	destroy_inv (false);
1022		1026
1023	if (is_head ())	1027	if (is_head ())
1024	if (sound_destroy)	1028	if (sound_destroy)
1025	play_sound (sound_destroy);	1029	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1030	else if (flag [FLAG_MONSTER])
…		…
1037	* the previous environment.	1041	* the previous environment.
1038	*/	1042	*/
1039	void	1043	void
1040	object::do_remove ()	1044	object::do_remove ()
1041	{	1045	{
1042	object tmp, last = 0;
1043	object *otmp;
1044
1045	if (flag [FLAG_REMOVED])	1046	if (flag [FLAG_REMOVED])
1046	return;	1047	return;
1047		1048
1048	INVOKE_OBJECT (REMOVE, this);	1049	INVOKE_OBJECT (REMOVE, this);
1049		1050
…		…
1062	if (object *pl = visible_to ())	1063	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1064	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1065	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1066
1066	adjust_weight (env, -total_weight ());	1067	adjust_weight (env, -total_weight ());
		1068
		1069	object *pl = in_player ();
1067		1070
1068	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1069	* the map, but we don't actually do that - it is up	1072	* the map, but we don't actually do that - it is up
1070	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1071	*/	1074	*/
…		…
1083		1086
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1087	/* NO_FIX_PLAYER is set when a great many changes are being
1085	* made to players inventory. If set, avoiding the call	1088	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1089	* to save cpu time.
1087	*/	1090	*/
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1091	if (pl)
		1092	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1093	{
1089	otmp->update_stats ();	1094	pl->update_stats ();
		1095
		1096	if (glow_radius && pl->is_on_map ())
		1097	update_all_los (pl->map, pl->x, pl->y);
		1098	}
1090	}	1099	}
1091	else if (map)	1100	else if (map)
1092	{	1101	{
1093	map->dirty = true;	1102	map->dirty = true;
1094	mapspace &ms = this->ms ();	1103	mapspace &ms = this->ms ();
1095		1104
1096	if (object *pl = ms.player ())	1105	if (object *pl = ms.player ())
1097	{	1106	{
1098	if (type == PLAYER) // this == pl(!)	1107	if (is_player ())
1099	{	1108	{
		1109	if (!flag [FLAG_WIZPASS])
		1110	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1111
1100	// leaving a spot always closes any open container on the ground	1112	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1113	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1114	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1115	// that the CLOSE event is being sent.
1104	close_container ();	1116	close_container ();
1105		1117
1106	--map->players;	1118	--map->players;
1107	map->touch ();	1119	map->touch ();
1108	}	1120	}
1109	else if (pl->container == this)	1121	else if (pl->container_ () == this)
1110	{	1122	{
1111	// removing a container should close it	1123	// removing a container should close it
1112	close_container ();	1124	close_container ();
1113	}	1125	}
1114		1126
…		…
1121	*(below ? &below->above : &ms.bot) = above;	1133	*(below ? &below->above : &ms.bot) = above;
1122		1134
1123	above = 0;	1135	above = 0;
1124	below = 0;	1136	below = 0;
1125		1137
		1138	ms.invalidate ();
		1139
1126	if (map->in_memory == MAP_SAVING)	1140	if (map->in_memory == MAP_SAVING)
1127	return;	1141	return;
1128		1142
1129	int check_walk_off = !flag [FLAG_NO_APPLY];	1143	int check_walk_off = !flag [FLAG_NO_APPLY];
1130		1144
1131	if (object *pl = ms.player ())	1145	if (object *pl = ms.player ())
1132	{	1146	{
1133	if (pl->container == this)	1147	if (pl->container_ () == this)
1134	/* If a container that the player is currently using somehow gets	1148	/* If a container that the player is currently using somehow gets
1135	* removed (most likely destroyed), update the player view	1149	* removed (most likely destroyed), update the player view
1136	* appropriately.	1150	* appropriately.
1137	*/	1151	*/
1138	pl->close_container ();	1152	pl->close_container ();
…		…
1142	//TODO: update floorbox to preserve ordering	1156	//TODO: update floorbox to preserve ordering
1143	if (pl->contr->ns)	1157	if (pl->contr->ns)
1144	pl->contr->ns->floorbox_update ();	1158	pl->contr->ns->floorbox_update ();
1145	}	1159	}
1146		1160
		1161	if (check_walk_off)
1147	for (tmp = ms.bot; tmp; tmp = tmp->above)	1162	for (object above, tmp = ms.bot; tmp; tmp = above)
1148	{	1163	{
		1164	above = tmp->above;
		1165
1149	/* No point updating the players look faces if he is the object	1166	/* No point updating the players look faces if he is the object
1150	* being removed.	1167	* being removed.
1151	*/	1168	*/
1152		1169
1153	/* See if object moving off should effect something */	1170	/* See if object moving off should effect something */
1154	if (check_walk_off
1155	&& ((move_type & tmp->move_off)	1171	if ((move_type & tmp->move_off)
1156	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1172	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1157	{
1158	move_apply (tmp, this, 0);	1173	move_apply (tmp, this, 0);
1159
1160	if (destroyed ())
1161	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162	}	1174	}
1163		1175
1164	last = tmp;	1176	if (affects_los ())
1165	}
1166
1167	/* last == NULL if there are no objects on this space */
1168	//TODO: this makes little sense, why only update the topmost object?
1169	if (!last)
1170	map->at (x, y).flags_ = 0;
1171	else
1172	update_object (last, UP_OBJ_REMOVE);
1173
1174	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1175	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1176	}	1178	}
1177	}	1179	}
1178		1180
1179	/*	1181	/*
…		…
1203	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1204		1206
1205	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1206	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1207		1209
1208	op->destroy (1);	1210	op->destroy ();
1209		1211
1210	return top;	1212	return top;
1211	}	1213	}
1212		1214
1213	return 0;	1215	return 0;
…		…
1275	* just 'op' otherwise	1277	* just 'op' otherwise
1276	*/	1278	*/
1277	object *	1279	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1280	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1281	{
1280	if (op->is_on_map ())
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object already on map");
1283	abort ();
1284	}
1285
1286	if (op->env)
1287	{
1288	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1289	op->remove ();	1282	op->remove ();
		1283
		1284	if (m == &freed_map)//D TODO: remove soon
		1285	{//D
		1286	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1290	}	1287	}//D
1291		1288
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1291	* need extra work
1295	*/	1292	*/
		1293	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1295	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1297	return 0;
1300	}	1298	}
1301		1299
1302	if (object *more = op->more)	1300	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1302	return 0;
1305		1303
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1307		1305	op->env = 0;
1308	op->map = m;	1306	op->map = newmap;
		1307
1309	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1310		1309
1311	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1312	*/	1311	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1315	{
1317	// TODO: we actually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1319	// from here :/	1318	// from here :/
1320	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1320	tmp->destroy ();
1322	}	1321	}
1323		1322
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1325
…		…
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1334	abort ();
1336	}	1335	}
1337		1336
1338	if (!originator->is_on_map ())	1337	if (!originator->is_on_map ())
		1338	{
1339	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1339	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340	op->debug_desc (), originator->debug_desc ());	1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
1341		1343
1342	op->above = originator;	1344	op->above = originator;
1343	op->below = originator->below;	1345	op->below = originator->below;
1344	originator->below = op;	1346	originator->below = op;
1345		1347
…		…
1431	op->below = top;	1433	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1435	}
1434	}	1436	}
1435		1437
1436	if (op->type == PLAYER)	1438	if (op->is_player ())
1437	{	1439	{
1438	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1439	++op->map->players;	1441	++op->map->players;
1440	op->map->touch ();	1442	op->map->touch ();
1441	}	1443	}
…		…
1456	* be far away from this change and not affected in any way -	1458	* be far away from this change and not affected in any way -
1457	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1461	* of effect may be sufficient.
1460	*/	1462	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1463		1468
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1466		1471
1467	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1474	* blocked() and wall() work properly), and these flags are updated by	1479	* blocked() and wall() work properly), and these flags are updated by
1475	* update_object().	1480	* update_object().
1476	*/	1481	*/
1477		1482
1478	/* if this is not the head or flag has been passed, don't check walk on status */	1483	/* if this is not the head or flag has been passed, don't check walk on status */
1479	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1484	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480	{	1485	{
1481	if (check_move_on (op, originator))	1486	if (check_move_on (op, originator))
1482	return 0;	1487	return 0;
1483		1488
1484	/* If we are a multi part object, lets work our way through the check	1489	/* If we are a multi part object, lets work our way through the check
…		…
1495	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1496	* finds an object of its own type, it'll remove that one first.	1501	* finds an object of its own type, it'll remove that one first.
1497	* op is the object to insert it under: supplies x and the map.	1502	* op is the object to insert it under: supplies x and the map.
1498	*/	1503	*/
1499	void	1504	void
1500	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1506	{
1502	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1503		1508
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1511	tmp->destroy ();
1507		1512
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1509		1514
1510	tmp->x = op->x;	1515	tmp->x = op->x;
1511	tmp->y = op->y;	1516	tmp->y = op->y;
1512		1517
1513	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1535	if (!nr)	1540	if (!nr)
1536	return true;	1541	return true;
1537		1542
1538	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1539		1544
		1545	if (nrof > nr)
		1546	{
1540	nrof -= nr;	1547	nrof -= nr;
1541
1542	if (nrof)
1543	{
1544	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545		1549
1546	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1547	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1548		1552
1549	return true;	1553	return true;
1550	}	1554	}
1551	else	1555	else
1552	{	1556	{
1553	destroy (1);	1557	destroy ();
1554	return false;	1558	return false;
1555	}	1559	}
1556	}	1560	}
1557		1561
1558	/*	1562	/*
…		…
1635	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1636	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1637		1641
1638	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1639		1643
1640	op->destroy (1);	1644	op->destroy ();
1641	op = tmp;	1645	op = tmp;
1642	goto inserted;	1646	goto inserted;
1643	}	1647	}
1644		1648
1645	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1663		1667
1664	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1665		1669
1666	inserted:	1670	inserted:
1667	/* reset the light list and los of the players on the map */	1671	/* reset the light list and los of the players on the map */
1668	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1669	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1670		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1671	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1673	update_stats ();	1679	update_stats ();
1674		1680
1675	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1676		1682
1677	return op;	1683	return op;
…		…
1698	* on top.	1704	* on top.
1699	*/	1705	*/
1700	int	1706	int
1701	check_move_on (object op, object originator)	1707	check_move_on (object op, object originator)
1702	{	1708	{
		1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1710	return 0;
		1711
1703	object *tmp;	1712	object *tmp;
1704	maptile *m = op->map;	1713	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1714	int x = op->x, y = op->y;
1706		1715
1707	MoveType move_on, move_slow, move_block;	1716	mapspace &ms = m->at (x, y);
1708		1717
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1718	ms.update ();
1710	return 0;
1711		1719
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1720	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1721	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1722	MoveType move_block = ms.move_block;
1715		1723
1716	/* if nothing on this space will slow op down or be applied,	1724	/* if nothing on this space will slow op down or be applied,
1717	* no need to do checking below. have to make sure move_type	1725	* no need to do checking below. have to make sure move_type
1718	* is set, as lots of objects don't have it set - we treat that	1726	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1727	* as walking.
…		…
1730	return 0;	1738	return 0;
1731		1739
1732	/* The objects have to be checked from top to bottom.	1740	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1741	* Hence, we first go to the top:
1734	*/	1742	*/
1735		1743	for (object next, tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1744	{
		1745	next = tmp->below;
1745		1746
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1747	if (tmp == op)
1749	continue; /* Can't apply yourself */	1748	continue; /* Can't apply yourself */
1750		1749
1751	/* Check to see if one of the movement types should be slowed down.	1750	/* Check to see if one of the movement types should be slowed down.
1752	* Second check makes sure that the movement types not being slowed	1751	* Second check makes sure that the movement types not being slowed
…		…
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758	{	1757	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1760	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1762
1766	if (op->type == PLAYER)	1763	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1764	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1765	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1766	diff /= 4.0;
1770		1767
1771	op->speed_left -= diff;	1768	op->speed_left -= diff;
1772	}	1769	}
1773	}	1770	}
…		…
1979	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
1980	*/	1977	*/
1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982	continue;	1979	continue;
1983		1980
1984	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
1985	continue;	1982	continue;
1986		1983
1987	altern [index++] = i;	1984	altern [index++] = i;
1988	}	1985	}
1989		1986
…		…
2057	* there is capable of.	2054	* there is capable of.
2058	*/	2055	*/
2059	int	2056	int
2060	find_dir (maptile m, int x, int y, object exclude)	2057	find_dir (maptile m, int x, int y, object exclude)
2061	{	2058	{
2062	int i, max = SIZEOFFREE, mflags;	2059	int max = SIZEOFFREE, mflags;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2060	MoveType move_type;
2069		2061
2070	if (exclude && exclude->head_ () != exclude)	2062	if (exclude && exclude->head_ () != exclude)
2071	{	2063	{
2072	exclude = exclude->head;	2064	exclude = exclude->head;
2073	move_type = exclude->move_type;	2065	move_type = exclude->move_type;
…		…
2076	{	2068	{
2077	/* If we don't have anything, presume it can use all movement types. */	2069	/* If we don't have anything, presume it can use all movement types. */
2078	move_type = MOVE_ALL;	2070	move_type = MOVE_ALL;
2079	}	2071	}
2080		2072
2081	for (i = 1; i < max; i++)	2073	for (int i = 1; i < max; i++)
2082	{	2074	{
2083	mp = m;	2075	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2076	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2077
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2078	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2079	max = maxfree[i];
2091	else	2080	else
2092	{	2081	{
2093	mapspace &ms = mp->at (nx, ny);	2082	mapspace &ms = *pos;
2094		2083
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2084	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2085	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2086	else if (ms.flags () & P_IS_ALIVE)
2100	{	2087	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2088	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2089	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2103	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2090	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2091	return freedir [i];
2108	}	2092	}
2109	}	2093	}
2110	}	2094	}
2111		2095
2112	return 0;	2096	return 0;
…		…
2187	* This basically means that if direction is 15, then it could either go	2171	* This basically means that if direction is 15, then it could either go
2188	* direction 4, 14, or 16 to get back to where we are.	2172	* direction 4, 14, or 16 to get back to where we are.
2189	* Moved from spell_util.c to object.c with the other related direction	2173	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2174	* functions.
2191	*/	2175	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2176	const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2177	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2178	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2179	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2180	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2181	{0, 0, 0}, /* 4 */
…		…
2293	int	2277	int
2294	can_pick (const object who, const object item)	2278	can_pick (const object who, const object item)
2295	{	2279	{
2296	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2280	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2281	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2298	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2282	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2299	}	2283	}
2300		2284
2301	/*	2285	/*
2302	* create clone from object to another	2286	* create clone from object to another
2303	*/	2287	*/
…		…
2335	return tmp;	2319	return tmp;
2336		2320
2337	return 0;	2321	return 0;
2338	}	2322	}
2339		2323
2340	const shstr &	2324	shstr_tmp
2341	object::kv_get (const shstr &key) const	2325	object::kv_get (shstr_tmp key) const
2342	{	2326	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2327	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2328	if (kv->key == key)
2345	return kv->value;	2329	return kv->value;
2346		2330
2347	return shstr_null;	2331	return shstr ();
2348	}	2332	}
2349		2333
2350	void	2334	void
2351	object::kv_set (const shstr &key, const shstr &value)	2335	object::kv_set (shstr_tmp key, shstr_tmp value)
2352	{	2336	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (kv->key == key)	2338	if (kv->key == key)
2355	{	2339	{
2356	kv->value = value;	2340	kv->value = value;
…		…
2365		2349
2366	key_values = kv;	2350	key_values = kv;
2367	}	2351	}
2368		2352
2369	void	2353	void
2370	object::kv_del (const shstr &key)	2354	object::kv_del (shstr_tmp key)
2371	{	2355	{
2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2356	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2357	if ((*kvp)->key == key)
2374	{	2358	{
2375	key_value kv = kvp;	2359	key_value kv = kvp;
…		…
2506	container = 0;	2490	container = 0;
2507		2491
2508	// client needs item update to make it work, client bug requires this to be separate	2492	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2493	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2494
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2496	play_sound (sound_find ("chest_close"));
2513	}	2497	}
2514		2498
2515	if (new_container)	2499	if (new_container)
2516	{	2500	{
…		…
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2510	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2511	new_container->insert (closer);
2528	}	2512	}
2529	#endif	2513	#endif
2530		2514
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2515	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2516
2533	// make sure the container is available, client bug requires this to be separate	2517	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2518	esrv_send_item (this, new_container);
2535		2519
2536	new_container->flag [FLAG_APPLIED] = true;	2520	new_container->flag [FLAG_APPLIED] = true;
…		…
2544	// else if (!old_container->env && contr && contr->ns)	2528	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2529	// contr->ns->floorbox_reset ();
2546	}	2530	}
2547		2531
2548	object *	2532	object *
2549	object::force_find (const shstr name)	2533	object::force_find (shstr_tmp name)
2550	{	2534	{
2551	/* cycle through his inventory to look for the MARK we want to	2535	/* cycle through his inventory to look for the MARK we want to
2552	* place	2536	* place
2553	*/	2537	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2538	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2557		2541
2558	return 0;	2542	return 0;
2559	}	2543	}
2560		2544
2561	void	2545	void
		2546	object::force_set_timer (int duration)
		2547	{
		2548	this->duration = 1;
		2549	this->speed_left = -1.f;
		2550
		2551	this->set_speed (duration ? 1.f / duration : 0.f);
		2552	}
		2553
		2554	object *
2562	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2563	{	2556	{
2564	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2565	force->destroy ();	2558	force->destroy ();
2566		2559
2567	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
2568		2561
2569	force->slaying = name;	2562	force->slaying = name;
2570	force->stats.food = 1;
2571	force->speed_left = -1.f;
2572		2563
2573	force->set_speed (duration ? 1.f / duration : 0.f);	2564	force->force_set_timer (duration);
2574	force->flag [FLAG_IS_USED_UP] = true;	2565
2575	force->flag [FLAG_APPLIED] = true;	2566	force->flag [FLAG_APPLIED] = true;
2576		2567
2577	insert (force);	2568	return insert (force);
2578	}	2569	}
2579		2570
2580	void	2571	void
2581	object::play_sound (faceidx sound)	2572	object::play_sound (faceidx sound) const
2582	{	2573	{
2583	if (!sound)	2574	if (!sound)
2584	return;	2575	return;
2585		2576
2586	if (flag [FLAG_REMOVED])	2577	if (is_on_map ())
		2578	map->play_sound (sound, x, y);
		2579	else if (object *pl = in_player ())
		2580	pl->contr->play_sound (sound);
		2581	}
		2582
		2583	void
		2584	object::say_msg (const char *msg) const
		2585	{
		2586	if (is_on_map ())
		2587	map->say_msg (msg, x, y);
		2588	else if (object *pl = in_player ())
		2589	pl->contr->play_sound (sound);
		2590	}
		2591
		2592	void
		2593	object::make_noise ()
		2594	{
		2595	// we do not model noise in the map, so instead put
		2596	// a temporary light into the noise source
		2597	// could use the map instead, but that's less reliable for our
		2598	// goal, which is to make invisibility a bit harder to exploit
		2599
		2600	// currently only works sensibly for players
		2601	if (!is_player ())
2587	return;	2602	return;
2588		2603
2589	if (env)	2604	// find old force, or create new one
2590	{	2605	object *force = force_find (shstr_noise_force);
2591	if (object *pl = in_player ())	2606
2592	pl->contr->play_sound (sound);	2607	if (force)
2593	}	2608	force->speed_left = -1.f; // patch old speed up
2594	else	2609	else
2595	map->play_sound (sound, x, y);	2610	{
2596	}	2611	force = archetype::get (shstr_noise_force);
2597		2612
		2613	force->slaying = shstr_noise_force;
		2614	force->stats.food = 1;
		2615	force->speed_left = -1.f;
		2616
		2617	force->set_speed (1.f / 4.f);
		2618	force->flag [FLAG_IS_USED_UP] = true;
		2619	force->flag [FLAG_APPLIED] = true;
		2620
		2621	insert (force);
		2622	}
		2623	}
		2624

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs. Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.244 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC