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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.225 by root, Fri May 2 20:28:44 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	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	UUID UUID::cur;	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	objectvec objects;	38	objectvec objects;
42	activevec actives;	39	activevec actives;
43		40
44	short freearr_x[SIZEOFFREE] = {	41	short freearr_x[SIZEOFFREE] = {
…		…
81	{	78	{
82	char filename[MAX_BUF];	79	char filename[MAX_BUF];
83		80
84	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
85		82
		83	seq_next_save = 0;
		84
86	FILE *fp;	85	FILE *fp;
87		86
88	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
89	{	88	{
90	if (errno == ENOENT)	89	if (errno == ENOENT)
91	{	90	{
92	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	92	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	93	write_uuid (UUID_GAP, true);
95	return;	94	return;
96	}	95	}
97		96
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	98	_exit (1);
…		…
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		112
114	write_uuid (UUID_SKIP, true);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	UUID::gen ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++cur.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	124	if (expect_false (cur.seq >= seq_next_save))
		125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
…		…
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* 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. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
140	{	143	{
141	key_value *wants_field;	144	key_value *wants_field;
142		145
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
151	key_value *has_field;	154	key_value *has_field;
152		155
153	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
155		158
156	if (has_field == NULL)	159	if (!has_field)
157	{
158	/* No field with that name. */	160	return 0; /* No field with that name. */
159	return FALSE;
160	}
161		161
162	/* Found the matching field. */	162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168		165
169	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
170	}	167	}
171		168
172	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	170	return 1;
174	}	171	}
175		172
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	174	static bool
178	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
179	{	176	{
180	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
182	*/	179	*/
…		…
203	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
204	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
205	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
206	return 0;	203	return 0;
207		204
208	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	208	* nrof values.
212	*/	209	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	211	return 0;
215		212
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	217	* flags lose any meaning.
221	*/	218	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		221
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		224
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
229	\|\| ob1->arch != ob2->arch
230	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
231	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
232	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
233	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
234	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
237	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
238	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
239	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
240	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
247	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
248	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
249	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
250	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
251	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
252	\|\| 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)))
253	return 0;	249	return 0;
254		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
255	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
257	*/	261	*/
258	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
259	{	263	{
260	if (!(ob1->inv && ob2->inv))	264	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	265	return 0; /* inventories differ in length */
262		266
263	if (ob1->inv->below \|\| ob2->inv->below)	267	if (ob1->inv->below \|\| ob2->inv->below)
264	return 0; /* more than one object in inv */	268	return 0; /* more than one object in inv */
265		269
266	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	271	return 0; /* inventory objects differ */
268		272
269	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	274	* if it is valid.
271	*/	275	*/
272	}	276	}
…		…
291	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
292	return 0;	296	return 0;
293	break;	297	break;
294	}	298	}
295		299
296	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
297	{	301	{
298	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	305
302	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	307	return 0;
304	}	308	}
305		309
306	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
307	{	311	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		319
316	if (k1 != k2)	320	if (k1 != k2)
317	return 0;	321	return 0;
		322
318	else if (k1 == 0)	323	if (k1 == 0)
319	return 1;	324	return 1;
		325
320	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	327	return 0;
322	}	328	}
323	}	329	}
324		330
325	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
326	return 1;	332	return 1;
327	}	333	}
328		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")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
329	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		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
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
330	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
331	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
332	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
333	*/	408	*/
334	long	409	void
335	sum_weight (object *op)	410	object::update_weight ()
336	{	411	{
337	long sum;	412	sint32 sum = 0;
338	object *inv;
339		413
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
341	{	415	{
342	if (inv->inv)	416	if (op->inv)
343	sum_weight (inv);	417	op->update_weight ();
344		418
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
346	}	425	{
347
348	if (op->type == CONTAINER && op->stats.Str)
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;	426	carrying = sum;
353		427
354	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
355	}	432	}
356		433
357	/**	434	/*
358	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
359	*/
360
361	object *
362	object_get_env_recursive (object *op)
363	{
364	while (op->env != NULL)
365	op = op->env;
366	return op;
367	}
368
369	/*
370	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
371	* Some error messages.
372	* The result of the dump is stored in the static global errmsg array.
373	*/	436	*/
374	char *	437	char *
375	dump_object (object *op)	438	dump_object (object *op)
376	{	439	{
377	if (!op)	440	if (!op)
…		…
391	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
392	{	455	{
393	object tmp, closest;	456	object tmp, closest;
394	int last_dist, i;	457	int last_dist, i;
395		458
396	if (op->more == NULL)	459	if (!op->more)
397	return op;	460	return op;
		461
398	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)
399	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
401	return closest;	468	return closest;
402	}	469	}
403		470
404	/*	471	/*
405	* 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.
406	*/	474	*/
407	object *	475	object *
408	find_object (tag_t i)	476	find_object (tag_t i)
409	{	477	{
410	for_all_objects (op)	478	for_all_objects (op)
…		…
538	}	606	}
539		607
540	object &	608	object &
541	object::operator =(const object &src)	609	object::operator =(const object &src)
542	{	610	{
543	bool is_freed = flag [FLAG_FREED];	611	remove ();
544	bool is_removed = flag [FLAG_REMOVED];
545		612
546	(object_copy )this = src;	613	(object_copy )this = src;
547		614
548	flag [FLAG_FREED] = is_freed;
549	flag [FLAG_REMOVED] = is_removed;	615	flag [FLAG_REMOVED] = true;
550		616
551	/* Copy over key_values, if any. */	617	/* Copy over key_values, if any. */
552	if (src.key_values)	618	if (src.key_values)
553	{	619	{
554	key_value *tail = 0;	620	key_value *tail = 0;
…		…
618	object *	684	object *
619	object::clone ()	685	object::clone ()
620	{	686	{
621	object *neu = create ();	687	object *neu = create ();
622	copy_to (neu);	688	copy_to (neu);
		689	neu->map = map; // not copied by copy_to
623	return neu;	690	return neu;
624	}	691	}
625		692
626	/*	693	/*
627	* If an object with the IS_TURNABLE() flag needs to be turned due	694	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
678	* UP_OBJ_FACE: only the objects face has changed.	745	* UP_OBJ_FACE: only the objects face has changed.
679	*/	746	*/
680	void	747	void
681	update_object (object *op, int action)	748	update_object (object *op, int action)
682	{	749	{
683	if (op == NULL)	750	if (!op)
684	{	751	{
685	/* this should never happen */	752	/* this should never happen */
686	LOG (llevDebug, "update_object() called for NULL object.\n");	753	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
687	return;	754	return;
688	}	755	}
689		756
690	if (op->env)	757	if (!op->is_on_map ())
691	{	758	{
692	/* Animation is currently handled by client, so nothing	759	/* Animation is currently handled by client, so nothing
693	* to do in this case.	760	* to do in this case.
694	*/	761	*/
695	return;	762	return;
696	}	763	}
697
698	/* If the map is saving, don't do anything as everything is
699	* going to get freed anyways.
700	*/
701	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
702	return;
703		764
704	/* make sure the object is within map boundaries */	765	/* make sure the object is within map boundaries */
705	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	766	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
706	{	767	{
707	LOG (llevError, "update_object() called for object out of map!\n");	768	LOG (llevError, "update_object() called for object out of map!\n");
…		…
850	object::destroy_inv (bool drop_to_ground)	911	object::destroy_inv (bool drop_to_ground)
851	{	912	{
852	// need to check first, because the checks below might segfault	913	// need to check first, because the checks below might segfault
853	// as we might be on an invalid mapspace and crossfire code	914	// as we might be on an invalid mapspace and crossfire code
854	// is too buggy to ensure that the inventory is empty.	915	// is too buggy to ensure that the inventory is empty.
855	// corollary: if you create arrows etc. with stuff in tis inventory,	916	// corollary: if you create arrows etc. with stuff in its inventory,
856	// cf will crash below with off-map x and y	917	// cf will crash below with off-map x and y
857	if (!inv)	918	if (!inv)
858	return;	919	return;
859		920
860	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
861	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
862	* drop on that space.	923	* drop on that space.
863	*/	924	*/
864	if (!drop_to_ground	925	if (!drop_to_ground
865	\|\| !map	926	\|\| !map
866	\|\| map->in_memory != MAP_IN_MEMORY	927	\|\| map->in_memory != MAP_ACTIVE
867	\|\| map->nodrop	928	\|\| map->nodrop
868	\|\| ms ().move_block == MOVE_ALL)	929	\|\| ms ().move_block == MOVE_ALL)
869	{	930	{
870	while (inv)	931	while (inv)
871	{	932	{
872	inv->destroy_inv (drop_to_ground);	933	inv->destroy_inv (false);
873	inv->destroy ();	934	inv->destroy ();
874	}	935	}
875	}	936	}
876	else	937	else
877	{ /* Put objects in inventory onto this space */	938	{ /* Put objects in inventory onto this space */
…		…
883	\|\| op->flag [FLAG_NO_DROP]	944	\|\| op->flag [FLAG_NO_DROP]
884	\|\| op->type == RUNE	945	\|\| op->type == RUNE
885	\|\| op->type == TRAP	946	\|\| op->type == TRAP
886	\|\| op->flag [FLAG_IS_A_TEMPLATE]	947	\|\| op->flag [FLAG_IS_A_TEMPLATE]
887	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	948	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
888	op->destroy ();	949	op->destroy (true);
889	else	950	else
890	map->insert (op, x, y);	951	map->insert (op, x, y);
891	}	952	}
892	}	953	}
893	}	954	}
…		…
897	object *op = new object;	958	object *op = new object;
898	op->link ();	959	op->link ();
899	return op;	960	return op;
900	}	961	}
901		962
		963	static struct freed_map : maptile
		964	{
		965	freed_map ()
		966	{
		967	path = "<freed objects map>";
		968	name = "/internal/freed_objects_map";
		969	width = 3;
		970	height = 3;
		971	nodrop = 1;
		972
		973	alloc ();
		974	in_memory = MAP_ACTIVE;
		975	}
		976	} freed_map; // freed objects are moved here to avoid crashes
		977
902	void	978	void
903	object::do_destroy ()	979	object::do_destroy ()
904	{	980	{
905	attachable::do_destroy ();
906
907	if (flag [FLAG_IS_LINKED])	981	if (flag [FLAG_IS_LINKED])
908	remove_button_link (this);	982	remove_button_link (this);
909		983
910	if (flag [FLAG_FRIENDLY])	984	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	985	remove_friendly_object (this);
912		986
913	if (!flag [FLAG_REMOVED])
914	remove ();	987	remove ();
915		988
916	destroy_inv (true);	989	attachable::do_destroy ();
917		990
918	deactivate ();	991	deactivate ();
919	unlink ();	992	unlink ();
920		993
921	flag [FLAG_FREED] = 1;	994	flag [FLAG_FREED] = 1;
922		995
923	// hack to ensure that freed objects still have a valid map	996	// hack to ensure that freed objects still have a valid map
924	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927	if (!freed_map)
928	{
929	freed_map = new maptile;
930
931	freed_map->path = "<freed objects map>";
932	freed_map->name = "/internal/freed_objects_map";
933	freed_map->width = 3;
934	freed_map->height = 3;
935	freed_map->nodrop = 1;
936
937	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;
939	}
940
941	map = freed_map;	997	map = &freed_map;
942	x = 1;	998	x = 1;
943	y = 1;	999	y = 1;
944	}
945		1000
946	if (more)	1001	if (more)
947	{	1002	{
948	more->destroy ();	1003	more->destroy ();
949	more = 0;	1004	more = 0;
…		…
962	object::destroy (bool destroy_inventory)	1017	object::destroy (bool destroy_inventory)
963	{	1018	{
964	if (destroyed ())	1019	if (destroyed ())
965	return;	1020	return;
966		1021
		1022	if (!is_head () && !head->destroyed ())
		1023	{
		1024	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1025	head->destroy (destroy_inventory);
		1026	return;
		1027	}
		1028
967	if (destroy_inventory)	1029	destroy_inv (!destroy_inventory);
968	destroy_inv (false);
969		1030
970	if (is_head ())	1031	if (is_head ())
971	if (sound_destroy)	1032	if (sound_destroy)
972	play_sound (sound_destroy);	1033	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	1034	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1035	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		1036
976	attachable::destroy ();	1037	attachable::destroy ();
977	}
978
979	/*
980	* sub_weight() recursively (outwards) subtracts a number from the
981	* weight of an object (and what is carried by it's environment(s)).
982	*/
983	void
984	sub_weight (object *op, signed long weight)
985	{
986	while (op != NULL)
987	{
988	if (op->type == CONTAINER)
989	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
990
991	op->carrying -= weight;
992	op = op->env;
993	}
994	}	1038	}
995		1039
996	/* op->remove ():	1040	/* op->remove ():
997	* This function removes the object op from the linked list of objects	1041	* This function removes the object op from the linked list of objects
998	* which it is currently tied to. When this function is done, the	1042	* which it is currently tied to. When this function is done, the
…		…
1004	object::do_remove ()	1048	object::do_remove ()
1005	{	1049	{
1006	object tmp, last = 0;	1050	object tmp, last = 0;
1007	object *otmp;	1051	object *otmp;
1008		1052
1009	if (QUERY_FLAG (this, FLAG_REMOVED))	1053	if (flag [FLAG_REMOVED])
1010	return;	1054	return;
1011		1055
1012	SET_FLAG (this, FLAG_REMOVED);
1013	INVOKE_OBJECT (REMOVE, this);	1056	INVOKE_OBJECT (REMOVE, this);
		1057
		1058	flag [FLAG_REMOVED] = true;
1014		1059
1015	if (more)	1060	if (more)
1016	more->remove ();	1061	more->remove ();
1017		1062
1018	/*	1063	/*
1019	* In this case, the object to be removed is in someones	1064	* In this case, the object to be removed is in someones
1020	* inventory.	1065	* inventory.
1021	*/	1066	*/
1022	if (env)	1067	if (env)
1023	{	1068	{
		1069	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1070	if (object *pl = visible_to ())
		1071	esrv_del_item (pl->contr, count);
		1072	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1073
		1074	adjust_weight (env, -total_weight ());
		1075
		1076	*(above ? &above->below : &env->inv) = below;
		1077
1024	if (nrof)	1078	if (below)
1025	sub_weight (env, weight * nrof);	1079	below->above = above;
1026	else	1080
1027	sub_weight (env, weight + carrying);	1081	/* we set up values so that it could be inserted into
		1082	* the map, but we don't actually do that - it is up
		1083	* to the caller to decide what we want to do.
		1084	*/
		1085	map = env->map;
		1086	x = env->x;
		1087	y = env->y;
		1088	above = 0;
		1089	below = 0;
		1090	env = 0;
1028		1091
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1092	/* NO_FIX_PLAYER is set when a great many changes are being
1030	* made to players inventory. If set, avoiding the call	1093	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.	1094	* to save cpu time.
1032	*/	1095	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();	1097	otmp->update_stats ();
1035
1036	if (above)
1037	above->below = below;
1038	else
1039	env->inv = below;
1040
1041	if (below)
1042	below->above = above;
1043
1044	/* we set up values so that it could be inserted into
1045	* the map, but we don't actually do that - it is up
1046	* to the caller to decide what we want to do.
1047	*/
1048	x = env->x, y = env->y;
1049	map = env->map;
1050	above = 0, below = 0;
1051	env = 0;
1052	}	1098	}
1053	else if (map)	1099	else if (map)
1054	{	1100	{
1055	if (type == PLAYER)
1056	{
1057	// leaving a spot always closes any open container on the ground
1058	if (container && !container->env)
1059	// this causes spurious floorbox updates, but it ensures
1060	// that the CLOSE event is being sent.
1061	close_container ();
1062
1063	--map->players;
1064	map->touch ();
1065	}
1066
1067	map->dirty = true;	1101	map->dirty = true;
1068	mapspace &ms = this->ms ();	1102	mapspace &ms = this->ms ();
		1103
		1104	if (object *pl = ms.player ())
		1105	{
		1106	if (type == PLAYER) // this == pl(!)
		1107	{
		1108	// leaving a spot always closes any open container on the ground
		1109	if (container && !container->env)
		1110	// this causes spurious floorbox updates, but it ensures
		1111	// that the CLOSE event is being sent.
		1112	close_container ();
		1113
		1114	--map->players;
		1115	map->touch ();
		1116	}
		1117	else if (pl->container == this)
		1118	{
		1119	// removing a container should close it
		1120	close_container ();
		1121	}
		1122
		1123	esrv_del_item (pl->contr, count);
		1124	}
1069		1125
1070	/* link the object above us */	1126	/* link the object above us */
1071	if (above)	1127	if (above)
1072	above->below = below;	1128	above->below = below;
1073	else	1129	else
…		…
1103	* removed (most likely destroyed), update the player view	1159	* removed (most likely destroyed), update the player view
1104	* appropriately.	1160	* appropriately.
1105	*/	1161	*/
1106	pl->close_container ();	1162	pl->close_container ();
1107		1163
1108	pl->contr->ns->floorbox_update ();	1164	//TODO: the floorbox prev/next might need updating
		1165	esrv_del_item (pl->contr, count);
1109	}	1166	}
1110		1167
1111	for (tmp = ms.bot; tmp; tmp = tmp->above)	1168	for (tmp = ms.bot; tmp; tmp = tmp->above)
1112	{	1169	{
1113	/* No point updating the players look faces if he is the object	1170	/* No point updating the players look faces if he is the object
…		…
1157	if (!top)	1214	if (!top)
1158	for (top = op; top && top->above; top = top->above)	1215	for (top = op; top && top->above; top = top->above)
1159	;	1216	;
1160		1217
1161	for (; top; top = top->below)	1218	for (; top; top = top->below)
1162	{
1163	if (top == op)
1164	continue;
1165
1166	if (object::can_merge (op, top))	1219	if (object::can_merge (op, top))
1167	{	1220	{
1168	top->nrof += op->nrof;	1221	top->nrof += op->nrof;
1169		1222
1170	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1223	if (object *pl = top->visible_to ())
1171	op->weight = 0; /* Don't want any adjustements now */	1224	esrv_update_item (UPD_NROF, pl, top);
		1225
		1226	op->weight = 0; // cancel the addition above
		1227	op->carrying = 0; // must be 0 already
		1228
1172	op->destroy ();	1229	op->destroy (1);
		1230
1173	return top;	1231	return top;
1174	}	1232	}
1175	}
1176		1233
1177	return 0;	1234	return 0;
1178	}	1235	}
1179		1236
1180	void	1237	void
…		…
1239	object *	1296	object *
1240	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1297	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1241	{	1298	{
1242	assert (!op->flag [FLAG_FREED]);	1299	assert (!op->flag [FLAG_FREED]);
1243		1300
1244	object top, floor = NULL;
1245
1246	op->remove ();	1301	op->remove ();
1247		1302
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1303	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1304	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1305	* need extra work
1251	*/	1306	*/
1252	if (!xy_normalise (m, op->x, op->y))	1307	if (!xy_normalise (m, op->x, op->y))
1253	{	1308	{
1254	op->destroy ();	1309	op->destroy (1);
1255	return 0;	1310	return 0;
1256	}	1311	}
1257		1312
1258	if (object *more = op->more)	1313	if (object *more = op->more)
1259	if (!insert_ob_in_map (more, m, originator, flag))	1314	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1268	*/	1323	*/
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1324	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1325	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1326	if (object::can_merge (op, tmp))
1272	{	1327	{
		1328	// TODO: we atcually want to update tmp, not op,
		1329	// but some caller surely breaks when we return tmp
		1330	// from here :/
1273	op->nrof += tmp->nrof;	1331	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1332	tmp->destroy (1);
1275	}	1333	}
1276		1334
1277	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1335	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1278	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1336	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1279		1337
…		…
1299	/* since below originator, no need to update top */	1357	/* since below originator, no need to update top */
1300	originator->below = op;	1358	originator->below = op;
1301	}	1359	}
1302	else	1360	else
1303	{	1361	{
		1362	object top, floor = NULL;
		1363
1304	top = ms.bot;	1364	top = ms.bot;
1305		1365
1306	/* If there are other objects, then */	1366	/* If there are other objects, then */
1307	if (top)	1367	if (top)
1308	{	1368	{
…		…
1407	}	1467	}
1408		1468
1409	op->map->dirty = true;	1469	op->map->dirty = true;
1410		1470
1411	if (object *pl = ms.player ())	1471	if (object *pl = ms.player ())
1412	pl->contr->ns->floorbox_update ();	1472	//TODO: the floorbox prev/next might need updating
		1473	esrv_send_item (pl, op);
1413		1474
1414	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1415	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1416	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1417	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1459	* op is the object to insert it under: supplies x and the map.	1520	* op is the object to insert it under: supplies x and the map.
1460	*/	1521	*/
1461	void	1522	void
1462	replace_insert_ob_in_map (const char arch_string, object op)	1523	replace_insert_ob_in_map (const char arch_string, object op)
1463	{	1524	{
1464	object tmp, tmp1;
1465
1466	/* first search for itself and remove any old instances */	1525	/* first search for itself and remove any old instances */
1467		1526
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1527	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1528	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1470	tmp->destroy ();	1529	tmp->destroy (1);
1471		1530
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1531	object *tmp = arch_to_object (archetype::find (arch_string));
1473		1532
1474	tmp1->x = op->x;	1533	tmp->x = op->x;
1475	tmp1->y = op->y;	1534	tmp->y = op->y;
		1535
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1536	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1537	}
1478		1538
1479	object *	1539	object *
1480	object::insert_at (object where, object originator, int flags)	1540	object::insert_at (object where, object originator, int flags)
1481	{	1541	{
		1542	if (where->env)
		1543	return where->env->insert (this);
		1544	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1545	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1546	}
1484		1547
1485	/*	1548	/*
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1487	* is returned contains nr objects, and the remaining parts contains
1488	* the rest (or is removed and freed if that number is 0).
1489	* On failure, NULL is returned, and the reason put into the
1490	* global static errmsg array.
1491	*/
1492	object *
1493	get_split_ob (object *orig_ob, uint32 nr)
1494	{
1495	object *newob;
1496	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497
1498	if (orig_ob->nrof < nr)
1499	{
1500	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1501	return NULL;
1502	}
1503
1504	newob = object_create_clone (orig_ob);
1505
1506	if ((orig_ob->nrof -= nr) < 1)
1507	orig_ob->destroy (1);
1508	else if (!is_removed)
1509	{
1510	if (orig_ob->env != NULL)
1511	sub_weight (orig_ob->env, orig_ob->weight * nr);
1512	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1513	{
1514	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1515	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1516	return NULL;
1517	}
1518	}
1519
1520	newob->nrof = nr;
1521
1522	return newob;
1523	}
1524
1525	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1549	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1550	* the amount of an object. If the amount reaches 0, the object
1528	* is subsequently removed and freed.	1551	* is subsequently removed and freed.
1529	*	1552	*
1530	* Return value: 'op' if something is left, NULL if the amount reached 0	1553	* Return value: 'op' if something is left, NULL if the amount reached 0
1531	*/	1554	*/
		1555	bool
		1556	object::decrease (sint32 nr)
		1557	{
		1558	if (!nr)
		1559	return true;
		1560
		1561	nr = min (nr, nrof);
		1562
		1563	nrof -= nr;
		1564
		1565	if (nrof)
		1566	{
		1567	adjust_weight (env, -weight * nr); // carrying == 0
		1568
		1569	if (object *pl = visible_to ())
		1570	esrv_update_item (UPD_NROF, pl, this);
		1571
		1572	return true;
		1573	}
		1574	else
		1575	{
		1576	destroy (1);
		1577	return false;
		1578	}
		1579	}
		1580
		1581	/*
		1582	* split(ob,nr) splits up ob into two parts. The part which
		1583	* is returned contains nr objects, and the remaining parts contains
		1584	* the rest (or is removed and returned if that number is 0).
		1585	* On failure, NULL is returned.
		1586	*/
1532	object *	1587	object *
1533	decrease_ob_nr (object *op, uint32 i)	1588	object::split (sint32 nr)
1534	{	1589	{
1535	object *tmp;	1590	int have = number_of ();
1536		1591
1537	if (i == 0) /* objects with op->nrof require this check */	1592	if (have < nr)
1538	return op;	1593	return 0;
1539		1594	else if (have == nr)
1540	if (i > op->nrof)
1541	i = op->nrof;
1542
1543	if (QUERY_FLAG (op, FLAG_REMOVED))
1544	op->nrof -= i;
1545	else if (op->env)
1546	{	1595	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = op->in_player ();
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp)
1558	for_all_players (pl)
1559	if (pl->ob->container == op->env)
1560	{
1561	tmp = pl->ob;
1562	break;
1563	}
1564
1565	if (i < op->nrof)
1566	{
1567	sub_weight (op->env, op->weight * i);
1568	op->nrof -= i;
1569	if (tmp)
1570	esrv_send_item (tmp, op);
1571	}
1572	else
1573	{
1574	op->remove ();	1596	remove ();
1575	op->nrof = 0;	1597	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1598	}
1580	else	1599	else
1581	{	1600	{
1582	object *above = op->above;	1601	decrease (nr);
1583		1602
1584	if (i < op->nrof)	1603	object *op = object_create_clone (this);
1585	op->nrof -= i;	1604	op->nrof = nr;
1586	else
1587	{
1588	op->remove ();
1589	op->nrof = 0;
1590	}
1591
1592	/* Since we just removed op, op->above is null */
1593	for (tmp = above; tmp; tmp = tmp->above)
1594	if (tmp->type == PLAYER)
1595	{
1596	if (op->nrof)
1597	esrv_send_item (tmp, op);
1598	else
1599	esrv_del_item (tmp->contr, op->count);
1600	}
1601	}
1602
1603	if (op->nrof)
1604	return op;	1605	return op;
1605	else
1606	{
1607	op->destroy ();
1608	return 0;
1609	}
1610	}
1611
1612	/*
1613	* add_weight(object, weight) adds the specified weight to an object,
1614	* and also updates how much the environment(s) is/are carrying.
1615	*/
1616	void
1617	add_weight (object *op, signed long weight)
1618	{
1619	while (op != NULL)
1620	{
1621	if (op->type == CONTAINER)
1622	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1623
1624	op->carrying += weight;
1625	op = op->env;
1626	}	1606	}
1627	}	1607	}
1628		1608
1629	object *	1609	object *
1630	insert_ob_in_ob (object op, object where)	1610	insert_ob_in_ob (object op, object where)
…		…
1655	* be != op, if items are merged. -Tero	1635	* be != op, if items are merged. -Tero
1656	*/	1636	*/
1657	object *	1637	object *
1658	object::insert (object *op)	1638	object::insert (object *op)
1659	{	1639	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1640	if (op->more)
1664	{	1641	{
1665	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1642	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1666	return op;	1643	return op;
1667	}	1644	}
1668		1645
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1646	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1647
		1648	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1649
1672	if (op->nrof)	1650	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1651	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1652	if (object::can_merge (tmp, op))
1676	{	1653	{
1677	/* return the original object and remove inserted object	1654	/* return the original object and remove inserted object
1678	(client needs the original object) */	1655	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1656	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to	1657
1681	* tmp->nrof, we need to increase the weight.	1658	if (object *pl = tmp->visible_to ())
1682	*/	1659	esrv_update_item (UPD_NROF, pl, tmp);
		1660
1683	add_weight (this, op->weight * op->nrof);	1661	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1662
1685	op->destroy (); /* free the inserted object */	1663	op->destroy (1);
1686	op = tmp;	1664	op = tmp;
1687	op->remove (); /* and fix old object's links */	1665	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1666	}
1691		1667
1692	/* I assume combined objects have no inventory
1693	* We add the weight - this object could have just been removed
1694	* (if it was possible to merge). calling remove_ob will subtract
1695	* the weight, so we need to add it in again, since we actually do
1696	* the linking below
1697	*/
1698	add_weight (this, op->weight * op->nrof);
1699	}
1700	else
1701	add_weight (this, (op->weight + op->carrying));
1702
1703	if (object *otmp = this->in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.	1668	op->owner = 0; // it's his/hers now. period.
1708	op->map = 0;	1669	op->map = 0;
		1670	op->x = 0;
		1671	op->y = 0;
		1672
		1673	op->above = 0;
		1674	op->below = inv;
1709	op->env = this;	1675	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713		1676
		1677	if (inv)
		1678	inv->above = op;
		1679
		1680	inv = op;
		1681
		1682	op->flag [FLAG_REMOVED] = 0;
		1683
		1684	if (object *pl = op->visible_to ())
		1685	esrv_send_item (pl, op);
		1686
		1687	adjust_weight (this, op->total_weight ());
		1688
		1689	inserted:
1714	/* reset the light list and los of the players on the map */	1690	/* reset the light list and los of the players on the map */
1715	if (op->glow_radius && map)	1691	if (op->glow_radius && map && map->darkness)
1716	{
1717	#ifdef DEBUG_LIGHTS
1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1719	#endif /* DEBUG_LIGHTS */
1720	if (map->darkness)
1721	update_all_los (map, x, y);	1692	update_all_los (map, x, y);
1722	}
1723		1693
1724	/* Client has no idea of ordering so lets not bother ordering it here.	1694	// if this is a player's inventory, update stats
1725	* It sure simplifies this function...	1695	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1726	*/	1696	update_stats ();
1727	if (!inv)
1728	inv = op;
1729	else
1730	{
1731	op->below = inv;
1732	op->below->above = op;
1733	inv = op;
1734	}
1735		1697
1736	INVOKE_OBJECT (INSERT, this);	1698	INVOKE_OBJECT (INSERT, this);
1737		1699
1738	return op;	1700	return op;
1739	}	1701	}
…		…
2363	* create clone from object to another	2325	* create clone from object to another
2364	*/	2326	*/
2365	object *	2327	object *
2366	object_create_clone (object *asrc)	2328	object_create_clone (object *asrc)
2367	{	2329	{
2368	object dst = 0, tmp, src, prev, *item;	2330	object *dst = 0;
2369		2331
2370	if (!asrc)	2332	if (!asrc)
2371	return 0;	2333	return 0;
2372		2334
2373	src = asrc->head_ ();	2335	object *src = asrc->head_ ();
2374		2336
2375	prev = 0;	2337	object *prev = 0;
2376	for (object *part = src; part; part = part->more)	2338	for (object *part = src; part; part = part->more)
2377	{	2339	{
2378	tmp = part->clone ();	2340	object *tmp = part->clone ();
		2341
2379	tmp->x -= src->x;	2342	tmp->x -= src->x;
2380	tmp->y -= src->y;	2343	tmp->y -= src->y;
2381		2344
2382	if (!part->head)	2345	if (!part->head)
2383	{	2346	{
…		…
2393	prev->more = tmp;	2356	prev->more = tmp;
2394		2357
2395	prev = tmp;	2358	prev = tmp;
2396	}	2359	}
2397		2360
2398	for (item = src->inv; item; item = item->below)	2361	for (object *item = src->inv; item; item = item->below)
2399	insert_ob_in_ob (object_create_clone (item), dst);	2362	insert_ob_in_ob (object_create_clone (item), dst);
2400		2363
2401	return dst;	2364	return dst;
2402	}	2365	}
2403		2366
…		…
2617	&name,	2580	&name,
2618	title ? "\",title:\"" : "",	2581	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2582	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2583	flag_desc (flagdesc, 512), type);
2621		2584
2622	if (!this->flag[FLAG_REMOVED] && env)	2585	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2587
2625	if (map)	2588	if (map)
2626	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);
2627		2590
…		…
2657	object::open_container (object *new_container)	2620	object::open_container (object *new_container)
2658	{	2621	{
2659	if (container == new_container)	2622	if (container == new_container)
2660	return;	2623	return;
2661		2624
2662	if (object *old_container = container)	2625	object *old_container = container;
		2626
		2627	if (old_container)
2663	{	2628	{
2664	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2629	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665	return;	2630	return;
2666		2631
2667	#if 0	2632	#if 0
…		…
2669	if (object *closer = old_container->inv)	2634	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2635	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2636	closer->destroy ();
2672	#endif	2637	#endif
2673		2638
		2639	// make sure the container is available
		2640	esrv_send_item (this, old_container);
		2641
2674	old_container->flag [FLAG_APPLIED] = 0;	2642	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2643	container = 0;
2676		2644
		2645	// client needs item update to make it work, client bug requires this to be separate
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2646	esrv_update_item (UPD_FLAGS, this, old_container);
		2647
2678	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));
2679	play_sound (sound_find ("chest_close"));	2649	play_sound (sound_find ("chest_close"));
2680	}	2650	}
2681		2651
2682	if (new_container)	2652	if (new_container)
…		…
2695	}	2665	}
2696	#endif	2666	#endif
2697		2667
2698	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));
2699		2669
		2670	// make sure the container is available, client bug requires this to be separate
		2671	esrv_send_item (this, new_container);
		2672
2700	new_container->flag [FLAG_APPLIED] = 1;	2673	new_container->flag [FLAG_APPLIED] = true;
2701	container = new_container;	2674	container = new_container;
2702		2675
		2676	// client needs flag change
2703	esrv_update_item (UPD_FLAGS, this, new_container);	2677	esrv_update_item (UPD_FLAGS, this, new_container);
2704	esrv_send_inventory (this, new_container);	2678	esrv_send_inventory (this, new_container);
2705	play_sound (sound_find ("chest_open"));	2679	play_sound (sound_find ("chest_open"));
2706	}	2680	}
		2681	// else if (!old_container->env && contr && contr->ns)
		2682	// contr->ns->floorbox_reset ();
2707	}	2683	}
2708		2684
2709	object *	2685	object *
2710	object::force_find (const shstr name)	2686	object::force_find (const shstr name)
2711	{	2687	{
…		…
2737		2713
2738	insert (force);	2714	insert (force);
2739	}	2715	}
2740		2716
2741	void	2717	void
2742	object::play_sound (faceidx sound) const	2718	object::play_sound (faceidx sound)
2743	{	2719	{
2744	if (!sound)	2720	if (!sound)
2745	return;	2721	return;
2746		2722
2747	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.203 by root, Fri Apr 11 13:59:05 2008 UTC vs. Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC