ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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
…		…
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 <support@deliantra.net>	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	UUID UUID::cur;	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	objectvec objects;	38	objectvec objects;
42	activevec actives;	39	activevec actives;
43		40
44	short freearr_x[SIZEOFFREE] = {	41	short freearr_x[SIZEOFFREE] = {
…		…
81	{	78	{
82	char filename[MAX_BUF];	79	char filename[MAX_BUF];
83		80
84	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
85		82
		83	seq_next_save = 0;
		84
86	FILE *fp;	85	FILE *fp;
87		86
88	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
89	{	88	{
90	if (errno == ENOENT)	89	if (errno == ENOENT)
91	{	90	{
92	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	92	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	93	write_uuid (UUID_GAP, true);
95	return;	94	return;
96	}	95	}
97		96
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	98	_exit (1);
…		…
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		112
114	write_uuid (UUID_SKIP, true);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	UUID::gen ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++cur.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	124	if (expect_false (cur.seq >= seq_next_save))
		125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
…		…
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* 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. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	143	{
141	key_value *wants_field;
142
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
144	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
145	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
146	*/	147	*/
147		148
148	/* For each field in wants, */	149	/* For each field in wants, */
149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
150	{	151	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	152	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		153
172	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	155	return true;
174	}	156	}
175		157
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	159	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	161	{
180	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
182	*/	164	*/
183	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
184	}	167	}
185		168
186	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
187	* they can be merged together.	170	* they can be merged together.
188	*	171	*
…		…
203	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
206	return 0;	189	return 0;
207		190
208	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	194	* nrof values.
212	*/	195	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	197	return 0;
215		198
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	200	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	201	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	202	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	203	* flags lose any meaning.
221	*/	204	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		207
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		210
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
247	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	232	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	235	return 0;
254		236
		237	if ((ob1->flag ^ ob2->flag)
		238	.reset (FLAG_INV_LOCKED)
		239	.reset (FLAG_CLIENT_SENT)
		240	.reset (FLAG_REMOVED)
		241	.any ())
		242	return 0;
		243
255	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
257	*/	247	*/
258	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
259	{	249	{
260	if (!(ob1->inv && ob2->inv))	250	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	251	return 0; /* inventories differ in length */
262		252
263	if (ob1->inv->below || ob2->inv->below)	253	if (ob1->inv->below || ob2->inv->below)
264	return 0; /* more than one object in inv */	254	return 0; /* more than one object in inv */
265		255
266	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	257	return 0; /* inventory objects differ */
268		258
269	/* inventory ok - still need to check rest of this object to see	259	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	260	* if it is valid.
271	*/	261	*/
272	}	262	}
…		…
291	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
292	return 0;	282	return 0;
293	break;	283	break;
294	}	284	}
295		285
296	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
297	{	287	{
298	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	291
302	else if (!compare_ob_value_lists (ob1, ob2))	292	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	293	return 0;
304	}	294	}
305		295
306	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
307	{	297	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		305
316	if (k1 != k2)	306	if (k1 != k2)
317	return 0;	307	return 0;
		308
318	else if (k1 == 0)	309	if (k1 == 0)
319	return 1;	310	return 1;
		311
320	else if (!cfperl_can_merge (ob1, ob2))	312	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	313	return 0;
322	}	314	}
323	}	315	}
324		316
325	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
326	return 1;	318	return 1;
327	}	319	}
328		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container || this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
		357	// adjust weight per container type ("of holding")
		358	static sint32
		359	weight_adjust (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
329	/*	366	/*
		367	* adjust_weight(object, weight) adds the specified weight to an object,
		368	* and also updates how much the environment(s) is/are carrying.
		369	*/
		370	static void
		371	adjust_weight (object *op, sint32 weight)
		372	{
		373	while (op)
		374	{
		375	weight = weight_adjust (op, weight);
		376
		377	if (!weight)
		378	return;
		379
		380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
		386	op = op->env;
		387	}
		388	}
		389
		390	/*
330	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
331	* an object is carrying. It goes through in figures out how much	392	* an object is carrying. It goes through op and figures out how much
332	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
333	*/	394	*/
334	long	395	void
335	sum_weight (object *op)	396	object::update_weight ()
336	{	397	{
337	long sum;	398	sint32 sum = 0;
338	object *inv;
339		399
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
341	{	401	{
342	if (inv->inv)	402	if (op->inv)
343	sum_weight (inv);	403	op->update_weight ();
344		404
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
346	}	411	{
347
348	if (op->type == CONTAINER && op->stats.Str)
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;	412	carrying = sum;
353		413
354	return sum;	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
355	}	418	}
356		419
357	/**	420	/*
358	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
359	*/
360
361	object *
362	object_get_env_recursive (object *op)
363	{
364	while (op->env != NULL)
365	op = op->env;
366	return op;
367	}
368
369	/*
370	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
371	* Some error messages.
372	* The result of the dump is stored in the static global errmsg array.
373	*/	422	*/
374	char *	423	char *
375	dump_object (object *op)	424	dump_object (object *op)
376	{	425	{
377	if (!op)	426	if (!op)
…		…
391	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
392	{	441	{
393	object *tmp, *closest;	442	object *tmp, *closest;
394	int last_dist, i;	443	int last_dist, i;
395		444
396	if (op->more == NULL)	445	if (!op->more)
397	return op;	446	return op;
		447
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		449	tmp;
		450	tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
401	return closest;	454	return closest;
402	}	455	}
403		456
404	/*	457	/*
405	* Returns the object which has the count-variable equal to the argument.	458	* Returns the object which has the count-variable equal to the argument.
		459	* VERRRY slow.
406	*/	460	*/
407	object *	461	object *
408	find_object (tag_t i)	462	find_object (tag_t i)
409	{	463	{
410	for_all_objects (op)	464	for_all_objects (op)
…		…
535	}	589	}
536		590
537	op->key_values = 0;	591	op->key_values = 0;
538	}	592	}
539		593
540	object &	594	/*
541	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
542	{	604	{
543	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
544	bool is_removed = flag [FLAG_REMOVED];
545
546	*(object_copy *)this = src;	606	*(object_copy *)dst = *this;
547
548	flag [FLAG_FREED] = is_freed;
549	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
550		608
551	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
552	if (src.key_values)	610	if (key_values)
553	{	611	{
554	key_value *tail = 0;	612	key_value *tail = 0;
555	key_values = 0;	613	dst->key_values = 0;
556		614
557	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
558	{	616	{
559	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
560		618
561	new_link->next = 0;	619	new_link->next = 0;
562	new_link->key = i->key;	620	new_link->key = i->key;
563	new_link->value = i->value;	621	new_link->value = i->value;
564		622
565	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
566	if (!key_values)	624	if (!dst->key_values)
567	{	625	{
568	key_values = new_link;	626	dst->key_values = new_link;
569	tail = new_link;	627	tail = new_link;
570	}	628	}
571	else	629	else
572	{	630	{
573	tail->next = new_link;	631	tail->next = new_link;
574	tail = new_link;	632	tail = new_link;
575	}	633	}
576	}	634	}
577	}	635	}
578	}
579
580	/*
581	* copy_to first frees everything allocated by the dst object,
582	* and then copies the contents of itself into the second
583	* object, allocating what needs to be allocated. Basically, any
584	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
585	* if the first object is freed, the pointers in the new object
586	* will point at garbage.
587	*/
588	void
589	object::copy_to (object *dst)
590	{
591	*dst = *this;
592		636
593	if (speed < 0)	637	if (speed < 0)
594	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
595		639
596	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
618	object *	662	object *
619	object::clone ()	663	object::clone ()
620	{	664	{
621	object *neu = create ();	665	object *neu = create ();
622	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
623	return neu;	668	return neu;
624	}	669	}
625		670
626	/*	671	/*
627	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
678	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
679	*/	724	*/
680	void	725	void
681	update_object (object *op, int action)	726	update_object (object *op, int action)
682	{	727	{
683	if (op == NULL)	728	if (!op)
684	{	729	{
685	/* this should never happen */	730	/* this should never happen */
686	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
687	return;	732	return;
688	}	733	}
689		734
690	if (op->env)	735	if (!op->is_on_map ())
691	{	736	{
692	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
693	* to do in this case.	738	* to do in this case.
694	*/	739	*/
695	return;	740	return;
696	}	741	}
697
698	/* If the map is saving, don't do anything as everything is
699	* going to get freed anyways.
700	*/
701	if (!op->map || op->map->in_memory == MAP_SAVING)
702	return;
703		742
704	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
705	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	744	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
706	{	745	{
707	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
850	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
851	{	890	{
852	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
853	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
854	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
855	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
856	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
857	if (!inv)	896	if (!inv)
858	return;	897	return;
859		898
860	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
861	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
862	* drop on that space.	901	* drop on that space.
863	*/	902	*/
864	if (!drop_to_ground	903	if (!drop_to_ground
865	|| !map	904	|| !map
866	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
867	|| map->nodrop	906	|| map->nodrop
868	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
869	{	908	{
870	while (inv)	909	while (inv)
871	{	910	{
872	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
873	inv->destroy ();	912	inv->destroy ();
874	}	913	}
875	}	914	}
876	else	915	else
877	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
883	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
884	|| op->type == RUNE	923	|| op->type == RUNE
885	|| op->type == TRAP	924	|| op->type == TRAP
886	|| op->flag [FLAG_IS_A_TEMPLATE]	925	|| op->flag [FLAG_IS_A_TEMPLATE]
887	|| op->flag [FLAG_DESTROY_ON_DEATH])	926	|| op->flag [FLAG_DESTROY_ON_DEATH])
888	op->destroy ();	927	op->destroy (true);
889	else	928	else
890	map->insert (op, x, y);	929	map->insert (op, x, y);
891	}	930	}
892	}	931	}
893	}	932	}
…		…
897	object *op = new object;	936	object *op = new object;
898	op->link ();	937	op->link ();
899	return op;	938	return op;
900	}	939	}
901		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954	} freed_map; // freed objects are moved here to avoid crashes
		955
902	void	956	void
903	object::do_destroy ()	957	object::do_destroy ()
904	{	958	{
905	attachable::do_destroy ();
906
907	if (flag [FLAG_IS_LINKED])	959	if (flag [FLAG_IS_LINKED])
908	remove_button_link (this);	960	remove_button_link (this);
909		961
910	if (flag [FLAG_FRIENDLY])	962	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	963	remove_friendly_object (this);
912		964
913	if (!flag [FLAG_REMOVED])
914	remove ();	965	remove ();
915		966
916	destroy_inv (true);	967	attachable::do_destroy ();
917		968
918	deactivate ();	969	deactivate ();
919	unlink ();	970	unlink ();
920		971
921	flag [FLAG_FREED] = 1;	972	flag [FLAG_FREED] = 1;
922		973
923	// hack to ensure that freed objects still have a valid map	974	// hack to ensure that freed objects still have a valid map
924	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927	if (!freed_map)
928	{
929	freed_map = new maptile;
930
931	freed_map->path = "<freed objects map>";
932	freed_map->name = "/internal/freed_objects_map";
933	freed_map->width = 3;
934	freed_map->height = 3;
935	freed_map->nodrop = 1;
936
937	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;
939	}
940
941	map = freed_map;	975	map = &freed_map;
942	x = 1;	976	x = 1;
943	y = 1;	977	y = 1;
944	}
945		978
946	if (more)	979	if (more)
947	{	980	{
948	more->destroy ();	981	more->destroy ();
949	more = 0;	982	more = 0;
…		…
962	object::destroy (bool destroy_inventory)	995	object::destroy (bool destroy_inventory)
963	{	996	{
964	if (destroyed ())	997	if (destroyed ())
965	return;	998	return;
966		999
		1000	if (!is_head () && !head->destroyed ())
		1001	{
		1002	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1003	head->destroy (destroy_inventory);
		1004	return;
		1005	}
		1006
967	if (destroy_inventory)	1007	destroy_inv (!destroy_inventory);
968	destroy_inv (false);
969		1008
970	if (is_head ())	1009	if (is_head ())
971	if (sound_destroy)	1010	if (sound_destroy)
972	play_sound (sound_destroy);	1011	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	1012	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1013	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		1014
976	attachable::destroy ();	1015	attachable::destroy ();
977	}
978
979	/*
980	* sub_weight() recursively (outwards) subtracts a number from the
981	* weight of an object (and what is carried by it's environment(s)).
982	*/
983	void
984	sub_weight (object *op, signed long weight)
985	{
986	while (op != NULL)
987	{
988	if (op->type == CONTAINER)
989	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
990
991	op->carrying -= weight;
992	op = op->env;
993	}
994	}	1016	}
995		1017
996	/* op->remove ():	1018	/* op->remove ():
997	* This function removes the object op from the linked list of objects	1019	* This function removes the object op from the linked list of objects
998	* which it is currently tied to. When this function is done, the	1020	* which it is currently tied to. When this function is done, the
…		…
1004	object::do_remove ()	1026	object::do_remove ()
1005	{	1027	{
1006	object *tmp, *last = 0;	1028	object *tmp, *last = 0;
1007	object *otmp;	1029	object *otmp;
1008		1030
1009	if (QUERY_FLAG (this, FLAG_REMOVED))	1031	if (flag [FLAG_REMOVED])
1010	return;	1032	return;
1011		1033
1012	SET_FLAG (this, FLAG_REMOVED);
1013	INVOKE_OBJECT (REMOVE, this);	1034	INVOKE_OBJECT (REMOVE, this);
		1035
		1036	flag [FLAG_REMOVED] = true;
1014		1037
1015	if (more)	1038	if (more)
1016	more->remove ();	1039	more->remove ();
1017		1040
1018	/*	1041	/*
1019	* In this case, the object to be removed is in someones	1042	* In this case, the object to be removed is in someones
1020	* inventory.	1043	* inventory.
1021	*/	1044	*/
1022	if (env)	1045	if (env)
1023	{	1046	{
		1047	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1048	if (object *pl = visible_to ())
		1049	esrv_del_item (pl->contr, count);
		1050	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1051
		1052	adjust_weight (env, -total_weight ());
		1053
		1054	*(above ? &above->below : &env->inv) = below;
		1055
1024	if (nrof)	1056	if (below)
1025	sub_weight (env, weight * nrof);	1057	below->above = above;
1026	else	1058
1027	sub_weight (env, weight + carrying);	1059	/* we set up values so that it could be inserted into
		1060	* the map, but we don't actually do that - it is up
		1061	* to the caller to decide what we want to do.
		1062	*/
		1063	map = env->map;
		1064	x = env->x;
		1065	y = env->y;
		1066	above = 0;
		1067	below = 0;
		1068	env = 0;
1028		1069
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1070	/* NO_FIX_PLAYER is set when a great many changes are being
1030	* made to players inventory. If set, avoiding the call	1071	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.	1072	* to save cpu time.
1032	*/	1073	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1074	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();	1075	otmp->update_stats ();
1035
1036	if (above)
1037	above->below = below;
1038	else
1039	env->inv = below;
1040
1041	if (below)
1042	below->above = above;
1043
1044	/* we set up values so that it could be inserted into
1045	* the map, but we don't actually do that - it is up
1046	* to the caller to decide what we want to do.
1047	*/
1048	x = env->x, y = env->y;
1049	map = env->map;
1050	above = 0, below = 0;
1051	env = 0;
1052	}	1076	}
1053	else if (map)	1077	else if (map)
1054	{	1078	{
1055	if (type == PLAYER)
1056	{
1057	// leaving a spot always closes any open container on the ground
1058	if (container && !container->env)
1059	// this causes spurious floorbox updates, but it ensures
1060	// that the CLOSE event is being sent.
1061	close_container ();
1062
1063	--map->players;
1064	map->touch ();
1065	}
1066
1067	map->dirty = true;	1079	map->dirty = true;
1068	mapspace &ms = this->ms ();	1080	mapspace &ms = this->ms ();
		1081
		1082	if (object *pl = ms.player ())
		1083	{
		1084	if (type == PLAYER) // this == pl(!)
		1085	{
		1086	// leaving a spot always closes any open container on the ground
		1087	if (container && !container->env)
		1088	// this causes spurious floorbox updates, but it ensures
		1089	// that the CLOSE event is being sent.
		1090	close_container ();
		1091
		1092	--map->players;
		1093	map->touch ();
		1094	}
		1095	else if (pl->container == this)
		1096	{
		1097	// removing a container should close it
		1098	close_container ();
		1099	}
		1100
		1101	esrv_del_item (pl->contr, count);
		1102	}
1069		1103
1070	/* link the object above us */	1104	/* link the object above us */
1071	if (above)	1105	if (above)
1072	above->below = below;	1106	above->below = below;
1073	else	1107	else
…		…
1103	* removed (most likely destroyed), update the player view	1137	* removed (most likely destroyed), update the player view
1104	* appropriately.	1138	* appropriately.
1105	*/	1139	*/
1106	pl->close_container ();	1140	pl->close_container ();
1107		1141
		1142	//TODO: the floorbox prev/next might need updating
		1143	//esrv_del_item (pl->contr, count);
		1144	//TODO: update floorbox to preserve ordering
		1145	if (pl->contr->ns)
1108	pl->contr->ns->floorbox_update ();	1146	pl->contr->ns->floorbox_update ();
1109	}	1147	}
1110		1148
1111	for (tmp = ms.bot; tmp; tmp = tmp->above)	1149	for (tmp = ms.bot; tmp; tmp = tmp->above)
1112	{	1150	{
1113	/* No point updating the players look faces if he is the object	1151	/* No point updating the players look faces if he is the object
…		…
1157	if (!top)	1195	if (!top)
1158	for (top = op; top && top->above; top = top->above)	1196	for (top = op; top && top->above; top = top->above)
1159	;	1197	;
1160		1198
1161	for (; top; top = top->below)	1199	for (; top; top = top->below)
1162	{
1163	if (top == op)
1164	continue;
1165
1166	if (object::can_merge (op, top))	1200	if (object::can_merge (op, top))
1167	{	1201	{
1168	top->nrof += op->nrof;	1202	top->nrof += op->nrof;
1169		1203
1170	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1204	if (object *pl = top->visible_to ())
1171	op->weight = 0; /* Don't want any adjustements now */	1205	esrv_update_item (UPD_NROF, pl, top);
		1206
		1207	op->weight = 0; // cancel the addition above
		1208	op->carrying = 0; // must be 0 already
		1209
1172	op->destroy ();	1210	op->destroy (1);
		1211
1173	return top;	1212	return top;
1174	}	1213	}
1175	}
1176		1214
1177	return 0;	1215	return 0;
1178	}	1216	}
1179		1217
1180	void	1218	void
…		…
1239	object *	1277	object *
1240	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1278	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1241	{	1279	{
1242	assert (!op->flag [FLAG_FREED]);	1280	assert (!op->flag [FLAG_FREED]);
1243		1281
1244	object *top, *floor = NULL;
1245
1246	op->remove ();	1282	op->remove ();
1247		1283
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1286	* need extra work
1251	*/	1287	*/
1252	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1253	{	1289	{
1254	op->destroy ();	1290	op->destroy (1);
1255	return 0;	1291	return 0;
1256	}	1292	}
1257		1293
1258	if (object *more = op->more)	1294	if (object *more = op->more)
1259	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1268	*/	1304	*/
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1272	{	1308	{
		1309	// TODO: we atcually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1273	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1313	tmp->destroy (1);
1275	}	1314	}
1276		1315
1277	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1278	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1279		1318
…		…
1299	/* since *below* originator, no need to update top */	1338	/* since *below* originator, no need to update top */
1300	originator->below = op;	1339	originator->below = op;
1301	}	1340	}
1302	else	1341	else
1303	{	1342	{
		1343	object *top, *floor = NULL;
		1344
1304	top = ms.bot;	1345	top = ms.bot;
1305		1346
1306	/* If there are other objects, then */	1347	/* If there are other objects, then */
1307	if (top)	1348	if (top)
1308	{	1349	{
…		…
1407	}	1448	}
1408		1449
1409	op->map->dirty = true;	1450	op->map->dirty = true;
1410		1451
1411	if (object *pl = ms.player ())	1452	if (object *pl = ms.player ())
		1453	//TODO: the floorbox prev/next might need updating
		1454	//esrv_send_item (pl, op);
		1455	//TODO: update floorbox to preserve ordering
		1456	if (pl->contr->ns)
1412	pl->contr->ns->floorbox_update ();	1457	pl->contr->ns->floorbox_update ();
1413		1458
1414	/* If this object glows, it may affect lighting conditions that are	1459	/* If this object glows, it may affect lighting conditions that are
1415	* visible to others on this map. But update_all_los is really	1460	* visible to others on this map. But update_all_los is really
1416	* an inefficient way to do this, as it means los for all players	1461	* an inefficient way to do this, as it means los for all players
1417	* on the map will get recalculated. The players could very well	1462	* on the map will get recalculated. The players could very well
…		…
1459	* op is the object to insert it under: supplies x and the map.	1504	* op is the object to insert it under: supplies x and the map.
1460	*/	1505	*/
1461	void	1506	void
1462	replace_insert_ob_in_map (const char *arch_string, object *op)	1507	replace_insert_ob_in_map (const char *arch_string, object *op)
1463	{	1508	{
1464	object *tmp, *tmp1;
1465
1466	/* first search for itself and remove any old instances */	1509	/* first search for itself and remove any old instances */
1467		1510
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1511	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1512	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1470	tmp->destroy ();	1513	tmp->destroy (1);
1471		1514
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1515	object *tmp = arch_to_object (archetype::find (arch_string));
1473		1516
1474	tmp1->x = op->x;	1517	tmp->x = op->x;
1475	tmp1->y = op->y;	1518	tmp->y = op->y;
		1519
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1520	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1521	}
1478		1522
1479	object *	1523	object *
1480	object::insert_at (object *where, object *originator, int flags)	1524	object::insert_at (object *where, object *originator, int flags)
1481	{	1525	{
		1526	if (where->env)
		1527	return where->env->insert (this);
		1528	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1529	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1530	}
1484		1531
1485	/*	1532	/*
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1487	* is returned contains nr objects, and the remaining parts contains
1488	* the rest (or is removed and freed if that number is 0).
1489	* On failure, NULL is returned, and the reason put into the
1490	* global static errmsg array.
1491	*/
1492	object *
1493	get_split_ob (object *orig_ob, uint32 nr)
1494	{
1495	object *newob;
1496	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497
1498	if (orig_ob->nrof < nr)
1499	{
1500	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1501	return NULL;
1502	}
1503
1504	newob = object_create_clone (orig_ob);
1505
1506	if ((orig_ob->nrof -= nr) < 1)
1507	orig_ob->destroy (1);
1508	else if (!is_removed)
1509	{
1510	if (orig_ob->env != NULL)
1511	sub_weight (orig_ob->env, orig_ob->weight * nr);
1512	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1513	{
1514	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1515	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1516	return NULL;
1517	}
1518	}
1519
1520	newob->nrof = nr;
1521
1522	return newob;
1523	}
1524
1525	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1533	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
1528	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1529	*	1536	*
1530	* Return value: 'op' if something is left, NULL if the amount reached 0	1537	* Return value: 'op' if something is left, NULL if the amount reached 0
1531	*/	1538	*/
		1539	bool
		1540	object::decrease (sint32 nr)
		1541	{
		1542	if (!nr)
		1543	return true;
		1544
		1545	nr = min (nr, nrof);
		1546
		1547	nrof -= nr;
		1548
		1549	if (nrof)
		1550	{
		1551	adjust_weight (env, -weight * nr); // carrying == 0
		1552
		1553	if (object *pl = visible_to ())
		1554	esrv_update_item (UPD_NROF, pl, this);
		1555
		1556	return true;
		1557	}
		1558	else
		1559	{
		1560	destroy (1);
		1561	return false;
		1562	}
		1563	}
		1564
		1565	/*
		1566	* split(ob,nr) splits up ob into two parts. The part which
		1567	* is returned contains nr objects, and the remaining parts contains
		1568	* the rest (or is removed and returned if that number is 0).
		1569	* On failure, NULL is returned.
		1570	*/
1532	object *	1571	object *
1533	decrease_ob_nr (object *op, uint32 i)	1572	object::split (sint32 nr)
1534	{	1573	{
1535	object *tmp;	1574	int have = number_of ();
1536		1575
1537	if (i == 0) /* objects with op->nrof require this check */	1576	if (have < nr)
1538	return op;	1577	return 0;
1539		1578	else if (have == nr)
1540	if (i > op->nrof)
1541	i = op->nrof;
1542
1543	if (QUERY_FLAG (op, FLAG_REMOVED))
1544	op->nrof -= i;
1545	else if (op->env)
1546	{	1579	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = op->in_player ();
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp)
1558	for_all_players (pl)
1559	if (pl->ob->container == op->env)
1560	{
1561	tmp = pl->ob;
1562	break;
1563	}
1564
1565	if (i < op->nrof)
1566	{
1567	sub_weight (op->env, op->weight * i);
1568	op->nrof -= i;
1569	if (tmp)
1570	esrv_send_item (tmp, op);
1571	}
1572	else
1573	{
1574	op->remove ();	1580	remove ();
1575	op->nrof = 0;	1581	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1582	}
1580	else	1583	else
1581	{	1584	{
1582	object *above = op->above;	1585	decrease (nr);
1583		1586
1584	if (i < op->nrof)	1587	object *op = object_create_clone (this);
1585	op->nrof -= i;	1588	op->nrof = nr;
1586	else
1587	{
1588	op->remove ();
1589	op->nrof = 0;
1590	}
1591
1592	/* Since we just removed op, op->above is null */
1593	for (tmp = above; tmp; tmp = tmp->above)
1594	if (tmp->type == PLAYER)
1595	{
1596	if (op->nrof)
1597	esrv_send_item (tmp, op);
1598	else
1599	esrv_del_item (tmp->contr, op->count);
1600	}
1601	}
1602
1603	if (op->nrof)
1604	return op;	1589	return op;
1605	else
1606	{
1607	op->destroy ();
1608	return 0;
1609	}
1610	}
1611
1612	/*
1613	* add_weight(object, weight) adds the specified weight to an object,
1614	* and also updates how much the environment(s) is/are carrying.
1615	*/
1616	void
1617	add_weight (object *op, signed long weight)
1618	{
1619	while (op != NULL)
1620	{
1621	if (op->type == CONTAINER)
1622	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1623
1624	op->carrying += weight;
1625	op = op->env;
1626	}	1590	}
1627	}	1591	}
1628		1592
1629	object *	1593	object *
1630	insert_ob_in_ob (object *op, object *where)	1594	insert_ob_in_ob (object *op, object *where)
…		…
1655	* be != op, if items are merged. -Tero	1619	* be != op, if items are merged. -Tero
1656	*/	1620	*/
1657	object *	1621	object *
1658	object::insert (object *op)	1622	object::insert (object *op)
1659	{	1623	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1624	if (op->more)
1664	{	1625	{
1665	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1626	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1666	return op;	1627	return op;
1667	}	1628	}
1668		1629
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1630	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1631
		1632	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1633
1672	if (op->nrof)	1634	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1635	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1636	if (object::can_merge (tmp, op))
1676	{	1637	{
1677	/* return the original object and remove inserted object	1638	/* return the original object and remove inserted object
1678	(client needs the original object) */	1639	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1640	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to	1641
1681	* tmp->nrof, we need to increase the weight.	1642	if (object *pl = tmp->visible_to ())
1682	*/	1643	esrv_update_item (UPD_NROF, pl, tmp);
		1644
1683	add_weight (this, op->weight * op->nrof);	1645	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1646
1685	op->destroy (); /* free the inserted object */	1647	op->destroy (1);
1686	op = tmp;	1648	op = tmp;
1687	op->remove (); /* and fix old object's links */	1649	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1650	}
1691		1651
1692	/* I assume combined objects have no inventory
1693	* We add the weight - this object could have just been removed
1694	* (if it was possible to merge). calling remove_ob will subtract
1695	* the weight, so we need to add it in again, since we actually do
1696	* the linking below
1697	*/
1698	add_weight (this, op->weight * op->nrof);
1699	}
1700	else
1701	add_weight (this, (op->weight + op->carrying));
1702
1703	if (object *otmp = this->in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.	1652	op->owner = 0; // it's his/hers now. period.
1708	op->map = 0;	1653	op->map = 0;
		1654	op->x = 0;
		1655	op->y = 0;
		1656
		1657	op->above = 0;
		1658	op->below = inv;
1709	op->env = this;	1659	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713		1660
		1661	if (inv)
		1662	inv->above = op;
		1663
		1664	inv = op;
		1665
		1666	op->flag [FLAG_REMOVED] = 0;
		1667
		1668	if (object *pl = op->visible_to ())
		1669	esrv_send_item (pl, op);
		1670
		1671	adjust_weight (this, op->total_weight ());
		1672
		1673	inserted:
1714	/* reset the light list and los of the players on the map */	1674	/* reset the light list and los of the players on the map */
1715	if (op->glow_radius && map)	1675	if (op->glow_radius && map && map->darkness)
1716	{
1717	#ifdef DEBUG_LIGHTS
1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1719	#endif /* DEBUG_LIGHTS */
1720	if (map->darkness)
1721	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1722	}
1723		1677
1724	/* Client has no idea of ordering so lets not bother ordering it here.	1678	// if this is a player's inventory, update stats
1725	* It sure simplifies this function...	1679	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1726	*/	1680	update_stats ();
1727	if (!inv)
1728	inv = op;
1729	else
1730	{
1731	op->below = inv;
1732	op->below->above = op;
1733	inv = op;
1734	}
1735		1681
1736	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1737		1683
1738	return op;	1684	return op;
1739	}	1685	}
…		…
2363	* create clone from object to another	2309	* create clone from object to another
2364	*/	2310	*/
2365	object *	2311	object *
2366	object_create_clone (object *asrc)	2312	object_create_clone (object *asrc)
2367	{	2313	{
2368	object *dst = 0, *tmp, *src, *prev, *item;	2314	object *dst = 0;
2369		2315
2370	if (!asrc)	2316	if (!asrc)
2371	return 0;	2317	return 0;
2372		2318
2373	src = asrc->head_ ();	2319	object *src = asrc->head_ ();
2374		2320
2375	prev = 0;	2321	object *prev = 0;
2376	for (object *part = src; part; part = part->more)	2322	for (object *part = src; part; part = part->more)
2377	{	2323	{
2378	tmp = part->clone ();	2324	object *tmp = part->clone ();
		2325
2379	tmp->x -= src->x;	2326	tmp->x -= src->x;
2380	tmp->y -= src->y;	2327	tmp->y -= src->y;
2381		2328
2382	if (!part->head)	2329	if (!part->head)
2383	{	2330	{
…		…
2393	prev->more = tmp;	2340	prev->more = tmp;
2394		2341
2395	prev = tmp;	2342	prev = tmp;
2396	}	2343	}
2397		2344
2398	for (item = src->inv; item; item = item->below)	2345	for (object *item = src->inv; item; item = item->below)
2399	insert_ob_in_ob (object_create_clone (item), dst);	2346	insert_ob_in_ob (object_create_clone (item), dst);
2400		2347
2401	return dst;	2348	return dst;
2402	}	2349	}
2403		2350
…		…
2413	return tmp;	2360	return tmp;
2414		2361
2415	return 0;	2362	return 0;
2416	}	2363	}
2417		2364
2418	/* If ob has a field named key, return the link from the list,	2365	const shstr &
2419	* otherwise return NULL.	2366	object::kv_get (const shstr &key) const
2420	*
2421	* key must be a passed in shared string - otherwise, this won't
2422	* do the desired thing.
2423	*/
2424	key_value *
2425	get_ob_key_link (const object *ob, const char *key)
2426	{	2367	{
2427	for (key_value *link = ob->key_values; link; link = link->next)	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2428	if (link->key == key)	2369	if (kv->key == key)
2429	return link;
2430
2431	return 0;
2432	}
2433
2434	/*
2435	* Returns the value of op has an extra_field for key, or NULL.
2436	*
2437	* The argument doesn't need to be a shared string.
2438	*
2439	* The returned string is shared.
2440	*/
2441	const char *
2442	get_ob_key_value (const object *op, const char *const key)
2443	{
2444	key_value *link;
2445	shstr_cmp canonical_key (key);
2446
2447	if (!canonical_key)
2448	{
2449	/* 1. There being a field named key on any object
2450	* implies there'd be a shared string to find.
2451	* 2. Since there isn't, no object has this field.
2452	* 3. Therefore, *this* object doesn't have this field.
2453	*/
2454	return 0;
2455	}
2456
2457	/* This is copied from get_ob_key_link() above -
2458	* only 4 lines, and saves the function call overhead.
2459	*/
2460	for (link = op->key_values; link; link = link->next)
2461	if (link->key == canonical_key)
2462	return link->value;	2370	return kv->value;
2463		2371
2464	return 0;	2372	return shstr_null;
2465	}	2373	}
2466		2374
2467	/*	2375	void
2468	* Updates the canonical_key in op to value.	2376	object::kv_set (const shstr &key, const shstr &value)
2469	*
2470	* canonical_key is a shared string (value doesn't have to be).
2471	*
2472	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2473	* keys.
2474	*
2475	* Returns TRUE on success.
2476	*/
2477	int
2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2479	{	2377	{
2480	key_value *field = NULL, *last = NULL;	2378	for (key_value *kv = key_values; kv; kv = kv->next)
2481		2379	if (kv->key == key)
2482	for (field = op->key_values; field != NULL; field = field->next)
2483	{
2484	if (field->key != canonical_key)
2485	{	2380	{
2486	last = field;	2381	kv->value = value;
2487	continue;	2382	return;
2488	}	2383	}
2489		2384
2490	if (value)	2385	key_value *kv = new key_value;
2491	field->value = value;	2386
2492	else	2387	kv->next = key_values;
		2388	kv->key = key;
		2389	kv->value = value;
		2390
		2391	key_values = kv;
		2392	}
		2393
		2394	void
		2395	object::kv_del (const shstr &key)
		2396	{
		2397	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2398	if ((*kvp)->key == key)
2493	{	2399	{
2494	/* Basically, if the archetype has this key set,	2400	key_value *kv = *kvp;
2495	* we need to store the null value so when we save	2401	*kvp = (*kvp)->next;
2496	* it, we save the empty value so that when we load,	2402	delete kv;
2497	* we get this value back again.	2403	return;
2498	*/
2499	if (get_ob_key_link (op->arch, canonical_key))
2500	field->value = 0;
2501	else
2502	{
2503	if (last)
2504	last->next = field->next;
2505	else
2506	op->key_values = field->next;
2507
2508	delete field;
2509	}
2510	}	2404	}
2511	return TRUE;
2512	}
2513	/* IF we get here, key doesn't exist */
2514
2515	/* No field, we'll have to add it. */
2516
2517	if (!add_key)
2518	return FALSE;
2519
2520	/* There isn't any good reason to store a null
2521	* value in the key/value list. If the archetype has
2522	* this key, then we should also have it, so shouldn't
2523	* be here. If user wants to store empty strings,
2524	* should pass in ""
2525	*/
2526	if (value == NULL)
2527	return TRUE;
2528
2529	field = new key_value;
2530
2531	field->key = canonical_key;
2532	field->value = value;
2533	/* Usual prepend-addition. */
2534	field->next = op->key_values;
2535	op->key_values = field;
2536
2537	return TRUE;
2538	}
2539
2540	/*
2541	* Updates the key in op to value.
2542	*
2543	* If add_key is FALSE, this will only update existing keys,
2544	* and not add new ones.
2545	* In general, should be little reason FALSE is ever passed in for add_key
2546	*
2547	* Returns TRUE on success.
2548	*/
2549	int
2550	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2551	{
2552	shstr key_ (key);
2553
2554	return set_ob_key_value_s (op, key_, value, add_key);
2555	}	2405	}
2556		2406
2557	object::depth_iterator::depth_iterator (object *container)	2407	object::depth_iterator::depth_iterator (object *container)
2558	: iterator_base (container)	2408	: iterator_base (container)
2559	{	2409	{
…		…
2617	&name,	2467	&name,
2618	title ? "\",title:\"" : "",	2468	title ? "\",title:\"" : "",
2619	title ? (const char *)title : "",	2469	title ? (const char *)title : "",
2620	flag_desc (flagdesc, 512), type);	2470	flag_desc (flagdesc, 512), type);
2621		2471
2622	if (!this->flag[FLAG_REMOVED] && env)	2472	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2474
2625	if (map)	2475	if (map)
2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2476	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2627		2477
…		…
2657	object::open_container (object *new_container)	2507	object::open_container (object *new_container)
2658	{	2508	{
2659	if (container == new_container)	2509	if (container == new_container)
2660	return;	2510	return;
2661		2511
2662	if (object *old_container = container)	2512	object *old_container = container;
		2513
		2514	if (old_container)
2663	{	2515	{
2664	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2516	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665	return;	2517	return;
2666		2518
2667	#if 0	2519	#if 0
…		…
2669	if (object *closer = old_container->inv)	2521	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2522	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2523	closer->destroy ();
2672	#endif	2524	#endif
2673		2525
		2526	// make sure the container is available
		2527	esrv_send_item (this, old_container);
		2528
2674	old_container->flag [FLAG_APPLIED] = 0;	2529	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2530	container = 0;
2676		2531
		2532	// client needs item update to make it work, client bug requires this to be separate
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2533	esrv_update_item (UPD_FLAGS, this, old_container);
		2534
2678	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2679	play_sound (sound_find ("chest_close"));	2536	play_sound (sound_find ("chest_close"));
2680	}	2537	}
2681		2538
2682	if (new_container)	2539	if (new_container)
…		…
2695	}	2552	}
2696	#endif	2553	#endif
2697		2554
2698	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2555	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699		2556
		2557	// make sure the container is available, client bug requires this to be separate
		2558	esrv_send_item (this, new_container);
		2559
2700	new_container->flag [FLAG_APPLIED] = 1;	2560	new_container->flag [FLAG_APPLIED] = true;
2701	container = new_container;	2561	container = new_container;
2702		2562
		2563	// client needs flag change
2703	esrv_update_item (UPD_FLAGS, this, new_container);	2564	esrv_update_item (UPD_FLAGS, this, new_container);
2704	esrv_send_inventory (this, new_container);	2565	esrv_send_inventory (this, new_container);
2705	play_sound (sound_find ("chest_open"));	2566	play_sound (sound_find ("chest_open"));
2706	}	2567	}
		2568	// else if (!old_container->env && contr && contr->ns)
		2569	// contr->ns->floorbox_reset ();
2707	}	2570	}
2708		2571
2709	object *	2572	object *
2710	object::force_find (const shstr name)	2573	object::force_find (const shstr name)
2711	{	2574	{
…		…
2737		2600
2738	insert (force);	2601	insert (force);
2739	}	2602	}
2740		2603
2741	void	2604	void
2742	object::play_sound (faceidx sound) const	2605	object::play_sound (faceidx sound)
2743	{	2606	{
2744	if (!sound)	2607	if (!sound)
2745	return;	2608	return;
2746		2609
2747	if (flag [FLAG_REMOVED])	2610	if (flag [FLAG_REMOVED])

Diff Legend

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