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.133 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	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 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.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
		27
28	#include <global.h>	28	#include <global.h>
29	#include <stdio.h>	29	#include <stdio.h>
30	#include <sys/types.h>	30	#include <sys/types.h>
31	#include <sys/uio.h>	31	#include <sys/uio.h>
32	#include <object.h>	32	#include <object.h>
33	#include <funcpoint.h>	33	#include <funcpoint.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	}
303		308
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
306	{	310	{
307	ob1->optimise ();	311	ob1->optimise ();
308	ob2->optimise ();	312	ob2->optimise ();
309		313
310	if (ob1->self || ob2->self)	314	if (ob1->self || ob2->self)
		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 != NULL; 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	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}
335		380
336	if (op->type == CONTAINER && op->stats.Str)	381	sum += op->total_weight ();
337	sum = (sum * (100 - op->stats.Str)) / 100;	382	}
338		383
339	if (op->carrying != sum)	384	carrying = weight_adjust (this, sum);
340	op->carrying = sum;
341
342	return sum;
343	}
344
345	/**
346	* Return the outermost environment object for a given object.
347	*/
348
349	object *
350	object_get_env_recursive (object *op)
351	{
352	while (op->env != NULL)
353	op = op->env;
354	return op;
355	}	385	}
356		386
357	/*	387	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	389	* Some error messages.
…		…
373	/*	403	/*
374	* 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
375	* multi-object 1 which is closest to the second object.	405	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	406	* If it's not a multi-object, it is returned.
377	*/	407	*/
378
379	object *	408	object *
380	get_nearest_part (object *op, const object *pl)	409	get_nearest_part (object *op, const object *pl)
381	{	410	{
382	object *tmp, *closest;	411	object *tmp, *closest;
383	int last_dist, i;	412	int last_dist, i;
…		…
419	break;	448	break;
420		449
421	return op;	450	return op;
422	}	451	}
423		452
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}
429
430	/*	453	/*
431	* 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
432	* skill and experience objects.	455	* skill and experience objects.
		456	* ACTUALLY NO! investigate! TODO
433	*/	457	*/
434	void	458	void
435	object::set_owner (object *owner)	459	object::set_owner (object *owner)
436	{	460	{
		461	// allow objects which own objects
437	if (!owner)	462	if (owner)
438	return;
439
440	/* next line added to allow objects which own objects */
441	/* Add a check for ownercounts in here, as I got into an endless loop
442	* with the fireball owning a poison cloud which then owned the
443	* fireball. I believe that was caused by one of the objects getting
444	* freed and then another object replacing it. Since the ownercounts
445	* didn't match, this check is valid and I believe that cause is valid.
446	*/
447	while (owner->owner)	463	while (owner->owner)
448	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	}
449		471
450	this->owner = owner;	472	this->owner = owner;
		473	}
		474
		475	int
		476	object::slottype () const
		477	{
		478	if (type == SKILL)
		479	{
		480	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		481	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		482	}
		483	else
		484	{
		485	if (slot [body_combat].info) return slot_combat;
		486	if (slot [body_range ].info) return slot_ranged;
		487	}
		488
		489	return slot_none;
		490	}
		491
		492	bool
		493	object::change_weapon (object *ob)
		494	{
		495	if (current_weapon == ob)
		496	return true;
		497
		498	if (chosen_skill)
		499	chosen_skill->flag [FLAG_APPLIED] = false;
		500
		501	current_weapon = ob;
		502	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		503
		504	if (chosen_skill)
		505	chosen_skill->flag [FLAG_APPLIED] = true;
		506
		507	update_stats ();
		508
		509	if (ob)
		510	{
		511	// now check wether any body locations became invalid, in which case
		512	// we cannot apply the weapon at the moment.
		513	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		514	if (slot[i].used < 0)
		515	{
		516	current_weapon = chosen_skill = 0;
		517	update_stats ();
		518
		519	new_draw_info_format (NDI_UNIQUE, 0, this,
		520	"You try to balance all your items at once, "
		521	"but the %s is just too much for your body. "
		522	"[You need to unapply some items first.]", &ob->name);
		523	return false;
		524	}
		525
		526	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		527	}
		528	else
		529	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		530
		531	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		532	{
		533	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		534	&name, ob->debug_desc ());
		535	return false;
		536	}
		537
		538	return true;
451	}	539	}
452		540
453	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
454	* refcounts and freeing the links.	542	* refcounts and freeing the links.
455	*/	543	*/
456	static void	544	static void
457	free_key_values (object *op)	545	free_key_values (object *op)
458	{	546	{
459	for (key_value *i = op->key_values; i != 0;)	547	for (key_value *i = op->key_values; i; )
460	{	548	{
461	key_value *next = i->next;	549	key_value *next = i->next;
462	delete i;	550	delete i;
463		551
464	i = next;	552	i = next;
465	}	553	}
466		554
467	op->key_values = 0;	555	op->key_values = 0;
468	}	556	}
469		557
470	/*	558	object &
471	* copy_to first frees everything allocated by the dst object,	559	object::operator =(const object &src)
472	* and then copies the contents of itself into the second
473	* object, allocating what needs to be allocated. Basically, any
474	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
475	* if the first object is freed, the pointers in the new object
476	* will point at garbage.
477	*/
478	void
479	object::copy_to (object *dst)
480	{	560	{
481	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	561	bool is_freed = flag [FLAG_FREED];
482	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	562	bool is_removed = flag [FLAG_REMOVED];
483		563
484	*(object_copy *)dst = *this;	564	*(object_copy *)this = src;
485		565
486	if (is_freed)	566	flag [FLAG_FREED] = is_freed;
487	SET_FLAG (dst, FLAG_FREED);	567	flag [FLAG_REMOVED] = is_removed;
488
489	if (is_removed)
490	SET_FLAG (dst, FLAG_REMOVED);
491
492	if (speed < 0)
493	dst->speed_left = speed_left - rndm ();
494		568
495	/* Copy over key_values, if any. */	569	/* Copy over key_values, if any. */
496	if (key_values)	570	if (src.key_values)
497	{	571	{
498	key_value *tail = 0;	572	key_value *tail = 0;
499	key_value *i;
500
501	dst->key_values = 0;	573	key_values = 0;
502		574
503	for (i = key_values; i; i = i->next)	575	for (key_value *i = src.key_values; i; i = i->next)
504	{	576	{
505	key_value *new_link = new key_value;	577	key_value *new_link = new key_value;
506		578
507	new_link->next = 0;	579	new_link->next = 0;
508	new_link->key = i->key;	580	new_link->key = i->key;
509	new_link->value = i->value;	581	new_link->value = i->value;
510		582
511	/* Try and be clever here, too. */	583	/* Try and be clever here, too. */
512	if (!dst->key_values)	584	if (!key_values)
513	{	585	{
514	dst->key_values = new_link;	586	key_values = new_link;
515	tail = new_link;	587	tail = new_link;
516	}	588	}
517	else	589	else
518	{	590	{
519	tail->next = new_link;	591	tail->next = new_link;
520	tail = new_link;	592	tail = new_link;
521	}	593	}
522	}	594	}
523	}	595	}
		596	}
		597
		598	/*
		599	* copy_to first frees everything allocated by the dst object,
		600	* and then copies the contents of itself into the second
		601	* object, allocating what needs to be allocated. Basically, any
		602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		603	* if the first object is freed, the pointers in the new object
		604	* will point at garbage.
		605	*/
		606	void
		607	object::copy_to (object *dst)
		608	{
		609	*dst = *this;
		610
		611	if (speed < 0)
		612	dst->speed_left -= rndm ();
524		613
525	dst->set_speed (dst->speed);	614	dst->set_speed (dst->speed);
526	}	615	}
527		616
528	void	617	void
529	object::instantiate ()	618	object::instantiate ()
530	{	619	{
531	if (!uuid.seq) // HACK	620	if (!uuid.seq) // HACK
532	uuid = gen_uuid ();	621	uuid = UUID::gen ();
533		622
534	speed_left = -0.1f;	623	speed_left = -0.1f;
535	/* 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
536	* 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.
537	* 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
538	* values for the body_used info, so when items are created	627	* values for the body_used info, so when items are created
539	* for it, they can be properly equipped.	628	* for it, they can be properly equipped.
540	*/	629	*/
541	memcpy (body_used, body_info, sizeof (body_used));	630	for (int i = NUM_BODY_LOCATIONS; i--; )
		631	slot[i].used = slot[i].info;
542		632
543	attachable::instantiate ();	633	attachable::instantiate ();
544	}	634	}
545		635
546	object *	636	object *
…		…
606	* UP_OBJ_FACE: only the objects face has changed.	696	* UP_OBJ_FACE: only the objects face has changed.
607	*/	697	*/
608	void	698	void
609	update_object (object *op, int action)	699	update_object (object *op, int action)
610	{	700	{
611	MoveType move_on, move_off, move_block, move_slow;
612
613	if (op == NULL)	701	if (op == NULL)
614	{	702	{
615	/* this should never happen */	703	/* this should never happen */
616	LOG (llevDebug, "update_object() called for NULL object.\n");	704	LOG (llevDebug, "update_object() called for NULL object.\n");
617	return;	705	return;
…		…
697	static int object_count;	785	static int object_count;
698		786
699	void object::link ()	787	void object::link ()
700	{	788	{
701	assert (!index);//D	789	assert (!index);//D
702	uuid = gen_uuid ();	790	uuid = UUID::gen ();
703	count = ++object_count;	791	count = ++object_count;
704		792
705	refcnt_inc ();	793	refcnt_inc ();
706	objects.insert (this);	794	objects.insert (this);
707	}	795	}
…		…
791	* if some form of movement is allowed, let objects	879	* if some form of movement is allowed, let objects
792	* drop on that space.	880	* drop on that space.
793	*/	881	*/
794	if (!drop_to_ground	882	if (!drop_to_ground
795	|| !map	883	|| !map
796	|| map->in_memory != MAP_IN_MEMORY	884	|| map->in_memory != MAP_ACTIVE
797	|| map->nodrop	885	|| map->nodrop
798	|| ms ().move_block == MOVE_ALL)	886	|| ms ().move_block == MOVE_ALL)
799	{	887	{
800	while (inv)	888	while (inv)
801	{	889	{
…		…
836		924
837	if (flag [FLAG_IS_LINKED])	925	if (flag [FLAG_IS_LINKED])
838	remove_button_link (this);	926	remove_button_link (this);
839		927
840	if (flag [FLAG_FRIENDLY])	928	if (flag [FLAG_FRIENDLY])
841	{
842	remove_friendly_object (this);	929	remove_friendly_object (this);
843
844	if (type == GOLEM
845	&& owner
846	&& owner->type == PLAYER
847	&& owner->contr->ranges[range_golem] == this)
848	owner->contr->ranges[range_golem] = 0;
849	}
850		930
851	if (!flag [FLAG_REMOVED])	931	if (!flag [FLAG_REMOVED])
852	remove ();	932	remove ();
853		933
854	destroy_inv (true);	934	destroy_inv (true);
…		…
864		944
865	if (!freed_map)	945	if (!freed_map)
866	{	946	{
867	freed_map = new maptile;	947	freed_map = new maptile;
868		948
		949	freed_map->path = "<freed objects map>";
869	freed_map->name = "/internal/freed_objects_map";	950	freed_map->name = "/internal/freed_objects_map";
870	freed_map->width = 3;	951	freed_map->width = 3;
871	freed_map->height = 3;	952	freed_map->height = 3;
		953	freed_map->nodrop = 1;
872		954
873	freed_map->alloc ();	955	freed_map->alloc ();
874	freed_map->in_memory = MAP_IN_MEMORY;	956	freed_map->in_memory = MAP_ACTIVE;
875	}	957	}
876		958
877	map = freed_map;	959	map = freed_map;
878	x = 1;	960	x = 1;
879	y = 1;	961	y = 1;
880	}	962	}
881		963
882	head = 0;
883
884	if (more)	964	if (more)
885	{	965	{
886	more->destroy ();	966	more->destroy ();
887	more = 0;	967	more = 0;
888	}	968	}
889		969
		970	head = 0;
		971
890	// clear those pointers that likely might have circular references to us	972	// clear those pointers that likely might cause circular references
891	owner = 0;	973	owner = 0;
892	enemy = 0;	974	enemy = 0;
893	attacked_by = 0;	975	attacked_by = 0;
		976	current_weapon = 0;
894	}	977	}
895		978
896	void	979	void
897	object::destroy (bool destroy_inventory)	980	object::destroy (bool destroy_inventory)
898	{	981	{
…		…
900	return;	983	return;
901		984
902	if (destroy_inventory)	985	if (destroy_inventory)
903	destroy_inv (false);	986	destroy_inv (false);
904		987
		988	if (is_head ())
		989	if (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
		993
905	attachable::destroy ();	994	attachable::destroy ();
906	}
907
908	/*
909	* sub_weight() recursively (outwards) subtracts a number from the
910	* weight of an object (and what is carried by it's environment(s)).
911	*/
912	void
913	sub_weight (object *op, signed long weight)
914	{
915	while (op != NULL)
916	{
917	if (op->type == CONTAINER)
918	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
919
920	op->carrying -= weight;
921	op = op->env;
922	}
923	}	995	}
924		996
925	/* op->remove ():	997	/* op->remove ():
926	* 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
927	* 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
…		…
1023	if (map->in_memory == MAP_SAVING)	1095	if (map->in_memory == MAP_SAVING)
1024	return;	1096	return;
1025		1097
1026	int check_walk_off = !flag [FLAG_NO_APPLY];	1098	int check_walk_off = !flag [FLAG_NO_APPLY];
1027		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
1028	for (tmp = ms.bot; tmp; tmp = tmp->above)	1112	for (tmp = ms.bot; tmp; tmp = tmp->above)
1029	{	1113	{
1030	/* 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
1031	* being removed.	1115	* being removed.
1032	*/	1116	*/
1033
1034	if (tmp->type == PLAYER && tmp != this)
1035	{
1036	/* If a container that the player is currently using somehow gets
1037	* removed (most likely destroyed), update the player view
1038	* appropriately.
1039	*/
1040	if (tmp->container == this)
1041	{
1042	flag [FLAG_APPLIED] = 0;
1043	tmp->container = 0;
1044	}
1045
1046	if (tmp->contr->ns)
1047	tmp->contr->ns->floorbox_update ();
1048	}
1049		1117
1050	/* See if object moving off should effect something */	1118	/* See if object moving off should effect something */
1051	if (check_walk_off	1119	if (check_walk_off
1052	&& ((move_type & tmp->move_off)	1120	&& ((move_type & tmp->move_off)
1053	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1121	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1056		1124
1057	if (destroyed ())	1125	if (destroyed ())
1058	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1126	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1059	}	1127	}
1060		1128
1061	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1062	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1063	if (tmp->above == tmp)
1064	tmp->above = 0;
1065
1066	last = tmp;	1129	last = tmp;
1067	}	1130	}
1068		1131
1069	/* last == NULL if there are no objects on this space */	1132	/* last == NULL if there are no objects on this space */
1070	//TODO: this makes little sense, why only update the topmost object?	1133	//TODO: this makes little sense, why only update the topmost object?
…		…
1090	merge_ob (object *op, object *top)	1153	merge_ob (object *op, object *top)
1091	{	1154	{
1092	if (!op->nrof)	1155	if (!op->nrof)
1093	return 0;	1156	return 0;
1094		1157
1095	if (top)	1158	if (!top)
1096	for (top = op; top && top->above; top = top->above)	1159	for (top = op; top && top->above; top = top->above)
1097	;	1160	;
1098		1161
1099	for (; top; top = top->below)	1162	for (; top; top = top->below)
1100	{	1163	{
…		…
1113	}	1176	}
1114		1177
1115	return 0;	1178	return 0;
1116	}	1179	}
1117		1180
		1181	void
		1182	object::expand_tail ()
		1183	{
		1184	if (more)
		1185	return;
		1186
		1187	object *prev = this;
		1188
		1189	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1190	{
		1191	object *op = arch_to_object (at);
		1192
		1193	op->name = name;
		1194	op->name_pl = name_pl;
		1195	op->title = title;
		1196
		1197	op->head = this;
		1198	prev->more = op;
		1199
		1200	prev = op;
		1201	}
		1202	}
		1203
1118	/*	1204	/*
1119	* same as insert_ob_in_map except it handles separate coordinates and does a clean	1205	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1120	* job preparing multi-part monsters.	1206	* job preparing multi-part monsters.
1121	*/	1207	*/
1122	object *	1208	object *
1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1209	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124	{	1210	{
1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1211	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1126	{	1212	{
1127	tmp->x = x + tmp->arch->clone.x;	1213	tmp->x = x + tmp->arch->x;
1128	tmp->y = y + tmp->arch->clone.y;	1214	tmp->y = y + tmp->arch->y;
1129	}	1215	}
1130		1216
1131	return insert_ob_in_map (op, m, originator, flag);	1217	return insert_ob_in_map (op, m, originator, flag);
1132	}	1218	}
1133		1219
…		…
1152	* just 'op' otherwise	1238	* just 'op' otherwise
1153	*/	1239	*/
1154	object *	1240	object *
1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1241	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1156	{	1242	{
		1243	assert (!op->flag [FLAG_FREED]);
		1244
1157	object *tmp, *top, *floor = NULL;	1245	object *top, *floor = NULL;
1158
1159	if (QUERY_FLAG (op, FLAG_FREED))
1160	{
1161	LOG (llevError, "Trying to insert freed object!\n");
1162	return NULL;
1163	}
1164
1165	if (!QUERY_FLAG (op, FLAG_REMOVED))
1166	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1167		1246
1168	op->remove ();	1247	op->remove ();
1169
1170	if (!m)
1171	{
1172	char *dump = dump_object (op);
1173	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1174	free (dump);
1175	return op;
1176	}
1177
1178	if (out_of_map (m, op->x, op->y))
1179	{
1180	char *dump = dump_object (op);
1181	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1182	#ifdef MANY_CORES
1183	/* Better to catch this here, as otherwise the next use of this object
1184	* is likely to cause a crash. Better to find out where it is getting
1185	* improperly inserted.
1186	*/
1187	abort ();
1188	#endif
1189	free (dump);
1190	return op;
1191	}
1192
1193	if (object *more = op->more)
1194	{
1195	if (!insert_ob_in_map (more, m, originator, flag))
1196	{
1197	if (!op->head)
1198	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1199
1200	return 0;
1201	}
1202	}
1203
1204	CLEAR_FLAG (op, FLAG_REMOVED);
1205		1248
1206	/* Ideally, the caller figures this out. However, it complicates a lot	1249	/* Ideally, the caller figures this out. However, it complicates a lot
1207	* 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
1208	* need extra work	1251	* need extra work
1209	*/	1252	*/
1210	if (!xy_normalise (m, op->x, op->y))	1253	if (!xy_normalise (m, op->x, op->y))
		1254	{
		1255	op->destroy ();
1211	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);
1212		1264
1213	op->map = m;	1265	op->map = m;
1214	mapspace &ms = op->ms ();	1266	mapspace &ms = op->ms ();
1215		1267
1216	/* this has to be done after we translate the coordinates.	1268	/* this has to be done after we translate the coordinates.
1217	*/	1269	*/
1218	if (op->nrof && !(flag & INS_NO_MERGE))	1270	if (op->nrof && !(flag & INS_NO_MERGE))
1219	for (tmp = ms.bot; tmp; tmp = tmp->above)	1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1220	if (object::can_merge (op, tmp))	1272	if (object::can_merge (op, tmp))
1221	{	1273	{
1222	op->nrof += tmp->nrof;	1274	op->nrof += tmp->nrof;
1223	tmp->destroy ();	1275	tmp->destroy ();
1224	}	1276	}
…		…
1251	else	1303	else
1252	{	1304	{
1253	top = ms.bot;	1305	top = ms.bot;
1254		1306
1255	/* If there are other objects, then */	1307	/* If there are other objects, then */
1256	if ((!(flag & INS_MAP_LOAD)) && top)	1308	if (top)
1257	{	1309	{
1258	object *last = 0;	1310	object *last = 0;
1259		1311
1260	/*	1312	/*
1261	* 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.
…		…
1291	* looks like instead of lots of conditions here.	1343	* looks like instead of lots of conditions here.
1292	* makes things faster, and effectively the same result.	1344	* makes things faster, and effectively the same result.
1293	*/	1345	*/
1294		1346
1295	/* Have object 'fall below' other objects that block view.	1347	/* Have object 'fall below' other objects that block view.
1296	* Unless those objects are exits, type 66	1348	* Unless those objects are exits.
1297	* If INS_ON_TOP is used, don't do this processing	1349	* If INS_ON_TOP is used, don't do this processing
1298	* Need to find the object that in fact blocks view, otherwise	1350	* Need to find the object that in fact blocks view, otherwise
1299	* stacking is a bit odd.	1351	* stacking is a bit odd.
1300	*/	1352	*/
1301	if (!(flag & INS_ON_TOP)	1353	if (!(flag & INS_ON_TOP)
1302	&& ms.flags () & P_BLOCKSVIEW	1354	&& ms.flags () & P_BLOCKSVIEW
1303	&& (op->face && !op->face->visibility))	1355	&& (op->face && !faces [op->face].visibility))
1304	{	1356	{
1305	for (last = top; last != floor; last = last->below)	1357	for (last = top; last != floor; last = last->below)
1306	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1358	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1307	break;	1359	break;
1308		1360
…		…
1314	if (last && last->below && last != floor)	1366	if (last && last->below && last != floor)
1315	top = last->below;	1367	top = last->below;
1316	}	1368	}
1317	} /* If objects on this space */	1369	} /* If objects on this space */
1318		1370
1319	if (flag & INS_MAP_LOAD)
1320	top = ms.top;
1321
1322	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1323	top = floor;	1372	top = floor;
1324		1373
1325	/* 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.
1326	*/	1375	*/
…		…
1358	op->map->touch ();	1407	op->map->touch ();
1359	}	1408	}
1360		1409
1361	op->map->dirty = true;	1410	op->map->dirty = true;
1362		1411
1363	/* If we have a floor, we know the player, if any, will be above
1364	* it, so save a few ticks and start from there.
1365	*/
1366	if (!(flag & INS_MAP_LOAD))
1367	if (object *pl = ms.player ())	1412	if (object *pl = ms.player ())
1368	if (pl->contr->ns)
1369	pl->contr->ns->floorbox_update ();	1413	pl->contr->ns->floorbox_update ();
1370		1414
1371	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1372	* 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
1373	* 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
1374	* on the map will get recalculated. The players could very well	1418	* on the map will get recalculated. The players could very well
…		…
1393	* blocked() and wall() work properly), and these flags are updated by	1437	* blocked() and wall() work properly), and these flags are updated by
1394	* update_object().	1438	* update_object().
1395	*/	1439	*/
1396		1440
1397	/* if this is not the head or flag has been passed, don't check walk on status */	1441	/* if this is not the head or flag has been passed, don't check walk on status */
1398	if (!(flag & INS_NO_WALK_ON) && !op->head)	1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1399	{	1443	{
1400	if (check_move_on (op, originator))	1444	if (check_move_on (op, originator))
1401	return 0;	1445	return 0;
1402		1446
1403	/* If we are a multi part object, lets work our way through the check	1447	/* If we are a multi part object, lets work our way through the check
1404	* walk on's.	1448	* walk on's.
1405	*/	1449	*/
1406	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1450	for (object *tmp = op->more; tmp; tmp = tmp->more)
1407	if (check_move_on (tmp, originator))	1451	if (check_move_on (tmp, originator))
1408	return 0;	1452	return 0;
1409	}	1453	}
1410		1454
1411	return op;	1455	return op;
…		…
1421	object *tmp, *tmp1;	1465	object *tmp, *tmp1;
1422		1466
1423	/* first search for itself and remove any old instances */	1467	/* first search for itself and remove any old instances */
1424		1468
1425	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1426	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1427	tmp->destroy ();	1471	tmp->destroy ();
1428		1472
1429	tmp1 = arch_to_object (archetype::find (arch_string));	1473	tmp1 = arch_to_object (archetype::find (arch_string));
1430		1474
1431	tmp1->x = op->x;	1475	tmp1->x = op->x;
…		…
1434	}	1478	}
1435		1479
1436	object *	1480	object *
1437	object::insert_at (object *where, object *originator, int flags)	1481	object::insert_at (object *where, object *originator, int flags)
1438	{	1482	{
		1483	if (where->env)
		1484	return where->env->insert (this);
		1485	else
1439	where->map->insert (this, where->x, where->y, originator, flags);	1486	return where->map->insert (this, where->x, where->y, originator, flags);
1440	}	1487	}
1441		1488
1442	/*	1489	/*
1443	* 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
1444	* is returned contains nr objects, and the remaining parts contains	1491	* is returned contains nr objects, and the remaining parts contains
…		…
1464	orig_ob->destroy (1);	1511	orig_ob->destroy (1);
1465	else if (!is_removed)	1512	else if (!is_removed)
1466	{	1513	{
1467	if (orig_ob->env != NULL)	1514	if (orig_ob->env != NULL)
1468	sub_weight (orig_ob->env, orig_ob->weight * nr);	1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1469	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)
1470	{	1517	{
1471	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.");
1472	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");
1473	return NULL;	1520	return NULL;
1474	}	1521	}
…		…
1484	* the amount of an object. If the amount reaches 0, the object	1531	* the amount of an object. If the amount reaches 0, the object
1485	* is subsequently removed and freed.	1532	* is subsequently removed and freed.
1486	*	1533	*
1487	* Return value: 'op' if something is left, NULL if the amount reached 0	1534	* Return value: 'op' if something is left, NULL if the amount reached 0
1488	*/	1535	*/
1489
1490	object *	1536	object *
1491	decrease_ob_nr (object *op, uint32 i)	1537	decrease_ob_nr (object *op, uint32 i)
1492	{	1538	{
1493	object *tmp;	1539	object *tmp;
1494		1540
…		…
1565	op->destroy ();	1611	op->destroy ();
1566	return 0;	1612	return 0;
1567	}	1613	}
1568	}	1614	}
1569		1615
1570	/*
1571	* add_weight(object, weight) adds the specified weight to an object,
1572	* and also updates how much the environment(s) is/are carrying.
1573	*/
1574
1575	void
1576	add_weight (object *op, signed long weight)
1577	{
1578	while (op != NULL)
1579	{
1580	if (op->type == CONTAINER)
1581	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1582
1583	op->carrying += weight;
1584	op = op->env;
1585	}
1586	}
1587
1588	object *	1616	object *
1589	insert_ob_in_ob (object *op, object *where)	1617	insert_ob_in_ob (object *op, object *where)
1590	{	1618	{
1591	if (!where)	1619	if (!where)
1592	{	1620	{
…		…
1594	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1622	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1595	free (dump);	1623	free (dump);
1596	return op;	1624	return op;
1597	}	1625	}
1598		1626
1599	if (where->head)	1627	if (where->head_ () != where)
1600	{	1628	{
1601	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1629	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1602	where = where->head;	1630	where = where->head;
1603	}	1631	}
1604		1632
1605	return where->insert (op);	1633	return where->insert (op);
1606	}	1634	}
…		…
1611	* inside the object environment.	1639	* inside the object environment.
1612	*	1640	*
1613	* The function returns now pointer to inserted item, and return value can	1641	* The function returns now pointer to inserted item, and return value can
1614	* be != op, if items are merged. -Tero	1642	* be != op, if items are merged. -Tero
1615	*/	1643	*/
1616
1617	object *	1644	object *
1618	object::insert (object *op)	1645	object::insert (object *op)
1619	{	1646	{
1620	object *tmp, *otmp;
1621
1622	if (!QUERY_FLAG (op, FLAG_REMOVED))	1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1623	op->remove ();	1648	op->remove ();
1624		1649
1625	if (op->more)	1650	if (op->more)
1626	{	1651	{
…		…
1628	return op;	1653	return op;
1629	}	1654	}
1630		1655
1631	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1632	CLEAR_FLAG (op, FLAG_REMOVED);	1657	CLEAR_FLAG (op, FLAG_REMOVED);
		1658
1633	if (op->nrof)	1659	if (op->nrof)
1634	{	1660	{
1635	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1661	for (object *tmp = inv; tmp; tmp = tmp->below)
1636	if (object::can_merge (tmp, op))	1662	if (object::can_merge (tmp, op))
1637	{	1663	{
1638	/* return the original object and remove inserted object	1664	/* return the original object and remove inserted object
1639	(client needs the original object) */	1665	(client needs the original object) */
1640	tmp->nrof += op->nrof;	1666	tmp->nrof += op->nrof;
…		…
1659	add_weight (this, op->weight * op->nrof);	1685	add_weight (this, op->weight * op->nrof);
1660	}	1686	}
1661	else	1687	else
1662	add_weight (this, (op->weight + op->carrying));	1688	add_weight (this, (op->weight + op->carrying));
1663		1689
1664	otmp = this->in_player ();	1690	if (object *otmp = this->in_player ())
1665	if (otmp && otmp->contr)
1666	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1667	otmp->update_stats ();	1692	otmp->update_stats ();
1668		1693
		1694	op->owner = 0; // its his/hers now. period.
1669	op->map = 0;	1695	op->map = 0;
1670	op->env = this;	1696	op->env = this;
1671	op->above = 0;	1697	op->above = 0;
1672	op->below = 0;	1698	op->below = 0;
1673	op->x = 0, op->y = 0;	1699	op->x = op->y = 0;
1674		1700
1675	/* 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 */
1676	if ((op->glow_radius != 0) && map)	1702	if (op->glow_radius && map)
1677	{	1703	{
1678	#ifdef DEBUG_LIGHTS	1704	#ifdef DEBUG_LIGHTS
1679	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);
1680	#endif /* DEBUG_LIGHTS */	1706	#endif /* DEBUG_LIGHTS */
1681	if (map->darkness)	1707	if (map->darkness)
…		…
1915	* activate recursively a flag on an object inventory	1941	* activate recursively a flag on an object inventory
1916	*/	1942	*/
1917	void	1943	void
1918	flag_inv (object *op, int flag)	1944	flag_inv (object *op, int flag)
1919	{	1945	{
1920	if (op->inv)
1921	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1946	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922	{	1947	{
1923	SET_FLAG (tmp, flag);	1948	SET_FLAG (tmp, flag);
1924	flag_inv (tmp, flag);	1949	flag_inv (tmp, flag);
1925	}	1950	}
1926	}	1951	}
1927		1952
1928	/*	1953	/*
1929	* deactivate recursively a flag on an object inventory	1954	* deactivate recursively a flag on an object inventory
1930	*/	1955	*/
1931	void	1956	void
1932	unflag_inv (object *op, int flag)	1957	unflag_inv (object *op, int flag)
1933	{	1958	{
1934	if (op->inv)
1935	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1936	{	1960	{
1937	CLEAR_FLAG (tmp, flag);	1961	CLEAR_FLAG (tmp, flag);
1938	unflag_inv (tmp, flag);	1962	unflag_inv (tmp, flag);
1939	}	1963	}
1940	}
1941
1942	/*
1943	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1944	* all it's inventory (recursively).
1945	* If checksums are used, a player will get set_cheat called for
1946	* him/her-self and all object carried by a call to this function.
1947	*/
1948	void
1949	set_cheat (object *op)
1950	{
1951	SET_FLAG (op, FLAG_WAS_WIZ);
1952	flag_inv (op, FLAG_WAS_WIZ);
1953	}	1964	}
1954		1965
1955	/*	1966	/*
1956	* 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
1957	* 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
…		…
1959	* to search (see the freearr_x/y[] definition).	1970	* to search (see the freearr_x/y[] definition).
1960	* It returns a random choice among the alternatives found.	1971	* It returns a random choice among the alternatives found.
1961	* 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
1962	* does all 4 immediate directions). This returns the index into the	1973	* does all 4 immediate directions). This returns the index into the
1963	* 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)
1964	* Note - this only checks to see if there is space for the head of the
1965	* object - if it is a multispace object, this should be called for all
1966	* pieces.
1967	* Note2: This function does correctly handle tiled maps, but does not	1975	* Note: This function does correctly handle tiled maps, but does not
1968	* inform the caller. However, insert_ob_in_map will update as	1976	* inform the caller. However, insert_ob_in_map will update as
1969	* 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.
1970	* 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
1971	* 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
1972	* 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
…		…
1974	* customized, changed states, etc.	1982	* customized, changed states, etc.
1975	*/	1983	*/
1976	int	1984	int
1977	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)
1978	{	1986	{
		1987	int altern[SIZEOFFREE];
1979	int index = 0, flag;	1988	int index = 0, flag;
1980	int altern[SIZEOFFREE];
1981		1989
1982	for (int i = start; i < stop; i++)	1990	for (int i = start; i < stop; i++)
1983	{	1991	{
1984	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1992	mapxy pos (m, x, y); pos.move (i);
1985	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	{
1986	altern [index++] = i;	2008	altern [index++] = i;
		2009	continue;
		2010	}
1987		2011
1988	/* 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.
1989	* 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.
1990	* 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 -
1991	* 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
1992	* 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
1993	* to only the spaces immediately surrounding the target area, and	2017	* to only the spaces immediately surrounding the target area, and
1994	* won't look 2 spaces south of the target space.	2018	* won't look 2 spaces south of the target space.
1995	*/	2019	*/
1996	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2020	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2021	{
1997	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;
1998	}	2036	}
1999		2037
2000	if (!index)	2038	if (!index)
2001	return -1;	2039	return -1;
2002		2040
…		…
2011	*/	2049	*/
2012	int	2050	int
2013	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)
2014	{	2052	{
2015	for (int i = 0; i < SIZEOFFREE; i++)	2053	for (int i = 0; i < SIZEOFFREE; i++)
2016	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]))
2017	return i;	2055	return i;
2018		2056
2019	return -1;	2057	return -1;
2020	}	2058	}
2021		2059
…		…
2075	object *tmp;	2113	object *tmp;
2076	maptile *mp;	2114	maptile *mp;
2077		2115
2078	MoveType blocked, move_type;	2116	MoveType blocked, move_type;
2079		2117
2080	if (exclude && exclude->head)	2118	if (exclude && exclude->head_ () != exclude)
2081	{	2119	{
2082	exclude = exclude->head;	2120	exclude = exclude->head;
2083	move_type = exclude->move_type;	2121	move_type = exclude->move_type;
2084	}	2122	}
2085	else	2123	else
…		…
2108	max = maxfree[i];	2146	max = maxfree[i];
2109	else if (mflags & P_IS_ALIVE)	2147	else if (mflags & P_IS_ALIVE)
2110	{	2148	{
2111	for (tmp = ms.bot; tmp; tmp = tmp->above)	2149	for (tmp = ms.bot; tmp; tmp = tmp->above)
2112	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2113	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2114	break;	2152	break;
2115		2153
2116	if (tmp)	2154	if (tmp)
2117	return freedir[i];	2155	return freedir[i];
2118	}	2156	}
…		…
2298	* 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
2299	* core dumps if they do.	2337	* core dumps if they do.
2300	*	2338	*
2301	* 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)
2302	*/	2340	*/
2303
2304	int	2341	int
2305	can_pick (const object *who, const object *item)	2342	can_pick (const object *who, const object *item)
2306	{	2343	{
2307	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2308	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2313	* create clone from object to another	2350	* create clone from object to another
2314	*/	2351	*/
2315	object *	2352	object *
2316	object_create_clone (object *asrc)	2353	object_create_clone (object *asrc)
2317	{	2354	{
2318	object *dst = 0, *tmp, *src, *part, *prev, *item;	2355	object *dst = 0, *tmp, *src, *prev, *item;
2319		2356
2320	if (!asrc)	2357	if (!asrc)
2321	return 0;	2358	return 0;
2322		2359
2323	src = asrc;
2324	if (src->head)
2325	src = src->head;	2360	src = asrc->head_ ();
2326		2361
2327	prev = 0;	2362	prev = 0;
2328	for (part = src; part; part = part->more)	2363	for (object *part = src; part; part = part->more)
2329	{	2364	{
2330	tmp = part->clone ();	2365	tmp = part->clone ();
2331	tmp->x -= src->x;	2366	tmp->x -= src->x;
2332	tmp->y -= src->y;	2367	tmp->y -= src->y;
2333		2368
…		…
2413	if (link->key == canonical_key)	2448	if (link->key == canonical_key)
2414	return link->value;	2449	return link->value;
2415		2450
2416	return 0;	2451	return 0;
2417	}	2452	}
2418
2419		2453
2420	/*	2454	/*
2421	* Updates the canonical_key in op to value.	2455	* Updates the canonical_key in op to value.
2422	*	2456	*
2423	* canonical_key is a shared string (value doesn't have to be).	2457	* canonical_key is a shared string (value doesn't have to be).
…		…
2447	/* Basically, if the archetype has this key set,	2481	/* Basically, if the archetype has this key set,
2448	* we need to store the null value so when we save	2482	* we need to store the null value so when we save
2449	* it, we save the empty value so that when we load,	2483	* it, we save the empty value so that when we load,
2450	* we get this value back again.	2484	* we get this value back again.
2451	*/	2485	*/
2452	if (get_ob_key_link (&op->arch->clone, canonical_key))	2486	if (get_ob_key_link (op->arch, canonical_key))
2453	field->value = 0;	2487	field->value = 0;
2454	else	2488	else
2455	{	2489	{
2456	if (last)	2490	if (last)
2457	last->next = field->next;	2491	last->next = field->next;
…		…
2526	}	2560	}
2527	else	2561	else
2528	item = item->env;	2562	item = item->env;
2529	}	2563	}
2530		2564
2531
2532	const char *	2565	const char *
2533	object::flag_desc (char *desc, int len) const	2566	object::flag_desc (char *desc, int len) const
2534	{	2567	{
2535	char *p = desc;	2568	char *p = desc;
2536	bool first = true;	2569	bool first = true;
…		…
2563	{	2596	{
2564	char flagdesc[512];	2597	char flagdesc[512];
2565	char info2[256 * 4];	2598	char info2[256 * 4];
2566	char *p = info;	2599	char *p = info;
2567		2600
2568	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}",
2569	count, uuid.seq,	2602	count,
		2603	uuid.c_str (),
2570	&name,	2604	&name,
2571	title ? "\",title:\"" : "",	2605	title ? "\",title:\"" : "",
2572	title ? (const char *)title : "",	2606	title ? (const char *)title : "",
2573	flag_desc (flagdesc, 512), type);	2607	flag_desc (flagdesc, 512), type);
2574		2608
2575	if (env)	2609	if (!this->flag[FLAG_REMOVED] && env)
2576	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2577		2611
2578	if (map)	2612	if (map)
2579	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);
2580		2614
…		…
2582	}	2616	}
2583		2617
2584	const char *	2618	const char *
2585	object::debug_desc () const	2619	object::debug_desc () const
2586	{	2620	{
2587	static char info[256 * 4];	2621	static char info[3][256 * 4];
		2622	static int info_idx;
		2623
2588	return debug_desc (info);	2624	return debug_desc (info [++info_idx % 3]);
2589	}
2590
2591	const char *
2592	object::debug_desc2 () const
2593	{
2594	static char info[256 * 4];
2595	return debug_desc (info);
2596	}	2625	}
2597		2626
2598	struct region *	2627	struct region *
2599	object::region () const	2628	object::region () const
2600	{	2629	{
…		…
2603	}	2632	}
2604		2633
2605	const materialtype_t *	2634	const materialtype_t *
2606	object::dominant_material () const	2635	object::dominant_material () const
2607	{	2636	{
2608	if (materialtype_t *mat = name_to_material (materialname))	2637	if (materialtype_t *mt = name_to_material (materialname))
2609	return mat;	2638	return mt;
2610		2639
2611	// omfg this is slow, this has to be temporary :)
2612	shstr unknown ("unknown");
2613
2614	return name_to_material (unknown);	2640	return name_to_material (shstr_unknown);
2615	}	2641	}
2616		2642
2617	void	2643	void
2618	object::open_container (object *new_container)	2644	object::open_container (object *new_container)
2619	{	2645	{
…		…
2635	old_container->flag [FLAG_APPLIED] = 0;	2661	old_container->flag [FLAG_APPLIED] = 0;
2636	container = 0;	2662	container = 0;
2637		2663
2638	esrv_update_item (UPD_FLAGS, this, old_container);	2664	esrv_update_item (UPD_FLAGS, this, old_container);
2639	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"));
2640	}	2667	}
2641		2668
2642	if (new_container)	2669	if (new_container)
2643	{	2670	{
2644	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2660	new_container->flag [FLAG_APPLIED] = 1;	2687	new_container->flag [FLAG_APPLIED] = 1;
2661	container = new_container;	2688	container = new_container;
2662		2689
2663	esrv_update_item (UPD_FLAGS, this, new_container);	2690	esrv_update_item (UPD_FLAGS, this, new_container);
2664	esrv_send_inventory (this, new_container);	2691	esrv_send_inventory (this, new_container);
		2692	play_sound (sound_find ("chest_open"));
		2693	}
		2694	}
		2695
		2696	object *
		2697	object::force_find (const shstr name)
		2698	{
		2699	/* cycle through his inventory to look for the MARK we want to
		2700	* place
		2701	*/
		2702	for (object *tmp = inv; tmp; tmp = tmp->below)
		2703	if (tmp->type == FORCE && tmp->slaying == name)
		2704	return splay (tmp);
		2705
		2706	return 0;
		2707	}
		2708
		2709	void
		2710	object::force_add (const shstr name, int duration)
		2711	{
		2712	if (object *force = force_find (name))
		2713	force->destroy ();
		2714
		2715	object *force = get_archetype (FORCE_NAME);
		2716
		2717	force->slaying = name;
		2718	force->stats.food = 1;
		2719	force->speed_left = -1.f;
		2720
		2721	force->set_speed (duration ? 1.f / duration : 0.f);
		2722	force->flag [FLAG_IS_USED_UP] = true;
		2723	force->flag [FLAG_APPLIED] = true;
		2724
		2725	insert (force);
		2726	}
		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)
2665	}	2738	{
		2739	if (object *pl = in_player ())
		2740	pl->contr->play_sound (sound);
		2741	}
		2742	else
		2743	map->play_sound (sound, x, y);
2666	}	2744	}
2667		2745
2668

Diff Legend

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