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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC

…		…
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
34		36
35	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
36	static UUID uuid;	38	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
38		40
…		…
104	_exit (1);	106	_exit (1);
105	}	107	}
106		108
107	uuid.seq = uid;	109	uuid.seq = uid;
108	write_uuid ();	110	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	112	fclose (fp);
111	}	113	}
112		114
113	UUID	115	UUID
114	gen_uuid ()	116	gen_uuid ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
141	*/	143	*/
142		144
143	/* For each field in wants, */	145	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	147	{
146	key_value *has_field;	148	key_value *has_field;
147		149
148	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	185	*
184	* 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
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
187	*	189	*
188	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
189	*	191	*
190	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
191	* check weight	193	* check weight
192	*/	194	*/
193		195
194	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	197	{
196	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
197	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)
198	return 0;	204	return 0;
199		205
200	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* 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
204	* 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
205	* used to store nrof).	209	* used to store nrof).
206	*/	210	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		222
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		225
222		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
252	(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)
253	return 0;	251	return 0;
254		252
255	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	254	* check all objects in the inventory.
257	*/	255	*/
…		…
260	/* 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 */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	260	return 0;
263		261
264	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	264	return 0;
267		265
268	/* 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
269	* if it is valid.	267	* if it is valid.
270	*/	268	*/
…		…
354	op = op->env;	352	op = op->env;
355	return op;	353	return op;
356	}	354	}
357		355
358	/*	356	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	358	* Some error messages.
376	* 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.
377	*/	360	*/
378		361
379	void	362	char *
380	dump_object2 (object *op)
381	{
382	errmsg[0] = 0;
383	return;
384	//TODO//D#d#
385	#if 0
386	char *cp;
387
388	/* object *tmp;*/
389
390	if (op->arch != NULL)
391	{
392	strcat (errmsg, "arch ");
393	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
394	strcat (errmsg, "\n");
395	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
396	strcat (errmsg, cp);
397	# if 0
398	/* Don't dump player diffs - they are too long, mostly meaningless, and
399	* will overflow the buffer.
400	* Changed so that we don't dump inventory either. This may
401	* also overflow the buffer.
402	*/
403	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
404	strcat (errmsg, cp);
405	for (tmp = op->inv; tmp; tmp = tmp->below)
406	dump_object2 (tmp);
407	# endif
408	strcat (errmsg, "end\n");
409	}
410	else
411	{
412	strcat (errmsg, "Object ");
413	if (op->name == NULL)
414	strcat (errmsg, "(null)");
415	else
416	strcat (errmsg, op->name);
417	strcat (errmsg, "\n");
418	# if 0
419	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
420	strcat (errmsg, cp);
421	for (tmp = op->inv; tmp; tmp = tmp->below)
422	dump_object2 (tmp);
423	# endif
424	strcat (errmsg, "end\n");
425	}
426	#endif
427	}
428
429	/*
430	* Dumps an object. Returns output in the static global errmsg array.
431	*/
432
433	void
434	dump_object (object *op)	363	dump_object (object *op)
435	{	364	{
436	if (op == NULL)	365	if (!op)
437	{	366	return strdup ("[NULLOBJ]");
438	strcpy (errmsg, "[NULL pointer]");
439	return;
440	}
441	errmsg[0] = '\0';
442	dump_object2 (op);
443	}
444		367
445	void	368	object_freezer freezer;
446	dump_all_objects (void)	369	save_object (freezer, op, 1);
447	{	370	return freezer.as_string ();
448	object *op;
449
450	for (op = object::first; op != NULL; op = op->next)
451	{
452	dump_object (op);
453	fprintf (logfile, "Object %s\n", errmsg);
454	}
455	}	371	}
456		372
457	/*	373	/*
458	* 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
459	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
479	*/	395	*/
480		396
481	object *	397	object *
482	find_object (tag_t i)	398	find_object (tag_t i)
483	{	399	{
484	object *op;
485
486	for (op = object::first; op != NULL; op = op->next)	400	for (object *op = object::first; op; op = op->next)
487	if (op->count == i)	401	if (op->count == i)
488	break;	402	return op;
489		403
490	return op;	404	return 0;
491	}	405	}
492		406
493	/*	407	/*
494	* 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.
495	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
553	}	467	}
554		468
555	op->key_values = 0;	469	op->key_values = 0;
556	}	470	}
557		471
558	void object::clear ()
559	{
560	attachable_base::clear ();
561
562	free_key_values (this);
563
564	owner = 0;
565	name = 0;
566	name_pl = 0;
567	title = 0;
568	race = 0;
569	slaying = 0;
570	skill = 0;
571	msg = 0;
572	lore = 0;
573	custom_name = 0;
574	materialname = 0;
575	contr = 0;
576	below = 0;
577	above = 0;
578	inv = 0;
579	container = 0;
580	env = 0;
581	more = 0;
582	head = 0;
583	map = 0;
584	active_next = 0;
585	active_prev = 0;
586
587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
588
589	SET_FLAG (this, FLAG_REMOVED);
590
591	/* What is not cleared is next, prev, and count */
592
593	expmul = 1.0;
594	face = blank_face;
595
596	if (settings.casting_time)
597	casting_time = -1;
598	}
599
600	void object::clone (object *destination)
601	{
602	*(object_copy *)destination = *this;
603	*(object_pod *)destination = *this;
604
605	if (self || cb)
606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607	}
608
609	/*	472	/*
610	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
611	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
612	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
613	* 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,
614	* 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
615	* will point at garbage.	478	* will point at garbage.
616	*/	479	*/
617	void	480	void
618	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
619	{	482	{
620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622		485
623	op2->clone (op);	486	*(object_copy *)dst = *this;
624		487
625	if (is_freed)	488	if (is_freed)
626	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
627	if (is_removed)	491	if (is_removed)
628	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
629		493
630	if (op2->speed < 0)	494	if (speed < 0)
631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632		496
633	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
634	if (op2->key_values)	498	if (key_values)
635	{	499	{
636	key_value *tail = 0;	500	key_value *tail = 0;
637	key_value *i;	501	key_value *i;
638		502
639	op->key_values = 0;	503	dst->key_values = 0;
640		504
641	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
642	{	506	{
643	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
644		508
645	new_link->next = 0;	509	new_link->next = 0;
646	new_link->key = i->key;	510	new_link->key = i->key;
647	new_link->value = i->value;	511	new_link->value = i->value;
648		512
649	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
650	if (!op->key_values)	514	if (!dst->key_values)
651	{	515	{
652	op->key_values = new_link;	516	dst->key_values = new_link;
653	tail = new_link;	517	tail = new_link;
654	}	518	}
655	else	519	else
656	{	520	{
657	tail->next = new_link;	521	tail->next = new_link;
658	tail = new_link;	522	tail = new_link;
659	}	523	}
660	}	524	}
661	}	525	}
662		526
663	update_ob_speed (op);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
664	}	536	}
665		537
666	/*	538	/*
667	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
668	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
…		…
682	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
683	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
684	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
685	*/	557	*/
686	void	558	void
687	update_ob_speed (object *op)	559	object::set_speed (float speed)
688	{	560	{
689	extern int arch_init;	561	extern int arch_init;
690		562
691	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
692	* since they never really need to be updated.	564	* since they never really need to be updated.
693	*/	565	*/
694		566	if (flag [FLAG_FREED] && speed)
695	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
696	{	567	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	#ifdef MANY_CORES
699	abort ();
700	#else
701	op->speed = 0;	569	speed = 0;
702	#endif
703	}	570	}
		571
		572	this->speed = speed;
704		573
705	if (arch_init)	574	if (arch_init)
706	return;	575	return;
707		576
708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
709	{	578	{
710	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
711	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
712	return;	581	return;
713		582
714	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
715	* of the list. */	584	* of the list. */
716	op->active_next = active_objects;	585	active_next = active_objects;
717		586
718	if (op->active_next != NULL)	587	if (active_next)
719	op->active_next->active_prev = op;	588	active_next->active_prev = this;
720		589
721	active_objects = op;	590	active_objects = this;
722	}	591	}
723	else	592	else
724	{	593	{
725	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
726	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
727	return;	596	return;
728		597
729	if (op->active_prev == NULL)	598	if (!active_prev)
730	{	599	{
731	active_objects = op->active_next;	600	active_objects = active_next;
732		601
733	if (op->active_next != NULL)	602	if (active_next)
734	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
735	}	604	}
736	else	605	else
737	{	606	{
738	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
739		608
740	if (op->active_next)	609	if (active_next)
741	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
742	}	611	}
743		612
744	op->active_next = NULL;	613	active_next = 0;
745	op->active_prev = NULL;	614	active_prev = 0;
746	}	615	}
747	}	616	}
748		617
749	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
750	* objects.	619	* objects.
…		…
776	op->active_next = NULL;	645	op->active_next = NULL;
777	op->active_prev = NULL;	646	op->active_prev = NULL;
778	}	647	}
779		648
780	/*	649	/*
781	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
782	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
783	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
784	* invisible object, etc...)	653	* invisible object, etc...)
785	* If the object being updated is beneath a player, the look-window	654	* If the object being updated is beneath a player, the look-window
786	* of that player is updated (this might be a suboptimal way of	655	* of that player is updated (this might be a suboptimal way of
787	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
788	*	657	*
789	* action is a hint of what the caller believes need to be done.	658	* action is a hint of what the caller believes need to be done.
790	* For example, if the only thing that has changed is the face (due to
791	* an animation), we don't need to call update_position until that actually
792	* comes into view of a player. OTOH, many other things, like addition/removal
793	* of walls or living creatures may need us to update the flags now.
794	* current action are:	659	* current action are:
795	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
796	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
798	* as that is easier than trying to look at what may have changed.	663	* as that is easier than trying to look at what may have changed.
799	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
800	*/	665	*/
801
802	void	666	void
803	update_object (object *op, int action)	667	update_object (object *op, int action)
804	{	668	{
805	int update_now = 0, flags;
806	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
807		670
808	if (op == NULL)	671	if (op == NULL)
809	{	672	{
810	/* this should never happen */	673	/* this should never happen */
811	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
812	return;	675	return;
813	}	676	}
814		677
815	if (op->env != NULL)	678	if (op->env)
816	{	679	{
817	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
818	* to do in this case.	681	* to do in this case.
819	*/	682	*/
820	return;	683	return;
…		…
825	*/	688	*/
826	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
827	return;	690	return;
828		691
829	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
830	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
831	{	694	{
832	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
833	#ifdef MANY_CORES	696	#ifdef MANY_CORES
834	abort ();	697	abort ();
835	#endif	698	#endif
836	return;	699	return;
837	}	700	}
838		701
839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	mapspace &m = op->ms ();
840	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
841	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
842	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
843	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
844	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
845		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
846	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
847	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
849	update_now = 1;
850
851	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
858	update_now = 1;
859
860	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
861	update_now = 1;
862
863	if ((move_on | op->move_on) != move_on)	715	|| (m.move_on | op->move_on ) != m.move_on
864	update_now = 1;
865
866	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
867	update_now = 1;	717	|| (m.move_slow | op->move_slow) != m.move_slow
868
869	/* This isn't perfect, but I don't expect a lot of objects to	718	/* This isn't perfect, but I don't expect a lot of objects to
870	* to have move_allow right now.	719	* to have move_allow right now.
871	*/	720	*/
872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874		723	m.flags_ = P_NEED_UPDATE;
875	if ((move_slow | op->move_slow) != move_slow)
876	update_now = 1;
877	}	724	}
878	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
879	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
880	* that is being removed.	727	* that is being removed.
881	*/	728	*/
882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
884	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
885	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
886	else	733	else
887	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
888		735
889	if (update_now)
890	{
891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
892	update_position (op->map, op->x, op->y);
893	}
894
895	if (op->more != NULL)	736	if (op->more)
896	update_object (op->more, action);	737	update_object (op->more, action);
897	}	738	}
898		739
899	object::vector object::mortals;
900	object::vector object::objects; // not yet used	740	object::vector object::objects; // not yet used
901	object *object::first;	741	object *object::first;
902
903	void object::free_mortals ()
904	{
905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
906	if ((*i)->refcnt)
907	++i; // further delay freeing
908	else
909	{
910	delete *i;
911	mortals.erase (i);
912	}
913
914	static int lastmortals = 0;//D
915
916	if (mortals.size() != lastmortals && lastmortals > 100)//D
917	{
918	lastmortals = mortals.size ();//D
919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920	}
921	}
922		742
923	object::object ()	743	object::object ()
924	{	744	{
925	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
926		746
…		…
965	object *op = new object;	785	object *op = new object;
966	op->link ();	786	op->link ();
967	return op;	787	return op;
968	}	788	}
969		789
970	/*	790	void
971	* free_object() frees everything allocated by an object, removes	791	object::do_destroy ()
972	* it from the list of used objects, and puts it on the list of
973	* free objects. The IS_FREED() flag is set in the object.
974	* The object must have been removed by remove_ob() first for
975	* this function to succeed.
976	*
977	* If destroy_inventory is set, free inventory as well. Else drop items in
978	* inventory to the ground.
979	*/
980	void object::destroy (bool destroy_inventory)
981	{	792	{
982	if (QUERY_FLAG (this, FLAG_FREED))	793	attachable::do_destroy ();
		794
		795	if (flag [FLAG_IS_LINKED])
		796	remove_button_link (this);
		797
		798	if (flag [FLAG_FRIENDLY])
		799	remove_friendly_object (this);
		800
		801	if (!flag [FLAG_REMOVED])
		802	remove ();
		803
		804	if (flag [FLAG_FREED])
983	return;	805	return;
984		806
985	if (QUERY_FLAG (this, FLAG_FRIENDLY))	807	flag [FLAG_FREED] = 1;
986	remove_friendly_object (this);
987		808
988	if (!QUERY_FLAG (this, FLAG_REMOVED))	809	while (inv)
989	remove_ob (this);	810	inv->destroy ();
990		811
991	SET_FLAG (this, FLAG_FREED);	812	set_speed (0);
		813	unlink ();
		814
		815	// hack to ensure that freed objects still have a valid map
		816	{
		817	static maptile *freed_map; // freed objects are moved here to avoid crashes
		818
		819	if (!freed_map)
		820	{
		821	freed_map = new maptile;
		822
		823	freed_map->name = "/internal/freed_objects_map";
		824	freed_map->width = 3;
		825	freed_map->height = 3;
		826
		827	freed_map->allocate ();
		828	}
		829
		830	map = freed_map;
		831	x = 1;
		832	y = 1;
		833	}
		834
		835	head = 0;
992		836
993	if (more)	837	if (more)
994	{	838	{
995	more->destroy (destroy_inventory);	839	more->destroy ();
996	more = 0;	840	more = 0;
997	}
998
999	if (inv)
1000	{
1001	/* Only if the space blocks everything do we not process -
1002	* if some form of movement is allowed, let objects
1003	* drop on that space.
1004	*/
1005	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1006	{
1007	object *op = inv;
1008
1009	while (op)
1010	{
1011	object *tmp = op->below;
1012	op->destroy (destroy_inventory);
1013	op = tmp;
1014	}
1015	}
1016	else
1017	{ /* Put objects in inventory onto this space */
1018	object *op = inv;
1019
1020	while (op)
1021	{
1022	object *tmp = op->below;
1023
1024	remove_ob (op);
1025
1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1028	free_object (op);
1029	else
1030	{
1031	op->x = x;
1032	op->y = y;
1033	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1034	}
1035
1036	op = tmp;
1037	}
1038	}
1039	}	841	}
1040		842
1041	// clear those pointers that likely might have circular references to us	843	// clear those pointers that likely might have circular references to us
1042	owner = 0;	844	owner = 0;
1043	enemy = 0;	845	enemy = 0;
1044	attacked_by = 0;	846	attacked_by = 0;
1045		847
1046	// only relevant for players(?), but make sure of it anyways	848	// only relevant for players(?), but make sure of it anyways
1047	contr = 0;	849	contr = 0;
		850	}
1048		851
1049	/* Remove object from the active list */	852	/*
1050	speed = 0;	853	* Remove and free all objects in the inventory of the given object.
1051	update_ob_speed (this);	854	* object.c ?
		855	*/
		856	void
		857	object::destroy_inv (bool drop_to_ground)
		858	{
		859	/* Only if the space blocks everything do we not process -
		860	* if some form of movement is allowed, let objects
		861	* drop on that space.
		862	*/
		863	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		864	{
		865	while (inv)
		866	inv->destroy ();
		867	}
		868	else
		869	{ /* Put objects in inventory onto this space */
		870	while (inv)
		871	{
		872	object *op = inv;
1052		873
1053	unlink ();	874	if (op->flag [FLAG_STARTEQUIP]
		875	|| op->flag [FLAG_NO_DROP]
		876	|| op->type == RUNE
		877	|| op->type == TRAP
		878	|| op->flag [FLAG_IS_A_TEMPLATE])
		879	op->destroy ();
		880	else
		881	{
		882	op->remove ();
		883	op->x = x;
		884	op->y = y;
		885	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		886	}
		887	}
		888	}
		889	}
1054		890
1055	mortals.push_back (this);	891	void
		892	object::destroy (bool destroy_inventory)
		893	{
		894	if (destroyed ())
		895	return;
		896
		897	if (destroy_inventory)
		898	destroy_inv (true);
		899
		900	attachable::destroy ();
1056	}	901	}
1057		902
1058	/*	903	/*
1059	* sub_weight() recursively (outwards) subtracts a number from the	904	* sub_weight() recursively (outwards) subtracts a number from the
1060	* weight of an object (and what is carried by it's environment(s)).	905	* weight of an object (and what is carried by it's environment(s)).
1061	*/	906	*/
1062
1063	void	907	void
1064	sub_weight (object *op, signed long weight)	908	sub_weight (object *op, signed long weight)
1065	{	909	{
1066	while (op != NULL)	910	while (op != NULL)
1067	{	911	{
…		…
1071	op->carrying -= weight;	915	op->carrying -= weight;
1072	op = op->env;	916	op = op->env;
1073	}	917	}
1074	}	918	}
1075		919
1076	/* remove_ob(op):	920	/* op->remove ():
1077	* This function removes the object op from the linked list of objects	921	* This function removes the object op from the linked list of objects
1078	* which it is currently tied to. When this function is done, the	922	* which it is currently tied to. When this function is done, the
1079	* object will have no environment. If the object previously had an	923	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	924	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	925	* the previous environment.
1082	* Beware: This function is called from the editor as well!	926	* Beware: This function is called from the editor as well!
1083	*/	927	*/
1084
1085	void	928	void
1086	remove_ob (object *op)	929	object::remove ()
1087	{	930	{
1088	object *tmp, *last = 0;	931	object *tmp, *last = 0;
1089	object *otmp;	932	object *otmp;
1090		933
1091	int check_walk_off;
1092	maptile *m;
1093
1094	sint16 x, y;
1095
1096	if (QUERY_FLAG (op, FLAG_REMOVED))	934	if (QUERY_FLAG (this, FLAG_REMOVED))
1097	return;	935	return;
1098		936
1099	SET_FLAG (op, FLAG_REMOVED);	937	SET_FLAG (this, FLAG_REMOVED);
		938	INVOKE_OBJECT (REMOVE, this);
1100		939
1101	if (op->more != NULL)	940	if (more)
1102	remove_ob (op->more);	941	more->remove ();
1103		942
1104	/*	943	/*
1105	* In this case, the object to be removed is in someones	944	* In this case, the object to be removed is in someones
1106	* inventory.	945	* inventory.
1107	*/	946	*/
1108	if (op->env != NULL)	947	if (env)
1109	{	948	{
1110	if (op->nrof)	949	if (nrof)
1111	sub_weight (op->env, op->weight * op->nrof);	950	sub_weight (env, weight * nrof);
1112	else	951	else
1113	sub_weight (op->env, op->weight + op->carrying);	952	sub_weight (env, weight + carrying);
1114		953
1115	/* NO_FIX_PLAYER is set when a great many changes are being	954	/* NO_FIX_PLAYER is set when a great many changes are being
1116	* made to players inventory. If set, avoiding the call	955	* made to players inventory. If set, avoiding the call
1117	* to save cpu time.	956	* to save cpu time.
1118	*/	957	*/
1119	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	958	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1120	fix_player (otmp);	959	otmp->update_stats ();
1121		960
1122	if (op->above != NULL)	961	if (above != NULL)
1123	op->above->below = op->below;	962	above->below = below;
1124	else	963	else
1125	op->env->inv = op->below;	964	env->inv = below;
1126		965
1127	if (op->below != NULL)	966	if (below != NULL)
1128	op->below->above = op->above;	967	below->above = above;
1129		968
1130	/* we set up values so that it could be inserted into	969	/* we set up values so that it could be inserted into
1131	* the map, but we don't actually do that - it is up	970	* the map, but we don't actually do that - it is up
1132	* to the caller to decide what we want to do.	971	* to the caller to decide what we want to do.
1133	*/	972	*/
1134	op->x = op->env->x, op->y = op->env->y;	973	x = env->x, y = env->y;
1135	op->map = op->env->map;	974	map = env->map;
1136	op->above = NULL, op->below = NULL;	975	above = 0, below = 0;
1137	op->env = NULL;	976	env = 0;
1138	}	977	}
1139	else if (op->map)	978	else if (map)
1140	{	979	{
1141	x = op->x;
1142	y = op->y;
1143	m = get_map_from_coord (op->map, &x, &y);
1144
1145	if (!m)
1146	{
1147	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1148	op->map->path, op->x, op->y);
1149	/* in old days, we used to set x and y to 0 and continue.
1150	* it seems if we get into this case, something is probablye
1151	* screwed up and should be fixed.
1152	*/
1153	abort ();
1154	}
1155
1156	if (op->map != m)
1157	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1158	op->map->path, m->path, op->x, op->y, x, y);
1159
1160	/* Re did the following section of code - it looks like it had	980	/* Re did the following section of code - it looks like it had
1161	* lots of logic for things we no longer care about	981	* lots of logic for things we no longer care about
1162	*/	982	*/
1163		983
1164	/* link the object above us */	984	/* link the object above us */
1165	if (op->above)	985	if (above)
1166	op->above->below = op->below;	986	above->below = below;
1167	else	987	else
1168	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	988	map->at (x, y).top = below; /* we were top, set new top */
1169		989
1170	/* Relink the object below us, if there is one */	990	/* Relink the object below us, if there is one */
1171	if (op->below)	991	if (below)
1172	op->below->above = op->above;	992	below->above = above;
1173	else	993	else
1174	{	994	{
1175	/* Nothing below, which means we need to relink map object for this space	995	/* Nothing below, which means we need to relink map object for this space
1176	* use translated coordinates in case some oddness with map tiling is	996	* use translated coordinates in case some oddness with map tiling is
1177	* evident	997	* evident
1178	*/	998	*/
1179	if (GET_MAP_OB (m, x, y) != op)	999	if (GET_MAP_OB (map, x, y) != this)
1180	{	1000	{
1181	dump_object (op);	1001	char *dump = dump_object (this);
1182	LOG (llevError,	1002	LOG (llevError,
1183	"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);	1003	"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);
		1004	free (dump);
1184	dump_object (GET_MAP_OB (m, x, y));	1005	dump = dump_object (GET_MAP_OB (map, x, y));
1185	LOG (llevError, "%s\n", errmsg);	1006	LOG (llevError, "%s\n", dump);
		1007	free (dump);
1186	}	1008	}
1187		1009
1188	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1010	map->at (x, y).bot = above; /* goes on above it. */
1189	}	1011	}
1190		1012
1191	op->above = 0;	1013	above = 0;
1192	op->below = 0;	1014	below = 0;
1193		1015
1194	if (op->map->in_memory == MAP_SAVING)	1016	if (map->in_memory == MAP_SAVING)
1195	return;	1017	return;
1196		1018
1197	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1019	int check_walk_off = !flag [FLAG_NO_APPLY];
1198		1020
1199	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1021	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1200	{	1022	{
1201	/* No point updating the players look faces if he is the object	1023	/* No point updating the players look faces if he is the object
1202	* being removed.	1024	* being removed.
1203	*/	1025	*/
1204		1026
1205	if (tmp->type == PLAYER && tmp != op)	1027	if (tmp->type == PLAYER && tmp != this)
1206	{	1028	{
1207	/* If a container that the player is currently using somehow gets	1029	/* If a container that the player is currently using somehow gets
1208	* removed (most likely destroyed), update the player view	1030	* removed (most likely destroyed), update the player view
1209	* appropriately.	1031	* appropriately.
1210	*/	1032	*/
1211	if (tmp->container == op)	1033	if (tmp->container == this)
1212	{	1034	{
1213	CLEAR_FLAG (op, FLAG_APPLIED);	1035	flag [FLAG_APPLIED] = 0;
1214	tmp->container = NULL;	1036	tmp->container = 0;
1215	}	1037	}
1216		1038
1217	tmp->contr->socket.update_look = 1;	1039	if (tmp->contr->ns)
		1040	tmp->contr->ns->floorbox_update ();
1218	}	1041	}
1219		1042
1220	/* See if player moving off should effect something */	1043	/* See if player moving off should effect something */
1221	if (check_walk_off	1044	if (check_walk_off
1222	&& ((op->move_type & tmp->move_off)	1045	&& ((move_type & tmp->move_off)
1223	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1046	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224	{	1047	{
1225	move_apply (tmp, op, NULL);	1048	move_apply (tmp, this, 0);
1226		1049
1227	if (op->destroyed ())	1050	if (destroyed ())
1228	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1051	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1229	}	1052	}
1230		1053
1231	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1054	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1232		1055
1233	if (tmp->above == tmp)	1056	if (tmp->above == tmp)
1234	tmp->above = NULL;	1057	tmp->above = 0;
1235		1058
1236	last = tmp;	1059	last = tmp;
1237	}	1060	}
1238		1061
1239	/* last == NULL of there are no objects on this space */	1062	/* last == NULL of there are no objects on this space */
1240	if (last == NULL)	1063	if (!last)
1241	{	1064	map->at (x, y).flags_ = P_NEED_UPDATE;
1242	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1243	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1244	* those out anyways, and if there are any flags set right now, they won't
1245	* be correct anyways.
1246	*/
1247	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1248	update_position (op->map, op->x, op->y);
1249	}
1250	else	1065	else
1251	update_object (last, UP_OBJ_REMOVE);	1066	update_object (last, UP_OBJ_REMOVE);
1252		1067
1253	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1068	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1254	update_all_los (op->map, op->x, op->y);	1069	update_all_los (map, x, y);
1255	}	1070	}
1256	}	1071	}
1257		1072
1258	/*	1073	/*
1259	* merge_ob(op,top):	1074	* merge_ob(op,top):
…		…
1267	merge_ob (object *op, object *top)	1082	merge_ob (object *op, object *top)
1268	{	1083	{
1269	if (!op->nrof)	1084	if (!op->nrof)
1270	return 0;	1085	return 0;
1271		1086
1272	if (top == NULL)	1087	if (top)
1273	for (top = op; top != NULL && top->above != NULL; top = top->above);	1088	for (top = op; top && top->above; top = top->above)
		1089	;
1274		1090
1275	for (; top != NULL; top = top->below)	1091	for (; top; top = top->below)
1276	{	1092	{
1277	if (top == op)	1093	if (top == op)
1278	continue;	1094	continue;
1279	if (CAN_MERGE (op, top))	1095
		1096	if (object::can_merge (op, top))
1280	{	1097	{
1281	top->nrof += op->nrof;	1098	top->nrof += op->nrof;
1282		1099
1283	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1100	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1284	op->weight = 0; /* Don't want any adjustements now */	1101	op->weight = 0; /* Don't want any adjustements now */
1285	remove_ob (op);	1102	op->destroy ();
1286	free_object (op);
1287	return top;	1103	return top;
1288	}	1104	}
1289	}	1105	}
1290		1106
1291	return 0;	1107	return 0;
…		…
1330	* Return value:	1146	* Return value:
1331	* new object if 'op' was merged with other object	1147	* new object if 'op' was merged with other object
1332	* NULL if 'op' was destroyed	1148	* NULL if 'op' was destroyed
1333	* just 'op' otherwise	1149	* just 'op' otherwise
1334	*/	1150	*/
1335
1336	object *	1151	object *
1337	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1152	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1338	{	1153	{
1339	object *tmp, *top, *floor = NULL;	1154	object *tmp, *top, *floor = NULL;
1340	sint16 x, y;	1155	sint16 x, y;
…		…
1345	return NULL;	1160	return NULL;
1346	}	1161	}
1347		1162
1348	if (m == NULL)	1163	if (m == NULL)
1349	{	1164	{
1350	dump_object (op);	1165	char *dump = dump_object (op);
1351	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1166	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1167	free (dump);
1352	return op;	1168	return op;
1353	}	1169	}
1354		1170
1355	if (out_of_map (m, op->x, op->y))	1171	if (out_of_map (m, op->x, op->y))
1356	{	1172	{
1357	dump_object (op);	1173	char *dump = dump_object (op);
1358	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1174	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1359	#ifdef MANY_CORES	1175	#ifdef MANY_CORES
1360	/* Better to catch this here, as otherwise the next use of this object	1176	/* Better to catch this here, as otherwise the next use of this object
1361	* is likely to cause a crash. Better to find out where it is getting	1177	* is likely to cause a crash. Better to find out where it is getting
1362	* improperly inserted.	1178	* improperly inserted.
1363	*/	1179	*/
1364	abort ();	1180	abort ();
1365	#endif	1181	#endif
		1182	free (dump);
1366	return op;	1183	return op;
1367	}	1184	}
1368		1185
1369	if (!QUERY_FLAG (op, FLAG_REMOVED))	1186	if (!QUERY_FLAG (op, FLAG_REMOVED))
1370	{	1187	{
1371	dump_object (op);	1188	char *dump = dump_object (op);
1372	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1189	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1190	free (dump);
1373	return op;	1191	return op;
1374	}	1192	}
1375		1193
1376	if (op->more != NULL)	1194	if (op->more)
1377	{	1195	{
1378	/* The part may be on a different map. */	1196	/* The part may be on a different map. */
1379		1197
1380	object *more = op->more;	1198	object *more = op->more;
1381		1199
…		…
1397	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1215	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1398	{	1216	{
1399	if (!op->head)	1217	if (!op->head)
1400	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1218	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1401		1219
1402	return NULL;	1220	return 0;
1403	}	1221	}
1404	}	1222	}
1405		1223
1406	CLEAR_FLAG (op, FLAG_REMOVED);	1224	CLEAR_FLAG (op, FLAG_REMOVED);
1407		1225
…		…
1415		1233
1416	/* this has to be done after we translate the coordinates.	1234	/* this has to be done after we translate the coordinates.
1417	*/	1235	*/
1418	if (op->nrof && !(flag & INS_NO_MERGE))	1236	if (op->nrof && !(flag & INS_NO_MERGE))
1419	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1237	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1420	if (CAN_MERGE (op, tmp))	1238	if (object::can_merge (op, tmp))
1421	{	1239	{
1422	op->nrof += tmp->nrof;	1240	op->nrof += tmp->nrof;
1423	remove_ob (tmp);	1241	tmp->destroy ();
1424	free_object (tmp);
1425	}	1242	}
1426		1243
1427	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1244	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1428	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1245	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1429		1246
…		…
1442	op->below = originator->below;	1259	op->below = originator->below;
1443		1260
1444	if (op->below)	1261	if (op->below)
1445	op->below->above = op;	1262	op->below->above = op;
1446	else	1263	else
1447	SET_MAP_OB (op->map, op->x, op->y, op);	1264	op->ms ().bot = op;
1448		1265
1449	/* since *below* originator, no need to update top */	1266	/* since *below* originator, no need to update top */
1450	originator->below = op;	1267	originator->below = op;
1451	}	1268	}
1452	else	1269	else
…		…
1498	* If INS_ON_TOP is used, don't do this processing	1315	* If INS_ON_TOP is used, don't do this processing
1499	* Need to find the object that in fact blocks view, otherwise	1316	* Need to find the object that in fact blocks view, otherwise
1500	* stacking is a bit odd.	1317	* stacking is a bit odd.
1501	*/	1318	*/
1502	if (!(flag & INS_ON_TOP) &&	1319	if (!(flag & INS_ON_TOP) &&
1503	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1320	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1504	{	1321	{
1505	for (last = top; last != floor; last = last->below)	1322	for (last = top; last != floor; last = last->below)
1506	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1323	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1507	break;	1324	break;
1508	/* Check to see if we found the object that blocks view,	1325	/* Check to see if we found the object that blocks view,
…		…
1531		1348
1532	if (op->above)	1349	if (op->above)
1533	op->above->below = op;	1350	op->above->below = op;
1534		1351
1535	op->below = NULL;	1352	op->below = NULL;
1536	SET_MAP_OB (op->map, op->x, op->y, op);	1353	op->ms ().bot = op;
1537	}	1354	}
1538	else	1355	else
1539	{ /* get inserted into the stack above top */	1356	{ /* get inserted into the stack above top */
1540	op->above = top->above;	1357	op->above = top->above;
1541		1358
…		…
1545	op->below = top;	1362	op->below = top;
1546	top->above = op;	1363	top->above = op;
1547	}	1364	}
1548		1365
1549	if (op->above == NULL)	1366	if (op->above == NULL)
1550	SET_MAP_TOP (op->map, op->x, op->y, op);	1367	op->ms ().top = op;
1551	} /* else not INS_BELOW_ORIGINATOR */	1368	} /* else not INS_BELOW_ORIGINATOR */
1552		1369
1553	if (op->type == PLAYER)	1370	if (op->type == PLAYER)
1554	op->contr->do_los = 1;	1371	op->contr->do_los = 1;
1555		1372
1556	/* If we have a floor, we know the player, if any, will be above	1373	/* If we have a floor, we know the player, if any, will be above
1557	* it, so save a few ticks and start from there.	1374	* it, so save a few ticks and start from there.
1558	*/	1375	*/
1559	if (!(flag & INS_MAP_LOAD))	1376	if (!(flag & INS_MAP_LOAD))
1560	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1377	if (object *pl = op->ms ().player ())
1561	if (tmp->type == PLAYER)	1378	if (pl->contr->ns)
1562	tmp->contr->socket.update_look = 1;	1379	pl->contr->ns->floorbox_update ();
1563		1380
1564	/* If this object glows, it may affect lighting conditions that are	1381	/* If this object glows, it may affect lighting conditions that are
1565	* visible to others on this map. But update_all_los is really	1382	* visible to others on this map. But update_all_los is really
1566	* an inefficient way to do this, as it means los for all players	1383	* an inefficient way to do this, as it means los for all players
1567	* on the map will get recalculated. The players could very well	1384	* on the map will get recalculated. The players could very well
1568	* be far away from this change and not affected in any way -	1385	* be far away from this change and not affected in any way -
1569	* this should get redone to only look for players within range,	1386	* this should get redone to only look for players within range,
1570	* or just updating the P_NEED_UPDATE for spaces within this area	1387	* or just updating the P_NEED_UPDATE for spaces within this area
1571	* of effect may be sufficient.	1388	* of effect may be sufficient.
1572	*/	1389	*/
1573	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1390	if (op->map->darkness && (op->glow_radius != 0))
1574	update_all_los (op->map, op->x, op->y);	1391	update_all_los (op->map, op->x, op->y);
1575		1392
1576	/* updates flags (blocked, alive, no magic, etc) for this map space */	1393	/* updates flags (blocked, alive, no magic, etc) for this map space */
1577	update_object (op, UP_OBJ_INSERT);	1394	update_object (op, UP_OBJ_INSERT);
1578		1395
		1396	INVOKE_OBJECT (INSERT, op);
		1397
1579	/* Don't know if moving this to the end will break anything. However,	1398	/* Don't know if moving this to the end will break anything. However,
1580	* we want to have update_look set above before calling this.	1399	* we want to have floorbox_update called before calling this.
1581	*	1400	*
1582	* check_move_on() must be after this because code called from	1401	* check_move_on() must be after this because code called from
1583	* check_move_on() depends on correct map flags (so functions like	1402	* check_move_on() depends on correct map flags (so functions like
1584	* blocked() and wall() work properly), and these flags are updated by	1403	* blocked() and wall() work properly), and these flags are updated by
1585	* update_object().	1404	* update_object().
…		…
1587		1406
1588	/* if this is not the head or flag has been passed, don't check walk on status */	1407	/* if this is not the head or flag has been passed, don't check walk on status */
1589	if (!(flag & INS_NO_WALK_ON) && !op->head)	1408	if (!(flag & INS_NO_WALK_ON) && !op->head)
1590	{	1409	{
1591	if (check_move_on (op, originator))	1410	if (check_move_on (op, originator))
1592	return NULL;	1411	return 0;
1593		1412
1594	/* If we are a multi part object, lets work our way through the check	1413	/* If we are a multi part object, lets work our way through the check
1595	* walk on's.	1414	* walk on's.
1596	*/	1415	*/
1597	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1416	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1598	if (check_move_on (tmp, originator))	1417	if (check_move_on (tmp, originator))
1599	return NULL;	1418	return 0;
1600	}	1419	}
1601		1420
1602	return op;	1421	return op;
1603	}	1422	}
1604		1423
1605	/* this function inserts an object in the map, but if it	1424	/* this function inserts an object in the map, but if it
1606	* finds an object of its own type, it'll remove that one first.	1425	* finds an object of its own type, it'll remove that one first.
1607	* op is the object to insert it under: supplies x and the map.	1426	* op is the object to insert it under: supplies x and the map.
1608	*/	1427	*/
1609	void	1428	void
1610	replace_insert_ob_in_map (const char *arch_string, object *op)	1429	replace_insert_ob_in_map (const char *arch_string, object *op)
1611	{	1430	{
1612	object *	1431	object *tmp, *tmp1;
1613	tmp;
1614	object *
1615	tmp1;
1616		1432
1617	/* first search for itself and remove any old instances */	1433	/* first search for itself and remove any old instances */
1618		1434
1619	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1435	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1620	{
1621	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1436	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1622	{	1437	tmp->destroy ();
1623	remove_ob (tmp);
1624	free_object (tmp);
1625	}
1626	}
1627		1438
1628	tmp1 = arch_to_object (archetype::find (arch_string));	1439	tmp1 = arch_to_object (archetype::find (arch_string));
1629		1440
1630	tmp1->x = op->x;	1441	tmp1->x = op->x;
1631	tmp1->y = op->y;	1442	tmp1->y = op->y;
…		…
1641	*/	1452	*/
1642		1453
1643	object *	1454	object *
1644	get_split_ob (object *orig_ob, uint32 nr)	1455	get_split_ob (object *orig_ob, uint32 nr)
1645	{	1456	{
1646	object *	1457	object *newob;
1647	newob;
1648	int
1649	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1650		1459
1651	if (orig_ob->nrof < nr)	1460	if (orig_ob->nrof < nr)
1652	{	1461	{
1653	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1462	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1654	return NULL;	1463	return NULL;
1655	}	1464	}
1656		1465
1657	newob = object_create_clone (orig_ob);	1466	newob = object_create_clone (orig_ob);
1658		1467
1659	if ((orig_ob->nrof -= nr) < 1)	1468	if ((orig_ob->nrof -= nr) < 1)
1660	{	1469	orig_ob->destroy (1);
1661	if (!is_removed)
1662	remove_ob (orig_ob);
1663	free_object2 (orig_ob, 1);
1664	}
1665	else if (!is_removed)	1470	else if (!is_removed)
1666	{	1471	{
1667	if (orig_ob->env != NULL)	1472	if (orig_ob->env != NULL)
1668	sub_weight (orig_ob->env, orig_ob->weight * nr);	1473	sub_weight (orig_ob->env, orig_ob->weight * nr);
1669	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1474	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1689		1494
1690	object *	1495	object *
1691	decrease_ob_nr (object *op, uint32 i)	1496	decrease_ob_nr (object *op, uint32 i)
1692	{	1497	{
1693	object *tmp;	1498	object *tmp;
1694	player *pl;
1695		1499
1696	if (i == 0) /* objects with op->nrof require this check */	1500	if (i == 0) /* objects with op->nrof require this check */
1697	return op;	1501	return op;
1698		1502
1699	if (i > op->nrof)	1503	if (i > op->nrof)
1700	i = op->nrof;	1504	i = op->nrof;
1701		1505
1702	if (QUERY_FLAG (op, FLAG_REMOVED))	1506	if (QUERY_FLAG (op, FLAG_REMOVED))
1703	op->nrof -= i;	1507	op->nrof -= i;
1704	else if (op->env != NULL)	1508	else if (op->env)
1705	{	1509	{
1706	/* is this object in the players inventory, or sub container	1510	/* is this object in the players inventory, or sub container
1707	* therein?	1511	* therein?
1708	*/	1512	*/
1709	tmp = is_player_inv (op->env);	1513	tmp = op->in_player ();
1710	/* nope. Is this a container the player has opened?	1514	/* nope. Is this a container the player has opened?
1711	* If so, set tmp to that player.	1515	* If so, set tmp to that player.
1712	* IMO, searching through all the players will mostly	1516	* IMO, searching through all the players will mostly
1713	* likely be quicker than following op->env to the map,	1517	* likely be quicker than following op->env to the map,
1714	* and then searching the map for a player.	1518	* and then searching the map for a player.
1715	*/	1519	*/
1716	if (!tmp)	1520	if (!tmp)
1717	{	1521	for_all_players (pl)
1718	for (pl = first_player; pl; pl = pl->next)
1719	if (pl->ob->container == op->env)	1522	if (pl->ob->container == op->env)
		1523	{
		1524	tmp = pl->ob;
1720	break;	1525	break;
1721	if (pl)
1722	tmp = pl->ob;
1723	else
1724	tmp = NULL;
1725	}	1526	}
1726		1527
1727	if (i < op->nrof)	1528	if (i < op->nrof)
1728	{	1529	{
1729	sub_weight (op->env, op->weight * i);	1530	sub_weight (op->env, op->weight * i);
1730	op->nrof -= i;	1531	op->nrof -= i;
1731	if (tmp)	1532	if (tmp)
1732	{
1733	esrv_send_item (tmp, op);	1533	esrv_send_item (tmp, op);
1734	}
1735	}	1534	}
1736	else	1535	else
1737	{	1536	{
1738	remove_ob (op);	1537	op->remove ();
1739	op->nrof = 0;	1538	op->nrof = 0;
1740	if (tmp)	1539	if (tmp)
1741	{
1742	esrv_del_item (tmp->contr, op->count);	1540	esrv_del_item (tmp->contr, op->count);
1743	}
1744	}	1541	}
1745	}	1542	}
1746	else	1543	else
1747	{	1544	{
1748	object *above = op->above;	1545	object *above = op->above;
1749		1546
1750	if (i < op->nrof)	1547	if (i < op->nrof)
1751	op->nrof -= i;	1548	op->nrof -= i;
1752	else	1549	else
1753	{	1550	{
1754	remove_ob (op);	1551	op->remove ();
1755	op->nrof = 0;	1552	op->nrof = 0;
1756	}	1553	}
1757		1554
1758	/* Since we just removed op, op->above is null */	1555	/* Since we just removed op, op->above is null */
1759	for (tmp = above; tmp != NULL; tmp = tmp->above)	1556	for (tmp = above; tmp; tmp = tmp->above)
1760	if (tmp->type == PLAYER)	1557	if (tmp->type == PLAYER)
1761	{	1558	{
1762	if (op->nrof)	1559	if (op->nrof)
1763	esrv_send_item (tmp, op);	1560	esrv_send_item (tmp, op);
1764	else	1561	else
…		…
1768		1565
1769	if (op->nrof)	1566	if (op->nrof)
1770	return op;	1567	return op;
1771	else	1568	else
1772	{	1569	{
1773	free_object (op);	1570	op->destroy ();
1774	return NULL;	1571	return 0;
1775	}	1572	}
1776	}	1573	}
1777		1574
1778	/*	1575	/*
1779	* add_weight(object, weight) adds the specified weight to an object,	1576	* add_weight(object, weight) adds the specified weight to an object,
…		…
1791	op->carrying += weight;	1588	op->carrying += weight;
1792	op = op->env;	1589	op = op->env;
1793	}	1590	}
1794	}	1591	}
1795		1592
		1593	object *
		1594	insert_ob_in_ob (object *op, object *where)
		1595	{
		1596	if (!where)
		1597	{
		1598	char *dump = dump_object (op);
		1599	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1600	free (dump);
		1601	return op;
		1602	}
		1603
		1604	if (where->head)
		1605	{
		1606	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1607	where = where->head;
		1608	}
		1609
		1610	return where->insert (op);
		1611	}
		1612
1796	/*	1613	/*
1797	* insert_ob_in_ob(op,environment):	1614	* env->insert (op)
1798	* This function inserts the object op in the linked list	1615	* This function inserts the object op in the linked list
1799	* inside the object environment.	1616	* inside the object environment.
1800	*	1617	*
1801	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1802	* the inventory at the last position or next to other objects of the same
1803	* type.
1804	* Frank: Now sorted by type, archetype and magic!
1805	*
1806	* The function returns now pointer to inserted item, and return value can	1618	* The function returns now pointer to inserted item, and return value can
1807	* be != op, if items are merged. -Tero	1619	* be != op, if items are merged. -Tero
1808	*/	1620	*/
1809		1621
1810	object *	1622	object *
1811	insert_ob_in_ob (object *op, object *where)	1623	object::insert (object *op)
1812	{	1624	{
1813	object *	1625	object *tmp, *otmp;
1814	tmp, *
1815	otmp;
1816		1626
1817	if (!QUERY_FLAG (op, FLAG_REMOVED))	1627	if (!QUERY_FLAG (op, FLAG_REMOVED))
1818	{	1628	op->remove ();
1819	dump_object (op);
1820	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1821	return op;
1822	}
1823
1824	if (where == NULL)
1825	{
1826	dump_object (op);
1827	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1828	return op;
1829	}
1830
1831	if (where->head)
1832	{
1833	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1834	where = where->head;
1835	}
1836		1629
1837	if (op->more)	1630	if (op->more)
1838	{	1631	{
1839	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1632	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1840	return op;	1633	return op;
…		…
1842		1635
1843	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1636	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1844	CLEAR_FLAG (op, FLAG_REMOVED);	1637	CLEAR_FLAG (op, FLAG_REMOVED);
1845	if (op->nrof)	1638	if (op->nrof)
1846	{	1639	{
1847	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1640	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1848	if (CAN_MERGE (tmp, op))	1641	if (object::can_merge (tmp, op))
1849	{	1642	{
1850	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1851	(client needs the original object) */	1644	(client needs the original object) */
1852	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1853	/* Weight handling gets pretty funky. Since we are adding to	1646	/* Weight handling gets pretty funky. Since we are adding to
1854	* tmp->nrof, we need to increase the weight.	1647	* tmp->nrof, we need to increase the weight.
1855	*/	1648	*/
1856	add_weight (where, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1857	SET_FLAG (op, FLAG_REMOVED);	1650	SET_FLAG (op, FLAG_REMOVED);
1858	free_object (op); /* free the inserted object */	1651	op->destroy (); /* free the inserted object */
1859	op = tmp;	1652	op = tmp;
1860	remove_ob (op); /* and fix old object's links */	1653	op->remove (); /* and fix old object's links */
1861	CLEAR_FLAG (op, FLAG_REMOVED);	1654	CLEAR_FLAG (op, FLAG_REMOVED);
1862	break;	1655	break;
1863	}	1656	}
1864		1657
1865	/* I assume combined objects have no inventory	1658	/* I assume combined objects have no inventory
1866	* We add the weight - this object could have just been removed	1659	* We add the weight - this object could have just been removed
1867	* (if it was possible to merge). calling remove_ob will subtract	1660	* (if it was possible to merge). calling remove_ob will subtract
1868	* the weight, so we need to add it in again, since we actually do	1661	* the weight, so we need to add it in again, since we actually do
1869	* the linking below	1662	* the linking below
1870	*/	1663	*/
1871	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1872	}	1665	}
1873	else	1666	else
1874	add_weight (where, (op->weight + op->carrying));	1667	add_weight (this, (op->weight + op->carrying));
1875		1668
1876	otmp = is_player_inv (where);	1669	otmp = this->in_player ();
1877	if (otmp && otmp->contr != NULL)	1670	if (otmp && otmp->contr)
1878	{
1879	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1671	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1880	fix_player (otmp);	1672	otmp->update_stats ();
1881	}
1882		1673
1883	op->map = NULL;	1674	op->map = 0;
1884	op->env = where;	1675	op->env = this;
1885	op->above = NULL;	1676	op->above = 0;
1886	op->below = NULL;	1677	op->below = 0;
1887	op->x = 0, op->y = 0;	1678	op->x = 0, op->y = 0;
1888		1679
1889	/* reset the light list and los of the players on the map */	1680	/* reset the light list and los of the players on the map */
1890	if ((op->glow_radius != 0) && where->map)	1681	if ((op->glow_radius != 0) && map)
1891	{	1682	{
1892	#ifdef DEBUG_LIGHTS	1683	#ifdef DEBUG_LIGHTS
1893	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1684	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1894	#endif /* DEBUG_LIGHTS */	1685	#endif /* DEBUG_LIGHTS */
1895	if (MAP_DARKNESS (where->map))	1686	if (map->darkness)
1896	update_all_los (where->map, where->x, where->y);	1687	update_all_los (map, x, y);
1897	}	1688	}
1898		1689
1899	/* Client has no idea of ordering so lets not bother ordering it here.	1690	/* Client has no idea of ordering so lets not bother ordering it here.
1900	* It sure simplifies this function...	1691	* It sure simplifies this function...
1901	*/	1692	*/
1902	if (where->inv == NULL)	1693	if (!inv)
1903	where->inv = op;	1694	inv = op;
1904	else	1695	else
1905	{	1696	{
1906	op->below = where->inv;	1697	op->below = inv;
1907	op->below->above = op;	1698	op->below->above = op;
1908	where->inv = op;	1699	inv = op;
1909	}	1700	}
		1701
		1702	INVOKE_OBJECT (INSERT, this);
		1703
1910	return op;	1704	return op;
1911	}	1705	}
1912		1706
1913	/*	1707	/*
1914	* Checks if any objects has a move_type that matches objects	1708	* Checks if any objects has a move_type that matches objects
…		…
1965		1759
1966	/* The objects have to be checked from top to bottom.	1760	/* The objects have to be checked from top to bottom.
1967	* Hence, we first go to the top:	1761	* Hence, we first go to the top:
1968	*/	1762	*/
1969		1763
1970	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1764	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1971	{	1765	{
1972	/* Trim the search when we find the first other spell effect	1766	/* Trim the search when we find the first other spell effect
1973	* this helps performance so that if a space has 50 spell objects,	1767	* this helps performance so that if a space has 50 spell objects,
1974	* we don't need to check all of them.	1768	* we don't need to check all of them.
1975	*/	1769	*/
…		…
2030	/*	1824	/*
2031	* present_arch(arch, map, x, y) searches for any objects with	1825	* present_arch(arch, map, x, y) searches for any objects with
2032	* a matching archetype at the given map and coordinates.	1826	* a matching archetype at the given map and coordinates.
2033	* The first matching object is returned, or NULL if none.	1827	* The first matching object is returned, or NULL if none.
2034	*/	1828	*/
2035
2036	object *	1829	object *
2037	present_arch (const archetype *at, maptile *m, int x, int y)	1830	present_arch (const archetype *at, maptile *m, int x, int y)
2038	{	1831	{
2039	object *
2040	tmp;
2041
2042	if (m == NULL || out_of_map (m, x, y))	1832	if (m == NULL || out_of_map (m, x, y))
2043	{	1833	{
2044	LOG (llevError, "Present_arch called outside map.\n");	1834	LOG (llevError, "Present_arch called outside map.\n");
2045	return NULL;	1835	return NULL;
2046	}	1836	}
		1837
2047	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1838	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2048	if (tmp->arch == at)	1839	if (tmp->arch == at)
2049	return tmp;	1840	return tmp;
		1841
2050	return NULL;	1842	return NULL;
2051	}	1843	}
2052		1844
2053	/*	1845	/*
2054	* present(type, map, x, y) searches for any objects with	1846	* present(type, map, x, y) searches for any objects with
2055	* a matching type variable at the given map and coordinates.	1847	* a matching type variable at the given map and coordinates.
2056	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
2057	*/	1849	*/
2058
2059	object *	1850	object *
2060	present (unsigned char type, maptile *m, int x, int y)	1851	present (unsigned char type, maptile *m, int x, int y)
2061	{	1852	{
2062	object *
2063	tmp;
2064
2065	if (out_of_map (m, x, y))	1853	if (out_of_map (m, x, y))
2066	{	1854	{
2067	LOG (llevError, "Present called outside map.\n");	1855	LOG (llevError, "Present called outside map.\n");
2068	return NULL;	1856	return NULL;
2069	}	1857	}
		1858
2070	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2071	if (tmp->type == type)	1860	if (tmp->type == type)
2072	return tmp;	1861	return tmp;
		1862
2073	return NULL;	1863	return NULL;
2074	}	1864	}
2075		1865
2076	/*	1866	/*
2077	* present_in_ob(type, object) searches for any objects with	1867	* present_in_ob(type, object) searches for any objects with
2078	* a matching type variable in the inventory of the given object.	1868	* a matching type variable in the inventory of the given object.
2079	* The first matching object is returned, or NULL if none.	1869	* The first matching object is returned, or NULL if none.
2080	*/	1870	*/
2081
2082	object *	1871	object *
2083	present_in_ob (unsigned char type, const object *op)	1872	present_in_ob (unsigned char type, const object *op)
2084	{	1873	{
2085	object *
2086	tmp;
2087
2088	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1874	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2089	if (tmp->type == type)	1875	if (tmp->type == type)
2090	return tmp;	1876	return tmp;
		1877
2091	return NULL;	1878	return NULL;
2092	}	1879	}
2093		1880
2094	/*	1881	/*
2095	* present_in_ob (type, str, object) searches for any objects with	1882	* present_in_ob (type, str, object) searches for any objects with
…		…
2103	* str is the string to match against. Note that we match against	1890	* str is the string to match against. Note that we match against
2104	* the object name, not the archetype name. this is so that the	1891	* the object name, not the archetype name. this is so that the
2105	* spell code can use one object type (force), but change it's name	1892	* spell code can use one object type (force), but change it's name
2106	* to be unique.	1893	* to be unique.
2107	*/	1894	*/
2108
2109	object *	1895	object *
2110	present_in_ob_by_name (int type, const char *str, const object *op)	1896	present_in_ob_by_name (int type, const char *str, const object *op)
2111	{	1897	{
2112	object *
2113	tmp;
2114
2115	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2116	{
2117	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1899	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2118	return tmp;	1900	return tmp;
2119	}	1901
2120	return NULL;	1902	return 0;
2121	}	1903	}
2122		1904
2123	/*	1905	/*
2124	* present_arch_in_ob(archetype, object) searches for any objects with	1906	* present_arch_in_ob(archetype, object) searches for any objects with
2125	* a matching archetype in the inventory of the given object.	1907	* a matching archetype in the inventory of the given object.
2126	* The first matching object is returned, or NULL if none.	1908	* The first matching object is returned, or NULL if none.
2127	*/	1909	*/
2128
2129	object *	1910	object *
2130	present_arch_in_ob (const archetype *at, const object *op)	1911	present_arch_in_ob (const archetype *at, const object *op)
2131	{	1912	{
2132	object *
2133	tmp;
2134
2135	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1913	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2136	if (tmp->arch == at)	1914	if (tmp->arch == at)
2137	return tmp;	1915	return tmp;
		1916
2138	return NULL;	1917	return NULL;
2139	}	1918	}
2140		1919
2141	/*	1920	/*
2142	* activate recursively a flag on an object inventory	1921	* activate recursively a flag on an object inventory
2143	*/	1922	*/
2144	void	1923	void
2145	flag_inv (object *op, int flag)	1924	flag_inv (object *op, int flag)
2146	{	1925	{
2147	object *
2148	tmp;
2149
2150	if (op->inv)	1926	if (op->inv)
2151	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1927	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2152	{	1928	{
2153	SET_FLAG (tmp, flag);	1929	SET_FLAG (tmp, flag);
2154	flag_inv (tmp, flag);	1930	flag_inv (tmp, flag);
2155	}	1931	}
2156	} /*	1932	}
		1933
		1934	/*
2157	* desactivate recursively a flag on an object inventory	1935	* deactivate recursively a flag on an object inventory
2158	*/	1936	*/
2159	void	1937	void
2160	unflag_inv (object *op, int flag)	1938	unflag_inv (object *op, int flag)
2161	{	1939	{
2162	object *
2163	tmp;
2164
2165	if (op->inv)	1940	if (op->inv)
2166	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1941	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2167	{	1942	{
2168	CLEAR_FLAG (tmp, flag);	1943	CLEAR_FLAG (tmp, flag);
2169	unflag_inv (tmp, flag);	1944	unflag_inv (tmp, flag);
2170	}	1945	}
2171	}	1946	}
…		…
2174	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1949	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2175	* all it's inventory (recursively).	1950	* all it's inventory (recursively).
2176	* If checksums are used, a player will get set_cheat called for	1951	* If checksums are used, a player will get set_cheat called for
2177	* him/her-self and all object carried by a call to this function.	1952	* him/her-self and all object carried by a call to this function.
2178	*/	1953	*/
2179
2180	void	1954	void
2181	set_cheat (object *op)	1955	set_cheat (object *op)
2182	{	1956	{
2183	SET_FLAG (op, FLAG_WAS_WIZ);	1957	SET_FLAG (op, FLAG_WAS_WIZ);
2184	flag_inv (op, FLAG_WAS_WIZ);	1958	flag_inv (op, FLAG_WAS_WIZ);
…		…
2203	* because arch_blocked (now ob_blocked) needs to know the movement type	1977	* because arch_blocked (now ob_blocked) needs to know the movement type
2204	* to know if the space in question will block the object. We can't use	1978	* to know if the space in question will block the object. We can't use
2205	* the archetype because that isn't correct if the monster has been	1979	* the archetype because that isn't correct if the monster has been
2206	* customized, changed states, etc.	1980	* customized, changed states, etc.
2207	*/	1981	*/
2208
2209	int	1982	int
2210	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1983	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2211	{	1984	{
2212	int
2213	i,
2214	index = 0, flag;	1985	int index = 0, flag;
2215	static int
2216	altern[SIZEOFFREE];	1986	int altern[SIZEOFFREE];
2217		1987
2218	for (i = start; i < stop; i++)	1988	for (int i = start; i < stop; i++)
2219	{	1989	{
2220	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1990	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2221	if (!flag)	1991	if (!flag)
2222	altern[index++] = i;	1992	altern [index++] = i;
2223		1993
2224	/* Basically, if we find a wall on a space, we cut down the search size.	1994	/* Basically, if we find a wall on a space, we cut down the search size.
2225	* In this way, we won't return spaces that are on another side of a wall.	1995	* In this way, we won't return spaces that are on another side of a wall.
2226	* This mostly work, but it cuts down the search size in all directions -	1996	* This mostly work, but it cuts down the search size in all directions -
2227	* if the space being examined only has a wall to the north and empty	1997	* if the space being examined only has a wall to the north and empty
2228	* spaces in all the other directions, this will reduce the search space	1998	* spaces in all the other directions, this will reduce the search space
2229	* to only the spaces immediately surrounding the target area, and	1999	* to only the spaces immediately surrounding the target area, and
2230	* won't look 2 spaces south of the target space.	2000	* won't look 2 spaces south of the target space.
2231	*/	2001	*/
2232	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2002	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2233	stop = maxfree[i];	2003	stop = maxfree[i];
2234	}	2004	}
		2005
2235	if (!index)	2006	if (!index)
2236	return -1;	2007	return -1;
		2008
2237	return altern[RANDOM () % index];	2009	return altern[RANDOM () % index];
2238	}	2010	}
2239		2011
2240	/*	2012	/*
2241	* find_first_free_spot(archetype, maptile, x, y) works like	2013	* find_first_free_spot(archetype, maptile, x, y) works like
2242	* find_free_spot(), but it will search max number of squares.	2014	* find_free_spot(), but it will search max number of squares.
2243	* But it will return the first available spot, not a random choice.	2015	* But it will return the first available spot, not a random choice.
2244	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2016	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2245	*/	2017	*/
2246
2247	int	2018	int
2248	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2019	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2249	{	2020	{
2250	int
2251	i;
2252
2253	for (i = 0; i < SIZEOFFREE; i++)	2021	for (int i = 0; i < SIZEOFFREE; i++)
2254	{
2255	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2022	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2256	return i;	2023	return i;
2257	}	2024
2258	return -1;	2025	return -1;
2259	}	2026	}
2260		2027
2261	/*	2028	/*
2262	* The function permute(arr, begin, end) randomly reorders the array	2029	* The function permute(arr, begin, end) randomly reorders the array
2263	* arr[begin..end-1].	2030	* arr[begin..end-1].
		2031	* now uses a fisher-yates shuffle, old permute was broken
2264	*/	2032	*/
2265	static void	2033	static void
2266	permute (int *arr, int begin, int end)	2034	permute (int *arr, int begin, int end)
2267	{	2035	{
2268	int	2036	arr += begin;
2269	i,
2270	j,
2271	tmp,
2272	len;
2273
2274	len = end - begin;	2037	end -= begin;
2275	for (i = begin; i < end; i++)
2276	{
2277	j = begin + RANDOM () % len;
2278		2038
2279	tmp = arr[i];	2039	while (--end)
2280	arr[i] = arr[j];	2040	swap (arr [end], arr [RANDOM () % (end + 1)]);
2281	arr[j] = tmp;
2282	}
2283	}	2041	}
2284		2042
2285	/* new function to make monster searching more efficient, and effective!	2043	/* new function to make monster searching more efficient, and effective!
2286	* This basically returns a randomized array (in the passed pointer) of	2044	* This basically returns a randomized array (in the passed pointer) of
2287	* the spaces to find monsters. In this way, it won't always look for	2045	* the spaces to find monsters. In this way, it won't always look for
…		…
2290	* the 3x3 area will be searched, just not in a predictable order.	2048	* the 3x3 area will be searched, just not in a predictable order.
2291	*/	2049	*/
2292	void	2050	void
2293	get_search_arr (int *search_arr)	2051	get_search_arr (int *search_arr)
2294	{	2052	{
2295	int	2053	int i;
2296	i;
2297		2054
2298	for (i = 0; i < SIZEOFFREE; i++)	2055	for (i = 0; i < SIZEOFFREE; i++)
2299	{
2300	search_arr[i] = i;	2056	search_arr[i] = i;
2301	}
2302		2057
2303	permute (search_arr, 1, SIZEOFFREE1 + 1);	2058	permute (search_arr, 1, SIZEOFFREE1 + 1);
2304	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2059	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2305	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2060	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2306	}	2061	}
…		…
2315	* Perhaps incorrectly, but I'm making the assumption that exclude	2070	* Perhaps incorrectly, but I'm making the assumption that exclude
2316	* is actually want is going to try and move there. We need this info	2071	* is actually want is going to try and move there. We need this info
2317	* because we have to know what movement the thing looking to move	2072	* because we have to know what movement the thing looking to move
2318	* there is capable of.	2073	* there is capable of.
2319	*/	2074	*/
2320
2321	int	2075	int
2322	find_dir (maptile *m, int x, int y, object *exclude)	2076	find_dir (maptile *m, int x, int y, object *exclude)
2323	{	2077	{
2324	int
2325	i,
2326	max = SIZEOFFREE, mflags;	2078	int i, max = SIZEOFFREE, mflags;
2327		2079
2328	sint16 nx, ny;	2080	sint16 nx, ny;
2329	object *	2081	object *tmp;
2330	tmp;
2331	maptile *	2082	maptile *mp;
2332	mp;
2333		2083
2334	MoveType blocked, move_type;	2084	MoveType blocked, move_type;
2335		2085
2336	if (exclude && exclude->head)	2086	if (exclude && exclude->head)
2337	{	2087	{
…		…
2349	mp = m;	2099	mp = m;
2350	nx = x + freearr_x[i];	2100	nx = x + freearr_x[i];
2351	ny = y + freearr_y[i];	2101	ny = y + freearr_y[i];
2352		2102
2353	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2103	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2104
2354	if (mflags & P_OUT_OF_MAP)	2105	if (mflags & P_OUT_OF_MAP)
2355	{
2356	max = maxfree[i];	2106	max = maxfree[i];
2357	}
2358	else	2107	else
2359	{	2108	{
2360	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2109	mapspace &ms = mp->at (nx, ny);
		2110
		2111	blocked = ms.move_block;
2361		2112
2362	if ((move_type & blocked) == move_type)	2113	if ((move_type & blocked) == move_type)
2363	{
2364	max = maxfree[i];	2114	max = maxfree[i];
2365	}
2366	else if (mflags & P_IS_ALIVE)	2115	else if (mflags & P_IS_ALIVE)
2367	{	2116	{
2368	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2117	for (tmp = ms.bot; tmp; tmp = tmp->above)
2369	{	2118	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2370	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2119	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2371	{
2372	break;	2120	break;
2373	}	2121
2374	}
2375	if (tmp)	2122	if (tmp)
2376	{
2377	return freedir[i];	2123	return freedir[i];
2378	}
2379	}	2124	}
2380	}	2125	}
2381	}	2126	}
		2127
2382	return 0;	2128	return 0;
2383	}	2129	}
2384		2130
2385	/*	2131	/*
2386	* distance(object 1, object 2) will return the square of the	2132	* distance(object 1, object 2) will return the square of the
2387	* distance between the two given objects.	2133	* distance between the two given objects.
2388	*/	2134	*/
2389
2390	int	2135	int
2391	distance (const object *ob1, const object *ob2)	2136	distance (const object *ob1, const object *ob2)
2392	{	2137	{
2393	int
2394	i;
2395
2396	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2138	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2397	return i;
2398	}	2139	}
2399		2140
2400	/*	2141	/*
2401	* find_dir_2(delta-x,delta-y) will return a direction in which	2142	* find_dir_2(delta-x,delta-y) will return a direction in which
2402	* an object which has subtracted the x and y coordinates of another	2143	* an object which has subtracted the x and y coordinates of another
2403	* object, needs to travel toward it.	2144	* object, needs to travel toward it.
2404	*/	2145	*/
2405
2406	int	2146	int
2407	find_dir_2 (int x, int y)	2147	find_dir_2 (int x, int y)
2408	{	2148	{
2409	int	2149	int q;
2410	q;
2411		2150
2412	if (y)	2151	if (y)
2413	q = x * 100 / y;	2152	q = x * 100 / y;
2414	else if (x)	2153	else if (x)
2415	q = -300 * x;	2154	q = -300 * x;
…		…
2450	int	2189	int
2451	absdir (int d)	2190	absdir (int d)
2452	{	2191	{
2453	while (d < 1)	2192	while (d < 1)
2454	d += 8;	2193	d += 8;
		2194
2455	while (d > 8)	2195	while (d > 8)
2456	d -= 8;	2196	d -= 8;
		2197
2457	return d;	2198	return d;
2458	}	2199	}
2459		2200
2460	/*	2201	/*
2461	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2202	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2463	*/	2204	*/
2464		2205
2465	int	2206	int
2466	dirdiff (int dir1, int dir2)	2207	dirdiff (int dir1, int dir2)
2467	{	2208	{
2468	int	2209	int d;
2469	d;
2470		2210
2471	d = abs (dir1 - dir2);	2211	d = abs (dir1 - dir2);
2472	if (d > 4)	2212	if (d > 4)
2473	d = 8 - d;	2213	d = 8 - d;
		2214
2474	return d;	2215	return d;
2475	}	2216	}
2476		2217
2477	/* peterm:	2218	/* peterm:
2478	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2219	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2481	* This basically means that if direction is 15, then it could either go	2222	* This basically means that if direction is 15, then it could either go
2482	* direction 4, 14, or 16 to get back to where we are.	2223	* direction 4, 14, or 16 to get back to where we are.
2483	* Moved from spell_util.c to object.c with the other related direction	2224	* Moved from spell_util.c to object.c with the other related direction
2484	* functions.	2225	* functions.
2485	*/	2226	*/
2486
2487	int
2488	reduction_dir[SIZEOFFREE][3] = {	2227	int reduction_dir[SIZEOFFREE][3] = {
2489	{0, 0, 0}, /* 0 */	2228	{0, 0, 0}, /* 0 */
2490	{0, 0, 0}, /* 1 */	2229	{0, 0, 0}, /* 1 */
2491	{0, 0, 0}, /* 2 */	2230	{0, 0, 0}, /* 2 */
2492	{0, 0, 0}, /* 3 */	2231	{0, 0, 0}, /* 3 */
2493	{0, 0, 0}, /* 4 */	2232	{0, 0, 0}, /* 4 */
…		…
2541	* find a path to that monster that we found. If not,	2280	* find a path to that monster that we found. If not,
2542	* we don't bother going toward it. Returns 1 if we	2281	* we don't bother going toward it. Returns 1 if we
2543	* can see a direct way to get it	2282	* can see a direct way to get it
2544	* Modified to be map tile aware -.MSW	2283	* Modified to be map tile aware -.MSW
2545	*/	2284	*/
2546
2547
2548	int	2285	int
2549	can_see_monsterP (maptile *m, int x, int y, int dir)	2286	can_see_monsterP (maptile *m, int x, int y, int dir)
2550	{	2287	{
2551	sint16 dx, dy;	2288	sint16 dx, dy;
2552	int
2553	mflags;	2289	int mflags;
2554		2290
2555	if (dir < 0)	2291	if (dir < 0)
2556	return 0; /* exit condition: invalid direction */	2292	return 0; /* exit condition: invalid direction */
2557		2293
2558	dx = x + freearr_x[dir];	2294	dx = x + freearr_x[dir];
…		…
2571	return 0;	2307	return 0;
2572		2308
2573	/* yes, can see. */	2309	/* yes, can see. */
2574	if (dir < 9)	2310	if (dir < 9)
2575	return 1;	2311	return 1;
		2312
2576	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2313	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2577	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2314	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2315	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2578	}	2316	}
2579
2580
2581		2317
2582	/*	2318	/*
2583	* can_pick(picker, item): finds out if an object is possible to be	2319	* can_pick(picker, item): finds out if an object is possible to be
2584	* picked up by the picker. Returnes 1 if it can be	2320	* picked up by the picker. Returnes 1 if it can be
2585	* picked up, otherwise 0.	2321	* picked up, otherwise 0.
…		…
2596	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2332	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2597	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2598	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2334	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2599	}	2335	}
2600		2336
2601
2602	/*	2337	/*
2603	* create clone from object to another	2338	* create clone from object to another
2604	*/	2339	*/
2605	object *	2340	object *
2606	object_create_clone (object *asrc)	2341	object_create_clone (object *asrc)
2607	{	2342	{
2608	object *
2609	dst = NULL, *tmp, *src, *part, *prev, *item;	2343	object *dst = 0, *tmp, *src, *part, *prev, *item;
2610		2344
2611	if (!asrc)	2345	if (!asrc)
2612	return NULL;	2346	return 0;
		2347
2613	src = asrc;	2348	src = asrc;
2614	if (src->head)	2349	if (src->head)
2615	src = src->head;	2350	src = src->head;
2616		2351
2617	prev = NULL;	2352	prev = 0;
2618	for (part = src; part; part = part->more)	2353	for (part = src; part; part = part->more)
2619	{	2354	{
2620	tmp = get_object ();	2355	tmp = part->clone ();
2621	copy_object (part, tmp);
2622	tmp->x -= src->x;	2356	tmp->x -= src->x;
2623	tmp->y -= src->y;	2357	tmp->y -= src->y;
		2358
2624	if (!part->head)	2359	if (!part->head)
2625	{	2360	{
2626	dst = tmp;	2361	dst = tmp;
2627	tmp->head = NULL;	2362	tmp->head = 0;
2628	}	2363	}
2629	else	2364	else
2630	{
2631	tmp->head = dst;	2365	tmp->head = dst;
2632	}	2366
2633	tmp->more = NULL;	2367	tmp->more = 0;
		2368
2634	if (prev)	2369	if (prev)
2635	prev->more = tmp;	2370	prev->more = tmp;
		2371
2636	prev = tmp;	2372	prev = tmp;
2637	}	2373	}
2638		2374
2639	for (item = src->inv; item; item = item->below)	2375	for (item = src->inv; item; item = item->below)
2640	insert_ob_in_ob (object_create_clone (item), dst);	2376	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2646	/* Basically, we save the content of the string to a temp file, then call */	2382	/* Basically, we save the content of the string to a temp file, then call */
2647	/* load_object on it. I admit it is a highly inefficient way to make things, */	2383	/* load_object on it. I admit it is a highly inefficient way to make things, */
2648	/* but it was simple to make and allows reusing the load_object function. */	2384	/* but it was simple to make and allows reusing the load_object function. */
2649	/* Remember not to use load_object_str in a time-critical situation. */	2385	/* Remember not to use load_object_str in a time-critical situation. */
2650	/* Also remember that multiparts objects are not supported for now. */	2386	/* Also remember that multiparts objects are not supported for now. */
2651
2652	object *	2387	object *
2653	load_object_str (const char *obstr)	2388	load_object_str (const char *obstr)
2654	{	2389	{
2655	object *op;	2390	object *op;
2656	char filename[MAX_BUF];	2391	char filename[MAX_BUF];
…		…
2666	}	2401	}
2667		2402
2668	fprintf (tempfile, obstr);	2403	fprintf (tempfile, obstr);
2669	fclose (tempfile);	2404	fclose (tempfile);
2670		2405
2671	op = get_object ();	2406	op = object::create ();
2672		2407
2673	object_thawer thawer (filename);	2408	object_thawer thawer (filename);
2674		2409
2675	if (thawer)	2410	if (thawer)
2676	load_object (thawer, op, 0);	2411	load_object (thawer, op, 0);
…		…
2686	* returns NULL if no match.	2421	* returns NULL if no match.
2687	*/	2422	*/
2688	object *	2423	object *
2689	find_obj_by_type_subtype (const object *who, int type, int subtype)	2424	find_obj_by_type_subtype (const object *who, int type, int subtype)
2690	{	2425	{
2691	object *tmp;
2692
2693	for (tmp = who->inv; tmp; tmp = tmp->below)	2426	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2694	if (tmp->type == type && tmp->subtype == subtype)	2427	if (tmp->type == type && tmp->subtype == subtype)
2695	return tmp;	2428	return tmp;
2696		2429
2697	return NULL;	2430	return 0;
2698	}	2431	}
2699		2432
2700	/* If ob has a field named key, return the link from the list,	2433	/* If ob has a field named key, return the link from the list,
2701	* otherwise return NULL.	2434	* otherwise return NULL.
2702	*	2435	*
…		…
2704	* do the desired thing.	2437	* do the desired thing.
2705	*/	2438	*/
2706	key_value *	2439	key_value *
2707	get_ob_key_link (const object *ob, const char *key)	2440	get_ob_key_link (const object *ob, const char *key)
2708	{	2441	{
2709	key_value *link;
2710
2711	for (link = ob->key_values; link != NULL; link = link->next)	2442	for (key_value *link = ob->key_values; link; link = link->next)
2712	if (link->key == key)	2443	if (link->key == key)
2713	return link;	2444	return link;
2714		2445
2715	return NULL;	2446	return 0;
2716	}	2447	}
2717		2448
2718	/*	2449	/*
2719	* Returns the value of op has an extra_field for key, or NULL.	2450	* Returns the value of op has an extra_field for key, or NULL.
2720	*	2451	*
…		…
2760	* Returns TRUE on success.	2491	* Returns TRUE on success.
2761	*/	2492	*/
2762	int	2493	int
2763	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2494	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2764	{	2495	{
2765	key_value *
2766	field = NULL, *last = NULL;	2496	key_value *field = NULL, *last = NULL;
2767		2497
2768	for (field = op->key_values; field != NULL; field = field->next)	2498	for (field = op->key_values; field != NULL; field = field->next)
2769	{	2499	{
2770	if (field->key != canonical_key)	2500	if (field->key != canonical_key)
2771	{	2501	{
…		…
2799	/* IF we get here, key doesn't exist */	2529	/* IF we get here, key doesn't exist */
2800		2530
2801	/* No field, we'll have to add it. */	2531	/* No field, we'll have to add it. */
2802		2532
2803	if (!add_key)	2533	if (!add_key)
2804	{
2805	return FALSE;	2534	return FALSE;
2806	}	2535
2807	/* There isn't any good reason to store a null	2536	/* There isn't any good reason to store a null
2808	* value in the key/value list. If the archetype has	2537	* value in the key/value list. If the archetype has
2809	* this key, then we should also have it, so shouldn't	2538	* this key, then we should also have it, so shouldn't
2810	* be here. If user wants to store empty strings,	2539	* be here. If user wants to store empty strings,
2811	* should pass in ""	2540	* should pass in ""

Diff Legend

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