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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 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);
		82
		83	seq_next_save = 0;
86		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)
310	{	316	{
311	int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312	int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313		319
314	if (k1 != k2)	320	if (k1 != k2)
315	return 0;	321	return 0;
		322
316	else if (k1 == 0)	323	if (k1 == 0)
317	return 1;	324	return 1;
		325
318	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
319	return 0;	327	return 0;
320	}	328	}
321	}	329	}
322		330
323	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
324	return 1;	332	return 1;
325	}	333	}
326		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container \|\| this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
327	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
328	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
329	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
330	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
331	*/	408	*/
332	long	409	void
333	sum_weight (object *op)	410	object::update_weight ()
334	{	411	{
335	long sum;	412	sint32 sum = 0;
336	object *inv;
337		413
338	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
339	{	415	{
340	if (inv->inv)	416	if (op->inv)
341	sum_weight (inv);	417	op->update_weight ();
342		418
343	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
344	}	425	{
345
346	if (op->type == CONTAINER && op->stats.Str)
347	sum = (sum * (100 - op->stats.Str)) / 100;
348
349	if (op->carrying != sum)
350	op->carrying = sum;	426	carrying = sum;
351		427
352	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
353	}	432	}
354		433
355	/**	434	/*
356	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
357	*/
358
359	object *
360	object_get_env_recursive (object *op)
361	{
362	while (op->env != NULL)
363	op = op->env;
364	return op;
365	}
366
367	/*
368	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
369	* Some error messages.
370	* The result of the dump is stored in the static global errmsg array.
371	*/	436	*/
372	char *	437	char *
373	dump_object (object *op)	438	dump_object (object *op)
374	{	439	{
375	if (!op)	440	if (!op)
…		…
389	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
390	{	455	{
391	object tmp, closest;	456	object tmp, closest;
392	int last_dist, i;	457	int last_dist, i;
393		458
394	if (op->more == NULL)	459	if (!op->more)
395	return op;	460	return op;
		461
396	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
397	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
398	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
399	return closest;	468	return closest;
400	}	469	}
401		470
402	/*	471	/*
403	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
404	*/	474	*/
405	object *	475	object *
406	find_object (tag_t i)	476	find_object (tag_t i)
407	{	477	{
408	for_all_objects (op)	478	for_all_objects (op)
…		…
426	for_all_objects (op)	496	for_all_objects (op)
427	if (op->name == str_)	497	if (op->name == str_)
428	break;	498	break;
429		499
430	return op;	500	return op;
431	}
432
433	void
434	free_all_object_data ()
435	{
436	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
437	}	501	}
438		502
439	/*	503	/*
440	* Sets the owner and sets the skill and exp pointers to owner's current	504	* Sets the owner and sets the skill and exp pointers to owner's current
441	* skill and experience objects.	505	* skill and experience objects.
…		…
446	{	510	{
447	// allow objects which own objects	511	// allow objects which own objects
448	if (owner)	512	if (owner)
449	while (owner->owner)	513	while (owner->owner)
450	owner = owner->owner;	514	owner = owner->owner;
		515
		516	if (flag [FLAG_FREED])
		517	{
		518	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		519	return;
		520	}
451		521
452	this->owner = owner;	522	this->owner = owner;
453	}	523	}
454		524
455	int	525	int
…		…
596		666
597	void	667	void
598	object::instantiate ()	668	object::instantiate ()
599	{	669	{
600	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
601	uuid = gen_uuid ();	671	uuid = UUID::gen ();
602		672
603	speed_left = -0.1f;	673	speed_left = -0.1f;
604	/* copy the body_info to the body_used - this is only really	674	/* copy the body_info to the body_used - this is only really
605	* need for monsters, but doesn't hurt to do it for everything.	675	* need for monsters, but doesn't hurt to do it for everything.
606	* by doing so, when a monster is created, it has good starting	676	* by doing so, when a monster is created, it has good starting
…		…
765	static int object_count;	835	static int object_count;
766		836
767	void object::link ()	837	void object::link ()
768	{	838	{
769	assert (!index);//D	839	assert (!index);//D
770	uuid = gen_uuid ();	840	uuid = UUID::gen ();
771	count = ++object_count;	841	count = ++object_count;
772		842
773	refcnt_inc ();	843	refcnt_inc ();
774	objects.insert (this);	844	objects.insert (this);
775	}	845	}
…		…
848	object::destroy_inv (bool drop_to_ground)	918	object::destroy_inv (bool drop_to_ground)
849	{	919	{
850	// need to check first, because the checks below might segfault	920	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	921	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	922	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	923	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	924	// cf will crash below with off-map x and y
855	if (!inv)	925	if (!inv)
856	return;	926	return;
857		927
858	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
860	* drop on that space.	930	* drop on that space.
861	*/	931	*/
862	if (!drop_to_ground	932	if (!drop_to_ground
863	\|\| !map	933	\|\| !map
864	\|\| map->in_memory != MAP_IN_MEMORY	934	\|\| map->in_memory != MAP_ACTIVE
865	\|\| map->nodrop	935	\|\| map->nodrop
866	\|\| ms ().move_block == MOVE_ALL)	936	\|\| ms ().move_block == MOVE_ALL)
867	{	937	{
868	while (inv)	938	while (inv)
869	{	939	{
870	inv->destroy_inv (drop_to_ground);	940	inv->destroy_inv (false);
871	inv->destroy ();	941	inv->destroy ();
872	}	942	}
873	}	943	}
874	else	944	else
875	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
881	\|\| op->flag [FLAG_NO_DROP]	951	\|\| op->flag [FLAG_NO_DROP]
882	\|\| op->type == RUNE	952	\|\| op->type == RUNE
883	\|\| op->type == TRAP	953	\|\| op->type == TRAP
884	\|\| op->flag [FLAG_IS_A_TEMPLATE]	954	\|\| op->flag [FLAG_IS_A_TEMPLATE]
885	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	955	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
886	op->destroy ();	956	op->destroy (true);
887	else	957	else
888	map->insert (op, x, y);	958	map->insert (op, x, y);
889	}	959	}
890	}	960	}
891	}	961	}
…		…
898	}	968	}
899		969
900	void	970	void
901	object::do_destroy ()	971	object::do_destroy ()
902	{	972	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	974	remove_button_link (this);
907		975
908	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	977	remove_friendly_object (this);
910		978
911	if (!flag [FLAG_REMOVED])
912	remove ();	979	remove ();
913		980
914	destroy_inv (true);	981	attachable::do_destroy ();
915		982
916	deactivate ();	983	deactivate ();
917	unlink ();	984	unlink ();
918		985
919	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
…		…
928		995
929	freed_map->path = "<freed objects map>";	996	freed_map->path = "<freed objects map>";
930	freed_map->name = "/internal/freed_objects_map";	997	freed_map->name = "/internal/freed_objects_map";
931	freed_map->width = 3;	998	freed_map->width = 3;
932	freed_map->height = 3;	999	freed_map->height = 3;
		1000	freed_map->nodrop = 1;
933		1001
934	freed_map->alloc ();	1002	freed_map->alloc ();
935	freed_map->in_memory = MAP_IN_MEMORY;	1003	freed_map->in_memory = MAP_ACTIVE;
936	}	1004	}
937		1005
938	map = freed_map;	1006	map = freed_map;
939	x = 1;	1007	x = 1;
940	y = 1;	1008	y = 1;
…		…
959	object::destroy (bool destroy_inventory)	1027	object::destroy (bool destroy_inventory)
960	{	1028	{
961	if (destroyed ())	1029	if (destroyed ())
962	return;	1030	return;
963		1031
		1032	if (!is_head () && !head->destroyed ())
		1033	{
		1034	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1035	head->destroy (destroy_inventory);
		1036	}
		1037
964	if (destroy_inventory)	1038	destroy_inv (!destroy_inventory);
965	destroy_inv (false);
966		1039
967	if (is_head ())	1040	if (is_head ())
968	if (sound_destroy)	1041	if (sound_destroy)
969	play_sound (sound_destroy);	1042	play_sound (sound_destroy);
970	else if (flag [FLAG_MONSTER])	1043	else if (flag [FLAG_MONSTER])
971	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1044	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
972		1045
973	attachable::destroy ();	1046	attachable::destroy ();
974	}
975
976	/*
977	* sub_weight() recursively (outwards) subtracts a number from the
978	* weight of an object (and what is carried by it's environment(s)).
979	*/
980	void
981	sub_weight (object *op, signed long weight)
982	{
983	while (op != NULL)
984	{
985	if (op->type == CONTAINER)
986	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
987
988	op->carrying -= weight;
989	op = op->env;
990	}
991	}	1047	}
992		1048
993	/* op->remove ():	1049	/* op->remove ():
994	* This function removes the object op from the linked list of objects	1050	* This function removes the object op from the linked list of objects
995	* which it is currently tied to. When this function is done, the	1051	* which it is currently tied to. When this function is done, the
…		…
1001	object::do_remove ()	1057	object::do_remove ()
1002	{	1058	{
1003	object tmp, last = 0;	1059	object tmp, last = 0;
1004	object *otmp;	1060	object *otmp;
1005		1061
1006	if (QUERY_FLAG (this, FLAG_REMOVED))	1062	if (flag [FLAG_REMOVED])
1007	return;	1063	return;
1008		1064
1009	SET_FLAG (this, FLAG_REMOVED);
1010	INVOKE_OBJECT (REMOVE, this);	1065	INVOKE_OBJECT (REMOVE, this);
		1066
		1067	flag [FLAG_REMOVED] = true;
1011		1068
1012	if (more)	1069	if (more)
1013	more->remove ();	1070	more->remove ();
1014		1071
1015	/*	1072	/*
1016	* In this case, the object to be removed is in someones	1073	* In this case, the object to be removed is in someones
1017	* inventory.	1074	* inventory.
1018	*/	1075	*/
1019	if (env)	1076	if (env)
1020	{	1077	{
		1078	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1079	if (object *pl = visible_to ())
		1080	esrv_del_item (pl->contr, count);
		1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1082
		1083	adjust_weight (env, -total_weight ());
		1084
		1085	*(above ? &above->below : &env->inv) = below;
		1086
1021	if (nrof)	1087	if (below)
1022	sub_weight (env, weight * nrof);	1088	below->above = above;
1023	else	1089
1024	sub_weight (env, weight + carrying);	1090	/* we set up values so that it could be inserted into
		1091	* the map, but we don't actually do that - it is up
		1092	* to the caller to decide what we want to do.
		1093	*/
		1094	map = env->map;
		1095	x = env->x;
		1096	y = env->y;
		1097	above = 0;
		1098	below = 0;
		1099	env = 0;
1025		1100
1026	/* NO_FIX_PLAYER is set when a great many changes are being	1101	/* NO_FIX_PLAYER is set when a great many changes are being
1027	* made to players inventory. If set, avoiding the call	1102	* made to players inventory. If set, avoiding the call
1028	* to save cpu time.	1103	* to save cpu time.
1029	*/	1104	*/
1030	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1105	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1031	otmp->update_stats ();	1106	otmp->update_stats ();
1032
1033	if (above)
1034	above->below = below;
1035	else
1036	env->inv = below;
1037
1038	if (below)
1039	below->above = above;
1040
1041	/* we set up values so that it could be inserted into
1042	* the map, but we don't actually do that - it is up
1043	* to the caller to decide what we want to do.
1044	*/
1045	x = env->x, y = env->y;
1046	map = env->map;
1047	above = 0, below = 0;
1048	env = 0;
1049	}	1107	}
1050	else if (map)	1108	else if (map)
1051	{	1109	{
1052	if (type == PLAYER)
1053	{
1054	// leaving a spot always closes any open container on the ground
1055	if (container && !container->env)
1056	// this causes spurious floorbox updates, but it ensures
1057	// that the CLOSE event is being sent.
1058	close_container ();
1059
1060	--map->players;
1061	map->touch ();
1062	}
1063
1064	map->dirty = true;	1110	map->dirty = true;
1065	mapspace &ms = this->ms ();	1111	mapspace &ms = this->ms ();
		1112
		1113	if (object *pl = ms.player ())
		1114	{
		1115	if (type == PLAYER) // this == pl(!)
		1116	{
		1117	// leaving a spot always closes any open container on the ground
		1118	if (container && !container->env)
		1119	// this causes spurious floorbox updates, but it ensures
		1120	// that the CLOSE event is being sent.
		1121	close_container ();
		1122
		1123	--map->players;
		1124	map->touch ();
		1125	}
		1126	else if (pl->container == this)
		1127	{
		1128	// removing a container should close it
		1129	close_container ();
		1130	}
		1131
		1132	esrv_del_item (pl->contr, count);
		1133	}
1066		1134
1067	/* link the object above us */	1135	/* link the object above us */
1068	if (above)	1136	if (above)
1069	above->below = below;	1137	above->below = below;
1070	else	1138	else
…		…
1100	* removed (most likely destroyed), update the player view	1168	* removed (most likely destroyed), update the player view
1101	* appropriately.	1169	* appropriately.
1102	*/	1170	*/
1103	pl->close_container ();	1171	pl->close_container ();
1104		1172
1105	pl->contr->ns->floorbox_update ();	1173	//TODO: the floorbox prev/next might need updating
		1174	esrv_del_item (pl->contr, count);
1106	}	1175	}
1107		1176
1108	for (tmp = ms.bot; tmp; tmp = tmp->above)	1177	for (tmp = ms.bot; tmp; tmp = tmp->above)
1109	{	1178	{
1110	/* No point updating the players look faces if he is the object	1179	/* No point updating the players look faces if he is the object
…		…
1149	merge_ob (object op, object top)	1218	merge_ob (object op, object top)
1150	{	1219	{
1151	if (!op->nrof)	1220	if (!op->nrof)
1152	return 0;	1221	return 0;
1153		1222
1154	if (top)	1223	if (!top)
1155	for (top = op; top && top->above; top = top->above)	1224	for (top = op; top && top->above; top = top->above)
1156	;	1225	;
1157		1226
1158	for (; top; top = top->below)	1227	for (; top; top = top->below)
1159	{
1160	if (top == op)
1161	continue;
1162
1163	if (object::can_merge (op, top))	1228	if (object::can_merge (op, top))
1164	{	1229	{
1165	top->nrof += op->nrof;	1230	top->nrof += op->nrof;
1166		1231
1167	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1232	if (object *pl = top->visible_to ())
1168	op->weight = 0; /* Don't want any adjustements now */	1233	esrv_update_item (UPD_NROF, pl, top);
		1234
		1235	op->weight = 0; // cancel the addition above
		1236	op->carrying = 0; // must be 0 already
		1237
1169	op->destroy ();	1238	op->destroy (1);
		1239
1170	return top;	1240	return top;
1171	}	1241	}
1172	}
1173		1242
1174	return 0;	1243	return 0;
1175	}	1244	}
1176		1245
1177	void	1246	void
…		…
1236	object *	1305	object *
1237	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1306	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1238	{	1307	{
1239	assert (!op->flag [FLAG_FREED]);	1308	assert (!op->flag [FLAG_FREED]);
1240		1309
1241	object top, floor = NULL;
1242
1243	op->remove ();	1310	op->remove ();
1244		1311
1245	/* Ideally, the caller figures this out. However, it complicates a lot	1312	/* Ideally, the caller figures this out. However, it complicates a lot
1246	* of areas of callers (eg, anything that uses find_free_spot would now	1313	* of areas of callers (eg, anything that uses find_free_spot would now
1247	* need extra work	1314	* need extra work
1248	*/	1315	*/
1249	if (!xy_normalise (m, op->x, op->y))	1316	if (!xy_normalise (m, op->x, op->y))
1250	{	1317	{
1251	op->destroy ();	1318	op->destroy (1);
1252	return 0;	1319	return 0;
1253	}	1320	}
1254		1321
1255	if (object *more = op->more)	1322	if (object *more = op->more)
1256	if (!insert_ob_in_map (more, m, originator, flag))	1323	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1265	*/	1332	*/
1266	if (op->nrof && !(flag & INS_NO_MERGE))	1333	if (op->nrof && !(flag & INS_NO_MERGE))
1267	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1268	if (object::can_merge (op, tmp))	1335	if (object::can_merge (op, tmp))
1269	{	1336	{
		1337	// TODO: we atcually want to update tmp, not op,
		1338	// but some caller surely breaks when we return tmp
		1339	// from here :/
1270	op->nrof += tmp->nrof;	1340	op->nrof += tmp->nrof;
1271	tmp->destroy ();	1341	tmp->destroy (1);
1272	}	1342	}
1273		1343
1274	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1344	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1275	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1345	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1276		1346
…		…
1296	/* since below originator, no need to update top */	1366	/* since below originator, no need to update top */
1297	originator->below = op;	1367	originator->below = op;
1298	}	1368	}
1299	else	1369	else
1300	{	1370	{
		1371	object top, floor = NULL;
		1372
1301	top = ms.bot;	1373	top = ms.bot;
1302		1374
1303	/* If there are other objects, then */	1375	/* If there are other objects, then */
1304	if (top)	1376	if (top)
1305	{	1377	{
…		…
1404	}	1476	}
1405		1477
1406	op->map->dirty = true;	1478	op->map->dirty = true;
1407		1479
1408	if (object *pl = ms.player ())	1480	if (object *pl = ms.player ())
1409	pl->contr->ns->floorbox_update ();	1481	//TODO: the floorbox prev/next might need updating
		1482	esrv_send_item (pl, op);
1410		1483
1411	/* If this object glows, it may affect lighting conditions that are	1484	/* If this object glows, it may affect lighting conditions that are
1412	* visible to others on this map. But update_all_los is really	1485	* visible to others on this map. But update_all_los is really
1413	* an inefficient way to do this, as it means los for all players	1486	* an inefficient way to do this, as it means los for all players
1414	* on the map will get recalculated. The players could very well	1487	* on the map will get recalculated. The players could very well
…		…
1456	* op is the object to insert it under: supplies x and the map.	1529	* op is the object to insert it under: supplies x and the map.
1457	*/	1530	*/
1458	void	1531	void
1459	replace_insert_ob_in_map (const char arch_string, object op)	1532	replace_insert_ob_in_map (const char arch_string, object op)
1460	{	1533	{
1461	object tmp, tmp1;
1462
1463	/* first search for itself and remove any old instances */	1534	/* first search for itself and remove any old instances */
1464		1535
1465	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1536	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1466	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1537	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1467	tmp->destroy ();	1538	tmp->destroy (1);
1468		1539
1469	tmp1 = arch_to_object (archetype::find (arch_string));	1540	object *tmp = arch_to_object (archetype::find (arch_string));
1470		1541
1471	tmp1->x = op->x;	1542	tmp->x = op->x;
1472	tmp1->y = op->y;	1543	tmp->y = op->y;
		1544
1473	insert_ob_in_map (tmp1, op->map, op, 0);	1545	insert_ob_in_map (tmp, op->map, op, 0);
1474	}	1546	}
1475		1547
1476	object *	1548	object *
1477	object::insert_at (object where, object originator, int flags)	1549	object::insert_at (object where, object originator, int flags)
1478	{	1550	{
		1551	if (where->env)
		1552	return where->env->insert (this);
		1553	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1554	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1555	}
1481		1556
1482	/*	1557	/*
1483	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1484	* is returned contains nr objects, and the remaining parts contains
1485	* the rest (or is removed and freed if that number is 0).
1486	* On failure, NULL is returned, and the reason put into the
1487	* global static errmsg array.
1488	*/
1489	object *
1490	get_split_ob (object *orig_ob, uint32 nr)
1491	{
1492	object *newob;
1493	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1494
1495	if (orig_ob->nrof < nr)
1496	{
1497	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1498	return NULL;
1499	}
1500
1501	newob = object_create_clone (orig_ob);
1502
1503	if ((orig_ob->nrof -= nr) < 1)
1504	orig_ob->destroy (1);
1505	else if (!is_removed)
1506	{
1507	if (orig_ob->env != NULL)
1508	sub_weight (orig_ob->env, orig_ob->weight * nr);
1509	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1510	{
1511	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1512	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1513	return NULL;
1514	}
1515	}
1516
1517	newob->nrof = nr;
1518
1519	return newob;
1520	}
1521
1522	/*
1523	* decrease_ob_nr(object, number) decreases a specified number from	1558	* decrease(object, number) decreases a specified number from
1524	* the amount of an object. If the amount reaches 0, the object	1559	* the amount of an object. If the amount reaches 0, the object
1525	* is subsequently removed and freed.	1560	* is subsequently removed and freed.
1526	*	1561	*
1527	* Return value: 'op' if something is left, NULL if the amount reached 0	1562	* Return value: 'op' if something is left, NULL if the amount reached 0
1528	*/	1563	*/
		1564	bool
		1565	object::decrease (sint32 nr)
		1566	{
		1567	if (!nr)
		1568	return true;
		1569
		1570	nr = min (nr, nrof);
		1571
		1572	nrof -= nr;
		1573
		1574	if (nrof)
		1575	{
		1576	adjust_weight (env, -weight * nr); // carrying == 0
		1577
		1578	if (object *pl = visible_to ())
		1579	esrv_update_item (UPD_NROF, pl, this);
		1580
		1581	return true;
		1582	}
		1583	else
		1584	{
		1585	destroy (1);
		1586	return false;
		1587	}
		1588	}
		1589
		1590	/*
		1591	* split(ob,nr) splits up ob into two parts. The part which
		1592	* is returned contains nr objects, and the remaining parts contains
		1593	* the rest (or is removed and returned if that number is 0).
		1594	* On failure, NULL is returned.
		1595	*/
1529	object *	1596	object *
1530	decrease_ob_nr (object *op, uint32 i)	1597	object::split (sint32 nr)
1531	{	1598	{
1532	object *tmp;	1599	int have = number_of ();
1533		1600
1534	if (i == 0) /* objects with op->nrof require this check */	1601	if (have < nr)
1535	return op;	1602	return 0;
1536		1603	else if (have == nr)
1537	if (i > op->nrof)
1538	i = op->nrof;
1539
1540	if (QUERY_FLAG (op, FLAG_REMOVED))
1541	op->nrof -= i;
1542	else if (op->env)
1543	{	1604	{
1544	/* is this object in the players inventory, or sub container
1545	* therein?
1546	*/
1547	tmp = op->in_player ();
1548	/* nope. Is this a container the player has opened?
1549	* If so, set tmp to that player.
1550	* IMO, searching through all the players will mostly
1551	* likely be quicker than following op->env to the map,
1552	* and then searching the map for a player.
1553	*/
1554	if (!tmp)
1555	for_all_players (pl)
1556	if (pl->ob->container == op->env)
1557	{
1558	tmp = pl->ob;
1559	break;
1560	}
1561
1562	if (i < op->nrof)
1563	{
1564	sub_weight (op->env, op->weight * i);
1565	op->nrof -= i;
1566	if (tmp)
1567	esrv_send_item (tmp, op);
1568	}
1569	else
1570	{
1571	op->remove ();	1605	remove ();
1572	op->nrof = 0;	1606	return this;
1573	if (tmp)
1574	esrv_del_item (tmp->contr, op->count);
1575	}
1576	}	1607	}
1577	else	1608	else
1578	{	1609	{
1579	object *above = op->above;	1610	decrease (nr);
1580		1611
1581	if (i < op->nrof)	1612	object *op = object_create_clone (this);
1582	op->nrof -= i;	1613	op->nrof = nr;
1583	else
1584	{
1585	op->remove ();
1586	op->nrof = 0;
1587	}
1588
1589	/* Since we just removed op, op->above is null */
1590	for (tmp = above; tmp; tmp = tmp->above)
1591	if (tmp->type == PLAYER)
1592	{
1593	if (op->nrof)
1594	esrv_send_item (tmp, op);
1595	else
1596	esrv_del_item (tmp->contr, op->count);
1597	}
1598	}
1599
1600	if (op->nrof)
1601	return op;	1614	return op;
1602	else
1603	{
1604	op->destroy ();
1605	return 0;
1606	}
1607	}
1608
1609	/*
1610	* add_weight(object, weight) adds the specified weight to an object,
1611	* and also updates how much the environment(s) is/are carrying.
1612	*/
1613	void
1614	add_weight (object *op, signed long weight)
1615	{
1616	while (op != NULL)
1617	{
1618	if (op->type == CONTAINER)
1619	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1620
1621	op->carrying += weight;
1622	op = op->env;
1623	}	1615	}
1624	}	1616	}
1625		1617
1626	object *	1618	object *
1627	insert_ob_in_ob (object op, object where)	1619	insert_ob_in_ob (object op, object where)
…		…
1652	* be != op, if items are merged. -Tero	1644	* be != op, if items are merged. -Tero
1653	*/	1645	*/
1654	object *	1646	object *
1655	object::insert (object *op)	1647	object::insert (object *op)
1656	{	1648	{
1657	if (!QUERY_FLAG (op, FLAG_REMOVED))
1658	op->remove ();
1659
1660	if (op->more)	1649	if (op->more)
1661	{	1650	{
1662	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1651	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1663	return op;	1652	return op;
1664	}	1653	}
1665		1654
1666	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1655	op->remove ();
1667	CLEAR_FLAG (op, FLAG_REMOVED);	1656
		1657	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1668		1658
1669	if (op->nrof)	1659	if (op->nrof)
1670	{
1671	for (object *tmp = inv; tmp; tmp = tmp->below)	1660	for (object *tmp = inv; tmp; tmp = tmp->below)
1672	if (object::can_merge (tmp, op))	1661	if (object::can_merge (tmp, op))
1673	{	1662	{
1674	/* return the original object and remove inserted object	1663	/* return the original object and remove inserted object
1675	(client needs the original object) */	1664	(client needs the original object) */
1676	tmp->nrof += op->nrof;	1665	tmp->nrof += op->nrof;
1677	/* Weight handling gets pretty funky. Since we are adding to	1666
1678	* tmp->nrof, we need to increase the weight.	1667	if (object *pl = tmp->visible_to ())
1679	*/	1668	esrv_update_item (UPD_NROF, pl, tmp);
		1669
1680	add_weight (this, op->weight * op->nrof);	1670	adjust_weight (this, op->total_weight ());
1681	SET_FLAG (op, FLAG_REMOVED);	1671
1682	op->destroy (); /* free the inserted object */	1672	op->destroy (1);
1683	op = tmp;	1673	op = tmp;
1684	op->remove (); /* and fix old object's links */	1674	goto inserted;
1685	CLEAR_FLAG (op, FLAG_REMOVED);
1686	break;
1687	}	1675	}
1688		1676
1689	/* I assume combined objects have no inventory
1690	* We add the weight - this object could have just been removed
1691	* (if it was possible to merge). calling remove_ob will subtract
1692	* the weight, so we need to add it in again, since we actually do
1693	* the linking below
1694	*/
1695	add_weight (this, op->weight * op->nrof);
1696	}
1697	else
1698	add_weight (this, (op->weight + op->carrying));
1699
1700	if (object *otmp = this->in_player ())
1701	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1702	otmp->update_stats ();
1703
1704	op->owner = 0; // its his/hers now. period.	1677	op->owner = 0; // it's his/hers now. period.
1705	op->map = 0;	1678	op->map = 0;
		1679	op->x = 0;
		1680	op->y = 0;
		1681
		1682	op->above = 0;
		1683	op->below = inv;
1706	op->env = this;	1684	op->env = this;
1707	op->above = 0;
1708	op->below = 0;
1709	op->x = op->y = 0;
1710		1685
		1686	if (inv)
		1687	inv->above = op;
		1688
		1689	inv = op;
		1690
		1691	op->flag [FLAG_REMOVED] = 0;
		1692
		1693	if (object *pl = op->visible_to ())
		1694	esrv_send_item (pl, op);
		1695
		1696	adjust_weight (this, op->total_weight ());
		1697
		1698	inserted:
1711	/* reset the light list and los of the players on the map */	1699	/* reset the light list and los of the players on the map */
1712	if (op->glow_radius && map)	1700	if (op->glow_radius && map && map->darkness)
1713	{
1714	#ifdef DEBUG_LIGHTS
1715	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1716	#endif /* DEBUG_LIGHTS */
1717	if (map->darkness)
1718	update_all_los (map, x, y);	1701	update_all_los (map, x, y);
1719	}
1720		1702
1721	/* Client has no idea of ordering so lets not bother ordering it here.	1703	// if this is a player's inventory, update stats
1722	* It sure simplifies this function...	1704	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1723	*/	1705	update_stats ();
1724	if (!inv)
1725	inv = op;
1726	else
1727	{
1728	op->below = inv;
1729	op->below->above = op;
1730	inv = op;
1731	}
1732		1706
1733	INVOKE_OBJECT (INSERT, this);	1707	INVOKE_OBJECT (INSERT, this);
1734		1708
1735	return op;	1709	return op;
1736	}	1710	}
…		…
1951	* activate recursively a flag on an object inventory	1925	* activate recursively a flag on an object inventory
1952	*/	1926	*/
1953	void	1927	void
1954	flag_inv (object *op, int flag)	1928	flag_inv (object *op, int flag)
1955	{	1929	{
1956	if (op->inv)
1957	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1958	{	1931	{
1959	SET_FLAG (tmp, flag);	1932	SET_FLAG (tmp, flag);
1960	flag_inv (tmp, flag);	1933	flag_inv (tmp, flag);
1961	}	1934	}
1962	}	1935	}
1963		1936
1964	/*	1937	/*
1965	* deactivate recursively a flag on an object inventory	1938	* deactivate recursively a flag on an object inventory
1966	*/	1939	*/
1967	void	1940	void
1968	unflag_inv (object *op, int flag)	1941	unflag_inv (object *op, int flag)
1969	{	1942	{
1970	if (op->inv)
1971	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1943	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1972	{	1944	{
1973	CLEAR_FLAG (tmp, flag);	1945	CLEAR_FLAG (tmp, flag);
1974	unflag_inv (tmp, flag);	1946	unflag_inv (tmp, flag);
1975	}	1947	}
1976	}	1948	}
1977		1949
1978	/*	1950	/*
1979	* find_free_spot(object, map, x, y, start, stop) will search for	1951	* find_free_spot(object, map, x, y, start, stop) will search for
1980	* a spot at the given map and coordinates which will be able to contain	1952	* a spot at the given map and coordinates which will be able to contain
…		…
1982	* to search (see the freearr_x/y[] definition).	1954	* to search (see the freearr_x/y[] definition).
1983	* It returns a random choice among the alternatives found.	1955	* It returns a random choice among the alternatives found.
1984	* start and stop are where to start relative to the free_arr array (1,9	1956	* start and stop are where to start relative to the free_arr array (1,9
1985	* does all 4 immediate directions). This returns the index into the	1957	* does all 4 immediate directions). This returns the index into the
1986	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1958	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1987	* Note - this only checks to see if there is space for the head of the
1988	* object - if it is a multispace object, this should be called for all
1989	* pieces.
1990	* Note2: This function does correctly handle tiled maps, but does not	1959	* Note: This function does correctly handle tiled maps, but does not
1991	* inform the caller. However, insert_ob_in_map will update as	1960	* inform the caller. However, insert_ob_in_map will update as
1992	* necessary, so the caller shouldn't need to do any special work.	1961	* necessary, so the caller shouldn't need to do any special work.
1993	* Note - updated to take an object instead of archetype - this is necessary	1962	* Note - updated to take an object instead of archetype - this is necessary
1994	* because arch_blocked (now ob_blocked) needs to know the movement type	1963	* because arch_blocked (now ob_blocked) needs to know the movement type
1995	* to know if the space in question will block the object. We can't use	1964	* to know if the space in question will block the object. We can't use
…		…
2016		1985
2017	/* However, often	1986	/* However, often
2018	* ob doesn't have any move type (when used to place exits)	1987	* ob doesn't have any move type (when used to place exits)
2019	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1988	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020	*/	1989	*/
2021	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1990	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022	{	1991	{
2023	altern [index++] = i;	1992	altern [index++] = i;
2024	continue;	1993	continue;
2025	}	1994	}
2026		1995
…		…
2040		2009
2041	/* Note it is intentional that we check ob - the movement type of the	2010	/* Note it is intentional that we check ob - the movement type of the
2042	* head of the object should correspond for the entire object.	2011	* head of the object should correspond for the entire object.
2043	*/	2012	*/
2044	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2013	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2014	continue;
		2015
		2016	if (ob->blocked (m, pos.x, pos.y))
2045	continue;	2017	continue;
2046		2018
2047	altern [index++] = i;	2019	altern [index++] = i;
2048	}	2020	}
2049		2021
…		…
2608	{	2580	{
2609	char flagdesc[512];	2581	char flagdesc[512];
2610	char info2[256 * 4];	2582	char info2[256 * 4];
2611	char *p = info;	2583	char *p = info;
2612		2584
2613	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2585	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614	count, uuid.seq,	2586	count,
		2587	uuid.c_str (),
2615	&name,	2588	&name,
2616	title ? "\",title:\"" : "",	2589	title ? "\",title:\"" : "",
2617	title ? (const char *)title : "",	2590	title ? (const char *)title : "",
2618	flag_desc (flagdesc, 512), type);	2591	flag_desc (flagdesc, 512), type);
2619		2592
2620	if (!this->flag[FLAG_REMOVED] && env)	2593	if (!flag[FLAG_REMOVED] && env)
2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2622		2595
2623	if (map)	2596	if (map)
2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2597	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2625		2598
…		…
2655	object::open_container (object *new_container)	2628	object::open_container (object *new_container)
2656	{	2629	{
2657	if (container == new_container)	2630	if (container == new_container)
2658	return;	2631	return;
2659		2632
2660	if (object *old_container = container)	2633	object *old_container = container;
		2634
		2635	if (old_container)
2661	{	2636	{
2662	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2637	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2663	return;	2638	return;
2664		2639
2665	#if 0	2640	#if 0
…		…
2667	if (object *closer = old_container->inv)	2642	if (object *closer = old_container->inv)
2668	if (closer->type == CLOSE_CON)	2643	if (closer->type == CLOSE_CON)
2669	closer->destroy ();	2644	closer->destroy ();
2670	#endif	2645	#endif
2671		2646
		2647	// make sure the container is available
		2648	esrv_send_item (this, old_container);
		2649
2672	old_container->flag [FLAG_APPLIED] = 0;	2650	old_container->flag [FLAG_APPLIED] = false;
2673	container = 0;	2651	container = 0;
2674		2652
		2653	// client needs item update to make it work, client bug requires this to be separate
2675	esrv_update_item (UPD_FLAGS, this, old_container);	2654	esrv_update_item (UPD_FLAGS, this, old_container);
		2655
2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2677	play_sound (sound_find ("chest_close"));	2657	play_sound (sound_find ("chest_close"));
2678	}	2658	}
2679		2659
2680	if (new_container)	2660	if (new_container)
…		…
2693	}	2673	}
2694	#endif	2674	#endif
2695		2675
2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2697		2677
		2678	// make sure the container is available, client bug requires this to be separate
		2679	esrv_send_item (this, new_container);
		2680
2698	new_container->flag [FLAG_APPLIED] = 1;	2681	new_container->flag [FLAG_APPLIED] = true;
2699	container = new_container;	2682	container = new_container;
2700		2683
		2684	// client needs flag change
2701	esrv_update_item (UPD_FLAGS, this, new_container);	2685	esrv_update_item (UPD_FLAGS, this, new_container);
2702	esrv_send_inventory (this, new_container);	2686	esrv_send_inventory (this, new_container);
2703	play_sound (sound_find ("chest_open"));	2687	play_sound (sound_find ("chest_open"));
2704	}	2688	}
		2689	// else if (!old_container->env && contr && contr->ns)
		2690	// contr->ns->floorbox_reset ();
2705	}	2691	}
2706		2692
2707	object *	2693	object *
2708	object::force_find (const shstr name)	2694	object::force_find (const shstr name)
2709	{	2695	{
…		…
2735		2721
2736	insert (force);	2722	insert (force);
2737	}	2723	}
2738		2724
2739	void	2725	void
2740	object::play_sound (faceidx sound) const	2726	object::play_sound (faceidx sound)
2741	{	2727	{
2742	if (!sound)	2728	if (!sound)
2743	return;	2729	return;
2744		2730
2745	if (flag [FLAG_REMOVED])	2731	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC vs. Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC