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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	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	45	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	};	46	};
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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-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	51	-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	};	52	};
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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	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	57	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	};	58	};
54	int freedir[SIZEOFFREE] = {	59	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	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	63	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	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	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	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
86		82
		83	seq_next_save = 0;
		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object ob1, const object ob2)	175	compare_ob_value_lists (const object ob1, const object ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison twice. :(	178	* so we need to run the comparison twice. :(
181	*/	179	*/
…		…
202	\|\| ob1->speed != ob2->speed	200	\|\| ob1->speed != ob2->speed
203	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
204	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* 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	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* 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	214	* 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	215	* 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	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	\|\| ob1->arch != ob2->arch
229	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
230	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
231	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
232	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
236	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
237	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
238	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
239	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
246	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
247	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
248	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
249	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
250	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
251	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv \|\| ob2->inv)	262	if (ob1->inv \|\| ob2->inv)
258	{	263	{
259	/* if one object has inventory but the other doesn't, not equiv */	264	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	265	return 0; /* inventories differ in length */
261	return 0;
262		266
263	/* Now check to see if the two inventory objects could merge */	267	if (ob1->inv->below \|\| ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	271	return 0; /* inventory objects differ */
266		272
267	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	300	if (ob1->key_values \|\| ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	305
300	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	307	return 0;
302	}	308	}
303		309
304	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
305	{	311	{
306	ob1->optimise ();	312	ob1->optimise ();
307	ob2->optimise ();	313	ob2->optimise ();
308		314
309	if (ob1->self \|\| ob2->self)	315	if (ob1->self \|\| ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
		321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
310	if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	327	return 0;
		328	}
312	}	329	}
313		330
314	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
315	return 1;	332	return 1;
316	}	333	}
317		334
		335	// adjust weight per container type ("of holding")
		336	static sint32
		337	weight_adjust (object *op, sint32 weight)
		338	{
		339	return op->type == CONTAINER
		340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		341	: weight;
		342	}
		343
318	/*	344	/*
		345	* adjust_weight(object, weight) adds the specified weight to an object,
		346	* and also updates how much the environment(s) is/are carrying.
		347	*/
		348	static void
		349	adjust_weight (object *op, sint32 weight)
		350	{
		351	while (op)
		352	{
		353	weight = weight_adjust (op, weight);
		354
		355	if (!weight)
		356	return;
		357
		358	op->carrying += weight;
		359
		360	if (object *pl = op->visible_to ())
		361	esrv_update_item (UPD_WEIGHT, pl, op);
		362
		363	op = op->env;
		364	}
		365	}
		366
		367	/*
319	* sum_weight() is a recursive function which calculates the weight	368	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	369	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	370	* containers are carrying, and sums it up.
322	*/	371	*/
323	long	372	void
324	sum_weight (object *op)	373	object::update_weight ()
325	{	374	{
326	long sum;	375	sint32 sum = 0;
327	object *inv;
328		376
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	377	for (object *op = inv; op; op = op->below)
330	{	378	{
331	if (inv->inv)	379	if (op->inv)
332	sum_weight (inv);	380	op->update_weight ();
333		381
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	382	sum += op->total_weight ();
		383	}
		384
		385	sum = weight_adjust (this, sum);
		386
		387	if (sum != carrying)
335	}	388	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	389	carrying = sum;
342		390
343	return sum;	391	if (object *pl = visible_to ())
		392	esrv_update_item (UPD_WEIGHT, pl, this);
		393	}
344	}	394	}
345		395
346	/**	396	/*
347	* Return the outermost environment object for a given object.	397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	398	*/
363	char *	399	char *
364	dump_object (object *op)	400	dump_object (object *op)
365	{	401	{
366	if (!op)	402	if (!op)
…		…
380	get_nearest_part (object op, const object pl)	416	get_nearest_part (object op, const object pl)
381	{	417	{
382	object tmp, closest;	418	object tmp, closest;
383	int last_dist, i;	419	int last_dist, i;
384		420
385	if (op->more == NULL)	421	if (!op->more)
386	return op;	422	return op;
		423
387	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	424	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		425	tmp;
		426	tmp = tmp->more)
388	if ((i = distance (tmp, pl)) < last_dist)	427	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	428	closest = tmp, last_dist = i;
		429
390	return closest;	430	return closest;
391	}	431	}
392		432
393	/*	433	/*
394	* Returns the object which has the count-variable equal to the argument.	434	* Returns the object which has the count-variable equal to the argument.
		435	* VERRRY slow.
395	*/	436	*/
396	object *	437	object *
397	find_object (tag_t i)	438	find_object (tag_t i)
398	{	439	{
399	for_all_objects (op)	440	for_all_objects (op)
…		…
417	for_all_objects (op)	458	for_all_objects (op)
418	if (op->name == str_)	459	if (op->name == str_)
419	break;	460	break;
420		461
421	return op;	462	return op;
422	}
423
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}	463	}
429		464
430	/*	465	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	466	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	467	* skill and experience objects.
…		…
437	{	472	{
438	// allow objects which own objects	473	// allow objects which own objects
439	if (owner)	474	if (owner)
440	while (owner->owner)	475	while (owner->owner)
441	owner = owner->owner;	476	owner = owner->owner;
		477
		478	if (flag [FLAG_FREED])
		479	{
		480	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		481	return;
		482	}
442		483
443	this->owner = owner;	484	this->owner = owner;
444	}	485	}
445		486
446	int	487	int
…		…
587		628
588	void	629	void
589	object::instantiate ()	630	object::instantiate ()
590	{	631	{
591	if (!uuid.seq) // HACK	632	if (!uuid.seq) // HACK
592	uuid = gen_uuid ();	633	uuid = UUID::gen ();
593		634
594	speed_left = -0.1f;	635	speed_left = -0.1f;
595	/* copy the body_info to the body_used - this is only really	636	/* copy the body_info to the body_used - this is only really
596	* need for monsters, but doesn't hurt to do it for everything.	637	* need for monsters, but doesn't hurt to do it for everything.
597	* by doing so, when a monster is created, it has good starting	638	* by doing so, when a monster is created, it has good starting
…		…
756	static int object_count;	797	static int object_count;
757		798
758	void object::link ()	799	void object::link ()
759	{	800	{
760	assert (!index);//D	801	assert (!index);//D
761	uuid = gen_uuid ();	802	uuid = UUID::gen ();
762	count = ++object_count;	803	count = ++object_count;
763		804
764	refcnt_inc ();	805	refcnt_inc ();
765	objects.insert (this);	806	objects.insert (this);
766	}	807	}
…		…
850	* if some form of movement is allowed, let objects	891	* if some form of movement is allowed, let objects
851	* drop on that space.	892	* drop on that space.
852	*/	893	*/
853	if (!drop_to_ground	894	if (!drop_to_ground
854	\|\| !map	895	\|\| !map
855	\|\| map->in_memory != MAP_IN_MEMORY	896	\|\| map->in_memory != MAP_ACTIVE
856	\|\| map->nodrop	897	\|\| map->nodrop
857	\|\| ms ().move_block == MOVE_ALL)	898	\|\| ms ().move_block == MOVE_ALL)
858	{	899	{
859	while (inv)	900	while (inv)
860	{	901	{
…		…
889	}	930	}
890		931
891	void	932	void
892	object::do_destroy ()	933	object::do_destroy ()
893	{	934	{
		935	if (object *pl = visible_to ())
		936	esrv_del_item (pl->contr, count);
		937
894	attachable::do_destroy ();	938	attachable::do_destroy ();
895		939
896	if (flag [FLAG_IS_LINKED])	940	if (flag [FLAG_IS_LINKED])
897	remove_button_link (this);	941	remove_button_link (this);
898		942
…		…
919		963
920	freed_map->path = "<freed objects map>";	964	freed_map->path = "<freed objects map>";
921	freed_map->name = "/internal/freed_objects_map";	965	freed_map->name = "/internal/freed_objects_map";
922	freed_map->width = 3;	966	freed_map->width = 3;
923	freed_map->height = 3;	967	freed_map->height = 3;
		968	freed_map->nodrop = 1;
924		969
925	freed_map->alloc ();	970	freed_map->alloc ();
926	freed_map->in_memory = MAP_IN_MEMORY;	971	freed_map->in_memory = MAP_ACTIVE;
927	}	972	}
928		973
929	map = freed_map;	974	map = freed_map;
930	x = 1;	975	x = 1;
931	y = 1;	976	y = 1;
…		…
960	play_sound (sound_destroy);	1005	play_sound (sound_destroy);
961	else if (flag [FLAG_MONSTER])	1006	else if (flag [FLAG_MONSTER])
962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1007	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963		1008
964	attachable::destroy ();	1009	attachable::destroy ();
965	}
966
967	/*
968	* sub_weight() recursively (outwards) subtracts a number from the
969	* weight of an object (and what is carried by it's environment(s)).
970	*/
971	void
972	sub_weight (object *op, signed long weight)
973	{
974	while (op != NULL)
975	{
976	if (op->type == CONTAINER)
977	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979	op->carrying -= weight;
980	op = op->env;
981	}
982	}	1010	}
983		1011
984	/* op->remove ():	1012	/* op->remove ():
985	* This function removes the object op from the linked list of objects	1013	* This function removes the object op from the linked list of objects
986	* which it is currently tied to. When this function is done, the	1014	* which it is currently tied to. When this function is done, the
…		…
1007	* In this case, the object to be removed is in someones	1035	* In this case, the object to be removed is in someones
1008	* inventory.	1036	* inventory.
1009	*/	1037	*/
1010	if (env)	1038	if (env)
1011	{	1039	{
		1040	adjust_weight (env, -total_weight ());
		1041
		1042	*(above ? &above->below : &env->inv) = below;
		1043
1012	if (nrof)	1044	if (below)
1013	sub_weight (env, weight * nrof);	1045	below->above = above;
1014	else	1046
1015	sub_weight (env, weight + carrying);	1047	/* we set up values so that it could be inserted into
		1048	* the map, but we don't actually do that - it is up
		1049	* to the caller to decide what we want to do.
		1050	*/
		1051	map = env->map;
		1052	x = env->x;
		1053	y = env->y;
		1054	above = 0;
		1055	below = 0;
		1056	env = 0;
1016		1057
1017	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1018	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1019	* to save cpu time.	1060	* to save cpu time.
1020	*/	1061	*/
1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022	otmp->update_stats ();	1063	otmp->update_stats ();
1023
1024	if (above)
1025	above->below = below;
1026	else
1027	env->inv = below;
1028
1029	if (below)
1030	below->above = above;
1031
1032	/* we set up values so that it could be inserted into
1033	* the map, but we don't actually do that - it is up
1034	* to the caller to decide what we want to do.
1035	*/
1036	x = env->x, y = env->y;
1037	map = env->map;
1038	above = 0, below = 0;
1039	env = 0;
1040	}	1064	}
1041	else if (map)	1065	else if (map)
1042	{	1066	{
1043	if (type == PLAYER)	1067	if (type == PLAYER)
1044	{	1068	{
…		…
1140	merge_ob (object op, object top)	1164	merge_ob (object op, object top)
1141	{	1165	{
1142	if (!op->nrof)	1166	if (!op->nrof)
1143	return 0;	1167	return 0;
1144		1168
1145	if (top)	1169	if (!top)
1146	for (top = op; top && top->above; top = top->above)	1170	for (top = op; top && top->above; top = top->above)
1147	;	1171	;
1148		1172
1149	for (; top; top = top->below)	1173	for (; top; top = top->below)
1150	{	1174	{
…		…
1257	if (op->nrof && !(flag & INS_NO_MERGE))	1281	if (op->nrof && !(flag & INS_NO_MERGE))
1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1259	if (object::can_merge (op, tmp))	1283	if (object::can_merge (op, tmp))
1260	{	1284	{
1261	op->nrof += tmp->nrof;	1285	op->nrof += tmp->nrof;
1262	tmp->destroy ();	1286	tmp->destroy (1);
1263	}	1287	}
1264		1288
1265	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1266	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1267		1291
…		…
1290	else	1314	else
1291	{	1315	{
1292	top = ms.bot;	1316	top = ms.bot;
1293		1317
1294	/* If there are other objects, then */	1318	/* If there are other objects, then */
1295	if ((!(flag & INS_MAP_LOAD)) && top)	1319	if (top)
1296	{	1320	{
1297	object *last = 0;	1321	object *last = 0;
1298		1322
1299	/*	1323	/*
1300	* If there are multiple objects on this space, we do some trickier handling.	1324	* If there are multiple objects on this space, we do some trickier handling.
…		…
1352	*/	1376	*/
1353	if (last && last->below && last != floor)	1377	if (last && last->below && last != floor)
1354	top = last->below;	1378	top = last->below;
1355	}	1379	}
1356	} /* If objects on this space */	1380	} /* If objects on this space */
1357	if (flag & INS_MAP_LOAD)
1358	top = ms.top;
1359		1381
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1382	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1383	top = floor;
1362		1384
1363	/* Top is the object that our object (op) is going to get inserted above.	1385	/* Top is the object that our object (op) is going to get inserted above.
…		…
1396	op->map->touch ();	1418	op->map->touch ();
1397	}	1419	}
1398		1420
1399	op->map->dirty = true;	1421	op->map->dirty = true;
1400		1422
1401	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = ms.player ())	1423	if (object *pl = ms.player ())
1403	pl->contr->ns->floorbox_update ();	1424	pl->contr->ns->floorbox_update ();
1404		1425
1405	/* If this object glows, it may affect lighting conditions that are	1426	/* If this object glows, it may affect lighting conditions that are
1406	* visible to others on this map. But update_all_los is really	1427	* visible to others on this map. But update_all_los is really
1407	* an inefficient way to do this, as it means los for all players	1428	* an inefficient way to do this, as it means los for all players
1408	* on the map will get recalculated. The players could very well	1429	* on the map will get recalculated. The players could very well
…		…
1450	* op is the object to insert it under: supplies x and the map.	1471	* op is the object to insert it under: supplies x and the map.
1451	*/	1472	*/
1452	void	1473	void
1453	replace_insert_ob_in_map (const char arch_string, object op)	1474	replace_insert_ob_in_map (const char arch_string, object op)
1454	{	1475	{
1455	object tmp, tmp1;
1456
1457	/* first search for itself and remove any old instances */	1476	/* first search for itself and remove any old instances */
1458		1477
1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1478	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1479	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461	tmp->destroy ();	1480	tmp->destroy (1);
1462		1481
1463	tmp1 = arch_to_object (archetype::find (arch_string));	1482	object *tmp = arch_to_object (archetype::find (arch_string));
1464		1483
1465	tmp1->x = op->x;	1484	tmp->x = op->x;
1466	tmp1->y = op->y;	1485	tmp->y = op->y;
		1486
1467	insert_ob_in_map (tmp1, op->map, op, 0);	1487	insert_ob_in_map (tmp, op->map, op, 0);
1468	}	1488	}
1469		1489
1470	object *	1490	object *
1471	object::insert_at (object where, object originator, int flags)	1491	object::insert_at (object where, object originator, int flags)
1472	{	1492	{
		1493	if (where->env)
		1494	return where->env->insert (this);
		1495	else
1473	return where->map->insert (this, where->x, where->y, originator, flags);	1496	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1497	}
1475		1498
1476	/*	1499	// find player who can see this object
1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1478	* is returned contains nr objects, and the remaining parts contains
1479	* the rest (or is removed and freed if that number is 0).
1480	* On failure, NULL is returned, and the reason put into the
1481	* global static errmsg array.
1482	*/
1483	object *	1500	object *
1484	get_split_ob (object *orig_ob, uint32 nr)	1501	object::visible_to () const
1485	{	1502	{
1486	object *newob;	1503	if (!flag [FLAG_REMOVED])
1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1488
1489	if (orig_ob->nrof < nr)
1490	{
1491	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1492	return NULL;
1493	}	1504	{
1494		1505	// see if we are in a container of sorts
1495	newob = object_create_clone (orig_ob);	1506	if (env)
1496
1497	if ((orig_ob->nrof -= nr) < 1)
1498	orig_ob->destroy (1);
1499	else if (!is_removed)
1500	{
1501	if (orig_ob->env != NULL)
1502	sub_weight (orig_ob->env, orig_ob->weight * nr);
1503	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1504	{
1505	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1506	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1507	return NULL;
1508	}	1507	{
1509	}	1508	// the player inventory itself is always visible
		1509	if (env->type == PLAYER)
		1510	return env;
1510		1511
1511	newob->nrof = nr;	1512	// else a player could have our env open
		1513	object *envest = env->outer_env ();
1512		1514
		1515	// the player itself is always on a map, so we will find him here
		1516	// even if our inv is in a player.
		1517	if (envest->is_on_map ())
		1518	if (object *pl = envest->ms ().player ())
		1519	if (pl->container == env)
		1520	return pl;
		1521	}
		1522	else
		1523	{
		1524	// maybe there is a player standing on the same mapspace
		1525	// this will catch the case where "this" is a player
		1526	if (object *pl = ms ().player ())
		1527	return pl;
		1528	}
		1529	}
		1530
1513	return newob;	1531	return 0;
1514	}	1532	}
1515		1533
1516	/*	1534	/*
1517	* decrease_ob_nr(object, number) decreases a specified number from	1535	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1536	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1537	* is subsequently removed and freed.
1520	*	1538	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1539	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1540	*/
		1541	bool
		1542	object::decrease (sint32 nr)
		1543	{
		1544	if (!nr)
		1545	return true;
		1546
		1547	nr = min (nr, nrof);
		1548
		1549	nrof -= nr;
		1550
		1551	if (nrof)
		1552	{
		1553	adjust_weight (env, -weight * nr); // carrying == 0
		1554
		1555	if (object *pl = visible_to ())
		1556	esrv_update_item (UPD_NROF, pl, this);
		1557
		1558	return true;
		1559	}
		1560	else
		1561	{
		1562	destroy (1);
		1563	return false;
		1564	}
		1565	}
		1566
		1567	/*
		1568	* split(ob,nr) splits up ob into two parts. The part which
		1569	* is returned contains nr objects, and the remaining parts contains
		1570	* the rest (or is removed and returned if that number is 0).
		1571	* On failure, NULL is returned.
		1572	*/
1523	object *	1573	object *
1524	decrease_ob_nr (object *op, uint32 i)	1574	object::split (sint32 nr)
1525	{	1575	{
1526	object *tmp;	1576	int have = number_of ();
1527		1577
1528	if (i == 0) /* objects with op->nrof require this check */	1578	if (have < nr)
1529	return op;	1579	return 0;
1530		1580	else if (have == nr)
1531	if (i > op->nrof)
1532	i = op->nrof;
1533
1534	if (QUERY_FLAG (op, FLAG_REMOVED))
1535	op->nrof -= i;
1536	else if (op->env)
1537	{	1581	{
1538	/* is this object in the players inventory, or sub container
1539	* therein?
1540	*/
1541	tmp = op->in_player ();
1542	/* nope. Is this a container the player has opened?
1543	* If so, set tmp to that player.
1544	* IMO, searching through all the players will mostly
1545	* likely be quicker than following op->env to the map,
1546	* and then searching the map for a player.
1547	*/
1548	if (!tmp)
1549	for_all_players (pl)
1550	if (pl->ob->container == op->env)
1551	{
1552	tmp = pl->ob;
1553	break;
1554	}
1555
1556	if (i < op->nrof)
1557	{
1558	sub_weight (op->env, op->weight * i);
1559	op->nrof -= i;
1560	if (tmp)
1561	esrv_send_item (tmp, op);
1562	}
1563	else
1564	{
1565	op->remove ();	1582	remove ();
1566	op->nrof = 0;	1583	return this;
1567	if (tmp)
1568	esrv_del_item (tmp->contr, op->count);
1569	}
1570	}	1584	}
1571	else	1585	else
1572	{	1586	{
1573	object *above = op->above;	1587	decrease (nr);
1574		1588
1575	if (i < op->nrof)	1589	object *op = object_create_clone (this);
1576	op->nrof -= i;	1590	op->nrof = nr;
1577	else
1578	{
1579	op->remove ();
1580	op->nrof = 0;
1581	}
1582
1583	/* Since we just removed op, op->above is null */
1584	for (tmp = above; tmp; tmp = tmp->above)
1585	if (tmp->type == PLAYER)
1586	{
1587	if (op->nrof)
1588	esrv_send_item (tmp, op);
1589	else
1590	esrv_del_item (tmp->contr, op->count);
1591	}
1592	}
1593
1594	if (op->nrof)
1595	return op;	1591	return op;
1596	else
1597	{
1598	op->destroy ();
1599	return 0;
1600	}
1601	}
1602
1603	/*
1604	* add_weight(object, weight) adds the specified weight to an object,
1605	* and also updates how much the environment(s) is/are carrying.
1606	*/
1607	void
1608	add_weight (object *op, signed long weight)
1609	{
1610	while (op != NULL)
1611	{
1612	if (op->type == CONTAINER)
1613	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1614
1615	op->carrying += weight;
1616	op = op->env;
1617	}	1592	}
1618	}	1593	}
1619		1594
1620	object *	1595	object *
1621	insert_ob_in_ob (object op, object where)	1596	insert_ob_in_ob (object op, object where)
…		…
1646	* be != op, if items are merged. -Tero	1621	* be != op, if items are merged. -Tero
1647	*/	1622	*/
1648	object *	1623	object *
1649	object::insert (object *op)	1624	object::insert (object *op)
1650	{	1625	{
1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1652	op->remove ();
1653
1654	if (op->more)	1626	if (op->more)
1655	{	1627	{
1656	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1628	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1657	return op;	1629	return op;
1658	}	1630	}
1659		1631
1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1632	op->remove ();
1661	CLEAR_FLAG (op, FLAG_REMOVED);	1633
		1634	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1662		1635
1663	if (op->nrof)	1636	if (op->nrof)
1664	{
1665	for (object *tmp = inv; tmp; tmp = tmp->below)	1637	for (object *tmp = inv; tmp; tmp = tmp->below)
1666	if (object::can_merge (tmp, op))	1638	if (object::can_merge (tmp, op))
1667	{	1639	{
1668	/* return the original object and remove inserted object	1640	/* return the original object and remove inserted object
1669	(client needs the original object) */	1641	(client needs the original object) */
1670	tmp->nrof += op->nrof;	1642	tmp->nrof += op->nrof;
1671	/* Weight handling gets pretty funky. Since we are adding to
1672	* tmp->nrof, we need to increase the weight.
1673	*/
1674	add_weight (this, op->weight * op->nrof);	1643	adjust_weight (this, op->total_weight ());
1675	SET_FLAG (op, FLAG_REMOVED);	1644
1676	op->destroy (); /* free the inserted object */	1645	op->destroy (1);
1677	op = tmp;	1646	op = tmp;
1678	op->remove (); /* and fix old object's links */	1647	goto inserted;
1679	CLEAR_FLAG (op, FLAG_REMOVED);
1680	break;
1681	}	1648	}
1682		1649
1683	/* I assume combined objects have no inventory	1650	op->owner = 0; // it's his/hers now. period.
1684	* We add the weight - this object could have just been removed	1651	op->map = 0;
1685	* (if it was possible to merge). calling remove_ob will subtract	1652	op->x = 0;
1686	* the weight, so we need to add it in again, since we actually do	1653	op->y = 0;
1687	* the linking below
1688	*/
1689	add_weight (this, op->weight * op->nrof);
1690	}
1691	else
1692	add_weight (this, (op->weight + op->carrying));
1693		1654
		1655	op->above = 0;
		1656	op->below = inv;
		1657	op->env = this;
		1658
		1659	if (inv)
		1660	inv->above = op;
		1661
		1662	inv = op;
		1663
		1664	op->flag [FLAG_REMOVED] = 0;
		1665
		1666	adjust_weight (this, op->total_weight ());
		1667
		1668	inserted:
		1669	/* reset the light list and los of the players on the map */
		1670	if (op->glow_radius && map && map->darkness)
		1671	update_all_los (map, x, y);
		1672
1694	if (object *otmp = this->in_player ())	1673	if (object *otmp = in_player ())
1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1696	otmp->update_stats ();	1675	otmp->update_stats ();
1697
1698	op->owner = 0; // its his/hers now. period.
1699	op->map = 0;
1700	op->env = this;
1701	op->above = 0;
1702	op->below = 0;
1703	op->x = op->y = 0;
1704
1705	/* reset the light list and los of the players on the map */
1706	if (op->glow_radius && map)
1707	{
1708	#ifdef DEBUG_LIGHTS
1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1710	#endif /* DEBUG_LIGHTS */
1711	if (map->darkness)
1712	update_all_los (map, x, y);
1713	}
1714
1715	/* Client has no idea of ordering so lets not bother ordering it here.
1716	* It sure simplifies this function...
1717	*/
1718	if (!inv)
1719	inv = op;
1720	else
1721	{
1722	op->below = inv;
1723	op->below->above = op;
1724	inv = op;
1725	}
1726		1676
1727	INVOKE_OBJECT (INSERT, this);	1677	INVOKE_OBJECT (INSERT, this);
1728		1678
1729	return op;	1679	return op;
1730	}	1680	}
…		…
1945	* activate recursively a flag on an object inventory	1895	* activate recursively a flag on an object inventory
1946	*/	1896	*/
1947	void	1897	void
1948	flag_inv (object *op, int flag)	1898	flag_inv (object *op, int flag)
1949	{	1899	{
1950	if (op->inv)
1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952	{	1901	{
1953	SET_FLAG (tmp, flag);	1902	SET_FLAG (tmp, flag);
1954	flag_inv (tmp, flag);	1903	flag_inv (tmp, flag);
1955	}	1904	}
1956	}	1905	}
1957		1906
1958	/*	1907	/*
1959	* deactivate recursively a flag on an object inventory	1908	* deactivate recursively a flag on an object inventory
1960	*/	1909	*/
1961	void	1910	void
1962	unflag_inv (object *op, int flag)	1911	unflag_inv (object *op, int flag)
1963	{	1912	{
1964	if (op->inv)
1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1913	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966	{	1914	{
1967	CLEAR_FLAG (tmp, flag);	1915	CLEAR_FLAG (tmp, flag);
1968	unflag_inv (tmp, flag);	1916	unflag_inv (tmp, flag);
1969	}	1917	}
1970	}	1918	}
1971		1919
1972	/*	1920	/*
1973	* find_free_spot(object, map, x, y, start, stop) will search for	1921	* find_free_spot(object, map, x, y, start, stop) will search for
1974	* a spot at the given map and coordinates which will be able to contain	1922	* a spot at the given map and coordinates which will be able to contain
…		…
1976	* to search (see the freearr_x/y[] definition).	1924	* to search (see the freearr_x/y[] definition).
1977	* It returns a random choice among the alternatives found.	1925	* It returns a random choice among the alternatives found.
1978	* start and stop are where to start relative to the free_arr array (1,9	1926	* start and stop are where to start relative to the free_arr array (1,9
1979	* does all 4 immediate directions). This returns the index into the	1927	* does all 4 immediate directions). This returns the index into the
1980	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1928	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1981	* Note - this only checks to see if there is space for the head of the
1982	* object - if it is a multispace object, this should be called for all
1983	* pieces.
1984	* Note2: This function does correctly handle tiled maps, but does not	1929	* Note: This function does correctly handle tiled maps, but does not
1985	* inform the caller. However, insert_ob_in_map will update as	1930	* inform the caller. However, insert_ob_in_map will update as
1986	* necessary, so the caller shouldn't need to do any special work.	1931	* necessary, so the caller shouldn't need to do any special work.
1987	* Note - updated to take an object instead of archetype - this is necessary	1932	* Note - updated to take an object instead of archetype - this is necessary
1988	* because arch_blocked (now ob_blocked) needs to know the movement type	1933	* because arch_blocked (now ob_blocked) needs to know the movement type
1989	* to know if the space in question will block the object. We can't use	1934	* to know if the space in question will block the object. We can't use
…		…
2010		1955
2011	/* However, often	1956	/* However, often
2012	* ob doesn't have any move type (when used to place exits)	1957	* ob doesn't have any move type (when used to place exits)
2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1958	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014	*/	1959	*/
2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1960	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2016	{	1961	{
2017	altern [index++] = i;	1962	altern [index++] = i;
2018	continue;	1963	continue;
2019	}	1964	}
2020		1965
…		…
2034		1979
2035	/* Note it is intentional that we check ob - the movement type of the	1980	/* Note it is intentional that we check ob - the movement type of the
2036	* head of the object should correspond for the entire object.	1981	* head of the object should correspond for the entire object.
2037	*/	1982	*/
2038	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1984	continue;
		1985
		1986	if (ob->blocked (m, pos.x, pos.y))
2039	continue;	1987	continue;
2040		1988
2041	altern [index++] = i;	1989	altern [index++] = i;
2042	}	1990	}
2043		1991
…		…
2602	{	2550	{
2603	char flagdesc[512];	2551	char flagdesc[512];
2604	char info2[256 * 4];	2552	char info2[256 * 4];
2605	char *p = info;	2553	char *p = info;
2606		2554
2607	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2555	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2608	count, uuid.seq,	2556	count,
		2557	uuid.c_str (),
2609	&name,	2558	&name,
2610	title ? "\",title:\"" : "",	2559	title ? "\",title:\"" : "",
2611	title ? (const char *)title : "",	2560	title ? (const char *)title : "",
2612	flag_desc (flagdesc, 512), type);	2561	flag_desc (flagdesc, 512), type);
2613		2562
…		…
2729		2678
2730	insert (force);	2679	insert (force);
2731	}	2680	}
2732		2681
2733	void	2682	void
2734	object::play_sound (faceidx sound) const	2683	object::play_sound (faceidx sound)
2735	{	2684	{
2736	if (!sound)	2685	if (!sound)
2737	return;	2686	return;
2738		2687
2739	if (flag [FLAG_REMOVED])	2688	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs. Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC