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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.196 by root, Wed Oct 17 22:01:27 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
21
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
28	#include <global.h>	27	#include <global.h>
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
…		…
254	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	255	* check all objects in the inventory.
256	*/	256	*/
257	if (ob1->inv || ob2->inv)	257	if (ob1->inv || ob2->inv)
258	{	258	{
259	/* if one object has inventory but the other doesn't, not equiv */	259	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	return 0; /* inventories differ in length */
261	return 0;
262		261
263	/* Now check to see if the two inventory objects could merge */	262	if (ob1->inv->below || ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
264	if (!object::can_merge (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	266	return 0; /* inventory objexts differ */
266		267
267	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	269	* if it is valid.
269	*/	270	*/
270	}	271	}
…		…
299	return 0;	300	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	301	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	302	return 0;
302	}	303	}
303		304
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	305	if (ob1->self || ob2->self)
306	{	306	{
307	ob1->optimise ();	307	ob1->optimise ();
308	ob2->optimise ();	308	ob2->optimise ();
309		309
310	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
		311	{
		312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		314
		315	if (k1 != k2)
311	return 0;	316	return 0;
		317	else if (k1 == 0)
		318	return 1;
		319	else if (!cfperl_can_merge (ob1, ob2))
		320	return 0;
		321	}
312	}	322	}
313		323
314	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
315	return 1;	325	return 1;
316	}	326	}
…		…
324	sum_weight (object *op)	334	sum_weight (object *op)
325	{	335	{
326	long sum;	336	long sum;
327	object *inv;	337	object *inv;
328		338
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	339	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	340	{
331	if (inv->inv)	341	if (inv->inv)
332	sum_weight (inv);	342	sum_weight (inv);
		343
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	345	}
335		346
336	if (op->type == CONTAINER && op->stats.Str)	347	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	348	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
357	/*	368	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	370	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.	371	* The result of the dump is stored in the static global errmsg array.
361	*/	372	*/
362
363	char *	373	char *
364	dump_object (object *op)	374	dump_object (object *op)
365	{	375	{
366	if (!op)	376	if (!op)
367	return strdup ("[NULLOBJ]");	377	return strdup ("[NULLOBJ]");
368		378
369	object_freezer freezer;	379	object_freezer freezer;
370	save_object (freezer, op, 1);	380	op->write (freezer);
371	return freezer.as_string ();	381	return freezer.as_string ();
372	}	382	}
373		383
374	/*	384	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	385	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
378	*/	388	*/
379
380	object *	389	object *
381	get_nearest_part (object *op, const object *pl)	390	get_nearest_part (object *op, const object *pl)
382	{	391	{
383	object *tmp, *closest;	392	object *tmp, *closest;
384	int last_dist, i;	393	int last_dist, i;
…		…
395	* Returns the object which has the count-variable equal to the argument.	404	* Returns the object which has the count-variable equal to the argument.
396	*/	405	*/
397	object *	406	object *
398	find_object (tag_t i)	407	find_object (tag_t i)
399	{	408	{
400	return ((unsigned int)i) < objects.size ()	409	for_all_objects (op)
401	? objects [i]	410	if (op->count == i)
402	: 0;	411	return op;
		412
		413	return 0;
403	}	414	}
404		415
405	/*	416	/*
406	* Returns the first object which has a name equal to the argument.	417	* Returns the first object which has a name equal to the argument.
407	* Used only by the patch command, but not all that useful.	418	* Used only by the patch command, but not all that useful.
…		…
427	}	438	}
428		439
429	/*	440	/*
430	* Sets the owner and sets the skill and exp pointers to owner's current	441	* Sets the owner and sets the skill and exp pointers to owner's current
431	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
432	*/	444	*/
433	void	445	void
434	object::set_owner (object *owner)	446	object::set_owner (object *owner)
435	{	447	{
		448	// allow objects which own objects
436	if (!owner)	449	if (owner)
437	return;
438
439	/* next line added to allow objects which own objects */
440	/* Add a check for ownercounts in here, as I got into an endless loop
441	* with the fireball owning a poison cloud which then owned the
442	* fireball. I believe that was caused by one of the objects getting
443	* freed and then another object replacing it. Since the ownercounts
444	* didn't match, this check is valid and I believe that cause is valid.
445	*/
446	while (owner->owner)	450	while (owner->owner)
447	owner = owner->owner;	451	owner = owner->owner;
448		452
449	this->owner = owner;	453	this->owner = owner;
		454	}
		455
		456	int
		457	object::slottype () const
		458	{
		459	if (type == SKILL)
		460	{
		461	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		462	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		463	}
		464	else
		465	{
		466	if (slot [body_combat].info) return slot_combat;
		467	if (slot [body_range ].info) return slot_ranged;
		468	}
		469
		470	return slot_none;
		471	}
		472
		473	bool
		474	object::change_weapon (object *ob)
		475	{
		476	if (current_weapon == ob)
		477	return true;
		478
		479	if (chosen_skill)
		480	chosen_skill->flag [FLAG_APPLIED] = false;
		481
		482	current_weapon = ob;
		483	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		484
		485	if (chosen_skill)
		486	chosen_skill->flag [FLAG_APPLIED] = true;
		487
		488	update_stats ();
		489
		490	if (ob)
		491	{
		492	// now check wether any body locations became invalid, in which case
		493	// we cannot apply the weapon at the moment.
		494	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		495	if (slot[i].used < 0)
		496	{
		497	current_weapon = chosen_skill = 0;
		498	update_stats ();
		499
		500	new_draw_info_format (NDI_UNIQUE, 0, this,
		501	"You try to balance all your items at once, "
		502	"but the %s is just too much for your body. "
		503	"[You need to unapply some items first.]", &ob->name);
		504	return false;
		505	}
		506
		507	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		508	}
		509	else
		510	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		511
		512	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		513	{
		514	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		515	&name, ob->debug_desc ());
		516	return false;
		517	}
		518
		519	return true;
450	}	520	}
451		521
452	/* Zero the key_values on op, decrementing the shared-string	522	/* Zero the key_values on op, decrementing the shared-string
453	* refcounts and freeing the links.	523	* refcounts and freeing the links.
454	*/	524	*/
455	static void	525	static void
456	free_key_values (object *op)	526	free_key_values (object *op)
457	{	527	{
458	for (key_value *i = op->key_values; i != 0;)	528	for (key_value *i = op->key_values; i; )
459	{	529	{
460	key_value *next = i->next;	530	key_value *next = i->next;
461	delete i;	531	delete i;
462		532
463	i = next;	533	i = next;
464	}	534	}
465		535
466	op->key_values = 0;	536	op->key_values = 0;
467	}	537	}
468		538
469	/*	539	object &
470	* copy_to first frees everything allocated by the dst object,	540	object::operator =(const object &src)
471	* and then copies the contents of itself into the second
472	* object, allocating what needs to be allocated. Basically, any
473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
474	* if the first object is freed, the pointers in the new object
475	* will point at garbage.
476	*/
477	void
478	object::copy_to (object *dst)
479	{	541	{
480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	542	bool is_freed = flag [FLAG_FREED];
481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	543	bool is_removed = flag [FLAG_REMOVED];
482		544
483	*(object_copy *)dst = *this;	545	*(object_copy *)this = src;
484		546
485	if (is_freed)	547	flag [FLAG_FREED] = is_freed;
486	SET_FLAG (dst, FLAG_FREED);	548	flag [FLAG_REMOVED] = is_removed;
487
488	if (is_removed)
489	SET_FLAG (dst, FLAG_REMOVED);
490
491	if (speed < 0)
492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493		549
494	/* Copy over key_values, if any. */	550	/* Copy over key_values, if any. */
495	if (key_values)	551	if (src.key_values)
496	{	552	{
497	key_value *tail = 0;	553	key_value *tail = 0;
498	key_value *i;
499
500	dst->key_values = 0;	554	key_values = 0;
501		555
502	for (i = key_values; i; i = i->next)	556	for (key_value *i = src.key_values; i; i = i->next)
503	{	557	{
504	key_value *new_link = new key_value;	558	key_value *new_link = new key_value;
505		559
506	new_link->next = 0;	560	new_link->next = 0;
507	new_link->key = i->key;	561	new_link->key = i->key;
508	new_link->value = i->value;	562	new_link->value = i->value;
509		563
510	/* Try and be clever here, too. */	564	/* Try and be clever here, too. */
511	if (!dst->key_values)	565	if (!key_values)
512	{	566	{
513	dst->key_values = new_link;	567	key_values = new_link;
514	tail = new_link;	568	tail = new_link;
515	}	569	}
516	else	570	else
517	{	571	{
518	tail->next = new_link;	572	tail->next = new_link;
519	tail = new_link;	573	tail = new_link;
520	}	574	}
521	}	575	}
522	}	576	}
		577	}
		578
		579	/*
		580	* copy_to first frees everything allocated by the dst object,
		581	* and then copies the contents of itself into the second
		582	* object, allocating what needs to be allocated. Basically, any
		583	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		584	* if the first object is freed, the pointers in the new object
		585	* will point at garbage.
		586	*/
		587	void
		588	object::copy_to (object *dst)
		589	{
		590	*dst = *this;
		591
		592	if (speed < 0)
		593	dst->speed_left -= rndm ();
523		594
524	dst->set_speed (dst->speed);	595	dst->set_speed (dst->speed);
		596	}
		597
		598	void
		599	object::instantiate ()
		600	{
		601	if (!uuid.seq) // HACK
		602	uuid = gen_uuid ();
		603
		604	speed_left = -0.1f;
		605	/* copy the body_info to the body_used - this is only really
		606	* need for monsters, but doesn't hurt to do it for everything.
		607	* by doing so, when a monster is created, it has good starting
		608	* values for the body_used info, so when items are created
		609	* for it, they can be properly equipped.
		610	*/
		611	for (int i = NUM_BODY_LOCATIONS; i--; )
		612	slot[i].used = slot[i].info;
		613
		614	attachable::instantiate ();
525	}	615	}
526		616
527	object *	617	object *
528	object::clone ()	618	object::clone ()
529	{	619	{
…		…
587	* UP_OBJ_FACE: only the objects face has changed.	677	* UP_OBJ_FACE: only the objects face has changed.
588	*/	678	*/
589	void	679	void
590	update_object (object *op, int action)	680	update_object (object *op, int action)
591	{	681	{
592	MoveType move_on, move_off, move_block, move_slow;
593
594	if (op == NULL)	682	if (op == NULL)
595	{	683	{
596	/* this should never happen */	684	/* this should never happen */
597	LOG (llevDebug, "update_object() called for NULL object.\n");	685	LOG (llevDebug, "update_object() called for NULL object.\n");
598	return;	686	return;
…		…
658		746
659	if (op->more)	747	if (op->more)
660	update_object (op->more, action);	748	update_object (op->more, action);
661	}	749	}
662		750
663	object *object::first;
664
665	object::object ()	751	object::object ()
666	{	752	{
667	SET_FLAG (this, FLAG_REMOVED);	753	SET_FLAG (this, FLAG_REMOVED);
668		754
669	expmul = 1.0;	755	expmul = 1.0;
670	face = blank_face;	756	face = blank_face;
671	}	757	}
672		758
673	object::~object ()	759	object::~object ()
674	{	760	{
		761	unlink ();
		762
675	free_key_values (this);	763	free_key_values (this);
676	}	764	}
677		765
		766	static int object_count;
		767
678	void object::link ()	768	void object::link ()
679	{	769	{
		770	assert (!index);//D
680	uuid = gen_uuid ();	771	uuid = gen_uuid ();
		772	count = ++object_count;
681		773
682	refcnt_inc ();	774	refcnt_inc ();
683	objects.insert (this);	775	objects.insert (this);
684	}	776	}
685		777
686	void object::unlink ()	778	void object::unlink ()
687	{	779	{
		780	if (!index)
		781	return;
		782
688	objects.erase (this);	783	objects.erase (this);
689	refcnt_dec ();	784	refcnt_dec ();
690	}	785	}
691		786
692	void	787	void
…		…
766	* drop on that space.	861	* drop on that space.
767	*/	862	*/
768	if (!drop_to_ground	863	if (!drop_to_ground
769	|| !map	864	|| !map
770	|| map->in_memory != MAP_IN_MEMORY	865	|| map->in_memory != MAP_IN_MEMORY
		866	|| map->nodrop
771	|| ms ().move_block == MOVE_ALL)	867	|| ms ().move_block == MOVE_ALL)
772	{	868	{
773	while (inv)	869	while (inv)
774	{	870	{
775	inv->destroy_inv (drop_to_ground);	871	inv->destroy_inv (drop_to_ground);
…		…
784		880
785	if (op->flag [FLAG_STARTEQUIP]	881	if (op->flag [FLAG_STARTEQUIP]
786	|| op->flag [FLAG_NO_DROP]	882	|| op->flag [FLAG_NO_DROP]
787	|| op->type == RUNE	883	|| op->type == RUNE
788	|| op->type == TRAP	884	|| op->type == TRAP
789	|| op->flag [FLAG_IS_A_TEMPLATE])	885	|| op->flag [FLAG_IS_A_TEMPLATE]
		886	|| op->flag [FLAG_DESTROY_ON_DEATH])
790	op->destroy ();	887	op->destroy ();
791	else	888	else
792	map->insert (op, x, y);	889	map->insert (op, x, y);
793	}	890	}
794	}	891	}
…		…
802	}	899	}
803		900
804	void	901	void
805	object::do_destroy ()	902	object::do_destroy ()
806	{	903	{
		904	attachable::do_destroy ();
		905
807	if (flag [FLAG_IS_LINKED])	906	if (flag [FLAG_IS_LINKED])
808	remove_button_link (this);	907	remove_button_link (this);
809		908
810	if (flag [FLAG_FRIENDLY])	909	if (flag [FLAG_FRIENDLY])
811	remove_friendly_object (this);	910	remove_friendly_object (this);
812		911
813	if (!flag [FLAG_REMOVED])	912	if (!flag [FLAG_REMOVED])
814	remove ();	913	remove ();
815		914
816	if (flag [FLAG_FREED])	915	destroy_inv (true);
817	return;
818		916
819	set_speed (0);	917	deactivate ();
		918	unlink ();
820		919
821	flag [FLAG_FREED] = 1;	920	flag [FLAG_FREED] = 1;
822
823	attachable::do_destroy ();
824
825	destroy_inv (true);
826	unlink ();
827		921
828	// hack to ensure that freed objects still have a valid map	922	// hack to ensure that freed objects still have a valid map
829	{	923	{
830	static maptile *freed_map; // freed objects are moved here to avoid crashes	924	static maptile *freed_map; // freed objects are moved here to avoid crashes
831		925
832	if (!freed_map)	926	if (!freed_map)
833	{	927	{
834	freed_map = new maptile;	928	freed_map = new maptile;
835		929
		930	freed_map->path = "<freed objects map>";
836	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
837	freed_map->width = 3;	932	freed_map->width = 3;
838	freed_map->height = 3;	933	freed_map->height = 3;
839		934
840	freed_map->alloc ();	935	freed_map->alloc ();
…		…
844	map = freed_map;	939	map = freed_map;
845	x = 1;	940	x = 1;
846	y = 1;	941	y = 1;
847	}	942	}
848		943
849	head = 0;
850
851	if (more)	944	if (more)
852	{	945	{
853	more->destroy ();	946	more->destroy ();
854	more = 0;	947	more = 0;
855	}	948	}
856		949
		950	head = 0;
		951
857	// clear those pointers that likely might have circular references to us	952	// clear those pointers that likely might cause circular references
858	owner = 0;	953	owner = 0;
859	enemy = 0;	954	enemy = 0;
860	attacked_by = 0;	955	attacked_by = 0;
		956	current_weapon = 0;
861	}	957	}
862		958
863	void	959	void
864	object::destroy (bool destroy_inventory)	960	object::destroy (bool destroy_inventory)
865	{	961	{
866	if (destroyed ())	962	if (destroyed ())
867	return;	963	return;
868		964
869	if (destroy_inventory)	965	if (destroy_inventory)
870	destroy_inv (false);	966	destroy_inv (false);
		967
		968	if (is_head ())
		969	if (sound_destroy)
		970	play_sound (sound_destroy);
		971	else if (flag [FLAG_MONSTER])
		972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
871		973
872	attachable::destroy ();	974	attachable::destroy ();
873	}	975	}
874		976
875	/*	977	/*
…		…
893	* This function removes the object op from the linked list of objects	995	* This function removes the object op from the linked list of objects
894	* which it is currently tied to. When this function is done, the	996	* which it is currently tied to. When this function is done, the
895	* object will have no environment. If the object previously had an	997	* object will have no environment. If the object previously had an
896	* environment, the x and y coordinates will be updated to	998	* environment, the x and y coordinates will be updated to
897	* the previous environment.	999	* the previous environment.
898	* Beware: This function is called from the editor as well!
899	*/	1000	*/
900	void	1001	void
901	object::remove ()	1002	object::do_remove ()
902	{	1003	{
903	object *tmp, *last = 0;	1004	object *tmp, *last = 0;
904	object *otmp;	1005	object *otmp;
905		1006
906	if (QUERY_FLAG (this, FLAG_REMOVED))	1007	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
949	}	1050	}
950	else if (map)	1051	else if (map)
951	{	1052	{
952	if (type == PLAYER)	1053	if (type == PLAYER)
953	{	1054	{
		1055	// leaving a spot always closes any open container on the ground
		1056	if (container && !container->env)
		1057	// this causes spurious floorbox updates, but it ensures
		1058	// that the CLOSE event is being sent.
		1059	close_container ();
		1060
954	--map->players;	1061	--map->players;
955	map->touch ();	1062	map->touch ();
956	}	1063	}
957		1064
958	map->dirty = true;	1065	map->dirty = true;
		1066	mapspace &ms = this->ms ();
959		1067
960	/* link the object above us */	1068	/* link the object above us */
961	if (above)	1069	if (above)
962	above->below = below;	1070	above->below = below;
963	else	1071	else
964	map->at (x, y).top = below; /* we were top, set new top */	1072	ms.top = below; /* we were top, set new top */
965		1073
966	/* Relink the object below us, if there is one */	1074	/* Relink the object below us, if there is one */
967	if (below)	1075	if (below)
968	below->above = above;	1076	below->above = above;
969	else	1077	else
…		…
971	/* Nothing below, which means we need to relink map object for this space	1079	/* Nothing below, which means we need to relink map object for this space
972	* use translated coordinates in case some oddness with map tiling is	1080	* use translated coordinates in case some oddness with map tiling is
973	* evident	1081	* evident
974	*/	1082	*/
975	if (GET_MAP_OB (map, x, y) != this)	1083	if (GET_MAP_OB (map, x, y) != this)
976	{
977	char *dump = dump_object (this);
978	LOG (llevError,
979	"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);	1084	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
980	free (dump);
981	dump = dump_object (GET_MAP_OB (map, x, y));
982	LOG (llevError, "%s\n", dump);
983	free (dump);
984	}
985		1085
986	map->at (x, y).bot = above; /* goes on above it. */	1086	ms.bot = above; /* goes on above it. */
987	}	1087	}
988		1088
989	above = 0;	1089	above = 0;
990	below = 0;	1090	below = 0;
991		1091
992	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
993	return;	1093	return;
994		1094
995	int check_walk_off = !flag [FLAG_NO_APPLY];	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
996		1096
		1097	if (object *pl = ms.player ())
		1098	{
		1099	if (pl->container == this)
		1100	/* If a container that the player is currently using somehow gets
		1101	* removed (most likely destroyed), update the player view
		1102	* appropriately.
		1103	*/
		1104	pl->close_container ();
		1105
		1106	pl->contr->ns->floorbox_update ();
		1107	}
		1108
997	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
998	{	1110	{
999	/* No point updating the players look faces if he is the object	1111	/* No point updating the players look faces if he is the object
1000	* being removed.	1112	* being removed.
1001	*/	1113	*/
1002
1003	if (tmp->type == PLAYER && tmp != this)
1004	{
1005	/* If a container that the player is currently using somehow gets
1006	* removed (most likely destroyed), update the player view
1007	* appropriately.
1008	*/
1009	if (tmp->container == this)
1010	{
1011	flag [FLAG_APPLIED] = 0;
1012	tmp->container = 0;
1013	}
1014
1015	if (tmp->contr->ns)
1016	tmp->contr->ns->floorbox_update ();
1017	}
1018		1114
1019	/* See if object moving off should effect something */	1115	/* See if object moving off should effect something */
1020	if (check_walk_off	1116	if (check_walk_off
1021	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1022	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1025		1121
1026	if (destroyed ())	1122	if (destroyed ())
1027	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1028	}	1124	}
1029		1125
1030	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1031	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1032	if (tmp->above == tmp)
1033	tmp->above = 0;
1034
1035	last = tmp;	1126	last = tmp;
1036	}	1127	}
1037		1128
1038	/* last == NULL if there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
1039	//TODO: this makes little sense, why only update the topmost object?	1130	//TODO: this makes little sense, why only update the topmost object?
…		…
1059	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1060	{	1151	{
1061	if (!op->nrof)	1152	if (!op->nrof)
1062	return 0;	1153	return 0;
1063		1154
1064	if (top)	1155	if (!top)
1065	for (top = op; top && top->above; top = top->above)	1156	for (top = op; top && top->above; top = top->above)
1066	;	1157	;
1067		1158
1068	for (; top; top = top->below)	1159	for (; top; top = top->below)
1069	{	1160	{
…		…
1082	}	1173	}
1083		1174
1084	return 0;	1175	return 0;
1085	}	1176	}
1086		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1087	/*	1201	/*
1088	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1089	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1090	*/	1204	*/
1091	object *	1205	object *
1092	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093	{	1207	{
1094	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1095	{	1209	{
1096	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1097	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1098	}	1212	}
1099		1213
1100	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1101	}	1215	}
1102		1216
…		…
1121	* just 'op' otherwise	1235	* just 'op' otherwise
1122	*/	1236	*/
1123	object *	1237	object *
1124	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1126	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1127	sint16 x, y;
1128		1243
1129	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1130	{
1131	LOG (llevError, "Trying to insert freed object!\n");
1132	return NULL;
1133	}
1134
1135	if (!m)
1136	{
1137	char *dump = dump_object (op);
1138	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1139	free (dump);
1140	return op;
1141	}
1142
1143	if (out_of_map (m, op->x, op->y))
1144	{
1145	char *dump = dump_object (op);
1146	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1147	#ifdef MANY_CORES
1148	/* Better to catch this here, as otherwise the next use of this object
1149	* is likely to cause a crash. Better to find out where it is getting
1150	* improperly inserted.
1151	*/
1152	abort ();
1153	#endif
1154	free (dump);
1155	return op;
1156	}
1157
1158	if (!QUERY_FLAG (op, FLAG_REMOVED))
1159	{
1160	char *dump = dump_object (op);
1161	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162	free (dump);
1163	return op;
1164	}
1165
1166	if (op->more)
1167	{
1168	/* The part may be on a different map. */
1169
1170	object *more = op->more;
1171
1172	/* We really need the caller to normalise coordinates - if
1173	* we set the map, that doesn't work if the location is within
1174	* a map and this is straddling an edge. So only if coordinate
1175	* is clear wrong do we normalise it.
1176	*/
1177	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178	more->map = get_map_from_coord (m, &more->x, &more->y);
1179	else if (!more->map)
1180	{
1181	/* For backwards compatibility - when not dealing with tiled maps,
1182	* more->map should always point to the parent.
1183	*/
1184	more->map = m;
1185	}
1186
1187	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1188	{
1189	if (!op->head)
1190	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191
1192	return 0;
1193	}
1194	}
1195
1196	CLEAR_FLAG (op, FLAG_REMOVED);
1197		1245
1198	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1199	* of areas of callers (eg, anything that uses find_free_spot would now	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1200	* need extra work	1248	* need extra work
1201	*/	1249	*/
1202	op->map = get_map_from_coord (m, &op->x, &op->y);	1250	if (!xy_normalise (m, op->x, op->y))
1203	x = op->x;	1251	{
1204	y = op->y;	1252	op->destroy ();
		1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
		1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1205		1264
1206	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1207	*/	1266	*/
1208	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1209	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1210	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1211	{	1270	{
1212	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1213	tmp->destroy ();	1272	tmp->destroy ();
1214	}	1273	}
…		…
1231	op->below = originator->below;	1290	op->below = originator->below;
1232		1291
1233	if (op->below)	1292	if (op->below)
1234	op->below->above = op;	1293	op->below->above = op;
1235	else	1294	else
1236	op->ms ().bot = op;	1295	ms.bot = op;
1237		1296
1238	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1239	originator->below = op;	1298	originator->below = op;
1240	}	1299	}
1241	else	1300	else
1242	{	1301	{
		1302	top = ms.bot;
		1303
1243	/* If there are other objects, then */	1304	/* If there are other objects, then */
1244	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if (top)
1245	{	1306	{
1246	object *last = 0;	1307	object *last = 0;
1247		1308
1248	/*	1309	/*
1249	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
…		…
1255	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1256	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1257	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1258	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1259	*/	1320	*/
1260	while (top)	1321	for (top = ms.bot; top; top = top->above)
1261	{	1322	{
1262	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263	floor = top;	1324	floor = top;
1264		1325
1265	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1268	top = top->below;	1329	top = top->below;
1269	break;	1330	break;
1270	}	1331	}
1271		1332
1272	last = top;	1333	last = top;
1273	top = top->above;
1274	}	1334	}
1275		1335
1276	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1277	top = last;	1337	top = last;
1278		1338
…		…
1280	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1281	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1282	*/	1342	*/
1283		1343
1284	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1285	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1286	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1287	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1288	* stacking is a bit odd.	1348	* stacking is a bit odd.
1289	*/	1349	*/
1290	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1291	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1292	{	1353	{
1293	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1294	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295	break;	1356	break;
		1357
1296	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1297	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1298	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1299	* set top to the object below us.	1361	* set top to the object below us.
1300	*/	1362	*/
1301	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1302	top = last->below;	1364	top = last->below;
1303	}	1365	}
1304	} /* If objects on this space */	1366	} /* If objects on this space */
1305		1367
1306	if (flag & INS_MAP_LOAD)
1307	top = GET_MAP_TOP (op->map, op->x, op->y);
1308
1309	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1310	top = floor;	1369	top = floor;
1311		1370
1312	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
1313	*/	1372	*/
1314		1373
1315	/* First object on this space */	1374	/* First object on this space */
1316	if (!top)	1375	if (!top)
1317	{	1376	{
1318	op->above = GET_MAP_OB (op->map, op->x, op->y);	1377	op->above = ms.bot;
1319		1378
1320	if (op->above)	1379	if (op->above)
1321	op->above->below = op;	1380	op->above->below = op;
1322		1381
1323	op->below = 0;	1382	op->below = 0;
1324	op->ms ().bot = op;	1383	ms.bot = op;
1325	}	1384	}
1326	else	1385	else
1327	{ /* get inserted into the stack above top */	1386	{ /* get inserted into the stack above top */
1328	op->above = top->above;	1387	op->above = top->above;
1329		1388
…		…
1333	op->below = top;	1392	op->below = top;
1334	top->above = op;	1393	top->above = op;
1335	}	1394	}
1336		1395
1337	if (!op->above)	1396	if (!op->above)
1338	op->ms ().top = op;	1397	ms.top = op;
1339	} /* else not INS_BELOW_ORIGINATOR */	1398	} /* else not INS_BELOW_ORIGINATOR */
1340		1399
1341	if (op->type == PLAYER)	1400	if (op->type == PLAYER)
1342	{	1401	{
1343	op->contr->do_los = 1;	1402	op->contr->do_los = 1;
…		…
1345	op->map->touch ();	1404	op->map->touch ();
1346	}	1405	}
1347		1406
1348	op->map->dirty = true;	1407	op->map->dirty = true;
1349		1408
1350	/* If we have a floor, we know the player, if any, will be above
1351	* it, so save a few ticks and start from there.
1352	*/
1353	if (!(flag & INS_MAP_LOAD))
1354	if (object *pl = op->ms ().player ())	1409	if (object *pl = ms.player ())
1355	if (pl->contr->ns)
1356	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1357		1411
1358	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1359	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1360	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1361	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
…		…
1380	* blocked() and wall() work properly), and these flags are updated by	1434	* blocked() and wall() work properly), and these flags are updated by
1381	* update_object().	1435	* update_object().
1382	*/	1436	*/
1383		1437
1384	/* if this is not the head or flag has been passed, don't check walk on status */	1438	/* if this is not the head or flag has been passed, don't check walk on status */
1385	if (!(flag & INS_NO_WALK_ON) && !op->head)	1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1386	{	1440	{
1387	if (check_move_on (op, originator))	1441	if (check_move_on (op, originator))
1388	return 0;	1442	return 0;
1389		1443
1390	/* If we are a multi part object, lets work our way through the check	1444	/* If we are a multi part object, lets work our way through the check
1391	* walk on's.	1445	* walk on's.
1392	*/	1446	*/
1393	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1447	for (object *tmp = op->more; tmp; tmp = tmp->more)
1394	if (check_move_on (tmp, originator))	1448	if (check_move_on (tmp, originator))
1395	return 0;	1449	return 0;
1396	}	1450	}
1397		1451
1398	return op;	1452	return op;
…		…
1408	object *tmp, *tmp1;	1462	object *tmp, *tmp1;
1409		1463
1410	/* first search for itself and remove any old instances */	1464	/* first search for itself and remove any old instances */
1411		1465
1412	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1413	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1414	tmp->destroy ();	1468	tmp->destroy ();
1415		1469
1416	tmp1 = arch_to_object (archetype::find (arch_string));	1470	tmp1 = arch_to_object (archetype::find (arch_string));
1417		1471
1418	tmp1->x = op->x;	1472	tmp1->x = op->x;
…		…
1421	}	1475	}
1422		1476
1423	object *	1477	object *
1424	object::insert_at (object *where, object *originator, int flags)	1478	object::insert_at (object *where, object *originator, int flags)
1425	{	1479	{
1426	where->map->insert (this, where->x, where->y, originator, flags);	1480	return where->map->insert (this, where->x, where->y, originator, flags);
1427	}	1481	}
1428		1482
1429	/*	1483	/*
1430	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1431	* is returned contains nr objects, and the remaining parts contains	1485	* is returned contains nr objects, and the remaining parts contains
…		…
1471	* the amount of an object. If the amount reaches 0, the object	1525	* the amount of an object. If the amount reaches 0, the object
1472	* is subsequently removed and freed.	1526	* is subsequently removed and freed.
1473	*	1527	*
1474	* Return value: 'op' if something is left, NULL if the amount reached 0	1528	* Return value: 'op' if something is left, NULL if the amount reached 0
1475	*/	1529	*/
1476
1477	object *	1530	object *
1478	decrease_ob_nr (object *op, uint32 i)	1531	decrease_ob_nr (object *op, uint32 i)
1479	{	1532	{
1480	object *tmp;	1533	object *tmp;
1481		1534
…		…
1556		1609
1557	/*	1610	/*
1558	* add_weight(object, weight) adds the specified weight to an object,	1611	* add_weight(object, weight) adds the specified weight to an object,
1559	* and also updates how much the environment(s) is/are carrying.	1612	* and also updates how much the environment(s) is/are carrying.
1560	*/	1613	*/
1561
1562	void	1614	void
1563	add_weight (object *op, signed long weight)	1615	add_weight (object *op, signed long weight)
1564	{	1616	{
1565	while (op != NULL)	1617	while (op != NULL)
1566	{	1618	{
…		…
1581	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1633	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1582	free (dump);	1634	free (dump);
1583	return op;	1635	return op;
1584	}	1636	}
1585		1637
1586	if (where->head)	1638	if (where->head_ () != where)
1587	{	1639	{
1588	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1640	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1589	where = where->head;	1641	where = where->head;
1590	}	1642	}
1591		1643
1592	return where->insert (op);	1644	return where->insert (op);
1593	}	1645	}
…		…
1598	* inside the object environment.	1650	* inside the object environment.
1599	*	1651	*
1600	* The function returns now pointer to inserted item, and return value can	1652	* The function returns now pointer to inserted item, and return value can
1601	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1602	*/	1654	*/
1603
1604	object *	1655	object *
1605	object::insert (object *op)	1656	object::insert (object *op)
1606	{	1657	{
1607	object *tmp, *otmp;
1608
1609	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1610	op->remove ();	1659	op->remove ();
1611		1660
1612	if (op->more)	1661	if (op->more)
1613	{	1662	{
…		…
1615	return op;	1664	return op;
1616	}	1665	}
1617		1666
1618	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1619	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1620	if (op->nrof)	1670	if (op->nrof)
1621	{	1671	{
1622	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1623	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1624	{	1674	{
1625	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1626	(client needs the original object) */	1676	(client needs the original object) */
1627	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1646	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1647	}	1697	}
1648	else	1698	else
1649	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1650		1700
1651	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1652	if (otmp && otmp->contr)
1653	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1654	otmp->update_stats ();	1703	otmp->update_stats ();
1655		1704
		1705	op->owner = 0; // its his/hers now. period.
1656	op->map = 0;	1706	op->map = 0;
1657	op->env = this;	1707	op->env = this;
1658	op->above = 0;	1708	op->above = 0;
1659	op->below = 0;	1709	op->below = 0;
1660	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1661		1711
1662	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1663	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1664	{	1714	{
1665	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1666	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1667	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1668	if (map->darkness)	1718	if (map->darkness)
…		…
1768	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1818	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1819	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770	{	1820	{
1771		1821
1772	float	1822	float
1773	diff = tmp->move_slow_penalty * FABS (op->speed);	1823	diff = tmp->move_slow_penalty * fabs (op->speed);
1774		1824
1775	if (op->type == PLAYER)	1825	if (op->type == PLAYER)
1776	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1826	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1777	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1827	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1778	diff /= 4.0;	1828	diff /= 4.0;
…		…
1925	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
1926	}	1976	}
1927	}	1977	}
1928		1978
1929	/*	1979	/*
1930	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1931	* all it's inventory (recursively).
1932	* If checksums are used, a player will get set_cheat called for
1933	* him/her-self and all object carried by a call to this function.
1934	*/
1935	void
1936	set_cheat (object *op)
1937	{
1938	SET_FLAG (op, FLAG_WAS_WIZ);
1939	flag_inv (op, FLAG_WAS_WIZ);
1940	}
1941
1942	/*
1943	* find_free_spot(object, map, x, y, start, stop) will search for	1980	* find_free_spot(object, map, x, y, start, stop) will search for
1944	* a spot at the given map and coordinates which will be able to contain	1981	* a spot at the given map and coordinates which will be able to contain
1945	* the given object. start and stop specifies how many squares	1982	* the given object. start and stop specifies how many squares
1946	* to search (see the freearr_x/y[] definition).	1983	* to search (see the freearr_x/y[] definition).
1947	* It returns a random choice among the alternatives found.	1984	* It returns a random choice among the alternatives found.
1948	* start and stop are where to start relative to the free_arr array (1,9	1985	* start and stop are where to start relative to the free_arr array (1,9
1949	* does all 4 immediate directions). This returns the index into the	1986	* does all 4 immediate directions). This returns the index into the
1950	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1987	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1951	* Note - this only checks to see if there is space for the head of the
1952	* object - if it is a multispace object, this should be called for all
1953	* pieces.
1954	* Note2: This function does correctly handle tiled maps, but does not	1988	* Note: This function does correctly handle tiled maps, but does not
1955	* inform the caller. However, insert_ob_in_map will update as	1989	* inform the caller. However, insert_ob_in_map will update as
1956	* necessary, so the caller shouldn't need to do any special work.	1990	* necessary, so the caller shouldn't need to do any special work.
1957	* Note - updated to take an object instead of archetype - this is necessary	1991	* Note - updated to take an object instead of archetype - this is necessary
1958	* because arch_blocked (now ob_blocked) needs to know the movement type	1992	* because arch_blocked (now ob_blocked) needs to know the movement type
1959	* to know if the space in question will block the object. We can't use	1993	* to know if the space in question will block the object. We can't use
…		…
1961	* customized, changed states, etc.	1995	* customized, changed states, etc.
1962	*/	1996	*/
1963	int	1997	int
1964	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1998	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1965	{	1999	{
		2000	int altern[SIZEOFFREE];
1966	int index = 0, flag;	2001	int index = 0, flag;
1967	int altern[SIZEOFFREE];
1968		2002
1969	for (int i = start; i < stop; i++)	2003	for (int i = start; i < stop; i++)
1970	{	2004	{
1971	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2005	mapxy pos (m, x, y); pos.move (i);
1972	if (!flag)	2006
		2007	if (!pos.normalise ())
		2008	continue;
		2009
		2010	mapspace &ms = *pos;
		2011
		2012	if (ms.flags () & P_IS_ALIVE)
		2013	continue;
		2014
		2015	/* However, often
		2016	* ob doesn't have any move type (when used to place exits)
		2017	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2018	*/
		2019	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2020	{
1973	altern [index++] = i;	2021	altern [index++] = i;
		2022	continue;
		2023	}
1974		2024
1975	/* Basically, if we find a wall on a space, we cut down the search size.	2025	/* Basically, if we find a wall on a space, we cut down the search size.
1976	* In this way, we won't return spaces that are on another side of a wall.	2026	* In this way, we won't return spaces that are on another side of a wall.
1977	* This mostly work, but it cuts down the search size in all directions -	2027	* This mostly work, but it cuts down the search size in all directions -
1978	* if the space being examined only has a wall to the north and empty	2028	* if the space being examined only has a wall to the north and empty
1979	* spaces in all the other directions, this will reduce the search space	2029	* spaces in all the other directions, this will reduce the search space
1980	* to only the spaces immediately surrounding the target area, and	2030	* to only the spaces immediately surrounding the target area, and
1981	* won't look 2 spaces south of the target space.	2031	* won't look 2 spaces south of the target space.
1982	*/	2032	*/
1983	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2033	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2034	{
1984	stop = maxfree[i];	2035	stop = maxfree[i];
		2036	continue;
		2037	}
		2038
		2039	/* Note it is intentional that we check ob - the movement type of the
		2040	* head of the object should correspond for the entire object.
		2041	*/
		2042	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2043	continue;
		2044
		2045	if (ob->blocked (m, pos.x, pos.y))
		2046	continue;
		2047
		2048	altern [index++] = i;
1985	}	2049	}
1986		2050
1987	if (!index)	2051	if (!index)
1988	return -1;	2052	return -1;
1989		2053
1990	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
1991	}	2055	}
1992		2056
1993	/*	2057	/*
1994	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
1995	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
…		…
1998	*/	2062	*/
1999	int	2063	int
2000	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2001	{	2065	{
2002	for (int i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2003	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2004	return i;	2068	return i;
2005		2069
2006	return -1;	2070	return -1;
2007	}	2071	}
2008		2072
…		…
2016	{	2080	{
2017	arr += begin;	2081	arr += begin;
2018	end -= begin;	2082	end -= begin;
2019		2083
2020	while (--end)	2084	while (--end)
2021	swap (arr [end], arr [RANDOM () % (end + 1)]);	2085	swap (arr [end], arr [rndm (end + 1)]);
2022	}	2086	}
2023		2087
2024	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2025	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2026	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2062	object *tmp;	2126	object *tmp;
2063	maptile *mp;	2127	maptile *mp;
2064		2128
2065	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2066		2130
2067	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2068	{	2132	{
2069	exclude = exclude->head;	2133	exclude = exclude->head;
2070	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2071	}	2135	}
2072	else	2136	else
…		…
2095	max = maxfree[i];	2159	max = maxfree[i];
2096	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2097	{	2161	{
2098	for (tmp = ms.bot; tmp; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2099	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2100	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2101	break;	2165	break;
2102		2166
2103	if (tmp)	2167	if (tmp)
2104	return freedir[i];	2168	return freedir[i];
2105	}	2169	}
…		…
2160		2224
2161	return 3;	2225	return 3;
2162	}	2226	}
2163		2227
2164	/*	2228	/*
2165	* absdir(int): Returns a number between 1 and 8, which represent
2166	* the "absolute" direction of a number (it actually takes care of
2167	* "overflow" in previous calculations of a direction).
2168	*/
2169
2170	int
2171	absdir (int d)
2172	{
2173	while (d < 1)
2174	d += 8;
2175
2176	while (d > 8)
2177	d -= 8;
2178
2179	return d;
2180	}
2181
2182	/*
2183	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2185	*/	2231	*/
2186
2187	int	2232	int
2188	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2189	{	2234	{
2190	int d;	2235	int d;
2191		2236
…		…
2304	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2349	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2305	* core dumps if they do.	2350	* core dumps if they do.
2306	*	2351	*
2307	* Add a check so we can't pick up invisible objects (0.93.8)	2352	* Add a check so we can't pick up invisible objects (0.93.8)
2308	*/	2353	*/
2309
2310	int	2354	int
2311	can_pick (const object *who, const object *item)	2355	can_pick (const object *who, const object *item)
2312	{	2356	{
2313	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2357	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2314	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2319	* create clone from object to another	2363	* create clone from object to another
2320	*/	2364	*/
2321	object *	2365	object *
2322	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2323	{	2367	{
2324	object *dst = 0, *tmp, *src, *part, *prev, *item;	2368	object *dst = 0, *tmp, *src, *prev, *item;
2325		2369
2326	if (!asrc)	2370	if (!asrc)
2327	return 0;	2371	return 0;
2328		2372
2329	src = asrc;
2330	if (src->head)
2331	src = src->head;	2373	src = asrc->head_ ();
2332		2374
2333	prev = 0;	2375	prev = 0;
2334	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2335	{	2377	{
2336	tmp = part->clone ();	2378	tmp = part->clone ();
2337	tmp->x -= src->x;	2379	tmp->x -= src->x;
2338	tmp->y -= src->y;	2380	tmp->y -= src->y;
2339		2381
…		…
2355		2397
2356	for (item = src->inv; item; item = item->below)	2398	for (item = src->inv; item; item = item->below)
2357	insert_ob_in_ob (object_create_clone (item), dst);	2399	insert_ob_in_ob (object_create_clone (item), dst);
2358		2400
2359	return dst;	2401	return dst;
2360	}
2361
2362	/* GROS - Creates an object using a string representing its content. */
2363	/* Basically, we save the content of the string to a temp file, then call */
2364	/* load_object on it. I admit it is a highly inefficient way to make things, */
2365	/* but it was simple to make and allows reusing the load_object function. */
2366	/* Remember not to use load_object_str in a time-critical situation. */
2367	/* Also remember that multiparts objects are not supported for now. */
2368	object *
2369	load_object_str (const char *obstr)
2370	{
2371	object *op;
2372	char filename[MAX_BUF];
2373
2374	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2375
2376	FILE *tempfile = fopen (filename, "w");
2377
2378	if (tempfile == NULL)
2379	{
2380	LOG (llevError, "Error - Unable to access load object temp file\n");
2381	return NULL;
2382	}
2383
2384	fprintf (tempfile, obstr);
2385	fclose (tempfile);
2386
2387	op = object::create ();
2388
2389	object_thawer thawer (filename);
2390
2391	if (thawer)
2392	load_object (thawer, op, 0);
2393
2394	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2395	CLEAR_FLAG (op, FLAG_REMOVED);
2396
2397	return op;
2398	}	2402	}
2399		2403
2400	/* This returns the first object in who's inventory that	2404	/* This returns the first object in who's inventory that
2401	* has the same type and subtype match.	2405	* has the same type and subtype match.
2402	* returns NULL if no match.	2406	* returns NULL if no match.
…		…
2457	if (link->key == canonical_key)	2461	if (link->key == canonical_key)
2458	return link->value;	2462	return link->value;
2459		2463
2460	return 0;	2464	return 0;
2461	}	2465	}
2462
2463		2466
2464	/*	2467	/*
2465	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
2466	*	2469	*
2467	* canonical_key is a shared string (value doesn't have to be).	2470	* canonical_key is a shared string (value doesn't have to be).
…		…
2491	/* Basically, if the archetype has this key set,	2494	/* Basically, if the archetype has this key set,
2492	* we need to store the null value so when we save	2495	* we need to store the null value so when we save
2493	* it, we save the empty value so that when we load,	2496	* it, we save the empty value so that when we load,
2494	* we get this value back again.	2497	* we get this value back again.
2495	*/	2498	*/
2496	if (get_ob_key_link (&op->arch->clone, canonical_key))	2499	if (get_ob_key_link (op->arch, canonical_key))
2497	field->value = 0;	2500	field->value = 0;
2498	else	2501	else
2499	{	2502	{
2500	if (last)	2503	if (last)
2501	last->next = field->next;	2504	last->next = field->next;
…		…
2570	}	2573	}
2571	else	2574	else
2572	item = item->env;	2575	item = item->env;
2573	}	2576	}
2574		2577
2575
2576	const char *	2578	const char *
2577	object::flag_desc (char *desc, int len) const	2579	object::flag_desc (char *desc, int len) const
2578	{	2580	{
2579	char *p = desc;	2581	char *p = desc;
2580	bool first = true;	2582	bool first = true;
…		…
2607	{	2609	{
2608	char flagdesc[512];	2610	char flagdesc[512];
2609	char info2[256 * 4];	2611	char info2[256 * 4];
2610	char *p = info;	2612	char *p = info;
2611		2613
2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2614	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613	count, uuid.seq,	2615	count, uuid.seq,
2614	&name,	2616	&name,
2615	title ? "\",title:" : "",	2617	title ? "\",title:\"" : "",
2616	title ? (const char *)title : "",	2618	title ? (const char *)title : "",
2617	flag_desc (flagdesc, 512), type);	2619	flag_desc (flagdesc, 512), type);
2618		2620
2619	if (env)	2621	if (!this->flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2622	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2623
2622	if (map)	2624	if (map)
2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2625	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624		2626
…		…
2626	}	2628	}
2627		2629
2628	const char *	2630	const char *
2629	object::debug_desc () const	2631	object::debug_desc () const
2630	{	2632	{
2631	static char info[256 * 4];	2633	static char info[3][256 * 4];
		2634	static int info_idx;
		2635
2632	return debug_desc (info);	2636	return debug_desc (info [++info_idx % 3]);
2633	}	2637	}
2634		2638
		2639	struct region *
		2640	object::region () const
		2641	{
		2642	return map ? map->region (x, y)
		2643	: region::default_region ();
		2644	}
		2645
		2646	const materialtype_t *
		2647	object::dominant_material () const
		2648	{
		2649	if (materialtype_t *mt = name_to_material (materialname))
		2650	return mt;
		2651
		2652	return name_to_material (shstr_unknown);
		2653	}
		2654
		2655	void
		2656	object::open_container (object *new_container)
		2657	{
		2658	if (container == new_container)
		2659	return;
		2660
		2661	if (object *old_container = container)
		2662	{
		2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2664	return;
		2665
		2666	#if 0
		2667	// remove the "Close old_container" object.
		2668	if (object *closer = old_container->inv)
		2669	if (closer->type == CLOSE_CON)
		2670	closer->destroy ();
		2671	#endif
		2672
		2673	old_container->flag [FLAG_APPLIED] = 0;
		2674	container = 0;
		2675
		2676	esrv_update_item (UPD_FLAGS, this, old_container);
		2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2678	play_sound (sound_find ("chest_close"));
		2679	}
		2680
		2681	if (new_container)
		2682	{
		2683	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2684	return;
		2685
		2686	// TODO: this does not seem to serve any purpose anymore?
		2687	#if 0
		2688	// insert the "Close Container" object.
		2689	if (archetype *closer = new_container->other_arch)
		2690	{
		2691	object *closer = arch_to_object (new_container->other_arch);
		2692	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2693	new_container->insert (closer);
		2694	}
		2695	#endif
		2696
		2697	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2698
		2699	new_container->flag [FLAG_APPLIED] = 1;
		2700	container = new_container;
		2701
		2702	esrv_update_item (UPD_FLAGS, this, new_container);
		2703	esrv_send_inventory (this, new_container);
		2704	play_sound (sound_find ("chest_open"));
		2705	}
		2706	}
		2707
		2708	object *
		2709	object::force_find (const shstr name)
		2710	{
		2711	/* cycle through his inventory to look for the MARK we want to
		2712	* place
		2713	*/
		2714	for (object *tmp = inv; tmp; tmp = tmp->below)
		2715	if (tmp->type == FORCE && tmp->slaying == name)
		2716	return splay (tmp);
		2717
		2718	return 0;
		2719	}
		2720
		2721	void
		2722	object::force_add (const shstr name, int duration)
		2723	{
		2724	if (object *force = force_find (name))
		2725	force->destroy ();
		2726
		2727	object *force = get_archetype (FORCE_NAME);
		2728
		2729	force->slaying = name;
		2730	force->stats.food = 1;
		2731	force->speed_left = -1.f;
		2732
		2733	force->set_speed (duration ? 1.f / duration : 0.f);
		2734	force->flag [FLAG_IS_USED_UP] = true;
		2735	force->flag [FLAG_APPLIED] = true;
		2736
		2737	insert (force);
		2738	}
		2739
		2740	void
		2741	object::play_sound (faceidx sound) const
		2742	{
		2743	if (!sound)
		2744	return;
		2745
		2746	if (flag [FLAG_REMOVED])
		2747	return;
		2748
		2749	if (env)
		2750	{
		2751	if (object *pl = in_player ())
		2752	pl->contr->play_sound (sound);
		2753	}
		2754	else
		2755	map->play_sound (sound, x, y);
		2756	}
		2757

Diff Legend

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