ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.42 by root, Thu Sep 14 01:19:47 2006 UTC vs.
Revision 1.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	}
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
		488	if (self || cb)
		489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647		490
648	if (is_freed)	491	if (is_freed)
649	SET_FLAG (op, FLAG_FREED);	492	SET_FLAG (dst, FLAG_FREED);
		493
650	if (is_removed)	494	if (is_removed)
651	SET_FLAG (op, FLAG_REMOVED);	495	SET_FLAG (dst, FLAG_REMOVED);
652		496
653	if (op2->speed < 0)	497	if (speed < 0)
654	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655		499
656	/* Copy over key_values, if any. */	500	/* Copy over key_values, if any. */
657	if (op2->key_values)	501	if (key_values)
658	{	502	{
659	key_value *tail = 0;	503	key_value *tail = 0;
660	key_value *i;	504	key_value *i;
661		505
662	op->key_values = 0;	506	dst->key_values = 0;
663		507
664	for (i = op2->key_values; i; i = i->next)	508	for (i = key_values; i; i = i->next)
665	{	509	{
666	key_value *new_link = new key_value;	510	key_value *new_link = new key_value;
667		511
668	new_link->next = 0;	512	new_link->next = 0;
669	new_link->key = i->key;	513	new_link->key = i->key;
670	new_link->value = i->value;	514	new_link->value = i->value;
671		515
672	/* Try and be clever here, too. */	516	/* Try and be clever here, too. */
673	if (!op->key_values)	517	if (!dst->key_values)
674	{	518	{
675	op->key_values = new_link;	519	dst->key_values = new_link;
676	tail = new_link;	520	tail = new_link;
677	}	521	}
678	else	522	else
679	{	523	{
680	tail->next = new_link;	524	tail->next = new_link;
681	tail = new_link;	525	tail = new_link;
682	}	526	}
683	}	527	}
684	}	528	}
685		529
686	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;
687	}	539	}
688		540
689	/*	541	/*
690	* 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
691	* 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
…		…
799	op->active_next = NULL;	651	op->active_next = NULL;
800	op->active_prev = NULL;	652	op->active_prev = NULL;
801	}	653	}
802		654
803	/*	655	/*
804	* update_object() updates the array which represents the map.	656	* update_object() updates the the map.
805	* It takes into account invisible objects (and represent squares covered	657	* It takes into account invisible objects (and represent squares covered
806	* 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
807	* invisible object, etc...)	659	* invisible object, etc...)
808	* 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
809	* 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
810	* updating that window, though, since update_object() is called _often_)	662	* updating that window, though, since update_object() is called _often_)
811	*	663	*
812	* 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.
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:	665	* current action are:
818	* UP_OBJ_INSERT: op was inserted	666	* UP_OBJ_INSERT: op was inserted
819	* UP_OBJ_REMOVE: op was removed	667	* UP_OBJ_REMOVE: op was removed
820	* 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
821	* 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.
822	* UP_OBJ_FACE: only the objects face has changed.	670	* UP_OBJ_FACE: only the objects face has changed.
823	*/	671	*/
824
825	void	672	void
826	update_object (object *op, int action)	673	update_object (object *op, int action)
827	{	674	{
828	int update_now = 0, flags;
829	MoveType move_on, move_off, move_block, move_slow;	675	MoveType move_on, move_off, move_block, move_slow;
830		676
831	if (op == NULL)	677	if (op == NULL)
832	{	678	{
833	/* this should never happen */	679	/* this should never happen */
834	LOG (llevDebug, "update_object() called for NULL object.\n");	680	LOG (llevDebug, "update_object() called for NULL object.\n");
835	return;	681	return;
836	}	682	}
837		683
838	if (op->env != NULL)	684	if (op->env)
839	{	685	{
840	/* Animation is currently handled by client, so nothing	686	/* Animation is currently handled by client, so nothing
841	* to do in this case.	687	* to do in this case.
842	*/	688	*/
843	return;	689	return;
…		…
857	abort ();	703	abort ();
858	#endif	704	#endif
859	return;	705	return;
860	}	706	}
861		707
862	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	708	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		709
		710	if (m.flags_ & P_NEED_UPDATE)
		711	/* nop */;
869	if (action == UP_OBJ_INSERT)	712	else if (action == UP_OBJ_INSERT)
870	{	713	{
		714	// this is likely overkill, TODO: revisit (schmorp)
871	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	715	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))	716	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
875	update_now = 1;	717	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
876		718	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		719	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
877	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	720	|| (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)	721	|| (m.move_on | op->move_on ) != m.move_on
887	update_now = 1;
888
889	if ((move_off | op->move_off) != move_off)	722	|| (m.move_off | op->move_off ) != m.move_off
890	update_now = 1;	723	|| (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	724	/* This isn't perfect, but I don't expect a lot of objects to
893	* to have move_allow right now.	725	* to have move_allow right now.
894	*/	726	*/
895	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
896	update_now = 1;	728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
897		729	m.flags_ = P_NEED_UPDATE;
898	if ((move_slow | op->move_slow) != move_slow)
899	update_now = 1;
900	}	730	}
901	/* if the object is being removed, we can't make intelligent	731	/* if the object is being removed, we can't make intelligent
902	* decisions, because remove_ob can't really pass the object	732	* decisions, because remove_ob can't really pass the object
903	* that is being removed.	733	* that is being removed.
904	*/	734	*/
905	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
906	update_now = 1;	736	m.flags_ = P_NEED_UPDATE;
907	else if (action == UP_OBJ_FACE)	737	else if (action == UP_OBJ_FACE)
908	/* Nothing to do for that case */ ;	738	/* Nothing to do for that case */ ;
909	else	739	else
910	LOG (llevError, "update_object called with invalid action: %d\n", action);	740	LOG (llevError, "update_object called with invalid action: %d\n", action);
911		741
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)	742	if (op->more)
919	update_object (op->more, action);	743	update_object (op->more, action);
920	}	744	}
921		745
922	static unordered_vector<object *> mortals;	746	object::vector object::mortals;
		747	object::vector object::objects; // not yet used
		748	object *object::first;
923		749
924	void object::free_mortals ()	750	void object::free_mortals ()
925	{	751	{
926	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927	if ((*i)->refcnt)	753	if ((*i)->refcnt)
928	++i; // further delay freeing	754	++i; // further delay freeing
929	else	755	else
930	{	756	{
931	delete *i;	757	delete *i;
932	mortals.erase (i);	758	mortals.erase (i);
933	}	759	}
934
935	static int lastmortals = 0;//D
936
937	if (mortals.size() != lastmortals)//D
938	{
939	lastmortals = mortals.size ();//D
940	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941	}
942	}	760	}
943		761
944	object::object ()	762	object::object ()
945	{	763	{
946	SET_FLAG (this, FLAG_REMOVED);	764	SET_FLAG (this, FLAG_REMOVED);
947		765
948	expmul = 1.0;	766	expmul = 1.0;
949	face = blank_face;	767	face = blank_face;
950	attacked_by_count = -1;
951	}	768	}
952		769
953	object::~object ()	770	object::~object ()
954	{	771	{
955	free_key_values (this);	772	free_key_values (this);
…		…
959	{	776	{
960	count = ++ob_count;	777	count = ++ob_count;
961	uuid = gen_uuid ();	778	uuid = gen_uuid ();
962		779
963	prev = 0;	780	prev = 0;
964	next = objects;	781	next = object::first;
965		782
966	if (objects)	783	if (object::first)
967	objects->prev = this;	784	object::first->prev = this;
968		785
969	objects = this;	786	object::first = this;
970	}	787	}
971		788
972	void object::unlink ()	789	void object::unlink ()
973	{	790	{
974	//count = 0;//D
975	if (!prev && !next) return;//D
976
977	if (this == objects)	791	if (this == object::first)
978	objects = next;	792	object::first = next;
979		793
980	/* Remove this object from the list of used objects */	794	/* Remove this object from the list of used objects */
981	if (prev) prev->next = next;	795	if (prev) prev->next = next;
982	if (next) next->prev = prev;	796	if (next) next->prev = prev;
983		797
…		…
997	* 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
998	* free objects. The IS_FREED() flag is set in the object.	812	* free objects. The IS_FREED() flag is set in the object.
999	* The object must have been removed by remove_ob() first for	813	* The object must have been removed by remove_ob() first for
1000	* this function to succeed.	814	* this function to succeed.
1001	*	815	*
1002	* 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
1003	* inventory to the ground.	817	* inventory to the ground.
1004	*/	818	*/
1005	void object::free (bool free_inventory)	819	void object::destroy (bool destroy_inventory)
1006	{	820	{
1007	if (QUERY_FLAG (this, FLAG_FREED))	821	if (QUERY_FLAG (this, FLAG_FREED))
1008	return;	822	return;
1009		823
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	824	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	825	remove_friendly_object (this);
1012		826
1013	if (!QUERY_FLAG (this, FLAG_REMOVED))	827	if (!QUERY_FLAG (this, FLAG_REMOVED))
1014	remove_ob (this);	828	remove ();
1015		829
1016	SET_FLAG (this, FLAG_FREED);	830	SET_FLAG (this, FLAG_FREED);
1017		831
1018	if (more)	832	if (more)
1019	{	833	{
1020	more->free (free_inventory);	834	more->destroy (destroy_inventory);
1021	more = 0;	835	more = 0;
1022	}	836	}
1023		837
1024	if (inv)	838	if (inv)
1025	{	839	{
1026	/* Only if the space blocks everything do we not process -	840	/* Only if the space blocks everything do we not process -
1027	* if some form of movement is allowed, let objects	841	* if some form of movement is allowed, let objects
1028	* drop on that space.	842	* drop on that space.
1029	*/	843	*/
1030	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)
1031	{	845	{
1032	object *op = inv;	846	object *op = inv;
1033		847
1034	while (op)	848	while (op)
1035	{	849	{
1036	object *tmp = op->below;	850	object *tmp = op->below;
1037	op->free (free_inventory);	851	op->destroy (destroy_inventory);
1038	op = tmp;	852	op = tmp;
1039	}	853	}
1040	}	854	}
1041	else	855	else
1042	{ /* Put objects in inventory onto this space */	856	{ /* Put objects in inventory onto this space */
…		…
1044		858
1045	while (op)	859	while (op)
1046	{	860	{
1047	object *tmp = op->below;	861	object *tmp = op->below;
1048		862
1049	remove_ob (op);	863	op->remove ();
1050		864
1051	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1053	free_object (op);	867	op->destroy ();
1054	else	868	else
1055	{	869	{
1056	op->x = x;	870	op->x = x;
1057	op->y = y;	871	op->y = y;
1058	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 */
…		…
1061	op = tmp;	875	op = tmp;
1062	}	876	}
1063	}	877	}
1064	}	878	}
1065		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
		900	// clear those pointers that likely might have circular references to us
1066	owner = 0;	901	owner = 0;
		902	enemy = 0;
		903	attacked_by = 0;
		904
		905	// only relevant for players(?), but make sure of it anyways
		906	contr = 0;
1067		907
1068	/* Remove object from the active list */	908	/* Remove object from the active list */
1069	speed = 0;	909	speed = 0;
1070	update_ob_speed (this);	910	update_ob_speed (this);
1071		911
…		…
1076		916
1077	/*	917	/*
1078	* sub_weight() recursively (outwards) subtracts a number from the	918	* sub_weight() recursively (outwards) subtracts a number from the
1079	* 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)).
1080	*/	920	*/
1081
1082	void	921	void
1083	sub_weight (object *op, signed long weight)	922	sub_weight (object *op, signed long weight)
1084	{	923	{
1085	while (op != NULL)	924	while (op != NULL)
1086	{	925	{
1087	if (op->type == CONTAINER)	926	if (op->type == CONTAINER)
1088	{
1089	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	927	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090	}	928
1091	op->carrying -= weight;	929	op->carrying -= weight;
1092	op = op->env;	930	op = op->env;
1093	}	931	}
1094	}	932	}
1095		933
1096	/* remove_ob(op):	934	/* op->remove ():
1097	* 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
1098	* 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
1099	* object will have no environment. If the object previously had an	937	* object will have no environment. If the object previously had an
1100	* environment, the x and y coordinates will be updated to	938	* environment, the x and y coordinates will be updated to
1101	* the previous environment.	939	* the previous environment.
1102	* Beware: This function is called from the editor as well!	940	* Beware: This function is called from the editor as well!
1103	*/	941	*/
1104
1105	void	942	void
1106	remove_ob (object *op)	943	object::remove ()
1107	{	944	{
		945	object *tmp, *last = 0;
1108	object *	946	object *otmp;
1109	tmp, *
1110	last = NULL;
1111	object *
1112	otmp;
1113		947
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	948	int check_walk_off;
1118	mapstruct *
1119	m;
1120		949
1121	sint16
1122	x,
1123	y;
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	950	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	return;	951	return;
1127		952
1128	SET_FLAG (op, FLAG_REMOVED);	953	SET_FLAG (this, FLAG_REMOVED);
1129		954
1130	if (op->more != NULL)	955	if (more)
1131	remove_ob (op->more);	956	more->remove ();
1132		957
1133	/*	958	/*
1134	* In this case, the object to be removed is in someones	959	* In this case, the object to be removed is in someones
1135	* inventory.	960	* inventory.
1136	*/	961	*/
1137	if (op->env != NULL)	962	if (env)
1138	{	963	{
1139	if (op->nrof)	964	if (nrof)
1140	sub_weight (op->env, op->weight * op->nrof);	965	sub_weight (env, weight * nrof);
1141	else	966	else
1142	sub_weight (op->env, op->weight + op->carrying);	967	sub_weight (env, weight + carrying);
1143		968
1144	/* 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
1145	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1146	* to save cpu time.	971	* to save cpu time.
1147	*/	972	*/
1148	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))
1149	fix_player (otmp);	974	otmp->update_stats ();
1150		975
1151	if (op->above != NULL)	976	if (above != NULL)
1152	op->above->below = op->below;	977	above->below = below;
1153	else	978	else
1154	op->env->inv = op->below;	979	env->inv = below;
1155		980
1156	if (op->below != NULL)	981	if (below != NULL)
1157	op->below->above = op->above;	982	below->above = above;
1158		983
1159	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1160	* 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
1161	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
1162	*/	987	*/
1163	op->x = op->env->x, op->y = op->env->y;	988	x = env->x, y = env->y;
1164	op->map = op->env->map;	989	map = env->map;
1165	op->above = NULL, op->below = NULL;	990	above = 0, below = 0;
1166	op->env = NULL;	991	env = 0;
1167	}	992	}
1168	else if (op->map)	993	else if (map)
1169	{	994	{
1170	x = op->x;
1171	y = op->y;
1172	m = get_map_from_coord (op->map, &x, &y);
1173
1174	if (!m)
1175	{
1176	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177	op->map->path, op->x, op->y);
1178	/* in old days, we used to set x and y to 0 and continue.
1179	* it seems if we get into this case, something is probablye
1180	* screwed up and should be fixed.
1181	*/
1182	abort ();
1183	}
1184
1185	if (op->map != m)
1186	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187	op->map->path, m->path, op->x, op->y, x, y);
1188
1189	/* Re did the following section of code - it looks like it had	995	/* Re did the following section of code - it looks like it had
1190	* lots of logic for things we no longer care about	996	* lots of logic for things we no longer care about
1191	*/	997	*/
1192		998
1193	/* link the object above us */	999	/* link the object above us */
1194	if (op->above)	1000	if (above)
1195	op->above->below = op->below;	1001	above->below = below;
1196	else	1002	else
1197	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 */
1198		1004
1199	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
1200	if (op->below)	1006	if (below)
1201	op->below->above = op->above;	1007	below->above = above;
1202	else	1008	else
1203	{	1009	{
1204	/* 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
1205	* use translated coordinates in case some oddness with map tiling is	1011	* use translated coordinates in case some oddness with map tiling is
1206	* evident	1012	* evident
1207	*/	1013	*/
1208	if (GET_MAP_OB (m, x, y) != op)	1014	if (GET_MAP_OB (map, x, y) != this)
1209	{	1015	{
1210	dump_object (op);	1016	char *dump = dump_object (this);
1211	LOG (llevError,	1017	LOG (llevError,
1212	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	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);
1213	dump_object (GET_MAP_OB (m, x, y));	1020	dump = dump_object (GET_MAP_OB (map, x, y));
1214	LOG (llevError, "%s\n", errmsg);	1021	LOG (llevError, "%s\n", dump);
		1022	free (dump);
1215	}	1023	}
1216		1024
1217	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1025	map->at (x, y).bottom = above; /* goes on above it. */
1218	}	1026	}
1219		1027
1220	op->above = 0;	1028	above = 0;
1221	op->below = 0;	1029	below = 0;
1222		1030
1223	if (op->map->in_memory == MAP_SAVING)	1031	if (map->in_memory == MAP_SAVING)
1224	return;	1032	return;
1225		1033
1226	tag = op->count;
1227	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228		1035
1229	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)
1230	{	1037	{
1231	/* 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
1232	* being removed.	1039	* being removed.
1233	*/	1040	*/
1234		1041
1235	if (tmp->type == PLAYER && tmp != op)	1042	if (tmp->type == PLAYER && tmp != this)
1236	{	1043	{
1237	/* If a container that the player is currently using somehow gets	1044	/* If a container that the player is currently using somehow gets
1238	* removed (most likely destroyed), update the player view	1045	* removed (most likely destroyed), update the player view
1239	* appropriately.	1046	* appropriately.
1240	*/	1047	*/
1241	if (tmp->container == op)	1048	if (tmp->container == this)
1242	{	1049	{
1243	CLEAR_FLAG (op, FLAG_APPLIED);	1050	CLEAR_FLAG (this, FLAG_APPLIED);
1244	tmp->container = NULL;	1051	tmp->container = 0;
1245	}	1052	}
1246		1053
1247	tmp->contr->socket.update_look = 1;	1054	tmp->contr->ns->floorbox_update ();
1248	}	1055	}
1249		1056
1250	/* See if player moving off should effect something */	1057	/* See if player moving off should effect something */
1251	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1058	if (check_walk_off
		1059	&& ((move_type & tmp->move_off)
		1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1252	{	1061	{
1253	move_apply (tmp, op, NULL);	1062	move_apply (tmp, this, 0);
1254		1063
1255	if (was_destroyed (op, tag))	1064	if (destroyed ())
1256	{
1257	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 ());
1258	}
1259	}	1066	}
1260		1067
1261	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262		1069
1263	if (tmp->above == tmp)	1070	if (tmp->above == tmp)
1264	tmp->above = NULL;	1071	tmp->above = 0;
1265		1072
1266	last = tmp;	1073	last = tmp;
1267	}	1074	}
1268		1075
1269	/* last == NULL of there are no objects on this space */	1076	/* last == NULL of there are no objects on this space */
1270	if (last == NULL)	1077	if (!last)
1271	{	1078	map->at (x, y).flags_ = P_NEED_UPDATE;
1272	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1274	* those out anyways, and if there are any flags set right now, they won't
1275	* be correct anyways.
1276	*/
1277	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1278	update_position (op->map, op->x, op->y);
1279	}
1280	else	1079	else
1281	update_object (last, UP_OBJ_REMOVE);	1080	update_object (last, UP_OBJ_REMOVE);
1282		1081
1283	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284	update_all_los (op->map, op->x, op->y);	1083	update_all_los (map, x, y);
1285	}	1084	}
1286	}	1085	}
1287		1086
1288	/*	1087	/*
1289	* merge_ob(op,top):	1088	* merge_ob(op,top):
…		…
1304		1103
1305	for (; top != NULL; top = top->below)	1104	for (; top != NULL; top = top->below)
1306	{	1105	{
1307	if (top == op)	1106	if (top == op)
1308	continue;	1107	continue;
1309	if (CAN_MERGE (op, top))	1108
		1109	if (object::can_merge (op, top))
1310	{	1110	{
1311	top->nrof += op->nrof;	1111	top->nrof += op->nrof;
1312		1112
1313	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314	op->weight = 0; /* Don't want any adjustements now */	1114	op->weight = 0; /* Don't want any adjustements now */
1315	remove_ob (op);	1115	op->destroy ();
1316	free_object (op);
1317	return top;	1116	return top;
1318	}	1117	}
1319	}	1118	}
1320		1119
1321	return NULL;	1120	return 0;
1322	}	1121	}
1323		1122
1324	/*	1123	/*
1325	* 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
1326	* job preparing multi-part monsters	1125	* job preparing multi-part monsters
1327	*/	1126	*/
1328	object *	1127	object *
1329	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)
1330	{	1129	{
1331	object *tmp;	1130	object *tmp;
1332		1131
1333	if (op->head)	1132	if (op->head)
1334	op = op->head;	1133	op = op->head;
…		…
1362	* NULL if 'op' was destroyed	1161	* NULL if 'op' was destroyed
1363	* just 'op' otherwise	1162	* just 'op' otherwise
1364	*/	1163	*/
1365		1164
1366	object *	1165	object *
1367	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)
1368	{	1167	{
1369	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1370	sint16 x, y;	1169	sint16 x, y;
1371		1170
1372	if (QUERY_FLAG (op, FLAG_FREED))	1171	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1375	return NULL;	1174	return NULL;
1376	}	1175	}
1377		1176
1378	if (m == NULL)	1177	if (m == NULL)
1379	{	1178	{
1380	dump_object (op);	1179	char *dump = dump_object (op);
1381	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);
1382	return op;	1182	return op;
1383	}	1183	}
1384		1184
1385	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1386	{	1186	{
1387	dump_object (op);	1187	char *dump = dump_object (op);
1388	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);
1389	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1390	/* 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
1391	* 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
1392	* improperly inserted.	1192	* improperly inserted.
1393	*/	1193	*/
1394	abort ();	1194	abort ();
1395	#endif	1195	#endif
		1196	free (dump);
1396	return op;	1197	return op;
1397	}	1198	}
1398		1199
1399	if (!QUERY_FLAG (op, FLAG_REMOVED))	1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1400	{	1201	{
1401	dump_object (op);	1202	char *dump = dump_object (op);
1402	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);
1403	return op;	1205	return op;
1404	}	1206	}
1405		1207
1406	if (op->more != NULL)	1208	if (op->more != NULL)
1407	{	1209	{
…		…
1445		1247
1446	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1447	*/	1249	*/
1448	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1449	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)
1450	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1451	{	1253	{
1452	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1453	remove_ob (tmp);	1255	tmp->destroy ();
1454	free_object (tmp);
1455	}	1256	}
1456		1257
1457	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 */
1458	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459		1260
…		…
1472	op->below = originator->below;	1273	op->below = originator->below;
1473		1274
1474	if (op->below)	1275	if (op->below)
1475	op->below->above = op;	1276	op->below->above = op;
1476	else	1277	else
1477	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bottom = op;
1478		1279
1479	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1480	originator->below = op;	1281	originator->below = op;
1481	}	1282	}
1482	else	1283	else
…		…
1528	* If INS_ON_TOP is used, don't do this processing	1329	* If INS_ON_TOP is used, don't do this processing
1529	* Need to find the object that in fact blocks view, otherwise	1330	* Need to find the object that in fact blocks view, otherwise
1530	* stacking is a bit odd.	1331	* stacking is a bit odd.
1531	*/	1332	*/
1532	if (!(flag & INS_ON_TOP) &&	1333	if (!(flag & INS_ON_TOP) &&
1533	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1534	{	1335	{
1535	for (last = top; last != floor; last = last->below)	1336	for (last = top; last != floor; last = last->below)
1536	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1537	break;	1338	break;
1538	/* Check to see if we found the object that blocks view,	1339	/* Check to see if we found the object that blocks view,
…		…
1561		1362
1562	if (op->above)	1363	if (op->above)
1563	op->above->below = op;	1364	op->above->below = op;
1564		1365
1565	op->below = NULL;	1366	op->below = NULL;
1566	SET_MAP_OB (op->map, op->x, op->y, op);	1367	op->ms ().bottom = op;
1567	}	1368	}
1568	else	1369	else
1569	{ /* get inserted into the stack above top */	1370	{ /* get inserted into the stack above top */
1570	op->above = top->above;	1371	op->above = top->above;
1571		1372
…		…
1575	op->below = top;	1376	op->below = top;
1576	top->above = op;	1377	top->above = op;
1577	}	1378	}
1578		1379
1579	if (op->above == NULL)	1380	if (op->above == NULL)
1580	SET_MAP_TOP (op->map, op->x, op->y, op);	1381	op->ms ().top = op;
1581	} /* else not INS_BELOW_ORIGINATOR */	1382	} /* else not INS_BELOW_ORIGINATOR */
1582		1383
1583	if (op->type == PLAYER)	1384	if (op->type == PLAYER)
1584	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
1585		1386
1586	/* 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
1587	* it, so save a few ticks and start from there.	1388	* it, so save a few ticks and start from there.
1588	*/	1389	*/
1589	if (!(flag & INS_MAP_LOAD))	1390	if (!(flag & INS_MAP_LOAD))
1590	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 ())
1591	if (tmp->type == PLAYER)	1392	pl->contr->ns->floorbox_update ();
1592	tmp->contr->socket.update_look = 1;
1593		1393
1594	/* If this object glows, it may affect lighting conditions that are	1394	/* If this object glows, it may affect lighting conditions that are
1595	* 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
1596	* 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
1597	* on the map will get recalculated. The players could very well	1397	* on the map will get recalculated. The players could very well
…		…
1605		1405
1606	/* updates flags (blocked, alive, no magic, etc) for this map space */	1406	/* updates flags (blocked, alive, no magic, etc) for this map space */
1607	update_object (op, UP_OBJ_INSERT);	1407	update_object (op, UP_OBJ_INSERT);
1608		1408
1609	/* 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,
1610	* we want to have update_look set above before calling this.	1410	* we want to have floorbox_update called before calling this.
1611	*	1411	*
1612	* check_move_on() must be after this because code called from	1412	* check_move_on() must be after this because code called from
1613	* check_move_on() depends on correct map flags (so functions like	1413	* check_move_on() depends on correct map flags (so functions like
1614	* blocked() and wall() work properly), and these flags are updated by	1414	* blocked() and wall() work properly), and these flags are updated by
1615	* update_object().	1415	* update_object().
…		…
1631		1431
1632	return op;	1432	return op;
1633	}	1433	}
1634		1434
1635	/* this function inserts an object in the map, but if it	1435	/* this function inserts an object in the map, but if it
1636	* finds an object of its own type, it'll remove that one first.	1436	* finds an object of its own type, it'll remove that one first.
1637	* op is the object to insert it under: supplies x and the map.	1437	* op is the object to insert it under: supplies x and the map.
1638	*/	1438	*/
1639	void	1439	void
1640	replace_insert_ob_in_map (const char *arch_string, object *op)	1440	replace_insert_ob_in_map (const char *arch_string, object *op)
1641	{	1441	{
1642	object *	1442	object *tmp, *tmp1;
1643	tmp;
1644	object *
1645	tmp1;
1646		1443
1647	/* first search for itself and remove any old instances */	1444	/* first search for itself and remove any old instances */
1648		1445
1649	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)
1650	{
1651	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652	{	1448	tmp->destroy ();
1653	remove_ob (tmp);
1654	free_object (tmp);
1655	}
1656	}
1657		1449
1658	tmp1 = arch_to_object (find_archetype (arch_string));	1450	tmp1 = arch_to_object (archetype::find (arch_string));
1659		1451
1660	tmp1->x = op->x;	1452	tmp1->x = op->x;
1661	tmp1->y = op->y;	1453	tmp1->y = op->y;
1662	insert_ob_in_map (tmp1, op->map, op, 0);	1454	insert_ob_in_map (tmp1, op->map, op, 0);
1663	}	1455	}
…		…
1671	*/	1463	*/
1672		1464
1673	object *	1465	object *
1674	get_split_ob (object *orig_ob, uint32 nr)	1466	get_split_ob (object *orig_ob, uint32 nr)
1675	{	1467	{
1676	object *	1468	object *newob;
1677	newob;
1678	int
1679	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680		1470
1681	if (orig_ob->nrof < nr)	1471	if (orig_ob->nrof < nr)
1682	{	1472	{
1683	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);
1684	return NULL;	1474	return NULL;
1685	}	1475	}
1686		1476
1687	newob = object_create_clone (orig_ob);	1477	newob = object_create_clone (orig_ob);
1688		1478
1689	if ((orig_ob->nrof -= nr) < 1)	1479	if ((orig_ob->nrof -= nr) < 1)
1690	{	1480	orig_ob->destroy (1);
1691	if (!is_removed)
1692	remove_ob (orig_ob);
1693	free_object2 (orig_ob, 1);
1694	}
1695	else if (!is_removed)	1481	else if (!is_removed)
1696	{	1482	{
1697	if (orig_ob->env != NULL)	1483	if (orig_ob->env != NULL)
1698	sub_weight (orig_ob->env, orig_ob->weight * nr);	1484	sub_weight (orig_ob->env, orig_ob->weight * nr);
1699	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)
…		…
1729	if (i > op->nrof)	1515	if (i > op->nrof)
1730	i = op->nrof;	1516	i = op->nrof;
1731		1517
1732	if (QUERY_FLAG (op, FLAG_REMOVED))	1518	if (QUERY_FLAG (op, FLAG_REMOVED))
1733	op->nrof -= i;	1519	op->nrof -= i;
1734	else if (op->env != NULL)	1520	else if (op->env)
1735	{	1521	{
1736	/* is this object in the players inventory, or sub container	1522	/* is this object in the players inventory, or sub container
1737	* therein?	1523	* therein?
1738	*/	1524	*/
1739	tmp = is_player_inv (op->env);	1525	tmp = op->in_player ();
1740	/* nope. Is this a container the player has opened?	1526	/* nope. Is this a container the player has opened?
1741	* If so, set tmp to that player.	1527	* If so, set tmp to that player.
1742	* IMO, searching through all the players will mostly	1528	* IMO, searching through all the players will mostly
1743	* likely be quicker than following op->env to the map,	1529	* likely be quicker than following op->env to the map,
1744	* and then searching the map for a player.	1530	* and then searching the map for a player.
1745	*/	1531	*/
1746	if (!tmp)	1532	if (!tmp)
1747	{	1533	{
1748	for (pl = first_player; pl; pl = pl->next)	1534	for (pl = first_player; pl; pl = pl->next)
1749	if (pl->ob->container == op->env)	1535	if (pl->ob->container == op->env)
		1536	{
		1537	tmp = pl->ob;
1750	break;	1538	break;
1751	if (pl)	1539	}
1752	tmp = pl->ob;
1753	else
1754	tmp = NULL;
1755	}	1540	}
1756		1541
1757	if (i < op->nrof)	1542	if (i < op->nrof)
1758	{	1543	{
1759	sub_weight (op->env, op->weight * i);	1544	sub_weight (op->env, op->weight * i);
1760	op->nrof -= i;	1545	op->nrof -= i;
1761	if (tmp)	1546	if (tmp)
1762	{
1763	esrv_send_item (tmp, op);	1547	esrv_send_item (tmp, op);
1764	}
1765	}	1548	}
1766	else	1549	else
1767	{	1550	{
1768	remove_ob (op);	1551	op->remove ();
1769	op->nrof = 0;	1552	op->nrof = 0;
1770	if (tmp)	1553	if (tmp)
1771	{
1772	esrv_del_item (tmp->contr, op->count);	1554	esrv_del_item (tmp->contr, op->count);
1773	}
1774	}	1555	}
1775	}	1556	}
1776	else	1557	else
1777	{	1558	{
1778	object *above = op->above;	1559	object *above = op->above;
1779		1560
1780	if (i < op->nrof)	1561	if (i < op->nrof)
1781	op->nrof -= i;	1562	op->nrof -= i;
1782	else	1563	else
1783	{	1564	{
1784	remove_ob (op);	1565	op->remove ();
1785	op->nrof = 0;	1566	op->nrof = 0;
1786	}	1567	}
1787		1568
1788	/* Since we just removed op, op->above is null */	1569	/* Since we just removed op, op->above is null */
1789	for (tmp = above; tmp != NULL; tmp = tmp->above)	1570	for (tmp = above; tmp; tmp = tmp->above)
1790	if (tmp->type == PLAYER)	1571	if (tmp->type == PLAYER)
1791	{	1572	{
1792	if (op->nrof)	1573	if (op->nrof)
1793	esrv_send_item (tmp, op);	1574	esrv_send_item (tmp, op);
1794	else	1575	else
…		…
1798		1579
1799	if (op->nrof)	1580	if (op->nrof)
1800	return op;	1581	return op;
1801	else	1582	else
1802	{	1583	{
1803	free_object (op);	1584	op->destroy ();
1804	return NULL;	1585	return 0;
1805	}	1586	}
1806	}	1587	}
1807		1588
1808	/*	1589	/*
1809	* add_weight(object, weight) adds the specified weight to an object,	1590	* add_weight(object, weight) adds the specified weight to an object,
…		…
1821	op->carrying += weight;	1602	op->carrying += weight;
1822	op = op->env;	1603	op = op->env;
1823	}	1604	}
1824	}	1605	}
1825		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
1826	/*	1627	/*
1827	* insert_ob_in_ob(op,environment):	1628	* env->insert (op)
1828	* This function inserts the object op in the linked list	1629	* This function inserts the object op in the linked list
1829	* inside the object environment.	1630	* inside the object environment.
1830	*	1631	*
1831	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832	* the inventory at the last position or next to other objects of the same
1833	* type.
1834	* Frank: Now sorted by type, archetype and magic!
1835	*
1836	* The function returns now pointer to inserted item, and return value can	1632	* The function returns now pointer to inserted item, and return value can
1837	* be != op, if items are merged. -Tero	1633	* be != op, if items are merged. -Tero
1838	*/	1634	*/
1839		1635
1840	object *	1636	object *
1841	insert_ob_in_ob (object *op, object *where)	1637	object::insert (object *op)
1842	{	1638	{
1843	object *	1639	object *tmp, *otmp;
1844	tmp, *
1845	otmp;
1846		1640
1847	if (!QUERY_FLAG (op, FLAG_REMOVED))	1641	if (!QUERY_FLAG (op, FLAG_REMOVED))
1848	{	1642	op->remove ();
1849	dump_object (op);
1850	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851	return op;
1852	}
1853
1854	if (where == NULL)
1855	{
1856	dump_object (op);
1857	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858	return op;
1859	}
1860
1861	if (where->head)
1862	{
1863	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864	where = where->head;
1865	}
1866		1643
1867	if (op->more)	1644	if (op->more)
1868	{	1645	{
1869	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);
1870	return op;	1647	return op;
…		…
1872		1649
1873	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1650	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874	CLEAR_FLAG (op, FLAG_REMOVED);	1651	CLEAR_FLAG (op, FLAG_REMOVED);
1875	if (op->nrof)	1652	if (op->nrof)
1876	{	1653	{
1877	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1654	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878	if (CAN_MERGE (tmp, op))	1655	if (object::can_merge (tmp, op))
1879	{	1656	{
1880	/* return the original object and remove inserted object	1657	/* return the original object and remove inserted object
1881	(client needs the original object) */	1658	(client needs the original object) */
1882	tmp->nrof += op->nrof;	1659	tmp->nrof += op->nrof;
1883	/* Weight handling gets pretty funky. Since we are adding to	1660	/* Weight handling gets pretty funky. Since we are adding to
1884	* tmp->nrof, we need to increase the weight.	1661	* tmp->nrof, we need to increase the weight.
1885	*/	1662	*/
1886	add_weight (where, op->weight * op->nrof);	1663	add_weight (this, op->weight * op->nrof);
1887	SET_FLAG (op, FLAG_REMOVED);	1664	SET_FLAG (op, FLAG_REMOVED);
1888	free_object (op); /* free the inserted object */	1665	op->destroy (); /* free the inserted object */
1889	op = tmp;	1666	op = tmp;
1890	remove_ob (op); /* and fix old object's links */	1667	op->remove (); /* and fix old object's links */
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
1892	break;	1669	break;
1893	}	1670	}
1894		1671
1895	/* I assume combined objects have no inventory	1672	/* I assume combined objects have no inventory
1896	* We add the weight - this object could have just been removed	1673	* We add the weight - this object could have just been removed
1897	* (if it was possible to merge). calling remove_ob will subtract	1674	* (if it was possible to merge). calling remove_ob will subtract
1898	* the weight, so we need to add it in again, since we actually do	1675	* the weight, so we need to add it in again, since we actually do
1899	* the linking below	1676	* the linking below
1900	*/	1677	*/
1901	add_weight (where, op->weight * op->nrof);	1678	add_weight (this, op->weight * op->nrof);
1902	}	1679	}
1903	else	1680	else
1904	add_weight (where, (op->weight + op->carrying));	1681	add_weight (this, (op->weight + op->carrying));
1905		1682
1906	otmp = is_player_inv (where);	1683	otmp = this->in_player ();
1907	if (otmp && otmp->contr != NULL)	1684	if (otmp && otmp->contr)
1908	{
1909	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1685	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910	fix_player (otmp);	1686	otmp->update_stats ();
1911	}
1912		1687
1913	op->map = NULL;	1688	op->map = 0;
1914	op->env = where;	1689	op->env = this;
1915	op->above = NULL;	1690	op->above = 0;
1916	op->below = NULL;	1691	op->below = 0;
1917	op->x = 0, op->y = 0;	1692	op->x = 0, op->y = 0;
1918		1693
1919	/* 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 */
1920	if ((op->glow_radius != 0) && where->map)	1695	if ((op->glow_radius != 0) && map)
1921	{	1696	{
1922	#ifdef DEBUG_LIGHTS	1697	#ifdef DEBUG_LIGHTS
1923	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);
1924	#endif /* DEBUG_LIGHTS */	1699	#endif /* DEBUG_LIGHTS */
1925	if (MAP_DARKNESS (where->map))	1700	if (MAP_DARKNESS (map))
1926	update_all_los (where->map, where->x, where->y);	1701	update_all_los (map, x, y);
1927	}	1702	}
1928		1703
1929	/* 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.
1930	* It sure simplifies this function...	1705	* It sure simplifies this function...
1931	*/	1706	*/
1932	if (where->inv == NULL)	1707	if (!inv)
1933	where->inv = op;	1708	inv = op;
1934	else	1709	else
1935	{	1710	{
1936	op->below = where->inv;	1711	op->below = inv;
1937	op->below->above = op;	1712	op->below->above = op;
1938	where->inv = op;	1713	inv = op;
1939	}	1714	}
		1715
1940	return op;	1716	return op;
1941	}	1717	}
1942		1718
1943	/*	1719	/*
1944	* Checks if any objects has a move_type that matches objects	1720	* Checks if any objects has a move_type that matches objects
…		…
1962	*/	1738	*/
1963		1739
1964	int	1740	int
1965	check_move_on (object *op, object *originator)	1741	check_move_on (object *op, object *originator)
1966	{	1742	{
1967	object *	1743	object *tmp;
1968	tmp;	1744	maptile *m = op->map;
1969	tag_t
1970	tag;
1971	mapstruct *
1972	m = op->map;
1973	int
1974	x = op->x, y = op->y;	1745	int x = op->x, y = op->y;
1975		1746
1976	MoveType	1747	MoveType move_on, move_slow, move_block;
1977	move_on,
1978	move_slow,
1979	move_block;
1980		1748
1981	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1749	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982	return 0;	1750	return 0;
1983
1984	tag = op->count;
1985		1751
1986	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);
1987	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);
1988	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);
1989		1755
…		…
2050	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1816	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1817	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2052	{	1818	{
2053	move_apply (tmp, op, originator);	1819	move_apply (tmp, op, originator);
2054		1820
2055	if (was_destroyed (op, tag))	1821	if (op->destroyed ())
2056	return 1;	1822	return 1;
2057		1823
2058	/* what the person/creature stepped onto has moved the object	1824	/* what the person/creature stepped onto has moved the object
2059	* someplace new. Don't process any further - if we did,	1825	* someplace new. Don't process any further - if we did,
2060	* have a feeling strange problems would result.	1826	* have a feeling strange problems would result.
…		…
2072	* a matching archetype at the given map and coordinates.	1838	* a matching archetype at the given map and coordinates.
2073	* The first matching object is returned, or NULL if none.	1839	* The first matching object is returned, or NULL if none.
2074	*/	1840	*/
2075		1841
2076	object *	1842	object *
2077	present_arch (const archetype *at, mapstruct *m, int x, int y)	1843	present_arch (const archetype *at, maptile *m, int x, int y)
2078	{	1844	{
2079	object *	1845	object *
2080	tmp;	1846	tmp;
2081		1847
2082	if (m == NULL || out_of_map (m, x, y))	1848	if (m == NULL || out_of_map (m, x, y))
…		…
2095	* a matching type variable at the given map and coordinates.	1861	* a matching type variable at the given map and coordinates.
2096	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
2097	*/	1863	*/
2098		1864
2099	object *	1865	object *
2100	present (unsigned char type, mapstruct *m, int x, int y)	1866	present (unsigned char type, maptile *m, int x, int y)
2101	{	1867	{
2102	object *	1868	object *
2103	tmp;	1869	tmp;
2104		1870
2105	if (out_of_map (m, x, y))	1871	if (out_of_map (m, x, y))
…		…
2245	* 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
2246	* customized, changed states, etc.	2012	* customized, changed states, etc.
2247	*/	2013	*/
2248		2014
2249	int	2015	int
2250	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)
2251	{	2017	{
2252	int	2018	int
2253	i,	2019	i,
2254	index = 0, flag;	2020	index = 0, flag;
2255	static int	2021	static int
…		…
2267	* 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
2268	* 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
2269	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2270	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2271	*/	2037	*/
2272	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2038	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2273	stop = maxfree[i];	2039	stop = maxfree[i];
2274	}	2040	}
		2041
2275	if (!index)	2042	if (!index)
2276	return -1;	2043	return -1;
		2044
2277	return altern[RANDOM () % index];	2045	return altern[RANDOM () % index];
2278	}	2046	}
2279		2047
2280	/*	2048	/*
2281	* find_first_free_spot(archetype, mapstruct, x, y) works like	2049	* find_first_free_spot(archetype, maptile, x, y) works like
2282	* find_free_spot(), but it will search max number of squares.	2050	* find_free_spot(), but it will search max number of squares.
2283	* 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.
2284	* 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.
2285	*/	2053	*/
2286		2054
2287	int	2055	int
2288	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)
2289	{	2057	{
2290	int	2058	int
2291	i;	2059	i;
2292		2060
2293	for (i = 0; i < SIZEOFFREE; i++)	2061	for (i = 0; i < SIZEOFFREE; i++)
…		…
2357	* 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
2358	* there is capable of.	2126	* there is capable of.
2359	*/	2127	*/
2360		2128
2361	int	2129	int
2362	find_dir (mapstruct *m, int x, int y, object *exclude)	2130	find_dir (maptile *m, int x, int y, object *exclude)
2363	{	2131	{
2364	int	2132	int
2365	i,	2133	i,
2366	max = SIZEOFFREE, mflags;	2134	max = SIZEOFFREE, mflags;
2367		2135
2368	sint16 nx, ny;	2136	sint16 nx, ny;
2369	object *	2137	object *
2370	tmp;	2138	tmp;
2371	mapstruct *	2139	maptile *
2372	mp;	2140	mp;
2373		2141
2374	MoveType blocked, move_type;	2142	MoveType blocked, move_type;
2375		2143
2376	if (exclude && exclude->head)	2144	if (exclude && exclude->head)
…		…
2389	mp = m;	2157	mp = m;
2390	nx = x + freearr_x[i];	2158	nx = x + freearr_x[i];
2391	ny = y + freearr_y[i];	2159	ny = y + freearr_y[i];
2392		2160
2393	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2161	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2162
2394	if (mflags & P_OUT_OF_MAP)	2163	if (mflags & P_OUT_OF_MAP)
2395	{
2396	max = maxfree[i];	2164	max = maxfree[i];
2397	}
2398	else	2165	else
2399	{	2166	{
2400	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2401		2168
2402	if ((move_type & blocked) == move_type)	2169	if ((move_type & blocked) == move_type)
2403	{
2404	max = maxfree[i];	2170	max = maxfree[i];
2405	}
2406	else if (mflags & P_IS_ALIVE)	2171	else if (mflags & P_IS_ALIVE)
2407	{	2172	{
2408	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)
2409	{
2410	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)))
2411	{
2412	break;	2175	break;
2413	}	2176
2414	}
2415	if (tmp)	2177	if (tmp)
2416	{
2417	return freedir[i];	2178	return freedir[i];
2418	}
2419	}	2179	}
2420	}	2180	}
2421	}	2181	}
		2182
2422	return 0;	2183	return 0;
2423	}	2184	}
2424		2185
2425	/*	2186	/*
2426	* distance(object 1, object 2) will return the square of the	2187	* distance(object 1, object 2) will return the square of the
…		…
2428	*/	2189	*/
2429		2190
2430	int	2191	int
2431	distance (const object *ob1, const object *ob2)	2192	distance (const object *ob1, const object *ob2)
2432	{	2193	{
2433	int	2194	int i;
2434	i;
2435		2195
2436	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);
2437	return i;	2197	return i;
2438	}	2198	}
2439		2199
…		…
2444	*/	2204	*/
2445		2205
2446	int	2206	int
2447	find_dir_2 (int x, int y)	2207	find_dir_2 (int x, int y)
2448	{	2208	{
2449	int	2209	int q;
2450	q;
2451		2210
2452	if (y)	2211	if (y)
2453	q = x * 100 / y;	2212	q = x * 100 / y;
2454	else if (x)	2213	else if (x)
2455	q = -300 * x;	2214	q = -300 * x;
…		…
2581	* find a path to that monster that we found. If not,	2340	* find a path to that monster that we found. If not,
2582	* we don't bother going toward it. Returns 1 if we	2341	* we don't bother going toward it. Returns 1 if we
2583	* can see a direct way to get it	2342	* can see a direct way to get it
2584	* Modified to be map tile aware -.MSW	2343	* Modified to be map tile aware -.MSW
2585	*/	2344	*/
2586
2587
2588	int	2345	int
2589	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2346	can_see_monsterP (maptile *m, int x, int y, int dir)
2590	{	2347	{
2591	sint16 dx, dy;	2348	sint16 dx, dy;
2592	int
2593	mflags;	2349	int mflags;
2594		2350
2595	if (dir < 0)	2351	if (dir < 0)
2596	return 0; /* exit condition: invalid direction */	2352	return 0; /* exit condition: invalid direction */
2597		2353
2598	dx = x + freearr_x[dir];	2354	dx = x + freearr_x[dir];
…		…
2611	return 0;	2367	return 0;
2612		2368
2613	/* yes, can see. */	2369	/* yes, can see. */
2614	if (dir < 9)	2370	if (dir < 9)
2615	return 1;	2371	return 1;
		2372
2616	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2373	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2617	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2374	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2375	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2618	}	2376	}
2619
2620
2621		2377
2622	/*	2378	/*
2623	* 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
2624	* picked up by the picker. Returnes 1 if it can be	2380	* picked up by the picker. Returnes 1 if it can be
2625	* picked up, otherwise 0.	2381	* picked up, otherwise 0.
…		…
2636	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2392	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2637	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2638	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2394	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2639	}	2395	}
2640		2396
2641
2642	/*	2397	/*
2643	* create clone from object to another	2398	* create clone from object to another
2644	*/	2399	*/
2645	object *	2400	object *
2646	object_create_clone (object *asrc)	2401	object_create_clone (object *asrc)
2647	{	2402	{
2648	object *
2649	dst = NULL, *tmp, *src, *part, *prev, *item;	2403	object *dst = 0, *tmp, *src, *part, *prev, *item;
2650		2404
2651	if (!asrc)	2405	if (!asrc)
2652	return NULL;	2406	return 0;
		2407
2653	src = asrc;	2408	src = asrc;
2654	if (src->head)	2409	if (src->head)
2655	src = src->head;	2410	src = src->head;
2656		2411
2657	prev = NULL;	2412	prev = 0;
2658	for (part = src; part; part = part->more)	2413	for (part = src; part; part = part->more)
2659	{	2414	{
2660	tmp = get_object ();	2415	tmp = part->clone ();
2661	copy_object (part, tmp);
2662	tmp->x -= src->x;	2416	tmp->x -= src->x;
2663	tmp->y -= src->y;	2417	tmp->y -= src->y;
		2418
2664	if (!part->head)	2419	if (!part->head)
2665	{	2420	{
2666	dst = tmp;	2421	dst = tmp;
2667	tmp->head = NULL;	2422	tmp->head = 0;
2668	}	2423	}
2669	else	2424	else
2670	{
2671	tmp->head = dst;	2425	tmp->head = dst;
2672	}	2426
2673	tmp->more = NULL;	2427	tmp->more = 0;
		2428
2674	if (prev)	2429	if (prev)
2675	prev->more = tmp;	2430	prev->more = tmp;
		2431
2676	prev = tmp;	2432	prev = tmp;
2677	}	2433	}
2678		2434
2679	/*** copy inventory ***/
2680	for (item = src->inv; item; item = item->below)	2435	for (item = src->inv; item; item = item->below)
2681	{
2682	(void) insert_ob_in_ob (object_create_clone (item), dst);	2436	insert_ob_in_ob (object_create_clone (item), dst);
2683	}
2684		2437
2685	return dst;	2438	return dst;
2686	}	2439	}
2687		2440
2688	/* return true if the object was destroyed, 0 otherwise */
2689	int
2690	was_destroyed (const object *op, tag_t old_tag)
2691	{
2692	/* checking for FLAG_FREED isn't necessary, but makes this function more
2693	* robust */
2694	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695	}
2696
2697	/* GROS - Creates an object using a string representing its content. */	2441	/* GROS - Creates an object using a string representing its content. */
2698
2699	/* Basically, we save the content of the string to a temp file, then call */	2442	/* Basically, we save the content of the string to a temp file, then call */
2700
2701	/* load_object on it. I admit it is a highly inefficient way to make things, */	2443	/* load_object on it. I admit it is a highly inefficient way to make things, */
2702
2703	/* but it was simple to make and allows reusing the load_object function. */	2444	/* but it was simple to make and allows reusing the load_object function. */
2704
2705	/* Remember not to use load_object_str in a time-critical situation. */	2445	/* Remember not to use load_object_str in a time-critical situation. */
2706
2707	/* Also remember that multiparts objects are not supported for now. */	2446	/* Also remember that multiparts objects are not supported for now. */
2708		2447
2709	object *	2448	object *
2710	load_object_str (const char *obstr)	2449	load_object_str (const char *obstr)
2711	{	2450	{
2712	object *	2451	object *op;
2713	op;
2714	char
2715	filename[MAX_BUF];	2452	char filename[MAX_BUF];
2716		2453
2717	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718		2455
2719	FILE *
2720	tempfile = fopen (filename, "w");	2456	FILE *tempfile = fopen (filename, "w");
2721		2457
2722	if (tempfile == NULL)	2458	if (tempfile == NULL)
2723	{	2459	{
2724	LOG (llevError, "Error - Unable to access load object temp file\n");	2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2725	return NULL;	2461	return NULL;
2726	}	2462	}
2727		2463
2728	fprintf (tempfile, obstr);	2464	fprintf (tempfile, obstr);
2729	fclose (tempfile);	2465	fclose (tempfile);
2730		2466
2731	op = get_object ();	2467	op = object::create ();
2732		2468
2733	object_thawer thawer (filename);	2469	object_thawer thawer (filename);
2734		2470
2735	if (thawer)	2471	if (thawer)
2736	load_object (thawer, op, 0);	2472	load_object (thawer, op, 0);
…		…
2746	* returns NULL if no match.	2482	* returns NULL if no match.
2747	*/	2483	*/
2748	object *	2484	object *
2749	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)
2750	{	2486	{
2751	object *	2487	object *tmp;
2752	tmp;
2753		2488
2754	for (tmp = who->inv; tmp; tmp = tmp->below)	2489	for (tmp = who->inv; tmp; tmp = tmp->below)
2755	if (tmp->type == type && tmp->subtype == subtype)	2490	if (tmp->type == type && tmp->subtype == subtype)
2756	return tmp;	2491	return tmp;
2757		2492
…		…
2765	* do the desired thing.	2500	* do the desired thing.
2766	*/	2501	*/
2767	key_value *	2502	key_value *
2768	get_ob_key_link (const object *ob, const char *key)	2503	get_ob_key_link (const object *ob, const char *key)
2769	{	2504	{
2770	key_value *	2505	key_value *link;
2771	link;
2772		2506
2773	for (link = ob->key_values; link != NULL; link = link->next)	2507	for (link = ob->key_values; link != NULL; link = link->next)
2774	{
2775	if (link->key == key)	2508	if (link->key == key)
2776	{
2777	return link;	2509	return link;
2778	}
2779	}
2780		2510
2781	return NULL;	2511	return NULL;
2782	}	2512	}
2783		2513
2784	/*	2514	/*

Diff Legend

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