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.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.75 by root, Wed Dec 20 11:36:38 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	}
512		425
513	void	426	void
514	free_all_object_data ()	427	free_all_object_data ()
515	{	428	{
516	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517	}
518
519	/*
520	* Returns the object which this object marks as being the owner.
521	* A id-scheme is used to avoid pointing to objects which have been
522	* freed and are now reused. If this is detected, the owner is
523	* set to NULL, and NULL is returned.
524	* Changed 2004-02-12 - if the player is setting at the play again
525	* prompt, he is removed, and we don't want to treat him as an owner of
526	* anything, so check removed flag. I don't expect that this should break
527	* anything - once an object is removed, it is basically dead anyways.
528	*/
529	object *
530	object::get_owner ()
531	{
532	if (!owner
533	|| QUERY_FLAG (owner, FLAG_FREED)
534	|| QUERY_FLAG (owner, FLAG_REMOVED))
535	owner = 0;
536
537	return owner;
538	}	430	}
539		431
540	/*	432	/*
541	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
542	* skill and experience objects.	434	* skill and experience objects.
…		…
612		504
613	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
614		506
615	expmul = 1.0;	507	expmul = 1.0;
616	face = blank_face;	508	face = blank_face;
617	attacked_by_count = -1;
618		509
619	if (settings.casting_time)	510	if (settings.casting_time)
620	casting_time = -1;	511	casting_time = -1;
621	}	512	}
622		513
623	void object::clone (object *destination)
624	{
625	*(object_copy *)destination = *this;
626	*(object_pod *)destination = *this;
627
628	if (self || cb)
629	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630	}
631
632	/*	514	/*
633	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
634	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
635	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
636	* 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,
637	* 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
638	* will point at garbage.	520	* will point at garbage.
639	*/	521	*/
640	void	522	void
641	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
642	{	524	{
643	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645		527
646	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));
647		533
648	if (is_freed)	534	if (is_freed)
649	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
650	if (is_removed)	537	if (is_removed)
651	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
652		539
653	if (op2->speed < 0)	540	if (speed < 0)
654	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655		542
656	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
657	if (op2->key_values)	544	if (key_values)
658	{	545	{
659	key_value *tail = 0;	546	key_value *tail = 0;
660	key_value *i;	547	key_value *i;
661		548
662	op->key_values = 0;	549	dst->key_values = 0;
663		550
664	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
665	{	552	{
666	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
667		554
668	new_link->next = 0;	555	new_link->next = 0;
669	new_link->key = i->key;	556	new_link->key = i->key;
670	new_link->value = i->value;	557	new_link->value = i->value;
671		558
672	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
673	if (!op->key_values)	560	if (!dst->key_values)
674	{	561	{
675	op->key_values = new_link;	562	dst->key_values = new_link;
676	tail = new_link;	563	tail = new_link;
677	}	564	}
678	else	565	else
679	{	566	{
680	tail->next = new_link;	567	tail->next = new_link;
681	tail = new_link;	568	tail = new_link;
682	}	569	}
683	}	570	}
684	}	571	}
685		572
686	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;
687	}	582	}
688		583
689	/*	584	/*
690	* 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
691	* 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
…		…
799	op->active_next = NULL;	694	op->active_next = NULL;
800	op->active_prev = NULL;	695	op->active_prev = NULL;
801	}	696	}
802		697
803	/*	698	/*
804	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
805	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
806	* 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
807	* invisible object, etc...)	702	* invisible object, etc...)
808	* 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
809	* 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
810	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
811	*	706	*
812	* 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.
813	* For example, if the only thing that has changed is the face (due to
814	* an animation), we don't need to call update_position until that actually
815	* comes into view of a player. OTOH, many other things, like addition/removal
816	* of walls or living creatures may need us to update the flags now.
817	* current action are:	708	* current action are:
818	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
819	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
820	* 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
821	* 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.
822	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
823	*/	714	*/
824
825	void	715	void
826	update_object (object *op, int action)	716	update_object (object *op, int action)
827	{	717	{
828	int update_now = 0, flags;
829	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
830		719
831	if (op == NULL)	720	if (op == NULL)
832	{	721	{
833	/* this should never happen */	722	/* this should never happen */
834	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
835	return;	724	return;
836	}	725	}
837		726
838	if (op->env != NULL)	727	if (op->env)
839	{	728	{
840	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
841	* to do in this case.	730	* to do in this case.
842	*/	731	*/
843	return;	732	return;
…		…
857	abort ();	746	abort ();
858	#endif	747	#endif
859	return;	748	return;
860	}	749	}
861		750
862	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->map->at (op->x, op->y);
863	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
864	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
865	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
866	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
867	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
868		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
869	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
870	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
871	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
872	update_now = 1;
873
874	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
875	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
876		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
877	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
878	update_now = 1;
879
880	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
881	update_now = 1;
882
883	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
884	update_now = 1;
885
886	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
887	update_now = 1;
888
889	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
890	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
891
892	/* 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
893	* to have move_allow right now.	768	* to have move_allow right now.
894	*/	769	*/
895	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
896	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
897		772	m.flags_ = P_NEED_UPDATE;
898	if ((move_slow | op->move_slow) != move_slow)
899	update_now = 1;
900	}	773	}
901	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
902	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
903	* that is being removed.	776	* that is being removed.
904	*/	777	*/
905	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
906	update_now = 1;	779	m.flags_ = P_NEED_UPDATE;
907	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
908	/* Nothing to do for that case */ ;	781	/* Nothing to do for that case */ ;
909	else	782	else
910	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
911		784
912	if (update_now)
913	{
914	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
915	update_position (op->map, op->x, op->y);
916	}
917
918	if (op->more != NULL)	785	if (op->more)
919	update_object (op->more, action);	786	update_object (op->more, action);
920	}	787	}
921		788
922	static unordered_vector<object *> mortals;	789	object::vector object::mortals;
		790	object::vector object::objects; // not yet used
		791	object *object::first;
923		792
924	void object::free_mortals ()	793	void object::free_mortals ()
925	{	794	{
926	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927	if ((*i)->refcnt)	796	if ((*i)->refcnt)
928	++i; // further delay freeing	797	++i; // further delay freeing
929	else	798	else
930	{	799	{
931	delete *i;	800	delete *i;
932	mortals.erase (i);	801	mortals.erase (i);
933	}	802	}
934
935	static int lastmortals = 0;//D
936
937	if (mortals.size() != lastmortals)//D
938	{
939	lastmortals = mortals.size ();//D
940	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941	}
942	}	803	}
943		804
944	object::object ()	805	object::object ()
945	{	806	{
946	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
947		808
948	expmul = 1.0;	809	expmul = 1.0;
949	face = blank_face;	810	face = blank_face;
950	attacked_by_count = -1;
951	}	811	}
952		812
953	object::~object ()	813	object::~object ()
954	{	814	{
955	free_key_values (this);	815	free_key_values (this);
…		…
959	{	819	{
960	count = ++ob_count;	820	count = ++ob_count;
961	uuid = gen_uuid ();	821	uuid = gen_uuid ();
962		822
963	prev = 0;	823	prev = 0;
964	next = objects;	824	next = object::first;
965		825
966	if (objects)	826	if (object::first)
967	objects->prev = this;	827	object::first->prev = this;
968		828
969	objects = this;	829	object::first = this;
970	}	830	}
971		831
972	void object::unlink ()	832	void object::unlink ()
973	{	833	{
974	//count = 0;//D
975	if (!prev && !next) return;//D
976
977	if (this == objects)	834	if (this == object::first)
978	objects = next;	835	object::first = next;
979		836
980	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
981	if (prev) prev->next = next;	838	if (prev) prev->next = next;
982	if (next) next->prev = prev;	839	if (next) next->prev = prev;
983		840
…		…
997	* 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
998	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
999	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
1000	* this function to succeed.	857	* this function to succeed.
1001	*	858	*
1002	* 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
1003	* inventory to the ground.	860	* inventory to the ground.
1004	*/	861	*/
1005	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
1006	{	863	{
1007	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
1008	return;	865	return;
1009		866
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	868	remove_friendly_object (this);
1012		869
1013	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
1014	remove_ob (this);	871	remove ();
1015		872
1016	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
1017		874
1018	if (more)	875	if (more)
1019	{	876	{
1020	more->free (free_inventory);	877	more->destroy (destroy_inventory);
1021	more = 0;	878	more = 0;
1022	}	879	}
1023		880
1024	if (inv)	881	if (inv)
1025	{	882	{
1026	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
1027	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
1028	* drop on that space.	885	* drop on that space.
1029	*/	886	*/
1030	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)
1031	{	888	{
1032	object *op = inv;	889	object *op = inv;
1033		890
1034	while (op)	891	while (op)
1035	{	892	{
1036	object *tmp = op->below;	893	object *tmp = op->below;
1037	op->free (free_inventory);	894	op->destroy (destroy_inventory);
1038	op = tmp;	895	op = tmp;
1039	}	896	}
1040	}	897	}
1041	else	898	else
1042	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
1044		901
1045	while (op)	902	while (op)
1046	{	903	{
1047	object *tmp = op->below;	904	object *tmp = op->below;
1048		905
1049	remove_ob (op);	906	op->remove ();
1050		907
1051	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052	|| 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))
1053	free_object (op);	910	op->destroy ();
1054	else	911	else
1055	{	912	{
1056	op->x = x;	913	op->x = x;
1057	op->y = y;	914	op->y = y;
1058	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 */
…		…
1061	op = tmp;	918	op = tmp;
1062	}	919	}
1063	}	920	}
1064	}	921	}
1065		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
1066	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;
1067		950
1068	/* Remove object from the active list */	951	/* Remove object from the active list */
1069	speed = 0;	952	speed = 0;
1070	update_ob_speed (this);	953	update_ob_speed (this);
1071		954
…		…
1076		959
1077	/*	960	/*
1078	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1079	* 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)).
1080	*/	963	*/
1081
1082	void	964	void
1083	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1084	{	966	{
1085	while (op != NULL)	967	while (op != NULL)
1086	{	968	{
1087	if (op->type == CONTAINER)	969	if (op->type == CONTAINER)
1088	{
1089	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	970	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090	}	971
1091	op->carrying -= weight;	972	op->carrying -= weight;
1092	op = op->env;	973	op = op->env;
1093	}	974	}
1094	}	975	}
1095		976
1096	/* remove_ob(op):	977	/* op->remove ():
1097	* 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
1098	* 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
1099	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1100	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1101	* the previous environment.	982	* the previous environment.
1102	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1103	*/	984	*/
1104
1105	void	985	void
1106	remove_ob (object *op)	986	object::remove ()
1107	{	987	{
		988	object *tmp, *last = 0;
1108	object *	989	object *otmp;
1109	tmp, *
1110	last = NULL;
1111	object *
1112	otmp;
1113		990
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	991	int check_walk_off;
1118	mapstruct *
1119	m;
1120		992
1121	sint16
1122	x,
1123	y;
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	return;	994	return;
1127		995
1128	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1129		997
1130	if (op->more != NULL)	998	if (more)
1131	remove_ob (op->more);	999	more->remove ();
1132		1000
1133	/*	1001	/*
1134	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1135	* inventory.	1003	* inventory.
1136	*/	1004	*/
1137	if (op->env != NULL)	1005	if (env)
1138	{	1006	{
1139	if (op->nrof)	1007	if (nrof)
1140	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1141	else	1009	else
1142	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1143		1011
1144	/* 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
1145	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1146	* to save cpu time.	1014	* to save cpu time.
1147	*/	1015	*/
1148	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))
1149	fix_player (otmp);	1017	fix_player (otmp);
1150		1018
1151	if (op->above != NULL)	1019	if (above != NULL)
1152	op->above->below = op->below;	1020	above->below = below;
1153	else	1021	else
1154	op->env->inv = op->below;	1022	env->inv = below;
1155		1023
1156	if (op->below != NULL)	1024	if (below != NULL)
1157	op->below->above = op->above;	1025	below->above = above;
1158		1026
1159	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1160	* 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
1161	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1162	*/	1030	*/
1163	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1164	op->map = op->env->map;	1032	map = env->map;
1165	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1166	op->env = NULL;	1034	env = 0;
1167	}	1035	}
1168	else if (op->map)	1036	else if (map)
1169	{	1037	{
1170	x = op->x;
1171	y = op->y;
1172	m = get_map_from_coord (op->map, &x, &y);
1173
1174	if (!m)
1175	{
1176	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177	op->map->path, op->x, op->y);
1178	/* in old days, we used to set x and y to 0 and continue.
1179	* it seems if we get into this case, something is probablye
1180	* screwed up and should be fixed.
1181	*/
1182	abort ();
1183	}
1184
1185	if (op->map != m)
1186	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187	op->map->path, m->path, op->x, op->y, x, y);
1188
1189	/* 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
1190	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1191	*/	1040	*/
1192		1041
1193	/* link the object above us */	1042	/* link the object above us */
1194	if (op->above)	1043	if (above)
1195	op->above->below = op->below;	1044	above->below = below;
1196	else	1045	else
1197	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 */
1198		1047
1199	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1200	if (op->below)	1049	if (below)
1201	op->below->above = op->above;	1050	below->above = above;
1202	else	1051	else
1203	{	1052	{
1204	/* 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
1205	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1206	* evident	1055	* evident
1207	*/	1056	*/
1208	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1209	{	1058	{
1210	dump_object (op);	1059	char *dump = dump_object (this);
1211	LOG (llevError,	1060	LOG (llevError,
1212	"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);
1213	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1214	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1215	}	1066	}
1216		1067
1217	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1218	}	1069	}
1219		1070
1220	op->above = 0;	1071	above = 0;
1221	op->below = 0;	1072	below = 0;
1222		1073
1223	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1224	return;	1075	return;
1225		1076
1226	tag = op->count;
1227	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228		1078
1229	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)
1230	{	1080	{
1231	/* 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
1232	* being removed.	1082	* being removed.
1233	*/	1083	*/
1234		1084
1235	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1236	{	1086	{
1237	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1238	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1239	* appropriately.	1089	* appropriately.
1240	*/	1090	*/
1241	if (tmp->container == op)	1091	if (tmp->container == this)
1242	{	1092	{
1243	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1244	tmp->container = NULL;	1094	tmp->container = 0;
1245	}	1095	}
1246		1096
1247	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1248	}	1098	}
1249		1099
1250	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1251	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))
1252	{	1104	{
1253	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1254		1106
1255	if (was_destroyed (op, tag))	1107	if (destroyed ())
1256	{
1257	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 ());
1258	}
1259	}	1109	}
1260		1110
1261	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262		1112
1263	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1264	tmp->above = NULL;	1114	tmp->above = 0;
1265		1115
1266	last = tmp;	1116	last = tmp;
1267	}	1117	}
1268		1118
1269	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1270	if (last == NULL)	1120	if (!last)
1271	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1272	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1274	* those out anyways, and if there are any flags set right now, they won't
1275	* be correct anyways.
1276	*/
1277	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1278	update_position (op->map, op->x, op->y);
1279	}
1280	else	1122	else
1281	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1282		1124
1283	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1285	}	1127	}
1286	}	1128	}
1287		1129
1288	/*	1130	/*
1289	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1304		1146
1305	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1306	{	1148	{
1307	if (top == op)	1149	if (top == op)
1308	continue;	1150	continue;
1309	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1310	{	1153	{
1311	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1312		1155
1313	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1315	remove_ob (op);	1158	op->destroy ();
1316	free_object (op);
1317	return top;	1159	return top;
1318	}	1160	}
1319	}	1161	}
1320		1162
1321	return NULL;	1163	return 0;
1322	}	1164	}
1323		1165
1324	/*	1166	/*
1325	* 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
1326	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1327	*/	1169	*/
1328	object *	1170	object *
1329	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)
1330	{	1172	{
1331	object *tmp;	1173	object *tmp;
1332		1174
1333	if (op->head)	1175	if (op->head)
1334	op = op->head;	1176	op = op->head;
…		…
1362	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1363	* just 'op' otherwise	1205	* just 'op' otherwise
1364	*/	1206	*/
1365		1207
1366	object *	1208	object *
1367	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)
1368	{	1210	{
1369	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1370	sint16 x, y;	1212	sint16 x, y;
1371		1213
1372	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1375	return NULL;	1217	return NULL;
1376	}	1218	}
1377		1219
1378	if (m == NULL)	1220	if (m == NULL)
1379	{	1221	{
1380	dump_object (op);	1222	char *dump = dump_object (op);
1381	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);
1382	return op;	1225	return op;
1383	}	1226	}
1384		1227
1385	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1386	{	1229	{
1387	dump_object (op);	1230	char *dump = dump_object (op);
1388	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);
1389	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1390	/* 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
1391	* 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
1392	* improperly inserted.	1235	* improperly inserted.
1393	*/	1236	*/
1394	abort ();	1237	abort ();
1395	#endif	1238	#endif
		1239	free (dump);
1396	return op;	1240	return op;
1397	}	1241	}
1398		1242
1399	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1400	{	1244	{
1401	dump_object (op);	1245	char *dump = dump_object (op);
1402	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);
1403	return op;	1248	return op;
1404	}	1249	}
1405		1250
1406	if (op->more != NULL)	1251	if (op->more != NULL)
1407	{	1252	{
…		…
1445		1290
1446	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1447	*/	1292	*/
1448	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1449	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)
1450	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1451	{	1296	{
1452	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1453	remove_ob (tmp);	1298	tmp->destroy ();
1454	free_object (tmp);
1455	}	1299	}
1456		1300
1457	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 */
1458	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459		1303
…		…
1472	op->below = originator->below;	1316	op->below = originator->below;
1473		1317
1474	if (op->below)	1318	if (op->below)
1475	op->below->above = op;	1319	op->below->above = op;
1476	else	1320	else
1477	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->map->at (op->x, op->y).bottom = op;
1478		1322
1479	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1480	originator->below = op;	1324	originator->below = op;
1481	}	1325	}
1482	else	1326	else
…		…
1528	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1529	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1530	* stacking is a bit odd.	1374	* stacking is a bit odd.
1531	*/	1375	*/
1532	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1533	(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))
1534	{	1378	{
1535	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1536	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1537	break;	1381	break;
1538	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1561		1405
1562	if (op->above)	1406	if (op->above)
1563	op->above->below = op;	1407	op->above->below = op;
1564		1408
1565	op->below = NULL;	1409	op->below = NULL;
1566	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->map->at (op->x, op->y).bottom = op;
1567	}	1411	}
1568	else	1412	else
1569	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1570	op->above = top->above;	1414	op->above = top->above;
1571		1415
…		…
1575	op->below = top;	1419	op->below = top;
1576	top->above = op;	1420	top->above = op;
1577	}	1421	}
1578		1422
1579	if (op->above == NULL)	1423	if (op->above == NULL)
1580	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->map->at (op->x, op->y).top = op;
1581	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1582		1426
1583	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1584	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1585		1429
1586	/* 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
1587	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1588	*/	1432	*/
1589	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1590	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = op->map->at (op->x, op->y).player ())
1591	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1592	tmp->contr->socket.update_look = 1;
1593		1436
1594	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1595	* 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
1596	* 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
1597	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1605		1448
1606	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1607	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1608		1451
1609	/* 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,
1610	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1611	*	1454	*
1612	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1613	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1614	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1615	* update_object().	1458	* update_object().
…		…
1631		1474
1632	return op;	1475	return op;
1633	}	1476	}
1634		1477
1635	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1636	* 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.
1637	* 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.
1638	*/	1481	*/
1639	void	1482	void
1640	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1641	{	1484	{
1642	object *	1485	object *tmp, *tmp1;
1643	tmp;
1644	object *
1645	tmp1;
1646		1486
1647	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1648		1488
1649	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)
1650	{
1651	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652	{	1491	tmp->destroy ();
1653	remove_ob (tmp);
1654	free_object (tmp);
1655	}
1656	}
1657		1492
1658	tmp1 = arch_to_object (find_archetype (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1659		1494
1660	tmp1->x = op->x;	1495	tmp1->x = op->x;
1661	tmp1->y = op->y;	1496	tmp1->y = op->y;
1662	insert_ob_in_map (tmp1, op->map, op, 0);	1497	insert_ob_in_map (tmp1, op->map, op, 0);
1663	}	1498	}
…		…
1671	*/	1506	*/
1672		1507
1673	object *	1508	object *
1674	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1675	{	1510	{
1676	object *	1511	object *newob;
1677	newob;
1678	int
1679	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680		1513
1681	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1682	{	1515	{
1683	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);
1684	return NULL;	1517	return NULL;
1685	}	1518	}
1686		1519
1687	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1688		1521
1689	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1690	{	1523	orig_ob->destroy (1);
1691	if (!is_removed)
1692	remove_ob (orig_ob);
1693	free_object2 (orig_ob, 1);
1694	}
1695	else if (!is_removed)	1524	else if (!is_removed)
1696	{	1525	{
1697	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1698	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1699	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)
…		…
1729	if (i > op->nrof)	1558	if (i > op->nrof)
1730	i = op->nrof;	1559	i = op->nrof;
1731		1560
1732	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1733	op->nrof -= i;	1562	op->nrof -= i;
1734	else if (op->env != NULL)	1563	else if (op->env)
1735	{	1564	{
1736	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1737	* therein?	1566	* therein?
1738	*/	1567	*/
1739	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1740	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1741	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1742	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1743	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1744	* and then searching the map for a player.	1573	* and then searching the map for a player.
1745	*/	1574	*/
1746	if (!tmp)	1575	if (!tmp)
1747	{	1576	{
1748	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1749	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1750	break;	1581	break;
1751	if (pl)	1582	}
1752	tmp = pl->ob;
1753	else
1754	tmp = NULL;
1755	}	1583	}
1756		1584
1757	if (i < op->nrof)	1585	if (i < op->nrof)
1758	{	1586	{
1759	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1760	op->nrof -= i;	1588	op->nrof -= i;
1761	if (tmp)	1589	if (tmp)
1762	{
1763	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1764	}
1765	}	1591	}
1766	else	1592	else
1767	{	1593	{
1768	remove_ob (op);	1594	op->remove ();
1769	op->nrof = 0;	1595	op->nrof = 0;
1770	if (tmp)	1596	if (tmp)
1771	{
1772	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1773	}
1774	}	1598	}
1775	}	1599	}
1776	else	1600	else
1777	{	1601	{
1778	object *above = op->above;	1602	object *above = op->above;
1779		1603
1780	if (i < op->nrof)	1604	if (i < op->nrof)
1781	op->nrof -= i;	1605	op->nrof -= i;
1782	else	1606	else
1783	{	1607	{
1784	remove_ob (op);	1608	op->remove ();
1785	op->nrof = 0;	1609	op->nrof = 0;
1786	}	1610	}
1787		1611
1788	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1789	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1790	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1791	{	1615	{
1792	if (op->nrof)	1616	if (op->nrof)
1793	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1794	else	1618	else
…		…
1798		1622
1799	if (op->nrof)	1623	if (op->nrof)
1800	return op;	1624	return op;
1801	else	1625	else
1802	{	1626	{
1803	free_object (op);	1627	op->destroy ();
1804	return NULL;	1628	return 0;
1805	}	1629	}
1806	}	1630	}
1807		1631
1808	/*	1632	/*
1809	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1821	op->carrying += weight;	1645	op->carrying += weight;
1822	op = op->env;	1646	op = op->env;
1823	}	1647	}
1824	}	1648	}
1825		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
1826	/*	1670	/*
1827	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1828	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1829	* inside the object environment.	1673	* inside the object environment.
1830	*	1674	*
1831	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832	* the inventory at the last position or next to other objects of the same
1833	* type.
1834	* Frank: Now sorted by type, archetype and magic!
1835	*
1836	* 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
1837	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1838	*/	1677	*/
1839		1678
1840	object *	1679	object *
1841	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1842	{	1681	{
1843	object *	1682	object *tmp, *otmp;
1844	tmp, *
1845	otmp;
1846		1683
1847	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1848	{	1685	op->remove ();
1849	dump_object (op);
1850	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851	return op;
1852	}
1853
1854	if (where == NULL)
1855	{
1856	dump_object (op);
1857	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858	return op;
1859	}
1860
1861	if (where->head)
1862	{
1863	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864	where = where->head;
1865	}
1866		1686
1867	if (op->more)	1687	if (op->more)
1868	{	1688	{
1869	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);
1870	return op;	1690	return op;
…		…
1872		1692
1873	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1875	if (op->nrof)	1695	if (op->nrof)
1876	{	1696	{
1877	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1879	{	1699	{
1880	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1881	(client needs the original object) */	1701	(client needs the original object) */
1882	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1883	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1884	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1885	*/	1705	*/
1886	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1887	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1888	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1889	op = tmp;	1709	op = tmp;
1890	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1892	break;	1712	break;
1893	}	1713	}
1894		1714
1895	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1896	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1897	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1898	* 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
1899	* the linking below	1719	* the linking below
1900	*/	1720	*/
1901	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1902	}	1722	}
1903	else	1723	else
1904	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1905		1725
1906	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1907	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1908	{
1909	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910	fix_player (otmp);	1729	fix_player (otmp);
1911	}
1912		1730
1913	op->map = NULL;	1731	op->map = 0;
1914	op->env = where;	1732	op->env = this;
1915	op->above = NULL;	1733	op->above = 0;
1916	op->below = NULL;	1734	op->below = 0;
1917	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1918		1736
1919	/* 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 */
1920	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1921	{	1739	{
1922	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1923	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);
1924	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1925	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1926	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1927	}	1745	}
1928		1746
1929	/* 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.
1930	* It sure simplifies this function...	1748	* It sure simplifies this function...
1931	*/	1749	*/
1932	if (where->inv == NULL)	1750	if (!inv)
1933	where->inv = op;	1751	inv = op;
1934	else	1752	else
1935	{	1753	{
1936	op->below = where->inv;	1754	op->below = inv;
1937	op->below->above = op;	1755	op->below->above = op;
1938	where->inv = op;	1756	inv = op;
1939	}	1757	}
		1758
1940	return op;	1759	return op;
1941	}	1760	}
1942		1761
1943	/*	1762	/*
1944	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1962	*/	1781	*/
1963		1782
1964	int	1783	int
1965	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1966	{	1785	{
1967	object *	1786	object *tmp;
1968	tmp;	1787	maptile *m = op->map;
1969	tag_t
1970	tag;
1971	mapstruct *
1972	m = op->map;
1973	int
1974	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1975		1789
1976	MoveType	1790	MoveType move_on, move_slow, move_block;
1977	move_on,
1978	move_slow,
1979	move_block;
1980		1791
1981	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982	return 0;	1793	return 0;
1983
1984	tag = op->count;
1985		1794
1986	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);
1987	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);
1988	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);
1989		1798
…		…
2050	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051	((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))
2052	{	1861	{
2053	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
2054		1863
2055	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
2056	return 1;	1865	return 1;
2057		1866
2058	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
2059	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
2060	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2072	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2073	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2074	*/	1883	*/
2075		1884
2076	object *	1885	object *
2077	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2078	{	1887	{
2079	object *	1888	object *
2080	tmp;	1889	tmp;
2081		1890
2082	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2095	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2096	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2097	*/	1906	*/
2098		1907
2099	object *	1908	object *
2100	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2101	{	1910	{
2102	object *	1911	object *
2103	tmp;	1912	tmp;
2104		1913
2105	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2245	* 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
2246	* customized, changed states, etc.	2055	* customized, changed states, etc.
2247	*/	2056	*/
2248		2057
2249	int	2058	int
2250	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)
2251	{	2060	{
2252	int	2061	int
2253	i,	2062	i,
2254	index = 0, flag;	2063	index = 0, flag;
2255	static int	2064	static int
…		…
2267	* 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
2268	* 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
2269	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2270	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2271	*/	2080	*/
2272	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2273	stop = maxfree[i];	2082	stop = maxfree[i];
2274	}	2083	}
		2084
2275	if (!index)	2085	if (!index)
2276	return -1;	2086	return -1;
		2087
2277	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2278	}	2089	}
2279		2090
2280	/*	2091	/*
2281	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2282	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2283	* 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.
2284	* 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.
2285	*/	2096	*/
2286		2097
2287	int	2098	int
2288	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)
2289	{	2100	{
2290	int	2101	int
2291	i;	2102	i;
2292		2103
2293	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2357	* 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
2358	* there is capable of.	2169	* there is capable of.
2359	*/	2170	*/
2360		2171
2361	int	2172	int
2362	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2363	{	2174	{
2364	int	2175	int
2365	i,	2176	i,
2366	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2367		2178
2368	sint16 nx, ny;	2179	sint16 nx, ny;
2369	object *	2180	object *
2370	tmp;	2181	tmp;
2371	mapstruct *	2182	maptile *
2372	mp;	2183	mp;
2373		2184
2374	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2375		2186
2376	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2389	mp = m;	2200	mp = m;
2390	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2391	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2392		2203
2393	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2394	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2395	{
2396	max = maxfree[i];	2207	max = maxfree[i];
2397	}
2398	else	2208	else
2399	{	2209	{
2400	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2401		2211
2402	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2403	{
2404	max = maxfree[i];	2213	max = maxfree[i];
2405	}
2406	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2407	{	2215	{
2408	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)
2409	{
2410	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)))
2411	{
2412	break;	2218	break;
2413	}	2219
2414	}
2415	if (tmp)	2220	if (tmp)
2416	{
2417	return freedir[i];	2221	return freedir[i];
2418	}
2419	}	2222	}
2420	}	2223	}
2421	}	2224	}
		2225
2422	return 0;	2226	return 0;
2423	}	2227	}
2424		2228
2425	/*	2229	/*
2426	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2428	*/	2232	*/
2429		2233
2430	int	2234	int
2431	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2432	{	2236	{
2433	int	2237	int i;
2434	i;
2435		2238
2436	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);
2437	return i;	2240	return i;
2438	}	2241	}
2439		2242
…		…
2444	*/	2247	*/
2445		2248
2446	int	2249	int
2447	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2448	{	2251	{
2449	int	2252	int q;
2450	q;
2451		2253
2452	if (y)	2254	if (y)
2453	q = x * 100 / y;	2255	q = x * 100 / y;
2454	else if (x)	2256	else if (x)
2455	q = -300 * x;	2257	q = -300 * x;
…		…
2581	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2582	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2583	* can see a direct way to get it	2385	* can see a direct way to get it
2584	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2585	*/	2387	*/
2586
2587
2588	int	2388	int
2589	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2590	{	2390	{
2591	sint16 dx, dy;	2391	sint16 dx, dy;
2592	int
2593	mflags;	2392	int mflags;
2594		2393
2595	if (dir < 0)	2394	if (dir < 0)
2596	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2597		2396
2598	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2611	return 0;	2410	return 0;
2612		2411
2613	/* yes, can see. */	2412	/* yes, can see. */
2614	if (dir < 9)	2413	if (dir < 9)
2615	return 1;	2414	return 1;
		2415
2616	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2617	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]);
2618	}	2419	}
2619
2620
2621		2420
2622	/*	2421	/*
2623	* 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
2624	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2625	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2636	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2637	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2638	!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));
2639	}	2438	}
2640		2439
2641
2642	/*	2440	/*
2643	* create clone from object to another	2441	* create clone from object to another
2644	*/	2442	*/
2645	object *	2443	object *
2646	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2647	{	2445	{
2648	object *
2649	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2650		2447
2651	if (!asrc)	2448	if (!asrc)
2652	return NULL;	2449	return 0;
		2450
2653	src = asrc;	2451	src = asrc;
2654	if (src->head)	2452	if (src->head)
2655	src = src->head;	2453	src = src->head;
2656		2454
2657	prev = NULL;	2455	prev = 0;
2658	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2659	{	2457	{
2660	tmp = get_object ();	2458	tmp = part->clone ();
2661	copy_object (part, tmp);
2662	tmp->x -= src->x;	2459	tmp->x -= src->x;
2663	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2664	if (!part->head)	2462	if (!part->head)
2665	{	2463	{
2666	dst = tmp;	2464	dst = tmp;
2667	tmp->head = NULL;	2465	tmp->head = 0;
2668	}	2466	}
2669	else	2467	else
2670	{
2671	tmp->head = dst;	2468	tmp->head = dst;
2672	}	2469
2673	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2674	if (prev)	2472	if (prev)
2675	prev->more = tmp;	2473	prev->more = tmp;
		2474
2676	prev = tmp;	2475	prev = tmp;
2677	}	2476	}
2678		2477
2679	/*** copy inventory ***/
2680	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2681	{
2682	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2683	}
2684		2480
2685	return dst;	2481	return dst;
2686	}	2482	}
2687		2483
2688	/* return true if the object was destroyed, 0 otherwise */
2689	int
2690	was_destroyed (const object *op, tag_t old_tag)
2691	{
2692	/* checking for FLAG_FREED isn't necessary, but makes this function more
2693	* robust */
2694	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695	}
2696
2697	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2698
2699	/* 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 */
2700
2701	/* 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, */
2702
2703	/* 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. */
2704
2705	/* 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. */
2706
2707	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2708		2490
2709	object *	2491	object *
2710	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2711	{	2493	{
2712	object *	2494	object *op;
2713	op;
2714	char
2715	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2716		2496
2717	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718		2498
2719	FILE *
2720	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2721		2500
2722	if (tempfile == NULL)	2501	if (tempfile == NULL)
2723	{	2502	{
2724	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2725	return NULL;	2504	return NULL;
2726	}	2505	}
2727		2506
2728	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2729	fclose (tempfile);	2508	fclose (tempfile);
2730		2509
2731	op = get_object ();	2510	op = object::create ();
2732		2511
2733	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2734		2513
2735	if (thawer)	2514	if (thawer)
2736	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2746	* returns NULL if no match.	2525	* returns NULL if no match.
2747	*/	2526	*/
2748	object *	2527	object *
2749	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)
2750	{	2529	{
2751	object *	2530	object *tmp;
2752	tmp;
2753		2531
2754	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2755	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2756	return tmp;	2534	return tmp;
2757		2535
…		…
2765	* do the desired thing.	2543	* do the desired thing.
2766	*/	2544	*/
2767	key_value *	2545	key_value *
2768	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2769	{	2547	{
2770	key_value *	2548	key_value *link;
2771	link;
2772		2549
2773	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2774	{
2775	if (link->key == key)	2551	if (link->key == key)
2776	{
2777	return link;	2552	return link;
2778	}
2779	}
2780		2553
2781	return NULL;	2554	return NULL;
2782	}	2555	}
2783		2556
2784	/*	2557	/*

Diff Legend

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