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.64 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.188 by root, Wed Sep 12 11:10:09 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
		35
		36	#include <bitset>
34		37
35	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
36	static UUID uuid;	39	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
38		41
39	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
40		44
41	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,	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,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	47	};
44	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 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,
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
141	*/	145	*/
142		146
143	/* For each field in wants, */	147	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	149	{
146	key_value *has_field;	150	key_value *has_field;
147		151
148	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	187	*
184	* Note that this function appears a lot longer than the macro it	188	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	189	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	190	* reduce this to the same efficiency.
187	*	191	*
188	* Check nrof variable *before* calling CAN_MERGE()	192	* Check nrof variable *before* calling can_merge()
189	*	193	*
190	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
191	* check weight	195	* check weight
192	*/	196	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	198	{
196	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	200	if (ob1 == ob2
		201	|| ob1->type != ob2->type
		202	|| ob1->speed != ob2->speed
		203	|| ob1->value != ob2->value
		204	|| ob1->name != ob2->name)
198	return 0;	205	return 0;
199		206
200	if (ob1->speed != ob2->speed)	207	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	209	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	210	* used to store nrof).
206	*/	211	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		223
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		226
222		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	252	return 0;
254		253
255	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	255	* check all objects in the inventory.
257	*/	256	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	261	return 0;
263		262
264	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	265	return 0;
267		266
268	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	268	* if it is valid.
270	*/	269	*/
…		…
279		278
280	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
282	* check?	281	* check?
283	*/	282	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	284	return 0;
286		285
287	switch (ob1->type)	286	switch (ob1->type)
288	{	287	{
289	case SCROLL:	288	case SCROLL:
…		…
300	return 0;	299	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	301	return 0;
303	}	302	}
304		303
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
307	{	305	{
308	ob1->optimise ();	306	ob1->optimise ();
309	ob2->optimise ();	307	ob2->optimise ();
310		308
311	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
312	return 0;	311	return 0;
313	}	312	}
314		313
315	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
316	return 1;	315	return 1;
317	}	316	}
…		…
325	sum_weight (object *op)	324	sum_weight (object *op)
326	{	325	{
327	long sum;	326	long sum;
328	object *inv;	327	object *inv;
329		328
330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
331	{	330	{
332	if (inv->inv)	331	if (inv->inv)
333	sum_weight (inv);	332	sum_weight (inv);
		333
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
335	}	335	}
336		336
337	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
354	op = op->env;	354	op = op->env;
355	return op;	355	return op;
356	}	356	}
357		357
358	/*	358	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	360	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
377	*/	362	*/
378
379	char *	363	char *
380	dump_object (object *op)	364	dump_object (object *op)
381	{	365	{
382	if (!op)	366	if (!op)
383	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
384		368
385	object_freezer freezer;	369	object_freezer freezer;
386	save_object (freezer, op, 3);	370	op->write (freezer);
387	return freezer.as_string ();	371	return freezer.as_string ();
388	}	372	}
389		373
390	/*	374	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
392	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
393	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
394	*/	378	*/
395
396	object *	379	object *
397	get_nearest_part (object *op, const object *pl)	380	get_nearest_part (object *op, const object *pl)
398	{	381	{
399	object *tmp, *closest;	382	object *tmp, *closest;
400	int last_dist, i;	383	int last_dist, i;
…		…
408	}	391	}
409		392
410	/*	393	/*
411	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
412	*/	395	*/
413
414	object *	396	object *
415	find_object (tag_t i)	397	find_object (tag_t i)
416	{	398	{
417	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
418	if (op->count == i)	400	if (op->count == i)
419	return op;	401	return op;
420		402
421	return 0;	403	return 0;
422	}	404	}
423		405
424	/*	406	/*
425	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
428	*/	410	*/
429
430	object *	411	object *
431	find_object_name (const char *str)	412	find_object_name (const char *str)
432	{	413	{
433	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
434	object *op;	415	object *op;
435		416
436	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
437	if (op->name == str_)	418	if (op->name == str_)
438	break;	419	break;
439		420
440	return op;	421	return op;
441	}	422	}
…		…
447	}	428	}
448		429
449	/*	430	/*
450	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
451	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
452	*/	434	*/
453	void	435	void
454	object::set_owner (object *owner)	436	object::set_owner (object *owner)
455	{	437	{
		438	// allow objects which own objects
456	if (!owner)	439	if (owner)
457	return;
458
459	/* next line added to allow objects which own objects */
460	/* Add a check for ownercounts in here, as I got into an endless loop
461	* with the fireball owning a poison cloud which then owned the
462	* fireball. I believe that was caused by one of the objects getting
463	* freed and then another object replacing it. Since the ownercounts
464	* didn't match, this check is valid and I believe that cause is valid.
465	*/
466	while (owner->owner)	440	while (owner->owner)
467	owner = owner->owner;	441	owner = owner->owner;
468		442
469	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
470	}	510	}
471		511
472	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
473	* refcounts and freeing the links.	513	* refcounts and freeing the links.
474	*/	514	*/
475	static void	515	static void
476	free_key_values (object *op)	516	free_key_values (object *op)
477	{	517	{
478	for (key_value *i = op->key_values; i != 0;)	518	for (key_value *i = op->key_values; i; )
479	{	519	{
480	key_value *next = i->next;	520	key_value *next = i->next;
481	delete i;	521	delete i;
482		522
483	i = next;	523	i = next;
484	}	524	}
485		525
486	op->key_values = 0;	526	op->key_values = 0;
487	}	527	}
488		528
489	void object::clear ()	529	object &
		530	object::operator =(const object &src)
490	{	531	{
491	attachable_base::clear ();	532	bool is_freed = flag [FLAG_FREED];
		533	bool is_removed = flag [FLAG_REMOVED];
492		534
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	/*
532	* copy_to first frees everything allocated by the dst object,
533	* and then copies the contents of itself into the second
534	* object, allocating what needs to be allocated. Basically, any
535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
536	* if the first object is freed, the pointers in the new object
537	* will point at garbage.
538	*/
539	void
540	object::copy_to (object *dst)
541	{
542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
544
545	*(object_copy *)dst = *this;	535	*(object_copy *)this = src;
546	*(object_pod *)dst = *this;
547		536
548	if (self || cb)	537	flag [FLAG_FREED] = is_freed;
549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	538	flag [FLAG_REMOVED] = is_removed;
550
551	if (is_freed)
552	SET_FLAG (dst, FLAG_FREED);
553
554	if (is_removed)
555	SET_FLAG (dst, FLAG_REMOVED);
556
557	if (speed < 0)
558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
559		539
560	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
561	if (key_values)	541	if (src.key_values)
562	{	542	{
563	key_value *tail = 0;	543	key_value *tail = 0;
564	key_value *i;
565
566	dst->key_values = 0;	544	key_values = 0;
567		545
568	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
569	{	547	{
570	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
571		549
572	new_link->next = 0;	550	new_link->next = 0;
573	new_link->key = i->key;	551	new_link->key = i->key;
574	new_link->value = i->value;	552	new_link->value = i->value;
575		553
576	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
577	if (!dst->key_values)	555	if (!key_values)
578	{	556	{
579	dst->key_values = new_link;	557	key_values = new_link;
580	tail = new_link;	558	tail = new_link;
581	}	559	}
582	else	560	else
583	{	561	{
584	tail->next = new_link;	562	tail->next = new_link;
585	tail = new_link;	563	tail = new_link;
586	}	564	}
587	}	565	}
588	}	566	}
		567	}
589		568
590	update_ob_speed (dst);	569	/*
		570	* copy_to first frees everything allocated by the dst object,
		571	* and then copies the contents of itself into the second
		572	* object, allocating what needs to be allocated. Basically, any
		573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		574	* if the first object is freed, the pointers in the new object
		575	* will point at garbage.
		576	*/
		577	void
		578	object::copy_to (object *dst)
		579	{
		580	*dst = *this;
		581
		582	if (speed < 0)
		583	dst->speed_left -= rndm ();
		584
		585	dst->set_speed (dst->speed);
		586	}
		587
		588	void
		589	object::instantiate ()
		590	{
		591	if (!uuid.seq) // HACK
		592	uuid = gen_uuid ();
		593
		594	speed_left = -0.1f;
		595	/* copy the body_info to the body_used - this is only really
		596	* need for monsters, but doesn't hurt to do it for everything.
		597	* by doing so, when a monster is created, it has good starting
		598	* values for the body_used info, so when items are created
		599	* for it, they can be properly equipped.
		600	*/
		601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
		603
		604	attachable::instantiate ();
		605	}
		606
		607	object *
		608	object::clone ()
		609	{
		610	object *neu = create ();
		611	copy_to (neu);
		612	return neu;
591	}	613	}
592		614
593	/*	615	/*
594	* If an object with the IS_TURNABLE() flag needs to be turned due	616	* If an object with the IS_TURNABLE() flag needs to be turned due
595	* to the closest player being on the other side, this function can	617	* to the closest player being on the other side, this function can
596	* be called to update the face variable, _and_ how it looks on the map.	618	* be called to update the face variable, _and_ how it looks on the map.
597	*/	619	*/
598
599	void	620	void
600	update_turn_face (object *op)	621	update_turn_face (object *op)
601	{	622	{
602	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	623	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
603	return;	624	return;
		625
604	SET_ANIMATION (op, op->direction);	626	SET_ANIMATION (op, op->direction);
605	update_object (op, UP_OBJ_FACE);	627	update_object (op, UP_OBJ_FACE);
606	}	628	}
607		629
608	/*	630	/*
609	* Updates the speed of an object. If the speed changes from 0 to another	631	* Updates the speed of an object. If the speed changes from 0 to another
610	* value, or vice versa, then add/remove the object from the active list.	632	* value, or vice versa, then add/remove the object from the active list.
611	* This function needs to be called whenever the speed of an object changes.	633	* This function needs to be called whenever the speed of an object changes.
612	*/	634	*/
613	void	635	void
614	update_ob_speed (object *op)	636	object::set_speed (float speed)
615	{	637	{
616	extern int arch_init;	638	if (flag [FLAG_FREED] && speed)
617
618	/* No reason putting the archetypes objects on the speed list,
619	* since they never really need to be updated.
620	*/
621
622	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
623	{	639	{
624	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	640	LOG (llevError, "Object %s is freed but has speed.\n", &name);
625	#ifdef MANY_CORES
626	abort ();
627	#else
628	op->speed = 0;	641	speed = 0;
629	#endif
630	}
631
632	if (arch_init)
633	return;
634
635	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
636	{	642	}
637	/* If already on active list, don't do anything */
638	if (op->active_next || op->active_prev || op == active_objects)
639	return;
640		643
641	/* process_events() expects us to insert the object at the beginning	644	this->speed = speed;
642	* of the list. */
643	op->active_next = active_objects;
644		645
645	if (op->active_next != NULL)	646	if (has_active_speed ())
646	op->active_next->active_prev = op;	647	activate ();
647
648	active_objects = op;
649	}
650	else	648	else
651	{	649	deactivate ();
652	/* If not on the active list, nothing needs to be done */
653	if (!op->active_next && !op->active_prev && op != active_objects)
654	return;
655
656	if (op->active_prev == NULL)
657	{
658	active_objects = op->active_next;
659
660	if (op->active_next != NULL)
661	op->active_next->active_prev = NULL;
662	}
663	else
664	{
665	op->active_prev->active_next = op->active_next;
666
667	if (op->active_next)
668	op->active_next->active_prev = op->active_prev;
669	}
670
671	op->active_next = NULL;
672	op->active_prev = NULL;
673	}
674	}	650	}
675		651
676	/* This function removes object 'op' from the list of active
677	* objects.
678	* This should only be used for style maps or other such
679	* reference maps where you don't want an object that isn't
680	* in play chewing up cpu time getting processed.
681	* The reverse of this is to call update_ob_speed, which
682	* will do the right thing based on the speed of the object.
683	*/
684	void
685	remove_from_active_list (object *op)
686	{
687	/* If not on the active list, nothing needs to be done */
688	if (!op->active_next && !op->active_prev && op != active_objects)
689	return;
690
691	if (op->active_prev == NULL)
692	{
693	active_objects = op->active_next;
694	if (op->active_next != NULL)
695	op->active_next->active_prev = NULL;
696	}
697	else
698	{
699	op->active_prev->active_next = op->active_next;
700	if (op->active_next)
701	op->active_next->active_prev = op->active_prev;
702	}
703	op->active_next = NULL;
704	op->active_prev = NULL;
705	}
706
707	/*	652	/*
708	* update_object() updates the array which represents the map.	653	* update_object() updates the the map.
709	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
710	* by invisible objects by whatever is below them (unless it's another	655	* by invisible objects by whatever is below them (unless it's another
711	* invisible object, etc...)	656	* invisible object, etc...)
712	* If the object being updated is beneath a player, the look-window	657	* If the object being updated is beneath a player, the look-window
713	* of that player is updated (this might be a suboptimal way of	658	* of that player is updated (this might be a suboptimal way of
714	* updating that window, though, since update_object() is called _often_)	659	* updating that window, though, since update_object() is called _often_)
715	*	660	*
716	* action is a hint of what the caller believes need to be done.	661	* action is a hint of what the caller believes need to be done.
717	* For example, if the only thing that has changed is the face (due to
718	* an animation), we don't need to call update_position until that actually
719	* comes into view of a player. OTOH, many other things, like addition/removal
720	* of walls or living creatures may need us to update the flags now.
721	* current action are:	662	* current action are:
722	* UP_OBJ_INSERT: op was inserted	663	* UP_OBJ_INSERT: op was inserted
723	* UP_OBJ_REMOVE: op was removed	664	* UP_OBJ_REMOVE: op was removed
724	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	665	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
725	* as that is easier than trying to look at what may have changed.	666	* as that is easier than trying to look at what may have changed.
726	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
727	*/	668	*/
728
729	void	669	void
730	update_object (object *op, int action)	670	update_object (object *op, int action)
731	{	671	{
732	int update_now = 0, flags;
733	MoveType move_on, move_off, move_block, move_slow;
734
735	if (op == NULL)	672	if (op == NULL)
736	{	673	{
737	/* this should never happen */	674	/* this should never happen */
738	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
739	return;	676	return;
740	}	677	}
741		678
742	if (op->env != NULL)	679	if (op->env)
743	{	680	{
744	/* Animation is currently handled by client, so nothing	681	/* Animation is currently handled by client, so nothing
745	* to do in this case.	682	* to do in this case.
746	*/	683	*/
747	return;	684	return;
…		…
752	*/	689	*/
753	if (!op->map || op->map->in_memory == MAP_SAVING)	690	if (!op->map || op->map->in_memory == MAP_SAVING)
754	return;	691	return;
755		692
756	/* make sure the object is within map boundaries */	693	/* make sure the object is within map boundaries */
757	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	694	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
758	{	695	{
759	LOG (llevError, "update_object() called for object out of map!\n");	696	LOG (llevError, "update_object() called for object out of map!\n");
760	#ifdef MANY_CORES	697	#ifdef MANY_CORES
761	abort ();	698	abort ();
762	#endif	699	#endif
763	return;	700	return;
764	}	701	}
765		702
766	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	703	mapspace &m = op->ms ();
767	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
768	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
769	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
770	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
771	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
772		704
		705	if (!(m.flags_ & P_UPTODATE))
		706	/* nop */;
773	if (action == UP_OBJ_INSERT)	707	else if (action == UP_OBJ_INSERT)
774	{	708	{
		709	// this is likely overkill, TODO: revisit (schmorp)
775	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	710	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
776	update_now = 1;
777
778	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	711	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
779	update_now = 1;	712	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
780		713	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		714	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
781	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	715	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
785	update_now = 1;
786
787	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
788	update_now = 1;
789
790	if ((move_on | op->move_on) != move_on)	716	|| (m.move_on | op->move_on ) != m.move_on
791	update_now = 1;
792
793	if ((move_off | op->move_off) != move_off)	717	|| (m.move_off | op->move_off ) != m.move_off
794	update_now = 1;	718	|| (m.move_slow | op->move_slow) != m.move_slow
795
796	/* This isn't perfect, but I don't expect a lot of objects to	719	/* This isn't perfect, but I don't expect a lot of objects to
797	* to have move_allow right now.	720	* to have move_allow right now.
798	*/	721	*/
799	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	722	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
800	update_now = 1;	723	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
801		724	m.flags_ = 0;
802	if ((move_slow | op->move_slow) != move_slow)
803	update_now = 1;
804	}	725	}
805
806	/* if the object is being removed, we can't make intelligent	726	/* if the object is being removed, we can't make intelligent
807	* decisions, because remove_ob can't really pass the object	727	* decisions, because remove_ob can't really pass the object
808	* that is being removed.	728	* that is being removed.
809	*/	729	*/
810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	730	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
811	update_now = 1;	731	m.flags_ = 0;
812	else if (action == UP_OBJ_FACE)	732	else if (action == UP_OBJ_FACE)
813	/* Nothing to do for that case */ ;	733	/* Nothing to do for that case */ ;
814	else	734	else
815	LOG (llevError, "update_object called with invalid action: %d\n", action);	735	LOG (llevError, "update_object called with invalid action: %d\n", action);
816		736
817	if (update_now)
818	{
819	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
820	update_position (op->map, op->x, op->y);
821	}
822
823	if (op->more != NULL)	737	if (op->more)
824	update_object (op->more, action);	738	update_object (op->more, action);
825	}
826
827	object::vector object::mortals;
828	object::vector object::objects; // not yet used
829	object *object::first;
830
831	void object::free_mortals ()
832	{
833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
834	if ((*i)->refcnt)
835	++i; // further delay freeing
836	else
837	{
838	delete *i;
839	mortals.erase (i);
840	}
841	}	739	}
842		740
843	object::object ()	741	object::object ()
844	{	742	{
845	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
…		…
848	face = blank_face;	746	face = blank_face;
849	}	747	}
850		748
851	object::~object ()	749	object::~object ()
852	{	750	{
		751	unlink ();
		752
853	free_key_values (this);	753	free_key_values (this);
854	}	754	}
855		755
		756	static int object_count;
		757
856	void object::link ()	758	void object::link ()
857	{	759	{
858	count = ++ob_count;	760	assert (!index);//D
859	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
860		763
861	prev = 0;	764	refcnt_inc ();
862	next = object::first;	765	objects.insert (this);
863
864	if (object::first)
865	object::first->prev = this;
866
867	object::first = this;
868	}	766	}
869		767
870	void object::unlink ()	768	void object::unlink ()
871	{	769	{
872	if (this == object::first)	770	if (!index)
873	object::first = next;	771	return;
874		772
875	/* Remove this object from the list of used objects */	773	objects.erase (this);
876	if (prev) prev->next = next;	774	refcnt_dec ();
877	if (next) next->prev = prev;	775	}
878		776
879	prev = 0;	777	void
880	next = 0;	778	object::activate ()
		779	{
		780	/* If already on active list, don't do anything */
		781	if (active)
		782	return;
		783
		784	if (has_active_speed ())
		785	actives.insert (this);
		786	}
		787
		788	void
		789	object::activate_recursive ()
		790	{
		791	activate ();
		792
		793	for (object *op = inv; op; op = op->below)
		794	op->activate_recursive ();
		795	}
		796
		797	/* This function removes object 'op' from the list of active
		798	* objects.
		799	* This should only be used for style maps or other such
		800	* reference maps where you don't want an object that isn't
		801	* in play chewing up cpu time getting processed.
		802	* The reverse of this is to call update_ob_speed, which
		803	* will do the right thing based on the speed of the object.
		804	*/
		805	void
		806	object::deactivate ()
		807	{
		808	/* If not on the active list, nothing needs to be done */
		809	if (!active)
		810	return;
		811
		812	actives.erase (this);
		813	}
		814
		815	void
		816	object::deactivate_recursive ()
		817	{
		818	for (object *op = inv; op; op = op->below)
		819	op->deactivate_recursive ();
		820
		821	deactivate ();
		822	}
		823
		824	void
		825	object::set_flag_inv (int flag, int value)
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	{
		829	op->flag [flag] = value;
		830	op->set_flag_inv (flag, value);
		831	}
		832	}
		833
		834	/*
		835	* Remove and free all objects in the inventory of the given object.
		836	* object.c ?
		837	*/
		838	void
		839	object::destroy_inv (bool drop_to_ground)
		840	{
		841	// need to check first, because the checks below might segfault
		842	// as we might be on an invalid mapspace and crossfire code
		843	// is too buggy to ensure that the inventory is empty.
		844	// corollary: if you create arrows etc. with stuff in tis inventory,
		845	// cf will crash below with off-map x and y
		846	if (!inv)
		847	return;
		848
		849	/* Only if the space blocks everything do we not process -
		850	* if some form of movement is allowed, let objects
		851	* drop on that space.
		852	*/
		853	if (!drop_to_ground
		854	|| !map
		855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
		857	|| ms ().move_block == MOVE_ALL)
		858	{
		859	while (inv)
		860	{
		861	inv->destroy_inv (drop_to_ground);
		862	inv->destroy ();
		863	}
		864	}
		865	else
		866	{ /* Put objects in inventory onto this space */
		867	while (inv)
		868	{
		869	object *op = inv;
		870
		871	if (op->flag [FLAG_STARTEQUIP]
		872	|| op->flag [FLAG_NO_DROP]
		873	|| op->type == RUNE
		874	|| op->type == TRAP
		875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
		877	op->destroy ();
		878	else
		879	map->insert (op, x, y);
		880	}
		881	}
881	}	882	}
882		883
883	object *object::create ()	884	object *object::create ()
884	{	885	{
885	object *op = new object;	886	object *op = new object;
886	op->link ();	887	op->link ();
887	return op;	888	return op;
888	}	889	}
889		890
890	/*	891	void
891	* free_object() frees everything allocated by an object, removes	892	object::do_destroy ()
892	* it from the list of used objects, and puts it on the list of
893	* free objects. The IS_FREED() flag is set in the object.
894	* The object must have been removed by remove_ob() first for
895	* this function to succeed.
896	*
897	* If destroy_inventory is set, free inventory as well. Else drop items in
898	* inventory to the ground.
899	*/
900	void object::destroy (bool destroy_inventory)
901	{	893	{
902	if (QUERY_FLAG (this, FLAG_FREED))	894	attachable::do_destroy ();
903	return;
904		895
905	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (flag [FLAG_IS_LINKED])
		897	remove_button_link (this);
		898
		899	if (flag [FLAG_FRIENDLY])
906	remove_friendly_object (this);	900	remove_friendly_object (this);
907		901
908	if (!QUERY_FLAG (this, FLAG_REMOVED))	902	if (!flag [FLAG_REMOVED])
909	remove ();	903	remove ();
910		904
911	SET_FLAG (this, FLAG_FREED);	905	destroy_inv (true);
912		906
913	if (more)	907	deactivate ();
914	{	908	unlink ();
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918		909
919	if (inv)	910	flag [FLAG_FREED] = 1;
920	{
921	/* Only if the space blocks everything do we not process -
922	* if some form of movement is allowed, let objects
923	* drop on that space.
924	*/
925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
926	{
927	object *op = inv;
928
929	while (op)
930	{
931	object *tmp = op->below;
932	op->destroy (destroy_inventory);
933	op = tmp;
934	}
935	}
936	else
937	{ /* Put objects in inventory onto this space */
938	object *op = inv;
939
940	while (op)
941	{
942	object *tmp = op->below;
943
944	op->remove ();
945
946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
948	op->destroy ();
949	else
950	{
951	op->x = x;
952	op->y = y;
953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
954	}
955
956	op = tmp;
957	}
958	}
959	}
960		911
961	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
962	{	913	{
963	static maptile *freed_map; // freed objects are moved here to avoid crashes	914	static maptile *freed_map; // freed objects are moved here to avoid crashes
964		915
965	if (!freed_map)	916	if (!freed_map)
966	{	917	{
967	freed_map = new maptile;	918	freed_map = new maptile;
968		919
		920	freed_map->path = "<freed objects map>";
969	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
970	freed_map->width = 3;	922	freed_map->width = 3;
971	freed_map->height = 3;	923	freed_map->height = 3;
972		924
973	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
974	}	927	}
975		928
976	map = freed_map;	929	map = freed_map;
977	x = 1;	930	x = 1;
978	y = 1;	931	y = 1;
979	}	932	}
980		933
		934	if (more)
		935	{
		936	more->destroy ();
		937	more = 0;
		938	}
		939
		940	head = 0;
		941
981	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
982	owner = 0;	943	owner = 0;
983	enemy = 0;	944	enemy = 0;
984	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
		947	}
985		948
986	// only relevant for players(?), but make sure of it anyways	949	void
987	contr = 0;	950	object::destroy (bool destroy_inventory)
		951	{
		952	if (destroyed ())
		953	return;
988		954
989	/* Remove object from the active list */	955	if (destroy_inventory)
990	speed = 0;	956	destroy_inv (false);
991	update_ob_speed (this);
992		957
993	unlink ();	958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
994		963
995	mortals.push_back (this);	964	attachable::destroy ();
996	}	965	}
997		966
998	/*	967	/*
999	* sub_weight() recursively (outwards) subtracts a number from the	968	* sub_weight() recursively (outwards) subtracts a number from the
1000	* weight of an object (and what is carried by it's environment(s)).	969	* weight of an object (and what is carried by it's environment(s)).
…		…
1016	* This function removes the object op from the linked list of objects	985	* This function removes the object op from the linked list of objects
1017	* which it is currently tied to. When this function is done, the	986	* which it is currently tied to. When this function is done, the
1018	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
1019	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
1020	* the previous environment.	989	* the previous environment.
1021	* Beware: This function is called from the editor as well!
1022	*/	990	*/
1023	void	991	void
1024	object::remove ()	992	object::do_remove ()
1025	{	993	{
1026	object *tmp, *last = 0;	994	object *tmp, *last = 0;
1027	object *otmp;	995	object *otmp;
1028		996
1029	int check_walk_off;
1030
1031	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
1032	return;	998	return;
1033		999
1034	SET_FLAG (this, FLAG_REMOVED);	1000	SET_FLAG (this, FLAG_REMOVED);
		1001	INVOKE_OBJECT (REMOVE, this);
1035		1002
1036	if (more)	1003	if (more)
1037	more->remove ();	1004	more->remove ();
1038		1005
1039	/*	1006	/*
…		…
1049		1016
1050	/* NO_FIX_PLAYER is set when a great many changes are being	1017	/* NO_FIX_PLAYER is set when a great many changes are being
1051	* made to players inventory. If set, avoiding the call	1018	* made to players inventory. If set, avoiding the call
1052	* to save cpu time.	1019	* to save cpu time.
1053	*/	1020	*/
1054	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1055	fix_player (otmp);	1022	otmp->update_stats ();
1056		1023
1057	if (above != NULL)	1024	if (above)
1058	above->below = below;	1025	above->below = below;
1059	else	1026	else
1060	env->inv = below;	1027	env->inv = below;
1061		1028
1062	if (below != NULL)	1029	if (below)
1063	below->above = above;	1030	below->above = above;
1064		1031
1065	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
1066	* the map, but we don't actually do that - it is up	1033	* the map, but we don't actually do that - it is up
1067	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
1071	above = 0, below = 0;	1038	above = 0, below = 0;
1072	env = 0;	1039	env = 0;
1073	}	1040	}
1074	else if (map)	1041	else if (map)
1075	{	1042	{
1076	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
1077	* lots of logic for things we no longer care about
1078	*/	1044	{
		1045	// leaving a spot always closes any open container on the ground
		1046	if (container && !container->env)
		1047	// this causes spurious floorbox updates, but it ensures
		1048	// that the CLOSE event is being sent.
		1049	close_container ();
		1050
		1051	--map->players;
		1052	map->touch ();
		1053	}
		1054
		1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
1079		1057
1080	/* link the object above us */	1058	/* link the object above us */
1081	if (above)	1059	if (above)
1082	above->below = below;	1060	above->below = below;
1083	else	1061	else
1084	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
1085		1063
1086	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
1087	if (below)	1065	if (below)
1088	below->above = above;	1066	below->above = above;
1089	else	1067	else
…		…
1091	/* Nothing below, which means we need to relink map object for this space	1069	/* Nothing below, which means we need to relink map object for this space
1092	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
1093	* evident	1071	* evident
1094	*/	1072	*/
1095	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
1096	{
1097	char *dump = dump_object (this);
1098	LOG (llevError,
1099	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1074	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1100	free (dump);
1101	dump = dump_object (GET_MAP_OB (map, x, y));
1102	LOG (llevError, "%s\n", dump);
1103	free (dump);
1104	}
1105		1075
1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1107	}	1077	}
1108		1078
1109	above = 0;	1079	above = 0;
1110	below = 0;	1080	below = 0;
1111		1081
1112	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1113	return;	1083	return;
1114		1084
1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1116		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1118	{	1100	{
1119	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1120	* being removed.	1102	* being removed.
1121	*/	1103	*/
1122		1104
1123	if (tmp->type == PLAYER && tmp != this)
1124	{
1125	/* If a container that the player is currently using somehow gets
1126	* removed (most likely destroyed), update the player view
1127	* appropriately.
1128	*/
1129	if (tmp->container == this)
1130	{
1131	CLEAR_FLAG (this, FLAG_APPLIED);
1132	tmp->container = 0;
1133	}
1134
1135	tmp->contr->socket.update_look = 1;
1136	}
1137
1138	/* See if player moving off should effect something */	1105	/* See if object moving off should effect something */
1139	if (check_walk_off	1106	if (check_walk_off
1140	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1142	{	1109	{
1143	move_apply (tmp, this, 0);	1110	move_apply (tmp, this, 0);
1144		1111
1145	if (destroyed ())	1112	if (destroyed ())
1146	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1113	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1147	}	1114	}
1148		1115
1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1150
1151	if (tmp->above == tmp)
1152	tmp->above = 0;
1153
1154	last = tmp;	1116	last = tmp;
1155	}	1117	}
1156		1118
1157	/* last == NULL of there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
		1120	//TODO: this makes little sense, why only update the topmost object?
1158	if (!last)	1121	if (!last)
1159	{	1122	map->at (x, y).flags_ = 0;
1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1161	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1162	* those out anyways, and if there are any flags set right now, they won't
1163	* be correct anyways.
1164	*/
1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1166	update_position (map, x, y);
1167	}
1168	else	1123	else
1169	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1170		1125
1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1172	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
1173	}	1128	}
1174	}	1129	}
1175		1130
1176	/*	1131	/*
…		…
1185	merge_ob (object *op, object *top)	1140	merge_ob (object *op, object *top)
1186	{	1141	{
1187	if (!op->nrof)	1142	if (!op->nrof)
1188	return 0;	1143	return 0;
1189		1144
1190	if (top == NULL)	1145	if (top)
1191	for (top = op; top != NULL && top->above != NULL; top = top->above);	1146	for (top = op; top && top->above; top = top->above)
		1147	;
1192		1148
1193	for (; top != NULL; top = top->below)	1149	for (; top; top = top->below)
1194	{	1150	{
1195	if (top == op)	1151	if (top == op)
1196	continue;	1152	continue;
1197	if (CAN_MERGE (op, top))	1153
		1154	if (object::can_merge (op, top))
1198	{	1155	{
1199	top->nrof += op->nrof;	1156	top->nrof += op->nrof;
1200		1157
1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1158	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1202	op->weight = 0; /* Don't want any adjustements now */	1159	op->weight = 0; /* Don't want any adjustements now */
…		…
1206	}	1163	}
1207		1164
1208	return 0;	1165	return 0;
1209	}	1166	}
1210		1167
		1168	void
		1169	object::expand_tail ()
		1170	{
		1171	if (more)
		1172	return;
		1173
		1174	object *prev = this;
		1175
		1176	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1177	{
		1178	object *op = arch_to_object (at);
		1179
		1180	op->name = name;
		1181	op->name_pl = name_pl;
		1182	op->title = title;
		1183
		1184	op->head = this;
		1185	prev->more = op;
		1186
		1187	prev = op;
		1188	}
		1189	}
		1190
1211	/*	1191	/*
1212	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1192	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1213	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1214	*/	1194	*/
1215	object *	1195	object *
1216	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1196	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1217	{	1197	{
1218	object *tmp;
1219
1220	if (op->head)
1221	op = op->head;
1222
1223	for (tmp = op; tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1224	{	1199	{
1225	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1226	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1227	}	1202	}
1228		1203
1229	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1230	}	1205	}
1231		1206
…		…
1247	* Return value:	1222	* Return value:
1248	* new object if 'op' was merged with other object	1223	* new object if 'op' was merged with other object
1249	* NULL if 'op' was destroyed	1224	* NULL if 'op' was destroyed
1250	* just 'op' otherwise	1225	* just 'op' otherwise
1251	*/	1226	*/
1252
1253	object *	1227	object *
1254	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1255	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1256	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1257	sint16 x, y;
1258		1233
1259	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1260	{
1261	LOG (llevError, "Trying to insert freed object!\n");
1262	return NULL;
1263	}
1264
1265	if (m == NULL)
1266	{
1267	char *dump = dump_object (op);
1268	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1269	free (dump);
1270	return op;
1271	}
1272
1273	if (out_of_map (m, op->x, op->y))
1274	{
1275	char *dump = dump_object (op);
1276	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1277	#ifdef MANY_CORES
1278	/* Better to catch this here, as otherwise the next use of this object
1279	* is likely to cause a crash. Better to find out where it is getting
1280	* improperly inserted.
1281	*/
1282	abort ();
1283	#endif
1284	free (dump);
1285	return op;
1286	}
1287
1288	if (!QUERY_FLAG (op, FLAG_REMOVED))
1289	{
1290	char *dump = dump_object (op);
1291	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1292	free (dump);
1293	return op;
1294	}
1295
1296	if (op->more != NULL)
1297	{
1298	/* The part may be on a different map. */
1299
1300	object *more = op->more;
1301
1302	/* We really need the caller to normalize coordinates - if
1303	* we set the map, that doesn't work if the location is within
1304	* a map and this is straddling an edge. So only if coordinate
1305	* is clear wrong do we normalize it.
1306	*/
1307	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1308	more->map = get_map_from_coord (m, &more->x, &more->y);
1309	else if (!more->map)
1310	{
1311	/* For backwards compatibility - when not dealing with tiled maps,
1312	* more->map should always point to the parent.
1313	*/
1314	more->map = m;
1315	}
1316
1317	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1318	{
1319	if (!op->head)
1320	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1321
1322	return NULL;
1323	}
1324	}
1325
1326	CLEAR_FLAG (op, FLAG_REMOVED);
1327		1235
1328	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1329	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1330	* need extra work	1238	* need extra work
1331	*/	1239	*/
1332	op->map = get_map_from_coord (m, &op->x, &op->y);	1240	if (!xy_normalise (m, op->x, op->y))
1333	x = op->x;	1241	{
1334	y = op->y;	1242	op->destroy ();
		1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
		1251
		1252	op->map = m;
		1253	mapspace &ms = op->ms ();
1335		1254
1336	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1337	*/	1256	*/
1338	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1339	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1340	if (CAN_MERGE (op, tmp))	1259	if (object::can_merge (op, tmp))
1341	{	1260	{
1342	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1343	tmp->destroy ();	1262	tmp->destroy ();
1344	}	1263	}
1345		1264
…		…
1361	op->below = originator->below;	1280	op->below = originator->below;
1362		1281
1363	if (op->below)	1282	if (op->below)
1364	op->below->above = op;	1283	op->below->above = op;
1365	else	1284	else
1366	SET_MAP_OB (op->map, op->x, op->y, op);	1285	ms.bot = op;
1367		1286
1368	/* since *below* originator, no need to update top */	1287	/* since *below* originator, no need to update top */
1369	originator->below = op;	1288	originator->below = op;
1370	}	1289	}
1371	else	1290	else
1372	{	1291	{
		1292	top = ms.bot;
		1293
1373	/* If there are other objects, then */	1294	/* If there are other objects, then */
1374	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1295	if ((!(flag & INS_MAP_LOAD)) && top)
1375	{	1296	{
1376	object *last = NULL;	1297	object *last = 0;
1377		1298
1378	/*	1299	/*
1379	* If there are multiple objects on this space, we do some trickier handling.	1300	* If there are multiple objects on this space, we do some trickier handling.
1380	* We've already dealt with merging if appropriate.	1301	* We've already dealt with merging if appropriate.
1381	* Generally, we want to put the new object on top. But if	1302	* Generally, we want to put the new object on top. But if
…		…
1385	* once we get to them. This reduces the need to traverse over all of	1306	* once we get to them. This reduces the need to traverse over all of
1386	* them when adding another one - this saves quite a bit of cpu time	1307	* them when adding another one - this saves quite a bit of cpu time
1387	* when lots of spells are cast in one area. Currently, it is presumed	1308	* when lots of spells are cast in one area. Currently, it is presumed
1388	* that flying non pickable objects are spell objects.	1309	* that flying non pickable objects are spell objects.
1389	*/	1310	*/
1390		1311	for (top = ms.bot; top; top = top->above)
1391	while (top != NULL)
1392	{	1312	{
1393	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1394	floor = top;	1314	floor = top;
1395		1315
1396	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1399	top = top->below;	1319	top = top->below;
1400	break;	1320	break;
1401	}	1321	}
1402		1322
1403	last = top;	1323	last = top;
1404	top = top->above;
1405	}	1324	}
1406		1325
1407	/* Don't want top to be NULL, so set it to the last valid object */	1326	/* Don't want top to be NULL, so set it to the last valid object */
1408	top = last;	1327	top = last;
1409		1328
…		…
1411	* looks like instead of lots of conditions here.	1330	* looks like instead of lots of conditions here.
1412	* makes things faster, and effectively the same result.	1331	* makes things faster, and effectively the same result.
1413	*/	1332	*/
1414		1333
1415	/* Have object 'fall below' other objects that block view.	1334	/* Have object 'fall below' other objects that block view.
1416	* Unless those objects are exits, type 66	1335	* Unless those objects are exits.
1417	* If INS_ON_TOP is used, don't do this processing	1336	* If INS_ON_TOP is used, don't do this processing
1418	* Need to find the object that in fact blocks view, otherwise	1337	* Need to find the object that in fact blocks view, otherwise
1419	* stacking is a bit odd.	1338	* stacking is a bit odd.
1420	*/	1339	*/
1421	if (!(flag & INS_ON_TOP) &&	1340	if (!(flag & INS_ON_TOP)
1422	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1341	&& ms.flags () & P_BLOCKSVIEW
		1342	&& (op->face && !faces [op->face].visibility))
1423	{	1343	{
1424	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1425	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1426	break;	1346	break;
		1347
1427	/* Check to see if we found the object that blocks view,	1348	/* Check to see if we found the object that blocks view,
1428	* and make sure we have a below pointer for it so that	1349	* and make sure we have a below pointer for it so that
1429	* we can get inserted below this one, which requires we	1350	* we can get inserted below this one, which requires we
1430	* set top to the object below us.	1351	* set top to the object below us.
1431	*/	1352	*/
1432	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1433	top = last->below;	1354	top = last->below;
1434	}	1355	}
1435	} /* If objects on this space */	1356	} /* If objects on this space */
1436
1437	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1438	top = GET_MAP_TOP (op->map, op->x, op->y);	1358	top = ms.top;
1439		1359
1440	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1441	top = floor;	1361	top = floor;
1442		1362
1443	/* Top is the object that our object (op) is going to get inserted above.	1363	/* Top is the object that our object (op) is going to get inserted above.
1444	*/	1364	*/
1445		1365
1446	/* First object on this space */	1366	/* First object on this space */
1447	if (!top)	1367	if (!top)
1448	{	1368	{
1449	op->above = GET_MAP_OB (op->map, op->x, op->y);	1369	op->above = ms.bot;
1450		1370
1451	if (op->above)	1371	if (op->above)
1452	op->above->below = op;	1372	op->above->below = op;
1453		1373
1454	op->below = NULL;	1374	op->below = 0;
1455	SET_MAP_OB (op->map, op->x, op->y, op);	1375	ms.bot = op;
1456	}	1376	}
1457	else	1377	else
1458	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1459	op->above = top->above;	1379	op->above = top->above;
1460		1380
…		…
1463		1383
1464	op->below = top;	1384	op->below = top;
1465	top->above = op;	1385	top->above = op;
1466	}	1386	}
1467		1387
1468	if (op->above == NULL)	1388	if (!op->above)
1469	SET_MAP_TOP (op->map, op->x, op->y, op);	1389	ms.top = op;
1470	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1471		1391
1472	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
		1393	{
1473	op->contr->do_los = 1;	1394	op->contr->do_los = 1;
		1395	++op->map->players;
		1396	op->map->touch ();
		1397	}
1474		1398
1475	/* If we have a floor, we know the player, if any, will be above	1399	op->map->dirty = true;
1476	* it, so save a few ticks and start from there.	1400
1477	*/
1478	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1479	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1402	if (object *pl = ms.player ())
1480	if (tmp->type == PLAYER)	1403	pl->contr->ns->floorbox_update ();
1481	tmp->contr->socket.update_look = 1;
1482		1404
1483	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1484	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1485	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1486	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1487	* be far away from this change and not affected in any way -	1409	* be far away from this change and not affected in any way -
1488	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1489	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1490	* of effect may be sufficient.	1412	* of effect may be sufficient.
1491	*/	1413	*/
1492	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1493	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1494		1416
1495	/* updates flags (blocked, alive, no magic, etc) for this map space */	1417	/* updates flags (blocked, alive, no magic, etc) for this map space */
1496	update_object (op, UP_OBJ_INSERT);	1418	update_object (op, UP_OBJ_INSERT);
1497		1419
		1420	INVOKE_OBJECT (INSERT, op);
		1421
1498	/* Don't know if moving this to the end will break anything. However,	1422	/* Don't know if moving this to the end will break anything. However,
1499	* we want to have update_look set above before calling this.	1423	* we want to have floorbox_update called before calling this.
1500	*	1424	*
1501	* check_move_on() must be after this because code called from	1425	* check_move_on() must be after this because code called from
1502	* check_move_on() depends on correct map flags (so functions like	1426	* check_move_on() depends on correct map flags (so functions like
1503	* blocked() and wall() work properly), and these flags are updated by	1427	* blocked() and wall() work properly), and these flags are updated by
1504	* update_object().	1428	* update_object().
1505	*/	1429	*/
1506		1430
1507	/* if this is not the head or flag has been passed, don't check walk on status */	1431	/* if this is not the head or flag has been passed, don't check walk on status */
1508	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1509	{	1433	{
1510	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1511	return NULL;	1435	return 0;
1512		1436
1513	/* If we are a multi part object, lets work our way through the check	1437	/* If we are a multi part object, lets work our way through the check
1514	* walk on's.	1438	* walk on's.
1515	*/	1439	*/
1516	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (object *tmp = op->more; tmp; tmp = tmp->more)
1517	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1518	return NULL;	1442	return 0;
1519	}	1443	}
1520		1444
1521	return op;	1445	return op;
1522	}	1446	}
1523		1447
1524	/* this function inserts an object in the map, but if it	1448	/* this function inserts an object in the map, but if it
1525	* finds an object of its own type, it'll remove that one first.	1449	* finds an object of its own type, it'll remove that one first.
1526	* op is the object to insert it under: supplies x and the map.	1450	* op is the object to insert it under: supplies x and the map.
1527	*/	1451	*/
1528	void	1452	void
1529	replace_insert_ob_in_map (const char *arch_string, object *op)	1453	replace_insert_ob_in_map (const char *arch_string, object *op)
1530	{	1454	{
1531	object *	1455	object *tmp, *tmp1;
1532	tmp;
1533	object *
1534	tmp1;
1535		1456
1536	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1537		1458
1538	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1540	tmp->destroy ();	1461	tmp->destroy ();
1541		1462
1542	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1543		1464
1544	tmp1->x = op->x;	1465	tmp1->x = op->x;
1545	tmp1->y = op->y;	1466	tmp1->y = op->y;
1546	insert_ob_in_map (tmp1, op->map, op, 0);	1467	insert_ob_in_map (tmp1, op->map, op, 0);
		1468	}
		1469
		1470	object *
		1471	object::insert_at (object *where, object *originator, int flags)
		1472	{
		1473	return where->map->insert (this, where->x, where->y, originator, flags);
1547	}	1474	}
1548		1475
1549	/*	1476	/*
1550	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1551	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
1552	* the rest (or is removed and freed if that number is 0).	1479	* the rest (or is removed and freed if that number is 0).
1553	* On failure, NULL is returned, and the reason put into the	1480	* On failure, NULL is returned, and the reason put into the
1554	* global static errmsg array.	1481	* global static errmsg array.
1555	*/	1482	*/
1556
1557	object *	1483	object *
1558	get_split_ob (object *orig_ob, uint32 nr)	1484	get_split_ob (object *orig_ob, uint32 nr)
1559	{	1485	{
1560	object *newob;	1486	object *newob;
1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1592	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1593	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1594	*	1520	*
1595	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1596	*/	1522	*/
1597
1598	object *	1523	object *
1599	decrease_ob_nr (object *op, uint32 i)	1524	decrease_ob_nr (object *op, uint32 i)
1600	{	1525	{
1601	object *tmp;	1526	object *tmp;
1602	player *pl;
1603		1527
1604	if (i == 0) /* objects with op->nrof require this check */	1528	if (i == 0) /* objects with op->nrof require this check */
1605	return op;	1529	return op;
1606		1530
1607	if (i > op->nrof)	1531	if (i > op->nrof)
1608	i = op->nrof;	1532	i = op->nrof;
1609		1533
1610	if (QUERY_FLAG (op, FLAG_REMOVED))	1534	if (QUERY_FLAG (op, FLAG_REMOVED))
1611	op->nrof -= i;	1535	op->nrof -= i;
1612	else if (op->env != NULL)	1536	else if (op->env)
1613	{	1537	{
1614	/* is this object in the players inventory, or sub container	1538	/* is this object in the players inventory, or sub container
1615	* therein?	1539	* therein?
1616	*/	1540	*/
1617	tmp = is_player_inv (op->env);	1541	tmp = op->in_player ();
1618	/* nope. Is this a container the player has opened?	1542	/* nope. Is this a container the player has opened?
1619	* If so, set tmp to that player.	1543	* If so, set tmp to that player.
1620	* IMO, searching through all the players will mostly	1544	* IMO, searching through all the players will mostly
1621	* likely be quicker than following op->env to the map,	1545	* likely be quicker than following op->env to the map,
1622	* and then searching the map for a player.	1546	* and then searching the map for a player.
1623	*/	1547	*/
1624	if (!tmp)	1548	if (!tmp)
1625	{	1549	for_all_players (pl)
1626	for (pl = first_player; pl; pl = pl->next)
1627	if (pl->ob->container == op->env)	1550	if (pl->ob->container == op->env)
		1551	{
		1552	tmp = pl->ob;
1628	break;	1553	break;
1629	if (pl)
1630	tmp = pl->ob;
1631	else
1632	tmp = NULL;
1633	}	1554	}
1634		1555
1635	if (i < op->nrof)	1556	if (i < op->nrof)
1636	{	1557	{
1637	sub_weight (op->env, op->weight * i);	1558	sub_weight (op->env, op->weight * i);
1638	op->nrof -= i;	1559	op->nrof -= i;
1639	if (tmp)	1560	if (tmp)
1640	{
1641	esrv_send_item (tmp, op);	1561	esrv_send_item (tmp, op);
1642	}
1643	}	1562	}
1644	else	1563	else
1645	{	1564	{
1646	op->remove ();	1565	op->remove ();
1647	op->nrof = 0;	1566	op->nrof = 0;
1648	if (tmp)	1567	if (tmp)
1649	{
1650	esrv_del_item (tmp->contr, op->count);	1568	esrv_del_item (tmp->contr, op->count);
1651	}
1652	}	1569	}
1653	}	1570	}
1654	else	1571	else
1655	{	1572	{
1656	object *above = op->above;	1573	object *above = op->above;
…		…
1662	op->remove ();	1579	op->remove ();
1663	op->nrof = 0;	1580	op->nrof = 0;
1664	}	1581	}
1665		1582
1666	/* Since we just removed op, op->above is null */	1583	/* Since we just removed op, op->above is null */
1667	for (tmp = above; tmp != NULL; tmp = tmp->above)	1584	for (tmp = above; tmp; tmp = tmp->above)
1668	if (tmp->type == PLAYER)	1585	if (tmp->type == PLAYER)
1669	{	1586	{
1670	if (op->nrof)	1587	if (op->nrof)
1671	esrv_send_item (tmp, op);	1588	esrv_send_item (tmp, op);
1672	else	1589	else
…		…
1677	if (op->nrof)	1594	if (op->nrof)
1678	return op;	1595	return op;
1679	else	1596	else
1680	{	1597	{
1681	op->destroy ();	1598	op->destroy ();
1682	return NULL;	1599	return 0;
1683	}	1600	}
1684	}	1601	}
1685		1602
1686	/*	1603	/*
1687	* add_weight(object, weight) adds the specified weight to an object,	1604	* add_weight(object, weight) adds the specified weight to an object,
1688	* and also updates how much the environment(s) is/are carrying.	1605	* and also updates how much the environment(s) is/are carrying.
1689	*/	1606	*/
1690
1691	void	1607	void
1692	add_weight (object *op, signed long weight)	1608	add_weight (object *op, signed long weight)
1693	{	1609	{
1694	while (op != NULL)	1610	while (op != NULL)
1695	{	1611	{
…		…
1710	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1626	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1711	free (dump);	1627	free (dump);
1712	return op;	1628	return op;
1713	}	1629	}
1714		1630
1715	if (where->head)	1631	if (where->head_ () != where)
1716	{	1632	{
1717	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1633	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1718	where = where->head;	1634	where = where->head;
1719	}	1635	}
1720		1636
1721	return where->insert (op);	1637	return where->insert (op);
1722	}	1638	}
…		…
1727	* inside the object environment.	1643	* inside the object environment.
1728	*	1644	*
1729	* The function returns now pointer to inserted item, and return value can	1645	* The function returns now pointer to inserted item, and return value can
1730	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1731	*/	1647	*/
1732
1733	object *	1648	object *
1734	object::insert (object *op)	1649	object::insert (object *op)
1735	{	1650	{
1736	object *tmp, *otmp;
1737
1738	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1739	op->remove ();	1652	op->remove ();
1740		1653
1741	if (op->more)	1654	if (op->more)
1742	{	1655	{
…		…
1744	return op;	1657	return op;
1745	}	1658	}
1746		1659
1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1748	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1749	if (op->nrof)	1663	if (op->nrof)
1750	{	1664	{
1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1752	if (CAN_MERGE (tmp, op))	1666	if (object::can_merge (tmp, op))
1753	{	1667	{
1754	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1755	(client needs the original object) */	1669	(client needs the original object) */
1756	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
1757	/* Weight handling gets pretty funky. Since we are adding to	1671	/* Weight handling gets pretty funky. Since we are adding to
…		…
1775	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1776	}	1690	}
1777	else	1691	else
1778	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1779		1693
1780	otmp = is_player_inv (this);	1694	if (object *otmp = this->in_player ())
1781	if (otmp && otmp->contr)
1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1783	fix_player (otmp);	1696	otmp->update_stats ();
1784		1697
		1698	op->owner = 0; // its his/hers now. period.
1785	op->map = NULL;	1699	op->map = 0;
1786	op->env = this;	1700	op->env = this;
1787	op->above = NULL;	1701	op->above = 0;
1788	op->below = NULL;	1702	op->below = 0;
1789	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1790		1704
1791	/* reset the light list and los of the players on the map */	1705	/* reset the light list and los of the players on the map */
1792	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1793	{	1707	{
1794	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1795	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1796	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1797	if (MAP_DARKNESS (map))	1711	if (map->darkness)
1798	update_all_los (map, x, y);	1712	update_all_los (map, x, y);
1799	}	1713	}
1800		1714
1801	/* Client has no idea of ordering so lets not bother ordering it here.	1715	/* Client has no idea of ordering so lets not bother ordering it here.
1802	* It sure simplifies this function...	1716	* It sure simplifies this function...
…		…
1807	{	1721	{
1808	op->below = inv;	1722	op->below = inv;
1809	op->below->above = op;	1723	op->below->above = op;
1810	inv = op;	1724	inv = op;
1811	}	1725	}
		1726
		1727	INVOKE_OBJECT (INSERT, this);
1812		1728
1813	return op;	1729	return op;
1814	}	1730	}
1815		1731
1816	/*	1732	/*
…		…
1831	*	1747	*
1832	* MSW 2001-07-08: Check all objects on space, not just those below	1748	* MSW 2001-07-08: Check all objects on space, not just those below
1833	* object being inserted. insert_ob_in_map may not put new objects	1749	* object being inserted. insert_ob_in_map may not put new objects
1834	* on top.	1750	* on top.
1835	*/	1751	*/
1836
1837	int	1752	int
1838	check_move_on (object *op, object *originator)	1753	check_move_on (object *op, object *originator)
1839	{	1754	{
1840	object *tmp;	1755	object *tmp;
1841	maptile *m = op->map;	1756	maptile *m = op->map;
…		…
1868		1783
1869	/* The objects have to be checked from top to bottom.	1784	/* The objects have to be checked from top to bottom.
1870	* Hence, we first go to the top:	1785	* Hence, we first go to the top:
1871	*/	1786	*/
1872		1787
1873	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1788	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1874	{	1789	{
1875	/* Trim the search when we find the first other spell effect	1790	/* Trim the search when we find the first other spell effect
1876	* this helps performance so that if a space has 50 spell objects,	1791	* this helps performance so that if a space has 50 spell objects,
1877	* we don't need to check all of them.	1792	* we don't need to check all of them.
1878	*/	1793	*/
…		…
1896	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1811	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1897	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1812	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1898	{	1813	{
1899		1814
1900	float	1815	float
1901	diff = tmp->move_slow_penalty * FABS (op->speed);	1816	diff = tmp->move_slow_penalty * fabs (op->speed);
1902		1817
1903	if (op->type == PLAYER)	1818	if (op->type == PLAYER)
1904	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1819	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1905	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1820	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1906	diff /= 4.0;	1821	diff /= 4.0;
…		…
1933	/*	1848	/*
1934	* present_arch(arch, map, x, y) searches for any objects with	1849	* present_arch(arch, map, x, y) searches for any objects with
1935	* a matching archetype at the given map and coordinates.	1850	* a matching archetype at the given map and coordinates.
1936	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
1937	*/	1852	*/
1938
1939	object *	1853	object *
1940	present_arch (const archetype *at, maptile *m, int x, int y)	1854	present_arch (const archetype *at, maptile *m, int x, int y)
1941	{	1855	{
1942	object *
1943	tmp;
1944
1945	if (m == NULL || out_of_map (m, x, y))	1856	if (!m || out_of_map (m, x, y))
1946	{	1857	{
1947	LOG (llevError, "Present_arch called outside map.\n");	1858	LOG (llevError, "Present_arch called outside map.\n");
1948	return NULL;	1859	return NULL;
1949	}	1860	}
1950	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1861
		1862	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1951	if (tmp->arch == at)	1863	if (tmp->arch == at)
1952	return tmp;	1864	return tmp;
		1865
1953	return NULL;	1866	return NULL;
1954	}	1867	}
1955		1868
1956	/*	1869	/*
1957	* present(type, map, x, y) searches for any objects with	1870	* present(type, map, x, y) searches for any objects with
1958	* a matching type variable at the given map and coordinates.	1871	* a matching type variable at the given map and coordinates.
1959	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1960	*/	1873	*/
1961
1962	object *	1874	object *
1963	present (unsigned char type, maptile *m, int x, int y)	1875	present (unsigned char type, maptile *m, int x, int y)
1964	{	1876	{
1965	object *
1966	tmp;
1967
1968	if (out_of_map (m, x, y))	1877	if (out_of_map (m, x, y))
1969	{	1878	{
1970	LOG (llevError, "Present called outside map.\n");	1879	LOG (llevError, "Present called outside map.\n");
1971	return NULL;	1880	return NULL;
1972	}	1881	}
1973	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1882
		1883	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1974	if (tmp->type == type)	1884	if (tmp->type == type)
1975	return tmp;	1885	return tmp;
		1886
1976	return NULL;	1887	return NULL;
1977	}	1888	}
1978		1889
1979	/*	1890	/*
1980	* present_in_ob(type, object) searches for any objects with	1891	* present_in_ob(type, object) searches for any objects with
1981	* a matching type variable in the inventory of the given object.	1892	* a matching type variable in the inventory of the given object.
1982	* The first matching object is returned, or NULL if none.	1893	* The first matching object is returned, or NULL if none.
1983	*/	1894	*/
1984
1985	object *	1895	object *
1986	present_in_ob (unsigned char type, const object *op)	1896	present_in_ob (unsigned char type, const object *op)
1987	{	1897	{
1988	object *
1989	tmp;
1990
1991	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1992	if (tmp->type == type)	1899	if (tmp->type == type)
1993	return tmp;	1900	return tmp;
		1901
1994	return NULL;	1902	return NULL;
1995	}	1903	}
1996		1904
1997	/*	1905	/*
1998	* present_in_ob (type, str, object) searches for any objects with	1906	* present_in_ob (type, str, object) searches for any objects with
…		…
2006	* str is the string to match against. Note that we match against	1914	* str is the string to match against. Note that we match against
2007	* the object name, not the archetype name. this is so that the	1915	* the object name, not the archetype name. this is so that the
2008	* spell code can use one object type (force), but change it's name	1916	* spell code can use one object type (force), but change it's name
2009	* to be unique.	1917	* to be unique.
2010	*/	1918	*/
2011
2012	object *	1919	object *
2013	present_in_ob_by_name (int type, const char *str, const object *op)	1920	present_in_ob_by_name (int type, const char *str, const object *op)
2014	{	1921	{
2015	object *
2016	tmp;
2017
2018	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1922	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2019	{
2020	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2021	return tmp;	1924	return tmp;
2022	}	1925
2023	return NULL;	1926	return 0;
2024	}	1927	}
2025		1928
2026	/*	1929	/*
2027	* present_arch_in_ob(archetype, object) searches for any objects with	1930	* present_arch_in_ob(archetype, object) searches for any objects with
2028	* a matching archetype in the inventory of the given object.	1931	* a matching archetype in the inventory of the given object.
2029	* The first matching object is returned, or NULL if none.	1932	* The first matching object is returned, or NULL if none.
2030	*/	1933	*/
2031
2032	object *	1934	object *
2033	present_arch_in_ob (const archetype *at, const object *op)	1935	present_arch_in_ob (const archetype *at, const object *op)
2034	{	1936	{
2035	object *
2036	tmp;
2037
2038	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2039	if (tmp->arch == at)	1938	if (tmp->arch == at)
2040	return tmp;	1939	return tmp;
		1940
2041	return NULL;	1941	return NULL;
2042	}	1942	}
2043		1943
2044	/*	1944	/*
2045	* activate recursively a flag on an object inventory	1945	* activate recursively a flag on an object inventory
2046	*/	1946	*/
2047	void	1947	void
2048	flag_inv (object *op, int flag)	1948	flag_inv (object *op, int flag)
2049	{	1949	{
2050	object *
2051	tmp;
2052
2053	if (op->inv)	1950	if (op->inv)
2054	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2055	{	1952	{
2056	SET_FLAG (tmp, flag);	1953	SET_FLAG (tmp, flag);
2057	flag_inv (tmp, flag);	1954	flag_inv (tmp, flag);
2058	}	1955	}
2059	} /*	1956	}
		1957
		1958	/*
2060	* desactivate recursively a flag on an object inventory	1959	* deactivate recursively a flag on an object inventory
2061	*/	1960	*/
2062	void	1961	void
2063	unflag_inv (object *op, int flag)	1962	unflag_inv (object *op, int flag)
2064	{	1963	{
2065	object *
2066	tmp;
2067
2068	if (op->inv)	1964	if (op->inv)
2069	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2070	{	1966	{
2071	CLEAR_FLAG (tmp, flag);	1967	CLEAR_FLAG (tmp, flag);
2072	unflag_inv (tmp, flag);	1968	unflag_inv (tmp, flag);
2073	}	1969	}
2074	}
2075
2076	/*
2077	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2078	* all it's inventory (recursively).
2079	* If checksums are used, a player will get set_cheat called for
2080	* him/her-self and all object carried by a call to this function.
2081	*/
2082
2083	void
2084	set_cheat (object *op)
2085	{
2086	SET_FLAG (op, FLAG_WAS_WIZ);
2087	flag_inv (op, FLAG_WAS_WIZ);
2088	}	1970	}
2089		1971
2090	/*	1972	/*
2091	* find_free_spot(object, map, x, y, start, stop) will search for	1973	* find_free_spot(object, map, x, y, start, stop) will search for
2092	* a spot at the given map and coordinates which will be able to contain	1974	* a spot at the given map and coordinates which will be able to contain
…		…
2106	* because arch_blocked (now ob_blocked) needs to know the movement type	1988	* because arch_blocked (now ob_blocked) needs to know the movement type
2107	* to know if the space in question will block the object. We can't use	1989	* to know if the space in question will block the object. We can't use
2108	* the archetype because that isn't correct if the monster has been	1990	* the archetype because that isn't correct if the monster has been
2109	* customized, changed states, etc.	1991	* customized, changed states, etc.
2110	*/	1992	*/
2111
2112	int	1993	int
2113	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1994	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2114	{	1995	{
2115	int
2116	i,
2117	index = 0, flag;	1996	int index = 0, flag;
2118	static int
2119	altern[SIZEOFFREE];	1997	int altern[SIZEOFFREE];
2120		1998
2121	for (i = start; i < stop; i++)	1999	for (int i = start; i < stop; i++)
2122	{	2000	{
2123	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2001	mapxy pos (m, x, y); pos.move (i);
2124	if (!flag)	2002
2125	altern[index++] = i;	2003	if (!pos.normalise ())
		2004	continue;
		2005
		2006	mapspace &ms = *pos;
		2007	ms.update ();
		2008
		2009	/* However, often
		2010	* ob doesn't have any move type (when used to place exits)
		2011	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2012	*/
		2013	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2014	continue;
2126		2015
2127	/* Basically, if we find a wall on a space, we cut down the search size.	2016	/* Basically, if we find a wall on a space, we cut down the search size.
2128	* In this way, we won't return spaces that are on another side of a wall.	2017	* In this way, we won't return spaces that are on another side of a wall.
2129	* This mostly work, but it cuts down the search size in all directions -	2018	* This mostly work, but it cuts down the search size in all directions -
2130	* if the space being examined only has a wall to the north and empty	2019	* if the space being examined only has a wall to the north and empty
2131	* spaces in all the other directions, this will reduce the search space	2020	* spaces in all the other directions, this will reduce the search space
2132	* to only the spaces immediately surrounding the target area, and	2021	* to only the spaces immediately surrounding the target area, and
2133	* won't look 2 spaces south of the target space.	2022	* won't look 2 spaces south of the target space.
2134	*/	2023	*/
2135	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2024	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2025	{
2136	stop = maxfree[i];	2026	stop = maxfree[i];
		2027	continue;
		2028	}
		2029
		2030	/* Note it is intentional that we check ob - the movement type of the
		2031	* head of the object should correspond for the entire object.
		2032	*/
		2033	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2034	continue;
		2035
		2036	altern [index++] = i;
2137	}	2037	}
		2038
2138	if (!index)	2039	if (!index)
2139	return -1;	2040	return -1;
		2041
2140	return altern[RANDOM () % index];	2042	return altern [rndm (index)];
2141	}	2043	}
2142		2044
2143	/*	2045	/*
2144	* find_first_free_spot(archetype, maptile, x, y) works like	2046	* find_first_free_spot(archetype, maptile, x, y) works like
2145	* find_free_spot(), but it will search max number of squares.	2047	* find_free_spot(), but it will search max number of squares.
2146	* But it will return the first available spot, not a random choice.	2048	* But it will return the first available spot, not a random choice.
2147	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2049	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2148	*/	2050	*/
2149
2150	int	2051	int
2151	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2052	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2152	{	2053	{
2153	int
2154	i;
2155
2156	for (i = 0; i < SIZEOFFREE; i++)	2054	for (int i = 0; i < SIZEOFFREE; i++)
2157	{
2158	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2055	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2159	return i;	2056	return i;
2160	}	2057
2161	return -1;	2058	return -1;
2162	}	2059	}
2163		2060
2164	/*	2061	/*
2165	* The function permute(arr, begin, end) randomly reorders the array	2062	* The function permute(arr, begin, end) randomly reorders the array
2166	* arr[begin..end-1].	2063	* arr[begin..end-1].
		2064	* now uses a fisher-yates shuffle, old permute was broken
2167	*/	2065	*/
2168	static void	2066	static void
2169	permute (int *arr, int begin, int end)	2067	permute (int *arr, int begin, int end)
2170	{	2068	{
2171	int	2069	arr += begin;
2172	i,
2173	j,
2174	tmp,
2175	len;
2176
2177	len = end - begin;	2070	end -= begin;
2178	for (i = begin; i < end; i++)
2179	{
2180	j = begin + RANDOM () % len;
2181		2071
2182	tmp = arr[i];	2072	while (--end)
2183	arr[i] = arr[j];	2073	swap (arr [end], arr [rndm (end + 1)]);
2184	arr[j] = tmp;
2185	}
2186	}	2074	}
2187		2075
2188	/* new function to make monster searching more efficient, and effective!	2076	/* new function to make monster searching more efficient, and effective!
2189	* This basically returns a randomized array (in the passed pointer) of	2077	* This basically returns a randomized array (in the passed pointer) of
2190	* the spaces to find monsters. In this way, it won't always look for	2078	* the spaces to find monsters. In this way, it won't always look for
…		…
2193	* the 3x3 area will be searched, just not in a predictable order.	2081	* the 3x3 area will be searched, just not in a predictable order.
2194	*/	2082	*/
2195	void	2083	void
2196	get_search_arr (int *search_arr)	2084	get_search_arr (int *search_arr)
2197	{	2085	{
2198	int	2086	int i;
2199	i;
2200		2087
2201	for (i = 0; i < SIZEOFFREE; i++)	2088	for (i = 0; i < SIZEOFFREE; i++)
2202	{
2203	search_arr[i] = i;	2089	search_arr[i] = i;
2204	}
2205		2090
2206	permute (search_arr, 1, SIZEOFFREE1 + 1);	2091	permute (search_arr, 1, SIZEOFFREE1 + 1);
2207	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2092	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2208	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2093	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2209	}	2094	}
…		…
2218	* Perhaps incorrectly, but I'm making the assumption that exclude	2103	* Perhaps incorrectly, but I'm making the assumption that exclude
2219	* is actually want is going to try and move there. We need this info	2104	* is actually want is going to try and move there. We need this info
2220	* because we have to know what movement the thing looking to move	2105	* because we have to know what movement the thing looking to move
2221	* there is capable of.	2106	* there is capable of.
2222	*/	2107	*/
2223
2224	int	2108	int
2225	find_dir (maptile *m, int x, int y, object *exclude)	2109	find_dir (maptile *m, int x, int y, object *exclude)
2226	{	2110	{
2227	int
2228	i,
2229	max = SIZEOFFREE, mflags;	2111	int i, max = SIZEOFFREE, mflags;
2230		2112
2231	sint16 nx, ny;	2113	sint16 nx, ny;
2232	object *	2114	object *tmp;
2233	tmp;
2234	maptile *	2115	maptile *mp;
2235	mp;
2236		2116
2237	MoveType blocked, move_type;	2117	MoveType blocked, move_type;
2238		2118
2239	if (exclude && exclude->head)	2119	if (exclude && exclude->head_ () != exclude)
2240	{	2120	{
2241	exclude = exclude->head;	2121	exclude = exclude->head;
2242	move_type = exclude->move_type;	2122	move_type = exclude->move_type;
2243	}	2123	}
2244	else	2124	else
…		…
2252	mp = m;	2132	mp = m;
2253	nx = x + freearr_x[i];	2133	nx = x + freearr_x[i];
2254	ny = y + freearr_y[i];	2134	ny = y + freearr_y[i];
2255		2135
2256	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2136	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2137
2257	if (mflags & P_OUT_OF_MAP)	2138	if (mflags & P_OUT_OF_MAP)
2258	{
2259	max = maxfree[i];	2139	max = maxfree[i];
2260	}
2261	else	2140	else
2262	{	2141	{
2263	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2142	mapspace &ms = mp->at (nx, ny);
		2143
		2144	blocked = ms.move_block;
2264		2145
2265	if ((move_type & blocked) == move_type)	2146	if ((move_type & blocked) == move_type)
2266	{
2267	max = maxfree[i];	2147	max = maxfree[i];
2268	}
2269	else if (mflags & P_IS_ALIVE)	2148	else if (mflags & P_IS_ALIVE)
2270	{	2149	{
2271	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2150	for (tmp = ms.bot; tmp; tmp = tmp->above)
2272	{	2151	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2273	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2152	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2274	{
2275	break;	2153	break;
2276	}	2154
2277	}
2278	if (tmp)	2155	if (tmp)
2279	{
2280	return freedir[i];	2156	return freedir[i];
2281	}
2282	}	2157	}
2283	}	2158	}
2284	}	2159	}
		2160
2285	return 0;	2161	return 0;
2286	}	2162	}
2287		2163
2288	/*	2164	/*
2289	* distance(object 1, object 2) will return the square of the	2165	* distance(object 1, object 2) will return the square of the
2290	* distance between the two given objects.	2166	* distance between the two given objects.
2291	*/	2167	*/
2292
2293	int	2168	int
2294	distance (const object *ob1, const object *ob2)	2169	distance (const object *ob1, const object *ob2)
2295	{	2170	{
2296	int
2297	i;
2298
2299	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2171	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2300	return i;
2301	}	2172	}
2302		2173
2303	/*	2174	/*
2304	* find_dir_2(delta-x,delta-y) will return a direction in which	2175	* find_dir_2(delta-x,delta-y) will return a direction in which
2305	* an object which has subtracted the x and y coordinates of another	2176	* an object which has subtracted the x and y coordinates of another
2306	* object, needs to travel toward it.	2177	* object, needs to travel toward it.
2307	*/	2178	*/
2308
2309	int	2179	int
2310	find_dir_2 (int x, int y)	2180	find_dir_2 (int x, int y)
2311	{	2181	{
2312	int	2182	int q;
2313	q;
2314		2183
2315	if (y)	2184	if (y)
2316	q = x * 100 / y;	2185	q = x * 100 / y;
2317	else if (x)	2186	else if (x)
2318	q = -300 * x;	2187	q = -300 * x;
…		…
2343		2212
2344	return 3;	2213	return 3;
2345	}	2214	}
2346		2215
2347	/*	2216	/*
2348	* absdir(int): Returns a number between 1 and 8, which represent
2349	* the "absolute" direction of a number (it actually takes care of
2350	* "overflow" in previous calculations of a direction).
2351	*/
2352
2353	int
2354	absdir (int d)
2355	{
2356	while (d < 1)
2357	d += 8;
2358	while (d > 8)
2359	d -= 8;
2360	return d;
2361	}
2362
2363	/*
2364	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2217	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2365	* between two directions (which are expected to be absolute (see absdir())	2218	* between two directions (which are expected to be absolute (see absdir())
2366	*/	2219	*/
2367
2368	int	2220	int
2369	dirdiff (int dir1, int dir2)	2221	dirdiff (int dir1, int dir2)
2370	{	2222	{
2371	int	2223	int d;
2372	d;
2373		2224
2374	d = abs (dir1 - dir2);	2225	d = abs (dir1 - dir2);
2375	if (d > 4)	2226	if (d > 4)
2376	d = 8 - d;	2227	d = 8 - d;
		2228
2377	return d;	2229	return d;
2378	}	2230	}
2379		2231
2380	/* peterm:	2232	/* peterm:
2381	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2233	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2384	* This basically means that if direction is 15, then it could either go	2236	* This basically means that if direction is 15, then it could either go
2385	* direction 4, 14, or 16 to get back to where we are.	2237	* direction 4, 14, or 16 to get back to where we are.
2386	* Moved from spell_util.c to object.c with the other related direction	2238	* Moved from spell_util.c to object.c with the other related direction
2387	* functions.	2239	* functions.
2388	*/	2240	*/
2389
2390	int
2391	reduction_dir[SIZEOFFREE][3] = {	2241	int reduction_dir[SIZEOFFREE][3] = {
2392	{0, 0, 0}, /* 0 */	2242	{0, 0, 0}, /* 0 */
2393	{0, 0, 0}, /* 1 */	2243	{0, 0, 0}, /* 1 */
2394	{0, 0, 0}, /* 2 */	2244	{0, 0, 0}, /* 2 */
2395	{0, 0, 0}, /* 3 */	2245	{0, 0, 0}, /* 3 */
2396	{0, 0, 0}, /* 4 */	2246	{0, 0, 0}, /* 4 */
…		…
2444	* find a path to that monster that we found. If not,	2294	* find a path to that monster that we found. If not,
2445	* we don't bother going toward it. Returns 1 if we	2295	* we don't bother going toward it. Returns 1 if we
2446	* can see a direct way to get it	2296	* can see a direct way to get it
2447	* Modified to be map tile aware -.MSW	2297	* Modified to be map tile aware -.MSW
2448	*/	2298	*/
2449
2450
2451	int	2299	int
2452	can_see_monsterP (maptile *m, int x, int y, int dir)	2300	can_see_monsterP (maptile *m, int x, int y, int dir)
2453	{	2301	{
2454	sint16 dx, dy;	2302	sint16 dx, dy;
2455	int
2456	mflags;	2303	int mflags;
2457		2304
2458	if (dir < 0)	2305	if (dir < 0)
2459	return 0; /* exit condition: invalid direction */	2306	return 0; /* exit condition: invalid direction */
2460		2307
2461	dx = x + freearr_x[dir];	2308	dx = x + freearr_x[dir];
…		…
2474	return 0;	2321	return 0;
2475		2322
2476	/* yes, can see. */	2323	/* yes, can see. */
2477	if (dir < 9)	2324	if (dir < 9)
2478	return 1;	2325	return 1;
		2326
2479	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2327	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2480	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2328	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2329	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2481	}	2330	}
2482
2483
2484		2331
2485	/*	2332	/*
2486	* can_pick(picker, item): finds out if an object is possible to be	2333	* can_pick(picker, item): finds out if an object is possible to be
2487	* picked up by the picker. Returnes 1 if it can be	2334	* picked up by the picker. Returnes 1 if it can be
2488	* picked up, otherwise 0.	2335	* picked up, otherwise 0.
…		…
2490	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2337	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2491	* core dumps if they do.	2338	* core dumps if they do.
2492	*	2339	*
2493	* Add a check so we can't pick up invisible objects (0.93.8)	2340	* Add a check so we can't pick up invisible objects (0.93.8)
2494	*/	2341	*/
2495
2496	int	2342	int
2497	can_pick (const object *who, const object *item)	2343	can_pick (const object *who, const object *item)
2498	{	2344	{
2499	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2345	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2500	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2346	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2501	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2347	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2502	}	2348	}
2503		2349
2504
2505	/*	2350	/*
2506	* create clone from object to another	2351	* create clone from object to another
2507	*/	2352	*/
2508	object *	2353	object *
2509	object_create_clone (object *asrc)	2354	object_create_clone (object *asrc)
2510	{	2355	{
2511	object *dst = 0, *tmp, *src, *part, *prev, *item;	2356	object *dst = 0, *tmp, *src, *prev, *item;
2512		2357
2513	if (!asrc)	2358	if (!asrc)
2514	return 0;	2359	return 0;
2515		2360
2516	src = asrc;
2517	if (src->head)
2518	src = src->head;	2361	src = asrc->head_ ();
2519		2362
2520	prev = 0;	2363	prev = 0;
2521	for (part = src; part; part = part->more)	2364	for (object *part = src; part; part = part->more)
2522	{	2365	{
2523	tmp = object::create ();	2366	tmp = part->clone ();
2524	part->copy_to (tmp);
2525	tmp->x -= src->x;	2367	tmp->x -= src->x;
2526	tmp->y -= src->y;	2368	tmp->y -= src->y;
2527		2369
2528	if (!part->head)	2370	if (!part->head)
2529	{	2371	{
2530	dst = tmp;	2372	dst = tmp;
2531	tmp->head = 0;	2373	tmp->head = 0;
2532	}	2374	}
2533	else	2375	else
2534	{
2535	tmp->head = dst;	2376	tmp->head = dst;
2536	}
2537		2377
2538	tmp->more = 0;	2378	tmp->more = 0;
2539		2379
2540	if (prev)	2380	if (prev)
2541	prev->more = tmp;	2381	prev->more = tmp;
…		…
2545		2385
2546	for (item = src->inv; item; item = item->below)	2386	for (item = src->inv; item; item = item->below)
2547	insert_ob_in_ob (object_create_clone (item), dst);	2387	insert_ob_in_ob (object_create_clone (item), dst);
2548		2388
2549	return dst;	2389	return dst;
2550	}
2551
2552	/* GROS - Creates an object using a string representing its content. */
2553	/* Basically, we save the content of the string to a temp file, then call */
2554	/* load_object on it. I admit it is a highly inefficient way to make things, */
2555	/* but it was simple to make and allows reusing the load_object function. */
2556	/* Remember not to use load_object_str in a time-critical situation. */
2557	/* Also remember that multiparts objects are not supported for now. */
2558
2559	object *
2560	load_object_str (const char *obstr)
2561	{
2562	object *op;
2563	char filename[MAX_BUF];
2564
2565	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2566
2567	FILE *tempfile = fopen (filename, "w");
2568
2569	if (tempfile == NULL)
2570	{
2571	LOG (llevError, "Error - Unable to access load object temp file\n");
2572	return NULL;
2573	}
2574
2575	fprintf (tempfile, obstr);
2576	fclose (tempfile);
2577
2578	op = object::create ();
2579
2580	object_thawer thawer (filename);
2581
2582	if (thawer)
2583	load_object (thawer, op, 0);
2584
2585	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2586	CLEAR_FLAG (op, FLAG_REMOVED);
2587
2588	return op;
2589	}	2390	}
2590		2391
2591	/* This returns the first object in who's inventory that	2392	/* This returns the first object in who's inventory that
2592	* has the same type and subtype match.	2393	* has the same type and subtype match.
2593	* returns NULL if no match.	2394	* returns NULL if no match.
2594	*/	2395	*/
2595	object *	2396	object *
2596	find_obj_by_type_subtype (const object *who, int type, int subtype)	2397	find_obj_by_type_subtype (const object *who, int type, int subtype)
2597	{	2398	{
2598	object *tmp;
2599
2600	for (tmp = who->inv; tmp; tmp = tmp->below)	2399	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2601	if (tmp->type == type && tmp->subtype == subtype)	2400	if (tmp->type == type && tmp->subtype == subtype)
2602	return tmp;	2401	return tmp;
2603		2402
2604	return NULL;	2403	return 0;
2605	}	2404	}
2606		2405
2607	/* If ob has a field named key, return the link from the list,	2406	/* If ob has a field named key, return the link from the list,
2608	* otherwise return NULL.	2407	* otherwise return NULL.
2609	*	2408	*
…		…
2611	* do the desired thing.	2410	* do the desired thing.
2612	*/	2411	*/
2613	key_value *	2412	key_value *
2614	get_ob_key_link (const object *ob, const char *key)	2413	get_ob_key_link (const object *ob, const char *key)
2615	{	2414	{
2616	key_value *link;
2617
2618	for (link = ob->key_values; link != NULL; link = link->next)	2415	for (key_value *link = ob->key_values; link; link = link->next)
2619	if (link->key == key)	2416	if (link->key == key)
2620	return link;	2417	return link;
2621		2418
2622	return NULL;	2419	return 0;
2623	}	2420	}
2624		2421
2625	/*	2422	/*
2626	* Returns the value of op has an extra_field for key, or NULL.	2423	* Returns the value of op has an extra_field for key, or NULL.
2627	*	2424	*
…		…
2652	if (link->key == canonical_key)	2449	if (link->key == canonical_key)
2653	return link->value;	2450	return link->value;
2654		2451
2655	return 0;	2452	return 0;
2656	}	2453	}
2657
2658		2454
2659	/*	2455	/*
2660	* Updates the canonical_key in op to value.	2456	* Updates the canonical_key in op to value.
2661	*	2457	*
2662	* canonical_key is a shared string (value doesn't have to be).	2458	* canonical_key is a shared string (value doesn't have to be).
…		…
2667	* Returns TRUE on success.	2463	* Returns TRUE on success.
2668	*/	2464	*/
2669	int	2465	int
2670	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2466	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2671	{	2467	{
2672	key_value *
2673	field = NULL, *last = NULL;	2468	key_value *field = NULL, *last = NULL;
2674		2469
2675	for (field = op->key_values; field != NULL; field = field->next)	2470	for (field = op->key_values; field != NULL; field = field->next)
2676	{	2471	{
2677	if (field->key != canonical_key)	2472	if (field->key != canonical_key)
2678	{	2473	{
…		…
2687	/* Basically, if the archetype has this key set,	2482	/* Basically, if the archetype has this key set,
2688	* we need to store the null value so when we save	2483	* we need to store the null value so when we save
2689	* it, we save the empty value so that when we load,	2484	* it, we save the empty value so that when we load,
2690	* we get this value back again.	2485	* we get this value back again.
2691	*/	2486	*/
2692	if (get_ob_key_link (&op->arch->clone, canonical_key))	2487	if (get_ob_key_link (op->arch, canonical_key))
2693	field->value = 0;	2488	field->value = 0;
2694	else	2489	else
2695	{	2490	{
2696	if (last)	2491	if (last)
2697	last->next = field->next;	2492	last->next = field->next;
…		…
2706	/* IF we get here, key doesn't exist */	2501	/* IF we get here, key doesn't exist */
2707		2502
2708	/* No field, we'll have to add it. */	2503	/* No field, we'll have to add it. */
2709		2504
2710	if (!add_key)	2505	if (!add_key)
2711	{
2712	return FALSE;	2506	return FALSE;
2713	}	2507
2714	/* There isn't any good reason to store a null	2508	/* There isn't any good reason to store a null
2715	* value in the key/value list. If the archetype has	2509	* value in the key/value list. If the archetype has
2716	* this key, then we should also have it, so shouldn't	2510	* this key, then we should also have it, so shouldn't
2717	* be here. If user wants to store empty strings,	2511	* be here. If user wants to store empty strings,
2718	* should pass in ""	2512	* should pass in ""
…		…
2767	}	2561	}
2768	else	2562	else
2769	item = item->env;	2563	item = item->env;
2770	}	2564	}
2771		2565
		2566	const char *
		2567	object::flag_desc (char *desc, int len) const
		2568	{
		2569	char *p = desc;
		2570	bool first = true;
		2571
		2572	*p = 0;
		2573
		2574	for (int i = 0; i < NUM_FLAGS; i++)
		2575	{
		2576	if (len <= 10) // magic constant!
		2577	{
		2578	snprintf (p, len, ",...");
		2579	break;
		2580	}
		2581
		2582	if (flag [i])
		2583	{
		2584	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2585	len -= cnt;
		2586	p += cnt;
		2587	first = false;
		2588	}
		2589	}
		2590
		2591	return desc;
		2592	}
		2593
2772	// return a suitable string describing an objetc in enough detail to find it	2594	// return a suitable string describing an object in enough detail to find it
2773	const char *	2595	const char *
2774	object::debug_desc (char *info) const	2596	object::debug_desc (char *info) const
2775	{	2597	{
		2598	char flagdesc[512];
2776	char info2[256 * 3];	2599	char info2[256 * 4];
2777	char *p = info;	2600	char *p = info;
2778		2601
2779	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2602	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2780	count,	2603	count, uuid.seq,
2781	&name,	2604	&name,
2782	title ? " " : "",	2605	title ? "\",title:\"" : "",
2783	title ? (const char *)title : "");	2606	title ? (const char *)title : "",
		2607	flag_desc (flagdesc, 512), type);
2784		2608
2785	if (env)	2609	if (!this->flag[FLAG_REMOVED] && env)
2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2787		2611
2788	if (map)	2612	if (map)
2789	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2790		2614
2791	return info;	2615	return info;
2792	}	2616	}
2793		2617
2794	const char *	2618	const char *
2795	object::debug_desc () const	2619	object::debug_desc () const
2796	{	2620	{
2797	static char info[256 * 3];	2621	static char info[3][256 * 4];
		2622	static int info_idx;
		2623
2798	return debug_desc (info);	2624	return debug_desc (info [++info_idx % 3]);
2799	}	2625	}
2800		2626
		2627	struct region *
		2628	object::region () const
		2629	{
		2630	return map ? map->region (x, y)
		2631	: region::default_region ();
		2632	}
		2633
		2634	const materialtype_t *
		2635	object::dominant_material () const
		2636	{
		2637	if (materialtype_t *mt = name_to_material (materialname))
		2638	return mt;
		2639
		2640	return name_to_material (shstr_unknown);
		2641	}
		2642
		2643	void
		2644	object::open_container (object *new_container)
		2645	{
		2646	if (container == new_container)
		2647	return;
		2648
		2649	if (object *old_container = container)
		2650	{
		2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2652	return;
		2653
		2654	#if 0
		2655	// remove the "Close old_container" object.
		2656	if (object *closer = old_container->inv)
		2657	if (closer->type == CLOSE_CON)
		2658	closer->destroy ();
		2659	#endif
		2660
		2661	old_container->flag [FLAG_APPLIED] = 0;
		2662	container = 0;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, old_container);
		2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2666	play_sound (sound_find ("chest_close"));
		2667	}
		2668
		2669	if (new_container)
		2670	{
		2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2672	return;
		2673
		2674	// TODO: this does not seem to serve any purpose anymore?
		2675	#if 0
		2676	// insert the "Close Container" object.
		2677	if (archetype *closer = new_container->other_arch)
		2678	{
		2679	object *closer = arch_to_object (new_container->other_arch);
		2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2681	new_container->insert (closer);
		2682	}
		2683	#endif
		2684
		2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2686
		2687	new_container->flag [FLAG_APPLIED] = 1;
		2688	container = new_container;
		2689
		2690	esrv_update_item (UPD_FLAGS, this, new_container);
		2691	esrv_send_inventory (this, new_container);
		2692	play_sound (sound_find ("chest_open"));
		2693	}
		2694	}
		2695
		2696	object *
		2697	object::force_find (const shstr name)
		2698	{
		2699	/* cycle through his inventory to look for the MARK we want to
		2700	* place
		2701	*/
		2702	for (object *tmp = inv; tmp; tmp = tmp->below)
		2703	if (tmp->type == FORCE && tmp->slaying == name)
		2704	return splay (tmp);
		2705
		2706	return 0;
		2707	}
		2708
		2709	void
		2710	object::force_add (const shstr name, int duration)
		2711	{
		2712	if (object *force = force_find (name))
		2713	force->destroy ();
		2714
		2715	object *force = get_archetype (FORCE_NAME);
		2716
		2717	force->slaying = name;
		2718	force->stats.food = 1;
		2719	force->speed_left = -1.f;
		2720
		2721	force->set_speed (duration ? 1.f / duration : 0.f);
		2722	force->flag [FLAG_IS_USED_UP] = true;
		2723	force->flag [FLAG_APPLIED] = true;
		2724
		2725	insert (force);
		2726	}
		2727
		2728	void
		2729	object::play_sound (faceidx sound) const
		2730	{
		2731	if (!sound)
		2732	return;
		2733
		2734	if (flag [FLAG_REMOVED])
		2735	return;
		2736
		2737	if (env)
		2738	{
		2739	if (object *pl = in_player ())
		2740	pl->contr->play_sound (sound);
		2741	}
		2742	else
		2743	map->play_sound (sound, x, y);
		2744	}
		2745

Diff Legend

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