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.65 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.128 by root, Mon Feb 5 01:24:45 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
…		…
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
		36	#include <bitset>
		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:
…		…
354	op = op->env;	353	op = op->env;
355	return op;	354	return op;
356	}	355	}
357		356
358	/*	357	/*
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.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	359	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
377	*/	361	*/
378		362
…		…
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	save_object (freezer, op, 1);
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
…		…
408	}	392	}
409		393
410	/*	394	/*
411	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
412	*/	396	*/
413
414	object *	397	object *
415	find_object (tag_t i)	398	find_object (tag_t i)
416	{	399	{
417	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
418	if (op->count == i)	401	if (op->count == i)
419	return op;	402	return op;
420		403
421	return 0;	404	return 0;
422	}	405	}
423		406
424	/*	407	/*
425	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
428	*/	411	*/
429
430	object *	412	object *
431	find_object_name (const char *str)	413	find_object_name (const char *str)
432	{	414	{
433	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
434	object *op;	416	object *op;
435		417
436	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
437	if (op->name == str_)	419	if (op->name == str_)
438	break;	420	break;
439		421
440	return op;	422	return op;
441	}	423	}
…		…
484	}	466	}
485		467
486	op->key_values = 0;	468	op->key_values = 0;
487	}	469	}
488		470
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
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	/*	471	/*
532	* copy_to first frees everything allocated by the dst object,	472	* copy_to first frees everything allocated by the dst object,
533	* and then copies the contents of itself into the second	473	* and then copies the contents of itself into the second
534	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
541	{	481	{
542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
544		484
545	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
546	*(object_pod *)dst = *this;
547
548	if (self || cb)
549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
550		486
551	if (is_freed)	487	if (is_freed)
552	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
553		489
554	if (is_removed)	490	if (is_removed)
555	SET_FLAG (dst, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
556		492
557	if (speed < 0)	493	if (speed < 0)
558	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - rndm ();
559		495
560	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
561	if (key_values)	497	if (key_values)
562	{	498	{
563	key_value *tail = 0;	499	key_value *tail = 0;
…		…
585	tail = new_link;	521	tail = new_link;
586	}	522	}
587	}	523	}
588	}	524	}
589		525
590	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
591	}	527	}
592		528
593	object *	529	object *
594	object::clone ()	530	object::clone ()
595	{	531	{
…		…
601	/*	537	/*
602	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
603	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
604	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
605	*/	541	*/
606
607	void	542	void
608	update_turn_face (object *op)	543	update_turn_face (object *op)
609	{	544	{
610	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
611	return;	546	return;
		547
612	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
613	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
614	}	550	}
615		551
616	/*	552	/*
617	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
618	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
619	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
620	*/	556	*/
621	void	557	void
622	update_ob_speed (object *op)	558	object::set_speed (float speed)
623	{	559	{
624	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
625
626	/* No reason putting the archetypes objects on the speed list,
627	* since they never really need to be updated.
628	*/
629
630	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
631	{	561	{
632	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
633	#ifdef MANY_CORES
634	abort ();
635	#else
636	op->speed = 0;	563	speed = 0;
637	#endif
638	}
639
640	if (arch_init)
641	return;
642
643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
644	{	564	}
645	/* If already on active list, don't do anything */
646	if (op->active_next || op->active_prev || op == active_objects)
647	return;
648		565
649	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
650	* of the list. */
651	op->active_next = active_objects;
652		567
653	if (op->active_next != NULL)	568	if (has_active_speed ())
654	op->active_next->active_prev = op;	569	activate ();
655
656	active_objects = op;
657	}
658	else	570	else
659	{	571	deactivate ();
660	/* If not on the active list, nothing needs to be done */
661	if (!op->active_next && !op->active_prev && op != active_objects)
662	return;
663
664	if (op->active_prev == NULL)
665	{
666	active_objects = op->active_next;
667
668	if (op->active_next != NULL)
669	op->active_next->active_prev = NULL;
670	}
671	else
672	{
673	op->active_prev->active_next = op->active_next;
674
675	if (op->active_next)
676	op->active_next->active_prev = op->active_prev;
677	}
678
679	op->active_next = NULL;
680	op->active_prev = NULL;
681	}
682	}	572	}
683		573
684	/* This function removes object 'op' from the list of active
685	* objects.
686	* This should only be used for style maps or other such
687	* reference maps where you don't want an object that isn't
688	* in play chewing up cpu time getting processed.
689	* The reverse of this is to call update_ob_speed, which
690	* will do the right thing based on the speed of the object.
691	*/
692	void
693	remove_from_active_list (object *op)
694	{
695	/* If not on the active list, nothing needs to be done */
696	if (!op->active_next && !op->active_prev && op != active_objects)
697	return;
698
699	if (op->active_prev == NULL)
700	{
701	active_objects = op->active_next;
702	if (op->active_next != NULL)
703	op->active_next->active_prev = NULL;
704	}
705	else
706	{
707	op->active_prev->active_next = op->active_next;
708	if (op->active_next)
709	op->active_next->active_prev = op->active_prev;
710	}
711	op->active_next = NULL;
712	op->active_prev = NULL;
713	}
714
715	/*	574	/*
716	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
717	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
718	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
719	* invisible object, etc...)	578	* invisible object, etc...)
720	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
721	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
722	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
723	*	582	*
724	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
725	* For example, if the only thing that has changed is the face (due to
726	* an animation), we don't need to call update_position until that actually
727	* comes into view of a player. OTOH, many other things, like addition/removal
728	* of walls or living creatures may need us to update the flags now.
729	* current action are:	584	* current action are:
730	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
731	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
732	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
733	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
734	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
735	*/	590	*/
736
737	void	591	void
738	update_object (object *op, int action)	592	update_object (object *op, int action)
739	{	593	{
740	int update_now = 0, flags;
741	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
742		595
743	if (op == NULL)	596	if (op == NULL)
744	{	597	{
745	/* this should never happen */	598	/* this should never happen */
746	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
747	return;	600	return;
748	}	601	}
749		602
750	if (op->env != NULL)	603	if (op->env)
751	{	604	{
752	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
753	* to do in this case.	606	* to do in this case.
754	*/	607	*/
755	return;	608	return;
…		…
760	*/	613	*/
761	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
762	return;	615	return;
763		616
764	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
765	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
766	{	619	{
767	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
768	#ifdef MANY_CORES	621	#ifdef MANY_CORES
769	abort ();	622	abort ();
770	#endif	623	#endif
771	return;	624	return;
772	}	625	}
773		626
774	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
775	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
776	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
777	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
778	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
779	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
780		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
781	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
782	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
783	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	update_now = 1;
785
786	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
787	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
788		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
789	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
793	update_now = 1;
794
795	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
796	update_now = 1;
797
798	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
799	update_now = 1;
800
801	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
802	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
803
804	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
805	* to have move_allow right now.	644	* to have move_allow right now.
806	*/	645	*/
807	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
808	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
809		648	m.flags_ = 0;
810	if ((move_slow | op->move_slow) != move_slow)
811	update_now = 1;
812	}	649	}
813
814	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
815	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
816	* that is being removed.	652	* that is being removed.
817	*/	653	*/
818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
819	update_now = 1;	655	m.flags_ = 0;
820	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
821	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
822	else	658	else
823	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
824		660
825	if (update_now)
826	{
827	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
828	update_position (op->map, op->x, op->y);
829	}
830
831	if (op->more != NULL)	661	if (op->more)
832	update_object (op->more, action);	662	update_object (op->more, action);
833	}
834
835	object::vector object::mortals;
836	object::vector object::objects; // not yet used
837	object *object::first;
838
839	void object::free_mortals ()
840	{
841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
842	if ((*i)->refcnt)
843	++i; // further delay freeing
844	else
845	{
846	delete *i;
847	mortals.erase (i);
848	}
849	}	663	}
850		664
851	object::object ()	665	object::object ()
852	{	666	{
853	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
…		…
856	face = blank_face;	670	face = blank_face;
857	}	671	}
858		672
859	object::~object ()	673	object::~object ()
860	{	674	{
		675	unlink ();
		676
861	free_key_values (this);	677	free_key_values (this);
862	}	678	}
863		679
		680	static int object_count;
		681
864	void object::link ()	682	void object::link ()
865	{	683	{
866	count = ++ob_count;	684	assert (!index);//D
867	uuid = gen_uuid ();	685	uuid = gen_uuid ();
		686	count = ++object_count;
868		687
869	prev = 0;	688	refcnt_inc ();
870	next = object::first;	689	objects.insert (this);
871
872	if (object::first)
873	object::first->prev = this;
874
875	object::first = this;
876	}	690	}
877		691
878	void object::unlink ()	692	void object::unlink ()
879	{	693	{
880	if (this == object::first)	694	if (!index)
881	object::first = next;	695	return;
882		696
883	/* Remove this object from the list of used objects */	697	objects.erase (this);
884	if (prev) prev->next = next;	698	refcnt_dec ();
885	if (next) next->prev = prev;	699	}
886		700
887	prev = 0;	701	void
888	next = 0;	702	object::activate ()
		703	{
		704	/* If already on active list, don't do anything */
		705	if (active)
		706	return;
		707
		708	if (has_active_speed ())
		709	actives.insert (this);
		710	}
		711
		712	void
		713	object::activate_recursive ()
		714	{
		715	activate ();
		716
		717	for (object *op = inv; op; op = op->below)
		718	op->activate_recursive ();
		719	}
		720
		721	/* This function removes object 'op' from the list of active
		722	* objects.
		723	* This should only be used for style maps or other such
		724	* reference maps where you don't want an object that isn't
		725	* in play chewing up cpu time getting processed.
		726	* The reverse of this is to call update_ob_speed, which
		727	* will do the right thing based on the speed of the object.
		728	*/
		729	void
		730	object::deactivate ()
		731	{
		732	/* If not on the active list, nothing needs to be done */
		733	if (!active)
		734	return;
		735
		736	actives.erase (this);
		737	}
		738
		739	void
		740	object::deactivate_recursive ()
		741	{
		742	for (object *op = inv; op; op = op->below)
		743	op->deactivate_recursive ();
		744
		745	deactivate ();
		746	}
		747
		748	void
		749	object::set_flag_inv (int flag, int value)
		750	{
		751	for (object *op = inv; op; op = op->below)
		752	{
		753	op->flag [flag] = value;
		754	op->set_flag_inv (flag, value);
		755	}
		756	}
		757
		758	/*
		759	* Remove and free all objects in the inventory of the given object.
		760	* object.c ?
		761	*/
		762	void
		763	object::destroy_inv (bool drop_to_ground)
		764	{
		765	// need to check first, because the checks below might segfault
		766	// as we might be on an invalid mapspace and crossfire code
		767	// is too buggy to ensure that the inventory is empty.
		768	// corollary: if you create arrows etc. with stuff in tis inventory,
		769	// cf will crash below with off-map x and y
		770	if (!inv)
		771	return;
		772
		773	/* Only if the space blocks everything do we not process -
		774	* if some form of movement is allowed, let objects
		775	* drop on that space.
		776	*/
		777	if (!drop_to_ground
		778	|| !map
		779	|| map->in_memory != MAP_IN_MEMORY
		780	|| map->nodrop
		781	|| ms ().move_block == MOVE_ALL)
		782	{
		783	while (inv)
		784	{
		785	inv->destroy_inv (drop_to_ground);
		786	inv->destroy ();
		787	}
		788	}
		789	else
		790	{ /* Put objects in inventory onto this space */
		791	while (inv)
		792	{
		793	object *op = inv;
		794
		795	if (op->flag [FLAG_STARTEQUIP]
		796	|| op->flag [FLAG_NO_DROP]
		797	|| op->type == RUNE
		798	|| op->type == TRAP
		799	|| op->flag [FLAG_IS_A_TEMPLATE]
		800	|| op->flag [FLAG_DESTROY_ON_DEATH])
		801	op->destroy ();
		802	else
		803	map->insert (op, x, y);
		804	}
		805	}
889	}	806	}
890		807
891	object *object::create ()	808	object *object::create ()
892	{	809	{
893	object *op = new object;	810	object *op = new object;
894	op->link ();	811	op->link ();
895	return op;	812	return op;
896	}	813	}
897		814
898	/*	815	void
899	* free_object() frees everything allocated by an object, removes	816	object::do_destroy ()
900	* it from the list of used objects, and puts it on the list of
901	* free objects. The IS_FREED() flag is set in the object.
902	* The object must have been removed by remove_ob() first for
903	* this function to succeed.
904	*
905	* If destroy_inventory is set, free inventory as well. Else drop items in
906	* inventory to the ground.
907	*/
908	void object::destroy (bool destroy_inventory)
909	{	817	{
910	if (QUERY_FLAG (this, FLAG_FREED))	818	attachable::do_destroy ();
911	return;
912		819
913	if (QUERY_FLAG (this, FLAG_FRIENDLY))	820	if (flag [FLAG_IS_LINKED])
		821	remove_button_link (this);
		822
		823	if (flag [FLAG_FRIENDLY])
		824	{
914	remove_friendly_object (this);	825	remove_friendly_object (this);
915		826
916	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (type == GOLEM
		828	&& owner
		829	&& owner->type == PLAYER
		830	&& owner->contr->ranges[range_golem] == this)
		831	owner->contr->ranges[range_golem] = 0;
		832	}
		833
		834	if (!flag [FLAG_REMOVED])
917	remove ();	835	remove ();
918		836
919	SET_FLAG (this, FLAG_FREED);	837	destroy_inv (true);
920		838
921	if (more)	839	deactivate ();
922	{	840	unlink ();
923	more->destroy (destroy_inventory);
924	more = 0;
925	}
926		841
927	if (inv)	842	flag [FLAG_FREED] = 1;
928	{
929	/* Only if the space blocks everything do we not process -
930	* if some form of movement is allowed, let objects
931	* drop on that space.
932	*/
933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
934	{
935	object *op = inv;
936
937	while (op)
938	{
939	object *tmp = op->below;
940	op->destroy (destroy_inventory);
941	op = tmp;
942	}
943	}
944	else
945	{ /* Put objects in inventory onto this space */
946	object *op = inv;
947
948	while (op)
949	{
950	object *tmp = op->below;
951
952	op->remove ();
953
954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
956	op->destroy ();
957	else
958	{
959	op->x = x;
960	op->y = y;
961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
962	}
963
964	op = tmp;
965	}
966	}
967	}
968		843
969	// hack to ensure that freed objects still have a valid map	844	// hack to ensure that freed objects still have a valid map
970	{	845	{
971	static maptile *freed_map; // freed objects are moved here to avoid crashes	846	static maptile *freed_map; // freed objects are moved here to avoid crashes
972		847
…		…
976		851
977	freed_map->name = "/internal/freed_objects_map";	852	freed_map->name = "/internal/freed_objects_map";
978	freed_map->width = 3;	853	freed_map->width = 3;
979	freed_map->height = 3;	854	freed_map->height = 3;
980		855
981	freed_map->allocate ();	856	freed_map->alloc ();
		857	freed_map->in_memory = MAP_IN_MEMORY;
982	}	858	}
983		859
984	map = freed_map;	860	map = freed_map;
985	x = 1;	861	x = 1;
986	y = 1;	862	y = 1;
987	}	863	}
988		864
		865	head = 0;
		866
		867	if (more)
		868	{
		869	more->destroy ();
		870	more = 0;
		871	}
		872
989	// clear those pointers that likely might have circular references to us	873	// clear those pointers that likely might have circular references to us
990	owner = 0;	874	owner = 0;
991	enemy = 0;	875	enemy = 0;
992	attacked_by = 0;	876	attacked_by = 0;
		877	}
993		878
994	// only relevant for players(?), but make sure of it anyways	879	void
995	contr = 0;	880	object::destroy (bool destroy_inventory)
		881	{
		882	if (destroyed ())
		883	return;
996		884
997	/* Remove object from the active list */	885	if (destroy_inventory)
998	speed = 0;	886	destroy_inv (false);
999	update_ob_speed (this);
1000		887
1001	unlink ();	888	attachable::destroy ();
1002
1003	mortals.push_back (this);
1004	}	889	}
1005		890
1006	/*	891	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	892	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	893	* weight of an object (and what is carried by it's environment(s)).
…		…
1024	* This function removes the object op from the linked list of objects	909	* This function removes the object op from the linked list of objects
1025	* which it is currently tied to. When this function is done, the	910	* which it is currently tied to. When this function is done, the
1026	* object will have no environment. If the object previously had an	911	* object will have no environment. If the object previously had an
1027	* environment, the x and y coordinates will be updated to	912	* environment, the x and y coordinates will be updated to
1028	* the previous environment.	913	* the previous environment.
1029	* Beware: This function is called from the editor as well!
1030	*/	914	*/
1031	void	915	void
1032	object::remove ()	916	object::do_remove ()
1033	{	917	{
1034	object *tmp, *last = 0;	918	object *tmp, *last = 0;
1035	object *otmp;	919	object *otmp;
1036		920
1037	int check_walk_off;
1038
1039	if (QUERY_FLAG (this, FLAG_REMOVED))	921	if (QUERY_FLAG (this, FLAG_REMOVED))
1040	return;	922	return;
1041		923
1042	SET_FLAG (this, FLAG_REMOVED);	924	SET_FLAG (this, FLAG_REMOVED);
		925	INVOKE_OBJECT (REMOVE, this);
1043		926
1044	if (more)	927	if (more)
1045	more->remove ();	928	more->remove ();
1046		929
1047	/*	930	/*
…		…
1057		940
1058	/* NO_FIX_PLAYER is set when a great many changes are being	941	/* NO_FIX_PLAYER is set when a great many changes are being
1059	* made to players inventory. If set, avoiding the call	942	* made to players inventory. If set, avoiding the call
1060	* to save cpu time.	943	* to save cpu time.
1061	*/	944	*/
1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	945	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	fix_player (otmp);	946	otmp->update_stats ();
1064		947
1065	if (above != NULL)	948	if (above)
1066	above->below = below;	949	above->below = below;
1067	else	950	else
1068	env->inv = below;	951	env->inv = below;
1069		952
1070	if (below != NULL)	953	if (below)
1071	below->above = above;	954	below->above = above;
1072		955
1073	/* we set up values so that it could be inserted into	956	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	957	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	958	* to the caller to decide what we want to do.
…		…
1079	above = 0, below = 0;	962	above = 0, below = 0;
1080	env = 0;	963	env = 0;
1081	}	964	}
1082	else if (map)	965	else if (map)
1083	{	966	{
1084	/* Re did the following section of code - it looks like it had	967	if (type == PLAYER)
1085	* lots of logic for things we no longer care about
1086	*/	968	{
		969	--map->players;
		970	map->touch ();
		971	}
		972
		973	map->dirty = true;
		974	mapspace &ms = this->ms ();
1087		975
1088	/* link the object above us */	976	/* link the object above us */
1089	if (above)	977	if (above)
1090	above->below = below;	978	above->below = below;
1091	else	979	else
1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	980	ms.top = below; /* we were top, set new top */
1093		981
1094	/* Relink the object below us, if there is one */	982	/* Relink the object below us, if there is one */
1095	if (below)	983	if (below)
1096	below->above = above;	984	below->above = above;
1097	else	985	else
…		…
1099	/* Nothing below, which means we need to relink map object for this space	987	/* Nothing below, which means we need to relink map object for this space
1100	* use translated coordinates in case some oddness with map tiling is	988	* use translated coordinates in case some oddness with map tiling is
1101	* evident	989	* evident
1102	*/	990	*/
1103	if (GET_MAP_OB (map, x, y) != this)	991	if (GET_MAP_OB (map, x, y) != this)
1104	{
1105	char *dump = dump_object (this);
1106	LOG (llevError,
1107	"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);	992	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 ());
1108	free (dump);
1109	dump = dump_object (GET_MAP_OB (map, x, y));
1110	LOG (llevError, "%s\n", dump);
1111	free (dump);
1112	}
1113		993
1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */	994	ms.bot = above; /* goes on above it. */
1115	}	995	}
1116		996
1117	above = 0;	997	above = 0;
1118	below = 0;	998	below = 0;
1119		999
1120	if (map->in_memory == MAP_SAVING)	1000	if (map->in_memory == MAP_SAVING)
1121	return;	1001	return;
1122		1002
1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1003	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1004
1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1005	for (tmp = ms.bot; tmp; tmp = tmp->above)
1126	{	1006	{
1127	/* No point updating the players look faces if he is the object	1007	/* No point updating the players look faces if he is the object
1128	* being removed.	1008	* being removed.
1129	*/	1009	*/
1130		1010
…		…
1134	* removed (most likely destroyed), update the player view	1014	* removed (most likely destroyed), update the player view
1135	* appropriately.	1015	* appropriately.
1136	*/	1016	*/
1137	if (tmp->container == this)	1017	if (tmp->container == this)
1138	{	1018	{
1139	CLEAR_FLAG (this, FLAG_APPLIED);	1019	flag [FLAG_APPLIED] = 0;
1140	tmp->container = 0;	1020	tmp->container = 0;
1141	}	1021	}
1142		1022
1143	tmp->contr->socket.update_look = 1;	1023	if (tmp->contr->ns)
		1024	tmp->contr->ns->floorbox_update ();
1144	}	1025	}
1145		1026
1146	/* See if player moving off should effect something */	1027	/* See if object moving off should effect something */
1147	if (check_walk_off	1028	if (check_walk_off
1148	&& ((move_type & tmp->move_off)	1029	&& ((move_type & tmp->move_off)
1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1030	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1150	{	1031	{
1151	move_apply (tmp, this, 0);	1032	move_apply (tmp, this, 0);
…		…
1153	if (destroyed ())	1034	if (destroyed ())
1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1035	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1155	}	1036	}
1156		1037
1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1038	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1158		1039	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1159	if (tmp->above == tmp)	1040	if (tmp->above == tmp)
1160	tmp->above = 0;	1041	tmp->above = 0;
1161		1042
1162	last = tmp;	1043	last = tmp;
1163	}	1044	}
1164		1045
1165	/* last == NULL of there are no objects on this space */	1046	/* last == NULL if there are no objects on this space */
		1047	//TODO: this makes little sense, why only update the topmost object?
1166	if (!last)	1048	if (!last)
1167	{	1049	map->at (x, y).flags_ = 0;
1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1170	* those out anyways, and if there are any flags set right now, they won't
1171	* be correct anyways.
1172	*/
1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1174	update_position (map, x, y);
1175	}
1176	else	1050	else
1177	update_object (last, UP_OBJ_REMOVE);	1051	update_object (last, UP_OBJ_REMOVE);
1178		1052
1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1053	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1180	update_all_los (map, x, y);	1054	update_all_los (map, x, y);
1181	}	1055	}
1182	}	1056	}
1183		1057
1184	/*	1058	/*
…		…
1193	merge_ob (object *op, object *top)	1067	merge_ob (object *op, object *top)
1194	{	1068	{
1195	if (!op->nrof)	1069	if (!op->nrof)
1196	return 0;	1070	return 0;
1197		1071
1198	if (top == NULL)	1072	if (top)
1199	for (top = op; top != NULL && top->above != NULL; top = top->above);	1073	for (top = op; top && top->above; top = top->above)
		1074	;
1200		1075
1201	for (; top != NULL; top = top->below)	1076	for (; top; top = top->below)
1202	{	1077	{
1203	if (top == op)	1078	if (top == op)
1204	continue;	1079	continue;
1205	if (CAN_MERGE (op, top))	1080
		1081	if (object::can_merge (op, top))
1206	{	1082	{
1207	top->nrof += op->nrof;	1083	top->nrof += op->nrof;
1208		1084
1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1085	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1210	op->weight = 0; /* Don't want any adjustements now */	1086	op->weight = 0; /* Don't want any adjustements now */
…		…
1215		1091
1216	return 0;	1092	return 0;
1217	}	1093	}
1218		1094
1219	/*	1095	/*
1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1096	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1221	* job preparing multi-part monsters	1097	* job preparing multi-part monsters.
1222	*/	1098	*/
1223	object *	1099	object *
1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1100	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225	{	1101	{
1226	object *tmp;
1227
1228	if (op->head)
1229	op = op->head;
1230
1231	for (tmp = op; tmp; tmp = tmp->more)	1102	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232	{	1103	{
1233	tmp->x = x + tmp->arch->clone.x;	1104	tmp->x = x + tmp->arch->clone.x;
1234	tmp->y = y + tmp->arch->clone.y;	1105	tmp->y = y + tmp->arch->clone.y;
1235	}	1106	}
1236		1107
…		…
1255	* Return value:	1126	* Return value:
1256	* new object if 'op' was merged with other object	1127	* new object if 'op' was merged with other object
1257	* NULL if 'op' was destroyed	1128	* NULL if 'op' was destroyed
1258	* just 'op' otherwise	1129	* just 'op' otherwise
1259	*/	1130	*/
1260
1261	object *	1131	object *
1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1132	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263	{	1133	{
1264	object *tmp, *top, *floor = NULL;	1134	object *tmp, *top, *floor = NULL;
1265	sint16 x, y;
1266		1135
1267	if (QUERY_FLAG (op, FLAG_FREED))	1136	if (QUERY_FLAG (op, FLAG_FREED))
1268	{	1137	{
1269	LOG (llevError, "Trying to insert freed object!\n");	1138	LOG (llevError, "Trying to insert freed object!\n");
1270	return NULL;	1139	return NULL;
1271	}	1140	}
1272		1141
1273	if (m == NULL)	1142	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1143	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1144
		1145	op->remove ();
		1146
		1147	if (!m)
1274	{	1148	{
1275	char *dump = dump_object (op);	1149	char *dump = dump_object (op);
1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1150	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277	free (dump);	1151	free (dump);
1278	return op;	1152	return op;
…		…
1291	#endif	1165	#endif
1292	free (dump);	1166	free (dump);
1293	return op;	1167	return op;
1294	}	1168	}
1295		1169
1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1297	{
1298	char *dump = dump_object (op);
1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300	free (dump);
1301	return op;
1302	}
1303
1304	if (op->more != NULL)
1305	{
1306	/* The part may be on a different map. */
1307
1308	object *more = op->more;	1170	if (object *more = op->more)
1309		1171	{
1310	/* We really need the caller to normalize coordinates - if
1311	* we set the map, that doesn't work if the location is within
1312	* a map and this is straddling an edge. So only if coordinate
1313	* is clear wrong do we normalize it.
1314	*/
1315	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1316	more->map = get_map_from_coord (m, &more->x, &more->y);
1317	else if (!more->map)
1318	{
1319	/* For backwards compatibility - when not dealing with tiled maps,
1320	* more->map should always point to the parent.
1321	*/
1322	more->map = m;
1323	}
1324
1325	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1172	if (!insert_ob_in_map (more, m, originator, flag))
1326	{	1173	{
1327	if (!op->head)	1174	if (!op->head)
1328	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1175	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329		1176
1330	return NULL;	1177	return 0;
1331	}	1178	}
1332	}	1179	}
1333		1180
1334	CLEAR_FLAG (op, FLAG_REMOVED);	1181	CLEAR_FLAG (op, FLAG_REMOVED);
1335		1182
1336	/* Ideally, the caller figures this out. However, it complicates a lot	1183	/* Ideally, the caller figures this out. However, it complicates a lot
1337	* of areas of callers (eg, anything that uses find_free_spot would now	1184	* of areas of callers (eg, anything that uses find_free_spot would now
1338	* need extra work	1185	* need extra work
1339	*/	1186	*/
1340	op->map = get_map_from_coord (m, &op->x, &op->y);	1187	if (!xy_normalise (m, op->x, op->y))
1341	x = op->x;	1188	return 0;
1342	y = op->y;	1189
		1190	op->map = m;
		1191	mapspace &ms = op->ms ();
1343		1192
1344	/* this has to be done after we translate the coordinates.	1193	/* this has to be done after we translate the coordinates.
1345	*/	1194	*/
1346	if (op->nrof && !(flag & INS_NO_MERGE))	1195	if (op->nrof && !(flag & INS_NO_MERGE))
1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1196	for (tmp = ms.bot; tmp; tmp = tmp->above)
1348	if (CAN_MERGE (op, tmp))	1197	if (object::can_merge (op, tmp))
1349	{	1198	{
1350	op->nrof += tmp->nrof;	1199	op->nrof += tmp->nrof;
1351	tmp->destroy ();	1200	tmp->destroy ();
1352	}	1201	}
1353		1202
…		…
1369	op->below = originator->below;	1218	op->below = originator->below;
1370		1219
1371	if (op->below)	1220	if (op->below)
1372	op->below->above = op;	1221	op->below->above = op;
1373	else	1222	else
1374	SET_MAP_OB (op->map, op->x, op->y, op);	1223	ms.bot = op;
1375		1224
1376	/* since *below* originator, no need to update top */	1225	/* since *below* originator, no need to update top */
1377	originator->below = op;	1226	originator->below = op;
1378	}	1227	}
1379	else	1228	else
1380	{	1229	{
		1230	top = ms.bot;
		1231
1381	/* If there are other objects, then */	1232	/* If there are other objects, then */
1382	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1233	if ((!(flag & INS_MAP_LOAD)) && top)
1383	{	1234	{
1384	object *last = NULL;	1235	object *last = 0;
1385		1236
1386	/*	1237	/*
1387	* If there are multiple objects on this space, we do some trickier handling.	1238	* If there are multiple objects on this space, we do some trickier handling.
1388	* We've already dealt with merging if appropriate.	1239	* We've already dealt with merging if appropriate.
1389	* Generally, we want to put the new object on top. But if	1240	* Generally, we want to put the new object on top. But if
…		…
1393	* once we get to them. This reduces the need to traverse over all of	1244	* once we get to them. This reduces the need to traverse over all of
1394	* them when adding another one - this saves quite a bit of cpu time	1245	* them when adding another one - this saves quite a bit of cpu time
1395	* when lots of spells are cast in one area. Currently, it is presumed	1246	* when lots of spells are cast in one area. Currently, it is presumed
1396	* that flying non pickable objects are spell objects.	1247	* that flying non pickable objects are spell objects.
1397	*/	1248	*/
1398		1249	for (top = ms.bot; top; top = top->above)
1399	while (top != NULL)
1400	{	1250	{
1401	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1251	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1402	floor = top;	1252	floor = top;
1403		1253
1404	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1254	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1407	top = top->below;	1257	top = top->below;
1408	break;	1258	break;
1409	}	1259	}
1410		1260
1411	last = top;	1261	last = top;
1412	top = top->above;
1413	}	1262	}
1414		1263
1415	/* Don't want top to be NULL, so set it to the last valid object */	1264	/* Don't want top to be NULL, so set it to the last valid object */
1416	top = last;	1265	top = last;
1417		1266
…		…
1424	* Unless those objects are exits, type 66	1273	* Unless those objects are exits, type 66
1425	* If INS_ON_TOP is used, don't do this processing	1274	* If INS_ON_TOP is used, don't do this processing
1426	* Need to find the object that in fact blocks view, otherwise	1275	* Need to find the object that in fact blocks view, otherwise
1427	* stacking is a bit odd.	1276	* stacking is a bit odd.
1428	*/	1277	*/
1429	if (!(flag & INS_ON_TOP) &&	1278	if (!(flag & INS_ON_TOP)
1430	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1279	&& ms.flags () & P_BLOCKSVIEW
		1280	&& (op->face && !op->face->visibility))
1431	{	1281	{
1432	for (last = top; last != floor; last = last->below)	1282	for (last = top; last != floor; last = last->below)
1433	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1283	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434	break;	1284	break;
		1285
1435	/* Check to see if we found the object that blocks view,	1286	/* Check to see if we found the object that blocks view,
1436	* and make sure we have a below pointer for it so that	1287	* and make sure we have a below pointer for it so that
1437	* we can get inserted below this one, which requires we	1288	* we can get inserted below this one, which requires we
1438	* set top to the object below us.	1289	* set top to the object below us.
1439	*/	1290	*/
…		…
1441	top = last->below;	1292	top = last->below;
1442	}	1293	}
1443	} /* If objects on this space */	1294	} /* If objects on this space */
1444		1295
1445	if (flag & INS_MAP_LOAD)	1296	if (flag & INS_MAP_LOAD)
1446	top = GET_MAP_TOP (op->map, op->x, op->y);	1297	top = ms.top;
1447		1298
1448	if (flag & INS_ABOVE_FLOOR_ONLY)	1299	if (flag & INS_ABOVE_FLOOR_ONLY)
1449	top = floor;	1300	top = floor;
1450		1301
1451	/* Top is the object that our object (op) is going to get inserted above.	1302	/* Top is the object that our object (op) is going to get inserted above.
1452	*/	1303	*/
1453		1304
1454	/* First object on this space */	1305	/* First object on this space */
1455	if (!top)	1306	if (!top)
1456	{	1307	{
1457	op->above = GET_MAP_OB (op->map, op->x, op->y);	1308	op->above = ms.bot;
1458		1309
1459	if (op->above)	1310	if (op->above)
1460	op->above->below = op;	1311	op->above->below = op;
1461		1312
1462	op->below = NULL;	1313	op->below = 0;
1463	SET_MAP_OB (op->map, op->x, op->y, op);	1314	ms.bot = op;
1464	}	1315	}
1465	else	1316	else
1466	{ /* get inserted into the stack above top */	1317	{ /* get inserted into the stack above top */
1467	op->above = top->above;	1318	op->above = top->above;
1468		1319
…		…
1471		1322
1472	op->below = top;	1323	op->below = top;
1473	top->above = op;	1324	top->above = op;
1474	}	1325	}
1475		1326
1476	if (op->above == NULL)	1327	if (!op->above)
1477	SET_MAP_TOP (op->map, op->x, op->y, op);	1328	ms.top = op;
1478	} /* else not INS_BELOW_ORIGINATOR */	1329	} /* else not INS_BELOW_ORIGINATOR */
1479		1330
1480	if (op->type == PLAYER)	1331	if (op->type == PLAYER)
		1332	{
1481	op->contr->do_los = 1;	1333	op->contr->do_los = 1;
		1334	++op->map->players;
		1335	op->map->touch ();
		1336	}
		1337
		1338	op->map->dirty = true;
1482		1339
1483	/* If we have a floor, we know the player, if any, will be above	1340	/* If we have a floor, we know the player, if any, will be above
1484	* it, so save a few ticks and start from there.	1341	* it, so save a few ticks and start from there.
1485	*/	1342	*/
1486	if (!(flag & INS_MAP_LOAD))	1343	if (!(flag & INS_MAP_LOAD))
1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1344	if (object *pl = ms.player ())
1488	if (tmp->type == PLAYER)	1345	if (pl->contr->ns)
1489	tmp->contr->socket.update_look = 1;	1346	pl->contr->ns->floorbox_update ();
1490		1347
1491	/* If this object glows, it may affect lighting conditions that are	1348	/* If this object glows, it may affect lighting conditions that are
1492	* visible to others on this map. But update_all_los is really	1349	* visible to others on this map. But update_all_los is really
1493	* an inefficient way to do this, as it means los for all players	1350	* an inefficient way to do this, as it means los for all players
1494	* on the map will get recalculated. The players could very well	1351	* on the map will get recalculated. The players could very well
1495	* be far away from this change and not affected in any way -	1352	* be far away from this change and not affected in any way -
1496	* this should get redone to only look for players within range,	1353	* this should get redone to only look for players within range,
1497	* or just updating the P_NEED_UPDATE for spaces within this area	1354	* or just updating the P_UPTODATE for spaces within this area
1498	* of effect may be sufficient.	1355	* of effect may be sufficient.
1499	*/	1356	*/
1500	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1357	if (op->map->darkness && (op->glow_radius != 0))
1501	update_all_los (op->map, op->x, op->y);	1358	update_all_los (op->map, op->x, op->y);
1502		1359
1503	/* updates flags (blocked, alive, no magic, etc) for this map space */	1360	/* updates flags (blocked, alive, no magic, etc) for this map space */
1504	update_object (op, UP_OBJ_INSERT);	1361	update_object (op, UP_OBJ_INSERT);
1505		1362
		1363	INVOKE_OBJECT (INSERT, op);
		1364
1506	/* Don't know if moving this to the end will break anything. However,	1365	/* Don't know if moving this to the end will break anything. However,
1507	* we want to have update_look set above before calling this.	1366	* we want to have floorbox_update called before calling this.
1508	*	1367	*
1509	* check_move_on() must be after this because code called from	1368	* check_move_on() must be after this because code called from
1510	* check_move_on() depends on correct map flags (so functions like	1369	* check_move_on() depends on correct map flags (so functions like
1511	* blocked() and wall() work properly), and these flags are updated by	1370	* blocked() and wall() work properly), and these flags are updated by
1512	* update_object().	1371	* update_object().
…		…
1514		1373
1515	/* if this is not the head or flag has been passed, don't check walk on status */	1374	/* if this is not the head or flag has been passed, don't check walk on status */
1516	if (!(flag & INS_NO_WALK_ON) && !op->head)	1375	if (!(flag & INS_NO_WALK_ON) && !op->head)
1517	{	1376	{
1518	if (check_move_on (op, originator))	1377	if (check_move_on (op, originator))
1519	return NULL;	1378	return 0;
1520		1379
1521	/* If we are a multi part object, lets work our way through the check	1380	/* If we are a multi part object, lets work our way through the check
1522	* walk on's.	1381	* walk on's.
1523	*/	1382	*/
1524	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1383	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1525	if (check_move_on (tmp, originator))	1384	if (check_move_on (tmp, originator))
1526	return NULL;	1385	return 0;
1527	}	1386	}
1528		1387
1529	return op;	1388	return op;
1530	}	1389	}
1531		1390
1532	/* this function inserts an object in the map, but if it	1391	/* this function inserts an object in the map, but if it
1533	* finds an object of its own type, it'll remove that one first.	1392	* finds an object of its own type, it'll remove that one first.
1534	* op is the object to insert it under: supplies x and the map.	1393	* op is the object to insert it under: supplies x and the map.
1535	*/	1394	*/
1536	void	1395	void
1537	replace_insert_ob_in_map (const char *arch_string, object *op)	1396	replace_insert_ob_in_map (const char *arch_string, object *op)
1538	{	1397	{
1539	object *	1398	object *tmp, *tmp1;
1540	tmp;
1541	object *
1542	tmp1;
1543		1399
1544	/* first search for itself and remove any old instances */	1400	/* first search for itself and remove any old instances */
1545		1401
1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1402	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1403	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548	tmp->destroy ();	1404	tmp->destroy ();
1549		1405
1550	tmp1 = arch_to_object (archetype::find (arch_string));	1406	tmp1 = arch_to_object (archetype::find (arch_string));
1551		1407
1552	tmp1->x = op->x;	1408	tmp1->x = op->x;
1553	tmp1->y = op->y;	1409	tmp1->y = op->y;
1554	insert_ob_in_map (tmp1, op->map, op, 0);	1410	insert_ob_in_map (tmp1, op->map, op, 0);
		1411	}
		1412
		1413	object *
		1414	object::insert_at (object *where, object *originator, int flags)
		1415	{
		1416	where->map->insert (this, where->x, where->y, originator, flags);
1555	}	1417	}
1556		1418
1557	/*	1419	/*
1558	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1420	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1559	* is returned contains nr objects, and the remaining parts contains	1421	* is returned contains nr objects, and the remaining parts contains
1560	* the rest (or is removed and freed if that number is 0).	1422	* the rest (or is removed and freed if that number is 0).
1561	* On failure, NULL is returned, and the reason put into the	1423	* On failure, NULL is returned, and the reason put into the
1562	* global static errmsg array.	1424	* global static errmsg array.
1563	*/	1425	*/
1564
1565	object *	1426	object *
1566	get_split_ob (object *orig_ob, uint32 nr)	1427	get_split_ob (object *orig_ob, uint32 nr)
1567	{	1428	{
1568	object *newob;	1429	object *newob;
1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1430	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1605		1466
1606	object *	1467	object *
1607	decrease_ob_nr (object *op, uint32 i)	1468	decrease_ob_nr (object *op, uint32 i)
1608	{	1469	{
1609	object *tmp;	1470	object *tmp;
1610	player *pl;
1611		1471
1612	if (i == 0) /* objects with op->nrof require this check */	1472	if (i == 0) /* objects with op->nrof require this check */
1613	return op;	1473	return op;
1614		1474
1615	if (i > op->nrof)	1475	if (i > op->nrof)
1616	i = op->nrof;	1476	i = op->nrof;
1617		1477
1618	if (QUERY_FLAG (op, FLAG_REMOVED))	1478	if (QUERY_FLAG (op, FLAG_REMOVED))
1619	op->nrof -= i;	1479	op->nrof -= i;
1620	else if (op->env != NULL)	1480	else if (op->env)
1621	{	1481	{
1622	/* is this object in the players inventory, or sub container	1482	/* is this object in the players inventory, or sub container
1623	* therein?	1483	* therein?
1624	*/	1484	*/
1625	tmp = is_player_inv (op->env);	1485	tmp = op->in_player ();
1626	/* nope. Is this a container the player has opened?	1486	/* nope. Is this a container the player has opened?
1627	* If so, set tmp to that player.	1487	* If so, set tmp to that player.
1628	* IMO, searching through all the players will mostly	1488	* IMO, searching through all the players will mostly
1629	* likely be quicker than following op->env to the map,	1489	* likely be quicker than following op->env to the map,
1630	* and then searching the map for a player.	1490	* and then searching the map for a player.
1631	*/	1491	*/
1632	if (!tmp)	1492	if (!tmp)
1633	{	1493	for_all_players (pl)
1634	for (pl = first_player; pl; pl = pl->next)
1635	if (pl->ob->container == op->env)	1494	if (pl->ob->container == op->env)
		1495	{
		1496	tmp = pl->ob;
1636	break;	1497	break;
1637	if (pl)
1638	tmp = pl->ob;
1639	else
1640	tmp = NULL;
1641	}	1498	}
1642		1499
1643	if (i < op->nrof)	1500	if (i < op->nrof)
1644	{	1501	{
1645	sub_weight (op->env, op->weight * i);	1502	sub_weight (op->env, op->weight * i);
1646	op->nrof -= i;	1503	op->nrof -= i;
1647	if (tmp)	1504	if (tmp)
1648	{
1649	esrv_send_item (tmp, op);	1505	esrv_send_item (tmp, op);
1650	}
1651	}	1506	}
1652	else	1507	else
1653	{	1508	{
1654	op->remove ();	1509	op->remove ();
1655	op->nrof = 0;	1510	op->nrof = 0;
1656	if (tmp)	1511	if (tmp)
1657	{
1658	esrv_del_item (tmp->contr, op->count);	1512	esrv_del_item (tmp->contr, op->count);
1659	}
1660	}	1513	}
1661	}	1514	}
1662	else	1515	else
1663	{	1516	{
1664	object *above = op->above;	1517	object *above = op->above;
…		…
1670	op->remove ();	1523	op->remove ();
1671	op->nrof = 0;	1524	op->nrof = 0;
1672	}	1525	}
1673		1526
1674	/* Since we just removed op, op->above is null */	1527	/* Since we just removed op, op->above is null */
1675	for (tmp = above; tmp != NULL; tmp = tmp->above)	1528	for (tmp = above; tmp; tmp = tmp->above)
1676	if (tmp->type == PLAYER)	1529	if (tmp->type == PLAYER)
1677	{	1530	{
1678	if (op->nrof)	1531	if (op->nrof)
1679	esrv_send_item (tmp, op);	1532	esrv_send_item (tmp, op);
1680	else	1533	else
…		…
1685	if (op->nrof)	1538	if (op->nrof)
1686	return op;	1539	return op;
1687	else	1540	else
1688	{	1541	{
1689	op->destroy ();	1542	op->destroy ();
1690	return NULL;	1543	return 0;
1691	}	1544	}
1692	}	1545	}
1693		1546
1694	/*	1547	/*
1695	* add_weight(object, weight) adds the specified weight to an object,	1548	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1608	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1756	CLEAR_FLAG (op, FLAG_REMOVED);	1609	CLEAR_FLAG (op, FLAG_REMOVED);
1757	if (op->nrof)	1610	if (op->nrof)
1758	{	1611	{
1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1612	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1760	if (CAN_MERGE (tmp, op))	1613	if (object::can_merge (tmp, op))
1761	{	1614	{
1762	/* return the original object and remove inserted object	1615	/* return the original object and remove inserted object
1763	(client needs the original object) */	1616	(client needs the original object) */
1764	tmp->nrof += op->nrof;	1617	tmp->nrof += op->nrof;
1765	/* Weight handling gets pretty funky. Since we are adding to	1618	/* Weight handling gets pretty funky. Since we are adding to
…		…
1783	add_weight (this, op->weight * op->nrof);	1636	add_weight (this, op->weight * op->nrof);
1784	}	1637	}
1785	else	1638	else
1786	add_weight (this, (op->weight + op->carrying));	1639	add_weight (this, (op->weight + op->carrying));
1787		1640
1788	otmp = is_player_inv (this);	1641	otmp = this->in_player ();
1789	if (otmp && otmp->contr)	1642	if (otmp && otmp->contr)
1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1643	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791	fix_player (otmp);	1644	otmp->update_stats ();
1792		1645
1793	op->map = NULL;	1646	op->map = 0;
1794	op->env = this;	1647	op->env = this;
1795	op->above = NULL;	1648	op->above = 0;
1796	op->below = NULL;	1649	op->below = 0;
1797	op->x = 0, op->y = 0;	1650	op->x = 0, op->y = 0;
1798		1651
1799	/* reset the light list and los of the players on the map */	1652	/* reset the light list and los of the players on the map */
1800	if ((op->glow_radius != 0) && map)	1653	if ((op->glow_radius != 0) && map)
1801	{	1654	{
1802	#ifdef DEBUG_LIGHTS	1655	#ifdef DEBUG_LIGHTS
1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1656	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804	#endif /* DEBUG_LIGHTS */	1657	#endif /* DEBUG_LIGHTS */
1805	if (MAP_DARKNESS (map))	1658	if (map->darkness)
1806	update_all_los (map, x, y);	1659	update_all_los (map, x, y);
1807	}	1660	}
1808		1661
1809	/* Client has no idea of ordering so lets not bother ordering it here.	1662	/* Client has no idea of ordering so lets not bother ordering it here.
1810	* It sure simplifies this function...	1663	* It sure simplifies this function...
…		…
1815	{	1668	{
1816	op->below = inv;	1669	op->below = inv;
1817	op->below->above = op;	1670	op->below->above = op;
1818	inv = op;	1671	inv = op;
1819	}	1672	}
		1673
		1674	INVOKE_OBJECT (INSERT, this);
1820		1675
1821	return op;	1676	return op;
1822	}	1677	}
1823		1678
1824	/*	1679	/*
…		…
1839	*	1694	*
1840	* MSW 2001-07-08: Check all objects on space, not just those below	1695	* MSW 2001-07-08: Check all objects on space, not just those below
1841	* object being inserted. insert_ob_in_map may not put new objects	1696	* object being inserted. insert_ob_in_map may not put new objects
1842	* on top.	1697	* on top.
1843	*/	1698	*/
1844
1845	int	1699	int
1846	check_move_on (object *op, object *originator)	1700	check_move_on (object *op, object *originator)
1847	{	1701	{
1848	object *tmp;	1702	object *tmp;
1849	maptile *m = op->map;	1703	maptile *m = op->map;
…		…
1876		1730
1877	/* The objects have to be checked from top to bottom.	1731	/* The objects have to be checked from top to bottom.
1878	* Hence, we first go to the top:	1732	* Hence, we first go to the top:
1879	*/	1733	*/
1880		1734
1881	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1735	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1882	{	1736	{
1883	/* Trim the search when we find the first other spell effect	1737	/* Trim the search when we find the first other spell effect
1884	* this helps performance so that if a space has 50 spell objects,	1738	* this helps performance so that if a space has 50 spell objects,
1885	* we don't need to check all of them.	1739	* we don't need to check all of them.
1886	*/	1740	*/
…		…
1904	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1905	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1906	{	1760	{
1907		1761
1908	float	1762	float
1909	diff = tmp->move_slow_penalty * FABS (op->speed);	1763	diff = tmp->move_slow_penalty * fabs (op->speed);
1910		1764
1911	if (op->type == PLAYER)	1765	if (op->type == PLAYER)
1912	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1913	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1914	diff /= 4.0;	1768	diff /= 4.0;
…		…
1941	/*	1795	/*
1942	* present_arch(arch, map, x, y) searches for any objects with	1796	* present_arch(arch, map, x, y) searches for any objects with
1943	* a matching archetype at the given map and coordinates.	1797	* a matching archetype at the given map and coordinates.
1944	* The first matching object is returned, or NULL if none.	1798	* The first matching object is returned, or NULL if none.
1945	*/	1799	*/
1946
1947	object *	1800	object *
1948	present_arch (const archetype *at, maptile *m, int x, int y)	1801	present_arch (const archetype *at, maptile *m, int x, int y)
1949	{	1802	{
1950	object *
1951	tmp;
1952
1953	if (m == NULL || out_of_map (m, x, y))	1803	if (!m || out_of_map (m, x, y))
1954	{	1804	{
1955	LOG (llevError, "Present_arch called outside map.\n");	1805	LOG (llevError, "Present_arch called outside map.\n");
1956	return NULL;	1806	return NULL;
1957	}	1807	}
1958	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1808
		1809	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1959	if (tmp->arch == at)	1810	if (tmp->arch == at)
1960	return tmp;	1811	return tmp;
		1812
1961	return NULL;	1813	return NULL;
1962	}	1814	}
1963		1815
1964	/*	1816	/*
1965	* present(type, map, x, y) searches for any objects with	1817	* present(type, map, x, y) searches for any objects with
1966	* a matching type variable at the given map and coordinates.	1818	* a matching type variable at the given map and coordinates.
1967	* The first matching object is returned, or NULL if none.	1819	* The first matching object is returned, or NULL if none.
1968	*/	1820	*/
1969
1970	object *	1821	object *
1971	present (unsigned char type, maptile *m, int x, int y)	1822	present (unsigned char type, maptile *m, int x, int y)
1972	{	1823	{
1973	object *
1974	tmp;
1975
1976	if (out_of_map (m, x, y))	1824	if (out_of_map (m, x, y))
1977	{	1825	{
1978	LOG (llevError, "Present called outside map.\n");	1826	LOG (llevError, "Present called outside map.\n");
1979	return NULL;	1827	return NULL;
1980	}	1828	}
1981	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1829
		1830	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1982	if (tmp->type == type)	1831	if (tmp->type == type)
1983	return tmp;	1832	return tmp;
		1833
1984	return NULL;	1834	return NULL;
1985	}	1835	}
1986		1836
1987	/*	1837	/*
1988	* present_in_ob(type, object) searches for any objects with	1838	* present_in_ob(type, object) searches for any objects with
1989	* a matching type variable in the inventory of the given object.	1839	* a matching type variable in the inventory of the given object.
1990	* The first matching object is returned, or NULL if none.	1840	* The first matching object is returned, or NULL if none.
1991	*/	1841	*/
1992
1993	object *	1842	object *
1994	present_in_ob (unsigned char type, const object *op)	1843	present_in_ob (unsigned char type, const object *op)
1995	{	1844	{
1996	object *
1997	tmp;
1998
1999	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1845	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000	if (tmp->type == type)	1846	if (tmp->type == type)
2001	return tmp;	1847	return tmp;
		1848
2002	return NULL;	1849	return NULL;
2003	}	1850	}
2004		1851
2005	/*	1852	/*
2006	* present_in_ob (type, str, object) searches for any objects with	1853	* present_in_ob (type, str, object) searches for any objects with
…		…
2014	* str is the string to match against. Note that we match against	1861	* str is the string to match against. Note that we match against
2015	* the object name, not the archetype name. this is so that the	1862	* the object name, not the archetype name. this is so that the
2016	* spell code can use one object type (force), but change it's name	1863	* spell code can use one object type (force), but change it's name
2017	* to be unique.	1864	* to be unique.
2018	*/	1865	*/
2019
2020	object *	1866	object *
2021	present_in_ob_by_name (int type, const char *str, const object *op)	1867	present_in_ob_by_name (int type, const char *str, const object *op)
2022	{	1868	{
2023	object *
2024	tmp;
2025
2026	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1869	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027	{
2028	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1870	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029	return tmp;	1871	return tmp;
2030	}	1872
2031	return NULL;	1873	return 0;
2032	}	1874	}
2033		1875
2034	/*	1876	/*
2035	* present_arch_in_ob(archetype, object) searches for any objects with	1877	* present_arch_in_ob(archetype, object) searches for any objects with
2036	* a matching archetype in the inventory of the given object.	1878	* a matching archetype in the inventory of the given object.
2037	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
2038	*/	1880	*/
2039
2040	object *	1881	object *
2041	present_arch_in_ob (const archetype *at, const object *op)	1882	present_arch_in_ob (const archetype *at, const object *op)
2042	{	1883	{
2043	object *
2044	tmp;
2045
2046	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047	if (tmp->arch == at)	1885	if (tmp->arch == at)
2048	return tmp;	1886	return tmp;
		1887
2049	return NULL;	1888	return NULL;
2050	}	1889	}
2051		1890
2052	/*	1891	/*
2053	* activate recursively a flag on an object inventory	1892	* activate recursively a flag on an object inventory
2054	*/	1893	*/
2055	void	1894	void
2056	flag_inv (object *op, int flag)	1895	flag_inv (object *op, int flag)
2057	{	1896	{
2058	object *
2059	tmp;
2060
2061	if (op->inv)	1897	if (op->inv)
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063	{	1899	{
2064	SET_FLAG (tmp, flag);	1900	SET_FLAG (tmp, flag);
2065	flag_inv (tmp, flag);	1901	flag_inv (tmp, flag);
2066	}	1902	}
2067	} /*	1903	}
		1904
		1905	/*
2068	* desactivate recursively a flag on an object inventory	1906	* deactivate recursively a flag on an object inventory
2069	*/	1907	*/
2070	void	1908	void
2071	unflag_inv (object *op, int flag)	1909	unflag_inv (object *op, int flag)
2072	{	1910	{
2073	object *
2074	tmp;
2075
2076	if (op->inv)	1911	if (op->inv)
2077	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1912	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2078	{	1913	{
2079	CLEAR_FLAG (tmp, flag);	1914	CLEAR_FLAG (tmp, flag);
2080	unflag_inv (tmp, flag);	1915	unflag_inv (tmp, flag);
2081	}	1916	}
2082	}	1917	}
…		…
2085	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1920	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086	* all it's inventory (recursively).	1921	* all it's inventory (recursively).
2087	* If checksums are used, a player will get set_cheat called for	1922	* If checksums are used, a player will get set_cheat called for
2088	* him/her-self and all object carried by a call to this function.	1923	* him/her-self and all object carried by a call to this function.
2089	*/	1924	*/
2090
2091	void	1925	void
2092	set_cheat (object *op)	1926	set_cheat (object *op)
2093	{	1927	{
2094	SET_FLAG (op, FLAG_WAS_WIZ);	1928	SET_FLAG (op, FLAG_WAS_WIZ);
2095	flag_inv (op, FLAG_WAS_WIZ);	1929	flag_inv (op, FLAG_WAS_WIZ);
…		…
2114	* because arch_blocked (now ob_blocked) needs to know the movement type	1948	* because arch_blocked (now ob_blocked) needs to know the movement type
2115	* to know if the space in question will block the object. We can't use	1949	* to know if the space in question will block the object. We can't use
2116	* the archetype because that isn't correct if the monster has been	1950	* the archetype because that isn't correct if the monster has been
2117	* customized, changed states, etc.	1951	* customized, changed states, etc.
2118	*/	1952	*/
2119
2120	int	1953	int
2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1954	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122	{	1955	{
2123	int
2124	i,
2125	index = 0, flag;	1956	int index = 0, flag;
2126	static int
2127	altern[SIZEOFFREE];	1957	int altern[SIZEOFFREE];
2128		1958
2129	for (i = start; i < stop; i++)	1959	for (int i = start; i < stop; i++)
2130	{	1960	{
2131	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1961	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2132	if (!flag)	1962	if (!flag)
2133	altern[index++] = i;	1963	altern [index++] = i;
2134		1964
2135	/* Basically, if we find a wall on a space, we cut down the search size.	1965	/* Basically, if we find a wall on a space, we cut down the search size.
2136	* In this way, we won't return spaces that are on another side of a wall.	1966	* In this way, we won't return spaces that are on another side of a wall.
2137	* This mostly work, but it cuts down the search size in all directions -	1967	* This mostly work, but it cuts down the search size in all directions -
2138	* if the space being examined only has a wall to the north and empty	1968	* if the space being examined only has a wall to the north and empty
2139	* spaces in all the other directions, this will reduce the search space	1969	* spaces in all the other directions, this will reduce the search space
2140	* to only the spaces immediately surrounding the target area, and	1970	* to only the spaces immediately surrounding the target area, and
2141	* won't look 2 spaces south of the target space.	1971	* won't look 2 spaces south of the target space.
2142	*/	1972	*/
2143	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1973	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2144	stop = maxfree[i];	1974	stop = maxfree[i];
2145	}	1975	}
		1976
2146	if (!index)	1977	if (!index)
2147	return -1;	1978	return -1;
		1979
2148	return altern[RANDOM () % index];	1980	return altern [rndm (index)];
2149	}	1981	}
2150		1982
2151	/*	1983	/*
2152	* find_first_free_spot(archetype, maptile, x, y) works like	1984	* find_first_free_spot(archetype, maptile, x, y) works like
2153	* find_free_spot(), but it will search max number of squares.	1985	* find_free_spot(), but it will search max number of squares.
2154	* But it will return the first available spot, not a random choice.	1986	* But it will return the first available spot, not a random choice.
2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1987	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2156	*/	1988	*/
2157
2158	int	1989	int
2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1990	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160	{	1991	{
2161	int
2162	i;
2163
2164	for (i = 0; i < SIZEOFFREE; i++)	1992	for (int i = 0; i < SIZEOFFREE; i++)
2165	{
2166	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	1993	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2167	return i;	1994	return i;
2168	}	1995
2169	return -1;	1996	return -1;
2170	}	1997	}
2171		1998
2172	/*	1999	/*
2173	* The function permute(arr, begin, end) randomly reorders the array	2000	* The function permute(arr, begin, end) randomly reorders the array
2174	* arr[begin..end-1].	2001	* arr[begin..end-1].
		2002	* now uses a fisher-yates shuffle, old permute was broken
2175	*/	2003	*/
2176	static void	2004	static void
2177	permute (int *arr, int begin, int end)	2005	permute (int *arr, int begin, int end)
2178	{	2006	{
2179	int	2007	arr += begin;
2180	i,
2181	j,
2182	tmp,
2183	len;
2184
2185	len = end - begin;	2008	end -= begin;
2186	for (i = begin; i < end; i++)
2187	{
2188	j = begin + RANDOM () % len;
2189		2009
2190	tmp = arr[i];	2010	while (--end)
2191	arr[i] = arr[j];	2011	swap (arr [end], arr [rndm (end + 1)]);
2192	arr[j] = tmp;
2193	}
2194	}	2012	}
2195		2013
2196	/* new function to make monster searching more efficient, and effective!	2014	/* new function to make monster searching more efficient, and effective!
2197	* This basically returns a randomized array (in the passed pointer) of	2015	* This basically returns a randomized array (in the passed pointer) of
2198	* the spaces to find monsters. In this way, it won't always look for	2016	* the spaces to find monsters. In this way, it won't always look for
…		…
2201	* the 3x3 area will be searched, just not in a predictable order.	2019	* the 3x3 area will be searched, just not in a predictable order.
2202	*/	2020	*/
2203	void	2021	void
2204	get_search_arr (int *search_arr)	2022	get_search_arr (int *search_arr)
2205	{	2023	{
2206	int	2024	int i;
2207	i;
2208		2025
2209	for (i = 0; i < SIZEOFFREE; i++)	2026	for (i = 0; i < SIZEOFFREE; i++)
2210	{
2211	search_arr[i] = i;	2027	search_arr[i] = i;
2212	}
2213		2028
2214	permute (search_arr, 1, SIZEOFFREE1 + 1);	2029	permute (search_arr, 1, SIZEOFFREE1 + 1);
2215	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2030	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2031	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217	}	2032	}
…		…
2226	* Perhaps incorrectly, but I'm making the assumption that exclude	2041	* Perhaps incorrectly, but I'm making the assumption that exclude
2227	* is actually want is going to try and move there. We need this info	2042	* is actually want is going to try and move there. We need this info
2228	* because we have to know what movement the thing looking to move	2043	* because we have to know what movement the thing looking to move
2229	* there is capable of.	2044	* there is capable of.
2230	*/	2045	*/
2231
2232	int	2046	int
2233	find_dir (maptile *m, int x, int y, object *exclude)	2047	find_dir (maptile *m, int x, int y, object *exclude)
2234	{	2048	{
2235	int
2236	i,
2237	max = SIZEOFFREE, mflags;	2049	int i, max = SIZEOFFREE, mflags;
2238		2050
2239	sint16 nx, ny;	2051	sint16 nx, ny;
2240	object *	2052	object *tmp;
2241	tmp;
2242	maptile *	2053	maptile *mp;
2243	mp;
2244		2054
2245	MoveType blocked, move_type;	2055	MoveType blocked, move_type;
2246		2056
2247	if (exclude && exclude->head)	2057	if (exclude && exclude->head)
2248	{	2058	{
…		…
2260	mp = m;	2070	mp = m;
2261	nx = x + freearr_x[i];	2071	nx = x + freearr_x[i];
2262	ny = y + freearr_y[i];	2072	ny = y + freearr_y[i];
2263		2073
2264	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2074	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2075
2265	if (mflags & P_OUT_OF_MAP)	2076	if (mflags & P_OUT_OF_MAP)
2266	{
2267	max = maxfree[i];	2077	max = maxfree[i];
2268	}
2269	else	2078	else
2270	{	2079	{
2271	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2080	mapspace &ms = mp->at (nx, ny);
		2081
		2082	blocked = ms.move_block;
2272		2083
2273	if ((move_type & blocked) == move_type)	2084	if ((move_type & blocked) == move_type)
2274	{
2275	max = maxfree[i];	2085	max = maxfree[i];
2276	}
2277	else if (mflags & P_IS_ALIVE)	2086	else if (mflags & P_IS_ALIVE)
2278	{	2087	{
2279	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2088	for (tmp = ms.bot; tmp; tmp = tmp->above)
2280	{	2089	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2090	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2282	{
2283	break;	2091	break;
2284	}	2092
2285	}
2286	if (tmp)	2093	if (tmp)
2287	{
2288	return freedir[i];	2094	return freedir[i];
2289	}
2290	}	2095	}
2291	}	2096	}
2292	}	2097	}
		2098
2293	return 0;	2099	return 0;
2294	}	2100	}
2295		2101
2296	/*	2102	/*
2297	* distance(object 1, object 2) will return the square of the	2103	* distance(object 1, object 2) will return the square of the
2298	* distance between the two given objects.	2104	* distance between the two given objects.
2299	*/	2105	*/
2300
2301	int	2106	int
2302	distance (const object *ob1, const object *ob2)	2107	distance (const object *ob1, const object *ob2)
2303	{	2108	{
2304	int
2305	i;
2306
2307	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2109	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308	return i;
2309	}	2110	}
2310		2111
2311	/*	2112	/*
2312	* find_dir_2(delta-x,delta-y) will return a direction in which	2113	* find_dir_2(delta-x,delta-y) will return a direction in which
2313	* an object which has subtracted the x and y coordinates of another	2114	* an object which has subtracted the x and y coordinates of another
2314	* object, needs to travel toward it.	2115	* object, needs to travel toward it.
2315	*/	2116	*/
2316
2317	int	2117	int
2318	find_dir_2 (int x, int y)	2118	find_dir_2 (int x, int y)
2319	{	2119	{
2320	int	2120	int q;
2321	q;
2322		2121
2323	if (y)	2122	if (y)
2324	q = x * 100 / y;	2123	q = x * 100 / y;
2325	else if (x)	2124	else if (x)
2326	q = -300 * x;	2125	q = -300 * x;
…		…
2351		2150
2352	return 3;	2151	return 3;
2353	}	2152	}
2354		2153
2355	/*	2154	/*
2356	* absdir(int): Returns a number between 1 and 8, which represent
2357	* the "absolute" direction of a number (it actually takes care of
2358	* "overflow" in previous calculations of a direction).
2359	*/
2360
2361	int
2362	absdir (int d)
2363	{
2364	while (d < 1)
2365	d += 8;
2366	while (d > 8)
2367	d -= 8;
2368	return d;
2369	}
2370
2371	/*
2372	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2155	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2373	* between two directions (which are expected to be absolute (see absdir())	2156	* between two directions (which are expected to be absolute (see absdir())
2374	*/	2157	*/
2375
2376	int	2158	int
2377	dirdiff (int dir1, int dir2)	2159	dirdiff (int dir1, int dir2)
2378	{	2160	{
2379	int	2161	int d;
2380	d;
2381		2162
2382	d = abs (dir1 - dir2);	2163	d = abs (dir1 - dir2);
2383	if (d > 4)	2164	if (d > 4)
2384	d = 8 - d;	2165	d = 8 - d;
		2166
2385	return d;	2167	return d;
2386	}	2168	}
2387		2169
2388	/* peterm:	2170	/* peterm:
2389	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2171	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2392	* This basically means that if direction is 15, then it could either go	2174	* This basically means that if direction is 15, then it could either go
2393	* direction 4, 14, or 16 to get back to where we are.	2175	* direction 4, 14, or 16 to get back to where we are.
2394	* Moved from spell_util.c to object.c with the other related direction	2176	* Moved from spell_util.c to object.c with the other related direction
2395	* functions.	2177	* functions.
2396	*/	2178	*/
2397
2398	int
2399	reduction_dir[SIZEOFFREE][3] = {	2179	int reduction_dir[SIZEOFFREE][3] = {
2400	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2401	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2402	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2403	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2404	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2452	* find a path to that monster that we found. If not,	2232	* find a path to that monster that we found. If not,
2453	* we don't bother going toward it. Returns 1 if we	2233	* we don't bother going toward it. Returns 1 if we
2454	* can see a direct way to get it	2234	* can see a direct way to get it
2455	* Modified to be map tile aware -.MSW	2235	* Modified to be map tile aware -.MSW
2456	*/	2236	*/
2457
2458
2459	int	2237	int
2460	can_see_monsterP (maptile *m, int x, int y, int dir)	2238	can_see_monsterP (maptile *m, int x, int y, int dir)
2461	{	2239	{
2462	sint16 dx, dy;	2240	sint16 dx, dy;
2463	int
2464	mflags;	2241	int mflags;
2465		2242
2466	if (dir < 0)	2243	if (dir < 0)
2467	return 0; /* exit condition: invalid direction */	2244	return 0; /* exit condition: invalid direction */
2468		2245
2469	dx = x + freearr_x[dir];	2246	dx = x + freearr_x[dir];
…		…
2482	return 0;	2259	return 0;
2483		2260
2484	/* yes, can see. */	2261	/* yes, can see. */
2485	if (dir < 9)	2262	if (dir < 9)
2486	return 1;	2263	return 1;
		2264
2487	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2265	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2266	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2267	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489	}	2268	}
2490
2491
2492		2269
2493	/*	2270	/*
2494	* can_pick(picker, item): finds out if an object is possible to be	2271	* can_pick(picker, item): finds out if an object is possible to be
2495	* picked up by the picker. Returnes 1 if it can be	2272	* picked up by the picker. Returnes 1 if it can be
2496	* picked up, otherwise 0.	2273	* picked up, otherwise 0.
…		…
2507	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2284	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2285	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2286	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510	}	2287	}
2511		2288
2512
2513	/*	2289	/*
2514	* create clone from object to another	2290	* create clone from object to another
2515	*/	2291	*/
2516	object *	2292	object *
2517	object_create_clone (object *asrc)	2293	object_create_clone (object *asrc)
…		…
2536	{	2312	{
2537	dst = tmp;	2313	dst = tmp;
2538	tmp->head = 0;	2314	tmp->head = 0;
2539	}	2315	}
2540	else	2316	else
2541	{
2542	tmp->head = dst;	2317	tmp->head = dst;
2543	}
2544		2318
2545	tmp->more = 0;	2319	tmp->more = 0;
2546		2320
2547	if (prev)	2321	if (prev)
2548	prev->more = tmp;	2322	prev->more = tmp;
…		…
2560	/* Basically, we save the content of the string to a temp file, then call */	2334	/* Basically, we save the content of the string to a temp file, then call */
2561	/* load_object on it. I admit it is a highly inefficient way to make things, */	2335	/* load_object on it. I admit it is a highly inefficient way to make things, */
2562	/* but it was simple to make and allows reusing the load_object function. */	2336	/* but it was simple to make and allows reusing the load_object function. */
2563	/* Remember not to use load_object_str in a time-critical situation. */	2337	/* Remember not to use load_object_str in a time-critical situation. */
2564	/* Also remember that multiparts objects are not supported for now. */	2338	/* Also remember that multiparts objects are not supported for now. */
2565
2566	object *	2339	object *
2567	load_object_str (const char *obstr)	2340	load_object_str (const char *obstr)
2568	{	2341	{
2569	object *op;	2342	object *op;
2570	char filename[MAX_BUF];	2343	char filename[MAX_BUF];
…		…
2600	* returns NULL if no match.	2373	* returns NULL if no match.
2601	*/	2374	*/
2602	object *	2375	object *
2603	find_obj_by_type_subtype (const object *who, int type, int subtype)	2376	find_obj_by_type_subtype (const object *who, int type, int subtype)
2604	{	2377	{
2605	object *tmp;
2606
2607	for (tmp = who->inv; tmp; tmp = tmp->below)	2378	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608	if (tmp->type == type && tmp->subtype == subtype)	2379	if (tmp->type == type && tmp->subtype == subtype)
2609	return tmp;	2380	return tmp;
2610		2381
2611	return NULL;	2382	return 0;
2612	}	2383	}
2613		2384
2614	/* If ob has a field named key, return the link from the list,	2385	/* If ob has a field named key, return the link from the list,
2615	* otherwise return NULL.	2386	* otherwise return NULL.
2616	*	2387	*
…		…
2618	* do the desired thing.	2389	* do the desired thing.
2619	*/	2390	*/
2620	key_value *	2391	key_value *
2621	get_ob_key_link (const object *ob, const char *key)	2392	get_ob_key_link (const object *ob, const char *key)
2622	{	2393	{
2623	key_value *link;
2624
2625	for (link = ob->key_values; link != NULL; link = link->next)	2394	for (key_value *link = ob->key_values; link; link = link->next)
2626	if (link->key == key)	2395	if (link->key == key)
2627	return link;	2396	return link;
2628		2397
2629	return NULL;	2398	return 0;
2630	}	2399	}
2631		2400
2632	/*	2401	/*
2633	* Returns the value of op has an extra_field for key, or NULL.	2402	* Returns the value of op has an extra_field for key, or NULL.
2634	*	2403	*
…		…
2674	* Returns TRUE on success.	2443	* Returns TRUE on success.
2675	*/	2444	*/
2676	int	2445	int
2677	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2446	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678	{	2447	{
2679	key_value *
2680	field = NULL, *last = NULL;	2448	key_value *field = NULL, *last = NULL;
2681		2449
2682	for (field = op->key_values; field != NULL; field = field->next)	2450	for (field = op->key_values; field != NULL; field = field->next)
2683	{	2451	{
2684	if (field->key != canonical_key)	2452	if (field->key != canonical_key)
2685	{	2453	{
…		…
2713	/* IF we get here, key doesn't exist */	2481	/* IF we get here, key doesn't exist */
2714		2482
2715	/* No field, we'll have to add it. */	2483	/* No field, we'll have to add it. */
2716		2484
2717	if (!add_key)	2485	if (!add_key)
2718	{
2719	return FALSE;	2486	return FALSE;
2720	}	2487
2721	/* There isn't any good reason to store a null	2488	/* There isn't any good reason to store a null
2722	* value in the key/value list. If the archetype has	2489	* value in the key/value list. If the archetype has
2723	* this key, then we should also have it, so shouldn't	2490	* this key, then we should also have it, so shouldn't
2724	* be here. If user wants to store empty strings,	2491	* be here. If user wants to store empty strings,
2725	* should pass in ""	2492	* should pass in ""
…		…
2774	}	2541	}
2775	else	2542	else
2776	item = item->env;	2543	item = item->env;
2777	}	2544	}
2778		2545
		2546
		2547	const char *
		2548	object::flag_desc (char *desc, int len) const
		2549	{
		2550	char *p = desc;
		2551	bool first = true;
		2552
		2553	*p = 0;
		2554
		2555	for (int i = 0; i < NUM_FLAGS; i++)
		2556	{
		2557	if (len <= 10) // magic constant!
		2558	{
		2559	snprintf (p, len, ",...");
		2560	break;
		2561	}
		2562
		2563	if (flag [i])
		2564	{
		2565	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2566	len -= cnt;
		2567	p += cnt;
		2568	first = false;
		2569	}
		2570	}
		2571
		2572	return desc;
		2573	}
		2574
2779	// return a suitable string describing an objetc in enough detail to find it	2575	// return a suitable string describing an object in enough detail to find it
2780	const char *	2576	const char *
2781	object::debug_desc (char *info) const	2577	object::debug_desc (char *info) const
2782	{	2578	{
		2579	char flagdesc[512];
2783	char info2[256 * 3];	2580	char info2[256 * 4];
2784	char *p = info;	2581	char *p = info;
2785		2582
2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2583	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2787	count,	2584	count, uuid.seq,
2788	&name,	2585	&name,
2789	title ? " " : "",	2586	title ? "\",title:\"" : "",
2790	title ? (const char *)title : "");	2587	title ? (const char *)title : "",
		2588	flag_desc (flagdesc, 512), type);
2791		2589
2792	if (env)	2590	if (env)
2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2591	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2794		2592
2795	if (map)	2593	if (map)
2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2594	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2797		2595
2798	return info;	2596	return info;
2799	}	2597	}
2800		2598
2801	const char *	2599	const char *
2802	object::debug_desc () const	2600	object::debug_desc () const
2803	{	2601	{
2804	static char info[256 * 3];	2602	static char info[256 * 4];
2805	return debug_desc (info);	2603	return debug_desc (info);
2806	}	2604	}
2807		2605
		2606	const char *
		2607	object::debug_desc2 () const
		2608	{
		2609	static char info[256 * 4];
		2610	return debug_desc (info);
		2611	}
		2612
		2613	struct region *
		2614	object::region () const
		2615	{
		2616	return map ? map->region (x, y)
		2617	: region::default_region ();
		2618	}
		2619

Diff Legend

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