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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.213 by root, Tue Apr 22 01:18:10 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

…		…
139		139
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	141	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
143	{	143	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
149	*/	147	*/
150		148
151	/* For each field in wants, */	149	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	151	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	152	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	159	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
330		316
331	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
332	return 1;	318	return 1;
333	}	319	}
334		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container \|\| this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
335	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
336	static sint32	358	static sint32
337	weight_adjust (object *op, sint32 weight)	359	weight_adjust (object *op, sint32 weight)
338	{	360	{
339	return op->type == CONTAINER	361	return op->type == CONTAINER
…		…
356	return;	378	return;
357		379
358	op->carrying += weight;	380	op->carrying += weight;
359		381
360	if (object *pl = op->visible_to ())	382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
361	esrv_update_item (UPD_WEIGHT, pl, op);	384	esrv_update_item (UPD_WEIGHT, pl, op);
362		385
363	op = op->env;	386	op = op->env;
364	}	387	}
365	}	388	}
366		389
…		…
387	if (sum != carrying)	410	if (sum != carrying)
388	{	411	{
389	carrying = sum;	412	carrying = sum;
390		413
391	if (object *pl = visible_to ())	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
392	esrv_update_item (UPD_WEIGHT, pl, this);	416	esrv_update_item (UPD_WEIGHT, pl, this);
393	}	417	}
394	}	418	}
395		419
396	/*	420	/*
397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
565	}	589	}
566		590
567	op->key_values = 0;	591	op->key_values = 0;
568	}	592	}
569		593
570	object &	594	/*
571	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
572	{	604	{
573	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
574	bool is_removed = flag [FLAG_REMOVED];
575
576	(object_copy )this = src;	606	(object_copy )dst = *this;
577
578	flag [FLAG_FREED] = is_freed;
579	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
580		608
581	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
582	if (src.key_values)	610	if (key_values)
583	{	611	{
584	key_value *tail = 0;	612	key_value *tail = 0;
585	key_values = 0;	613	dst->key_values = 0;
586		614
587	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
588	{	616	{
589	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
590		618
591	new_link->next = 0;	619	new_link->next = 0;
592	new_link->key = i->key;	620	new_link->key = i->key;
593	new_link->value = i->value;	621	new_link->value = i->value;
594		622
595	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
596	if (!key_values)	624	if (!dst->key_values)
597	{	625	{
598	key_values = new_link;	626	dst->key_values = new_link;
599	tail = new_link;	627	tail = new_link;
600	}	628	}
601	else	629	else
602	{	630	{
603	tail->next = new_link;	631	tail->next = new_link;
604	tail = new_link;	632	tail = new_link;
605	}	633	}
606	}	634	}
607	}	635	}
608	}
609
610	/*
611	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
615	* if the first object is freed, the pointers in the new object
616	* will point at garbage.
617	*/
618	void
619	object::copy_to (object *dst)
620	{
621	dst = this;
622		636
623	if (speed < 0)	637	if (speed < 0)
624	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
625		639
626	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
648	object *	662	object *
649	object::clone ()	663	object::clone ()
650	{	664	{
651	object *neu = create ();	665	object *neu = create ();
652	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
653	return neu;	668	return neu;
654	}	669	}
655		670
656	/*	671	/*
657	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
708	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
709	*/	724	*/
710	void	725	void
711	update_object (object *op, int action)	726	update_object (object *op, int action)
712	{	727	{
713	if (op == NULL)	728	if (!op)
714	{	729	{
715	/* this should never happen */	730	/* this should never happen */
716	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
717	return;	732	return;
718	}	733	}
719		734
720	if (op->env)	735	if (!op->is_on_map ())
721	{	736	{
722	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
723	* to do in this case.	738	* to do in this case.
724	*/	739	*/
725	return;	740	return;
726	}	741	}
727
728	/* If the map is saving, don't do anything as everything is
729	* going to get freed anyways.
730	*/
731	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
732	return;
733		742
734	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
735	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	744	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
736	{	745	{
737	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
880	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
881	{	890	{
882	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
883	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
884	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
885	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
886	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
887	if (!inv)	896	if (!inv)
888	return;	897	return;
889		898
890	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
…		…
897	\|\| map->nodrop	906	\|\| map->nodrop
898	\|\| ms ().move_block == MOVE_ALL)	907	\|\| ms ().move_block == MOVE_ALL)
899	{	908	{
900	while (inv)	909	while (inv)
901	{	910	{
902	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
903	inv->destroy ();	912	inv->destroy ();
904	}	913	}
905	}	914	}
906	else	915	else
907	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
913	\|\| op->flag [FLAG_NO_DROP]	922	\|\| op->flag [FLAG_NO_DROP]
914	\|\| op->type == RUNE	923	\|\| op->type == RUNE
915	\|\| op->type == TRAP	924	\|\| op->type == TRAP
916	\|\| op->flag [FLAG_IS_A_TEMPLATE]	925	\|\| op->flag [FLAG_IS_A_TEMPLATE]
917	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	926	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
918	op->destroy ();	927	op->destroy (true);
919	else	928	else
920	map->insert (op, x, y);	929	map->insert (op, x, y);
921	}	930	}
922	}	931	}
923	}	932	}
…		…
927	object *op = new object;	936	object *op = new object;
928	op->link ();	937	op->link ();
929	return op;	938	return op;
930	}	939	}
931		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954	} freed_map; // freed objects are moved here to avoid crashes
		955
932	void	956	void
933	object::do_destroy ()	957	object::do_destroy ()
934	{	958	{
935	if (flag [FLAG_IS_LINKED])	959	if (flag [FLAG_IS_LINKED])
936	remove_button_link (this);	960	remove_button_link (this);
…		…
940		964
941	remove ();	965	remove ();
942		966
943	attachable::do_destroy ();	967	attachable::do_destroy ();
944		968
945	destroy_inv (true);
946
947	deactivate ();	969	deactivate ();
948	unlink ();	970	unlink ();
949		971
950	flag [FLAG_FREED] = 1;	972	flag [FLAG_FREED] = 1;
951		973
952	// hack to ensure that freed objects still have a valid map	974	// hack to ensure that freed objects still have a valid map
953	{
954	static maptile *freed_map; // freed objects are moved here to avoid crashes
955
956	if (!freed_map)
957	{
958	freed_map = new maptile;
959
960	freed_map->path = "<freed objects map>";
961	freed_map->name = "/internal/freed_objects_map";
962	freed_map->width = 3;
963	freed_map->height = 3;
964	freed_map->nodrop = 1;
965
966	freed_map->alloc ();
967	freed_map->in_memory = MAP_ACTIVE;
968	}
969
970	map = freed_map;	975	map = &freed_map;
971	x = 1;	976	x = 1;
972	y = 1;	977	y = 1;
973	}
974		978
975	if (more)	979	if (more)
976	{	980	{
977	more->destroy ();	981	more->destroy ();
978	more = 0;	982	more = 0;
…		…
991	object::destroy (bool destroy_inventory)	995	object::destroy (bool destroy_inventory)
992	{	996	{
993	if (destroyed ())	997	if (destroyed ())
994	return;	998	return;
995		999
		1000	if (!is_head () && !head->destroyed ())
		1001	{
		1002	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1003	head->destroy (destroy_inventory);
		1004	return;
		1005	}
		1006
996	if (destroy_inventory)	1007	destroy_inv (!destroy_inventory);
997	destroy_inv (false);
998		1008
999	if (is_head ())	1009	if (is_head ())
1000	if (sound_destroy)	1010	if (sound_destroy)
1001	play_sound (sound_destroy);	1011	play_sound (sound_destroy);
1002	else if (flag [FLAG_MONSTER])	1012	else if (flag [FLAG_MONSTER])
…		…
1021	if (flag [FLAG_REMOVED])	1031	if (flag [FLAG_REMOVED])
1022	return;	1032	return;
1023		1033
1024	INVOKE_OBJECT (REMOVE, this);	1034	INVOKE_OBJECT (REMOVE, this);
1025		1035
1026	if (object *pl = visible_to ())
1027	esrv_del_item (pl->contr, count);
1028
1029	flag [FLAG_REMOVED] = true;	1036	flag [FLAG_REMOVED] = true;
1030		1037
1031	if (more)	1038	if (more)
1032	more->remove ();	1039	more->remove ();
1033		1040
…		…
1035	* In this case, the object to be removed is in someones	1042	* In this case, the object to be removed is in someones
1036	* inventory.	1043	* inventory.
1037	*/	1044	*/
1038	if (env)	1045	if (env)
1039	{	1046	{
		1047	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1048	if (object *pl = visible_to ())
		1049	esrv_del_item (pl->contr, count);
		1050	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1051
1040	adjust_weight (env, -total_weight ());	1052	adjust_weight (env, -total_weight ());
1041		1053
1042	*(above ? &above->below : &env->inv) = below;	1054	*(above ? &above->below : &env->inv) = below;
1043		1055
1044	if (below)	1056	if (below)
…		…
1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1074	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	otmp->update_stats ();	1075	otmp->update_stats ();
1064	}	1076	}
1065	else if (map)	1077	else if (map)
1066	{	1078	{
1067	if (type == PLAYER)
1068	{
1069	// leaving a spot always closes any open container on the ground
1070	if (container && !container->env)
1071	// this causes spurious floorbox updates, but it ensures
1072	// that the CLOSE event is being sent.
1073	close_container ();
1074
1075	--map->players;
1076	map->touch ();
1077	}
1078
1079	map->dirty = true;	1079	map->dirty = true;
1080	mapspace &ms = this->ms ();	1080	mapspace &ms = this->ms ();
		1081
		1082	if (object *pl = ms.player ())
		1083	{
		1084	if (type == PLAYER) // this == pl(!)
		1085	{
		1086	// leaving a spot always closes any open container on the ground
		1087	if (container && !container->env)
		1088	// this causes spurious floorbox updates, but it ensures
		1089	// that the CLOSE event is being sent.
		1090	close_container ();
		1091
		1092	--map->players;
		1093	map->touch ();
		1094	}
		1095	else if (pl->container == this)
		1096	{
		1097	// removing a container should close it
		1098	close_container ();
		1099	}
		1100
		1101	esrv_del_item (pl->contr, count);
		1102	}
1081		1103
1082	/* link the object above us */	1104	/* link the object above us */
1083	if (above)	1105	if (above)
1084	above->below = below;	1106	above->below = below;
1085	else	1107	else
…		…
1115	* removed (most likely destroyed), update the player view	1137	* removed (most likely destroyed), update the player view
1116	* appropriately.	1138	* appropriately.
1117	*/	1139	*/
1118	pl->close_container ();	1140	pl->close_container ();
1119		1141
		1142	//TODO: the floorbox prev/next might need updating
		1143	//esrv_del_item (pl->contr, count);
		1144	//TODO: update floorbox to preserve ordering
		1145	if (pl->contr->ns)
1120	pl->contr->ns->floorbox_update ();	1146	pl->contr->ns->floorbox_update ();
1121	}	1147	}
1122		1148
1123	for (tmp = ms.bot; tmp; tmp = tmp->above)	1149	for (tmp = ms.bot; tmp; tmp = tmp->above)
1124	{	1150	{
1125	/* No point updating the players look faces if he is the object	1151	/* No point updating the players look faces if he is the object
…		…
1169	if (!top)	1195	if (!top)
1170	for (top = op; top && top->above; top = top->above)	1196	for (top = op; top && top->above; top = top->above)
1171	;	1197	;
1172		1198
1173	for (; top; top = top->below)	1199	for (; top; top = top->below)
1174	{
1175	if (top == op)
1176	continue;
1177
1178	if (object::can_merge (op, top))	1200	if (object::can_merge (op, top))
1179	{	1201	{
1180	top->nrof += op->nrof;	1202	top->nrof += op->nrof;
1181		1203
1182	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1204	if (object *pl = top->visible_to ())
1183	op->weight = 0; /* Don't want any adjustements now */	1205	esrv_update_item (UPD_NROF, pl, top);
		1206
		1207	op->weight = 0; // cancel the addition above
		1208	op->carrying = 0; // must be 0 already
		1209
1184	op->destroy ();	1210	op->destroy (1);
		1211
1185	return top;	1212	return top;
1186	}	1213	}
1187	}
1188		1214
1189	return 0;	1215	return 0;
1190	}	1216	}
1191		1217
1192	void	1218	void
…		…
1251	object *	1277	object *
1252	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1253	{	1279	{
1254	assert (!op->flag [FLAG_FREED]);	1280	assert (!op->flag [FLAG_FREED]);
1255		1281
1256	object top, floor = NULL;
1257
1258	op->remove ();	1282	op->remove ();
1259		1283
1260	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* Ideally, the caller figures this out. However, it complicates a lot
1261	* of areas of callers (eg, anything that uses find_free_spot would now	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1262	* need extra work	1286	* need extra work
1263	*/	1287	*/
1264	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1265	{	1289	{
1266	op->destroy ();	1290	op->destroy (1);
1267	return 0;	1291	return 0;
1268	}	1292	}
1269		1293
1270	if (object *more = op->more)	1294	if (object *more = op->more)
1271	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1280	*/	1304	*/
1281	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1284	{	1308	{
		1309	// TODO: we atcually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1285	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1286	tmp->destroy (1);	1313	tmp->destroy (1);
1287	}	1314	}
1288		1315
1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1311	/* since below originator, no need to update top */	1338	/* since below originator, no need to update top */
1312	originator->below = op;	1339	originator->below = op;
1313	}	1340	}
1314	else	1341	else
1315	{	1342	{
		1343	object top, floor = NULL;
		1344
1316	top = ms.bot;	1345	top = ms.bot;
1317		1346
1318	/* If there are other objects, then */	1347	/* If there are other objects, then */
1319	if (top)	1348	if (top)
1320	{	1349	{
…		…
1419	}	1448	}
1420		1449
1421	op->map->dirty = true;	1450	op->map->dirty = true;
1422		1451
1423	if (object *pl = ms.player ())	1452	if (object *pl = ms.player ())
		1453	//TODO: the floorbox prev/next might need updating
		1454	//esrv_send_item (pl, op);
		1455	//TODO: update floorbox to preserve ordering
		1456	if (pl->contr->ns)
1424	pl->contr->ns->floorbox_update ();	1457	pl->contr->ns->floorbox_update ();
1425		1458
1426	/* If this object glows, it may affect lighting conditions that are	1459	/* If this object glows, it may affect lighting conditions that are
1427	* visible to others on this map. But update_all_los is really	1460	* visible to others on this map. But update_all_los is really
1428	* an inefficient way to do this, as it means los for all players	1461	* an inefficient way to do this, as it means los for all players
1429	* on the map will get recalculated. The players could very well	1462	* on the map will get recalculated. The players could very well
…		…
1494	return where->env->insert (this);	1527	return where->env->insert (this);
1495	else	1528	else
1496	return where->map->insert (this, where->x, where->y, originator, flags);	1529	return where->map->insert (this, where->x, where->y, originator, flags);
1497	}	1530	}
1498		1531
1499	// find player who can see this object
1500	object *
1501	object::visible_to () const
1502	{
1503	if (!flag [FLAG_REMOVED])
1504	{
1505	// see if we are in a container of sorts
1506	if (env)
1507	{
1508	// the player inventory itself is always visible
1509	if (env->type == PLAYER)
1510	return env;
1511
1512	// else a player could have our env open
1513	object *envest = env->outer_env ();
1514
1515	// the player itself is always on a map, so we will find him here
1516	// even if our inv is in a player.
1517	if (envest->is_on_map ())
1518	if (object *pl = envest->ms ().player ())
1519	if (pl->container == env)
1520	return pl;
1521	}
1522	else
1523	{
1524	// maybe there is a player standing on the same mapspace
1525	// this will catch the case where "this" is a player
1526	if (object *pl = ms ().player ())
1527	return pl;
1528	}
1529	}
1530
1531	return 0;
1532	}
1533
1534	/*	1532	/*
1535	* decrease(object, number) decreases a specified number from	1533	* decrease(object, number) decreases a specified number from
1536	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
1537	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1538	*	1536	*
…		…
1638	if (object::can_merge (tmp, op))	1636	if (object::can_merge (tmp, op))
1639	{	1637	{
1640	/* return the original object and remove inserted object	1638	/* return the original object and remove inserted object
1641	(client needs the original object) */	1639	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1640	tmp->nrof += op->nrof;
		1641
		1642	if (object *pl = tmp->visible_to ())
		1643	esrv_update_item (UPD_NROF, pl, tmp);
		1644
1643	adjust_weight (this, op->total_weight ());	1645	adjust_weight (this, op->total_weight ());
1644		1646
1645	op->destroy (1);	1647	op->destroy (1);
1646	op = tmp;	1648	op = tmp;
1647	goto inserted;	1649	goto inserted;
…		…
1661		1663
1662	inv = op;	1664	inv = op;
1663		1665
1664	op->flag [FLAG_REMOVED] = 0;	1666	op->flag [FLAG_REMOVED] = 0;
1665		1667
		1668	if (object *pl = op->visible_to ())
		1669	esrv_send_item (pl, op);
		1670
1666	adjust_weight (this, op->total_weight ());	1671	adjust_weight (this, op->total_weight ());
1667		1672
1668	inserted:	1673	inserted:
1669	/* reset the light list and los of the players on the map */	1674	/* reset the light list and los of the players on the map */
1670	if (op->glow_radius && map && map->darkness)	1675	if (op->glow_radius && map && map->darkness)
1671	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1672		1677
1673	if (object *otmp = in_player ())	1678	// if this is a player's inventory, update stats
1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675	otmp->update_stats ();	1680	update_stats ();
1676		1681
1677	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1678		1683
1679	return op;	1684	return op;
1680	}	1685	}
…		…
2304	* create clone from object to another	2309	* create clone from object to another
2305	*/	2310	*/
2306	object *	2311	object *
2307	object_create_clone (object *asrc)	2312	object_create_clone (object *asrc)
2308	{	2313	{
2309	object dst = 0, tmp, src, prev, *item;	2314	object *dst = 0;
2310		2315
2311	if (!asrc)	2316	if (!asrc)
2312	return 0;	2317	return 0;
2313		2318
2314	src = asrc->head_ ();	2319	object *src = asrc->head_ ();
2315		2320
2316	prev = 0;	2321	object *prev = 0;
2317	for (object *part = src; part; part = part->more)	2322	for (object *part = src; part; part = part->more)
2318	{	2323	{
2319	tmp = part->clone ();	2324	object *tmp = part->clone ();
		2325
2320	tmp->x -= src->x;	2326	tmp->x -= src->x;
2321	tmp->y -= src->y;	2327	tmp->y -= src->y;
2322		2328
2323	if (!part->head)	2329	if (!part->head)
2324	{	2330	{
…		…
2334	prev->more = tmp;	2340	prev->more = tmp;
2335		2341
2336	prev = tmp;	2342	prev = tmp;
2337	}	2343	}
2338		2344
2339	for (item = src->inv; item; item = item->below)	2345	for (object *item = src->inv; item; item = item->below)
2340	insert_ob_in_ob (object_create_clone (item), dst);	2346	insert_ob_in_ob (object_create_clone (item), dst);
2341		2347
2342	return dst;	2348	return dst;
2343	}	2349	}
2344		2350
…		…
2354	return tmp;	2360	return tmp;
2355		2361
2356	return 0;	2362	return 0;
2357	}	2363	}
2358		2364
2359	/* If ob has a field named key, return the link from the list,	2365	const shstr &
2360	* otherwise return NULL.	2366	object::kv_get (const shstr &key) const
2361	*
2362	* key must be a passed in shared string - otherwise, this won't
2363	* do the desired thing.
2364	*/
2365	key_value *
2366	get_ob_key_link (const object ob, const char key)
2367	{	2367	{
2368	for (key_value *link = ob->key_values; link; link = link->next)	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (link->key == key)	2369	if (kv->key == key)
2370	return link;
2371
2372	return 0;
2373	}
2374
2375	/*
2376	* Returns the value of op has an extra_field for key, or NULL.
2377	*
2378	* The argument doesn't need to be a shared string.
2379	*
2380	* The returned string is shared.
2381	*/
2382	const char *
2383	get_ob_key_value (const object op, const char const key)
2384	{
2385	key_value *link;
2386	shstr_cmp canonical_key (key);
2387
2388	if (!canonical_key)
2389	{
2390	/* 1. There being a field named key on any object
2391	* implies there'd be a shared string to find.
2392	* 2. Since there isn't, no object has this field.
2393	* 3. Therefore, this object doesn't have this field.
2394	*/
2395	return 0;
2396	}
2397
2398	/* This is copied from get_ob_key_link() above -
2399	* only 4 lines, and saves the function call overhead.
2400	*/
2401	for (link = op->key_values; link; link = link->next)
2402	if (link->key == canonical_key)
2403	return link->value;	2370	return kv->value;
2404		2371
2405	return 0;	2372	return shstr_null;
2406	}	2373	}
2407		2374
2408	/*	2375	void
2409	* Updates the canonical_key in op to value.	2376	object::kv_set (const shstr &key, const shstr &value)
2410	*
2411	* canonical_key is a shared string (value doesn't have to be).
2412	*
2413	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2414	* keys.
2415	*
2416	* Returns TRUE on success.
2417	*/
2418	int
2419	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2420	{	2377	{
2421	key_value field = NULL, last = NULL;	2378	for (key_value *kv = key_values; kv; kv = kv->next)
2422		2379	if (kv->key == key)
2423	for (field = op->key_values; field != NULL; field = field->next)
2424	{
2425	if (field->key != canonical_key)
2426	{	2380	{
2427	last = field;	2381	kv->value = value;
2428	continue;	2382	return;
2429	}	2383	}
2430		2384
2431	if (value)	2385	key_value *kv = new key_value;
2432	field->value = value;	2386
2433	else	2387	kv->next = key_values;
		2388	kv->key = key;
		2389	kv->value = value;
		2390
		2391	key_values = kv;
		2392	}
		2393
		2394	void
		2395	object::kv_del (const shstr &key)
		2396	{
		2397	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2398	if ((*kvp)->key == key)
2434	{	2399	{
2435	/* Basically, if the archetype has this key set,	2400	key_value kv = kvp;
2436	* we need to store the null value so when we save	2401	kvp = (kvp)->next;
2437	* it, we save the empty value so that when we load,	2402	delete kv;
2438	* we get this value back again.	2403	return;
2439	*/
2440	if (get_ob_key_link (op->arch, canonical_key))
2441	field->value = 0;
2442	else
2443	{
2444	if (last)
2445	last->next = field->next;
2446	else
2447	op->key_values = field->next;
2448
2449	delete field;
2450	}
2451	}	2404	}
2452	return TRUE;
2453	}
2454	/* IF we get here, key doesn't exist */
2455
2456	/* No field, we'll have to add it. */
2457
2458	if (!add_key)
2459	return FALSE;
2460
2461	/* There isn't any good reason to store a null
2462	* value in the key/value list. If the archetype has
2463	* this key, then we should also have it, so shouldn't
2464	* be here. If user wants to store empty strings,
2465	* should pass in ""
2466	*/
2467	if (value == NULL)
2468	return TRUE;
2469
2470	field = new key_value;
2471
2472	field->key = canonical_key;
2473	field->value = value;
2474	/* Usual prepend-addition. */
2475	field->next = op->key_values;
2476	op->key_values = field;
2477
2478	return TRUE;
2479	}
2480
2481	/*
2482	* Updates the key in op to value.
2483	*
2484	* If add_key is FALSE, this will only update existing keys,
2485	* and not add new ones.
2486	* In general, should be little reason FALSE is ever passed in for add_key
2487	*
2488	* Returns TRUE on success.
2489	*/
2490	int
2491	set_ob_key_value (object op, const char key, const char *value, int add_key)
2492	{
2493	shstr key_ (key);
2494
2495	return set_ob_key_value_s (op, key_, value, add_key);
2496	}	2405	}
2497		2406
2498	object::depth_iterator::depth_iterator (object *container)	2407	object::depth_iterator::depth_iterator (object *container)
2499	: iterator_base (container)	2408	: iterator_base (container)
2500	{	2409	{
…		…
2558	&name,	2467	&name,
2559	title ? "\",title:\"" : "",	2468	title ? "\",title:\"" : "",
2560	title ? (const char *)title : "",	2469	title ? (const char *)title : "",
2561	flag_desc (flagdesc, 512), type);	2470	flag_desc (flagdesc, 512), type);
2562		2471
2563	if (!this->flag[FLAG_REMOVED] && env)	2472	if (!flag[FLAG_REMOVED] && env)
2564	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2565		2474
2566	if (map)	2475	if (map)
2567	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2476	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2568		2477
…		…
2598	object::open_container (object *new_container)	2507	object::open_container (object *new_container)
2599	{	2508	{
2600	if (container == new_container)	2509	if (container == new_container)
2601	return;	2510	return;
2602		2511
2603	if (object *old_container = container)	2512	object *old_container = container;
		2513
		2514	if (old_container)
2604	{	2515	{
2605	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2516	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2606	return;	2517	return;
2607		2518
2608	#if 0	2519	#if 0
…		…
2610	if (object *closer = old_container->inv)	2521	if (object *closer = old_container->inv)
2611	if (closer->type == CLOSE_CON)	2522	if (closer->type == CLOSE_CON)
2612	closer->destroy ();	2523	closer->destroy ();
2613	#endif	2524	#endif
2614		2525
		2526	// make sure the container is available
		2527	esrv_send_item (this, old_container);
		2528
2615	old_container->flag [FLAG_APPLIED] = 0;	2529	old_container->flag [FLAG_APPLIED] = false;
2616	container = 0;	2530	container = 0;
2617		2531
		2532	// client needs item update to make it work, client bug requires this to be separate
2618	esrv_update_item (UPD_FLAGS, this, old_container);	2533	esrv_update_item (UPD_FLAGS, this, old_container);
		2534
2619	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2620	play_sound (sound_find ("chest_close"));	2536	play_sound (sound_find ("chest_close"));
2621	}	2537	}
2622		2538
2623	if (new_container)	2539	if (new_container)
…		…
2636	}	2552	}
2637	#endif	2553	#endif
2638		2554
2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2555	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2640		2556
		2557	// make sure the container is available, client bug requires this to be separate
		2558	esrv_send_item (this, new_container);
		2559
2641	new_container->flag [FLAG_APPLIED] = 1;	2560	new_container->flag [FLAG_APPLIED] = true;
2642	container = new_container;	2561	container = new_container;
2643		2562
		2563	// client needs flag change
2644	esrv_update_item (UPD_FLAGS, this, new_container);	2564	esrv_update_item (UPD_FLAGS, this, new_container);
2645	esrv_send_inventory (this, new_container);	2565	esrv_send_inventory (this, new_container);
2646	play_sound (sound_find ("chest_open"));	2566	play_sound (sound_find ("chest_open"));
2647	}	2567	}
		2568	// else if (!old_container->env && contr && contr->ns)
		2569	// contr->ns->floorbox_reset ();
2648	}	2570	}
2649		2571
2650	object *	2572	object *
2651	object::force_find (const shstr name)	2573	object::force_find (const shstr name)
2652	{	2574	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.213 by root, Tue Apr 22 01:18:10 2008 UTC vs. Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.213 by root, Tue Apr 22 01:18:10 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC