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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 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
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
…		…
206	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
207	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
208	return 0;	203	return 0;
209		204
210	/* Do not merge objects if nrof would overflow. First part checks	205	/* Do not merge objects if nrof would overflow. First part checks
211	* for unsigned overflow (2c), second part checks wether the result	206	* for unsigned overflow (2c), second part checks whether the result
212	* would fit into a 32 bit signed int, which is often used to hold	207	* would fit into a 32 bit signed int, which is often used to hold
213	* nrof values.	208	* nrof values.
214	*/	209	*/
215	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
216	return 0;	211	return 0;
…		…
225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
226		221
227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
229		224
230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
231	\|\| ob1->arch != ob2->arch
232	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
233	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
234	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
235	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
236	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
239	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
240	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
241	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
242	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
249	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
250	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
251	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
252	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
253	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
254	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		249	return 0;
		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
255	return 0;	256	return 0;
256		257
257	/* This is really a spellbook check - we should in general	258	/* This is really a spellbook check - we should in general
258	* not merge objects with real inventories, as splitting them	259	* not merge objects with real inventories, as splitting them
259	* is hard.	260	* is hard.
…		…
298		299
299	if (ob1->key_values \|\| ob2->key_values)	300	if (ob1->key_values \|\| ob2->key_values)
300	{	301	{
301	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
302	if ((!ob1->key_values) != (!ob2->key_values))	303	if ((!ob1->key_values) != (!ob2->key_values))
303	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
304	return 0;	305
305	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
306	return 0;	307	return 0;
307	}	308	}
308		309
309	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
310	{	311	{
…		…
316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318		319
319	if (k1 != k2)	320	if (k1 != k2)
320	return 0;	321	return 0;
		322
321	else if (k1 == 0)	323	if (k1 == 0)
322	return 1;	324	return 1;
		325
323	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
324	return 0;	327	return 0;
325	}	328	}
326	}	329	}
327		330
328	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
329	return 1;	332	return 1;
330	}	333	}
331		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container \|\| this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
332	static sint32	372	static sint32
333	weight_adjust (object *op, sint32 weight)	373	weight_adjust (object *op, sint32 weight)
334	{	374	{
335	return op->type == CONTAINER	375	return op->type == CONTAINER
336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337	: weight;	377	: weight;
338	}	378	}
339		379
340	/*	380	/*
341	* add_weight(object, weight) adds the specified weight to an object,	381	* adjust_weight(object, weight) adds the specified weight to an object,
342	* and also updates how much the environment(s) is/are carrying.	382	* and also updates how much the environment(s) is/are carrying.
343	*/	383	*/
344	static void	384	static void
345	add_weight (object *op, sint32 weight)	385	adjust_weight (object *op, sint32 weight)
346	{	386	{
347	while (op)	387	while (op)
348	{	388	{
349	weight = weight_adjust (op, weight);	389	weight = weight_adjust (op, weight);
350		390
		391	if (!weight)
		392	return;
		393
351	op->carrying += weight;	394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
352	op = op->env;	400	op = op->env;
353	}	401	}
354	}
355
356	/*
357	* sub_weight() recursively (outwards) subtracts a number from the
358	* weight of an object (and what is carried by it's environment(s)).
359	*/
360	static void
361	sub_weight (object *op, long weight)
362	{
363	add_weight (op, -weight);
364	}	402	}
365		403
366	/*	404	/*
367	* this is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
368	* an object is carrying. It goes through op and figures out how much	406	* an object is carrying. It goes through op and figures out how much
…		…
379	op->update_weight ();	417	op->update_weight ();
380		418
381	sum += op->total_weight ();	419	sum += op->total_weight ();
382	}	420	}
383		421
384	carrying = weight_adjust (this, sum);	422	sum = weight_adjust (this, sum);
385	}
386		423
		424	if (sum != carrying)
		425	{
		426	carrying = sum;
		427
		428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
		432	}
		433
387	/*	434	/*
388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
389	* Some error messages.
390	* The result of the dump is stored in the static global errmsg array.
391	*/	436	*/
392	char *	437	char *
393	dump_object (object *op)	438	dump_object (object *op)
394	{	439	{
395	if (!op)	440	if (!op)
…		…
409	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
410	{	455	{
411	object tmp, closest;	456	object tmp, closest;
412	int last_dist, i;	457	int last_dist, i;
413		458
414	if (op->more == NULL)	459	if (!op->more)
415	return op;	460	return op;
		461
416	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
417	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
418	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
419	return closest;	468	return closest;
420	}	469	}
421		470
422	/*	471	/*
423	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
424	*/	474	*/
425	object *	475	object *
426	find_object (tag_t i)	476	find_object (tag_t i)
427	{	477	{
428	for_all_objects (op)	478	for_all_objects (op)
…		…
696	* UP_OBJ_FACE: only the objects face has changed.	746	* UP_OBJ_FACE: only the objects face has changed.
697	*/	747	*/
698	void	748	void
699	update_object (object *op, int action)	749	update_object (object *op, int action)
700	{	750	{
701	if (op == NULL)	751	if (!op)
702	{	752	{
703	/* this should never happen */	753	/* this should never happen */
704	LOG (llevDebug, "update_object() called for NULL object.\n");	754	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
705	return;	755	return;
706	}	756	}
707		757
708	if (op->env)	758	if (!op->is_on_map ())
709	{	759	{
710	/* Animation is currently handled by client, so nothing	760	/* Animation is currently handled by client, so nothing
711	* to do in this case.	761	* to do in this case.
712	*/	762	*/
713	return;	763	return;
714	}	764	}
715
716	/* If the map is saving, don't do anything as everything is
717	* going to get freed anyways.
718	*/
719	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
720	return;
721		765
722	/* make sure the object is within map boundaries */	766	/* make sure the object is within map boundaries */
723	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	767	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
724	{	768	{
725	LOG (llevError, "update_object() called for object out of map!\n");	769	LOG (llevError, "update_object() called for object out of map!\n");
…		…
868	object::destroy_inv (bool drop_to_ground)	912	object::destroy_inv (bool drop_to_ground)
869	{	913	{
870	// need to check first, because the checks below might segfault	914	// need to check first, because the checks below might segfault
871	// as we might be on an invalid mapspace and crossfire code	915	// as we might be on an invalid mapspace and crossfire code
872	// is too buggy to ensure that the inventory is empty.	916	// is too buggy to ensure that the inventory is empty.
873	// corollary: if you create arrows etc. with stuff in tis inventory,	917	// corollary: if you create arrows etc. with stuff in its inventory,
874	// cf will crash below with off-map x and y	918	// cf will crash below with off-map x and y
875	if (!inv)	919	if (!inv)
876	return;	920	return;
877		921
878	/* Only if the space blocks everything do we not process -	922	/* Only if the space blocks everything do we not process -
…		…
885	\|\| map->nodrop	929	\|\| map->nodrop
886	\|\| ms ().move_block == MOVE_ALL)	930	\|\| ms ().move_block == MOVE_ALL)
887	{	931	{
888	while (inv)	932	while (inv)
889	{	933	{
890	inv->destroy_inv (drop_to_ground);	934	inv->destroy_inv (false);
891	inv->destroy ();	935	inv->destroy ();
892	}	936	}
893	}	937	}
894	else	938	else
895	{ /* Put objects in inventory onto this space */	939	{ /* Put objects in inventory onto this space */
…		…
901	\|\| op->flag [FLAG_NO_DROP]	945	\|\| op->flag [FLAG_NO_DROP]
902	\|\| op->type == RUNE	946	\|\| op->type == RUNE
903	\|\| op->type == TRAP	947	\|\| op->type == TRAP
904	\|\| op->flag [FLAG_IS_A_TEMPLATE]	948	\|\| op->flag [FLAG_IS_A_TEMPLATE]
905	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	949	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
906	op->destroy ();	950	op->destroy (true);
907	else	951	else
908	map->insert (op, x, y);	952	map->insert (op, x, y);
909	}	953	}
910	}	954	}
911	}	955	}
…		…
915	object *op = new object;	959	object *op = new object;
916	op->link ();	960	op->link ();
917	return op;	961	return op;
918	}	962	}
919		963
		964	static struct freed_map : maptile
		965	{
		966	freed_map ()
		967	{
		968	path = "<freed objects map>";
		969	name = "/internal/freed_objects_map";
		970	width = 3;
		971	height = 3;
		972	nodrop = 1;
		973
		974	alloc ();
		975	in_memory = MAP_ACTIVE;
		976	}
		977	} freed_map; // freed objects are moved here to avoid crashes
		978
920	void	979	void
921	object::do_destroy ()	980	object::do_destroy ()
922	{	981	{
923	attachable::do_destroy ();
924
925	if (flag [FLAG_IS_LINKED])	982	if (flag [FLAG_IS_LINKED])
926	remove_button_link (this);	983	remove_button_link (this);
927		984
928	if (flag [FLAG_FRIENDLY])	985	if (flag [FLAG_FRIENDLY])
929	remove_friendly_object (this);	986	remove_friendly_object (this);
930		987
931	if (!flag [FLAG_REMOVED])
932	remove ();	988	remove ();
933		989
934	destroy_inv (true);	990	attachable::do_destroy ();
935		991
936	deactivate ();	992	deactivate ();
937	unlink ();	993	unlink ();
938		994
939	flag [FLAG_FREED] = 1;	995	flag [FLAG_FREED] = 1;
940		996
941	// hack to ensure that freed objects still have a valid map	997	// hack to ensure that freed objects still have a valid map
942	{
943	static maptile *freed_map; // freed objects are moved here to avoid crashes
944
945	if (!freed_map)
946	{
947	freed_map = new maptile;
948
949	freed_map->path = "<freed objects map>";
950	freed_map->name = "/internal/freed_objects_map";
951	freed_map->width = 3;
952	freed_map->height = 3;
953	freed_map->nodrop = 1;
954
955	freed_map->alloc ();
956	freed_map->in_memory = MAP_ACTIVE;
957	}
958
959	map = freed_map;	998	map = &freed_map;
960	x = 1;	999	x = 1;
961	y = 1;	1000	y = 1;
962	}
963		1001
964	if (more)	1002	if (more)
965	{	1003	{
966	more->destroy ();	1004	more->destroy ();
967	more = 0;	1005	more = 0;
…		…
980	object::destroy (bool destroy_inventory)	1018	object::destroy (bool destroy_inventory)
981	{	1019	{
982	if (destroyed ())	1020	if (destroyed ())
983	return;	1021	return;
984		1022
		1023	if (!is_head () && !head->destroyed ())
		1024	{
		1025	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1026	head->destroy (destroy_inventory);
		1027	return;
		1028	}
		1029
985	if (destroy_inventory)	1030	destroy_inv (!destroy_inventory);
986	destroy_inv (false);
987		1031
988	if (is_head ())	1032	if (is_head ())
989	if (sound_destroy)	1033	if (sound_destroy)
990	play_sound (sound_destroy);	1034	play_sound (sound_destroy);
991	else if (flag [FLAG_MONSTER])	1035	else if (flag [FLAG_MONSTER])
…		…
1005	object::do_remove ()	1049	object::do_remove ()
1006	{	1050	{
1007	object tmp, last = 0;	1051	object tmp, last = 0;
1008	object *otmp;	1052	object *otmp;
1009		1053
1010	if (QUERY_FLAG (this, FLAG_REMOVED))	1054	if (flag [FLAG_REMOVED])
1011	return;	1055	return;
1012		1056
1013	SET_FLAG (this, FLAG_REMOVED);
1014	INVOKE_OBJECT (REMOVE, this);	1057	INVOKE_OBJECT (REMOVE, this);
		1058
		1059	flag [FLAG_REMOVED] = true;
1015		1060
1016	if (more)	1061	if (more)
1017	more->remove ();	1062	more->remove ();
1018		1063
1019	/*	1064	/*
1020	* In this case, the object to be removed is in someones	1065	* In this case, the object to be removed is in someones
1021	* inventory.	1066	* inventory.
1022	*/	1067	*/
1023	if (env)	1068	if (env)
1024	{	1069	{
		1070	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1071	if (object *pl = visible_to ())
		1072	esrv_del_item (pl->contr, count);
		1073	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1074
		1075	adjust_weight (env, -total_weight ());
		1076
		1077	*(above ? &above->below : &env->inv) = below;
		1078
1025	if (nrof)	1079	if (below)
1026	sub_weight (env, weight * nrof);	1080	below->above = above;
1027	else	1081
1028	sub_weight (env, weight + carrying);	1082	/* we set up values so that it could be inserted into
		1083	* the map, but we don't actually do that - it is up
		1084	* to the caller to decide what we want to do.
		1085	*/
		1086	map = env->map;
		1087	x = env->x;
		1088	y = env->y;
		1089	above = 0;
		1090	below = 0;
		1091	env = 0;
1029		1092
1030	/* NO_FIX_PLAYER is set when a great many changes are being	1093	/* NO_FIX_PLAYER is set when a great many changes are being
1031	* made to players inventory. If set, avoiding the call	1094	* made to players inventory. If set, avoiding the call
1032	* to save cpu time.	1095	* to save cpu time.
1033	*/	1096	*/
1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1035	otmp->update_stats ();	1098	otmp->update_stats ();
1036
1037	if (above)
1038	above->below = below;
1039	else
1040	env->inv = below;
1041
1042	if (below)
1043	below->above = above;
1044
1045	/* we set up values so that it could be inserted into
1046	* the map, but we don't actually do that - it is up
1047	* to the caller to decide what we want to do.
1048	*/
1049	x = env->x, y = env->y;
1050	map = env->map;
1051	above = 0, below = 0;
1052	env = 0;
1053	}	1099	}
1054	else if (map)	1100	else if (map)
1055	{	1101	{
1056	if (type == PLAYER)
1057	{
1058	// leaving a spot always closes any open container on the ground
1059	if (container && !container->env)
1060	// this causes spurious floorbox updates, but it ensures
1061	// that the CLOSE event is being sent.
1062	close_container ();
1063
1064	--map->players;
1065	map->touch ();
1066	}
1067
1068	map->dirty = true;	1102	map->dirty = true;
1069	mapspace &ms = this->ms ();	1103	mapspace &ms = this->ms ();
		1104
		1105	if (object *pl = ms.player ())
		1106	{
		1107	if (type == PLAYER) // this == pl(!)
		1108	{
		1109	// leaving a spot always closes any open container on the ground
		1110	if (container && !container->env)
		1111	// this causes spurious floorbox updates, but it ensures
		1112	// that the CLOSE event is being sent.
		1113	close_container ();
		1114
		1115	--map->players;
		1116	map->touch ();
		1117	}
		1118	else if (pl->container == this)
		1119	{
		1120	// removing a container should close it
		1121	close_container ();
		1122	}
		1123
		1124	esrv_del_item (pl->contr, count);
		1125	}
1070		1126
1071	/* link the object above us */	1127	/* link the object above us */
1072	if (above)	1128	if (above)
1073	above->below = below;	1129	above->below = below;
1074	else	1130	else
…		…
1104	* removed (most likely destroyed), update the player view	1160	* removed (most likely destroyed), update the player view
1105	* appropriately.	1161	* appropriately.
1106	*/	1162	*/
1107	pl->close_container ();	1163	pl->close_container ();
1108		1164
1109	pl->contr->ns->floorbox_update ();	1165	//TODO: the floorbox prev/next might need updating
		1166	esrv_del_item (pl->contr, count);
1110	}	1167	}
1111		1168
1112	for (tmp = ms.bot; tmp; tmp = tmp->above)	1169	for (tmp = ms.bot; tmp; tmp = tmp->above)
1113	{	1170	{
1114	/* No point updating the players look faces if he is the object	1171	/* No point updating the players look faces if he is the object
…		…
1158	if (!top)	1215	if (!top)
1159	for (top = op; top && top->above; top = top->above)	1216	for (top = op; top && top->above; top = top->above)
1160	;	1217	;
1161		1218
1162	for (; top; top = top->below)	1219	for (; top; top = top->below)
1163	{
1164	if (top == op)
1165	continue;
1166
1167	if (object::can_merge (op, top))	1220	if (object::can_merge (op, top))
1168	{	1221	{
1169	top->nrof += op->nrof;	1222	top->nrof += op->nrof;
1170		1223
1171	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1224	if (object *pl = top->visible_to ())
1172	op->weight = 0; /* Don't want any adjustements now */	1225	esrv_update_item (UPD_NROF, pl, top);
		1226
		1227	op->weight = 0; // cancel the addition above
		1228	op->carrying = 0; // must be 0 already
		1229
1173	op->destroy ();	1230	op->destroy (1);
		1231
1174	return top;	1232	return top;
1175	}	1233	}
1176	}
1177		1234
1178	return 0;	1235	return 0;
1179	}	1236	}
1180		1237
1181	void	1238	void
…		…
1240	object *	1297	object *
1241	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1298	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1242	{	1299	{
1243	assert (!op->flag [FLAG_FREED]);	1300	assert (!op->flag [FLAG_FREED]);
1244		1301
1245	object top, floor = NULL;
1246
1247	op->remove ();	1302	op->remove ();
1248		1303
1249	/* Ideally, the caller figures this out. However, it complicates a lot	1304	/* Ideally, the caller figures this out. However, it complicates a lot
1250	* of areas of callers (eg, anything that uses find_free_spot would now	1305	* of areas of callers (eg, anything that uses find_free_spot would now
1251	* need extra work	1306	* need extra work
1252	*/	1307	*/
1253	if (!xy_normalise (m, op->x, op->y))	1308	if (!xy_normalise (m, op->x, op->y))
1254	{	1309	{
1255	op->destroy ();	1310	op->destroy (1);
1256	return 0;	1311	return 0;
1257	}	1312	}
1258		1313
1259	if (object *more = op->more)	1314	if (object *more = op->more)
1260	if (!insert_ob_in_map (more, m, originator, flag))	1315	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1269	*/	1324	*/
1270	if (op->nrof && !(flag & INS_NO_MERGE))	1325	if (op->nrof && !(flag & INS_NO_MERGE))
1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1326	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1272	if (object::can_merge (op, tmp))	1327	if (object::can_merge (op, tmp))
1273	{	1328	{
		1329	// TODO: we atcually want to update tmp, not op,
		1330	// but some caller surely breaks when we return tmp
		1331	// from here :/
1274	op->nrof += tmp->nrof;	1332	op->nrof += tmp->nrof;
1275	tmp->destroy ();	1333	tmp->destroy (1);
1276	}	1334	}
1277		1335
1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1336	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1279	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1337	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1280		1338
…		…
1300	/* since below originator, no need to update top */	1358	/* since below originator, no need to update top */
1301	originator->below = op;	1359	originator->below = op;
1302	}	1360	}
1303	else	1361	else
1304	{	1362	{
		1363	object top, floor = NULL;
		1364
1305	top = ms.bot;	1365	top = ms.bot;
1306		1366
1307	/* If there are other objects, then */	1367	/* If there are other objects, then */
1308	if (top)	1368	if (top)
1309	{	1369	{
…		…
1408	}	1468	}
1409		1469
1410	op->map->dirty = true;	1470	op->map->dirty = true;
1411		1471
1412	if (object *pl = ms.player ())	1472	if (object *pl = ms.player ())
1413	pl->contr->ns->floorbox_update ();	1473	//TODO: the floorbox prev/next might need updating
		1474	esrv_send_item (pl, op);
1414		1475
1415	/* If this object glows, it may affect lighting conditions that are	1476	/* If this object glows, it may affect lighting conditions that are
1416	* visible to others on this map. But update_all_los is really	1477	* visible to others on this map. But update_all_los is really
1417	* an inefficient way to do this, as it means los for all players	1478	* an inefficient way to do this, as it means los for all players
1418	* on the map will get recalculated. The players could very well	1479	* on the map will get recalculated. The players could very well
…		…
1460	* op is the object to insert it under: supplies x and the map.	1521	* op is the object to insert it under: supplies x and the map.
1461	*/	1522	*/
1462	void	1523	void
1463	replace_insert_ob_in_map (const char arch_string, object op)	1524	replace_insert_ob_in_map (const char arch_string, object op)
1464	{	1525	{
1465	object tmp, tmp1;
1466
1467	/* first search for itself and remove any old instances */	1526	/* first search for itself and remove any old instances */
1468		1527
1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1528	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1529	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1471	tmp->destroy ();	1530	tmp->destroy (1);
1472		1531
1473	tmp1 = arch_to_object (archetype::find (arch_string));	1532	object *tmp = arch_to_object (archetype::find (arch_string));
1474		1533
1475	tmp1->x = op->x;	1534	tmp->x = op->x;
1476	tmp1->y = op->y;	1535	tmp->y = op->y;
		1536
1477	insert_ob_in_map (tmp1, op->map, op, 0);	1537	insert_ob_in_map (tmp, op->map, op, 0);
1478	}	1538	}
1479		1539
1480	object *	1540	object *
1481	object::insert_at (object where, object originator, int flags)	1541	object::insert_at (object where, object originator, int flags)
1482	{	1542	{
…		…
1485	else	1545	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1546	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1547	}
1488		1548
1489	/*	1549	/*
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523
1524	newob->nrof = nr;
1525
1526	return newob;
1527	}
1528
1529	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1550	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1551	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1552	* is subsequently removed and freed.
1533	*	1553	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1554	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1555	*/
		1556	bool
		1557	object::decrease (sint32 nr)
		1558	{
		1559	if (!nr)
		1560	return true;
		1561
		1562	nr = min (nr, nrof);
		1563
		1564	nrof -= nr;
		1565
		1566	if (nrof)
		1567	{
		1568	adjust_weight (env, -weight * nr); // carrying == 0
		1569
		1570	if (object *pl = visible_to ())
		1571	esrv_update_item (UPD_NROF, pl, this);
		1572
		1573	return true;
		1574	}
		1575	else
		1576	{
		1577	destroy (1);
		1578	return false;
		1579	}
		1580	}
		1581
		1582	/*
		1583	* split(ob,nr) splits up ob into two parts. The part which
		1584	* is returned contains nr objects, and the remaining parts contains
		1585	* the rest (or is removed and returned if that number is 0).
		1586	* On failure, NULL is returned.
		1587	*/
1536	object *	1588	object *
1537	decrease_ob_nr (object *op, uint32 i)	1589	object::split (sint32 nr)
1538	{	1590	{
1539	object *tmp;	1591	int have = number_of ();
1540		1592
1541	if (i == 0) /* objects with op->nrof require this check */	1593	if (have < nr)
1542	return op;	1594	return 0;
1543		1595	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1596	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1597	remove ();
1579	op->nrof = 0;	1598	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1599	}
1584	else	1600	else
1585	{	1601	{
1586	object *above = op->above;	1602	decrease (nr);
1587		1603
1588	if (i < op->nrof)	1604	object *op = object_create_clone (this);
1589	op->nrof -= i;	1605	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1606	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}	1607	}
1614	}	1608	}
1615		1609
1616	object *	1610	object *
1617	insert_ob_in_ob (object op, object where)	1611	insert_ob_in_ob (object op, object where)
…		…
1642	* be != op, if items are merged. -Tero	1636	* be != op, if items are merged. -Tero
1643	*/	1637	*/
1644	object *	1638	object *
1645	object::insert (object *op)	1639	object::insert (object *op)
1646	{	1640	{
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1641	if (op->more)
1651	{	1642	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1643	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1644	return op;
1654	}	1645	}
1655		1646
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1647	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1648
		1649	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1658		1650
1659	if (op->nrof)	1651	if (op->nrof)
1660	{
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1652	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1653	if (object::can_merge (tmp, op))
1663	{	1654	{
1664	/* return the original object and remove inserted object	1655	/* return the original object and remove inserted object
1665	(client needs the original object) */	1656	(client needs the original object) */
1666	tmp->nrof += op->nrof;	1657	tmp->nrof += op->nrof;
1667	/* Weight handling gets pretty funky. Since we are adding to	1658
1668	* tmp->nrof, we need to increase the weight.	1659	if (object *pl = tmp->visible_to ())
1669	*/	1660	esrv_update_item (UPD_NROF, pl, tmp);
		1661
1670	add_weight (this, op->weight * op->nrof);	1662	adjust_weight (this, op->total_weight ());
1671	SET_FLAG (op, FLAG_REMOVED);	1663
1672	op->destroy (); /* free the inserted object */	1664	op->destroy (1);
1673	op = tmp;	1665	op = tmp;
1674	op->remove (); /* and fix old object's links */	1666	goto inserted;
1675	CLEAR_FLAG (op, FLAG_REMOVED);
1676	break;
1677	}	1667	}
1678		1668
1679	/* I assume combined objects have no inventory
1680	* We add the weight - this object could have just been removed
1681	* (if it was possible to merge). calling remove_ob will subtract
1682	* the weight, so we need to add it in again, since we actually do
1683	* the linking below
1684	*/
1685	add_weight (this, op->weight * op->nrof);
1686	}
1687	else
1688	add_weight (this, (op->weight + op->carrying));
1689
1690	if (object *otmp = this->in_player ())
1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();
1693
1694	op->owner = 0; // its his/hers now. period.	1669	op->owner = 0; // it's his/hers now. period.
1695	op->map = 0;	1670	op->map = 0;
		1671	op->x = 0;
		1672	op->y = 0;
		1673
		1674	op->above = 0;
		1675	op->below = inv;
1696	op->env = this;	1676	op->env = this;
1697	op->above = 0;
1698	op->below = 0;
1699	op->x = op->y = 0;
1700		1677
		1678	if (inv)
		1679	inv->above = op;
		1680
		1681	inv = op;
		1682
		1683	op->flag [FLAG_REMOVED] = 0;
		1684
		1685	if (object *pl = op->visible_to ())
		1686	esrv_send_item (pl, op);
		1687
		1688	adjust_weight (this, op->total_weight ());
		1689
		1690	inserted:
1701	/* reset the light list and los of the players on the map */	1691	/* reset the light list and los of the players on the map */
1702	if (op->glow_radius && map)	1692	if (op->glow_radius && map && map->darkness)
1703	{
1704	#ifdef DEBUG_LIGHTS
1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1706	#endif /* DEBUG_LIGHTS */
1707	if (map->darkness)
1708	update_all_los (map, x, y);	1693	update_all_los (map, x, y);
1709	}
1710		1694
1711	/* Client has no idea of ordering so lets not bother ordering it here.	1695	// if this is a player's inventory, update stats
1712	* It sure simplifies this function...	1696	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1713	*/	1697	update_stats ();
1714	if (!inv)
1715	inv = op;
1716	else
1717	{
1718	op->below = inv;
1719	op->below->above = op;
1720	inv = op;
1721	}
1722		1698
1723	INVOKE_OBJECT (INSERT, this);	1699	INVOKE_OBJECT (INSERT, this);
1724		1700
1725	return op;	1701	return op;
1726	}	1702	}
…		…
2604	&name,	2580	&name,
2605	title ? "\",title:\"" : "",	2581	title ? "\",title:\"" : "",
2606	title ? (const char *)title : "",	2582	title ? (const char *)title : "",
2607	flag_desc (flagdesc, 512), type);	2583	flag_desc (flagdesc, 512), type);
2608		2584
2609	if (!this->flag[FLAG_REMOVED] && env)	2585	if (!flag[FLAG_REMOVED] && env)
2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2611		2587
2612	if (map)	2588	if (map)
2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2589	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2614		2590
…		…
2644	object::open_container (object *new_container)	2620	object::open_container (object *new_container)
2645	{	2621	{
2646	if (container == new_container)	2622	if (container == new_container)
2647	return;	2623	return;
2648		2624
2649	if (object *old_container = container)	2625	object *old_container = container;
		2626
		2627	if (old_container)
2650	{	2628	{
2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2629	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2652	return;	2630	return;
2653		2631
2654	#if 0	2632	#if 0
…		…
2656	if (object *closer = old_container->inv)	2634	if (object *closer = old_container->inv)
2657	if (closer->type == CLOSE_CON)	2635	if (closer->type == CLOSE_CON)
2658	closer->destroy ();	2636	closer->destroy ();
2659	#endif	2637	#endif
2660		2638
		2639	// make sure the container is available
		2640	esrv_send_item (this, old_container);
		2641
2661	old_container->flag [FLAG_APPLIED] = 0;	2642	old_container->flag [FLAG_APPLIED] = false;
2662	container = 0;	2643	container = 0;
2663		2644
		2645	// client needs item update to make it work, client bug requires this to be separate
2664	esrv_update_item (UPD_FLAGS, this, old_container);	2646	esrv_update_item (UPD_FLAGS, this, old_container);
		2647
2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2666	play_sound (sound_find ("chest_close"));	2649	play_sound (sound_find ("chest_close"));
2667	}	2650	}
2668		2651
2669	if (new_container)	2652	if (new_container)
…		…
2682	}	2665	}
2683	#endif	2666	#endif
2684		2667
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2668	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2686		2669
		2670	// make sure the container is available, client bug requires this to be separate
		2671	esrv_send_item (this, new_container);
		2672
2687	new_container->flag [FLAG_APPLIED] = 1;	2673	new_container->flag [FLAG_APPLIED] = true;
2688	container = new_container;	2674	container = new_container;
2689		2675
		2676	// client needs flag change
2690	esrv_update_item (UPD_FLAGS, this, new_container);	2677	esrv_update_item (UPD_FLAGS, this, new_container);
2691	esrv_send_inventory (this, new_container);	2678	esrv_send_inventory (this, new_container);
2692	play_sound (sound_find ("chest_open"));	2679	play_sound (sound_find ("chest_open"));
2693	}	2680	}
		2681	// else if (!old_container->env && contr && contr->ns)
		2682	// contr->ns->floorbox_reset ();
2694	}	2683	}
2695		2684
2696	object *	2685	object *
2697	object::force_find (const shstr name)	2686	object::force_find (const shstr name)
2698	{	2687	{
…		…
2724		2713
2725	insert (force);	2714	insert (force);
2726	}	2715	}
2727		2716
2728	void	2717	void
2729	object::play_sound (faceidx sound) const	2718	object::play_sound (faceidx sound)
2730	{	2719	{
2731	if (!sound)	2720	if (!sound)
2732	return;	2721	return;
2733		2722
2734	if (flag [FLAG_REMOVED])	2723	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs. Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC