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.79 by root, Sat Dec 23 06:30: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	}
…		…
554	}	467	}
555		468
556	op->key_values = 0;	469	op->key_values = 0;
557	}	470	}
558		471
559	void object::clear ()
560	{
561	attachable_base::clear ();
562
563	free_key_values (this);
564
565	owner = 0;
566	name = 0;
567	name_pl = 0;
568	title = 0;
569	race = 0;
570	slaying = 0;
571	skill = 0;
572	msg = 0;
573	lore = 0;
574	custom_name = 0;
575	materialname = 0;
576	contr = 0;
577	below = 0;
578	above = 0;
579	inv = 0;
580	container = 0;
581	env = 0;
582	more = 0;
583	head = 0;
584	map = 0;
585	active_next = 0;
586	active_prev = 0;
587
588	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
589
590	SET_FLAG (this, FLAG_REMOVED);
591
592	/* What is not cleared is next, prev, and count */
593
594	expmul = 1.0;
595	face = blank_face;
596
597	if (settings.casting_time)
598	casting_time = -1;
599	}
600
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	/*	472	/*
611	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* 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	477	* if the first object is freed, the pointers in the new object
616	* will point at garbage.	478	* will point at garbage.
617	*/	479	*/
618	void	480	void
619	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
620	{	482	{
621	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
622	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
623		485
624	op2->clone (op);	486	*(object_copy *)dst = *this;
		487
		488	if (self || cb)
		489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
625		490
626	if (is_freed)	491	if (is_freed)
627	SET_FLAG (op, FLAG_FREED);	492	SET_FLAG (dst, FLAG_FREED);
		493
628	if (is_removed)	494	if (is_removed)
629	SET_FLAG (op, FLAG_REMOVED);	495	SET_FLAG (dst, FLAG_REMOVED);
630		496
631	if (op2->speed < 0)	497	if (speed < 0)
632	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
633		499
634	/* Copy over key_values, if any. */	500	/* Copy over key_values, if any. */
635	if (op2->key_values)	501	if (key_values)
636	{	502	{
637	key_value *tail = 0;	503	key_value *tail = 0;
638	key_value *i;	504	key_value *i;
639		505
640	op->key_values = 0;	506	dst->key_values = 0;
641		507
642	for (i = op2->key_values; i; i = i->next)	508	for (i = key_values; i; i = i->next)
643	{	509	{
644	key_value *new_link = new key_value;	510	key_value *new_link = new key_value;
645		511
646	new_link->next = 0;	512	new_link->next = 0;
647	new_link->key = i->key;	513	new_link->key = i->key;
648	new_link->value = i->value;	514	new_link->value = i->value;
649		515
650	/* Try and be clever here, too. */	516	/* Try and be clever here, too. */
651	if (!op->key_values)	517	if (!dst->key_values)
652	{	518	{
653	op->key_values = new_link;	519	dst->key_values = new_link;
654	tail = new_link;	520	tail = new_link;
655	}	521	}
656	else	522	else
657	{	523	{
658	tail->next = new_link;	524	tail->next = new_link;
659	tail = new_link;	525	tail = new_link;
660	}	526	}
661	}	527	}
662	}	528	}
663		529
664	update_ob_speed (op);	530	update_ob_speed (dst);
		531	}
		532
		533	object *
		534	object::clone ()
		535	{
		536	object *neu = create ();
		537	copy_to (neu);
		538	return neu;
665	}	539	}
666		540
667	/*	541	/*
668	* If an object with the IS_TURNABLE() flag needs to be turned due	542	* 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	543	* to the closest player being on the other side, this function can
…		…
777	op->active_next = NULL;	651	op->active_next = NULL;
778	op->active_prev = NULL;	652	op->active_prev = NULL;
779	}	653	}
780		654
781	/*	655	/*
782	* update_object() updates the array which represents the map.	656	* update_object() updates the the map.
783	* It takes into account invisible objects (and represent squares covered	657	* It takes into account invisible objects (and represent squares covered
784	* by invisible objects by whatever is below them (unless it's another	658	* by invisible objects by whatever is below them (unless it's another
785	* invisible object, etc...)	659	* invisible object, etc...)
786	* If the object being updated is beneath a player, the look-window	660	* 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	661	* of that player is updated (this might be a suboptimal way of
788	* updating that window, though, since update_object() is called _often_)	662	* updating that window, though, since update_object() is called _often_)
789	*	663	*
790	* action is a hint of what the caller believes need to be done.	664	* 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:	665	* current action are:
796	* UP_OBJ_INSERT: op was inserted	666	* UP_OBJ_INSERT: op was inserted
797	* UP_OBJ_REMOVE: op was removed	667	* UP_OBJ_REMOVE: op was removed
798	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	668	* 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.	669	* as that is easier than trying to look at what may have changed.
800	* UP_OBJ_FACE: only the objects face has changed.	670	* UP_OBJ_FACE: only the objects face has changed.
801	*/	671	*/
802
803	void	672	void
804	update_object (object *op, int action)	673	update_object (object *op, int action)
805	{	674	{
806	int update_now = 0, flags;
807	MoveType move_on, move_off, move_block, move_slow;	675	MoveType move_on, move_off, move_block, move_slow;
808		676
809	if (op == NULL)	677	if (op == NULL)
810	{	678	{
811	/* this should never happen */	679	/* this should never happen */
812	LOG (llevDebug, "update_object() called for NULL object.\n");	680	LOG (llevDebug, "update_object() called for NULL object.\n");
813	return;	681	return;
814	}	682	}
815		683
816	if (op->env != NULL)	684	if (op->env)
817	{	685	{
818	/* Animation is currently handled by client, so nothing	686	/* Animation is currently handled by client, so nothing
819	* to do in this case.	687	* to do in this case.
820	*/	688	*/
821	return;	689	return;
…		…
835	abort ();	703	abort ();
836	#endif	704	#endif
837	return;	705	return;
838	}	706	}
839		707
840	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	708	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		709
		710	if (m.flags_ & P_NEED_UPDATE)
		711	/* nop */;
847	if (action == UP_OBJ_INSERT)	712	else if (action == UP_OBJ_INSERT)
848	{	713	{
		714	// this is likely overkill, TODO: revisit (schmorp)
849	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	715	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))	716	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
853	update_now = 1;	717	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
854		718	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		719	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
855	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	720	|| (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)	721	|| (m.move_on | op->move_on ) != m.move_on
865	update_now = 1;
866
867	if ((move_off | op->move_off) != move_off)	722	|| (m.move_off | op->move_off ) != m.move_off
868	update_now = 1;	723	|| (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	724	/* This isn't perfect, but I don't expect a lot of objects to
871	* to have move_allow right now.	725	* to have move_allow right now.
872	*/	726	*/
873	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
874	update_now = 1;	728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
875		729	m.flags_ = P_NEED_UPDATE;
876	if ((move_slow | op->move_slow) != move_slow)
877	update_now = 1;
878	}	730	}
879	/* if the object is being removed, we can't make intelligent	731	/* if the object is being removed, we can't make intelligent
880	* decisions, because remove_ob can't really pass the object	732	* decisions, because remove_ob can't really pass the object
881	* that is being removed.	733	* that is being removed.
882	*/	734	*/
883	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
884	update_now = 1;	736	m.flags_ = P_NEED_UPDATE;
885	else if (action == UP_OBJ_FACE)	737	else if (action == UP_OBJ_FACE)
886	/* Nothing to do for that case */ ;	738	/* Nothing to do for that case */ ;
887	else	739	else
888	LOG (llevError, "update_object called with invalid action: %d\n", action);	740	LOG (llevError, "update_object called with invalid action: %d\n", action);
889		741
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)	742	if (op->more)
897	update_object (op->more, action);	743	update_object (op->more, action);
898	}	744	}
899		745
900	static unordered_vector<object *> mortals;	746	object::vector object::mortals;
		747	object::vector object::objects; // not yet used
		748	object *object::first;
901		749
902	void object::free_mortals ()	750	void object::free_mortals ()
903	{	751	{
904	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905	if ((*i)->refcnt)	753	if ((*i)->refcnt)
906	++i; // further delay freeing	754	++i; // further delay freeing
907	else	755	else
908	{	756	{
909	delete *i;	757	delete *i;
910	mortals.erase (i);	758	mortals.erase (i);
911	}	759	}
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	}	760	}
921		761
922	object::object ()	762	object::object ()
923	{	763	{
924	SET_FLAG (this, FLAG_REMOVED);	764	SET_FLAG (this, FLAG_REMOVED);
…		…
936	{	776	{
937	count = ++ob_count;	777	count = ++ob_count;
938	uuid = gen_uuid ();	778	uuid = gen_uuid ();
939		779
940	prev = 0;	780	prev = 0;
941	next = objects;	781	next = object::first;
942		782
943	if (objects)	783	if (object::first)
944	objects->prev = this;	784	object::first->prev = this;
945		785
946	objects = this;	786	object::first = this;
947	}	787	}
948		788
949	void object::unlink ()	789	void object::unlink ()
950	{	790	{
951	//count = 0;//D
952	if (!prev && !next) return;//D
953
954	if (this == objects)	791	if (this == object::first)
955	objects = next;	792	object::first = next;
956		793
957	/* Remove this object from the list of used objects */	794	/* Remove this object from the list of used objects */
958	if (prev) prev->next = next;	795	if (prev) prev->next = next;
959	if (next) next->prev = prev;	796	if (next) next->prev = prev;
960		797
…		…
974	* it from the list of used objects, and puts it on the list of	811	* 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.	812	* free objects. The IS_FREED() flag is set in the object.
976	* The object must have been removed by remove_ob() first for	813	* The object must have been removed by remove_ob() first for
977	* this function to succeed.	814	* this function to succeed.
978	*	815	*
979	* If free_inventory is set, free inventory as well. Else drop items in	816	* If destroy_inventory is set, free inventory as well. Else drop items in
980	* inventory to the ground.	817	* inventory to the ground.
981	*/	818	*/
982	void object::free (bool free_inventory)	819	void object::destroy (bool destroy_inventory)
983	{	820	{
984	if (QUERY_FLAG (this, FLAG_FREED))	821	if (QUERY_FLAG (this, FLAG_FREED))
985	return;	822	return;
986		823
987	if (QUERY_FLAG (this, FLAG_FRIENDLY))	824	if (QUERY_FLAG (this, FLAG_FRIENDLY))
988	remove_friendly_object (this);	825	remove_friendly_object (this);
989		826
990	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (!QUERY_FLAG (this, FLAG_REMOVED))
991	remove_ob (this);	828	remove ();
992		829
993	SET_FLAG (this, FLAG_FREED);	830	SET_FLAG (this, FLAG_FREED);
994		831
995	if (more)	832	if (more)
996	{	833	{
997	more->free (free_inventory);	834	more->destroy (destroy_inventory);
998	more = 0;	835	more = 0;
999	}	836	}
1000		837
1001	if (inv)	838	if (inv)
1002	{	839	{
1003	/* Only if the space blocks everything do we not process -	840	/* Only if the space blocks everything do we not process -
1004	* if some form of movement is allowed, let objects	841	* if some form of movement is allowed, let objects
1005	* drop on that space.	842	* drop on that space.
1006	*/	843	*/
1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1008	{	845	{
1009	object *op = inv;	846	object *op = inv;
1010		847
1011	while (op)	848	while (op)
1012	{	849	{
1013	object *tmp = op->below;	850	object *tmp = op->below;
1014	op->free (free_inventory);	851	op->destroy (destroy_inventory);
1015	op = tmp;	852	op = tmp;
1016	}	853	}
1017	}	854	}
1018	else	855	else
1019	{ /* Put objects in inventory onto this space */	856	{ /* Put objects in inventory onto this space */
…		…
1021		858
1022	while (op)	859	while (op)
1023	{	860	{
1024	object *tmp = op->below;	861	object *tmp = op->below;
1025		862
1026	remove_ob (op);	863	op->remove ();
1027		864
1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	865	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))	866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1030	free_object (op);	867	op->destroy ();
1031	else	868	else
1032	{	869	{
1033	op->x = x;	870	op->x = x;
1034	op->y = y;	871	op->y = y;
1035	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1038	op = tmp;	875	op = tmp;
1039	}	876	}
1040	}	877	}
1041	}	878	}
1042		879
		880	// hack to ensure that freed objects still have a valid map
		881	{
		882	static maptile *freed_map; // freed objects are moved here to avoid crashes
		883
		884	if (!freed_map)
		885	{
		886	freed_map = new maptile;
		887
		888	freed_map->name = "/internal/freed_objects_map";
		889	freed_map->width = 3;
		890	freed_map->height = 3;
		891
		892	freed_map->allocate ();
		893	}
		894
		895	map = freed_map;
		896	x = 1;
		897	y = 1;
		898	}
		899
1043	// clear those pointers that likely might have circular references to us	900	// clear those pointers that likely might have circular references to us
1044	owner = 0;	901	owner = 0;
1045	enemy = 0;	902	enemy = 0;
1046	attacked_by = 0;	903	attacked_by = 0;
1047		904
		905	// only relevant for players(?), but make sure of it anyways
		906	contr = 0;
		907
1048	/* Remove object from the active list */	908	/* Remove object from the active list */
1049	speed = 0;	909	speed = 0;
1050	update_ob_speed (this);	910	update_ob_speed (this);
1051		911
1052	unlink ();	912	unlink ();
…		…
1056		916
1057	/*	917	/*
1058	* sub_weight() recursively (outwards) subtracts a number from the	918	* sub_weight() recursively (outwards) subtracts a number from the
1059	* weight of an object (and what is carried by it's environment(s)).	919	* weight of an object (and what is carried by it's environment(s)).
1060	*/	920	*/
1061
1062	void	921	void
1063	sub_weight (object *op, signed long weight)	922	sub_weight (object *op, signed long weight)
1064	{	923	{
1065	while (op != NULL)	924	while (op != NULL)
1066	{	925	{
1067	if (op->type == CONTAINER)	926	if (op->type == CONTAINER)
1068	{
1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	927	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070	}	928
1071	op->carrying -= weight;	929	op->carrying -= weight;
1072	op = op->env;	930	op = op->env;
1073	}	931	}
1074	}	932	}
1075		933
1076	/* remove_ob(op):	934	/* op->remove ():
1077	* This function removes the object op from the linked list of objects	935	* 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	936	* which it is currently tied to. When this function is done, the
1079	* object will have no environment. If the object previously had an	937	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	938	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	939	* the previous environment.
1082	* Beware: This function is called from the editor as well!	940	* Beware: This function is called from the editor as well!
1083	*/	941	*/
1084
1085	void	942	void
1086	remove_ob (object *op)	943	object::remove ()
1087	{	944	{
		945	object *tmp, *last = 0;
1088	object *	946	object *otmp;
1089	tmp, *
1090	last = NULL;
1091	object *
1092	otmp;
1093		947
1094	tag_t
1095	tag;
1096	int
1097	check_walk_off;	948	int check_walk_off;
1098	mapstruct *
1099	m;
1100		949
1101	sint16
1102	x,
1103	y;
1104
1105	if (QUERY_FLAG (op, FLAG_REMOVED))	950	if (QUERY_FLAG (this, FLAG_REMOVED))
1106	return;	951	return;
1107		952
1108	SET_FLAG (op, FLAG_REMOVED);	953	SET_FLAG (this, FLAG_REMOVED);
1109		954
1110	if (op->more != NULL)	955	if (more)
1111	remove_ob (op->more);	956	more->remove ();
1112		957
1113	/*	958	/*
1114	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1115	* inventory.	960	* inventory.
1116	*/	961	*/
1117	if (op->env != NULL)	962	if (env)
1118	{	963	{
1119	if (op->nrof)	964	if (nrof)
1120	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1121	else	966	else
1122	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1123		968
1124	/* NO_FIX_PLAYER is set when a great many changes are being	969	/* NO_FIX_PLAYER is set when a great many changes are being
1125	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1126	* to save cpu time.	971	* to save cpu time.
1127	*/	972	*/
1128	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1129	fix_player (otmp);	974	otmp->update_stats ();
1130		975
1131	if (op->above != NULL)	976	if (above != NULL)
1132	op->above->below = op->below;	977	above->below = below;
1133	else	978	else
1134	op->env->inv = op->below;	979	env->inv = below;
1135		980
1136	if (op->below != NULL)	981	if (below != NULL)
1137	op->below->above = op->above;	982	below->above = above;
1138		983
1139	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1140	* the map, but we don't actually do that - it is up	985	* the map, but we don't actually do that - it is up
1141	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1142	*/	987	*/
1143	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1144	op->map = op->env->map;	989	map = env->map;
1145	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1146	op->env = NULL;	991	env = 0;
1147	}	992	}
1148	else if (op->map)	993	else if (map)
1149	{	994	{
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	995	/* Re did the following section of code - it looks like it had
1170	* lots of logic for things we no longer care about	996	* lots of logic for things we no longer care about
1171	*/	997	*/
1172		998
1173	/* link the object above us */	999	/* link the object above us */
1174	if (op->above)	1000	if (above)
1175	op->above->below = op->below;	1001	above->below = below;
1176	else	1002	else
1177	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1003	map->at (x, y).top = below; /* we were top, set new top */
1178		1004
1179	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1180	if (op->below)	1006	if (below)
1181	op->below->above = op->above;	1007	below->above = above;
1182	else	1008	else
1183	{	1009	{
1184	/* Nothing below, which means we need to relink map object for this space	1010	/* 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	1011	* use translated coordinates in case some oddness with map tiling is
1186	* evident	1012	* evident
1187	*/	1013	*/
1188	if (GET_MAP_OB (m, x, y) != op)	1014	if (GET_MAP_OB (map, x, y) != this)
1189	{	1015	{
1190	dump_object (op);	1016	char *dump = dump_object (this);
1191	LOG (llevError,	1017	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);	1018	"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);
		1019	free (dump);
1193	dump_object (GET_MAP_OB (m, x, y));	1020	dump = dump_object (GET_MAP_OB (map, x, y));
1194	LOG (llevError, "%s\n", errmsg);	1021	LOG (llevError, "%s\n", dump);
		1022	free (dump);
1195	}	1023	}
1196		1024
1197	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1025	map->at (x, y).bottom = above; /* goes on above it. */
1198	}	1026	}
1199		1027
1200	op->above = 0;	1028	above = 0;
1201	op->below = 0;	1029	below = 0;
1202		1030
1203	if (op->map->in_memory == MAP_SAVING)	1031	if (map->in_memory == MAP_SAVING)
1204	return;	1032	return;
1205		1033
1206	tag = op->count;
1207	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208		1035
1209	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1210	{	1037	{
1211	/* No point updating the players look faces if he is the object	1038	/* No point updating the players look faces if he is the object
1212	* being removed.	1039	* being removed.
1213	*/	1040	*/
1214		1041
1215	if (tmp->type == PLAYER && tmp != op)	1042	if (tmp->type == PLAYER && tmp != this)
1216	{	1043	{
1217	/* If a container that the player is currently using somehow gets	1044	/* If a container that the player is currently using somehow gets
1218	* removed (most likely destroyed), update the player view	1045	* removed (most likely destroyed), update the player view
1219	* appropriately.	1046	* appropriately.
1220	*/	1047	*/
1221	if (tmp->container == op)	1048	if (tmp->container == this)
1222	{	1049	{
1223	CLEAR_FLAG (op, FLAG_APPLIED);	1050	CLEAR_FLAG (this, FLAG_APPLIED);
1224	tmp->container = NULL;	1051	tmp->container = 0;
1225	}	1052	}
1226		1053
1227	tmp->contr->socket.update_look = 1;	1054	tmp->contr->ns->floorbox_update ();
1228	}	1055	}
1229		1056
1230	/* See if player moving off should effect something */	1057	/* 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))	1058	if (check_walk_off
		1059	&& ((move_type & tmp->move_off)
		1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1232	{	1061	{
1233	move_apply (tmp, op, NULL);	1062	move_apply (tmp, this, 0);
1234		1063
1235	if (was_destroyed (op, tag))	1064	if (destroyed ())
1236	{
1237	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1238	}
1239	}	1066	}
1240		1067
1241	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242		1069
1243	if (tmp->above == tmp)	1070	if (tmp->above == tmp)
1244	tmp->above = NULL;	1071	tmp->above = 0;
1245		1072
1246	last = tmp;	1073	last = tmp;
1247	}	1074	}
1248		1075
1249	/* last == NULL of there are no objects on this space */	1076	/* last == NULL of there are no objects on this space */
1250	if (last == NULL)	1077	if (!last)
1251	{	1078	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	1079	else
1261	update_object (last, UP_OBJ_REMOVE);	1080	update_object (last, UP_OBJ_REMOVE);
1262		1081
1263	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264	update_all_los (op->map, op->x, op->y);	1083	update_all_los (map, x, y);
1265	}	1084	}
1266	}	1085	}
1267		1086
1268	/*	1087	/*
1269	* merge_ob(op,top):	1088	* merge_ob(op,top):
…		…
1284		1103
1285	for (; top != NULL; top = top->below)	1104	for (; top != NULL; top = top->below)
1286	{	1105	{
1287	if (top == op)	1106	if (top == op)
1288	continue;	1107	continue;
1289	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1290	{	1110	{
1291	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1292		1112
1293	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1294	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1295	remove_ob (op);	1115	op->destroy ();
1296	free_object (op);
1297	return top;	1116	return top;
1298	}	1117	}
1299	}	1118	}
1300		1119
1301	return NULL;	1120	return 0;
1302	}	1121	}
1303		1122
1304	/*	1123	/*
1305	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1306	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1307	*/	1126	*/
1308	object *	1127	object *
1309	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1310	{	1129	{
1311	object *tmp;	1130	object *tmp;
1312		1131
1313	if (op->head)	1132	if (op->head)
1314	op = op->head;	1133	op = op->head;
…		…
1342	* NULL if 'op' was destroyed	1161	* NULL if 'op' was destroyed
1343	* just 'op' otherwise	1162	* just 'op' otherwise
1344	*/	1163	*/
1345		1164
1346	object *	1165	object *
1347	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1348	{	1167	{
1349	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1350	sint16 x, y;	1169	sint16 x, y;
1351		1170
1352	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1355	return NULL;	1174	return NULL;
1356	}	1175	}
1357		1176
1358	if (m == NULL)	1177	if (m == NULL)
1359	{	1178	{
1360	dump_object (op);	1179	char *dump = dump_object (op);
1361	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1181	free (dump);
1362	return op;	1182	return op;
1363	}	1183	}
1364		1184
1365	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1366	{	1186	{
1367	dump_object (op);	1187	char *dump = dump_object (op);
1368	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1369	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1370	/* Better to catch this here, as otherwise the next use of this object	1190	/* 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	1191	* is likely to cause a crash. Better to find out where it is getting
1372	* improperly inserted.	1192	* improperly inserted.
1373	*/	1193	*/
1374	abort ();	1194	abort ();
1375	#endif	1195	#endif
		1196	free (dump);
1376	return op;	1197	return op;
1377	}	1198	}
1378		1199
1379	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1380	{	1201	{
1381	dump_object (op);	1202	char *dump = dump_object (op);
1382	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1204	free (dump);
1383	return op;	1205	return op;
1384	}	1206	}
1385		1207
1386	if (op->more != NULL)	1208	if (op->more != NULL)
1387	{	1209	{
…		…
1425		1247
1426	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1427	*/	1249	*/
1428	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1429	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1430	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1431	{	1253	{
1432	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1433	remove_ob (tmp);	1255	tmp->destroy ();
1434	free_object (tmp);
1435	}	1256	}
1436		1257
1437	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1258	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1438	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1439		1260
…		…
1452	op->below = originator->below;	1273	op->below = originator->below;
1453		1274
1454	if (op->below)	1275	if (op->below)
1455	op->below->above = op;	1276	op->below->above = op;
1456	else	1277	else
1457	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bottom = op;
1458		1279
1459	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1460	originator->below = op;	1281	originator->below = op;
1461	}	1282	}
1462	else	1283	else
…		…
1508	* If INS_ON_TOP is used, don't do this processing	1329	* If INS_ON_TOP is used, don't do this processing
1509	* Need to find the object that in fact blocks view, otherwise	1330	* Need to find the object that in fact blocks view, otherwise
1510	* stacking is a bit odd.	1331	* stacking is a bit odd.
1511	*/	1332	*/
1512	if (!(flag & INS_ON_TOP) &&	1333	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))	1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1514	{	1335	{
1515	for (last = top; last != floor; last = last->below)	1336	for (last = top; last != floor; last = last->below)
1516	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1517	break;	1338	break;
1518	/* Check to see if we found the object that blocks view,	1339	/* Check to see if we found the object that blocks view,
…		…
1541		1362
1542	if (op->above)	1363	if (op->above)
1543	op->above->below = op;	1364	op->above->below = op;
1544		1365
1545	op->below = NULL;	1366	op->below = NULL;
1546	SET_MAP_OB (op->map, op->x, op->y, op);	1367	op->ms ().bottom = op;
1547	}	1368	}
1548	else	1369	else
1549	{ /* get inserted into the stack above top */	1370	{ /* get inserted into the stack above top */
1550	op->above = top->above;	1371	op->above = top->above;
1551		1372
…		…
1555	op->below = top;	1376	op->below = top;
1556	top->above = op;	1377	top->above = op;
1557	}	1378	}
1558		1379
1559	if (op->above == NULL)	1380	if (op->above == NULL)
1560	SET_MAP_TOP (op->map, op->x, op->y, op);	1381	op->ms ().top = op;
1561	} /* else not INS_BELOW_ORIGINATOR */	1382	} /* else not INS_BELOW_ORIGINATOR */
1562		1383
1563	if (op->type == PLAYER)	1384	if (op->type == PLAYER)
1564	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
1565		1386
1566	/* If we have a floor, we know the player, if any, will be above	1387	/* 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.	1388	* it, so save a few ticks and start from there.
1568	*/	1389	*/
1569	if (!(flag & INS_MAP_LOAD))	1390	if (!(flag & INS_MAP_LOAD))
1570	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1391	if (object *pl = op->ms ().player ())
1571	if (tmp->type == PLAYER)	1392	pl->contr->ns->floorbox_update ();
1572	tmp->contr->socket.update_look = 1;
1573		1393
1574	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1575	* visible to others on this map. But update_all_los is really	1395	* 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	1396	* 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	1397	* on the map will get recalculated. The players could very well
…		…
1585		1405
1586	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1587	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1588		1408
1589	/* Don't know if moving this to the end will break anything. However,	1409	/* 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.	1410	* we want to have floorbox_update called before calling this.
1591	*	1411	*
1592	* check_move_on() must be after this because code called from	1412	* check_move_on() must be after this because code called from
1593	* check_move_on() depends on correct map flags (so functions like	1413	* check_move_on() depends on correct map flags (so functions like
1594	* blocked() and wall() work properly), and these flags are updated by	1414	* blocked() and wall() work properly), and these flags are updated by
1595	* update_object().	1415	* update_object().
…		…
1611		1431
1612	return op;	1432	return op;
1613	}	1433	}
1614		1434
1615	/* this function inserts an object in the map, but if it	1435	/* 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.	1436	* 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.	1437	* op is the object to insert it under: supplies x and the map.
1618	*/	1438	*/
1619	void	1439	void
1620	replace_insert_ob_in_map (const char *arch_string, object *op)	1440	replace_insert_ob_in_map (const char *arch_string, object *op)
1621	{	1441	{
1622	object *	1442	object *tmp, *tmp1;
1623	tmp;
1624	object *
1625	tmp1;
1626		1443
1627	/* first search for itself and remove any old instances */	1444	/* first search for itself and remove any old instances */
1628		1445
1629	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1446	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 */	1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1632	{	1448	tmp->destroy ();
1633	remove_ob (tmp);
1634	free_object (tmp);
1635	}
1636	}
1637		1449
1638	tmp1 = arch_to_object (find_archetype (arch_string));	1450	tmp1 = arch_to_object (archetype::find (arch_string));
1639		1451
1640	tmp1->x = op->x;	1452	tmp1->x = op->x;
1641	tmp1->y = op->y;	1453	tmp1->y = op->y;
1642	insert_ob_in_map (tmp1, op->map, op, 0);	1454	insert_ob_in_map (tmp1, op->map, op, 0);
1643	}	1455	}
…		…
1651	*/	1463	*/
1652		1464
1653	object *	1465	object *
1654	get_split_ob (object *orig_ob, uint32 nr)	1466	get_split_ob (object *orig_ob, uint32 nr)
1655	{	1467	{
1656	object *	1468	object *newob;
1657	newob;
1658	int
1659	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1660		1470
1661	if (orig_ob->nrof < nr)	1471	if (orig_ob->nrof < nr)
1662	{	1472	{
1663	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1473	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1664	return NULL;	1474	return NULL;
1665	}	1475	}
1666		1476
1667	newob = object_create_clone (orig_ob);	1477	newob = object_create_clone (orig_ob);
1668		1478
1669	if ((orig_ob->nrof -= nr) < 1)	1479	if ((orig_ob->nrof -= nr) < 1)
1670	{	1480	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)	1481	else if (!is_removed)
1676	{	1482	{
1677	if (orig_ob->env != NULL)	1483	if (orig_ob->env != NULL)
1678	sub_weight (orig_ob->env, orig_ob->weight * nr);	1484	sub_weight (orig_ob->env, orig_ob->weight * nr);
1679	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1485	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1709	if (i > op->nrof)	1515	if (i > op->nrof)
1710	i = op->nrof;	1516	i = op->nrof;
1711		1517
1712	if (QUERY_FLAG (op, FLAG_REMOVED))	1518	if (QUERY_FLAG (op, FLAG_REMOVED))
1713	op->nrof -= i;	1519	op->nrof -= i;
1714	else if (op->env != NULL)	1520	else if (op->env)
1715	{	1521	{
1716	/* is this object in the players inventory, or sub container	1522	/* is this object in the players inventory, or sub container
1717	* therein?	1523	* therein?
1718	*/	1524	*/
1719	tmp = is_player_inv (op->env);	1525	tmp = op->in_player ();
1720	/* nope. Is this a container the player has opened?	1526	/* nope. Is this a container the player has opened?
1721	* If so, set tmp to that player.	1527	* If so, set tmp to that player.
1722	* IMO, searching through all the players will mostly	1528	* IMO, searching through all the players will mostly
1723	* likely be quicker than following op->env to the map,	1529	* likely be quicker than following op->env to the map,
1724	* and then searching the map for a player.	1530	* and then searching the map for a player.
1725	*/	1531	*/
1726	if (!tmp)	1532	if (!tmp)
1727	{	1533	{
1728	for (pl = first_player; pl; pl = pl->next)	1534	for (pl = first_player; pl; pl = pl->next)
1729	if (pl->ob->container == op->env)	1535	if (pl->ob->container == op->env)
		1536	{
		1537	tmp = pl->ob;
1730	break;	1538	break;
1731	if (pl)	1539	}
1732	tmp = pl->ob;
1733	else
1734	tmp = NULL;
1735	}	1540	}
1736		1541
1737	if (i < op->nrof)	1542	if (i < op->nrof)
1738	{	1543	{
1739	sub_weight (op->env, op->weight * i);	1544	sub_weight (op->env, op->weight * i);
1740	op->nrof -= i;	1545	op->nrof -= i;
1741	if (tmp)	1546	if (tmp)
1742	{
1743	esrv_send_item (tmp, op);	1547	esrv_send_item (tmp, op);
1744	}
1745	}	1548	}
1746	else	1549	else
1747	{	1550	{
1748	remove_ob (op);	1551	op->remove ();
1749	op->nrof = 0;	1552	op->nrof = 0;
1750	if (tmp)	1553	if (tmp)
1751	{
1752	esrv_del_item (tmp->contr, op->count);	1554	esrv_del_item (tmp->contr, op->count);
1753	}
1754	}	1555	}
1755	}	1556	}
1756	else	1557	else
1757	{	1558	{
1758	object *above = op->above;	1559	object *above = op->above;
1759		1560
1760	if (i < op->nrof)	1561	if (i < op->nrof)
1761	op->nrof -= i;	1562	op->nrof -= i;
1762	else	1563	else
1763	{	1564	{
1764	remove_ob (op);	1565	op->remove ();
1765	op->nrof = 0;	1566	op->nrof = 0;
1766	}	1567	}
1767		1568
1768	/* Since we just removed op, op->above is null */	1569	/* Since we just removed op, op->above is null */
1769	for (tmp = above; tmp != NULL; tmp = tmp->above)	1570	for (tmp = above; tmp; tmp = tmp->above)
1770	if (tmp->type == PLAYER)	1571	if (tmp->type == PLAYER)
1771	{	1572	{
1772	if (op->nrof)	1573	if (op->nrof)
1773	esrv_send_item (tmp, op);	1574	esrv_send_item (tmp, op);
1774	else	1575	else
…		…
1778		1579
1779	if (op->nrof)	1580	if (op->nrof)
1780	return op;	1581	return op;
1781	else	1582	else
1782	{	1583	{
1783	free_object (op);	1584	op->destroy ();
1784	return NULL;	1585	return 0;
1785	}	1586	}
1786	}	1587	}
1787		1588
1788	/*	1589	/*
1789	* add_weight(object, weight) adds the specified weight to an object,	1590	* add_weight(object, weight) adds the specified weight to an object,
…		…
1801	op->carrying += weight;	1602	op->carrying += weight;
1802	op = op->env;	1603	op = op->env;
1803	}	1604	}
1804	}	1605	}
1805		1606
		1607	object *
		1608	insert_ob_in_ob (object *op, object *where)
		1609	{
		1610	if (!where)
		1611	{
		1612	char *dump = dump_object (op);
		1613	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1614	free (dump);
		1615	return op;
		1616	}
		1617
		1618	if (where->head)
		1619	{
		1620	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1621	where = where->head;
		1622	}
		1623
		1624	return where->insert (op);
		1625	}
		1626
1806	/*	1627	/*
1807	* insert_ob_in_ob(op,environment):	1628	* env->insert (op)
1808	* This function inserts the object op in the linked list	1629	* This function inserts the object op in the linked list
1809	* inside the object environment.	1630	* inside the object environment.
1810	*	1631	*
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	1632	* The function returns now pointer to inserted item, and return value can
1817	* be != op, if items are merged. -Tero	1633	* be != op, if items are merged. -Tero
1818	*/	1634	*/
1819		1635
1820	object *	1636	object *
1821	insert_ob_in_ob (object *op, object *where)	1637	object::insert (object *op)
1822	{	1638	{
1823	object *	1639	object *tmp, *otmp;
1824	tmp, *
1825	otmp;
1826		1640
1827	if (!QUERY_FLAG (op, FLAG_REMOVED))	1641	if (!QUERY_FLAG (op, FLAG_REMOVED))
1828	{	1642	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		1643
1847	if (op->more)	1644	if (op->more)
1848	{	1645	{
1849	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1646	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1850	return op;	1647	return op;
…		…
1852		1649
1853	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1650	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854	CLEAR_FLAG (op, FLAG_REMOVED);	1651	CLEAR_FLAG (op, FLAG_REMOVED);
1855	if (op->nrof)	1652	if (op->nrof)
1856	{	1653	{
1857	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1654	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858	if (CAN_MERGE (tmp, op))	1655	if (object::can_merge (tmp, op))
1859	{	1656	{
1860	/* return the original object and remove inserted object	1657	/* return the original object and remove inserted object
1861	(client needs the original object) */	1658	(client needs the original object) */
1862	tmp->nrof += op->nrof;	1659	tmp->nrof += op->nrof;
1863	/* Weight handling gets pretty funky. Since we are adding to	1660	/* Weight handling gets pretty funky. Since we are adding to
1864	* tmp->nrof, we need to increase the weight.	1661	* tmp->nrof, we need to increase the weight.
1865	*/	1662	*/
1866	add_weight (where, op->weight * op->nrof);	1663	add_weight (this, op->weight * op->nrof);
1867	SET_FLAG (op, FLAG_REMOVED);	1664	SET_FLAG (op, FLAG_REMOVED);
1868	free_object (op); /* free the inserted object */	1665	op->destroy (); /* free the inserted object */
1869	op = tmp;	1666	op = tmp;
1870	remove_ob (op); /* and fix old object's links */	1667	op->remove (); /* and fix old object's links */
1871	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
1872	break;	1669	break;
1873	}	1670	}
1874		1671
1875	/* I assume combined objects have no inventory	1672	/* I assume combined objects have no inventory
1876	* We add the weight - this object could have just been removed	1673	* We add the weight - this object could have just been removed
1877	* (if it was possible to merge). calling remove_ob will subtract	1674	* (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	1675	* the weight, so we need to add it in again, since we actually do
1879	* the linking below	1676	* the linking below
1880	*/	1677	*/
1881	add_weight (where, op->weight * op->nrof);	1678	add_weight (this, op->weight * op->nrof);
1882	}	1679	}
1883	else	1680	else
1884	add_weight (where, (op->weight + op->carrying));	1681	add_weight (this, (op->weight + op->carrying));
1885		1682
1886	otmp = is_player_inv (where);	1683	otmp = this->in_player ();
1887	if (otmp && otmp->contr != NULL)	1684	if (otmp && otmp->contr)
1888	{
1889	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1685	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890	fix_player (otmp);	1686	otmp->update_stats ();
1891	}
1892		1687
1893	op->map = NULL;	1688	op->map = 0;
1894	op->env = where;	1689	op->env = this;
1895	op->above = NULL;	1690	op->above = 0;
1896	op->below = NULL;	1691	op->below = 0;
1897	op->x = 0, op->y = 0;	1692	op->x = 0, op->y = 0;
1898		1693
1899	/* reset the light list and los of the players on the map */	1694	/* reset the light list and los of the players on the map */
1900	if ((op->glow_radius != 0) && where->map)	1695	if ((op->glow_radius != 0) && map)
1901	{	1696	{
1902	#ifdef DEBUG_LIGHTS	1697	#ifdef DEBUG_LIGHTS
1903	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1904	#endif /* DEBUG_LIGHTS */	1699	#endif /* DEBUG_LIGHTS */
1905	if (MAP_DARKNESS (where->map))	1700	if (MAP_DARKNESS (map))
1906	update_all_los (where->map, where->x, where->y);	1701	update_all_los (map, x, y);
1907	}	1702	}
1908		1703
1909	/* Client has no idea of ordering so lets not bother ordering it here.	1704	/* Client has no idea of ordering so lets not bother ordering it here.
1910	* It sure simplifies this function...	1705	* It sure simplifies this function...
1911	*/	1706	*/
1912	if (where->inv == NULL)	1707	if (!inv)
1913	where->inv = op;	1708	inv = op;
1914	else	1709	else
1915	{	1710	{
1916	op->below = where->inv;	1711	op->below = inv;
1917	op->below->above = op;	1712	op->below->above = op;
1918	where->inv = op;	1713	inv = op;
1919	}	1714	}
		1715
1920	return op;	1716	return op;
1921	}	1717	}
1922		1718
1923	/*	1719	/*
1924	* Checks if any objects has a move_type that matches objects	1720	* Checks if any objects has a move_type that matches objects
…		…
1942	*/	1738	*/
1943		1739
1944	int	1740	int
1945	check_move_on (object *op, object *originator)	1741	check_move_on (object *op, object *originator)
1946	{	1742	{
1947	object *	1743	object *tmp;
1948	tmp;	1744	maptile *m = op->map;
1949	tag_t
1950	tag;
1951	mapstruct *
1952	m = op->map;
1953	int
1954	x = op->x, y = op->y;	1745	int x = op->x, y = op->y;
1955		1746
1956	MoveType	1747	MoveType move_on, move_slow, move_block;
1957	move_on,
1958	move_slow,
1959	move_block;
1960		1748
1961	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1749	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962	return 0;	1750	return 0;
1963
1964	tag = op->count;
1965		1751
1966	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1752	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);	1753	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);	1754	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1969		1755
…		…
2030	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1816	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))	1817	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2032	{	1818	{
2033	move_apply (tmp, op, originator);	1819	move_apply (tmp, op, originator);
2034		1820
2035	if (was_destroyed (op, tag))	1821	if (op->destroyed ())
2036	return 1;	1822	return 1;
2037		1823
2038	/* what the person/creature stepped onto has moved the object	1824	/* what the person/creature stepped onto has moved the object
2039	* someplace new. Don't process any further - if we did,	1825	* someplace new. Don't process any further - if we did,
2040	* have a feeling strange problems would result.	1826	* have a feeling strange problems would result.
…		…
2052	* a matching archetype at the given map and coordinates.	1838	* a matching archetype at the given map and coordinates.
2053	* The first matching object is returned, or NULL if none.	1839	* The first matching object is returned, or NULL if none.
2054	*/	1840	*/
2055		1841
2056	object *	1842	object *
2057	present_arch (const archetype *at, mapstruct *m, int x, int y)	1843	present_arch (const archetype *at, maptile *m, int x, int y)
2058	{	1844	{
2059	object *	1845	object *
2060	tmp;	1846	tmp;
2061		1847
2062	if (m == NULL || out_of_map (m, x, y))	1848	if (m == NULL || out_of_map (m, x, y))
…		…
2075	* a matching type variable at the given map and coordinates.	1861	* a matching type variable at the given map and coordinates.
2076	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
2077	*/	1863	*/
2078		1864
2079	object *	1865	object *
2080	present (unsigned char type, mapstruct *m, int x, int y)	1866	present (unsigned char type, maptile *m, int x, int y)
2081	{	1867	{
2082	object *	1868	object *
2083	tmp;	1869	tmp;
2084		1870
2085	if (out_of_map (m, x, y))	1871	if (out_of_map (m, x, y))
…		…
2225	* the archetype because that isn't correct if the monster has been	2011	* the archetype because that isn't correct if the monster has been
2226	* customized, changed states, etc.	2012	* customized, changed states, etc.
2227	*/	2013	*/
2228		2014
2229	int	2015	int
2230	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2231	{	2017	{
2232	int	2018	int
2233	i,	2019	i,
2234	index = 0, flag;	2020	index = 0, flag;
2235	static int	2021	static int
…		…
2247	* if the space being examined only has a wall to the north and empty	2033	* 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	2034	* spaces in all the other directions, this will reduce the search space
2249	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2250	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2251	*/	2037	*/
2252	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2038	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2253	stop = maxfree[i];	2039	stop = maxfree[i];
2254	}	2040	}
		2041
2255	if (!index)	2042	if (!index)
2256	return -1;	2043	return -1;
		2044
2257	return altern[RANDOM () % index];	2045	return altern[RANDOM () % index];
2258	}	2046	}
2259		2047
2260	/*	2048	/*
2261	* find_first_free_spot(archetype, mapstruct, x, y) works like	2049	* find_first_free_spot(archetype, maptile, x, y) works like
2262	* find_free_spot(), but it will search max number of squares.	2050	* find_free_spot(), but it will search max number of squares.
2263	* But it will return the first available spot, not a random choice.	2051	* 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.	2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2265	*/	2053	*/
2266		2054
2267	int	2055	int
2268	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2269	{	2057	{
2270	int	2058	int
2271	i;	2059	i;
2272		2060
2273	for (i = 0; i < SIZEOFFREE; i++)	2061	for (i = 0; i < SIZEOFFREE; i++)
…		…
2337	* because we have to know what movement the thing looking to move	2125	* because we have to know what movement the thing looking to move
2338	* there is capable of.	2126	* there is capable of.
2339	*/	2127	*/
2340		2128
2341	int	2129	int
2342	find_dir (mapstruct *m, int x, int y, object *exclude)	2130	find_dir (maptile *m, int x, int y, object *exclude)
2343	{	2131	{
2344	int	2132	int
2345	i,	2133	i,
2346	max = SIZEOFFREE, mflags;	2134	max = SIZEOFFREE, mflags;
2347		2135
2348	sint16 nx, ny;	2136	sint16 nx, ny;
2349	object *	2137	object *
2350	tmp;	2138	tmp;
2351	mapstruct *	2139	maptile *
2352	mp;	2140	mp;
2353		2141
2354	MoveType blocked, move_type;	2142	MoveType blocked, move_type;
2355		2143
2356	if (exclude && exclude->head)	2144	if (exclude && exclude->head)
…		…
2369	mp = m;	2157	mp = m;
2370	nx = x + freearr_x[i];	2158	nx = x + freearr_x[i];
2371	ny = y + freearr_y[i];	2159	ny = y + freearr_y[i];
2372		2160
2373	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2161	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2162
2374	if (mflags & P_OUT_OF_MAP)	2163	if (mflags & P_OUT_OF_MAP)
2375	{
2376	max = maxfree[i];	2164	max = maxfree[i];
2377	}
2378	else	2165	else
2379	{	2166	{
2380	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2381		2168
2382	if ((move_type & blocked) == move_type)	2169	if ((move_type & blocked) == move_type)
2383	{
2384	max = maxfree[i];	2170	max = maxfree[i];
2385	}
2386	else if (mflags & P_IS_ALIVE)	2171	else if (mflags & P_IS_ALIVE)
2387	{	2172	{
2388	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2173	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)))	2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2391	{
2392	break;	2175	break;
2393	}	2176
2394	}
2395	if (tmp)	2177	if (tmp)
2396	{
2397	return freedir[i];	2178	return freedir[i];
2398	}
2399	}	2179	}
2400	}	2180	}
2401	}	2181	}
		2182
2402	return 0;	2183	return 0;
2403	}	2184	}
2404		2185
2405	/*	2186	/*
2406	* distance(object 1, object 2) will return the square of the	2187	* distance(object 1, object 2) will return the square of the
…		…
2408	*/	2189	*/
2409		2190
2410	int	2191	int
2411	distance (const object *ob1, const object *ob2)	2192	distance (const object *ob1, const object *ob2)
2412	{	2193	{
2413	int	2194	int i;
2414	i;
2415		2195
2416	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2417	return i;	2197	return i;
2418	}	2198	}
2419		2199
…		…
2424	*/	2204	*/
2425		2205
2426	int	2206	int
2427	find_dir_2 (int x, int y)	2207	find_dir_2 (int x, int y)
2428	{	2208	{
2429	int	2209	int q;
2430	q;
2431		2210
2432	if (y)	2211	if (y)
2433	q = x * 100 / y;	2212	q = x * 100 / y;
2434	else if (x)	2213	else if (x)
2435	q = -300 * x;	2214	q = -300 * x;
…		…
2561	* find a path to that monster that we found. If not,	2340	* find a path to that monster that we found. If not,
2562	* we don't bother going toward it. Returns 1 if we	2341	* we don't bother going toward it. Returns 1 if we
2563	* can see a direct way to get it	2342	* can see a direct way to get it
2564	* Modified to be map tile aware -.MSW	2343	* Modified to be map tile aware -.MSW
2565	*/	2344	*/
2566
2567
2568	int	2345	int
2569	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2346	can_see_monsterP (maptile *m, int x, int y, int dir)
2570	{	2347	{
2571	sint16 dx, dy;	2348	sint16 dx, dy;
2572	int
2573	mflags;	2349	int mflags;
2574		2350
2575	if (dir < 0)	2351	if (dir < 0)
2576	return 0; /* exit condition: invalid direction */	2352	return 0; /* exit condition: invalid direction */
2577		2353
2578	dx = x + freearr_x[dir];	2354	dx = x + freearr_x[dir];
…		…
2591	return 0;	2367	return 0;
2592		2368
2593	/* yes, can see. */	2369	/* yes, can see. */
2594	if (dir < 9)	2370	if (dir < 9)
2595	return 1;	2371	return 1;
		2372
2596	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2373	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]);	2374	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2375	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2598	}	2376	}
2599
2600
2601		2377
2602	/*	2378	/*
2603	* can_pick(picker, item): finds out if an object is possible to be	2379	* 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	2380	* picked up by the picker. Returnes 1 if it can be
2605	* picked up, otherwise 0.	2381	* picked up, otherwise 0.
…		…
2616	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2392	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2617	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(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));	2394	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2619	}	2395	}
2620		2396
2621
2622	/*	2397	/*
2623	* create clone from object to another	2398	* create clone from object to another
2624	*/	2399	*/
2625	object *	2400	object *
2626	object_create_clone (object *asrc)	2401	object_create_clone (object *asrc)
2627	{	2402	{
2628	object *
2629	dst = NULL, *tmp, *src, *part, *prev, *item;	2403	object *dst = 0, *tmp, *src, *part, *prev, *item;
2630		2404
2631	if (!asrc)	2405	if (!asrc)
2632	return NULL;	2406	return 0;
		2407
2633	src = asrc;	2408	src = asrc;
2634	if (src->head)	2409	if (src->head)
2635	src = src->head;	2410	src = src->head;
2636		2411
2637	prev = NULL;	2412	prev = 0;
2638	for (part = src; part; part = part->more)	2413	for (part = src; part; part = part->more)
2639	{	2414	{
2640	tmp = get_object ();	2415	tmp = part->clone ();
2641	copy_object (part, tmp);
2642	tmp->x -= src->x;	2416	tmp->x -= src->x;
2643	tmp->y -= src->y;	2417	tmp->y -= src->y;
		2418
2644	if (!part->head)	2419	if (!part->head)
2645	{	2420	{
2646	dst = tmp;	2421	dst = tmp;
2647	tmp->head = NULL;	2422	tmp->head = 0;
2648	}	2423	}
2649	else	2424	else
2650	{
2651	tmp->head = dst;	2425	tmp->head = dst;
2652	}	2426
2653	tmp->more = NULL;	2427	tmp->more = 0;
		2428
2654	if (prev)	2429	if (prev)
2655	prev->more = tmp;	2430	prev->more = tmp;
		2431
2656	prev = tmp;	2432	prev = tmp;
2657	}	2433	}
2658		2434
2659	/*** copy inventory ***/
2660	for (item = src->inv; item; item = item->below)	2435	for (item = src->inv; item; item = item->below)
2661	{
2662	(void) insert_ob_in_ob (object_create_clone (item), dst);	2436	insert_ob_in_ob (object_create_clone (item), dst);
2663	}
2664		2437
2665	return dst;	2438	return dst;
2666	}	2439	}
2667		2440
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. */	2441	/* 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 */	2442	/* 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, */	2443	/* 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. */	2444	/* 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. */	2445	/* Remember not to use load_object_str in a time-critical situation. */
2686
2687	/* Also remember that multiparts objects are not supported for now. */	2446	/* Also remember that multiparts objects are not supported for now. */
2688		2447
2689	object *	2448	object *
2690	load_object_str (const char *obstr)	2449	load_object_str (const char *obstr)
2691	{	2450	{
2692	object *	2451	object *op;
2693	op;
2694	char
2695	filename[MAX_BUF];	2452	char filename[MAX_BUF];
2696		2453
2697	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698		2455
2699	FILE *
2700	tempfile = fopen (filename, "w");	2456	FILE *tempfile = fopen (filename, "w");
2701		2457
2702	if (tempfile == NULL)	2458	if (tempfile == NULL)
2703	{	2459	{
2704	LOG (llevError, "Error - Unable to access load object temp file\n");	2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2705	return NULL;	2461	return NULL;
2706	}	2462	}
2707		2463
2708	fprintf (tempfile, obstr);	2464	fprintf (tempfile, obstr);
2709	fclose (tempfile);	2465	fclose (tempfile);
2710		2466
2711	op = get_object ();	2467	op = object::create ();
2712		2468
2713	object_thawer thawer (filename);	2469	object_thawer thawer (filename);
2714		2470
2715	if (thawer)	2471	if (thawer)
2716	load_object (thawer, op, 0);	2472	load_object (thawer, op, 0);
…		…
2726	* returns NULL if no match.	2482	* returns NULL if no match.
2727	*/	2483	*/
2728	object *	2484	object *
2729	find_obj_by_type_subtype (const object *who, int type, int subtype)	2485	find_obj_by_type_subtype (const object *who, int type, int subtype)
2730	{	2486	{
2731	object *	2487	object *tmp;
2732	tmp;
2733		2488
2734	for (tmp = who->inv; tmp; tmp = tmp->below)	2489	for (tmp = who->inv; tmp; tmp = tmp->below)
2735	if (tmp->type == type && tmp->subtype == subtype)	2490	if (tmp->type == type && tmp->subtype == subtype)
2736	return tmp;	2491	return tmp;
2737		2492
…		…
2745	* do the desired thing.	2500	* do the desired thing.
2746	*/	2501	*/
2747	key_value *	2502	key_value *
2748	get_ob_key_link (const object *ob, const char *key)	2503	get_ob_key_link (const object *ob, const char *key)
2749	{	2504	{
2750	key_value *	2505	key_value *link;
2751	link;
2752		2506
2753	for (link = ob->key_values; link != NULL; link = link->next)	2507	for (link = ob->key_values; link != NULL; link = link->next)
2754	{
2755	if (link->key == key)	2508	if (link->key == key)
2756	{
2757	return link;	2509	return link;
2758	}
2759	}
2760		2510
2761	return NULL;	2511	return NULL;
2762	}	2512	}
2763		2513
2764	/*	2514	/*

Diff Legend

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