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.43 by root, Thu Sep 14 17:10:24 2006 UTC vs.
Revision 1.76 by root, Thu Dec 21 01:33:49 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
37	static UUID uuid;	38	static UUID uuid;
38	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
39		40
40	object *objects; /* Pointer to the list of used objects */
41	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
42		42
43	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,	43	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,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	45	};
…		…
106	_exit (1);	106	_exit (1);
107	}	107	}
108		108
109	uuid.seq = uid;	109	uuid.seq = uid;
110	write_uuid ();	110	write_uuid ();
111	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112	fclose (fp);	112	fclose (fp);
113	}	113	}
114		114
115	UUID	115	UUID
116	gen_uuid ()	116	gen_uuid ()
…		…
185	*	185	*
186	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
187	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
188	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
189	*	189	*
190	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
191	*	191	*
192	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
193	* check weight	193	* check weight
194	*/	194	*/
195		195
196	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	197	{
198	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
199	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
200	return 0;	204	return 0;
201		205
202	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
203	return 0;
204
205	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
206	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
207	* used to store nrof).	209	* used to store nrof).
208	*/	210	*/
209	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
219	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220		222
221	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223		225
224		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
226	* being locked in inventory should prevent merging.
227	* 0x4 in flags3 is CLIENT_SENT
228	*/
229	if ((ob1->arch != ob2->arch) ||
230	(ob1->flags[0] != ob2->flags[0]) ||
231	(ob1->flags[1] != ob2->flags[1]) ||
232	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
235	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
236	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
237	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
238	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
241	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
242	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
243	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
244	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
245	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
246	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
247	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
248	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
249	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
250	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
251	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
252	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
253	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
254	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
255	return 0;	251	return 0;
256		252
257	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
258	* check all objects in the inventory.	254	* check all objects in the inventory.
259	*/	255	*/
…		…
262	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
263	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264	return 0;	260	return 0;
265		261
266	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
267	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
268	return 0;	264	return 0;
269		265
270	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
271	* if it is valid.	267	* if it is valid.
272	*/	268	*/
…		…
356	op = op->env;	352	op = op->env;
357	return op;	353	return op;
358	}	354	}
359		355
360	/*	356	/*
361	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
362	* a better check. We basically keeping traversing up until we can't
363	* or find a player.
364	*/
365
366	object *
367	is_player_inv (object *op)
368	{
369	for (; op != NULL && op->type != PLAYER; op = op->env)
370	if (op->env == op)
371	op->env = NULL;
372	return op;
373	}
374
375	/*
376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377	* Some error messages.	358	* Some error messages.
378	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
379	*/	360	*/
380		361
381	void	362	char *
382	dump_object2 (object *op)
383	{
384	errmsg[0] = 0;
385	return;
386	//TODO//D#d#
387	#if 0
388	char *cp;
389
390	/* object *tmp;*/
391
392	if (op->arch != NULL)
393	{
394	strcat (errmsg, "arch ");
395	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396	strcat (errmsg, "\n");
397	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398	strcat (errmsg, cp);
399	# if 0
400	/* Don't dump player diffs - they are too long, mostly meaningless, and
401	* will overflow the buffer.
402	* Changed so that we don't dump inventory either. This may
403	* also overflow the buffer.
404	*/
405	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406	strcat (errmsg, cp);
407	for (tmp = op->inv; tmp; tmp = tmp->below)
408	dump_object2 (tmp);
409	# endif
410	strcat (errmsg, "end\n");
411	}
412	else
413	{
414	strcat (errmsg, "Object ");
415	if (op->name == NULL)
416	strcat (errmsg, "(null)");
417	else
418	strcat (errmsg, op->name);
419	strcat (errmsg, "\n");
420	# if 0
421	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422	strcat (errmsg, cp);
423	for (tmp = op->inv; tmp; tmp = tmp->below)
424	dump_object2 (tmp);
425	# endif
426	strcat (errmsg, "end\n");
427	}
428	#endif
429	}
430
431	/*
432	* Dumps an object. Returns output in the static global errmsg array.
433	*/
434
435	void
436	dump_object (object *op)	363	dump_object (object *op)
437	{	364	{
438	if (op == NULL)	365	if (!op)
439	{	366	return strdup ("[NULLOBJ]");
440	strcpy (errmsg, "[NULL pointer]");
441	return;
442	}
443	errmsg[0] = '\0';
444	dump_object2 (op);
445	}
446		367
447	void	368	object_freezer freezer;
448	dump_all_objects (void)	369	save_object (freezer, op, 3);
449	{	370	return freezer.as_string ();
450	object *op;
451
452	for (op = objects; op != NULL; op = op->next)
453	{
454	dump_object (op);
455	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456	}
457	}	371	}
458		372
459	/*	373	/*
460	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
461	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
481	*/	395	*/
482		396
483	object *	397	object *
484	find_object (tag_t i)	398	find_object (tag_t i)
485	{	399	{
486	object *op;	400	for (object *op = object::first; op; op = op->next)
487
488	for (op = objects; op != NULL; op = op->next)
489	if (op->count == i)	401	if (op->count == i)
490	break;	402	return op;
		403
491	return op;	404	return 0;
492	}	405	}
493		406
494	/*	407	/*
495	* 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.
496	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
501	find_object_name (const char *str)	414	find_object_name (const char *str)
502	{	415	{
503	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
504	object *op;	417	object *op;
505		418
506	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
507	if (op->name == str_)	420	if (op->name == str_)
508	break;	421	break;
509		422
510	return op;	423	return op;
511	}	424	}
…		…
596		509
597	if (settings.casting_time)	510	if (settings.casting_time)
598	casting_time = -1;	511	casting_time = -1;
599	}	512	}
600		513
601	void object::clone (object *destination)
602	{
603	*(object_copy *)destination = *this;
604	*(object_pod *)destination = *this;
605
606	if (self || cb)
607	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
608	}
609
610	/*	514	/*
611	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
615	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
616	* will point at garbage.	520	* will point at garbage.
617	*/	521	*/
618	void	522	void
619	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
620	{	524	{
621	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
622	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
623		527
624	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
625		533
626	if (is_freed)	534	if (is_freed)
627	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
628	if (is_removed)	537	if (is_removed)
629	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
630		539
631	if (op2->speed < 0)	540	if (speed < 0)
632	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
633		542
634	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
635	if (op2->key_values)	544	if (key_values)
636	{	545	{
637	key_value *tail = 0;	546	key_value *tail = 0;
638	key_value *i;	547	key_value *i;
639		548
640	op->key_values = 0;	549	dst->key_values = 0;
641		550
642	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
643	{	552	{
644	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
645		554
646	new_link->next = 0;	555	new_link->next = 0;
647	new_link->key = i->key;	556	new_link->key = i->key;
648	new_link->value = i->value;	557	new_link->value = i->value;
649		558
650	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
651	if (!op->key_values)	560	if (!dst->key_values)
652	{	561	{
653	op->key_values = new_link;	562	dst->key_values = new_link;
654	tail = new_link;	563	tail = new_link;
655	}	564	}
656	else	565	else
657	{	566	{
658	tail->next = new_link;	567	tail->next = new_link;
659	tail = new_link;	568	tail = new_link;
660	}	569	}
661	}	570	}
662	}	571	}
663		572
664	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
665	}	582	}
666		583
667	/*	584	/*
668	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
669	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
777	op->active_next = NULL;	694	op->active_next = NULL;
778	op->active_prev = NULL;	695	op->active_prev = NULL;
779	}	696	}
780		697
781	/*	698	/*
782	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
783	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
784	* by invisible objects by whatever is below them (unless it's another	701	* by invisible objects by whatever is below them (unless it's another
785	* invisible object, etc...)	702	* invisible object, etc...)
786	* If the object being updated is beneath a player, the look-window	703	* If the object being updated is beneath a player, the look-window
787	* of that player is updated (this might be a suboptimal way of	704	* of that player is updated (this might be a suboptimal way of
788	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
789	*	706	*
790	* action is a hint of what the caller believes need to be done.	707	* action is a hint of what the caller believes need to be done.
791	* For example, if the only thing that has changed is the face (due to
792	* an animation), we don't need to call update_position until that actually
793	* comes into view of a player. OTOH, many other things, like addition/removal
794	* of walls or living creatures may need us to update the flags now.
795	* current action are:	708	* current action are:
796	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
797	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
798	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	711	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
799	* as that is easier than trying to look at what may have changed.	712	* as that is easier than trying to look at what may have changed.
800	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
801	*/	714	*/
802
803	void	715	void
804	update_object (object *op, int action)	716	update_object (object *op, int action)
805	{	717	{
806	int update_now = 0, flags;
807	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
808		719
809	if (op == NULL)	720	if (op == NULL)
810	{	721	{
811	/* this should never happen */	722	/* this should never happen */
812	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
813	return;	724	return;
814	}	725	}
815		726
816	if (op->env != NULL)	727	if (op->env)
817	{	728	{
818	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
819	* to do in this case.	730	* to do in this case.
820	*/	731	*/
821	return;	732	return;
…		…
835	abort ();	746	abort ();
836	#endif	747	#endif
837	return;	748	return;
838	}	749	}
839		750
840	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->ms ();
841	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
842	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
843	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
844	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
845	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
846		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
847	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
848	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
849	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
850	update_now = 1;
851
852	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
853	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
854		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
855	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
856	update_now = 1;
857
858	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
859	update_now = 1;
860
861	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
862	update_now = 1;
863
864	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
865	update_now = 1;
866
867	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
868	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
869
870	/* This isn't perfect, but I don't expect a lot of objects to	767	/* This isn't perfect, but I don't expect a lot of objects to
871	* to have move_allow right now.	768	* to have move_allow right now.
872	*/	769	*/
873	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
874	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
875		772	m.flags_ = P_NEED_UPDATE;
876	if ((move_slow | op->move_slow) != move_slow)
877	update_now = 1;
878	}	773	}
879	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
880	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
881	* that is being removed.	776	* that is being removed.
882	*/	777	*/
883	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
884	update_now = 1;	779	m.flags_ = P_NEED_UPDATE;
885	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
886	/* Nothing to do for that case */ ;	781	/* Nothing to do for that case */ ;
887	else	782	else
888	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
889		784
890	if (update_now)
891	{
892	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
893	update_position (op->map, op->x, op->y);
894	}
895
896	if (op->more != NULL)	785	if (op->more)
897	update_object (op->more, action);	786	update_object (op->more, action);
898	}	787	}
899		788
900	static unordered_vector<object *> mortals;	789	object::vector object::mortals;
		790	object::vector object::objects; // not yet used
		791	object *object::first;
901		792
902	void object::free_mortals ()	793	void object::free_mortals ()
903	{	794	{
904	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905	if ((*i)->refcnt)	796	if ((*i)->refcnt)
906	++i; // further delay freeing	797	++i; // further delay freeing
907	else	798	else
908	{	799	{
909	delete *i;	800	delete *i;
910	mortals.erase (i);	801	mortals.erase (i);
911	}	802	}
912
913	static int lastmortals = 0;//D
914
915	if (mortals.size() != lastmortals)//D
916	{
917	lastmortals = mortals.size ();//D
918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919	}
920	}	803	}
921		804
922	object::object ()	805	object::object ()
923	{	806	{
924	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
…		…
936	{	819	{
937	count = ++ob_count;	820	count = ++ob_count;
938	uuid = gen_uuid ();	821	uuid = gen_uuid ();
939		822
940	prev = 0;	823	prev = 0;
941	next = objects;	824	next = object::first;
942		825
943	if (objects)	826	if (object::first)
944	objects->prev = this;	827	object::first->prev = this;
945		828
946	objects = this;	829	object::first = this;
947	}	830	}
948		831
949	void object::unlink ()	832	void object::unlink ()
950	{	833	{
951	//count = 0;//D
952	if (!prev && !next) return;//D
953
954	if (this == objects)	834	if (this == object::first)
955	objects = next;	835	object::first = next;
956		836
957	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
958	if (prev) prev->next = next;	838	if (prev) prev->next = next;
959	if (next) next->prev = prev;	839	if (next) next->prev = prev;
960		840
…		…
974	* it from the list of used objects, and puts it on the list of	854	* it from the list of used objects, and puts it on the list of
975	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
976	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
977	* this function to succeed.	857	* this function to succeed.
978	*	858	*
979	* If free_inventory is set, free inventory as well. Else drop items in	859	* If destroy_inventory is set, free inventory as well. Else drop items in
980	* inventory to the ground.	860	* inventory to the ground.
981	*/	861	*/
982	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
983	{	863	{
984	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
985	return;	865	return;
986		866
987	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
988	remove_friendly_object (this);	868	remove_friendly_object (this);
989		869
990	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
991	remove_ob (this);	871	remove ();
992		872
993	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
994		874
995	if (more)	875	if (more)
996	{	876	{
997	more->free (free_inventory);	877	more->destroy (destroy_inventory);
998	more = 0;	878	more = 0;
999	}	879	}
1000		880
1001	if (inv)	881	if (inv)
1002	{	882	{
1003	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
1004	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
1005	* drop on that space.	885	* drop on that space.
1006	*/	886	*/
1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008	{	888	{
1009	object *op = inv;	889	object *op = inv;
1010		890
1011	while (op)	891	while (op)
1012	{	892	{
1013	object *tmp = op->below;	893	object *tmp = op->below;
1014	op->free (free_inventory);	894	op->destroy (destroy_inventory);
1015	op = tmp;	895	op = tmp;
1016	}	896	}
1017	}	897	}
1018	else	898	else
1019	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
1021		901
1022	while (op)	902	while (op)
1023	{	903	{
1024	object *tmp = op->below;	904	object *tmp = op->below;
1025		905
1026	remove_ob (op);	906	op->remove ();
1027		907
1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1030	free_object (op);	910	op->destroy ();
1031	else	911	else
1032	{	912	{
1033	op->x = x;	913	op->x = x;
1034	op->y = y;	914	op->y = y;
1035	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1038	op = tmp;	918	op = tmp;
1039	}	919	}
1040	}	920	}
1041	}	921	}
1042		922
		923	// hack to ensure that freed objects still have a valid map
		924	{
		925	static maptile *freed_map; // freed objects are moved here to avoid crashes
		926
		927	if (!freed_map)
		928	{
		929	freed_map = new maptile;
		930
		931	freed_map->name = "/internal/freed_objects_map";
		932	freed_map->width = 3;
		933	freed_map->height = 3;
		934
		935	freed_map->allocate ();
		936	}
		937
		938	map = freed_map;
		939	x = 1;
		940	y = 1;
		941	}
		942
		943	// clear those pointers that likely might have circular references to us
1043	owner = 0;	944	owner = 0;
		945	enemy = 0;
		946	attacked_by = 0;
		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
1044		950
1045	/* Remove object from the active list */	951	/* Remove object from the active list */
1046	speed = 0;	952	speed = 0;
1047	update_ob_speed (this);	953	update_ob_speed (this);
1048		954
…		…
1053		959
1054	/*	960	/*
1055	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1056	* weight of an object (and what is carried by it's environment(s)).	962	* weight of an object (and what is carried by it's environment(s)).
1057	*/	963	*/
1058
1059	void	964	void
1060	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1061	{	966	{
1062	while (op != NULL)	967	while (op != NULL)
1063	{	968	{
1064	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1065	{
1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1067	}	971
1068	op->carrying -= weight;	972	op->carrying -= weight;
1069	op = op->env;	973	op = op->env;
1070	}	974	}
1071	}	975	}
1072		976
1073	/* remove_ob(op):	977	/* op->remove ():
1074	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
1075	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
1076	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1077	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1078	* the previous environment.	982	* the previous environment.
1079	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1080	*/	984	*/
1081
1082	void	985	void
1083	remove_ob (object *op)	986	object::remove ()
1084	{	987	{
		988	object *tmp, *last = 0;
1085	object *	989	object *otmp;
1086	tmp, *
1087	last = NULL;
1088	object *
1089	otmp;
1090		990
1091	tag_t
1092	tag;
1093	int
1094	check_walk_off;	991	int check_walk_off;
1095	mapstruct *
1096	m;
1097		992
1098	sint16
1099	x,
1100	y;
1101
1102	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1103	return;	994	return;
1104		995
1105	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1106		997
1107	if (op->more != NULL)	998	if (more)
1108	remove_ob (op->more);	999	more->remove ();
1109		1000
1110	/*	1001	/*
1111	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1112	* inventory.	1003	* inventory.
1113	*/	1004	*/
1114	if (op->env != NULL)	1005	if (env)
1115	{	1006	{
1116	if (op->nrof)	1007	if (nrof)
1117	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1118	else	1009	else
1119	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1120		1011
1121	/* NO_FIX_PLAYER is set when a great many changes are being	1012	/* NO_FIX_PLAYER is set when a great many changes are being
1122	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1123	* to save cpu time.	1014	* to save cpu time.
1124	*/	1015	*/
1125	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1126	fix_player (otmp);	1017	fix_player (otmp);
1127		1018
1128	if (op->above != NULL)	1019	if (above != NULL)
1129	op->above->below = op->below;	1020	above->below = below;
1130	else	1021	else
1131	op->env->inv = op->below;	1022	env->inv = below;
1132		1023
1133	if (op->below != NULL)	1024	if (below != NULL)
1134	op->below->above = op->above;	1025	below->above = above;
1135		1026
1136	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1137	* the map, but we don't actually do that - it is up	1028	* the map, but we don't actually do that - it is up
1138	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1139	*/	1030	*/
1140	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1141	op->map = op->env->map;	1032	map = env->map;
1142	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1143	op->env = NULL;	1034	env = 0;
1144	}	1035	}
1145	else if (op->map)	1036	else if (map)
1146	{	1037	{
1147	x = op->x;
1148	y = op->y;
1149	m = get_map_from_coord (op->map, &x, &y);
1150
1151	if (!m)
1152	{
1153	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1154	op->map->path, op->x, op->y);
1155	/* in old days, we used to set x and y to 0 and continue.
1156	* it seems if we get into this case, something is probablye
1157	* screwed up and should be fixed.
1158	*/
1159	abort ();
1160	}
1161
1162	if (op->map != m)
1163	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1164	op->map->path, m->path, op->x, op->y, x, y);
1165
1166	/* Re did the following section of code - it looks like it had	1038	/* Re did the following section of code - it looks like it had
1167	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1168	*/	1040	*/
1169		1041
1170	/* link the object above us */	1042	/* link the object above us */
1171	if (op->above)	1043	if (above)
1172	op->above->below = op->below;	1044	above->below = below;
1173	else	1045	else
1174	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1046	map->at (x, y).top = below; /* we were top, set new top */
1175		1047
1176	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1177	if (op->below)	1049	if (below)
1178	op->below->above = op->above;	1050	below->above = above;
1179	else	1051	else
1180	{	1052	{
1181	/* Nothing below, which means we need to relink map object for this space	1053	/* Nothing below, which means we need to relink map object for this space
1182	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1183	* evident	1055	* evident
1184	*/	1056	*/
1185	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1186	{	1058	{
1187	dump_object (op);	1059	char *dump = dump_object (this);
1188	LOG (llevError,	1060	LOG (llevError,
1189	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1061	"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);
		1062	free (dump);
1190	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1191	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1192	}	1066	}
1193		1067
1194	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1195	}	1069	}
1196		1070
1197	op->above = 0;	1071	above = 0;
1198	op->below = 0;	1072	below = 0;
1199		1073
1200	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1201	return;	1075	return;
1202		1076
1203	tag = op->count;
1204	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1205		1078
1206	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1207	{	1080	{
1208	/* No point updating the players look faces if he is the object	1081	/* No point updating the players look faces if he is the object
1209	* being removed.	1082	* being removed.
1210	*/	1083	*/
1211		1084
1212	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1213	{	1086	{
1214	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1215	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1216	* appropriately.	1089	* appropriately.
1217	*/	1090	*/
1218	if (tmp->container == op)	1091	if (tmp->container == this)
1219	{	1092	{
1220	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1221	tmp->container = NULL;	1094	tmp->container = 0;
1222	}	1095	}
1223		1096
1224	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1225	}	1098	}
1226		1099
1227	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1228	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1229	{	1104	{
1230	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1231		1106
1232	if (was_destroyed (op, tag))	1107	if (destroyed ())
1233	{
1234	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1235	}
1236	}	1109	}
1237		1110
1238	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1239		1112
1240	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1241	tmp->above = NULL;	1114	tmp->above = 0;
1242		1115
1243	last = tmp;	1116	last = tmp;
1244	}	1117	}
1245		1118
1246	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1247	if (last == NULL)	1120	if (!last)
1248	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1249	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1250	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1251	* those out anyways, and if there are any flags set right now, they won't
1252	* be correct anyways.
1253	*/
1254	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1255	update_position (op->map, op->x, op->y);
1256	}
1257	else	1122	else
1258	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1259		1124
1260	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1261	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1262	}	1127	}
1263	}	1128	}
1264		1129
1265	/*	1130	/*
1266	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1281		1146
1282	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1283	{	1148	{
1284	if (top == op)	1149	if (top == op)
1285	continue;	1150	continue;
1286	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1287	{	1153	{
1288	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1289		1155
1290	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1291	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1292	remove_ob (op);	1158	op->destroy ();
1293	free_object (op);
1294	return top;	1159	return top;
1295	}	1160	}
1296	}	1161	}
1297		1162
1298	return NULL;	1163	return 0;
1299	}	1164	}
1300		1165
1301	/*	1166	/*
1302	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1167	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1303	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1304	*/	1169	*/
1305	object *	1170	object *
1306	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1307	{	1172	{
1308	object *tmp;	1173	object *tmp;
1309		1174
1310	if (op->head)	1175	if (op->head)
1311	op = op->head;	1176	op = op->head;
…		…
1339	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1340	* just 'op' otherwise	1205	* just 'op' otherwise
1341	*/	1206	*/
1342		1207
1343	object *	1208	object *
1344	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1345	{	1210	{
1346	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1347	sint16 x, y;	1212	sint16 x, y;
1348		1213
1349	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1352	return NULL;	1217	return NULL;
1353	}	1218	}
1354		1219
1355	if (m == NULL)	1220	if (m == NULL)
1356	{	1221	{
1357	dump_object (op);	1222	char *dump = dump_object (op);
1358	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1224	free (dump);
1359	return op;	1225	return op;
1360	}	1226	}
1361		1227
1362	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1363	{	1229	{
1364	dump_object (op);	1230	char *dump = dump_object (op);
1365	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1366	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1367	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1368	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1369	* improperly inserted.	1235	* improperly inserted.
1370	*/	1236	*/
1371	abort ();	1237	abort ();
1372	#endif	1238	#endif
		1239	free (dump);
1373	return op;	1240	return op;
1374	}	1241	}
1375		1242
1376	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1377	{	1244	{
1378	dump_object (op);	1245	char *dump = dump_object (op);
1379	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1247	free (dump);
1380	return op;	1248	return op;
1381	}	1249	}
1382		1250
1383	if (op->more != NULL)	1251	if (op->more != NULL)
1384	{	1252	{
…		…
1422		1290
1423	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1424	*/	1292	*/
1425	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1426	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1427	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1428	{	1296	{
1429	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1430	remove_ob (tmp);	1298	tmp->destroy ();
1431	free_object (tmp);
1432	}	1299	}
1433		1300
1434	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1435	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1436		1303
…		…
1449	op->below = originator->below;	1316	op->below = originator->below;
1450		1317
1451	if (op->below)	1318	if (op->below)
1452	op->below->above = op;	1319	op->below->above = op;
1453	else	1320	else
1454	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1455		1322
1456	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1457	originator->below = op;	1324	originator->below = op;
1458	}	1325	}
1459	else	1326	else
…		…
1505	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1506	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1507	* stacking is a bit odd.	1374	* stacking is a bit odd.
1508	*/	1375	*/
1509	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1510	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1511	{	1378	{
1512	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1513	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1514	break;	1381	break;
1515	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1538		1405
1539	if (op->above)	1406	if (op->above)
1540	op->above->below = op;	1407	op->above->below = op;
1541		1408
1542	op->below = NULL;	1409	op->below = NULL;
1543	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1544	}	1411	}
1545	else	1412	else
1546	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1547	op->above = top->above;	1414	op->above = top->above;
1548		1415
…		…
1552	op->below = top;	1419	op->below = top;
1553	top->above = op;	1420	top->above = op;
1554	}	1421	}
1555		1422
1556	if (op->above == NULL)	1423	if (op->above == NULL)
1557	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1558	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1559		1426
1560	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1561	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1562		1429
1563	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1564	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1565	*/	1432	*/
1566	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1567	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = op->ms ().player ())
1568	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1569	tmp->contr->socket.update_look = 1;
1570		1436
1571	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1572	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1573	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1574	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1582		1448
1583	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1584	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1585		1451
1586	/* Don't know if moving this to the end will break anything. However,	1452	/* Don't know if moving this to the end will break anything. However,
1587	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1588	*	1454	*
1589	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1590	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1591	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1592	* update_object().	1458	* update_object().
…		…
1608		1474
1609	return op;	1475	return op;
1610	}	1476	}
1611		1477
1612	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1613	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1614	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1615	*/	1481	*/
1616	void	1482	void
1617	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1618	{	1484	{
1619	object *	1485	object *tmp, *tmp1;
1620	tmp;
1621	object *
1622	tmp1;
1623		1486
1624	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1625		1488
1626	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1627	{
1628	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1629	{	1491	tmp->destroy ();
1630	remove_ob (tmp);
1631	free_object (tmp);
1632	}
1633	}
1634		1492
1635	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1636		1494
1637	tmp1->x = op->x;	1495	tmp1->x = op->x;
1638	tmp1->y = op->y;	1496	tmp1->y = op->y;
1639	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1640	}	1498	}
…		…
1648	*/	1506	*/
1649		1507
1650	object *	1508	object *
1651	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1652	{	1510	{
1653	object *	1511	object *newob;
1654	newob;
1655	int
1656	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1657		1513
1658	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1659	{	1515	{
1660	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1516	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1661	return NULL;	1517	return NULL;
1662	}	1518	}
1663		1519
1664	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1665		1521
1666	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1667	{	1523	orig_ob->destroy (1);
1668	if (!is_removed)
1669	remove_ob (orig_ob);
1670	free_object2 (orig_ob, 1);
1671	}
1672	else if (!is_removed)	1524	else if (!is_removed)
1673	{	1525	{
1674	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1675	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1676	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1528	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1706	if (i > op->nrof)	1558	if (i > op->nrof)
1707	i = op->nrof;	1559	i = op->nrof;
1708		1560
1709	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1710	op->nrof -= i;	1562	op->nrof -= i;
1711	else if (op->env != NULL)	1563	else if (op->env)
1712	{	1564	{
1713	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1714	* therein?	1566	* therein?
1715	*/	1567	*/
1716	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1717	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1718	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1719	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1720	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1721	* and then searching the map for a player.	1573	* and then searching the map for a player.
1722	*/	1574	*/
1723	if (!tmp)	1575	if (!tmp)
1724	{	1576	{
1725	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1726	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1727	break;	1581	break;
1728	if (pl)	1582	}
1729	tmp = pl->ob;
1730	else
1731	tmp = NULL;
1732	}	1583	}
1733		1584
1734	if (i < op->nrof)	1585	if (i < op->nrof)
1735	{	1586	{
1736	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1737	op->nrof -= i;	1588	op->nrof -= i;
1738	if (tmp)	1589	if (tmp)
1739	{
1740	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1741	}
1742	}	1591	}
1743	else	1592	else
1744	{	1593	{
1745	remove_ob (op);	1594	op->remove ();
1746	op->nrof = 0;	1595	op->nrof = 0;
1747	if (tmp)	1596	if (tmp)
1748	{
1749	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1750	}
1751	}	1598	}
1752	}	1599	}
1753	else	1600	else
1754	{	1601	{
1755	object *above = op->above;	1602	object *above = op->above;
1756		1603
1757	if (i < op->nrof)	1604	if (i < op->nrof)
1758	op->nrof -= i;	1605	op->nrof -= i;
1759	else	1606	else
1760	{	1607	{
1761	remove_ob (op);	1608	op->remove ();
1762	op->nrof = 0;	1609	op->nrof = 0;
1763	}	1610	}
1764		1611
1765	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1766	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1767	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1768	{	1615	{
1769	if (op->nrof)	1616	if (op->nrof)
1770	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1771	else	1618	else
…		…
1775		1622
1776	if (op->nrof)	1623	if (op->nrof)
1777	return op;	1624	return op;
1778	else	1625	else
1779	{	1626	{
1780	free_object (op);	1627	op->destroy ();
1781	return NULL;	1628	return 0;
1782	}	1629	}
1783	}	1630	}
1784		1631
1785	/*	1632	/*
1786	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1798	op->carrying += weight;	1645	op->carrying += weight;
1799	op = op->env;	1646	op = op->env;
1800	}	1647	}
1801	}	1648	}
1802		1649
		1650	object *
		1651	insert_ob_in_ob (object *op, object *where)
		1652	{
		1653	if (!where)
		1654	{
		1655	char *dump = dump_object (op);
		1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1657	free (dump);
		1658	return op;
		1659	}
		1660
		1661	if (where->head)
		1662	{
		1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1664	where = where->head;
		1665	}
		1666
		1667	return where->insert (op);
		1668	}
		1669
1803	/*	1670	/*
1804	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1805	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1806	* inside the object environment.	1673	* inside the object environment.
1807	*	1674	*
1808	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1809	* the inventory at the last position or next to other objects of the same
1810	* type.
1811	* Frank: Now sorted by type, archetype and magic!
1812	*
1813	* The function returns now pointer to inserted item, and return value can	1675	* The function returns now pointer to inserted item, and return value can
1814	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1815	*/	1677	*/
1816		1678
1817	object *	1679	object *
1818	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1819	{	1681	{
1820	object *	1682	object *tmp, *otmp;
1821	tmp, *
1822	otmp;
1823		1683
1824	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1825	{	1685	op->remove ();
1826	dump_object (op);
1827	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1828	return op;
1829	}
1830
1831	if (where == NULL)
1832	{
1833	dump_object (op);
1834	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1835	return op;
1836	}
1837
1838	if (where->head)
1839	{
1840	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1841	where = where->head;
1842	}
1843		1686
1844	if (op->more)	1687	if (op->more)
1845	{	1688	{
1846	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1689	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1847	return op;	1690	return op;
…		…
1849		1692
1850	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1851	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1852	if (op->nrof)	1695	if (op->nrof)
1853	{	1696	{
1854	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1855	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1856	{	1699	{
1857	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1858	(client needs the original object) */	1701	(client needs the original object) */
1859	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1860	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1861	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1862	*/	1705	*/
1863	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1864	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1865	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1866	op = tmp;	1709	op = tmp;
1867	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1868	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1869	break;	1712	break;
1870	}	1713	}
1871		1714
1872	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1873	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1874	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1875	* the weight, so we need to add it in again, since we actually do	1718	* the weight, so we need to add it in again, since we actually do
1876	* the linking below	1719	* the linking below
1877	*/	1720	*/
1878	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1879	}	1722	}
1880	else	1723	else
1881	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1882		1725
1883	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1884	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1885	{
1886	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1887	fix_player (otmp);	1729	fix_player (otmp);
1888	}
1889		1730
1890	op->map = NULL;	1731	op->map = 0;
1891	op->env = where;	1732	op->env = this;
1892	op->above = NULL;	1733	op->above = 0;
1893	op->below = NULL;	1734	op->below = 0;
1894	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1895		1736
1896	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1897	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1898	{	1739	{
1899	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1900	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1901	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1902	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1903	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1904	}	1745	}
1905		1746
1906	/* Client has no idea of ordering so lets not bother ordering it here.	1747	/* Client has no idea of ordering so lets not bother ordering it here.
1907	* It sure simplifies this function...	1748	* It sure simplifies this function...
1908	*/	1749	*/
1909	if (where->inv == NULL)	1750	if (!inv)
1910	where->inv = op;	1751	inv = op;
1911	else	1752	else
1912	{	1753	{
1913	op->below = where->inv;	1754	op->below = inv;
1914	op->below->above = op;	1755	op->below->above = op;
1915	where->inv = op;	1756	inv = op;
1916	}	1757	}
		1758
1917	return op;	1759	return op;
1918	}	1760	}
1919		1761
1920	/*	1762	/*
1921	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1939	*/	1781	*/
1940		1782
1941	int	1783	int
1942	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1943	{	1785	{
1944	object *	1786	object *tmp;
1945	tmp;	1787	maptile *m = op->map;
1946	tag_t
1947	tag;
1948	mapstruct *
1949	m = op->map;
1950	int
1951	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1952		1789
1953	MoveType	1790	MoveType move_on, move_slow, move_block;
1954	move_on,
1955	move_slow,
1956	move_block;
1957		1791
1958	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1959	return 0;	1793	return 0;
1960
1961	tag = op->count;
1962		1794
1963	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1795	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1964	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1796	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1965	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1797	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1966		1798
…		…
2027	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2028	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2029	{	1861	{
2030	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
2031		1863
2032	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
2033	return 1;	1865	return 1;
2034		1866
2035	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
2036	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
2037	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2049	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2050	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2051	*/	1883	*/
2052		1884
2053	object *	1885	object *
2054	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2055	{	1887	{
2056	object *	1888	object *
2057	tmp;	1889	tmp;
2058		1890
2059	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2072	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2073	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2074	*/	1906	*/
2075		1907
2076	object *	1908	object *
2077	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2078	{	1910	{
2079	object *	1911	object *
2080	tmp;	1912	tmp;
2081		1913
2082	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2222	* the archetype because that isn't correct if the monster has been	2054	* the archetype because that isn't correct if the monster has been
2223	* customized, changed states, etc.	2055	* customized, changed states, etc.
2224	*/	2056	*/
2225		2057
2226	int	2058	int
2227	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2228	{	2060	{
2229	int	2061	int
2230	i,	2062	i,
2231	index = 0, flag;	2063	index = 0, flag;
2232	static int	2064	static int
…		…
2244	* if the space being examined only has a wall to the north and empty	2076	* if the space being examined only has a wall to the north and empty
2245	* spaces in all the other directions, this will reduce the search space	2077	* spaces in all the other directions, this will reduce the search space
2246	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2247	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2248	*/	2080	*/
2249	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2250	stop = maxfree[i];	2082	stop = maxfree[i];
2251	}	2083	}
		2084
2252	if (!index)	2085	if (!index)
2253	return -1;	2086	return -1;
		2087
2254	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2255	}	2089	}
2256		2090
2257	/*	2091	/*
2258	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2259	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2260	* But it will return the first available spot, not a random choice.	2094	* But it will return the first available spot, not a random choice.
2261	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2262	*/	2096	*/
2263		2097
2264	int	2098	int
2265	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2266	{	2100	{
2267	int	2101	int
2268	i;	2102	i;
2269		2103
2270	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2334	* because we have to know what movement the thing looking to move	2168	* because we have to know what movement the thing looking to move
2335	* there is capable of.	2169	* there is capable of.
2336	*/	2170	*/
2337		2171
2338	int	2172	int
2339	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2340	{	2174	{
2341	int	2175	int
2342	i,	2176	i,
2343	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2344		2178
2345	sint16 nx, ny;	2179	sint16 nx, ny;
2346	object *	2180	object *
2347	tmp;	2181	tmp;
2348	mapstruct *	2182	maptile *
2349	mp;	2183	mp;
2350		2184
2351	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2352		2186
2353	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2366	mp = m;	2200	mp = m;
2367	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2368	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2369		2203
2370	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2371	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2372	{
2373	max = maxfree[i];	2207	max = maxfree[i];
2374	}
2375	else	2208	else
2376	{	2209	{
2377	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2378		2211
2379	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2380	{
2381	max = maxfree[i];	2213	max = maxfree[i];
2382	}
2383	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2384	{	2215	{
2385	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2386	{
2387	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2388	{
2389	break;	2218	break;
2390	}	2219
2391	}
2392	if (tmp)	2220	if (tmp)
2393	{
2394	return freedir[i];	2221	return freedir[i];
2395	}
2396	}	2222	}
2397	}	2223	}
2398	}	2224	}
		2225
2399	return 0;	2226	return 0;
2400	}	2227	}
2401		2228
2402	/*	2229	/*
2403	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2405	*/	2232	*/
2406		2233
2407	int	2234	int
2408	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2409	{	2236	{
2410	int	2237	int i;
2411	i;
2412		2238
2413	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2414	return i;	2240	return i;
2415	}	2241	}
2416		2242
…		…
2421	*/	2247	*/
2422		2248
2423	int	2249	int
2424	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2425	{	2251	{
2426	int	2252	int q;
2427	q;
2428		2253
2429	if (y)	2254	if (y)
2430	q = x * 100 / y;	2255	q = x * 100 / y;
2431	else if (x)	2256	else if (x)
2432	q = -300 * x;	2257	q = -300 * x;
…		…
2558	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2559	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2560	* can see a direct way to get it	2385	* can see a direct way to get it
2561	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2562	*/	2387	*/
2563
2564
2565	int	2388	int
2566	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2567	{	2390	{
2568	sint16 dx, dy;	2391	sint16 dx, dy;
2569	int
2570	mflags;	2392	int mflags;
2571		2393
2572	if (dir < 0)	2394	if (dir < 0)
2573	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2574		2396
2575	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2588	return 0;	2410	return 0;
2589		2411
2590	/* yes, can see. */	2412	/* yes, can see. */
2591	if (dir < 9)	2413	if (dir < 9)
2592	return 1;	2414	return 1;
		2415
2593	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2594	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2417	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2418	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2595	}	2419	}
2596
2597
2598		2420
2599	/*	2421	/*
2600	* can_pick(picker, item): finds out if an object is possible to be	2422	* can_pick(picker, item): finds out if an object is possible to be
2601	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2602	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2613	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2614	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2615	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2437	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2616	}	2438	}
2617		2439
2618
2619	/*	2440	/*
2620	* create clone from object to another	2441	* create clone from object to another
2621	*/	2442	*/
2622	object *	2443	object *
2623	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2624	{	2445	{
2625	object *
2626	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2627		2447
2628	if (!asrc)	2448	if (!asrc)
2629	return NULL;	2449	return 0;
		2450
2630	src = asrc;	2451	src = asrc;
2631	if (src->head)	2452	if (src->head)
2632	src = src->head;	2453	src = src->head;
2633		2454
2634	prev = NULL;	2455	prev = 0;
2635	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2636	{	2457	{
2637	tmp = get_object ();	2458	tmp = part->clone ();
2638	copy_object (part, tmp);
2639	tmp->x -= src->x;	2459	tmp->x -= src->x;
2640	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2641	if (!part->head)	2462	if (!part->head)
2642	{	2463	{
2643	dst = tmp;	2464	dst = tmp;
2644	tmp->head = NULL;	2465	tmp->head = 0;
2645	}	2466	}
2646	else	2467	else
2647	{
2648	tmp->head = dst;	2468	tmp->head = dst;
2649	}	2469
2650	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2651	if (prev)	2472	if (prev)
2652	prev->more = tmp;	2473	prev->more = tmp;
		2474
2653	prev = tmp;	2475	prev = tmp;
2654	}	2476	}
2655		2477
2656	/*** copy inventory ***/
2657	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2658	{
2659	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2660	}
2661		2480
2662	return dst;	2481	return dst;
2663	}	2482	}
2664		2483
2665	/* return true if the object was destroyed, 0 otherwise */
2666	int
2667	was_destroyed (const object *op, tag_t old_tag)
2668	{
2669	/* checking for FLAG_FREED isn't necessary, but makes this function more
2670	* robust */
2671	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2672	}
2673
2674	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2675
2676	/* Basically, we save the content of the string to a temp file, then call */	2485	/* Basically, we save the content of the string to a temp file, then call */
2677
2678	/* load_object on it. I admit it is a highly inefficient way to make things, */	2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2679
2680	/* but it was simple to make and allows reusing the load_object function. */	2487	/* but it was simple to make and allows reusing the load_object function. */
2681
2682	/* Remember not to use load_object_str in a time-critical situation. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2683
2684	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2685		2490
2686	object *	2491	object *
2687	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2688	{	2493	{
2689	object *	2494	object *op;
2690	op;
2691	char
2692	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2693		2496
2694	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2695		2498
2696	FILE *
2697	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2698		2500
2699	if (tempfile == NULL)	2501	if (tempfile == NULL)
2700	{	2502	{
2701	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2702	return NULL;	2504	return NULL;
2703	}	2505	}
2704		2506
2705	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2706	fclose (tempfile);	2508	fclose (tempfile);
2707		2509
2708	op = get_object ();	2510	op = object::create ();
2709		2511
2710	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2711		2513
2712	if (thawer)	2514	if (thawer)
2713	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2723	* returns NULL if no match.	2525	* returns NULL if no match.
2724	*/	2526	*/
2725	object *	2527	object *
2726	find_obj_by_type_subtype (const object *who, int type, int subtype)	2528	find_obj_by_type_subtype (const object *who, int type, int subtype)
2727	{	2529	{
2728	object *	2530	object *tmp;
2729	tmp;
2730		2531
2731	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2732	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2733	return tmp;	2534	return tmp;
2734		2535
…		…
2742	* do the desired thing.	2543	* do the desired thing.
2743	*/	2544	*/
2744	key_value *	2545	key_value *
2745	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2746	{	2547	{
2747	key_value *	2548	key_value *link;
2748	link;
2749		2549
2750	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2751	{
2752	if (link->key == key)	2551	if (link->key == key)
2753	{
2754	return link;	2552	return link;
2755	}
2756	}
2757		2553
2758	return NULL;	2554	return NULL;
2759	}	2555	}
2760		2556
2761	/*	2557	/*

Diff Legend

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