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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.247 by root, Mon Jul 14 18:36:43 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
…		…
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	234	return 0;
237		235
238	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
242	.any ())	239	.any ())
243	return 0;	240	return 0;
244		241
245	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
327	{	324	{
328	// see if we are in a container of sorts	325	// see if we are in a container of sorts
329	if (env)	326	if (env)
330	{	327	{
331	// the player inventory itself is always visible	328	// the player inventory itself is always visible
332	if (env->type == PLAYER)	329	if (env->is_player ())
333	return env;	330	return env;
334		331
335	// else a player could have our env open	332	// else a player could have our env open
336	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
337		334
338	// 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
339	// even if our inv is in a player.	336	// even if our inv is in a player.
340	if (envest->is_on_map ())	337	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
345	else	342	else
346	{	343	{
347	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
350	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
351	return pl;	349	return pl;
352	}	350	}
353	}	351	}
354		352
355	return 0;	353	return 0;
…		…
639	}	637	}
640		638
641	if (speed < 0)	639	if (speed < 0)
642	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
643		641
644	dst->set_speed (dst->speed);	642	dst->activate ();
645	}	643	}
646		644
647	void	645	void
648	object::instantiate ()	646	object::instantiate ()
649	{	647	{
…		…
761	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
762	{	760	{
763	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
766	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
770	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
771	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
772	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
773	/* 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
774	* to have move_allow right now.	772	* have move_allow right now.
775	*/	773	*/
776	\|\| ((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
777	\|\| 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)
778	m.flags_ = 0;	776	m.invalidate ();
779	}	777	}
780	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
781	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
782	* that is being removed.	780	* that is being removed.
783	*/	781	*/
784	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
785	m.flags_ = 0;	783	m.invalidate ();
786	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
787	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
788	else	786	else
789	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
790		788
…		…
794		792
795	object::object ()	793	object::object ()
796	{	794	{
797	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
798		796
799	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
800	face = blank_face;	798	face = blank_face;
801	}	799	}
802		800
803	object::~object ()	801	object::~object ()
804	{	802	{
…		…
834	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
835	if (active)	833	if (active)
836	return;	834	return;
837		835
838	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
839	actives.insert (this);	841	actives.insert (this);
		842	}
840	}	843	}
841		844
842	void	845	void
843	object::activate_recursive ()	846	object::activate_recursive ()
844	{	847	{
…		…
909	\|\| map->in_memory != MAP_ACTIVE	912	\|\| map->in_memory != MAP_ACTIVE
910	\|\| map->no_drop	913	\|\| map->no_drop
911	\|\| ms ().move_block == MOVE_ALL)	914	\|\| ms ().move_block == MOVE_ALL)
912	{	915	{
913	while (inv)	916	while (inv)
914	{
915	inv->destroy_inv (false);
916	inv->destroy ();	917	inv->destroy ();
917	}
918	}	918	}
919	else	919	else
920	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
921	while (inv)	921	while (inv)
922	{	922	{
…		…
926	\|\| op->flag [FLAG_NO_DROP]	926	\|\| op->flag [FLAG_NO_DROP]
927	\|\| op->type == RUNE	927	\|\| op->type == RUNE
928	\|\| op->type == TRAP	928	\|\| op->type == TRAP
929	\|\| op->flag [FLAG_IS_A_TEMPLATE]	929	\|\| op->flag [FLAG_IS_A_TEMPLATE]
930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
931	op->destroy (true);	931	op->destroy ();
932	else	932	else
933	map->insert (op, x, y);	933	map->insert (op, x, y);
934	}	934	}
935	}	935	}
936	}	936	}
…		…
965		965
966	void	966	void
967	object::do_destroy ()	967	object::do_destroy ()
968	{	968	{
969	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
970	remove_button_link (this);	970	remove_link ();
971		971
972	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
973	remove_friendly_object (this);	973	remove_friendly_object (this);
974		974
975	remove ();	975	remove ();
…		…
1000	attacked_by = 0;	1000	attacked_by = 0;
1001	current_weapon = 0;	1001	current_weapon = 0;
1002	}	1002	}
1003		1003
1004	void	1004	void
1005	object::destroy (bool destroy_inventory)	1005	object::destroy ()
1006	{	1006	{
1007	if (destroyed ())	1007	if (destroyed ())
1008	return;	1008	return;
1009		1009
1010	if (!is_head () && !head->destroyed ())	1010	if (!is_head () && !head->destroyed ())
1011	{	1011	{
1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1013	head->destroy (destroy_inventory);	1013	head->destroy ();
1014	return;	1014	return;
1015	}	1015	}
1016		1016
1017	destroy_inv (!destroy_inventory);	1017	destroy_inv (false);
1018		1018
1019	if (is_head ())	1019	if (is_head ())
1020	if (sound_destroy)	1020	if (sound_destroy)
1021	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
1022	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1058	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1059	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1060	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
1061		1061
1062	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
		1063
		1064	object *pl = in_player ();
1063		1065
1064	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1065	* 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
1066	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1067	*/	1069	*/
…		…
1079		1081
1080	/* 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
1081	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.	1084	* to save cpu time.
1083	*/	1085	*/
1084	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	{
1085	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	}
1086	}	1094	}
1087	else if (map)	1095	else if (map)
1088	{	1096	{
1089	map->dirty = true;	1097	map->dirty = true;
1090	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1091		1099
1092	if (object *pl = ms.player ())	1100	if (object *pl = ms.player ())
1093	{	1101	{
1094	if (type == PLAYER) // this == pl(!)	1102	if (is_player ())
1095	{	1103	{
		1104	if (!flag [FLAG_WIZPASS])
		1105	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1106
1096	// leaving a spot always closes any open container on the ground	1107	// leaving a spot always closes any open container on the ground
1097	if (container && !container->env)	1108	if (container && !container->env)
1098	// this causes spurious floorbox updates, but it ensures	1109	// this causes spurious floorbox updates, but it ensures
1099	// that the CLOSE event is being sent.	1110	// that the CLOSE event is being sent.
1100	close_container ();	1111	close_container ();
…		…
1117	*(below ? &below->above : &ms.bot) = above;	1128	*(below ? &below->above : &ms.bot) = above;
1118		1129
1119	above = 0;	1130	above = 0;
1120	below = 0;	1131	below = 0;
1121		1132
		1133	ms.invalidate ();
		1134
1122	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1123	return;	1136	return;
1124		1137
1125	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
1126		1139
…		…
1158	}	1171	}
1159		1172
1160	last = tmp;	1173	last = tmp;
1161	}	1174	}
1162		1175
1163	/* last == NULL if there are no objects on this space */	1176	if (affects_los ())
1164	//TODO: this makes little sense, why only update the topmost object?
1165	if (!last)
1166	map->at (x, y).flags_ = 0;
1167	else
1168	update_object (last, UP_OBJ_REMOVE);
1169
1170	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1171	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1172	}	1178	}
1173	}	1179	}
1174		1180
1175	/*	1181	/*
…		…
1199	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1200		1206
1201	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1202	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1203		1209
1204	op->destroy (1);	1210	op->destroy ();
1205		1211
1206	return top;	1212	return top;
1207	}	1213	}
1208		1214
1209	return 0;	1215	return 0;
…		…
1271	* just 'op' otherwise	1277	* just 'op' otherwise
1272	*/	1278	*/
1273	object *	1279	object *
1274	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)
1275	{	1281	{
1276	if (op->is_on_map ())
1277	{
1278	LOG (llevError, "insert_ob_in_map called for object already on map");
1279	abort ();
1280	}
1281
1282	if (op->env)
1283	{
1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1285	op->remove ();	1282	op->remove ();
1286	}
1287		1283
1288	if (op->face && !face_info (op->face))//D TODO: remove soon	1284	if (m == &freed_map)//D TODO: remove soon
1289	{//D	1285	{//D
1290	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1286	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1291	op->face = 1;//D
1292	}//D	1287	}//D
1293		1288
1294	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1295	* 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
1296	* need extra work	1291	* need extra work
1297	*/	1292	*/
		1293	maptile *newmap = m;
1298	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1299	{	1295	{
1300	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301	return 0;	1297	return 0;
1302	}	1298	}
1303		1299
1304	if (object *more = op->more)	1300	if (object *more = op->more)
1305	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1306	return 0;	1302	return 0;
1307		1303
1308	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1309		1305	op->env = 0;
1310	op->map = m;	1306	op->map = newmap;
		1307
1311	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1312		1309
1313	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1314	*/	1311	*/
1315	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1318	{	1315	{
1319	// TODO: we actually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1320	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1321	// from here :/	1318	// from here :/
1322	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1323	tmp->destroy (1);	1320	tmp->destroy ();
1324	}	1321	}
1325		1322
1326	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 */
1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1328		1325
…		…
1336	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");
1337	abort ();	1334	abort ();
1338	}	1335	}
1339		1336
1340	if (!originator->is_on_map ())	1337	if (!originator->is_on_map ())
		1338	{
1341	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",
1342	op->debug_desc (), originator->debug_desc ());	1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
1343		1343
1344	op->above = originator;	1344	op->above = originator;
1345	op->below = originator->below;	1345	op->below = originator->below;
1346	originator->below = op;	1346	originator->below = op;
1347		1347
…		…
1433	op->below = top;	1433	op->below = top;
1434	*(op->above ? &op->above->below : &ms.top) = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1435	}
1436	}	1436	}
1437		1437
1438	if (op->type == PLAYER)	1438	if (op->is_player ())
1439	{	1439	{
1440	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1441	++op->map->players;	1441	++op->map->players;
1442	op->map->touch ();	1442	op->map->touch ();
1443	}	1443	}
…		…
1458	* 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 -
1459	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1460	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1461	* of effect may be sufficient.	1461	* of effect may be sufficient.
1462	*/	1462	*/
1463	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1464	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1465		1468
1466	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1467	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1468		1471
1469	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1497	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1498	* 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.
1499	* 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.
1500	*/	1503	*/
1501	void	1504	void
1502	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1503	{	1506	{
1504	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1505		1508
1506	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1507	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1508	tmp->destroy (1);	1511	tmp->destroy ();
1509		1512
1510	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1511		1514
1512	tmp->x = op->x;	1515	tmp->x = op->x;
1513	tmp->y = op->y;	1516	tmp->y = op->y;
1514		1517
1515	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1537	if (!nr)	1540	if (!nr)
1538	return true;	1541	return true;
1539		1542
1540	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1541		1544
		1545	if (nrof > nr)
		1546	{
1542	nrof -= nr;	1547	nrof -= nr;
1543
1544	if (nrof)
1545	{
1546	adjust_weight (env, -weight * max (1, nr)); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1547		1549
1548	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1549	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1550		1552
1551	return true;	1553	return true;
1552	}	1554	}
1553	else	1555	else
1554	{	1556	{
1555	destroy (1);	1557	destroy ();
1556	return false;	1558	return false;
1557	}	1559	}
1558	}	1560	}
1559		1561
1560	/*	1562	/*
…		…
1637	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1638	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1639		1641
1640	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1641		1643
1642	op->destroy (1);	1644	op->destroy ();
1643	op = tmp;	1645	op = tmp;
1644	goto inserted;	1646	goto inserted;
1645	}	1647	}
1646		1648
1647	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1665		1667
1666	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1667		1669
1668	inserted:	1670	inserted:
1669	/* 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 */
1670	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1671	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1672		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1673	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1674	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675	update_stats ();	1679	update_stats ();
1676		1680
1677	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1678		1682
1679	return op;	1683	return op;
…		…
1763	{	1767	{
1764		1768
1765	float	1769	float
1766	diff = tmp->move_slow_penalty * fabs (op->speed);	1770	diff = tmp->move_slow_penalty * fabs (op->speed);
1767		1771
1768	if (op->type == PLAYER)	1772	if (op->is_player ())
1769	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)) \|\|
1770	(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)))
1771	diff /= 4.0;	1775	diff /= 4.0;
1772		1776
1773	op->speed_left -= diff;	1777	op->speed_left -= diff;
…		…
1981	* head of the object should correspond for the entire object.	1985	* head of the object should correspond for the entire object.
1982	*/	1986	*/
1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984	continue;	1988	continue;
1985		1989
1986	if (ob->blocked (m, pos.x, pos.y))	1990	if (ob->blocked (pos.m, pos.x, pos.y))
1987	continue;	1991	continue;
1988		1992
1989	altern [index++] = i;	1993	altern [index++] = i;
1990	}	1994	}
1991		1995
…		…
2059	* there is capable of.	2063	* there is capable of.
2060	*/	2064	*/
2061	int	2065	int
2062	find_dir (maptile m, int x, int y, object exclude)	2066	find_dir (maptile m, int x, int y, object exclude)
2063	{	2067	{
2064	int i, max = SIZEOFFREE, mflags;	2068	int max = SIZEOFFREE, mflags;
2065
2066	sint16 nx, ny;
2067	object *tmp;
2068	maptile *mp;
2069
2070	MoveType blocked, move_type;	2069	MoveType move_type;
2071		2070
2072	if (exclude && exclude->head_ () != exclude)	2071	if (exclude && exclude->head_ () != exclude)
2073	{	2072	{
2074	exclude = exclude->head;	2073	exclude = exclude->head;
2075	move_type = exclude->move_type;	2074	move_type = exclude->move_type;
…		…
2078	{	2077	{
2079	/* 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. */
2080	move_type = MOVE_ALL;	2079	move_type = MOVE_ALL;
2081	}	2080	}
2082		2081
2083	for (i = 1; i < max; i++)	2082	for (int i = 1; i < max; i++)
2084	{	2083	{
2085	mp = m;	2084	mapxy pos (m, x, y);
2086	nx = x + freearr_x[i];	2085	pos.move (i);
2087	ny = y + freearr_y[i];
2088		2086
2089	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	if (!pos.normalise ())
2090
2091	if (mflags & P_OUT_OF_MAP)
2092	max = maxfree[i];	2088	max = maxfree[i];
2093	else	2089	else
2094	{	2090	{
2095	mapspace &ms = mp->at (nx, ny);	2091	mapspace &ms = *pos;
2096		2092
2097	blocked = ms.move_block;
2098
2099	if ((move_type & blocked) == move_type)	2093	if ((move_type & ms.move_block) == move_type)
2100	max = maxfree[i];	2094	max = maxfree [i];
2101	else if (mflags & P_IS_ALIVE)	2095	else if (ms.flags () & P_IS_ALIVE)
2102	{	2096	{
2103	for (tmp = ms.bot; tmp; tmp = tmp->above)	2097	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2104	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2098	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2105	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2099	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2106	break;
2107
2108	if (tmp)
2109	return freedir[i];	2100	return freedir [i];
2110	}	2101	}
2111	}	2102	}
2112	}	2103	}
2113		2104
2114	return 0;	2105	return 0;
…		…
2189	* 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
2190	* 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.
2191	* 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
2192	* functions.	2183	* functions.
2193	*/	2184	*/
2194	int reduction_dir[SIZEOFFREE][3] = {	2185	const int reduction_dir[SIZEOFFREE][3] = {
2195	{0, 0, 0}, /* 0 */	2186	{0, 0, 0}, /* 0 */
2196	{0, 0, 0}, /* 1 */	2187	{0, 0, 0}, /* 1 */
2197	{0, 0, 0}, /* 2 */	2188	{0, 0, 0}, /* 2 */
2198	{0, 0, 0}, /* 3 */	2189	{0, 0, 0}, /* 3 */
2199	{0, 0, 0}, /* 4 */	2190	{0, 0, 0}, /* 4 */
…		…
2295	int	2286	int
2296	can_pick (const object who, const object item)	2287	can_pick (const object who, const object item)
2297	{	2288	{
2298	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2289	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2299	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2290	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2300	!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));
2301	}	2292	}
2302		2293
2303	/*	2294	/*
2304	* create clone from object to another	2295	* create clone from object to another
2305	*/	2296	*/
…		…
2337	return tmp;	2328	return tmp;
2338		2329
2339	return 0;	2330	return 0;
2340	}	2331	}
2341		2332
2342	const shstr &	2333	shstr_tmp
2343	object::kv_get (const shstr &key) const	2334	object::kv_get (shstr_tmp key) const
2344	{	2335	{
2345	for (key_value *kv = key_values; kv; kv = kv->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2346	if (kv->key == key)	2337	if (kv->key == key)
2347	return kv->value;	2338	return kv->value;
2348		2339
2349	return shstr_null;	2340	return shstr ();
2350	}	2341	}
2351		2342
2352	void	2343	void
2353	object::kv_set (const shstr &key, const shstr &value)	2344	object::kv_set (shstr_tmp key, shstr_tmp value)
2354	{	2345	{
2355	for (key_value *kv = key_values; kv; kv = kv->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2356	if (kv->key == key)	2347	if (kv->key == key)
2357	{	2348	{
2358	kv->value = value;	2349	kv->value = value;
…		…
2367		2358
2368	key_values = kv;	2359	key_values = kv;
2369	}	2360	}
2370		2361
2371	void	2362	void
2372	object::kv_del (const shstr &key)	2363	object::kv_del (shstr_tmp key)
2373	{	2364	{
2374	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2365	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2375	if ((*kvp)->key == key)	2366	if ((*kvp)->key == key)
2376	{	2367	{
2377	key_value kv = kvp;	2368	key_value kv = kvp;
…		…
2508	container = 0;	2499	container = 0;
2509		2500
2510	// 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
2511	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
2512		2503
2513	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 ());
2514	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2515	}	2506	}
2516		2507
2517	if (new_container)	2508	if (new_container)
2518	{	2509	{
…		…
2528	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2519	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2529	new_container->insert (closer);	2520	new_container->insert (closer);
2530	}	2521	}
2531	#endif	2522	#endif
2532		2523
2533	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 ());
2534		2525
2535	// 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
2536	esrv_send_item (this, new_container);	2527	esrv_send_item (this, new_container);
2537		2528
2538	new_container->flag [FLAG_APPLIED] = true;	2529	new_container->flag [FLAG_APPLIED] = true;
…		…
2546	// else if (!old_container->env && contr && contr->ns)	2537	// else if (!old_container->env && contr && contr->ns)
2547	// contr->ns->floorbox_reset ();	2538	// contr->ns->floorbox_reset ();
2548	}	2539	}
2549		2540
2550	object *	2541	object *
2551	object::force_find (const shstr name)	2542	object::force_find (shstr_tmp name)
2552	{	2543	{
2553	/* 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
2554	* place	2545	* place
2555	*/	2546	*/
2556	for (object *tmp = inv; tmp; tmp = tmp->below)	2547	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2558	return splay (tmp);	2549	return splay (tmp);
2559		2550
2560	return 0;	2551	return 0;
2561	}	2552	}
2562		2553
2563	void	2554	object *
2564	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2565	{	2556	{
2566	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2567	force->destroy ();	2558	force->destroy ();
2568		2559
2569	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
…		…
2574		2565
2575	force->set_speed (duration ? 1.f / duration : 0.f);	2566	force->set_speed (duration ? 1.f / duration : 0.f);
2576	force->flag [FLAG_IS_USED_UP] = true;	2567	force->flag [FLAG_IS_USED_UP] = true;
2577	force->flag [FLAG_APPLIED] = true;	2568	force->flag [FLAG_APPLIED] = true;
2578		2569
2579	insert (force);	2570	return insert (force);
2580	}	2571	}
2581		2572
2582	void	2573	void
2583	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2584	{	2575	{
2585	if (!sound)	2576	if (!sound)
2586	return;	2577	return;
2587		2578
2588	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 ())
2589	return;	2604	return;
2590		2605
2591	if (env)	2606	// find old force, or create new one
2592	{	2607	object *force = force_find (shstr_noise_force);
2593	if (object *pl = in_player ())	2608
2594	pl->contr->play_sound (sound);	2609	if (force)
2595	}	2610	force->speed_left = -1.f; // patch old speed up
2596	else	2611	else
2597	map->play_sound (sound, x, y);	2612	{
2598	}	2613	force = archetype::get (shstr_noise_force);
2599		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.247 by root, Mon Jul 14 18:36:43 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.247 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC