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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.240 by root, Wed May 7 13:40:30 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	/* Do not merge objects if nrof would overflow. First part checks	193	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	194	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	195	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;	196	return 0;
198		197
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	198	/* 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	199	* 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	200	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	205	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		206
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	207	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		209
211	if (ob1->arch->name != ob2->arch->name	210	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	211	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	212	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	213	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	214	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	215	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	216	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	217	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	218	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	219	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	220	\|\| ob1->animation_id != ob2->animation_id
		221	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	222	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	223	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	224	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	225	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	226	\|\| ob1->move_type != ob2->move_type
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	235	return 0;
236		236
237	if ((ob1->flag ^ ob2->flag)	237	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	238	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	239	.reset (FLAG_REMOVED)
241	.any ())	240	.any ())
242	return 0;	241	return 0;
243		242
244	/* This is really a spellbook check - we should in general	243	/* This is really a spellbook check - we should in general
…		…
326	{	325	{
327	// see if we are in a container of sorts	326	// see if we are in a container of sorts
328	if (env)	327	if (env)
329	{	328	{
330	// the player inventory itself is always visible	329	// the player inventory itself is always visible
331	if (env->type == PLAYER)	330	if (env->is_player ())
332	return env;	331	return env;
333		332
334	// else a player could have our env open	333	// else a player could have our env open
335	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
336		335
337	// 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
338	// even if our inv is in a player.	337	// even if our inv is in a player.
339	if (envest->is_on_map ())	338	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	340	if (pl->container_ () == env)
342	return pl;	341	return pl;
343	}	342	}
344	else	343	else
345	{	344	{
346	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
349	if (!pl->container \|\| this == pl->container)	348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		349	\|\| pl->container_ () == this)
350	return pl;	350	return pl;
351	}	351	}
352	}	352	}
353		353
354	return 0;	354	return 0;
…		…
430	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
431		431
432	object_freezer freezer;	432	object_freezer freezer;
433	op->write (freezer);	433	op->write (freezer);
434	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
435	}	441	}
436		442
437	/*	443	/*
438	* 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
439	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
478	*/	484	*/
479	object *	485	object *
480	find_object_name (const char *str)	486	find_object_name (const char *str)
481	{	487	{
482	shstr_cmp str_ (str);	488	shstr_cmp str_ (str);
483	object *op;
484		489
		490	if (str_)
485	for_all_objects (op)	491	for_all_objects (op)
486	if (op->name == str_)	492	if (op->name == str_)
487	break;	493	return op;
488		494
489	return op;	495	return 0;
490	}	496	}
491		497
492	/*	498	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	499	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	500	* skill and experience objects.
…		…
556	update_stats ();	562	update_stats ();
557		563
558	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
561	"[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);
562	return false;	569	return false;
563	}	570	}
564		571
565	//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);
566	}	573	}
…		…
638	}	645	}
639		646
640	if (speed < 0)	647	if (speed < 0)
641	dst->speed_left -= rndm ();	648	dst->speed_left -= rndm ();
642		649
643	dst->set_speed (dst->speed);	650	dst->activate ();
644	}	651	}
645		652
646	void	653	void
647	object::instantiate ()	654	object::instantiate ()
648	{	655	{
…		…
760	else if (action == UP_OBJ_INSERT)	767	else if (action == UP_OBJ_INSERT)
761	{	768	{
762	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* 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
773	* to have move_allow right now.	780	* have move_allow right now.
774	*/	781	*/
775	\|\| ((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
776	\|\| 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)
777	m.flags_ = 0;	784	m.invalidate ();
778	}	785	}
779	/* if the object is being removed, we can't make intelligent	786	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	787	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	788	* that is being removed.
782	*/	789	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	790	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	791	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	792	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	793	/* Nothing to do for that case */ ;
787	else	794	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	795	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		796
…		…
793		800
794	object::object ()	801	object::object ()
795	{	802	{
796	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
797		804
798	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
799	face = blank_face;	806	face = blank_face;
800	}	807	}
801		808
802	object::~object ()	809	object::~object ()
803	{	810	{
…		…
833	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
834	if (active)	841	if (active)
835	return;	842	return;
836		843
837	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
838	actives.insert (this);	849	actives.insert (this);
		850	}
839	}	851	}
840		852
841	void	853	void
842	object::activate_recursive ()	854	object::activate_recursive ()
843	{	855	{
…		…
908	\|\| map->in_memory != MAP_ACTIVE	920	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->no_drop	921	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	922	\|\| ms ().move_block == MOVE_ALL)
911	{	923	{
912	while (inv)	924	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	925	inv->destroy ();
916	}
917	}	926	}
918	else	927	else
919	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
920	while (inv)	929	while (inv)
921	{	930	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	934	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	935	\|\| op->type == RUNE
927	\|\| op->type == TRAP	936	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	937	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	938	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	939	op->destroy ();
931	else	940	else
932	map->insert (op, x, y);	941	map->insert (op, x, y);
933	}	942	}
934	}	943	}
935	}	944	}
…		…
964		973
965	void	974	void
966	object::do_destroy ()	975	object::do_destroy ()
967	{	976	{
968	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
969	remove_button_link (this);	978	remove_link ();
970		979
971	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
972	remove_friendly_object (this);	981	remove_friendly_object (this);
973		982
974	remove ();	983	remove ();
…		…
999	attacked_by = 0;	1008	attacked_by = 0;
1000	current_weapon = 0;	1009	current_weapon = 0;
1001	}	1010	}
1002		1011
1003	void	1012	void
1004	object::destroy (bool destroy_inventory)	1013	object::destroy ()
1005	{	1014	{
1006	if (destroyed ())	1015	if (destroyed ())
1007	return;	1016	return;
1008		1017
1009	if (!is_head () && !head->destroyed ())	1018	if (!is_head () && !head->destroyed ())
1010	{	1019	{
1011	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1012	head->destroy (destroy_inventory);	1021	head->destroy ();
1013	return;	1022	return;
1014	}	1023	}
1015		1024
1016	destroy_inv (!destroy_inventory);	1025	destroy_inv (false);
1017		1026
1018	if (is_head ())	1027	if (is_head ())
1019	if (sound_destroy)	1028	if (sound_destroy)
1020	play_sound (sound_destroy);	1029	play_sound (sound_destroy);
1021	else if (flag [FLAG_MONSTER])	1030	else if (flag [FLAG_MONSTER])
…		…
1032	* the previous environment.	1041	* the previous environment.
1033	*/	1042	*/
1034	void	1043	void
1035	object::do_remove ()	1044	object::do_remove ()
1036	{	1045	{
1037	object tmp, last = 0;
1038	object *otmp;
1039
1040	if (flag [FLAG_REMOVED])	1046	if (flag [FLAG_REMOVED])
1041	return;	1047	return;
1042		1048
1043	INVOKE_OBJECT (REMOVE, this);	1049	INVOKE_OBJECT (REMOVE, this);
1044		1050
…		…
1057	if (object *pl = visible_to ())	1063	if (object *pl = visible_to ())
1058	esrv_del_item (pl->contr, count);	1064	esrv_del_item (pl->contr, count);
1059	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
1060		1066
1061	adjust_weight (env, -total_weight ());	1067	adjust_weight (env, -total_weight ());
		1068
		1069	object *pl = in_player ();
1062		1070
1063	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1064	* 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
1065	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1066	*/	1074	*/
…		…
1078		1086
1079	/* 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
1080	* made to players inventory. If set, avoiding the call	1088	* made to players inventory. If set, avoiding the call
1081	* to save cpu time.	1089	* to save cpu time.
1082	*/	1090	*/
1083	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	{
1084	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	}
1085	}	1099	}
1086	else if (map)	1100	else if (map)
1087	{	1101	{
1088	map->dirty = true;	1102	map->dirty = true;
1089	mapspace &ms = this->ms ();	1103	mapspace &ms = this->ms ();
1090		1104
1091	if (object *pl = ms.player ())	1105	if (object *pl = ms.player ())
1092	{	1106	{
1093	if (type == PLAYER) // this == pl(!)	1107	if (is_player ())
1094	{	1108	{
		1109	if (!flag [FLAG_WIZPASS])
		1110	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1111
1095	// leaving a spot always closes any open container on the ground	1112	// leaving a spot always closes any open container on the ground
1096	if (container && !container->env)	1113	if (container && !container->env)
1097	// this causes spurious floorbox updates, but it ensures	1114	// this causes spurious floorbox updates, but it ensures
1098	// that the CLOSE event is being sent.	1115	// that the CLOSE event is being sent.
1099	close_container ();	1116	close_container ();
1100		1117
1101	--map->players;	1118	--map->players;
1102	map->touch ();	1119	map->touch ();
1103	}	1120	}
1104	else if (pl->container == this)	1121	else if (pl->container_ () == this)
1105	{	1122	{
1106	// removing a container should close it	1123	// removing a container should close it
1107	close_container ();	1124	close_container ();
1108	}	1125	}
1109		1126
…		…
1116	*(below ? &below->above : &ms.bot) = above;	1133	*(below ? &below->above : &ms.bot) = above;
1117		1134
1118	above = 0;	1135	above = 0;
1119	below = 0;	1136	below = 0;
1120		1137
		1138	ms.invalidate ();
		1139
1121	if (map->in_memory == MAP_SAVING)	1140	if (map->in_memory == MAP_SAVING)
1122	return;	1141	return;
1123		1142
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1143	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1144
1126	if (object *pl = ms.player ())	1145	if (object *pl = ms.player ())
1127	{	1146	{
1128	if (pl->container == this)	1147	if (pl->container_ () == this)
1129	/* If a container that the player is currently using somehow gets	1148	/* If a container that the player is currently using somehow gets
1130	* removed (most likely destroyed), update the player view	1149	* removed (most likely destroyed), update the player view
1131	* appropriately.	1150	* appropriately.
1132	*/	1151	*/
1133	pl->close_container ();	1152	pl->close_container ();
…		…
1137	//TODO: update floorbox to preserve ordering	1156	//TODO: update floorbox to preserve ordering
1138	if (pl->contr->ns)	1157	if (pl->contr->ns)
1139	pl->contr->ns->floorbox_update ();	1158	pl->contr->ns->floorbox_update ();
1140	}	1159	}
1141		1160
		1161	if (check_walk_off)
1142	for (tmp = ms.bot; tmp; tmp = tmp->above)	1162	for (object above, tmp = ms.bot; tmp; tmp = above)
1143	{	1163	{
		1164	above = tmp->above;
		1165
1144	/* 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
1145	* being removed.	1167	* being removed.
1146	*/	1168	*/
1147		1169
1148	/* See if object moving off should effect something */	1170	/* See if object moving off should effect something */
1149	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1171	if ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1172	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152	{
1153	move_apply (tmp, this, 0);	1173	move_apply (tmp, this, 0);
1154
1155	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1174	}
1158		1175
1159	last = tmp;	1176	if (affects_los ())
1160	}
1161
1162	/* last == NULL if there are no objects on this space */
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);	1177	update_all_los (map, x, y);
1171	}	1178	}
1172	}	1179	}
1173		1180
1174	/*	1181	/*
…		…
1198	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1199		1206
1200	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1201	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1202		1209
1203	op->destroy (1);	1210	op->destroy ();
1204		1211
1205	return top;	1212	return top;
1206	}	1213	}
1207		1214
1208	return 0;	1215	return 0;
…		…
1236	* job preparing multi-part monsters.	1243	* job preparing multi-part monsters.
1237	*/	1244	*/
1238	object *	1245	object *
1239	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1246	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1240	{	1247	{
		1248	op->remove ();
		1249
1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1250	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242	{	1251	{
1243	tmp->x = x + tmp->arch->x;	1252	tmp->x = x + tmp->arch->x;
1244	tmp->y = y + tmp->arch->y;	1253	tmp->y = y + tmp->arch->y;
1245	}	1254	}
…		…
1270	object *	1279	object *
1271	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)
1272	{	1281	{
1273	op->remove ();	1282	op->remove ();
1274		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
		1287	}//D
		1288
1275	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* 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	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1277	* need extra work	1291	* need extra work
1278	*/	1292	*/
		1293	maptile *newmap = m;
1279	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1280	{	1295	{
1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282	return 0;	1297	return 0;
1283	}	1298	}
1284		1299
1285	if (object *more = op->more)	1300	if (object *more = op->more)
1286	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1287	return 0;	1302	return 0;
1288		1303
1289	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1290		1305	op->env = 0;
1291	op->map = m;	1306	op->map = newmap;
		1307
1292	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1293		1309
1294	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1295	*/	1311	*/
1296	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1299	{	1315	{
1300	// TODO: we actually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1301	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1302	// from here :/	1318	// from here :/
1303	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1304	tmp->destroy (1);	1320	tmp->destroy ();
1305	}	1321	}
1306		1322
1307	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 */
1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1309		1325
1310	if (!QUERY_FLAG (op, FLAG_ALIVE))	1326	if (!QUERY_FLAG (op, FLAG_ALIVE))
1311	CLEAR_FLAG (op, FLAG_NO_STEAL);	1327	CLEAR_FLAG (op, FLAG_NO_STEAL);
1312		1328
1313	if (flag & INS_BELOW_ORIGINATOR)	1329	if (flag & INS_BELOW_ORIGINATOR)
1314	{	1330	{
1315	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y \|\| !originator->is_on_map ())	1331	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1316	{	1332	{
1317	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");
		1334	abort ();
		1335	}
		1336
		1337	if (!originator->is_on_map ())
		1338	{
		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 ());
1318	abort ();	1341	abort ();
1319	}	1342	}
1320		1343
1321	op->above = originator;	1344	op->above = originator;
1322	op->below = originator->below;	1345	op->below = originator->below;
…		…
1410	op->below = top;	1433	op->below = top;
1411	*(op->above ? &op->above->below : &ms.top) = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1412	}	1435	}
1413	}	1436	}
1414		1437
1415	if (op->type == PLAYER)	1438	if (op->is_player ())
1416	{	1439	{
1417	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1418	++op->map->players;	1441	++op->map->players;
1419	op->map->touch ();	1442	op->map->touch ();
1420	}	1443	}
…		…
1435	* 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 -
1436	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1437	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1438	* of effect may be sufficient.	1461	* of effect may be sufficient.
1439	*/	1462	*/
1440	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1441	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1442		1468
1443	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1444	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1445		1471
1446	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1453	* blocked() and wall() work properly), and these flags are updated by	1479	* blocked() and wall() work properly), and these flags are updated by
1454	* update_object().	1480	* update_object().
1455	*/	1481	*/
1456		1482
1457	/* 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 */
1458	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1484	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1459	{	1485	{
1460	if (check_move_on (op, originator))	1486	if (check_move_on (op, originator))
1461	return 0;	1487	return 0;
1462		1488
1463	/* 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
…		…
1474	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1475	* 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.
1476	* 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.
1477	*/	1503	*/
1478	void	1504	void
1479	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1480	{	1506	{
1481	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1482		1508
1483	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1484	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1485	tmp->destroy (1);	1511	tmp->destroy ();
1486		1512
1487	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1488		1514
1489	tmp->x = op->x;	1515	tmp->x = op->x;
1490	tmp->y = op->y;	1516	tmp->y = op->y;
1491		1517
1492	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1514	if (!nr)	1540	if (!nr)
1515	return true;	1541	return true;
1516		1542
1517	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1518		1544
		1545	if (nrof > nr)
		1546	{
1519	nrof -= nr;	1547	nrof -= nr;
1520
1521	if (nrof)
1522	{
1523	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1524		1549
1525	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1526	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1527		1552
1528	return true;	1553	return true;
1529	}	1554	}
1530	else	1555	else
1531	{	1556	{
1532	destroy (1);	1557	destroy ();
1533	return false;	1558	return false;
1534	}	1559	}
1535	}	1560	}
1536		1561
1537	/*	1562	/*
…		…
1614	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1615	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1616		1641
1617	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1618		1643
1619	op->destroy (1);	1644	op->destroy ();
1620	op = tmp;	1645	op = tmp;
1621	goto inserted;	1646	goto inserted;
1622	}	1647	}
1623		1648
1624	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1642		1667
1643	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1644		1669
1645	inserted:	1670	inserted:
1646	/* 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 */
1647	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1648	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1649		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1650	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1651	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1652	update_stats ();	1679	update_stats ();
1653		1680
1654	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1655		1682
1656	return op;	1683	return op;
…		…
1677	* on top.	1704	* on top.
1678	*/	1705	*/
1679	int	1706	int
1680	check_move_on (object op, object originator)	1707	check_move_on (object op, object originator)
1681	{	1708	{
		1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1710	return 0;
		1711
1682	object *tmp;	1712	object *tmp;
1683	maptile *m = op->map;	1713	maptile *m = op->map;
1684	int x = op->x, y = op->y;	1714	int x = op->x, y = op->y;
1685		1715
1686	MoveType move_on, move_slow, move_block;	1716	mapspace &ms = m->at (x, y);
1687		1717
1688	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1718	ms.update ();
1689	return 0;
1690		1719
1691	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1720	MoveType move_on = ms.move_on;
1692	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1721	MoveType move_slow = ms.move_slow;
1693	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1722	MoveType move_block = ms.move_block;
1694		1723
1695	/* 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,
1696	* 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
1697	* 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
1698	* as walking.	1727	* as walking.
…		…
1709	return 0;	1738	return 0;
1710		1739
1711	/* The objects have to be checked from top to bottom.	1740	/* The objects have to be checked from top to bottom.
1712	* Hence, we first go to the top:	1741	* Hence, we first go to the top:
1713	*/	1742	*/
1714		1743	for (object next, tmp = ms.top; tmp; tmp = next)
1715	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1716	{
1717	/* Trim the search when we find the first other spell effect
1718	* this helps performance so that if a space has 50 spell objects,
1719	* we don't need to check all of them.
1720	*/
1721	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1722	break;
1723	}	1744	{
		1745	next = tmp->below;
1724		1746
1725	for (; tmp; tmp = tmp->below)
1726	{
1727	if (tmp == op)	1747	if (tmp == op)
1728	continue; /* Can't apply yourself */	1748	continue; /* Can't apply yourself */
1729		1749
1730	/* 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.
1731	* Second check makes sure that the movement types not being slowed	1751	* Second check makes sure that the movement types not being slowed
…		…
1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1737	{	1757	{
1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1739	((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))
1740	{	1760	{
1741
1742	float
1743	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	float diff = tmp->move_slow_penalty * fabs (op->speed);
1744		1762
1745	if (op->type == PLAYER)	1763	if (op->is_player ())
1746	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)) \|\|
1747	(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)))
1748	diff /= 4.0;	1766	diff /= 4.0;
1749		1767
1750	op->speed_left -= diff;	1768	op->speed_left -= diff;
1751	}	1769	}
1752	}	1770	}
…		…
1958	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
1959	*/	1977	*/
1960	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1961	continue;	1979	continue;
1962		1980
1963	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
1964	continue;	1982	continue;
1965		1983
1966	altern [index++] = i;	1984	altern [index++] = i;
1967	}	1985	}
1968		1986
…		…
2036	* there is capable of.	2054	* there is capable of.
2037	*/	2055	*/
2038	int	2056	int
2039	find_dir (maptile m, int x, int y, object exclude)	2057	find_dir (maptile m, int x, int y, object exclude)
2040	{	2058	{
2041	int i, max = SIZEOFFREE, mflags;	2059	int max = SIZEOFFREE, mflags;
2042
2043	sint16 nx, ny;
2044	object *tmp;
2045	maptile *mp;
2046
2047	MoveType blocked, move_type;	2060	MoveType move_type;
2048		2061
2049	if (exclude && exclude->head_ () != exclude)	2062	if (exclude && exclude->head_ () != exclude)
2050	{	2063	{
2051	exclude = exclude->head;	2064	exclude = exclude->head;
2052	move_type = exclude->move_type;	2065	move_type = exclude->move_type;
…		…
2055	{	2068	{
2056	/* 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. */
2057	move_type = MOVE_ALL;	2070	move_type = MOVE_ALL;
2058	}	2071	}
2059		2072
2060	for (i = 1; i < max; i++)	2073	for (int i = 1; i < max; i++)
2061	{	2074	{
2062	mp = m;	2075	mapxy pos (m, x, y);
2063	nx = x + freearr_x[i];	2076	pos.move (i);
2064	ny = y + freearr_y[i];
2065		2077
2066	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2078	if (!pos.normalise ())
2067
2068	if (mflags & P_OUT_OF_MAP)
2069	max = maxfree[i];	2079	max = maxfree[i];
2070	else	2080	else
2071	{	2081	{
2072	mapspace &ms = mp->at (nx, ny);	2082	mapspace &ms = *pos;
2073		2083
2074	blocked = ms.move_block;
2075
2076	if ((move_type & blocked) == move_type)	2084	if ((move_type & ms.move_block) == move_type)
2077	max = maxfree[i];	2085	max = maxfree [i];
2078	else if (mflags & P_IS_ALIVE)	2086	else if (ms.flags () & P_IS_ALIVE)
2079	{	2087	{
2080	for (tmp = ms.bot; tmp; tmp = tmp->above)	2088	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2081	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2089	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2082	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2090	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2083	break;
2084
2085	if (tmp)
2086	return freedir[i];	2091	return freedir [i];
2087	}	2092	}
2088	}	2093	}
2089	}	2094	}
2090		2095
2091	return 0;	2096	return 0;
…		…
2166	* 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
2167	* 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.
2168	* 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
2169	* functions.	2174	* functions.
2170	*/	2175	*/
2171	int reduction_dir[SIZEOFFREE][3] = {	2176	const int reduction_dir[SIZEOFFREE][3] = {
2172	{0, 0, 0}, /* 0 */	2177	{0, 0, 0}, /* 0 */
2173	{0, 0, 0}, /* 1 */	2178	{0, 0, 0}, /* 1 */
2174	{0, 0, 0}, /* 2 */	2179	{0, 0, 0}, /* 2 */
2175	{0, 0, 0}, /* 3 */	2180	{0, 0, 0}, /* 3 */
2176	{0, 0, 0}, /* 4 */	2181	{0, 0, 0}, /* 4 */
…		…
2272	int	2277	int
2273	can_pick (const object who, const object item)	2278	can_pick (const object who, const object item)
2274	{	2279	{
2275	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2280	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2276	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2281	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2277	!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));
2278	}	2283	}
2279		2284
2280	/*	2285	/*
2281	* create clone from object to another	2286	* create clone from object to another
2282	*/	2287	*/
…		…
2314	return tmp;	2319	return tmp;
2315		2320
2316	return 0;	2321	return 0;
2317	}	2322	}
2318		2323
2319	const shstr &	2324	shstr_tmp
2320	object::kv_get (const shstr &key) const	2325	object::kv_get (shstr_tmp key) const
2321	{	2326	{
2322	for (key_value *kv = key_values; kv; kv = kv->next)	2327	for (key_value *kv = key_values; kv; kv = kv->next)
2323	if (kv->key == key)	2328	if (kv->key == key)
2324	return kv->value;	2329	return kv->value;
2325		2330
2326	return shstr_null;	2331	return shstr ();
2327	}	2332	}
2328		2333
2329	void	2334	void
2330	object::kv_set (const shstr &key, const shstr &value)	2335	object::kv_set (shstr_tmp key, shstr_tmp value)
2331	{	2336	{
2332	for (key_value *kv = key_values; kv; kv = kv->next)	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2333	if (kv->key == key)	2338	if (kv->key == key)
2334	{	2339	{
2335	kv->value = value;	2340	kv->value = value;
…		…
2344		2349
2345	key_values = kv;	2350	key_values = kv;
2346	}	2351	}
2347		2352
2348	void	2353	void
2349	object::kv_del (const shstr &key)	2354	object::kv_del (shstr_tmp key)
2350	{	2355	{
2351	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2356	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2352	if ((*kvp)->key == key)	2357	if ((*kvp)->key == key)
2353	{	2358	{
2354	key_value kv = kvp;	2359	key_value kv = kvp;
…		…
2413	{	2418	{
2414	char flagdesc[512];	2419	char flagdesc[512];
2415	char info2[256 * 4];	2420	char info2[256 * 4];
2416	char *p = info;	2421	char *p = info;
2417		2422
2418	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2423	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2419	count,	2424	count,
2420	uuid.c_str (),	2425	uuid.c_str (),
2421	&name,	2426	&name,
2422	title ? "\",title:\"" : "",	2427	title ? ",title:\"" : "",
2423	title ? (const char *)title : "",	2428	title ? (const char *)title : "",
		2429	title ? "\"" : "",
2424	flag_desc (flagdesc, 512), type);	2430	flag_desc (flagdesc, 512), type);
2425		2431
2426	if (!flag[FLAG_REMOVED] && env)	2432	if (!flag[FLAG_REMOVED] && env)
2427	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2433	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2428		2434
…		…
2484	container = 0;	2490	container = 0;
2485		2491
2486	// 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
2487	esrv_update_item (UPD_FLAGS, this, old_container);	2493	esrv_update_item (UPD_FLAGS, this, old_container);
2488		2494
2489	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 ());
2490	play_sound (sound_find ("chest_close"));	2496	play_sound (sound_find ("chest_close"));
2491	}	2497	}
2492		2498
2493	if (new_container)	2499	if (new_container)
2494	{	2500	{
…		…
2504	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2510	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2505	new_container->insert (closer);	2511	new_container->insert (closer);
2506	}	2512	}
2507	#endif	2513	#endif
2508		2514
2509	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 ());
2510		2516
2511	// 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
2512	esrv_send_item (this, new_container);	2518	esrv_send_item (this, new_container);
2513		2519
2514	new_container->flag [FLAG_APPLIED] = true;	2520	new_container->flag [FLAG_APPLIED] = true;
…		…
2522	// else if (!old_container->env && contr && contr->ns)	2528	// else if (!old_container->env && contr && contr->ns)
2523	// contr->ns->floorbox_reset ();	2529	// contr->ns->floorbox_reset ();
2524	}	2530	}
2525		2531
2526	object *	2532	object *
2527	object::force_find (const shstr name)	2533	object::force_find (shstr_tmp name)
2528	{	2534	{
2529	/* 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
2530	* place	2536	* place
2531	*/	2537	*/
2532	for (object *tmp = inv; tmp; tmp = tmp->below)	2538	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2535		2541
2536	return 0;	2542	return 0;
2537	}	2543	}
2538		2544
2539	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 *
2540	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2541	{	2556	{
2542	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2543	force->destroy ();	2558	force->destroy ();
2544		2559
2545	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
2546		2561
2547	force->slaying = name;	2562	force->slaying = name;
2548	force->stats.food = 1;
2549	force->speed_left = -1.f;
2550		2563
2551	force->set_speed (duration ? 1.f / duration : 0.f);	2564	force->force_set_timer (duration);
2552	force->flag [FLAG_IS_USED_UP] = true;	2565
2553	force->flag [FLAG_APPLIED] = true;	2566	force->flag [FLAG_APPLIED] = true;
2554		2567
2555	insert (force);	2568	return insert (force);
2556	}	2569	}
2557		2570
2558	void	2571	void
2559	object::play_sound (faceidx sound)	2572	object::play_sound (faceidx sound) const
2560	{	2573	{
2561	if (!sound)	2574	if (!sound)
2562	return;	2575	return;
2563		2576
2564	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 ())
2565	return;	2602	return;
2566		2603
2567	if (env)	2604	// find old force, or create new one
2568	{	2605	object *force = force_find (shstr_noise_force);
2569	if (object *pl = in_player ())	2606
2570	pl->contr->play_sound (sound);	2607	if (force)
2571	}	2608	force->speed_left = -1.f; // patch old speed up
2572	else	2609	else
2573	map->play_sound (sound, x, y);	2610	{
2574	}	2611	force = archetype::get (shstr_noise_force);
2575		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.240 by root, Wed May 7 13:40:30 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.240 by root, Wed May 7 13:40:30 2008 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC