ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.209 by root, Mon Apr 21 06:35:26 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program 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 2 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
…		…
34	#include <sproto.h>	30	#include <sproto.h>
35	#include <loader.h>	31	#include <loader.h>
36		32
37	#include <bitset>	33	#include <bitset>
38		34
39	int nrofallocobjects = 0;	35	UUID UUID::cur;
40	static UUID uuid;	36	static uint64_t seq_next_save;
41	const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
42		38
43	objectvec objects;	39	objectvec objects;
44	activevec actives;	40	activevec actives;
45		41
46	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,	42	short freearr_x[SIZEOFFREE] = {
		43	0,
		44	0, 1, 1, 1, 0, -1, -1, -1,
		45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -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
48	};	47	};
49	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,	48	short freearr_y[SIZEOFFREE] = {
		49	0,
		50	-1, -1, 0, 1, 1, 1, 0, -1,
		51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51	};	53	};
52	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,	54	int maxfree[SIZEOFFREE] = {
		55	0,
		56	9, 10, 13, 14, 17, 18, 21, 22,
		57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53	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	58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54	};	59	};
55	int freedir[SIZEOFFREE] = {	60	int freedir[SIZEOFFREE] = {
56	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,	61	0,
		62	1, 2, 3, 4, 5, 6, 7, 8,
		63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58	};	65	};
59		66
60	static void	67	static void
61	write_uuid (void)	68	write_uuid (uval64 skip, bool sync)
62	{	69	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	70	CALL_BEGIN (2);
64		71	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	72	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	73	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		74	CALL_END;
68	FILE *fp;
69
70	if (!(fp = fopen (filename2, "w")))
71	{
72	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73	return;
74	}
75
76	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77	fclose (fp);
78	rename (filename2, filename1);
79	}	75	}
80		76
81	static void	77	static void
82	read_uuid (void)	78	read_uuid (void)
83	{	79	{
84	char filename[MAX_BUF];	80	char filename[MAX_BUF];
85		81
86	sprintf (filename, "%s/uuid", settings.localdir);	82	sprintf (filename, "%s/uuid", settings.localdir);
87		83
		84	seq_next_save = 0;
		85
88	FILE *fp;	86	FILE *fp;
89		87
90	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
91	{	89	{
92	if (errno == ENOENT)	90	if (errno == ENOENT)
93	{	91	{
94	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	93	UUID::cur.seq = 0;
96	write_uuid ();	94	write_uuid (UUID_GAP, true);
97	return;	95	return;
98	}	96	}
99		97
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	99	_exit (1);
102	}	100	}
103		101
104	int version;	102	UUID::BUF buf;
105	unsigned long long uid;	103	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	104	fgets (buf, sizeof (buf), fp);
		105
		106	if (!UUID::cur.parse (buf))
107	{	107	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	108	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	109	_exit (1);
110	}	110	}
111		111
112	uuid.seq = uid;	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	113
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	114	write_uuid (UUID_GAP, true);
115	fclose (fp);	115	fclose (fp);
116	}	116	}
117		117
118	UUID	118	UUID
119	gen_uuid ()	119	UUID::gen ()
120	{	120	{
121	UUID uid;	121	UUID uid;
122		122
123	uid.seq = ++uuid.seq;	123	uid.seq = ++cur.seq;
124		124
125	if (!(uuid.seq & (UUID_SKIP - 1)))	125	if (expect_false (cur.seq >= seq_next_save))
126	write_uuid ();	126	{
		127	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		128	write_uuid (UUID_GAP, false);
		129	}
		130
127		131
128	return uid;	132	return uid;
129	}	133	}
130		134
131	void	135	void
132	init_uuid ()	136	UUID::init ()
133	{	137	{
134	read_uuid ();	138	read_uuid ();
135	}	139	}
136		140
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	142	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	143	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	144	{
141	key_value *wants_field;	145	key_value *wants_field;
142		146
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
151	key_value *has_field;	155	key_value *has_field;
152		156
153	/* Look for a field in has with the same key. */	157	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);	158	has_field = get_ob_key_link (has, wants_field->key);
155		159
156	if (has_field == NULL)	160	if (!has_field)
157	{
158	/* No field with that name. */	161	return 0; /* No field with that name. */
159	return FALSE;
160	}
161		162
162	/* Found the matching field. */	163	/* Found the matching field. */
163	if (has_field->value != wants_field->value)	164	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */	165	return 0; /* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168		166
169	/* If we get here, we found a match. Now for the next field in wants. */	167	/* If we get here, we found a match. Now for the next field in wants. */
170	}	168	}
171		169
172	/* If we get here, every field in wants has a matching field in has. */	170	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	171	return 1;
174	}	172	}
175		173
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	174	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	175	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	176	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	177	{
180	/* However, there may be fields in has which aren't partnered in wants,	178	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison *twice*. :(	179	* so we need to run the comparison *twice*. :(
182	*/	180	*/
…		…
203	|| ob1->speed != ob2->speed	201	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	202	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	203	|| ob1->name != ob2->name)
206	return 0;	204	return 0;
207		205
208	//TODO: this ain't working well, use nicer and correct overflow check	206	/* 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	207	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	209	* nrof values.
212	*/	210	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	212	return 0;
215		213
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	214	/* 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	215	* 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	216	* 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	217	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	218	* flags lose any meaning.
221	*/	219	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		222
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		225
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	227	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	228	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	229	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	230	|| 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	231	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	232	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	233	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	234	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	235	|| ob1->value != ob2->value
…		…
247	|| ob1->move_block != ob2->move_block	242	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	243	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	244	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	245	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	246	|| ob1->move_slow != ob2->move_slow
252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	247	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		248	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	250	return 0;
254		251
		252	if ((ob1->flag ^ ob2->flag)
		253	.reset (FLAG_INV_LOCKED)
		254	.reset (FLAG_CLIENT_SENT)
		255	.reset (FLAG_REMOVED)
		256	.any ())
		257	return 0;
		258
255	/* This is really a spellbook check - really, we should	259	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	260	* not merge objects with real inventories, as splitting them
		261	* is hard.
257	*/	262	*/
258	if (ob1->inv || ob2->inv)	263	if (ob1->inv || ob2->inv)
259	{	264	{
260	/* if one object has inventory but the other doesn't, not equiv */	265	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	266	return 0; /* inventories differ in length */
262	return 0;
263		267
264	/* Now check to see if the two inventory objects could merge */	268	if (ob1->inv->below || ob2->inv->below)
		269	return 0; /* more than one object in inv */
		270
265	if (!object::can_merge (ob1->inv, ob2->inv))	271	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	272	return 0; /* inventory objects differ */
267		273
268	/* inventory ok - still need to check rest of this object to see	274	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	275	* if it is valid.
270	*/	276	*/
271	}	277	}
…		…
290	if (ob1->level != ob2->level)	296	if (ob1->level != ob2->level)
291	return 0;	297	return 0;
292	break;	298	break;
293	}	299	}
294		300
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	301	if (ob1->key_values || ob2->key_values)
296	{	302	{
297	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	304	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
		306
		307	if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	308	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;
303	}	309	}
304		310
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	311	if (ob1->self || ob2->self)
307	{	312	{
308	ob1->optimise ();	313	ob1->optimise ();
309	ob2->optimise ();	314	ob2->optimise ();
310		315
311	if (ob1->self || ob2->self)	316	if (ob1->self || ob2->self)
		317	{
		318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		320
		321	if (k1 != k2)
312	return 0;	322	return 0;
		323
		324	if (k1 == 0)
		325	return 1;
		326
		327	if (!cfperl_can_merge (ob1, ob2))
		328	return 0;
		329	}
313	}	330	}
314		331
315	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
316	return 1;	333	return 1;
317	}	334	}
318		335
		336	// adjust weight per container type ("of holding")
		337	static sint32
		338	weight_adjust (object *op, sint32 weight)
		339	{
		340	return op->type == CONTAINER
		341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		342	: weight;
		343	}
		344
319	/*	345	/*
		346	* adjust_weight(object, weight) adds the specified weight to an object,
		347	* and also updates how much the environment(s) is/are carrying.
		348	*/
		349	static void
		350	adjust_weight (object *op, sint32 weight)
		351	{
		352	while (op)
		353	{
		354	weight = weight_adjust (op, weight);
		355
		356	op->carrying += weight;
		357	op = op->env;
		358	}
		359	}
		360
		361	/*
320	* sum_weight() is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	363	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	364	* containers are carrying, and sums it up.
323	*/	365	*/
324	long	366	void
325	sum_weight (object *op)	367	object::update_weight ()
326	{	368	{
327	long sum;	369	sint32 sum = 0;
328	object *inv;
329		370
330	for (sum = 0, inv = op->inv; inv; inv = inv->below)	371	for (object *op = inv; op; op = op->below)
331	{	372	{
332	if (inv->inv)	373	if (op->inv)
333	sum_weight (inv);	374	op->update_weight ();
334		375
335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	376	sum += op->total_weight ();
336	}	377	}
337		378
338	if (op->type == CONTAINER && op->stats.Str)	379	carrying = weight_adjust (this, sum);
339	sum = (sum * (100 - op->stats.Str)) / 100;
340
341	if (op->carrying != sum)
342	op->carrying = sum;
343
344	return sum;
345	}	380	}
346		381
347	/**	382	/*
348	* Return the outermost environment object for a given object.	383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
349	*/
350
351	object *
352	object_get_env_recursive (object *op)
353	{
354	while (op->env != NULL)
355	op = op->env;
356	return op;
357	}
358
359	/*
360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361	* Some error messages.
362	* The result of the dump is stored in the static global errmsg array.
363	*/	384	*/
364	char *	385	char *
365	dump_object (object *op)	386	dump_object (object *op)
366	{	387	{
367	if (!op)	388	if (!op)
…		…
375	/*	396	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	397	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	398	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	399	* If it's not a multi-object, it is returned.
379	*/	400	*/
380
381	object *	401	object *
382	get_nearest_part (object *op, const object *pl)	402	get_nearest_part (object *op, const object *pl)
383	{	403	{
384	object *tmp, *closest;	404	object *tmp, *closest;
385	int last_dist, i;	405	int last_dist, i;
386		406
387	if (op->more == NULL)	407	if (!op->more)
388	return op;	408	return op;
		409
389	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		411	tmp;
		412	tmp = tmp->more)
390	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
391	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
392	return closest;	416	return closest;
393	}	417	}
394		418
395	/*	419	/*
396	* Returns the object which has the count-variable equal to the argument.	420	* Returns the object which has the count-variable equal to the argument.
		421	* VERRRY slow.
397	*/	422	*/
398	object *	423	object *
399	find_object (tag_t i)	424	find_object (tag_t i)
400	{	425	{
401	for_all_objects (op)	426	for_all_objects (op)
…		…
421	break;	446	break;
422		447
423	return op;	448	return op;
424	}	449	}
425		450
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	451	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	453	* skill and experience objects.
		454	* ACTUALLY NO! investigate! TODO
435	*/	455	*/
436	void	456	void
437	object::set_owner (object *owner)	457	object::set_owner (object *owner)
438	{	458	{
		459	// allow objects which own objects
439	if (!owner)	460	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	461	while (owner->owner)
450	owner = owner->owner;	462	owner = owner->owner;
		463
		464	if (flag [FLAG_FREED])
		465	{
		466	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		467	return;
		468	}
451		469
452	this->owner = owner;	470	this->owner = owner;
453	}	471	}
454		472
455	void	473	int
		474	object::slottype () const
		475	{
		476	if (type == SKILL)
		477	{
		478	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		479	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		480	}
		481	else
		482	{
		483	if (slot [body_combat].info) return slot_combat;
		484	if (slot [body_range ].info) return slot_ranged;
		485	}
		486
		487	return slot_none;
		488	}
		489
		490	bool
456	object::set_weapon (object *ob)	491	object::change_weapon (object *ob)
457	{	492	{
458	if (current_weapon == ob)	493	if (current_weapon == ob)
459	return;	494	return true;
460
461	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462		495
463	if (chosen_skill)	496	if (chosen_skill)
464	chosen_skill->flag [FLAG_APPLIED] = false;	497	chosen_skill->flag [FLAG_APPLIED] = false;
465		498
466	current_weapon = ob;	499	current_weapon = ob;
467	chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);	500	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468		501
469	if (chosen_skill)	502	if (chosen_skill)
470	chosen_skill->flag [FLAG_APPLIED] = true;	503	chosen_skill->flag [FLAG_APPLIED] = true;
471		504
472	update_stats ();	505	update_stats ();
		506
		507	if (ob)
		508	{
		509	// now check wether any body locations became invalid, in which case
		510	// we cannot apply the weapon at the moment.
		511	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		512	if (slot[i].used < 0)
		513	{
		514	current_weapon = chosen_skill = 0;
		515	update_stats ();
		516
		517	new_draw_info_format (NDI_UNIQUE, 0, this,
		518	"You try to balance all your items at once, "
		519	"but the %s is just too much for your body. "
		520	"[You need to unapply some items first.]", &ob->name);
		521	return false;
		522	}
		523
		524	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		525	}
		526	else
		527	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		528
		529	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		530	{
		531	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		532	&name, ob->debug_desc ());
		533	return false;
		534	}
		535
		536	return true;
473	}	537	}
474		538
475	/* Zero the key_values on op, decrementing the shared-string	539	/* Zero the key_values on op, decrementing the shared-string
476	* refcounts and freeing the links.	540	* refcounts and freeing the links.
477	*/	541	*/
…		…
541	object::copy_to (object *dst)	605	object::copy_to (object *dst)
542	{	606	{
543	*dst = *this;	607	*dst = *this;
544		608
545	if (speed < 0)	609	if (speed < 0)
546	dst->speed_left = speed_left - rndm ();	610	dst->speed_left -= rndm ();
547		611
548	dst->set_speed (dst->speed);	612	dst->set_speed (dst->speed);
549	}	613	}
550		614
551	void	615	void
552	object::instantiate ()	616	object::instantiate ()
553	{	617	{
554	if (!uuid.seq) // HACK	618	if (!uuid.seq) // HACK
555	uuid = gen_uuid ();	619	uuid = UUID::gen ();
556		620
557	speed_left = -0.1f;	621	speed_left = -0.1f;
558	/* copy the body_info to the body_used - this is only really	622	/* copy the body_info to the body_used - this is only really
559	* need for monsters, but doesn't hurt to do it for everything.	623	* need for monsters, but doesn't hurt to do it for everything.
560	* by doing so, when a monster is created, it has good starting	624	* by doing so, when a monster is created, it has good starting
…		…
719	static int object_count;	783	static int object_count;
720		784
721	void object::link ()	785	void object::link ()
722	{	786	{
723	assert (!index);//D	787	assert (!index);//D
724	uuid = gen_uuid ();	788	uuid = UUID::gen ();
725	count = ++object_count;	789	count = ++object_count;
726		790
727	refcnt_inc ();	791	refcnt_inc ();
728	objects.insert (this);	792	objects.insert (this);
729	}	793	}
…		…
813	* if some form of movement is allowed, let objects	877	* if some form of movement is allowed, let objects
814	* drop on that space.	878	* drop on that space.
815	*/	879	*/
816	if (!drop_to_ground	880	if (!drop_to_ground
817	|| !map	881	|| !map
818	|| map->in_memory != MAP_IN_MEMORY	882	|| map->in_memory != MAP_ACTIVE
819	|| map->nodrop	883	|| map->nodrop
820	|| ms ().move_block == MOVE_ALL)	884	|| ms ().move_block == MOVE_ALL)
821	{	885	{
822	while (inv)	886	while (inv)
823	{	887	{
…		…
878		942
879	if (!freed_map)	943	if (!freed_map)
880	{	944	{
881	freed_map = new maptile;	945	freed_map = new maptile;
882		946
		947	freed_map->path = "<freed objects map>";
883	freed_map->name = "/internal/freed_objects_map";	948	freed_map->name = "/internal/freed_objects_map";
884	freed_map->width = 3;	949	freed_map->width = 3;
885	freed_map->height = 3;	950	freed_map->height = 3;
		951	freed_map->nodrop = 1;
886		952
887	freed_map->alloc ();	953	freed_map->alloc ();
888	freed_map->in_memory = MAP_IN_MEMORY;	954	freed_map->in_memory = MAP_ACTIVE;
889	}	955	}
890		956
891	map = freed_map;	957	map = freed_map;
892	x = 1;	958	x = 1;
893	y = 1;	959	y = 1;
894	}	960	}
895		961
896	head = 0;
897
898	if (more)	962	if (more)
899	{	963	{
900	more->destroy ();	964	more->destroy ();
901	more = 0;	965	more = 0;
902	}	966	}
903		967
		968	head = 0;
		969
904	// clear those pointers that likely might have circular references to us	970	// clear those pointers that likely might cause circular references
905	owner = 0;	971	owner = 0;
906	enemy = 0;	972	enemy = 0;
907	attacked_by = 0;	973	attacked_by = 0;
		974	current_weapon = 0;
908	}	975	}
909		976
910	void	977	void
911	object::destroy (bool destroy_inventory)	978	object::destroy (bool destroy_inventory)
912	{	979	{
…		…
914	return;	981	return;
915		982
916	if (destroy_inventory)	983	if (destroy_inventory)
917	destroy_inv (false);	984	destroy_inv (false);
918		985
		986	if (is_head ())
		987	if (sound_destroy)
		988	play_sound (sound_destroy);
		989	else if (flag [FLAG_MONSTER])
		990	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
		991
919	attachable::destroy ();	992	attachable::destroy ();
920	}
921
922	/*
923	* sub_weight() recursively (outwards) subtracts a number from the
924	* weight of an object (and what is carried by it's environment(s)).
925	*/
926	void
927	sub_weight (object *op, signed long weight)
928	{
929	while (op != NULL)
930	{
931	if (op->type == CONTAINER)
932	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
933
934	op->carrying -= weight;
935	op = op->env;
936	}
937	}	993	}
938		994
939	/* op->remove ():	995	/* op->remove ():
940	* This function removes the object op from the linked list of objects	996	* This function removes the object op from the linked list of objects
941	* which it is currently tied to. When this function is done, the	997	* which it is currently tied to. When this function is done, the
…		…
962	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
963	* inventory.	1019	* inventory.
964	*/	1020	*/
965	if (env)	1021	if (env)
966	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
967	if (nrof)	1027	if (below)
968	sub_weight (env, weight * nrof);	1028	below->above = above;
969	else	1029
970	sub_weight (env, weight + carrying);	1030	/* we set up values so that it could be inserted into
		1031	* the map, but we don't actually do that - it is up
		1032	* to the caller to decide what we want to do.
		1033	*/
		1034	map = env->map;
		1035	x = env->x;
		1036	y = env->y;
		1037	above = 0;
		1038	below = 0;
		1039	env = 0;
971		1040
972	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
973	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
974	* to save cpu time.	1043	* to save cpu time.
975	*/	1044	*/
976	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
977	otmp->update_stats ();	1046	otmp->update_stats ();
978
979	if (above)
980	above->below = below;
981	else
982	env->inv = below;
983
984	if (below)
985	below->above = above;
986
987	/* we set up values so that it could be inserted into
988	* the map, but we don't actually do that - it is up
989	* to the caller to decide what we want to do.
990	*/
991	x = env->x, y = env->y;
992	map = env->map;
993	above = 0, below = 0;
994	env = 0;
995	}	1047	}
996	else if (map)	1048	else if (map)
997	{	1049	{
998	if (type == PLAYER)	1050	if (type == PLAYER)
999	{	1051	{
…		…
1037	if (map->in_memory == MAP_SAVING)	1089	if (map->in_memory == MAP_SAVING)
1038	return;	1090	return;
1039		1091
1040	int check_walk_off = !flag [FLAG_NO_APPLY];	1092	int check_walk_off = !flag [FLAG_NO_APPLY];
1041		1093
		1094	if (object *pl = ms.player ())
		1095	{
		1096	if (pl->container == this)
		1097	/* If a container that the player is currently using somehow gets
		1098	* removed (most likely destroyed), update the player view
		1099	* appropriately.
		1100	*/
		1101	pl->close_container ();
		1102
		1103	pl->contr->ns->floorbox_update ();
		1104	}
		1105
1042	for (tmp = ms.bot; tmp; tmp = tmp->above)	1106	for (tmp = ms.bot; tmp; tmp = tmp->above)
1043	{	1107	{
1044	/* No point updating the players look faces if he is the object	1108	/* No point updating the players look faces if he is the object
1045	* being removed.	1109	* being removed.
1046	*/	1110	*/
1047
1048	if (tmp->type == PLAYER && tmp != this)
1049	{
1050	/* If a container that the player is currently using somehow gets
1051	* removed (most likely destroyed), update the player view
1052	* appropriately.
1053	*/
1054	if (tmp->container == this)
1055	{
1056	flag [FLAG_APPLIED] = 0;
1057	tmp->container = 0;
1058	}
1059
1060	if (tmp->contr->ns)
1061	tmp->contr->ns->floorbox_update ();
1062	}
1063		1111
1064	/* See if object moving off should effect something */	1112	/* See if object moving off should effect something */
1065	if (check_walk_off	1113	if (check_walk_off
1066	&& ((move_type & tmp->move_off)	1114	&& ((move_type & tmp->move_off)
1067	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1070		1118
1071	if (destroyed ())	1119	if (destroyed ())
1072	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1073	}	1121	}
1074		1122
1075	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1076	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1077	if (tmp->above == tmp)
1078	tmp->above = 0;
1079
1080	last = tmp;	1123	last = tmp;
1081	}	1124	}
1082		1125
1083	/* last == NULL if there are no objects on this space */	1126	/* last == NULL if there are no objects on this space */
1084	//TODO: this makes little sense, why only update the topmost object?	1127	//TODO: this makes little sense, why only update the topmost object?
…		…
1104	merge_ob (object *op, object *top)	1147	merge_ob (object *op, object *top)
1105	{	1148	{
1106	if (!op->nrof)	1149	if (!op->nrof)
1107	return 0;	1150	return 0;
1108		1151
1109	if (top)	1152	if (!top)
1110	for (top = op; top && top->above; top = top->above)	1153	for (top = op; top && top->above; top = top->above)
1111	;	1154	;
1112		1155
1113	for (; top; top = top->below)	1156	for (; top; top = top->below)
1114	{	1157	{
…		…
1135	if (more)	1178	if (more)
1136	return;	1179	return;
1137		1180
1138	object *prev = this;	1181	object *prev = this;
1139		1182
1140	for (archetype *at = arch->more; at; at = at->more)	1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1141	{	1184	{
1142	object *op = arch_to_object (at);	1185	object *op = arch_to_object (at);
1143		1186
1144	op->name = name;	1187	op->name = name;
1145	op->name_pl = name_pl;	1188	op->name_pl = name_pl;
…		…
1159	object *	1202	object *
1160	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1161	{	1204	{
1162	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1163	{	1206	{
1164	tmp->x = x + tmp->arch->clone.x;	1207	tmp->x = x + tmp->arch->x;
1165	tmp->y = y + tmp->arch->clone.y;	1208	tmp->y = y + tmp->arch->y;
1166	}	1209	}
1167		1210
1168	return insert_ob_in_map (op, m, originator, flag);	1211	return insert_ob_in_map (op, m, originator, flag);
1169	}	1212	}
1170		1213
…		…
1191	object *	1234	object *
1192	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1193	{	1236	{
1194	assert (!op->flag [FLAG_FREED]);	1237	assert (!op->flag [FLAG_FREED]);
1195		1238
1196	object *tmp, *top, *floor = NULL;	1239	object *top, *floor = NULL;
1197		1240
1198	op->remove ();	1241	op->remove ();
1199
1200	#if 0
1201	if (!m->active != !op->active)
1202	if (m->active)
1203	op->activate_recursive ();
1204	else
1205	op->deactivate_recursive ();
1206	#endif
1207
1208	if (out_of_map (m, op->x, op->y))
1209	{
1210	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1211	#ifdef MANY_CORES
1212	/* Better to catch this here, as otherwise the next use of this object
1213	* is likely to cause a crash. Better to find out where it is getting
1214	* improperly inserted.
1215	*/
1216	abort ();
1217	#endif
1218	return op;
1219	}
1220
1221	if (object *more = op->more)
1222	{
1223	if (!insert_ob_in_map (more, m, originator, flag))
1224	{
1225	if (!op->head)
1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228	return 0;
1229	}
1230	}
1231
1232	CLEAR_FLAG (op, FLAG_REMOVED);
1233		1242
1234	/* Ideally, the caller figures this out. However, it complicates a lot	1243	/* Ideally, the caller figures this out. However, it complicates a lot
1235	* of areas of callers (eg, anything that uses find_free_spot would now	1244	* of areas of callers (eg, anything that uses find_free_spot would now
1236	* need extra work	1245	* need extra work
1237	*/	1246	*/
1238	if (!xy_normalise (m, op->x, op->y))	1247	if (!xy_normalise (m, op->x, op->y))
		1248	{
		1249	op->destroy ();
1239	return 0;	1250	return 0;
		1251	}
		1252
		1253	if (object *more = op->more)
		1254	if (!insert_ob_in_map (more, m, originator, flag))
		1255	return 0;
		1256
		1257	CLEAR_FLAG (op, FLAG_REMOVED);
1240		1258
1241	op->map = m;	1259	op->map = m;
1242	mapspace &ms = op->ms ();	1260	mapspace &ms = op->ms ();
1243		1261
1244	/* this has to be done after we translate the coordinates.	1262	/* this has to be done after we translate the coordinates.
1245	*/	1263	*/
1246	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1247	for (tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1248	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1249	{	1267	{
1250	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1251	tmp->destroy ();	1269	tmp->destroy (1);
1252	}	1270	}
1253		1271
1254	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1255	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1256		1274
…		…
1279	else	1297	else
1280	{	1298	{
1281	top = ms.bot;	1299	top = ms.bot;
1282		1300
1283	/* If there are other objects, then */	1301	/* If there are other objects, then */
1284	if ((!(flag & INS_MAP_LOAD)) && top)	1302	if (top)
1285	{	1303	{
1286	object *last = 0;	1304	object *last = 0;
1287		1305
1288	/*	1306	/*
1289	* If there are multiple objects on this space, we do some trickier handling.	1307	* If there are multiple objects on this space, we do some trickier handling.
…		…
1342	if (last && last->below && last != floor)	1360	if (last && last->below && last != floor)
1343	top = last->below;	1361	top = last->below;
1344	}	1362	}
1345	} /* If objects on this space */	1363	} /* If objects on this space */
1346		1364
1347	if (flag & INS_MAP_LOAD)
1348	top = ms.top;
1349
1350	if (flag & INS_ABOVE_FLOOR_ONLY)	1365	if (flag & INS_ABOVE_FLOOR_ONLY)
1351	top = floor;	1366	top = floor;
1352		1367
1353	/* Top is the object that our object (op) is going to get inserted above.	1368	/* Top is the object that our object (op) is going to get inserted above.
1354	*/	1369	*/
…		…
1386	op->map->touch ();	1401	op->map->touch ();
1387	}	1402	}
1388		1403
1389	op->map->dirty = true;	1404	op->map->dirty = true;
1390		1405
1391	/* If we have a floor, we know the player, if any, will be above
1392	* it, so save a few ticks and start from there.
1393	*/
1394	if (!(flag & INS_MAP_LOAD))
1395	if (object *pl = ms.player ())	1406	if (object *pl = ms.player ())
1396	if (pl->contr->ns)
1397	pl->contr->ns->floorbox_update ();	1407	pl->contr->ns->floorbox_update ();
1398		1408
1399	/* If this object glows, it may affect lighting conditions that are	1409	/* If this object glows, it may affect lighting conditions that are
1400	* visible to others on this map. But update_all_los is really	1410	* visible to others on this map. But update_all_los is really
1401	* an inefficient way to do this, as it means los for all players	1411	* an inefficient way to do this, as it means los for all players
1402	* on the map will get recalculated. The players could very well	1412	* on the map will get recalculated. The players could very well
…		…
1421	* blocked() and wall() work properly), and these flags are updated by	1431	* blocked() and wall() work properly), and these flags are updated by
1422	* update_object().	1432	* update_object().
1423	*/	1433	*/
1424		1434
1425	/* if this is not the head or flag has been passed, don't check walk on status */	1435	/* if this is not the head or flag has been passed, don't check walk on status */
1426	if (!(flag & INS_NO_WALK_ON) && !op->head)	1436	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1427	{	1437	{
1428	if (check_move_on (op, originator))	1438	if (check_move_on (op, originator))
1429	return 0;	1439	return 0;
1430		1440
1431	/* If we are a multi part object, lets work our way through the check	1441	/* If we are a multi part object, lets work our way through the check
1432	* walk on's.	1442	* walk on's.
1433	*/	1443	*/
1434	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1444	for (object *tmp = op->more; tmp; tmp = tmp->more)
1435	if (check_move_on (tmp, originator))	1445	if (check_move_on (tmp, originator))
1436	return 0;	1446	return 0;
1437	}	1447	}
1438		1448
1439	return op;	1449	return op;
…		…
1444	* op is the object to insert it under: supplies x and the map.	1454	* op is the object to insert it under: supplies x and the map.
1445	*/	1455	*/
1446	void	1456	void
1447	replace_insert_ob_in_map (const char *arch_string, object *op)	1457	replace_insert_ob_in_map (const char *arch_string, object *op)
1448	{	1458	{
1449	object *tmp, *tmp1;
1450
1451	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1452		1460
1453	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1454	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1455	tmp->destroy ();	1463	tmp->destroy (1);
1456		1464
1457	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1458		1466
1459	tmp1->x = op->x;	1467	tmp->x = op->x;
1460	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1461	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1462	}	1471	}
1463		1472
1464	object *	1473	object *
1465	object::insert_at (object *where, object *originator, int flags)	1474	object::insert_at (object *where, object *originator, int flags)
1466	{	1475	{
		1476	if (where->env)
		1477	return where->env->insert (this);
		1478	else
1467	return where->map->insert (this, where->x, where->y, originator, flags);	1479	return where->map->insert (this, where->x, where->y, originator, flags);
		1480	}
		1481
		1482	// find player who can see this object
		1483	static object *
		1484	visible_to (object *op)
		1485	{
		1486	if (!op->flag [FLAG_REMOVED])
		1487	{
		1488	// see if we are in a container of sorts
		1489	if (object *env = op->env)
		1490	{
		1491	// the player inventory itself is always visible
		1492	if (env->type == PLAYER)
		1493	return env;
		1494
		1495	// else a player could have our env open
		1496	env = env->outer_env ();
		1497
		1498	// the player itself is always on a map, so we will find him here
		1499	// even if our inv is in a player.
		1500	if (env->is_on_map ())
		1501	if (object *pl = env->ms ().player ())
		1502	if (pl->container == op->env)
		1503	return pl;
		1504	}
		1505	else
		1506	{
		1507	// maybe there is a player standing on the same mapspace
		1508	if (object *pl = env->ms ().player ())
		1509	return pl;
		1510	}
		1511	}
		1512
		1513	return 0;
		1514	}
		1515
		1516	/*
		1517	* decrease(object, number) decreases a specified number from
		1518	* the amount of an object. If the amount reaches 0, the object
		1519	* is subsequently removed and freed.
		1520	*
		1521	* Return value: 'op' if something is left, NULL if the amount reached 0
		1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	nr = min (nr, nrof);
		1527
		1528	if (!nr)
		1529	return 1;
		1530
		1531	nrof -= nr;
		1532
		1533	object *visible = visible_to (this);
		1534
		1535	if (nrof)
		1536	{
		1537	adjust_weight (env, -weight * nr); // carrying == 0
		1538
		1539	if (visible)
		1540	esrv_send_item (visible, this);
		1541
		1542	return 1;
		1543	}
		1544	else
		1545	{
		1546	if (visible)
		1547	esrv_del_item (visible->contr, count);
		1548
		1549	this->destroy (1);
		1550	return 0;
		1551	}
1468	}	1552	}
1469		1553
1470	/*	1554	/*
1471	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1555	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1472	* is returned contains nr objects, and the remaining parts contains	1556	* is returned contains nr objects, and the remaining parts contains
1473	* the rest (or is removed and freed if that number is 0).	1557	* the rest (or is removed and freed if that number is 0).
1474	* On failure, NULL is returned, and the reason put into the	1558	* On failure, NULL is returned, and the reason put into the
1475	* global static errmsg array.	1559	* global static errmsg array.
1476	*/	1560	*/
1477	object *	1561	object *
		1562	object::split (sint32 nr)
		1563	{
		1564	if (nrof < nr)
		1565	return 0;
		1566	else if (nrof == nr)
		1567	{
		1568	remove ();
		1569	return this;
		1570	}
		1571	else
		1572	{
		1573	decrease (nr);
		1574
		1575	object *op = object_create_clone (this);
		1576	op->nrof = nr;
		1577	return op;
		1578	}
		1579	}
		1580
		1581	//TODO: remove, but semantics differs from split_nr
		1582	object *
1478	get_split_ob (object *orig_ob, uint32 nr)	1583	get_split_ob (object *orig_ob, uint32 nr)
1479	{	1584	{
1480	object *newob;
1481	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1482
1483	if (orig_ob->nrof < nr)	1585	if (orig_ob->nrof < nr)
1484	{	1586	{
1485	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1587	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1486	return NULL;
1487	}
1488
1489	newob = object_create_clone (orig_ob);
1490
1491	if ((orig_ob->nrof -= nr) < 1)
1492	orig_ob->destroy (1);
1493	else if (!is_removed)
1494	{
1495	if (orig_ob->env != NULL)
1496	sub_weight (orig_ob->env, orig_ob->weight * nr);
1497	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1498	{
1499	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1500	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1501	return NULL;
1502	}
1503	}
1504
1505	newob->nrof = nr;
1506
1507	return newob;
1508	}
1509
1510	/*
1511	* decrease_ob_nr(object, number) decreases a specified number from
1512	* the amount of an object. If the amount reaches 0, the object
1513	* is subsequently removed and freed.
1514	*
1515	* Return value: 'op' if something is left, NULL if the amount reached 0
1516	*/
1517	object *
1518	decrease_ob_nr (object *op, uint32 i)
1519	{
1520	object *tmp;
1521
1522	if (i == 0) /* objects with op->nrof require this check */
1523	return op;
1524
1525	if (i > op->nrof)
1526	i = op->nrof;
1527
1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1529	op->nrof -= i;
1530	else if (op->env)
1531	{
1532	/* is this object in the players inventory, or sub container
1533	* therein?
1534	*/
1535	tmp = op->in_player ();
1536	/* nope. Is this a container the player has opened?
1537	* If so, set tmp to that player.
1538	* IMO, searching through all the players will mostly
1539	* likely be quicker than following op->env to the map,
1540	* and then searching the map for a player.
1541	*/
1542	if (!tmp)
1543	for_all_players (pl)
1544	if (pl->ob->container == op->env)
1545	{
1546	tmp = pl->ob;
1547	break;
1548	}
1549
1550	if (i < op->nrof)
1551	{
1552	sub_weight (op->env, op->weight * i);
1553	op->nrof -= i;
1554	if (tmp)
1555	esrv_send_item (tmp, op);
1556	}
1557	else
1558	{
1559	op->remove ();
1560	op->nrof = 0;
1561	if (tmp)
1562	esrv_del_item (tmp->contr, op->count);
1563	}
1564	}
1565	else
1566	{
1567	object *above = op->above;
1568
1569	if (i < op->nrof)
1570	op->nrof -= i;
1571	else
1572	{
1573	op->remove ();
1574	op->nrof = 0;
1575	}
1576
1577	/* Since we just removed op, op->above is null */
1578	for (tmp = above; tmp; tmp = tmp->above)
1579	if (tmp->type == PLAYER)
1580	{
1581	if (op->nrof)
1582	esrv_send_item (tmp, op);
1583	else
1584	esrv_del_item (tmp->contr, op->count);
1585	}
1586	}
1587
1588	if (op->nrof)
1589	return op;
1590	else
1591	{
1592	op->destroy ();
1593	return 0;	1588	return 0;
1594	}	1589	}
1595	}
1596		1590
1597	/*	1591	return orig_ob->split (nr);
1598	* add_weight(object, weight) adds the specified weight to an object,
1599	* and also updates how much the environment(s) is/are carrying.
1600	*/
1601	void
1602	add_weight (object *op, signed long weight)
1603	{
1604	while (op != NULL)
1605	{
1606	if (op->type == CONTAINER)
1607	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1608
1609	op->carrying += weight;
1610	op = op->env;
1611	}
1612	}	1592	}
1613		1593
1614	object *	1594	object *
1615	insert_ob_in_ob (object *op, object *where)	1595	insert_ob_in_ob (object *op, object *where)
1616	{	1596	{
…		…
1620	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1600	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1621	free (dump);	1601	free (dump);
1622	return op;	1602	return op;
1623	}	1603	}
1624		1604
1625	if (where->head)	1605	if (where->head_ () != where)
1626	{	1606	{
1627	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1607	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1628	where = where->head;	1608	where = where->head;
1629	}	1609	}
1630		1610
1631	return where->insert (op);	1611	return where->insert (op);
1632	}	1612	}
…		…
1640	* be != op, if items are merged. -Tero	1620	* be != op, if items are merged. -Tero
1641	*/	1621	*/
1642	object *	1622	object *
1643	object::insert (object *op)	1623	object::insert (object *op)
1644	{	1624	{
1645	object *tmp, *otmp;
1646
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1625	if (op->more)
1651	{	1626	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1627	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1628	return op;
1654	}	1629	}
1655		1630
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1631	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1632
		1633	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1634
1658	if (op->nrof)	1635	if (op->nrof)
1659	{
1660	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1636	for (object *tmp = inv; tmp; tmp = tmp->below)
1661	if (object::can_merge (tmp, op))	1637	if (object::can_merge (tmp, op))
1662	{	1638	{
1663	/* return the original object and remove inserted object	1639	/* return the original object and remove inserted object
1664	(client needs the original object) */	1640	(client needs the original object) */
1665	tmp->nrof += op->nrof;	1641	tmp->nrof += op->nrof;
1666	/* Weight handling gets pretty funky. Since we are adding to	1642	op->destroy (1);
1667	* tmp->nrof, we need to increase the weight.
1668	*/
1669	add_weight (this, op->weight * op->nrof);
1670	SET_FLAG (op, FLAG_REMOVED);
1671	op->destroy (); /* free the inserted object */
1672	op = tmp;	1643	op = tmp;
1673	op->remove (); /* and fix old object's links */	1644	goto inserted;
1674	CLEAR_FLAG (op, FLAG_REMOVED);
1675	break;
1676	}	1645	}
1677		1646
1678	/* I assume combined objects have no inventory	1647	op->owner = 0; // it's his/hers now. period.
1679	* We add the weight - this object could have just been removed	1648	op->map = 0;
1680	* (if it was possible to merge). calling remove_ob will subtract	1649	op->x = 0;
1681	* the weight, so we need to add it in again, since we actually do	1650	op->y = 0;
1682	* the linking below
1683	*/
1684	add_weight (this, op->weight * op->nrof);
1685	}
1686	else
1687	add_weight (this, (op->weight + op->carrying));
1688		1651
1689	otmp = this->in_player ();	1652	op->above = 0;
1690	if (otmp && otmp->contr)	1653	op->below = inv;
		1654	op->env = this;
		1655
		1656	if (inv)
		1657	inv->above = op;
		1658
		1659	inv = op;
		1660
		1661	op->flag [FLAG_REMOVED] = 0;
		1662
		1663	adjust_weight (this, op->total_weight ());
		1664
		1665	inserted:
		1666	/* reset the light list and los of the players on the map */
		1667	if (op->glow_radius && map && map->darkness)
		1668	update_all_los (map, x, y);
		1669
		1670	if (object *otmp = in_player ())
1691	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1671	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();	1672	otmp->update_stats ();
1693
1694	op->map = 0;
1695	op->env = this;
1696	op->above = 0;
1697	op->below = 0;
1698	op->x = 0, op->y = 0;
1699
1700	/* reset the light list and los of the players on the map */
1701	if ((op->glow_radius != 0) && map)
1702	{
1703	#ifdef DEBUG_LIGHTS
1704	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1705	#endif /* DEBUG_LIGHTS */
1706	if (map->darkness)
1707	update_all_los (map, x, y);
1708	}
1709
1710	/* Client has no idea of ordering so lets not bother ordering it here.
1711	* It sure simplifies this function...
1712	*/
1713	if (!inv)
1714	inv = op;
1715	else
1716	{
1717	op->below = inv;
1718	op->below->above = op;
1719	inv = op;
1720	}
1721		1673
1722	INVOKE_OBJECT (INSERT, this);	1674	INVOKE_OBJECT (INSERT, this);
1723		1675
1724	return op;	1676	return op;
1725	}	1677	}
…		…
1940	* activate recursively a flag on an object inventory	1892	* activate recursively a flag on an object inventory
1941	*/	1893	*/
1942	void	1894	void
1943	flag_inv (object *op, int flag)	1895	flag_inv (object *op, int flag)
1944	{	1896	{
1945	if (op->inv)
1946	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1947	{	1898	{
1948	SET_FLAG (tmp, flag);	1899	SET_FLAG (tmp, flag);
1949	flag_inv (tmp, flag);	1900	flag_inv (tmp, flag);
1950	}	1901	}
1951	}	1902	}
1952		1903
1953	/*	1904	/*
1954	* deactivate recursively a flag on an object inventory	1905	* deactivate recursively a flag on an object inventory
1955	*/	1906	*/
1956	void	1907	void
1957	unflag_inv (object *op, int flag)	1908	unflag_inv (object *op, int flag)
1958	{	1909	{
1959	if (op->inv)
1960	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1961	{	1911	{
1962	CLEAR_FLAG (tmp, flag);	1912	CLEAR_FLAG (tmp, flag);
1963	unflag_inv (tmp, flag);	1913	unflag_inv (tmp, flag);
1964	}	1914	}
1965	}
1966
1967	/*
1968	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1969	* all it's inventory (recursively).
1970	* If checksums are used, a player will get set_cheat called for
1971	* him/her-self and all object carried by a call to this function.
1972	*/
1973	void
1974	set_cheat (object *op)
1975	{
1976	SET_FLAG (op, FLAG_WAS_WIZ);
1977	flag_inv (op, FLAG_WAS_WIZ);
1978	}	1915	}
1979		1916
1980	/*	1917	/*
1981	* find_free_spot(object, map, x, y, start, stop) will search for	1918	* find_free_spot(object, map, x, y, start, stop) will search for
1982	* a spot at the given map and coordinates which will be able to contain	1919	* a spot at the given map and coordinates which will be able to contain
…		…
1984	* to search (see the freearr_x/y[] definition).	1921	* to search (see the freearr_x/y[] definition).
1985	* It returns a random choice among the alternatives found.	1922	* It returns a random choice among the alternatives found.
1986	* start and stop are where to start relative to the free_arr array (1,9	1923	* start and stop are where to start relative to the free_arr array (1,9
1987	* does all 4 immediate directions). This returns the index into the	1924	* does all 4 immediate directions). This returns the index into the
1988	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1925	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1989	* Note - this only checks to see if there is space for the head of the
1990	* object - if it is a multispace object, this should be called for all
1991	* pieces.
1992	* Note2: This function does correctly handle tiled maps, but does not	1926	* Note: This function does correctly handle tiled maps, but does not
1993	* inform the caller. However, insert_ob_in_map will update as	1927	* inform the caller. However, insert_ob_in_map will update as
1994	* necessary, so the caller shouldn't need to do any special work.	1928	* necessary, so the caller shouldn't need to do any special work.
1995	* Note - updated to take an object instead of archetype - this is necessary	1929	* Note - updated to take an object instead of archetype - this is necessary
1996	* because arch_blocked (now ob_blocked) needs to know the movement type	1930	* because arch_blocked (now ob_blocked) needs to know the movement type
1997	* to know if the space in question will block the object. We can't use	1931	* to know if the space in question will block the object. We can't use
…		…
1999	* customized, changed states, etc.	1933	* customized, changed states, etc.
2000	*/	1934	*/
2001	int	1935	int
2002	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1936	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2003	{	1937	{
		1938	int altern[SIZEOFFREE];
2004	int index = 0, flag;	1939	int index = 0, flag;
2005	int altern[SIZEOFFREE];
2006		1940
2007	for (int i = start; i < stop; i++)	1941	for (int i = start; i < stop; i++)
2008	{	1942	{
2009	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1943	mapxy pos (m, x, y); pos.move (i);
2010	if (!flag)	1944
		1945	if (!pos.normalise ())
		1946	continue;
		1947
		1948	mapspace &ms = *pos;
		1949
		1950	if (ms.flags () & P_IS_ALIVE)
		1951	continue;
		1952
		1953	/* However, often
		1954	* ob doesn't have any move type (when used to place exits)
		1955	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1956	*/
		1957	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1958	{
2011	altern [index++] = i;	1959	altern [index++] = i;
		1960	continue;
		1961	}
2012		1962
2013	/* Basically, if we find a wall on a space, we cut down the search size.	1963	/* Basically, if we find a wall on a space, we cut down the search size.
2014	* In this way, we won't return spaces that are on another side of a wall.	1964	* In this way, we won't return spaces that are on another side of a wall.
2015	* This mostly work, but it cuts down the search size in all directions -	1965	* This mostly work, but it cuts down the search size in all directions -
2016	* if the space being examined only has a wall to the north and empty	1966	* if the space being examined only has a wall to the north and empty
2017	* spaces in all the other directions, this will reduce the search space	1967	* spaces in all the other directions, this will reduce the search space
2018	* to only the spaces immediately surrounding the target area, and	1968	* to only the spaces immediately surrounding the target area, and
2019	* won't look 2 spaces south of the target space.	1969	* won't look 2 spaces south of the target space.
2020	*/	1970	*/
2021	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1971	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1972	{
2022	stop = maxfree[i];	1973	stop = maxfree[i];
		1974	continue;
		1975	}
		1976
		1977	/* Note it is intentional that we check ob - the movement type of the
		1978	* head of the object should correspond for the entire object.
		1979	*/
		1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1981	continue;
		1982
		1983	if (ob->blocked (m, pos.x, pos.y))
		1984	continue;
		1985
		1986	altern [index++] = i;
2023	}	1987	}
2024		1988
2025	if (!index)	1989	if (!index)
2026	return -1;	1990	return -1;
2027		1991
…		…
2036	*/	2000	*/
2037	int	2001	int
2038	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2002	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2039	{	2003	{
2040	for (int i = 0; i < SIZEOFFREE; i++)	2004	for (int i = 0; i < SIZEOFFREE; i++)
2041	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2005	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2042	return i;	2006	return i;
2043		2007
2044	return -1;	2008	return -1;
2045	}	2009	}
2046		2010
…		…
2100	object *tmp;	2064	object *tmp;
2101	maptile *mp;	2065	maptile *mp;
2102		2066
2103	MoveType blocked, move_type;	2067	MoveType blocked, move_type;
2104		2068
2105	if (exclude && exclude->head)	2069	if (exclude && exclude->head_ () != exclude)
2106	{	2070	{
2107	exclude = exclude->head;	2071	exclude = exclude->head;
2108	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
2109	}	2073	}
2110	else	2074	else
…		…
2133	max = maxfree[i];	2097	max = maxfree[i];
2134	else if (mflags & P_IS_ALIVE)	2098	else if (mflags & P_IS_ALIVE)
2135	{	2099	{
2136	for (tmp = ms.bot; tmp; tmp = tmp->above)	2100	for (tmp = ms.bot; tmp; tmp = tmp->above)
2137	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2101	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2138	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2102	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2139	break;	2103	break;
2140		2104
2141	if (tmp)	2105	if (tmp)
2142	return freedir[i];	2106	return freedir[i];
2143	}	2107	}
…		…
2323	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2287	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2324	* core dumps if they do.	2288	* core dumps if they do.
2325	*	2289	*
2326	* Add a check so we can't pick up invisible objects (0.93.8)	2290	* Add a check so we can't pick up invisible objects (0.93.8)
2327	*/	2291	*/
2328
2329	int	2292	int
2330	can_pick (const object *who, const object *item)	2293	can_pick (const object *who, const object *item)
2331	{	2294	{
2332	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2295	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2296	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2338	* create clone from object to another	2301	* create clone from object to another
2339	*/	2302	*/
2340	object *	2303	object *
2341	object_create_clone (object *asrc)	2304	object_create_clone (object *asrc)
2342	{	2305	{
2343	object *dst = 0, *tmp, *src, *part, *prev, *item;	2306	object *dst = 0, *tmp, *src, *prev, *item;
2344		2307
2345	if (!asrc)	2308	if (!asrc)
2346	return 0;	2309	return 0;
2347		2310
2348	src = asrc;
2349	if (src->head)
2350	src = src->head;	2311	src = asrc->head_ ();
2351		2312
2352	prev = 0;	2313	prev = 0;
2353	for (part = src; part; part = part->more)	2314	for (object *part = src; part; part = part->more)
2354	{	2315	{
2355	tmp = part->clone ();	2316	tmp = part->clone ();
2356	tmp->x -= src->x;	2317	tmp->x -= src->x;
2357	tmp->y -= src->y;	2318	tmp->y -= src->y;
2358		2319
…		…
2471	/* Basically, if the archetype has this key set,	2432	/* Basically, if the archetype has this key set,
2472	* we need to store the null value so when we save	2433	* we need to store the null value so when we save
2473	* it, we save the empty value so that when we load,	2434	* it, we save the empty value so that when we load,
2474	* we get this value back again.	2435	* we get this value back again.
2475	*/	2436	*/
2476	if (get_ob_key_link (&op->arch->clone, canonical_key))	2437	if (get_ob_key_link (op->arch, canonical_key))
2477	field->value = 0;	2438	field->value = 0;
2478	else	2439	else
2479	{	2440	{
2480	if (last)	2441	if (last)
2481	last->next = field->next;	2442	last->next = field->next;
…		…
2550	}	2511	}
2551	else	2512	else
2552	item = item->env;	2513	item = item->env;
2553	}	2514	}
2554		2515
2555
2556	const char *	2516	const char *
2557	object::flag_desc (char *desc, int len) const	2517	object::flag_desc (char *desc, int len) const
2558	{	2518	{
2559	char *p = desc;	2519	char *p = desc;
2560	bool first = true;	2520	bool first = true;
…		…
2587	{	2547	{
2588	char flagdesc[512];	2548	char flagdesc[512];
2589	char info2[256 * 4];	2549	char info2[256 * 4];
2590	char *p = info;	2550	char *p = info;
2591		2551
2592	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2552	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2593	count, uuid.seq,	2553	count,
		2554	uuid.c_str (),
2594	&name,	2555	&name,
2595	title ? "\",title:\"" : "",	2556	title ? "\",title:\"" : "",
2596	title ? (const char *)title : "",	2557	title ? (const char *)title : "",
2597	flag_desc (flagdesc, 512), type);	2558	flag_desc (flagdesc, 512), type);
2598		2559
2599	if (env)	2560	if (!this->flag[FLAG_REMOVED] && env)
2600	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2561	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2601		2562
2602	if (map)	2563	if (map)
2603	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2564	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2604		2565
…		…
2622	}	2583	}
2623		2584
2624	const materialtype_t *	2585	const materialtype_t *
2625	object::dominant_material () const	2586	object::dominant_material () const
2626	{	2587	{
2627	if (materialtype_t *mat = name_to_material (materialname))	2588	if (materialtype_t *mt = name_to_material (materialname))
2628	return mat;	2589	return mt;
2629		2590
2630	// omfg this is slow, this has to be temporary :)
2631	shstr unknown ("unknown");
2632
2633	return name_to_material (unknown);	2591	return name_to_material (shstr_unknown);
2634	}	2592	}
2635		2593
2636	void	2594	void
2637	object::open_container (object *new_container)	2595	object::open_container (object *new_container)
2638	{	2596	{
…		…
2654	old_container->flag [FLAG_APPLIED] = 0;	2612	old_container->flag [FLAG_APPLIED] = 0;
2655	container = 0;	2613	container = 0;
2656		2614
2657	esrv_update_item (UPD_FLAGS, this, old_container);	2615	esrv_update_item (UPD_FLAGS, this, old_container);
2658	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2616	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2617	play_sound (sound_find ("chest_close"));
2659	}	2618	}
2660		2619
2661	if (new_container)	2620	if (new_container)
2662	{	2621	{
2663	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2622	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2679	new_container->flag [FLAG_APPLIED] = 1;	2638	new_container->flag [FLAG_APPLIED] = 1;
2680	container = new_container;	2639	container = new_container;
2681		2640
2682	esrv_update_item (UPD_FLAGS, this, new_container);	2641	esrv_update_item (UPD_FLAGS, this, new_container);
2683	esrv_send_inventory (this, new_container);	2642	esrv_send_inventory (this, new_container);
		2643	play_sound (sound_find ("chest_open"));
		2644	}
		2645	}
		2646
		2647	object *
		2648	object::force_find (const shstr name)
		2649	{
		2650	/* cycle through his inventory to look for the MARK we want to
		2651	* place
		2652	*/
		2653	for (object *tmp = inv; tmp; tmp = tmp->below)
		2654	if (tmp->type == FORCE && tmp->slaying == name)
		2655	return splay (tmp);
		2656
		2657	return 0;
		2658	}
		2659
		2660	void
		2661	object::force_add (const shstr name, int duration)
		2662	{
		2663	if (object *force = force_find (name))
		2664	force->destroy ();
		2665
		2666	object *force = get_archetype (FORCE_NAME);
		2667
		2668	force->slaying = name;
		2669	force->stats.food = 1;
		2670	force->speed_left = -1.f;
		2671
		2672	force->set_speed (duration ? 1.f / duration : 0.f);
		2673	force->flag [FLAG_IS_USED_UP] = true;
		2674	force->flag [FLAG_APPLIED] = true;
		2675
		2676	insert (force);
		2677	}
		2678
		2679	void
		2680	object::play_sound (faceidx sound)
		2681	{
		2682	if (!sound)
		2683	return;
		2684
		2685	if (flag [FLAG_REMOVED])
		2686	return;
		2687
		2688	if (env)
2684	}	2689	{
		2690	if (object *pl = in_player ())
		2691	pl->contr->play_sound (sound);
		2692	}
		2693	else
		2694	map->play_sound (sound, x, y);
2685	}	2695	}
2686		2696
2687

Diff Legend

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