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

Diff Legend

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