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.44 by root, Thu Sep 14 17:29:27 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
1043	// clear those pointers that likely might have circular references to us	943	// clear those pointers that likely might have circular references to us
1044	owner = 0;	944	owner = 0;
1045	enemy = 0;	945	enemy = 0;
1046	attacked_by = 0;	946	attacked_by = 0;
1047		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
		950
1048	/* Remove object from the active list */	951	/* Remove object from the active list */
1049	speed = 0;	952	speed = 0;
1050	update_ob_speed (this);	953	update_ob_speed (this);
1051		954
1052	unlink ();	955	unlink ();
…		…
1056		959
1057	/*	960	/*
1058	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1059	* 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)).
1060	*/	963	*/
1061
1062	void	964	void
1063	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1064	{	966	{
1065	while (op != NULL)	967	while (op != NULL)
1066	{	968	{
1067	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1068	{
1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070	}	971
1071	op->carrying -= weight;	972	op->carrying -= weight;
1072	op = op->env;	973	op = op->env;
1073	}	974	}
1074	}	975	}
1075		976
1076	/* remove_ob(op):	977	/* op->remove ():
1077	* 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
1078	* 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
1079	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	982	* the previous environment.
1082	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1083	*/	984	*/
1084
1085	void	985	void
1086	remove_ob (object *op)	986	object::remove ()
1087	{	987	{
		988	object *tmp, *last = 0;
1088	object *	989	object *otmp;
1089	tmp, *
1090	last = NULL;
1091	object *
1092	otmp;
1093		990
1094	tag_t
1095	tag;
1096	int
1097	check_walk_off;	991	int check_walk_off;
1098	mapstruct *
1099	m;
1100		992
1101	sint16
1102	x,
1103	y;
1104
1105	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1106	return;	994	return;
1107		995
1108	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1109		997
1110	if (op->more != NULL)	998	if (more)
1111	remove_ob (op->more);	999	more->remove ();
1112		1000
1113	/*	1001	/*
1114	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1115	* inventory.	1003	* inventory.
1116	*/	1004	*/
1117	if (op->env != NULL)	1005	if (env)
1118	{	1006	{
1119	if (op->nrof)	1007	if (nrof)
1120	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1121	else	1009	else
1122	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1123		1011
1124	/* 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
1125	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1126	* to save cpu time.	1014	* to save cpu time.
1127	*/	1015	*/
1128	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))
1129	fix_player (otmp);	1017	fix_player (otmp);
1130		1018
1131	if (op->above != NULL)	1019	if (above != NULL)
1132	op->above->below = op->below;	1020	above->below = below;
1133	else	1021	else
1134	op->env->inv = op->below;	1022	env->inv = below;
1135		1023
1136	if (op->below != NULL)	1024	if (below != NULL)
1137	op->below->above = op->above;	1025	below->above = above;
1138		1026
1139	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1140	* 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
1141	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1142	*/	1030	*/
1143	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1144	op->map = op->env->map;	1032	map = env->map;
1145	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1146	op->env = NULL;	1034	env = 0;
1147	}	1035	}
1148	else if (op->map)	1036	else if (map)
1149	{	1037	{
1150	x = op->x;
1151	y = op->y;
1152	m = get_map_from_coord (op->map, &x, &y);
1153
1154	if (!m)
1155	{
1156	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1157	op->map->path, op->x, op->y);
1158	/* in old days, we used to set x and y to 0 and continue.
1159	* it seems if we get into this case, something is probablye
1160	* screwed up and should be fixed.
1161	*/
1162	abort ();
1163	}
1164
1165	if (op->map != m)
1166	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1167	op->map->path, m->path, op->x, op->y, x, y);
1168
1169	/* 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
1170	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1171	*/	1040	*/
1172		1041
1173	/* link the object above us */	1042	/* link the object above us */
1174	if (op->above)	1043	if (above)
1175	op->above->below = op->below;	1044	above->below = below;
1176	else	1045	else
1177	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 */
1178		1047
1179	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1180	if (op->below)	1049	if (below)
1181	op->below->above = op->above;	1050	below->above = above;
1182	else	1051	else
1183	{	1052	{
1184	/* 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
1185	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1186	* evident	1055	* evident
1187	*/	1056	*/
1188	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1189	{	1058	{
1190	dump_object (op);	1059	char *dump = dump_object (this);
1191	LOG (llevError,	1060	LOG (llevError,
1192	"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);
1193	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1194	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1195	}	1066	}
1196		1067
1197	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1198	}	1069	}
1199		1070
1200	op->above = 0;	1071	above = 0;
1201	op->below = 0;	1072	below = 0;
1202		1073
1203	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1204	return;	1075	return;
1205		1076
1206	tag = op->count;
1207	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208		1078
1209	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)
1210	{	1080	{
1211	/* 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
1212	* being removed.	1082	* being removed.
1213	*/	1083	*/
1214		1084
1215	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1216	{	1086	{
1217	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1218	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1219	* appropriately.	1089	* appropriately.
1220	*/	1090	*/
1221	if (tmp->container == op)	1091	if (tmp->container == this)
1222	{	1092	{
1223	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1224	tmp->container = NULL;	1094	tmp->container = 0;
1225	}	1095	}
1226		1096
1227	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1228	}	1098	}
1229		1099
1230	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1231	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))
1232	{	1104	{
1233	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1234		1106
1235	if (was_destroyed (op, tag))	1107	if (destroyed ())
1236	{
1237	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 ());
1238	}
1239	}	1109	}
1240		1110
1241	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242		1112
1243	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1244	tmp->above = NULL;	1114	tmp->above = 0;
1245		1115
1246	last = tmp;	1116	last = tmp;
1247	}	1117	}
1248		1118
1249	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1250	if (last == NULL)	1120	if (!last)
1251	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1252	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1253	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1254	* those out anyways, and if there are any flags set right now, they won't
1255	* be correct anyways.
1256	*/
1257	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1258	update_position (op->map, op->x, op->y);
1259	}
1260	else	1122	else
1261	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1262		1124
1263	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1265	}	1127	}
1266	}	1128	}
1267		1129
1268	/*	1130	/*
1269	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1284		1146
1285	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1286	{	1148	{
1287	if (top == op)	1149	if (top == op)
1288	continue;	1150	continue;
1289	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1290	{	1153	{
1291	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1292		1155
1293	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1294	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1295	remove_ob (op);	1158	op->destroy ();
1296	free_object (op);
1297	return top;	1159	return top;
1298	}	1160	}
1299	}	1161	}
1300		1162
1301	return NULL;	1163	return 0;
1302	}	1164	}
1303		1165
1304	/*	1166	/*
1305	* 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
1306	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1307	*/	1169	*/
1308	object *	1170	object *
1309	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)
1310	{	1172	{
1311	object *tmp;	1173	object *tmp;
1312		1174
1313	if (op->head)	1175	if (op->head)
1314	op = op->head;	1176	op = op->head;
…		…
1342	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1343	* just 'op' otherwise	1205	* just 'op' otherwise
1344	*/	1206	*/
1345		1207
1346	object *	1208	object *
1347	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)
1348	{	1210	{
1349	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1350	sint16 x, y;	1212	sint16 x, y;
1351		1213
1352	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1355	return NULL;	1217	return NULL;
1356	}	1218	}
1357		1219
1358	if (m == NULL)	1220	if (m == NULL)
1359	{	1221	{
1360	dump_object (op);	1222	char *dump = dump_object (op);
1361	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);
1362	return op;	1225	return op;
1363	}	1226	}
1364		1227
1365	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1366	{	1229	{
1367	dump_object (op);	1230	char *dump = dump_object (op);
1368	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);
1369	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1370	/* 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
1371	* 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
1372	* improperly inserted.	1235	* improperly inserted.
1373	*/	1236	*/
1374	abort ();	1237	abort ();
1375	#endif	1238	#endif
		1239	free (dump);
1376	return op;	1240	return op;
1377	}	1241	}
1378		1242
1379	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1380	{	1244	{
1381	dump_object (op);	1245	char *dump = dump_object (op);
1382	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);
1383	return op;	1248	return op;
1384	}	1249	}
1385		1250
1386	if (op->more != NULL)	1251	if (op->more != NULL)
1387	{	1252	{
…		…
1425		1290
1426	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1427	*/	1292	*/
1428	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1429	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)
1430	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1431	{	1296	{
1432	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1433	remove_ob (tmp);	1298	tmp->destroy ();
1434	free_object (tmp);
1435	}	1299	}
1436		1300
1437	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 */
1438	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1439		1303
…		…
1452	op->below = originator->below;	1316	op->below = originator->below;
1453		1317
1454	if (op->below)	1318	if (op->below)
1455	op->below->above = op;	1319	op->below->above = op;
1456	else	1320	else
1457	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->ms ().bottom = op;
1458		1322
1459	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1460	originator->below = op;	1324	originator->below = op;
1461	}	1325	}
1462	else	1326	else
…		…
1508	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1509	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1510	* stacking is a bit odd.	1374	* stacking is a bit odd.
1511	*/	1375	*/
1512	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1513	(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))
1514	{	1378	{
1515	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1516	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1517	break;	1381	break;
1518	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1541		1405
1542	if (op->above)	1406	if (op->above)
1543	op->above->below = op;	1407	op->above->below = op;
1544		1408
1545	op->below = NULL;	1409	op->below = NULL;
1546	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->ms ().bottom = op;
1547	}	1411	}
1548	else	1412	else
1549	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1550	op->above = top->above;	1414	op->above = top->above;
1551		1415
…		…
1555	op->below = top;	1419	op->below = top;
1556	top->above = op;	1420	top->above = op;
1557	}	1421	}
1558		1422
1559	if (op->above == NULL)	1423	if (op->above == NULL)
1560	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->ms ().top = op;
1561	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1562		1426
1563	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1564	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1565		1429
1566	/* 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
1567	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1568	*/	1432	*/
1569	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1570	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 ())
1571	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1572	tmp->contr->socket.update_look = 1;
1573		1436
1574	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1575	* 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
1576	* 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
1577	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1585		1448
1586	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1587	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1588		1451
1589	/* 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,
1590	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1591	*	1454	*
1592	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1593	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1594	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1595	* update_object().	1458	* update_object().
…		…
1611		1474
1612	return op;	1475	return op;
1613	}	1476	}
1614		1477
1615	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1616	* 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.
1617	* 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.
1618	*/	1481	*/
1619	void	1482	void
1620	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1621	{	1484	{
1622	object *	1485	object *tmp, *tmp1;
1623	tmp;
1624	object *
1625	tmp1;
1626		1486
1627	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1628		1488
1629	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)
1630	{
1631	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1632	{	1491	tmp->destroy ();
1633	remove_ob (tmp);
1634	free_object (tmp);
1635	}
1636	}
1637		1492
1638	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1639		1494
1640	tmp1->x = op->x;	1495	tmp1->x = op->x;
1641	tmp1->y = op->y;	1496	tmp1->y = op->y;
1642	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1643	}	1498	}
…		…
1651	*/	1506	*/
1652		1507
1653	object *	1508	object *
1654	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1655	{	1510	{
1656	object *	1511	object *newob;
1657	newob;
1658	int
1659	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1660		1513
1661	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1662	{	1515	{
1663	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);
1664	return NULL;	1517	return NULL;
1665	}	1518	}
1666		1519
1667	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1668		1521
1669	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1670	{	1523	orig_ob->destroy (1);
1671	if (!is_removed)
1672	remove_ob (orig_ob);
1673	free_object2 (orig_ob, 1);
1674	}
1675	else if (!is_removed)	1524	else if (!is_removed)
1676	{	1525	{
1677	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1678	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1679	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)
…		…
1709	if (i > op->nrof)	1558	if (i > op->nrof)
1710	i = op->nrof;	1559	i = op->nrof;
1711		1560
1712	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1713	op->nrof -= i;	1562	op->nrof -= i;
1714	else if (op->env != NULL)	1563	else if (op->env)
1715	{	1564	{
1716	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1717	* therein?	1566	* therein?
1718	*/	1567	*/
1719	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1720	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1721	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1722	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1723	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1724	* and then searching the map for a player.	1573	* and then searching the map for a player.
1725	*/	1574	*/
1726	if (!tmp)	1575	if (!tmp)
1727	{	1576	{
1728	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1729	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1730	break;	1581	break;
1731	if (pl)	1582	}
1732	tmp = pl->ob;
1733	else
1734	tmp = NULL;
1735	}	1583	}
1736		1584
1737	if (i < op->nrof)	1585	if (i < op->nrof)
1738	{	1586	{
1739	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1740	op->nrof -= i;	1588	op->nrof -= i;
1741	if (tmp)	1589	if (tmp)
1742	{
1743	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1744	}
1745	}	1591	}
1746	else	1592	else
1747	{	1593	{
1748	remove_ob (op);	1594	op->remove ();
1749	op->nrof = 0;	1595	op->nrof = 0;
1750	if (tmp)	1596	if (tmp)
1751	{
1752	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1753	}
1754	}	1598	}
1755	}	1599	}
1756	else	1600	else
1757	{	1601	{
1758	object *above = op->above;	1602	object *above = op->above;
1759		1603
1760	if (i < op->nrof)	1604	if (i < op->nrof)
1761	op->nrof -= i;	1605	op->nrof -= i;
1762	else	1606	else
1763	{	1607	{
1764	remove_ob (op);	1608	op->remove ();
1765	op->nrof = 0;	1609	op->nrof = 0;
1766	}	1610	}
1767		1611
1768	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1769	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1770	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1771	{	1615	{
1772	if (op->nrof)	1616	if (op->nrof)
1773	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1774	else	1618	else
…		…
1778		1622
1779	if (op->nrof)	1623	if (op->nrof)
1780	return op;	1624	return op;
1781	else	1625	else
1782	{	1626	{
1783	free_object (op);	1627	op->destroy ();
1784	return NULL;	1628	return 0;
1785	}	1629	}
1786	}	1630	}
1787		1631
1788	/*	1632	/*
1789	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1801	op->carrying += weight;	1645	op->carrying += weight;
1802	op = op->env;	1646	op = op->env;
1803	}	1647	}
1804	}	1648	}
1805		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
1806	/*	1670	/*
1807	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1808	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1809	* inside the object environment.	1673	* inside the object environment.
1810	*	1674	*
1811	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1812	* the inventory at the last position or next to other objects of the same
1813	* type.
1814	* Frank: Now sorted by type, archetype and magic!
1815	*
1816	* 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
1817	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1818	*/	1677	*/
1819		1678
1820	object *	1679	object *
1821	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1822	{	1681	{
1823	object *	1682	object *tmp, *otmp;
1824	tmp, *
1825	otmp;
1826		1683
1827	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1828	{	1685	op->remove ();
1829	dump_object (op);
1830	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1831	return op;
1832	}
1833
1834	if (where == NULL)
1835	{
1836	dump_object (op);
1837	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1838	return op;
1839	}
1840
1841	if (where->head)
1842	{
1843	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1844	where = where->head;
1845	}
1846		1686
1847	if (op->more)	1687	if (op->more)
1848	{	1688	{
1849	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);
1850	return op;	1690	return op;
…		…
1852		1692
1853	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1855	if (op->nrof)	1695	if (op->nrof)
1856	{	1696	{
1857	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1859	{	1699	{
1860	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1861	(client needs the original object) */	1701	(client needs the original object) */
1862	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1863	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1864	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1865	*/	1705	*/
1866	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1867	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1868	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1869	op = tmp;	1709	op = tmp;
1870	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1871	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1872	break;	1712	break;
1873	}	1713	}
1874		1714
1875	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1876	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1877	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1878	* 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
1879	* the linking below	1719	* the linking below
1880	*/	1720	*/
1881	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1882	}	1722	}
1883	else	1723	else
1884	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1885		1725
1886	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1887	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1888	{
1889	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890	fix_player (otmp);	1729	fix_player (otmp);
1891	}
1892		1730
1893	op->map = NULL;	1731	op->map = 0;
1894	op->env = where;	1732	op->env = this;
1895	op->above = NULL;	1733	op->above = 0;
1896	op->below = NULL;	1734	op->below = 0;
1897	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1898		1736
1899	/* 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 */
1900	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1901	{	1739	{
1902	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1903	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);
1904	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1905	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1906	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1907	}	1745	}
1908		1746
1909	/* 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.
1910	* It sure simplifies this function...	1748	* It sure simplifies this function...
1911	*/	1749	*/
1912	if (where->inv == NULL)	1750	if (!inv)
1913	where->inv = op;	1751	inv = op;
1914	else	1752	else
1915	{	1753	{
1916	op->below = where->inv;	1754	op->below = inv;
1917	op->below->above = op;	1755	op->below->above = op;
1918	where->inv = op;	1756	inv = op;
1919	}	1757	}
		1758
1920	return op;	1759	return op;
1921	}	1760	}
1922		1761
1923	/*	1762	/*
1924	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1942	*/	1781	*/
1943		1782
1944	int	1783	int
1945	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1946	{	1785	{
1947	object *	1786	object *tmp;
1948	tmp;	1787	maptile *m = op->map;
1949	tag_t
1950	tag;
1951	mapstruct *
1952	m = op->map;
1953	int
1954	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1955		1789
1956	MoveType	1790	MoveType move_on, move_slow, move_block;
1957	move_on,
1958	move_slow,
1959	move_block;
1960		1791
1961	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962	return 0;	1793	return 0;
1963
1964	tag = op->count;
1965		1794
1966	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);
1967	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);
1968	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);
1969		1798
…		…
2030	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031	((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))
2032	{	1861	{
2033	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
2034		1863
2035	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
2036	return 1;	1865	return 1;
2037		1866
2038	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
2039	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
2040	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2052	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2053	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2054	*/	1883	*/
2055		1884
2056	object *	1885	object *
2057	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2058	{	1887	{
2059	object *	1888	object *
2060	tmp;	1889	tmp;
2061		1890
2062	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2075	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2076	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2077	*/	1906	*/
2078		1907
2079	object *	1908	object *
2080	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2081	{	1910	{
2082	object *	1911	object *
2083	tmp;	1912	tmp;
2084		1913
2085	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2225	* 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
2226	* customized, changed states, etc.	2055	* customized, changed states, etc.
2227	*/	2056	*/
2228		2057
2229	int	2058	int
2230	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)
2231	{	2060	{
2232	int	2061	int
2233	i,	2062	i,
2234	index = 0, flag;	2063	index = 0, flag;
2235	static int	2064	static int
…		…
2247	* 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
2248	* 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
2249	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2250	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2251	*/	2080	*/
2252	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2253	stop = maxfree[i];	2082	stop = maxfree[i];
2254	}	2083	}
		2084
2255	if (!index)	2085	if (!index)
2256	return -1;	2086	return -1;
		2087
2257	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2258	}	2089	}
2259		2090
2260	/*	2091	/*
2261	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2262	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2263	* 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.
2264	* 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.
2265	*/	2096	*/
2266		2097
2267	int	2098	int
2268	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)
2269	{	2100	{
2270	int	2101	int
2271	i;	2102	i;
2272		2103
2273	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2337	* 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
2338	* there is capable of.	2169	* there is capable of.
2339	*/	2170	*/
2340		2171
2341	int	2172	int
2342	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2343	{	2174	{
2344	int	2175	int
2345	i,	2176	i,
2346	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2347		2178
2348	sint16 nx, ny;	2179	sint16 nx, ny;
2349	object *	2180	object *
2350	tmp;	2181	tmp;
2351	mapstruct *	2182	maptile *
2352	mp;	2183	mp;
2353		2184
2354	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2355		2186
2356	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2369	mp = m;	2200	mp = m;
2370	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2371	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2372		2203
2373	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2374	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2375	{
2376	max = maxfree[i];	2207	max = maxfree[i];
2377	}
2378	else	2208	else
2379	{	2209	{
2380	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2381		2211
2382	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2383	{
2384	max = maxfree[i];	2213	max = maxfree[i];
2385	}
2386	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2387	{	2215	{
2388	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)
2389	{
2390	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)))
2391	{
2392	break;	2218	break;
2393	}	2219
2394	}
2395	if (tmp)	2220	if (tmp)
2396	{
2397	return freedir[i];	2221	return freedir[i];
2398	}
2399	}	2222	}
2400	}	2223	}
2401	}	2224	}
		2225
2402	return 0;	2226	return 0;
2403	}	2227	}
2404		2228
2405	/*	2229	/*
2406	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2408	*/	2232	*/
2409		2233
2410	int	2234	int
2411	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2412	{	2236	{
2413	int	2237	int i;
2414	i;
2415		2238
2416	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);
2417	return i;	2240	return i;
2418	}	2241	}
2419		2242
…		…
2424	*/	2247	*/
2425		2248
2426	int	2249	int
2427	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2428	{	2251	{
2429	int	2252	int q;
2430	q;
2431		2253
2432	if (y)	2254	if (y)
2433	q = x * 100 / y;	2255	q = x * 100 / y;
2434	else if (x)	2256	else if (x)
2435	q = -300 * x;	2257	q = -300 * x;
…		…
2561	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2562	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2563	* can see a direct way to get it	2385	* can see a direct way to get it
2564	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2565	*/	2387	*/
2566
2567
2568	int	2388	int
2569	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2570	{	2390	{
2571	sint16 dx, dy;	2391	sint16 dx, dy;
2572	int
2573	mflags;	2392	int mflags;
2574		2393
2575	if (dir < 0)	2394	if (dir < 0)
2576	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2577		2396
2578	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2591	return 0;	2410	return 0;
2592		2411
2593	/* yes, can see. */	2412	/* yes, can see. */
2594	if (dir < 9)	2413	if (dir < 9)
2595	return 1;	2414	return 1;
		2415
2596	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2597	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]);
2598	}	2419	}
2599
2600
2601		2420
2602	/*	2421	/*
2603	* 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
2604	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2605	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2616	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2617	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2618	!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));
2619	}	2438	}
2620		2439
2621
2622	/*	2440	/*
2623	* create clone from object to another	2441	* create clone from object to another
2624	*/	2442	*/
2625	object *	2443	object *
2626	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2627	{	2445	{
2628	object *
2629	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2630		2447
2631	if (!asrc)	2448	if (!asrc)
2632	return NULL;	2449	return 0;
		2450
2633	src = asrc;	2451	src = asrc;
2634	if (src->head)	2452	if (src->head)
2635	src = src->head;	2453	src = src->head;
2636		2454
2637	prev = NULL;	2455	prev = 0;
2638	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2639	{	2457	{
2640	tmp = get_object ();	2458	tmp = part->clone ();
2641	copy_object (part, tmp);
2642	tmp->x -= src->x;	2459	tmp->x -= src->x;
2643	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2644	if (!part->head)	2462	if (!part->head)
2645	{	2463	{
2646	dst = tmp;	2464	dst = tmp;
2647	tmp->head = NULL;	2465	tmp->head = 0;
2648	}	2466	}
2649	else	2467	else
2650	{
2651	tmp->head = dst;	2468	tmp->head = dst;
2652	}	2469
2653	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2654	if (prev)	2472	if (prev)
2655	prev->more = tmp;	2473	prev->more = tmp;
		2474
2656	prev = tmp;	2475	prev = tmp;
2657	}	2476	}
2658		2477
2659	/*** copy inventory ***/
2660	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2661	{
2662	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2663	}
2664		2480
2665	return dst;	2481	return dst;
2666	}	2482	}
2667		2483
2668	/* return true if the object was destroyed, 0 otherwise */
2669	int
2670	was_destroyed (const object *op, tag_t old_tag)
2671	{
2672	/* checking for FLAG_FREED isn't necessary, but makes this function more
2673	* robust */
2674	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675	}
2676
2677	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2678
2679	/* 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 */
2680
2681	/* 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, */
2682
2683	/* 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. */
2684
2685	/* 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. */
2686
2687	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2688		2490
2689	object *	2491	object *
2690	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2691	{	2493	{
2692	object *	2494	object *op;
2693	op;
2694	char
2695	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2696		2496
2697	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698		2498
2699	FILE *
2700	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2701		2500
2702	if (tempfile == NULL)	2501	if (tempfile == NULL)
2703	{	2502	{
2704	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2705	return NULL;	2504	return NULL;
2706	}	2505	}
2707		2506
2708	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2709	fclose (tempfile);	2508	fclose (tempfile);
2710		2509
2711	op = get_object ();	2510	op = object::create ();
2712		2511
2713	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2714		2513
2715	if (thawer)	2514	if (thawer)
2716	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2726	* returns NULL if no match.	2525	* returns NULL if no match.
2727	*/	2526	*/
2728	object *	2527	object *
2729	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)
2730	{	2529	{
2731	object *	2530	object *tmp;
2732	tmp;
2733		2531
2734	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2735	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2736	return tmp;	2534	return tmp;
2737		2535
…		…
2745	* do the desired thing.	2543	* do the desired thing.
2746	*/	2544	*/
2747	key_value *	2545	key_value *
2748	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2749	{	2547	{
2750	key_value *	2548	key_value *link;
2751	link;
2752		2549
2753	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2754	{
2755	if (link->key == key)	2551	if (link->key == key)
2756	{
2757	return link;	2552	return link;
2758	}
2759	}
2760		2553
2761	return NULL;	2554	return NULL;
2762	}	2555	}
2763		2556
2764	/*	2557	/*

Diff Legend

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