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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007 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	* Crossfire TRT 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
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
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 <crossfire@schmorp.de>	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.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
		27
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
…		…
33	#include <sproto.h>	34	#include <sproto.h>
34	#include <loader.h>	35	#include <loader.h>
35		36
36	#include <bitset>	37	#include <bitset>
37		38
38	int nrofallocobjects = 0;	39	UUID UUID::cur;
39	static UUID uuid;	40	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	41	static const uint64 UUID_GAP = 1<<19;
41		42
42	objectvec objects;	43	objectvec objects;
43	activevec actives;	44	activevec actives;
44		45
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = {
		47	0,
		48	0, 1, 1, 1, 0, -1, -1, -1,
		49	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	50	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	51	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	52	short freearr_y[SIZEOFFREE] = {
		53	0,
		54	-1, -1, 0, 1, 1, 1, 0, -1,
		55	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	56	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	57	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	58	int maxfree[SIZEOFFREE] = {
		59	0,
		60	9, 10, 13, 14, 17, 18, 21, 22,
		61	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	62	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	63	};
54	int freedir[SIZEOFFREE] = {	64	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	0,
		66	1, 2, 3, 4, 5, 6, 7, 8,
		67	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	68	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	69	};
58		70
59	static void	71	static void
60	write_uuid (void)	72	write_uuid (uval64 skip, bool sync)
61	{	73	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	74	CALL_BEGIN (2);
63		75	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	76	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		78	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	79	}
79		80
80	static void	81	static void
81	read_uuid (void)	82	read_uuid (void)
82	{	83	{
83	char filename[MAX_BUF];	84	char filename[MAX_BUF];
84		85
85	sprintf (filename, "%s/uuid", settings.localdir);	86	sprintf (filename, "%s/uuid", settings.localdir);
86		87
		88	seq_next_save = 0;
		89
87	FILE *fp;	90	FILE *fp;
88		91
89	if (!(fp = fopen (filename, "r")))	92	if (!(fp = fopen (filename, "r")))
90	{	93	{
91	if (errno == ENOENT)	94	if (errno == ENOENT)
92	{	95	{
93	LOG (llevInfo, "RESET uid to 1\n");	96	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	97	UUID::cur.seq = 0;
95	write_uuid ();	98	write_uuid (UUID_GAP, true);
96	return;	99	return;
97	}	100	}
98		101
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	103	_exit (1);
101	}	104	}
102		105
103	int version;	106	UUID::BUF buf;
104	unsigned long long uid;	107	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	108	fgets (buf, sizeof (buf), fp);
		109
		110	if (!UUID::cur.parse (buf))
106	{	111	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	112	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	113	_exit (1);
109	}	114	}
110		115
111	uuid.seq = uid;	116	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	117
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	118	write_uuid (UUID_GAP, true);
114	fclose (fp);	119	fclose (fp);
115	}	120	}
116		121
117	UUID	122	UUID
118	gen_uuid ()	123	UUID::gen ()
119	{	124	{
120	UUID uid;	125	UUID uid;
121		126
122	uid.seq = ++uuid.seq;	127	uid.seq = ++cur.seq;
123		128
124	if (!(uuid.seq & (UUID_SKIP - 1)))	129	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	130	{
		131	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		132	write_uuid (UUID_GAP, false);
		133	}
		134
126		135
127	return uid;	136	return uid;
128	}	137	}
129		138
130	void	139	void
131	init_uuid ()	140	UUID::init ()
132	{	141	{
133	read_uuid ();	142	read_uuid ();
134	}	143	}
135		144
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	146	static bool
138	compare_ob_value_lists_one (const object wants, const object has)	147	compare_ob_value_lists_one (const object wants, const object has)
139	{	148	{
140	key_value *wants_field;	149	key_value *wants_field;
141		150
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	151	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	159	key_value *has_field;
151		160
152	/* Look for a field in has with the same key. */	161	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	162	has_field = get_ob_key_link (has, wants_field->key);
154		163
155	if (has_field == NULL)	164	if (!has_field)
156	{
157	/* No field with that name. */	165	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		166
161	/* Found the matching field. */	167	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	168	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	169	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		170
168	/* If we get here, we found a match. Now for the next field in wants. */	171	/* If we get here, we found a match. Now for the next field in wants. */
169	}	172	}
170		173
171	/* If we get here, every field in wants has a matching field in has. */	174	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	175	return 1;
173	}	176	}
174		177
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	178	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	179	static bool
177	compare_ob_value_lists (const object ob1, const object ob2)	180	compare_ob_value_lists (const object ob1, const object ob2)
178	{	181	{
179	/* However, there may be fields in has which aren't partnered in wants,	182	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison twice. :(	183	* so we need to run the comparison twice. :(
181	*/	184	*/
…		…
202	\|\| ob1->speed != ob2->speed	205	\|\| ob1->speed != ob2->speed
203	\|\| ob1->value != ob2->value	206	\|\| ob1->value != ob2->value
204	\|\| ob1->name != ob2->name)	207	\|\| ob1->name != ob2->name)
205	return 0;	208	return 0;
206		209
207	//TODO: this ain't working well, use nicer and correct overflow check	210	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	211	* for unsigned overflow (2c), second part checks wether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	212	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	213	* nrof values.
211	*/	214	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	215	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	216	return 0;
214		217
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	218	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	219	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	220	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	221	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	222	* flags lose any meaning.
220	*/	223	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
249	\|\| ob1->move_off != ob2->move_off	252	\|\| ob1->move_off != ob2->move_off
250	\|\| ob1->move_slow != ob2->move_slow	253	\|\| ob1->move_slow != ob2->move_slow
251	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	254	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)
252	return 0;	255	return 0;
253		256
254	/* This is really a spellbook check - really, we should	257	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	258	* not merge objects with real inventories, as splitting them
		259	* is hard.
256	*/	260	*/
257	if (ob1->inv \|\| ob2->inv)	261	if (ob1->inv \|\| ob2->inv)
258	{	262	{
259	/* if one object has inventory but the other doesn't, not equiv */	263	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	264	return 0; /* inventories differ in length */
261	return 0;
262		265
263	/* Now check to see if the two inventory objects could merge */	266	if (ob1->inv->below \|\| ob2->inv->below)
		267	return 0; /* more than one object in inv */
		268
264	if (!object::can_merge (ob1->inv, ob2->inv))	269	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	270	return 0; /* inventory objects differ */
266		271
267	/* inventory ok - still need to check rest of this object to see	272	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	273	* if it is valid.
269	*/	274	*/
270	}	275	}
…		…
289	if (ob1->level != ob2->level)	294	if (ob1->level != ob2->level)
290	return 0;	295	return 0;
291	break;	296	break;
292	}	297	}
293		298
294	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	299	if (ob1->key_values \|\| ob2->key_values)
295	{	300	{
296	/* At least one of these has key_values. */	301	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	302	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	303	/* One has fields, but the other one doesn't. */
299	return 0;	304	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	305	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	306	return 0;
302	}	307	}
…		…
305	{	310	{
306	ob1->optimise ();	311	ob1->optimise ();
307	ob2->optimise ();	312	ob2->optimise ();
308		313
309	if (ob1->self \|\| ob2->self)	314	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	315	{
		316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		318
		319	if (k1 != k2)
311	return 0;	320	return 0;
		321	else if (k1 == 0)
		322	return 1;
		323	else if (!cfperl_can_merge (ob1, ob2))
		324	return 0;
		325	}
312	}	326	}
313		327
314	/* Everything passes, must be OK. */	328	/* Everything passes, must be OK. */
315	return 1;	329	return 1;
316	}	330	}
317		331
		332	static sint32
		333	weight_adjust (object *op, sint32 weight)
		334	{
		335	return op->type == CONTAINER
		336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		337	: weight;
		338	}
		339
318	/*	340	/*
		341	* add_weight(object, weight) adds the specified weight to an object,
		342	* and also updates how much the environment(s) is/are carrying.
		343	*/
		344	static void
		345	add_weight (object *op, sint32 weight)
		346	{
		347	while (op)
		348	{
		349	weight = weight_adjust (op, weight);
		350
		351	op->carrying += weight;
		352	op = op->env;
		353	}
		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	}
		365
		366	/*
319	* sum_weight() is a recursive function which calculates the weight	367	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	368	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	369	* containers are carrying, and sums it up.
322	*/	370	*/
323	long	371	void
324	sum_weight (object *op)	372	object::update_weight ()
325	{	373	{
326	long sum;	374	sint32 sum = 0;
327	object *inv;
328		375
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	376	for (object *op = inv; op; op = op->below)
330	{	377	{
331	if (inv->inv)	378	if (op->inv)
332	sum_weight (inv);	379	op->update_weight ();
333		380
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	381	sum += op->total_weight ();
335	}	382	}
336		383
337	if (op->type == CONTAINER && op->stats.Str)	384	carrying = weight_adjust (this, sum);
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;
342
343	return sum;
344	}
345
346	/**
347	* Return the outermost environment object for a given object.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}	385	}
357		386
358	/*	387	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.	389	* Some error messages.
…		…
374	/*	403	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	404	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	405	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	406	* If it's not a multi-object, it is returned.
378	*/	407	*/
379
380	object *	408	object *
381	get_nearest_part (object op, const object pl)	409	get_nearest_part (object op, const object pl)
382	{	410	{
383	object tmp, closest;	411	object tmp, closest;
384	int last_dist, i;	412	int last_dist, i;
…		…
420	break;	448	break;
421		449
422	return op;	450	return op;
423	}	451	}
424		452
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	453	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	454	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	455	* skill and experience objects.
		456	* ACTUALLY NO! investigate! TODO
434	*/	457	*/
435	void	458	void
436	object::set_owner (object *owner)	459	object::set_owner (object *owner)
437	{	460	{
		461	// allow objects which own objects
438	if (!owner)	462	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	463	while (owner->owner)
449	owner = owner->owner;	464	owner = owner->owner;
		465
		466	if (flag [FLAG_FREED])
		467	{
		468	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		469	return;
		470	}
450		471
451	this->owner = owner;	472	this->owner = owner;
452	}	473	}
453		474
454	int	475	int
…		…
586	object::copy_to (object *dst)	607	object::copy_to (object *dst)
587	{	608	{
588	dst = this;	609	dst = this;
589		610
590	if (speed < 0)	611	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	612	dst->speed_left -= rndm ();
592		613
593	dst->set_speed (dst->speed);	614	dst->set_speed (dst->speed);
594	}	615	}
595		616
596	void	617	void
597	object::instantiate ()	618	object::instantiate ()
598	{	619	{
599	if (!uuid.seq) // HACK	620	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	621	uuid = UUID::gen ();
601		622
602	speed_left = -0.1f;	623	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	624	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	625	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	626	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	785	static int object_count;
765		786
766	void object::link ()	787	void object::link ()
767	{	788	{
768	assert (!index);//D	789	assert (!index);//D
769	uuid = gen_uuid ();	790	uuid = UUID::gen ();
770	count = ++object_count;	791	count = ++object_count;
771		792
772	refcnt_inc ();	793	refcnt_inc ();
773	objects.insert (this);	794	objects.insert (this);
774	}	795	}
…		…
858	* if some form of movement is allowed, let objects	879	* if some form of movement is allowed, let objects
859	* drop on that space.	880	* drop on that space.
860	*/	881	*/
861	if (!drop_to_ground	882	if (!drop_to_ground
862	\|\| !map	883	\|\| !map
863	\|\| map->in_memory != MAP_IN_MEMORY	884	\|\| map->in_memory != MAP_ACTIVE
864	\|\| map->nodrop	885	\|\| map->nodrop
865	\|\| ms ().move_block == MOVE_ALL)	886	\|\| ms ().move_block == MOVE_ALL)
866	{	887	{
867	while (inv)	888	while (inv)
868	{	889	{
…		…
923		944
924	if (!freed_map)	945	if (!freed_map)
925	{	946	{
926	freed_map = new maptile;	947	freed_map = new maptile;
927		948
		949	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	950	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	951	freed_map->width = 3;
930	freed_map->height = 3;	952	freed_map->height = 3;
		953	freed_map->nodrop = 1;
931		954
932	freed_map->alloc ();	955	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	956	freed_map->in_memory = MAP_ACTIVE;
934	}	957	}
935		958
936	map = freed_map;	959	map = freed_map;
937	x = 1;	960	x = 1;
938	y = 1;	961	y = 1;
…		…
960	return;	983	return;
961		984
962	if (destroy_inventory)	985	if (destroy_inventory)
963	destroy_inv (false);	986	destroy_inv (false);
964		987
		988	if (is_head ())
		989	if (sound_destroy)
965	play_sound (sound_destroy);	990	play_sound (sound_destroy);
		991	else if (flag [FLAG_MONSTER])
		992	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
966		993
967	attachable::destroy ();	994	attachable::destroy ();
968	}
969
970	/*
971	* sub_weight() recursively (outwards) subtracts a number from the
972	* weight of an object (and what is carried by it's environment(s)).
973	*/
974	void
975	sub_weight (object *op, signed long weight)
976	{
977	while (op != NULL)
978	{
979	if (op->type == CONTAINER)
980	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
981
982	op->carrying -= weight;
983	op = op->env;
984	}
985	}	995	}
986		996
987	/* op->remove ():	997	/* op->remove ():
988	* This function removes the object op from the linked list of objects	998	* This function removes the object op from the linked list of objects
989	* which it is currently tied to. When this function is done, the	999	* which it is currently tied to. When this function is done, the
…		…
1085	if (map->in_memory == MAP_SAVING)	1095	if (map->in_memory == MAP_SAVING)
1086	return;	1096	return;
1087		1097
1088	int check_walk_off = !flag [FLAG_NO_APPLY];	1098	int check_walk_off = !flag [FLAG_NO_APPLY];
1089		1099
		1100	if (object *pl = ms.player ())
		1101	{
		1102	if (pl->container == this)
		1103	/* If a container that the player is currently using somehow gets
		1104	* removed (most likely destroyed), update the player view
		1105	* appropriately.
		1106	*/
		1107	pl->close_container ();
		1108
		1109	pl->contr->ns->floorbox_update ();
		1110	}
		1111
1090	for (tmp = ms.bot; tmp; tmp = tmp->above)	1112	for (tmp = ms.bot; tmp; tmp = tmp->above)
1091	{	1113	{
1092	/* No point updating the players look faces if he is the object	1114	/* No point updating the players look faces if he is the object
1093	* being removed.	1115	* being removed.
1094	*/	1116	*/
1095
1096	if (tmp->type == PLAYER && tmp != this)
1097	{
1098	/* If a container that the player is currently using somehow gets
1099	* removed (most likely destroyed), update the player view
1100	* appropriately.
1101	*/
1102	if (tmp->container == this)
1103	{
1104	flag [FLAG_APPLIED] = 0;
1105	tmp->container = 0;
1106	}
1107
1108	if (tmp->contr->ns)
1109	tmp->contr->ns->floorbox_update ();
1110	}
1111		1117
1112	/* See if object moving off should effect something */	1118	/* See if object moving off should effect something */
1113	if (check_walk_off	1119	if (check_walk_off
1114	&& ((move_type & tmp->move_off)	1120	&& ((move_type & tmp->move_off)
1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1121	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1147	merge_ob (object op, object top)	1153	merge_ob (object op, object top)
1148	{	1154	{
1149	if (!op->nrof)	1155	if (!op->nrof)
1150	return 0;	1156	return 0;
1151		1157
1152	if (top)	1158	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1159	for (top = op; top && top->above; top = top->above)
1154	;	1160	;
1155		1161
1156	for (; top; top = top->below)	1162	for (; top; top = top->below)
1157	{	1163	{
…		…
1238		1244
1239	object top, floor = NULL;	1245	object top, floor = NULL;
1240		1246
1241	op->remove ();	1247	op->remove ();
1242		1248
1243	#if 0
1244	if (!m->active != !op->active)
1245	if (m->active)
1246	op->activate_recursive ();
1247	else
1248	op->deactivate_recursive ();
1249	#endif
1250
1251	if (out_of_map (m, op->x, op->y))
1252	{
1253	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1254	#ifdef MANY_CORES
1255	/* Better to catch this here, as otherwise the next use of this object
1256	* is likely to cause a crash. Better to find out where it is getting
1257	* improperly inserted.
1258	*/
1259	abort ();
1260	#endif
1261	return op;
1262	}
1263
1264	if (object *more = op->more)
1265	if (!insert_ob_in_map (more, m, originator, flag))
1266	return 0;
1267
1268	CLEAR_FLAG (op, FLAG_REMOVED);
1269
1270	/* Ideally, the caller figures this out. However, it complicates a lot	1249	/* Ideally, the caller figures this out. However, it complicates a lot
1271	* of areas of callers (eg, anything that uses find_free_spot would now	1250	* of areas of callers (eg, anything that uses find_free_spot would now
1272	* need extra work	1251	* need extra work
1273	*/	1252	*/
1274	if (!xy_normalise (m, op->x, op->y))	1253	if (!xy_normalise (m, op->x, op->y))
		1254	{
		1255	op->destroy ();
1275	return 0;	1256	return 0;
		1257	}
		1258
		1259	if (object *more = op->more)
		1260	if (!insert_ob_in_map (more, m, originator, flag))
		1261	return 0;
		1262
		1263	CLEAR_FLAG (op, FLAG_REMOVED);
1276		1264
1277	op->map = m;	1265	op->map = m;
1278	mapspace &ms = op->ms ();	1266	mapspace &ms = op->ms ();
1279		1267
1280	/* this has to be done after we translate the coordinates.	1268	/* this has to be done after we translate the coordinates.
…		…
1315	else	1303	else
1316	{	1304	{
1317	top = ms.bot;	1305	top = ms.bot;
1318		1306
1319	/* If there are other objects, then */	1307	/* If there are other objects, then */
1320	if ((!(flag & INS_MAP_LOAD)) && top)	1308	if (top)
1321	{	1309	{
1322	object *last = 0;	1310	object *last = 0;
1323		1311
1324	/*	1312	/*
1325	* If there are multiple objects on this space, we do some trickier handling.	1313	* If there are multiple objects on this space, we do some trickier handling.
…		…
1377	*/	1365	*/
1378	if (last && last->below && last != floor)	1366	if (last && last->below && last != floor)
1379	top = last->below;	1367	top = last->below;
1380	}	1368	}
1381	} /* If objects on this space */	1369	} /* If objects on this space */
1382	if (flag & INS_MAP_LOAD)
1383	top = ms.top;
1384		1370
1385	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1386	top = floor;	1372	top = floor;
1387		1373
1388	/* Top is the object that our object (op) is going to get inserted above.	1374	/* Top is the object that our object (op) is going to get inserted above.
…		…
1421	op->map->touch ();	1407	op->map->touch ();
1422	}	1408	}
1423		1409
1424	op->map->dirty = true;	1410	op->map->dirty = true;
1425		1411
1426	/* If we have a floor, we know the player, if any, will be above
1427	* it, so save a few ticks and start from there.
1428	*/
1429	if (!(flag & INS_MAP_LOAD))
1430	if (object *pl = ms.player ())	1412	if (object *pl = ms.player ())
1431	if (pl->contr->ns)
1432	pl->contr->ns->floorbox_update ();	1413	pl->contr->ns->floorbox_update ();
1433		1414
1434	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1435	* visible to others on this map. But update_all_los is really	1416	* visible to others on this map. But update_all_los is really
1436	* an inefficient way to do this, as it means los for all players	1417	* an inefficient way to do this, as it means los for all players
1437	* on the map will get recalculated. The players could very well	1418	* on the map will get recalculated. The players could very well
…		…
1497	}	1478	}
1498		1479
1499	object *	1480	object *
1500	object::insert_at (object where, object originator, int flags)	1481	object::insert_at (object where, object originator, int flags)
1501	{	1482	{
		1483	if (where->env)
		1484	return where->env->insert (this);
		1485	else
1502	return where->map->insert (this, where->x, where->y, originator, flags);	1486	return where->map->insert (this, where->x, where->y, originator, flags);
1503	}	1487	}
1504		1488
1505	/*	1489	/*
1506	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1507	* is returned contains nr objects, and the remaining parts contains	1491	* is returned contains nr objects, and the remaining parts contains
…		…
1527	orig_ob->destroy (1);	1511	orig_ob->destroy (1);
1528	else if (!is_removed)	1512	else if (!is_removed)
1529	{	1513	{
1530	if (orig_ob->env != NULL)	1514	if (orig_ob->env != NULL)
1531	sub_weight (orig_ob->env, orig_ob->weight * nr);	1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1532	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1533	{	1517	{
1534	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1535	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1536	return NULL;	1520	return NULL;
1537	}	1521	}
…		…
1627	op->destroy ();	1611	op->destroy ();
1628	return 0;	1612	return 0;
1629	}	1613	}
1630	}	1614	}
1631		1615
1632	/*
1633	* add_weight(object, weight) adds the specified weight to an object,
1634	* and also updates how much the environment(s) is/are carrying.
1635	*/
1636	void
1637	add_weight (object *op, signed long weight)
1638	{
1639	while (op != NULL)
1640	{
1641	if (op->type == CONTAINER)
1642	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1643
1644	op->carrying += weight;
1645	op = op->env;
1646	}
1647	}
1648
1649	object *	1616	object *
1650	insert_ob_in_ob (object op, object where)	1617	insert_ob_in_ob (object op, object where)
1651	{	1618	{
1652	if (!where)	1619	if (!where)
1653	{	1620	{
…		…
1675	* be != op, if items are merged. -Tero	1642	* be != op, if items are merged. -Tero
1676	*/	1643	*/
1677	object *	1644	object *
1678	object::insert (object *op)	1645	object::insert (object *op)
1679	{	1646	{
1680	object tmp, otmp;
1681
1682	if (!QUERY_FLAG (op, FLAG_REMOVED))	1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1683	op->remove ();	1648	op->remove ();
1684		1649
1685	if (op->more)	1650	if (op->more)
1686	{	1651	{
…		…
1688	return op;	1653	return op;
1689	}	1654	}
1690		1655
1691	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1692	CLEAR_FLAG (op, FLAG_REMOVED);	1657	CLEAR_FLAG (op, FLAG_REMOVED);
		1658
1693	if (op->nrof)	1659	if (op->nrof)
1694	{	1660	{
1695	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1661	for (object *tmp = inv; tmp; tmp = tmp->below)
1696	if (object::can_merge (tmp, op))	1662	if (object::can_merge (tmp, op))
1697	{	1663	{
1698	/* return the original object and remove inserted object	1664	/* return the original object and remove inserted object
1699	(client needs the original object) */	1665	(client needs the original object) */
1700	tmp->nrof += op->nrof;	1666	tmp->nrof += op->nrof;
…		…
1719	add_weight (this, op->weight * op->nrof);	1685	add_weight (this, op->weight * op->nrof);
1720	}	1686	}
1721	else	1687	else
1722	add_weight (this, (op->weight + op->carrying));	1688	add_weight (this, (op->weight + op->carrying));
1723		1689
1724	otmp = this->in_player ();	1690	if (object *otmp = this->in_player ())
1725	if (otmp && otmp->contr)
1726	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1727	otmp->update_stats ();	1692	otmp->update_stats ();
1728		1693
		1694	op->owner = 0; // its his/hers now. period.
1729	op->map = 0;	1695	op->map = 0;
1730	op->env = this;	1696	op->env = this;
1731	op->above = 0;	1697	op->above = 0;
1732	op->below = 0;	1698	op->below = 0;
1733	op->x = 0, op->y = 0;	1699	op->x = op->y = 0;
1734		1700
1735	/* reset the light list and los of the players on the map */	1701	/* reset the light list and los of the players on the map */
1736	if ((op->glow_radius != 0) && map)	1702	if (op->glow_radius && map)
1737	{	1703	{
1738	#ifdef DEBUG_LIGHTS	1704	#ifdef DEBUG_LIGHTS
1739	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1740	#endif /* DEBUG_LIGHTS */	1706	#endif /* DEBUG_LIGHTS */
1741	if (map->darkness)	1707	if (map->darkness)
…		…
1975	* activate recursively a flag on an object inventory	1941	* activate recursively a flag on an object inventory
1976	*/	1942	*/
1977	void	1943	void
1978	flag_inv (object *op, int flag)	1944	flag_inv (object *op, int flag)
1979	{	1945	{
1980	if (op->inv)
1981	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1946	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1982	{	1947	{
1983	SET_FLAG (tmp, flag);	1948	SET_FLAG (tmp, flag);
1984	flag_inv (tmp, flag);	1949	flag_inv (tmp, flag);
1985	}	1950	}
1986	}	1951	}
1987		1952
1988	/*	1953	/*
1989	* deactivate recursively a flag on an object inventory	1954	* deactivate recursively a flag on an object inventory
1990	*/	1955	*/
1991	void	1956	void
1992	unflag_inv (object *op, int flag)	1957	unflag_inv (object *op, int flag)
1993	{	1958	{
1994	if (op->inv)
1995	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1996	{	1960	{
1997	CLEAR_FLAG (tmp, flag);	1961	CLEAR_FLAG (tmp, flag);
1998	unflag_inv (tmp, flag);	1962	unflag_inv (tmp, flag);
1999	}	1963	}
2000	}	1964	}
2001		1965
2002	/*	1966	/*
2003	* find_free_spot(object, map, x, y, start, stop) will search for	1967	* find_free_spot(object, map, x, y, start, stop) will search for
2004	* a spot at the given map and coordinates which will be able to contain	1968	* a spot at the given map and coordinates which will be able to contain
…		…
2006	* to search (see the freearr_x/y[] definition).	1970	* to search (see the freearr_x/y[] definition).
2007	* It returns a random choice among the alternatives found.	1971	* It returns a random choice among the alternatives found.
2008	* start and stop are where to start relative to the free_arr array (1,9	1972	* start and stop are where to start relative to the free_arr array (1,9
2009	* does all 4 immediate directions). This returns the index into the	1973	* does all 4 immediate directions). This returns the index into the
2010	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1974	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2011	* Note - this only checks to see if there is space for the head of the
2012	* object - if it is a multispace object, this should be called for all
2013	* pieces.
2014	* Note2: This function does correctly handle tiled maps, but does not	1975	* Note: This function does correctly handle tiled maps, but does not
2015	* inform the caller. However, insert_ob_in_map will update as	1976	* inform the caller. However, insert_ob_in_map will update as
2016	* necessary, so the caller shouldn't need to do any special work.	1977	* necessary, so the caller shouldn't need to do any special work.
2017	* Note - updated to take an object instead of archetype - this is necessary	1978	* Note - updated to take an object instead of archetype - this is necessary
2018	* because arch_blocked (now ob_blocked) needs to know the movement type	1979	* because arch_blocked (now ob_blocked) needs to know the movement type
2019	* to know if the space in question will block the object. We can't use	1980	* to know if the space in question will block the object. We can't use
…		…
2021	* customized, changed states, etc.	1982	* customized, changed states, etc.
2022	*/	1983	*/
2023	int	1984	int
2024	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1985	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2025	{	1986	{
		1987	int altern[SIZEOFFREE];
2026	int index = 0, flag;	1988	int index = 0, flag;
2027	int altern[SIZEOFFREE];
2028		1989
2029	for (int i = start; i < stop; i++)	1990	for (int i = start; i < stop; i++)
2030	{	1991	{
2031	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1992	mapxy pos (m, x, y); pos.move (i);
2032	if (!flag)	1993
		1994	if (!pos.normalise ())
		1995	continue;
		1996
		1997	mapspace &ms = *pos;
		1998
		1999	if (ms.flags () & P_IS_ALIVE)
		2000	continue;
		2001
		2002	/* However, often
		2003	* ob doesn't have any move type (when used to place exits)
		2004	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2005	*/
		2006	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2007	{
2033	altern [index++] = i;	2008	altern [index++] = i;
		2009	continue;
		2010	}
2034		2011
2035	/* Basically, if we find a wall on a space, we cut down the search size.	2012	/* Basically, if we find a wall on a space, we cut down the search size.
2036	* In this way, we won't return spaces that are on another side of a wall.	2013	* In this way, we won't return spaces that are on another side of a wall.
2037	* This mostly work, but it cuts down the search size in all directions -	2014	* This mostly work, but it cuts down the search size in all directions -
2038	* if the space being examined only has a wall to the north and empty	2015	* if the space being examined only has a wall to the north and empty
2039	* spaces in all the other directions, this will reduce the search space	2016	* spaces in all the other directions, this will reduce the search space
2040	* to only the spaces immediately surrounding the target area, and	2017	* to only the spaces immediately surrounding the target area, and
2041	* won't look 2 spaces south of the target space.	2018	* won't look 2 spaces south of the target space.
2042	*/	2019	*/
2043	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2020	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2021	{
2044	stop = maxfree[i];	2022	stop = maxfree[i];
		2023	continue;
		2024	}
		2025
		2026	/* Note it is intentional that we check ob - the movement type of the
		2027	* head of the object should correspond for the entire object.
		2028	*/
		2029	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2030	continue;
		2031
		2032	if (ob->blocked (m, pos.x, pos.y))
		2033	continue;
		2034
		2035	altern [index++] = i;
2045	}	2036	}
2046		2037
2047	if (!index)	2038	if (!index)
2048	return -1;	2039	return -1;
2049		2040
…		…
2058	*/	2049	*/
2059	int	2050	int
2060	find_first_free_spot (const object ob, maptile m, int x, int y)	2051	find_first_free_spot (const object ob, maptile m, int x, int y)
2061	{	2052	{
2062	for (int i = 0; i < SIZEOFFREE; i++)	2053	for (int i = 0; i < SIZEOFFREE; i++)
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2054	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2055	return i;
2065		2056
2066	return -1;	2057	return -1;
2067	}	2058	}
2068		2059
…		…
2345	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2336	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2346	* core dumps if they do.	2337	* core dumps if they do.
2347	*	2338	*
2348	* Add a check so we can't pick up invisible objects (0.93.8)	2339	* Add a check so we can't pick up invisible objects (0.93.8)
2349	*/	2340	*/
2350
2351	int	2341	int
2352	can_pick (const object who, const object item)	2342	can_pick (const object who, const object item)
2353	{	2343	{
2354	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2344	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2355	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2606	{	2596	{
2607	char flagdesc[512];	2597	char flagdesc[512];
2608	char info2[256 * 4];	2598	char info2[256 * 4];
2609	char *p = info;	2599	char *p = info;
2610		2600
2611	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2601	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2612	count, uuid.seq,	2602	count,
		2603	uuid.c_str (),
2613	&name,	2604	&name,
2614	title ? "\",title:\"" : "",	2605	title ? "\",title:\"" : "",
2615	title ? (const char *)title : "",	2606	title ? (const char *)title : "",
2616	flag_desc (flagdesc, 512), type);	2607	flag_desc (flagdesc, 512), type);
2617		2608
2618	if (env)	2609	if (!this->flag[FLAG_REMOVED] && env)
2619	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620		2611
2621	if (map)	2612	if (map)
2622	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623		2614
…		…
2670	old_container->flag [FLAG_APPLIED] = 0;	2661	old_container->flag [FLAG_APPLIED] = 0;
2671	container = 0;	2662	container = 0;
2672		2663
2673	esrv_update_item (UPD_FLAGS, this, old_container);	2664	esrv_update_item (UPD_FLAGS, this, old_container);
2674	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2666	play_sound (sound_find ("chest_close"));
2675	}	2667	}
2676		2668
2677	if (new_container)	2669	if (new_container)
2678	{	2670	{
2679	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2695	new_container->flag [FLAG_APPLIED] = 1;	2687	new_container->flag [FLAG_APPLIED] = 1;
2696	container = new_container;	2688	container = new_container;
2697		2689
2698	esrv_update_item (UPD_FLAGS, this, new_container);	2690	esrv_update_item (UPD_FLAGS, this, new_container);
2699	esrv_send_inventory (this, new_container);	2691	esrv_send_inventory (this, new_container);
		2692	play_sound (sound_find ("chest_open"));
2700	}	2693	}
2701	}	2694	}
2702		2695
2703	object *	2696	object *
2704	object::force_find (const shstr name)	2697	object::force_find (const shstr name)
…		…
2730	force->flag [FLAG_APPLIED] = true;	2723	force->flag [FLAG_APPLIED] = true;
2731		2724
2732	insert (force);	2725	insert (force);
2733	}	2726	}
2734		2727
		2728	void
		2729	object::play_sound (faceidx sound) const
		2730	{
		2731	if (!sound)
		2732	return;
		2733
		2734	if (flag [FLAG_REMOVED])
		2735	return;
		2736
		2737	if (env)
		2738	{
		2739	if (object *pl = in_player ())
		2740	pl->contr->play_sound (sound);
		2741	}
		2742	else
		2743	map->play_sound (sound, x, y);
		2744	}
		2745

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs. Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.171 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC