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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
186	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
189	return 0;	190	return 0;
190		191
191	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	195	return 0;
198		196
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		205
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		208
211	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	210	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	211	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	212	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	213	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	214	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	215	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	216	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	217	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	218	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	219	\|\| ob1->animation_id != ob2->animation_id
		220	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	221	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	222	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	223	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	224	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	225	\|\| ob1->move_type != ob2->move_type
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	234	return 0;
236		235
237	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
241	.any ())	239	.any ())
242	return 0;	240	return 0;
243		241
244	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
326	{	324	{
327	// see if we are in a container of sorts	325	// see if we are in a container of sorts
328	if (env)	326	if (env)
329	{	327	{
330	// the player inventory itself is always visible	328	// the player inventory itself is always visible
331	if (env->type == PLAYER)	329	if (env->is_player ())
332	return env;	330	return env;
333		331
334	// else a player could have our env open	332	// else a player could have our env open
335	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
336		334
337	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	336	// even if our inv is in a player.
339	if (envest->is_on_map ())	337	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
344	else	342	else
345	{	343	{
346	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
350	return pl;	349	return pl;
351	}	350	}
352	}	351	}
353		352
354	return 0;	353	return 0;
…		…
478	*/	477	*/
479	object *	478	object *
480	find_object_name (const char *str)	479	find_object_name (const char *str)
481	{	480	{
482	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
483	object *op;
484		482
		483	if (str_)
485	for_all_objects (op)	484	for_all_objects (op)
486	if (op->name == str_)	485	if (op->name == str_)
487	break;	486	return op;
488		487
489	return op;	488	return 0;
490	}	489	}
491		490
492	/*	491	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	493	* skill and experience objects.
…		…
638	}	637	}
639		638
640	if (speed < 0)	639	if (speed < 0)
641	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
642		641
643	dst->set_speed (dst->speed);	642	dst->activate ();
644	}	643	}
645		644
646	void	645	void
647	object::instantiate ()	646	object::instantiate ()
648	{	647	{
…		…
760	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
761	{	760	{
762	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	772	* have move_allow right now.
774	*/	773	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((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)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777	m.flags_ = 0;	776	m.invalidate ();
778	}	777	}
779	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	780	* that is being removed.
782	*/	781	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	783	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
787	else	786	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		788
…		…
793		792
794	object::object ()	793	object::object ()
795	{	794	{
796	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
797		796
798	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
799	face = blank_face;	798	face = blank_face;
800	}	799	}
801		800
802	object::~object ()	801	object::~object ()
803	{	802	{
…		…
833	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
834	if (active)	833	if (active)
835	return;	834	return;
836		835
837	if (has_active_speed ())	836	if (has_active_speed ())
		837	{
		838	if (flag [FLAG_FREED])
		839	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		840
838	actives.insert (this);	841	actives.insert (this);
		842	}
839	}	843	}
840		844
841	void	845	void
842	object::activate_recursive ()	846	object::activate_recursive ()
843	{	847	{
…		…
904	* drop on that space.	908	* drop on that space.
905	*/	909	*/
906	if (!drop_to_ground	910	if (!drop_to_ground
907	\|\| !map	911	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	912	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	913	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	914	\|\| ms ().move_block == MOVE_ALL)
911	{	915	{
912	while (inv)	916	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	917	inv->destroy ();
916	}
917	}	918	}
918	else	919	else
919	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
920	while (inv)	921	while (inv)
921	{	922	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	926	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	927	\|\| op->type == RUNE
927	\|\| op->type == TRAP	928	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	929	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	931	op->destroy ();
931	else	932	else
932	map->insert (op, x, y);	933	map->insert (op, x, y);
933	}	934	}
934	}	935	}
935	}	936	}
…		…
943		944
944	static struct freed_map : maptile	945	static struct freed_map : maptile
945	{	946	{
946	freed_map ()	947	freed_map ()
947	{	948	{
948	path = "<freed objects map>";	949	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	950	name = "/internal/freed_objects_map";
950	width = 3;	951	width = 3;
951	height = 3;	952	height = 3;
952	nodrop = 1;	953	no_drop = 1;
		954	no_reset = 1;
953		955
954	alloc ();	956	alloc ();
955	in_memory = MAP_ACTIVE;	957	in_memory = MAP_ACTIVE;
956	}	958	}
957		959
…		…
963		965
964	void	966	void
965	object::do_destroy ()	967	object::do_destroy ()
966	{	968	{
967	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	970	remove_link ();
969		971
970	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	973	remove_friendly_object (this);
972		974
973	remove ();	975	remove ();
…		…
998	attacked_by = 0;	1000	attacked_by = 0;
999	current_weapon = 0;	1001	current_weapon = 0;
1000	}	1002	}
1001		1003
1002	void	1004	void
1003	object::destroy (bool destroy_inventory)	1005	object::destroy ()
1004	{	1006	{
1005	if (destroyed ())	1007	if (destroyed ())
1006	return;	1008	return;
1007		1009
1008	if (!is_head () && !head->destroyed ())	1010	if (!is_head () && !head->destroyed ())
1009	{	1011	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1013	head->destroy ();
1012	return;	1014	return;
1013	}	1015	}
1014		1016
1015	destroy_inv (!destroy_inventory);	1017	destroy_inv (false);
1016		1018
1017	if (is_head ())	1019	if (is_head ())
1018	if (sound_destroy)	1020	if (sound_destroy)
1019	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1056	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1061
1060	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
		1063
		1064	object *pl = in_player ();
1061		1065
1062	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1067	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1065	*/	1069	*/
…		…
1077		1081
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1082	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1084	* to save cpu time.
1081	*/	1085	*/
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1086	if (pl)
		1087	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1088	{
1083	otmp->update_stats ();	1089	pl->update_stats ();
		1090
		1091	if (glow_radius && pl->is_on_map ())
		1092	update_all_los (pl->map, pl->x, pl->y);
		1093	}
1084	}	1094	}
1085	else if (map)	1095	else if (map)
1086	{	1096	{
1087	map->dirty = true;	1097	map->dirty = true;
1088	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1089		1099
1090	if (object *pl = ms.player ())	1100	if (object *pl = ms.player ())
1091	{	1101	{
1092	if (type == PLAYER) // this == pl(!)	1102	if (is_player ())
1093	{	1103	{
		1104	if (!flag [FLAG_WIZPASS])
		1105	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1106
1094	// leaving a spot always closes any open container on the ground	1107	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1108	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1109	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1110	// that the CLOSE event is being sent.
1098	close_container ();	1111	close_container ();
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1128	*(below ? &below->above : &ms.bot) = above;
1116		1129
1117	above = 0;	1130	above = 0;
1118	below = 0;	1131	below = 0;
1119		1132
		1133	ms.invalidate ();
		1134
1120	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1121	return;	1136	return;
1122		1137
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1139
…		…
1156	}	1171	}
1157		1172
1158	last = tmp;	1173	last = tmp;
1159	}	1174	}
1160		1175
1161	/* last == NULL if there are no objects on this space */	1176	if (affects_los ())
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1169	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1170	}	1178	}
1171	}	1179	}
1172		1180
1173	/*	1181	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1198		1206
1199	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1201		1209
1202	op->destroy (1);	1210	op->destroy ();
1203		1211
1204	return top;	1212	return top;
1205	}	1213	}
1206		1214
1207	return 0;	1215	return 0;
…		…
1235	* job preparing multi-part monsters.	1243	* job preparing multi-part monsters.
1236	*/	1244	*/
1237	object *	1245	object *
1238	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)
1239	{	1247	{
		1248	op->remove ();
		1249
1240	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1250	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241	{	1251	{
1242	tmp->x = x + tmp->arch->x;	1252	tmp->x = x + tmp->arch->x;
1243	tmp->y = y + tmp->arch->y;	1253	tmp->y = y + tmp->arch->y;
1244	}	1254	}
…		…
1269	object *	1279	object *
1270	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)
1271	{	1281	{
1272	op->remove ();	1282	op->remove ();
1273		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
1274	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1275	* 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
1276	* need extra work	1291	* need extra work
1277	*/	1292	*/
		1293	maptile *newmap = m;
1278	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1279	{	1295	{
1280	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1281	return 0;	1297	return 0;
1282	}	1298	}
1283		1299
1284	if (object *more = op->more)	1300	if (object *more = op->more)
1285	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1286	return 0;	1302	return 0;
1287		1303
1288	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1289		1305	op->env = 0;
1290	op->map = m;	1306	op->map = newmap;
		1307
1291	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1292		1309
1293	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1294	*/	1311	*/
1295	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1298	{	1315	{
1299	// TODO: we actually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1300	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1301	// from here :/	1318	// from here :/
1302	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1303	tmp->destroy (1);	1320	tmp->destroy ();
1304	}	1321	}
1305		1322
1306	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 */
1307	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1308		1325
1309	if (!QUERY_FLAG (op, FLAG_ALIVE))	1326	if (!QUERY_FLAG (op, FLAG_ALIVE))
1310	CLEAR_FLAG (op, FLAG_NO_STEAL);	1327	CLEAR_FLAG (op, FLAG_NO_STEAL);
1311		1328
1312	if (flag & INS_BELOW_ORIGINATOR)	1329	if (flag & INS_BELOW_ORIGINATOR)
1313	{	1330	{
1314	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)
1315	{	1332	{
1316	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 ());
1317	abort ();	1341	abort ();
1318	}	1342	}
1319		1343
1320	op->above = originator;	1344	op->above = originator;
1321	op->below = originator->below;	1345	op->below = originator->below;
…		…
1390	} /* If objects on this space */	1414	} /* If objects on this space */
1391		1415
1392	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1393	top = floor;	1417	top = floor;
1394		1418
1395	/* Top is the object that our object (op) is going to get inserted above.	1419	// insert object above top, or bottom-most if top = 0
1396	*/
1397
1398	/* no top found, insert on top */
1399	if (!top)	1420	if (!top)
1400	{	1421	{
1401	op->above = 0;	1422	op->below = 0;
1402	op->below = ms.top;	1423	op->above = ms.bot;
1403	ms.top = op;	1424	ms.bot = op;
1404		1425
1405	*(op->below ? &op->below->above : &ms.bot) = op;	1426	*(op->above ? &op->above->below : &ms.top) = op;
1406	}	1427	}
1407	else	1428	else
1408	{ /* get inserted into the stack above top */	1429	{
1409	op->above = top->above;	1430	op->above = top->above;
1410	top->above = op;	1431	top->above = op;
1411		1432
1412	op->below = top;	1433	op->below = top;
1413	*(op->above ? &op->above->below : &ms.top) = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1414	}	1435	}
1415	} /* else not INS_BELOW_ORIGINATOR */	1436	}
1416		1437
1417	if (op->type == PLAYER)	1438	if (op->is_player ())
1418	{	1439	{
1419	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1420	++op->map->players;	1441	++op->map->players;
1421	op->map->touch ();	1442	op->map->touch ();
1422	}	1443	}
…		…
1437	* 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 -
1438	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1439	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1440	* of effect may be sufficient.	1461	* of effect may be sufficient.
1441	*/	1462	*/
1442	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1443	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1444		1468
1445	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1446	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1447		1471
1448	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1476	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1477	* 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.
1478	* 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.
1479	*/	1503	*/
1480	void	1504	void
1481	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1482	{	1506	{
1483	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1484		1508
1485	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1487	tmp->destroy (1);	1511	tmp->destroy ();
1488		1512
1489	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1490		1514
1491	tmp->x = op->x;	1515	tmp->x = op->x;
1492	tmp->y = op->y;	1516	tmp->y = op->y;
1493		1517
1494	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1516	if (!nr)	1540	if (!nr)
1517	return true;	1541	return true;
1518		1542
1519	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1520		1544
		1545	if (nrof > nr)
		1546	{
1521	nrof -= nr;	1547	nrof -= nr;
1522
1523	if (nrof)
1524	{
1525	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1526		1549
1527	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1528	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1529		1552
1530	return true;	1553	return true;
1531	}	1554	}
1532	else	1555	else
1533	{	1556	{
1534	destroy (1);	1557	destroy ();
1535	return false;	1558	return false;
1536	}	1559	}
1537	}	1560	}
1538		1561
1539	/*	1562	/*
…		…
1616	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1617	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1618		1641
1619	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1620		1643
1621	op->destroy (1);	1644	op->destroy ();
1622	op = tmp;	1645	op = tmp;
1623	goto inserted;	1646	goto inserted;
1624	}	1647	}
1625		1648
1626	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1644		1667
1645	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1646		1669
1647	inserted:	1670	inserted:
1648	/* 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 */
1649	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1650	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1651		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1652	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1653	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1654	update_stats ();	1679	update_stats ();
1655		1680
1656	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1657		1682
1658	return op;	1683	return op;
…		…
1742	{	1767	{
1743		1768
1744	float	1769	float
1745	diff = tmp->move_slow_penalty * fabs (op->speed);	1770	diff = tmp->move_slow_penalty * fabs (op->speed);
1746		1771
1747	if (op->type == PLAYER)	1772	if (op->is_player ())
1748	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1773	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1749	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1774	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1750	diff /= 4.0;	1775	diff /= 4.0;
1751		1776
1752	op->speed_left -= diff;	1777	op->speed_left -= diff;
…		…
1960	* head of the object should correspond for the entire object.	1985	* head of the object should correspond for the entire object.
1961	*/	1986	*/
1962	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1963	continue;	1988	continue;
1964		1989
1965	if (ob->blocked (m, pos.x, pos.y))	1990	if (ob->blocked (pos.m, pos.x, pos.y))
1966	continue;	1991	continue;
1967		1992
1968	altern [index++] = i;	1993	altern [index++] = i;
1969	}	1994	}
1970		1995
…		…
2038	* there is capable of.	2063	* there is capable of.
2039	*/	2064	*/
2040	int	2065	int
2041	find_dir (maptile m, int x, int y, object exclude)	2066	find_dir (maptile m, int x, int y, object exclude)
2042	{	2067	{
2043	int i, max = SIZEOFFREE, mflags;	2068	int max = SIZEOFFREE, mflags;
2044
2045	sint16 nx, ny;
2046	object *tmp;
2047	maptile *mp;
2048
2049	MoveType blocked, move_type;	2069	MoveType move_type;
2050		2070
2051	if (exclude && exclude->head_ () != exclude)	2071	if (exclude && exclude->head_ () != exclude)
2052	{	2072	{
2053	exclude = exclude->head;	2073	exclude = exclude->head;
2054	move_type = exclude->move_type;	2074	move_type = exclude->move_type;
…		…
2057	{	2077	{
2058	/* If we don't have anything, presume it can use all movement types. */	2078	/* If we don't have anything, presume it can use all movement types. */
2059	move_type = MOVE_ALL;	2079	move_type = MOVE_ALL;
2060	}	2080	}
2061		2081
2062	for (i = 1; i < max; i++)	2082	for (int i = 1; i < max; i++)
2063	{	2083	{
2064	mp = m;	2084	mapxy pos (m, x, y);
2065	nx = x + freearr_x[i];	2085	pos.move (i);
2066	ny = y + freearr_y[i];
2067		2086
2068	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	if (!pos.normalise ())
2069
2070	if (mflags & P_OUT_OF_MAP)
2071	max = maxfree[i];	2088	max = maxfree[i];
2072	else	2089	else
2073	{	2090	{
2074	mapspace &ms = mp->at (nx, ny);	2091	mapspace &ms = *pos;
2075		2092
2076	blocked = ms.move_block;
2077
2078	if ((move_type & blocked) == move_type)	2093	if ((move_type & ms.move_block) == move_type)
2079	max = maxfree[i];	2094	max = maxfree [i];
2080	else if (mflags & P_IS_ALIVE)	2095	else if (ms.flags () & P_IS_ALIVE)
2081	{	2096	{
2082	for (tmp = ms.bot; tmp; tmp = tmp->above)	2097	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2083	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2098	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2084	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2099	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2085	break;
2086
2087	if (tmp)
2088	return freedir[i];	2100	return freedir [i];
2089	}	2101	}
2090	}	2102	}
2091	}	2103	}
2092		2104
2093	return 0;	2105	return 0;
…		…
2168	* This basically means that if direction is 15, then it could either go	2180	* This basically means that if direction is 15, then it could either go
2169	* direction 4, 14, or 16 to get back to where we are.	2181	* direction 4, 14, or 16 to get back to where we are.
2170	* Moved from spell_util.c to object.c with the other related direction	2182	* Moved from spell_util.c to object.c with the other related direction
2171	* functions.	2183	* functions.
2172	*/	2184	*/
2173	int reduction_dir[SIZEOFFREE][3] = {	2185	const int reduction_dir[SIZEOFFREE][3] = {
2174	{0, 0, 0}, /* 0 */	2186	{0, 0, 0}, /* 0 */
2175	{0, 0, 0}, /* 1 */	2187	{0, 0, 0}, /* 1 */
2176	{0, 0, 0}, /* 2 */	2188	{0, 0, 0}, /* 2 */
2177	{0, 0, 0}, /* 3 */	2189	{0, 0, 0}, /* 3 */
2178	{0, 0, 0}, /* 4 */	2190	{0, 0, 0}, /* 4 */
…		…
2274	int	2286	int
2275	can_pick (const object who, const object item)	2287	can_pick (const object who, const object item)
2276	{	2288	{
2277	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2289	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2278	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2290	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2279	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2291	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2280	}	2292	}
2281		2293
2282	/*	2294	/*
2283	* create clone from object to another	2295	* create clone from object to another
2284	*/	2296	*/
…		…
2316	return tmp;	2328	return tmp;
2317		2329
2318	return 0;	2330	return 0;
2319	}	2331	}
2320		2332
2321	const shstr &	2333	shstr_tmp
2322	object::kv_get (const shstr &key) const	2334	object::kv_get (shstr_tmp key) const
2323	{	2335	{
2324	for (key_value *kv = key_values; kv; kv = kv->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2325	if (kv->key == key)	2337	if (kv->key == key)
2326	return kv->value;	2338	return kv->value;
2327		2339
2328	return shstr_null;	2340	return shstr ();
2329	}	2341	}
2330		2342
2331	void	2343	void
2332	object::kv_set (const shstr &key, const shstr &value)	2344	object::kv_set (shstr_tmp key, shstr_tmp value)
2333	{	2345	{
2334	for (key_value *kv = key_values; kv; kv = kv->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2335	if (kv->key == key)	2347	if (kv->key == key)
2336	{	2348	{
2337	kv->value = value;	2349	kv->value = value;
…		…
2346		2358
2347	key_values = kv;	2359	key_values = kv;
2348	}	2360	}
2349		2361
2350	void	2362	void
2351	object::kv_del (const shstr &key)	2363	object::kv_del (shstr_tmp key)
2352	{	2364	{
2353	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2365	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2354	if ((*kvp)->key == key)	2366	if ((*kvp)->key == key)
2355	{	2367	{
2356	key_value kv = kvp;	2368	key_value kv = kvp;
…		…
2415	{	2427	{
2416	char flagdesc[512];	2428	char flagdesc[512];
2417	char info2[256 * 4];	2429	char info2[256 * 4];
2418	char *p = info;	2430	char *p = info;
2419		2431
2420	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2432	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2421	count,	2433	count,
2422	uuid.c_str (),	2434	uuid.c_str (),
2423	&name,	2435	&name,
2424	title ? "\",title:\"" : "",	2436	title ? ",title:\"" : "",
2425	title ? (const char *)title : "",	2437	title ? (const char *)title : "",
		2438	title ? "\"" : "",
2426	flag_desc (flagdesc, 512), type);	2439	flag_desc (flagdesc, 512), type);
2427		2440
2428	if (!flag[FLAG_REMOVED] && env)	2441	if (!flag[FLAG_REMOVED] && env)
2429	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2442	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2430		2443
…		…
2486	container = 0;	2499	container = 0;
2487		2500
2488	// client needs item update to make it work, client bug requires this to be separate	2501	// client needs item update to make it work, client bug requires this to be separate
2489	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
2490		2503
2491	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2504	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2492	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2493	}	2506	}
2494		2507
2495	if (new_container)	2508	if (new_container)
2496	{	2509	{
…		…
2506	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2519	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2507	new_container->insert (closer);	2520	new_container->insert (closer);
2508	}	2521	}
2509	#endif	2522	#endif
2510		2523
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2524	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2512		2525
2513	// make sure the container is available, client bug requires this to be separate	2526	// make sure the container is available, client bug requires this to be separate
2514	esrv_send_item (this, new_container);	2527	esrv_send_item (this, new_container);
2515		2528
2516	new_container->flag [FLAG_APPLIED] = true;	2529	new_container->flag [FLAG_APPLIED] = true;
…		…
2524	// else if (!old_container->env && contr && contr->ns)	2537	// else if (!old_container->env && contr && contr->ns)
2525	// contr->ns->floorbox_reset ();	2538	// contr->ns->floorbox_reset ();
2526	}	2539	}
2527		2540
2528	object *	2541	object *
2529	object::force_find (const shstr name)	2542	object::force_find (shstr_tmp name)
2530	{	2543	{
2531	/* cycle through his inventory to look for the MARK we want to	2544	/* cycle through his inventory to look for the MARK we want to
2532	* place	2545	* place
2533	*/	2546	*/
2534	for (object *tmp = inv; tmp; tmp = tmp->below)	2547	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2536	return splay (tmp);	2549	return splay (tmp);
2537		2550
2538	return 0;	2551	return 0;
2539	}	2552	}
2540		2553
2541	void	2554	object *
2542	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2543	{	2556	{
2544	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2545	force->destroy ();	2558	force->destroy ();
2546		2559
2547	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
…		…
2552		2565
2553	force->set_speed (duration ? 1.f / duration : 0.f);	2566	force->set_speed (duration ? 1.f / duration : 0.f);
2554	force->flag [FLAG_IS_USED_UP] = true;	2567	force->flag [FLAG_IS_USED_UP] = true;
2555	force->flag [FLAG_APPLIED] = true;	2568	force->flag [FLAG_APPLIED] = true;
2556		2569
2557	insert (force);	2570	return insert (force);
2558	}	2571	}
2559		2572
2560	void	2573	void
2561	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2562	{	2575	{
2563	if (!sound)	2576	if (!sound)
2564	return;	2577	return;
2565		2578
2566	if (flag [FLAG_REMOVED])	2579	if (is_on_map ())
		2580	map->play_sound (sound, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		2584
		2585	void
		2586	object::say_msg (const char *msg) const
		2587	{
		2588	if (is_on_map ())
		2589	map->say_msg (msg, x, y);
		2590	else if (object *pl = in_player ())
		2591	pl->contr->play_sound (sound);
		2592	}
		2593
		2594	void
		2595	object::make_noise ()
		2596	{
		2597	// we do not model noise in the map, so instead put
		2598	// a temporary light into the noise source
		2599	// could use the map instead, but that's less reliable for our
		2600	// goal, which is to make invisibility a bit harder to exploit
		2601
		2602	// currently only works sensibly for players
		2603	if (!is_player ())
2567	return;	2604	return;
2568		2605
2569	if (env)	2606	// find old force, or create new one
2570	{	2607	object *force = force_find (shstr_noise_force);
2571	if (object *pl = in_player ())	2608
2572	pl->contr->play_sound (sound);	2609	if (force)
2573	}	2610	force->speed_left = -1.f; // patch old speed up
2574	else	2611	else
2575	map->play_sound (sound, x, y);	2612	{
2576	}	2613	force = archetype::get (shstr_noise_force);
2577		2614
		2615	force->slaying = shstr_noise_force;
		2616	force->stats.food = 1;
		2617	force->speed_left = -1.f;
		2618
		2619	force->set_speed (1.f / 4.f);
		2620	force->flag [FLAG_IS_USED_UP] = true;
		2621	force->flag [FLAG_APPLIED] = true;
		2622
		2623	insert (force);
		2624	}
		2625	}
		2626

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC vs. Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC