[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
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. */
34	#include <sproto.h>	33	#include <sproto.h>
35	#include <loader.h>	34	#include <loader.h>
36		35
37	#include <bitset>	36	#include <bitset>
38		37
39	int nrofallocobjects = 0;	38	UUID UUID::cur;
40	static UUID uuid;
41	const uint64 UUID_SKIP = 1<<19;	39	static const uint64 UUID_SKIP = 1<<19;
42		40
43	objectvec objects;	41	objectvec objects;
44	activevec actives;	42	activevec actives;
45		43
46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	44	short freearr_x[SIZEOFFREE] = {
		45	0,
		46	0, 1, 1, 1, 0, -1, -1, -1,
		47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	48	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48	};	49	};
49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	50	short freearr_y[SIZEOFFREE] = {
		51	0,
		52	-1, -1, 0, 1, 1, 1, 0, -1,
		53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51	};	55	};
52	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	56	int maxfree[SIZEOFFREE] = {
		57	0,
		58	9, 10, 13, 14, 17, 18, 21, 22,
		59	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	60	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54	};	61	};
55	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
56	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	63	0,
		64	1, 2, 3, 4, 5, 6, 7, 8,
		65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58	};	67	};
59		68
60	static void	69	static void
61	write_uuid (void)	70	write_uuid (uval64 skip, bool sync)
62	{	71	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	72	CALL_BEGIN (2);
64		73	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	74	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	75	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		76	CALL_END;
68	FILE *fp;
69
70	if (!(fp = fopen (filename2, "w")))
71	{
72	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73	return;
74	}
75
76	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77	fclose (fp);
78	rename (filename2, filename1);
79	}	77	}
80		78
81	static void	79	static void
82	read_uuid (void)	80	read_uuid (void)
83	{	81	{
…		…
90	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
91	{	89	{
92	if (errno == ENOENT)	90	if (errno == ENOENT)
93	{	91	{
94	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	93	UUID::cur.seq = 0;
96	write_uuid ();	94	write_uuid (UUID_SKIP, true);
97	return;	95	return;
98	}	96	}
99		97
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	99	_exit (1);
102	}	100	}
103		101
104	int version;	102	UUID::BUF buf;
105	unsigned long long uid;	103	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	104	fgets (buf, sizeof (buf), fp);
		105
		106	if (!UUID::cur.parse (buf))
107	{	107	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	108	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	109	_exit (1);
110	}	110	}
111		111
112	uuid.seq = uid;	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	113
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	114	write_uuid (UUID_SKIP, true);
115	fclose (fp);	115	fclose (fp);
116	}	116	}
117		117
118	UUID	118	UUID
119	gen_uuid ()	119	UUID::gen ()
120	{	120	{
121	UUID uid;	121	UUID uid;
122		122
123	uid.seq = ++uuid.seq;	123	uid.seq = ++cur.seq;
124		124
125	if (!(uuid.seq & (UUID_SKIP - 1)))	125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))
126	write_uuid ();	126	write_uuid (UUID_SKIP, false);
127		127
128	return uid;	128	return uid;
129	}	129	}
130		130
131	void	131	void
132	init_uuid ()	132	UUID::init ()
133	{	133	{
134	read_uuid ();	134	read_uuid ();
135	}	135	}
136		136
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
…		…
255	/* This is really a spellbook check - really, we should	255	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	256	* check all objects in the inventory.
257	*/	257	*/
258	if (ob1->inv \|\| ob2->inv)	258	if (ob1->inv \|\| ob2->inv)
259	{	259	{
260	/* if one object has inventory but the other doesn't, not equiv */	260	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	261	return 0; /* inventories differ in length */
262	return 0;
263		262
264	/* Now check to see if the two inventory objects could merge */	263	if (ob1->inv->below \|\| ob2->inv->below)
		264	return 0; /* more than one object in inv */
		265
265	if (!object::can_merge (ob1->inv, ob2->inv))	266	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	267	return 0; /* inventory objexts differ */
267		268
268	/* inventory ok - still need to check rest of this object to see	269	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	270	* if it is valid.
270	*/	271	*/
271	}	272	}
…		…
300	return 0;	301	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))	302	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	303	return 0;
303	}	304	}
304		305
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self \|\| ob2->self)	306	if (ob1->self \|\| ob2->self)
307	{	307	{
308	ob1->optimise ();	308	ob1->optimise ();
309	ob2->optimise ();	309	ob2->optimise ();
310		310
311	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
		312	{
		313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		315
		316	if (k1 != k2)
312	return 0;	317	return 0;
		318	else if (k1 == 0)
		319	return 1;
		320	else if (!cfperl_can_merge (ob1, ob2))
		321	return 0;
		322	}
313	}	323	}
314		324
315	/* Everything passes, must be OK. */	325	/* Everything passes, must be OK. */
316	return 1;	326	return 1;
317	}	327	}
…		…
375	/*	385	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	386	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	387	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	388	* If it's not a multi-object, it is returned.
379	*/	389	*/
380
381	object *	390	object *
382	get_nearest_part (object op, const object pl)	391	get_nearest_part (object op, const object pl)
383	{	392	{
384	object tmp, closest;	393	object tmp, closest;
385	int last_dist, i;	394	int last_dist, i;
…		…
421	break;	430	break;
422		431
423	return op;	432	return op;
424	}	433	}
425		434
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	435	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	436	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	437	* skill and experience objects.
		438	* ACTUALLY NO! investigate! TODO
435	*/	439	*/
436	void	440	void
437	object::set_owner (object *owner)	441	object::set_owner (object *owner)
438	{	442	{
		443	// allow objects which own objects
439	if (!owner)	444	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	445	while (owner->owner)
450	owner = owner->owner;	446	owner = owner->owner;
		447
		448	if (flag [FLAG_FREED])
		449	{
		450	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		451	return;
		452	}
451		453
452	this->owner = owner;	454	this->owner = owner;
453	}	455	}
454		456
455	void	457	int
		458	object::slottype () const
		459	{
		460	if (type == SKILL)
		461	{
		462	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		463	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		464	}
		465	else
		466	{
		467	if (slot [body_combat].info) return slot_combat;
		468	if (slot [body_range ].info) return slot_ranged;
		469	}
		470
		471	return slot_none;
		472	}
		473
		474	bool
456	object::set_weapon (object *ob)	475	object::change_weapon (object *ob)
457	{	476	{
458	if (current_weapon == ob)	477	if (current_weapon == ob)
459	return;	478	return true;
460
461	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462		479
463	if (chosen_skill)	480	if (chosen_skill)
464	chosen_skill->flag [FLAG_APPLIED] = false;	481	chosen_skill->flag [FLAG_APPLIED] = false;
465		482
466	current_weapon = ob;	483	current_weapon = ob;
467	chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);	484	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468		485
469	if (chosen_skill)	486	if (chosen_skill)
470	chosen_skill->flag [FLAG_APPLIED] = true;	487	chosen_skill->flag [FLAG_APPLIED] = true;
471		488
472	update_stats ();	489	update_stats ();
		490
		491	if (ob)
		492	{
		493	// now check wether any body locations became invalid, in which case
		494	// we cannot apply the weapon at the moment.
		495	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		496	if (slot[i].used < 0)
		497	{
		498	current_weapon = chosen_skill = 0;
		499	update_stats ();
		500
		501	new_draw_info_format (NDI_UNIQUE, 0, this,
		502	"You try to balance all your items at once, "
		503	"but the %s is just too much for your body. "
		504	"[You need to unapply some items first.]", &ob->name);
		505	return false;
		506	}
		507
		508	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		509	}
		510	else
		511	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		512
		513	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		514	{
		515	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		516	&name, ob->debug_desc ());
		517	return false;
		518	}
		519
		520	return true;
473	}	521	}
474		522
475	/* Zero the key_values on op, decrementing the shared-string	523	/* Zero the key_values on op, decrementing the shared-string
476	* refcounts and freeing the links.	524	* refcounts and freeing the links.
477	*/	525	*/
…		…
541	object::copy_to (object *dst)	589	object::copy_to (object *dst)
542	{	590	{
543	dst = this;	591	dst = this;
544		592
545	if (speed < 0)	593	if (speed < 0)
546	dst->speed_left = speed_left - rndm ();	594	dst->speed_left -= rndm ();
547		595
548	dst->set_speed (dst->speed);	596	dst->set_speed (dst->speed);
549	}	597	}
550		598
551	void	599	void
552	object::instantiate ()	600	object::instantiate ()
553	{	601	{
554	if (!uuid.seq) // HACK	602	if (!uuid.seq) // HACK
555	uuid = gen_uuid ();	603	uuid = UUID::gen ();
556		604
557	speed_left = -0.1f;	605	speed_left = -0.1f;
558	/* copy the body_info to the body_used - this is only really	606	/* copy the body_info to the body_used - this is only really
559	* need for monsters, but doesn't hurt to do it for everything.	607	* need for monsters, but doesn't hurt to do it for everything.
560	* by doing so, when a monster is created, it has good starting	608	* by doing so, when a monster is created, it has good starting
…		…
719	static int object_count;	767	static int object_count;
720		768
721	void object::link ()	769	void object::link ()
722	{	770	{
723	assert (!index);//D	771	assert (!index);//D
724	uuid = gen_uuid ();	772	uuid = UUID::gen ();
725	count = ++object_count;	773	count = ++object_count;
726		774
727	refcnt_inc ();	775	refcnt_inc ();
728	objects.insert (this);	776	objects.insert (this);
729	}	777	}
…		…
878		926
879	if (!freed_map)	927	if (!freed_map)
880	{	928	{
881	freed_map = new maptile;	929	freed_map = new maptile;
882		930
		931	freed_map->path = "<freed objects map>";
883	freed_map->name = "/internal/freed_objects_map";	932	freed_map->name = "/internal/freed_objects_map";
884	freed_map->width = 3;	933	freed_map->width = 3;
885	freed_map->height = 3;	934	freed_map->height = 3;
		935	freed_map->nodrop = 1;
886		936
887	freed_map->alloc ();	937	freed_map->alloc ();
888	freed_map->in_memory = MAP_IN_MEMORY;	938	freed_map->in_memory = MAP_IN_MEMORY;
889	}	939	}
890		940
891	map = freed_map;	941	map = freed_map;
892	x = 1;	942	x = 1;
893	y = 1;	943	y = 1;
894	}	944	}
895		945
896	head = 0;
897
898	if (more)	946	if (more)
899	{	947	{
900	more->destroy ();	948	more->destroy ();
901	more = 0;	949	more = 0;
902	}	950	}
903		951
		952	head = 0;
		953
904	// clear those pointers that likely might have circular references to us	954	// clear those pointers that likely might cause circular references
905	owner = 0;	955	owner = 0;
906	enemy = 0;	956	enemy = 0;
907	attacked_by = 0;	957	attacked_by = 0;
		958	current_weapon = 0;
908	}	959	}
909		960
910	void	961	void
911	object::destroy (bool destroy_inventory)	962	object::destroy (bool destroy_inventory)
912	{	963	{
913	if (destroyed ())	964	if (destroyed ())
914	return;	965	return;
915		966
916	if (destroy_inventory)	967	if (destroy_inventory)
917	destroy_inv (false);	968	destroy_inv (false);
		969
		970	if (is_head ())
		971	if (sound_destroy)
		972	play_sound (sound_destroy);
		973	else if (flag [FLAG_MONSTER])
		974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
918		975
919	attachable::destroy ();	976	attachable::destroy ();
920	}	977	}
921		978
922	/*	979	/*
…		…
1037	if (map->in_memory == MAP_SAVING)	1094	if (map->in_memory == MAP_SAVING)
1038	return;	1095	return;
1039		1096
1040	int check_walk_off = !flag [FLAG_NO_APPLY];	1097	int check_walk_off = !flag [FLAG_NO_APPLY];
1041		1098
		1099	if (object *pl = ms.player ())
		1100	{
		1101	if (pl->container == this)
		1102	/* If a container that the player is currently using somehow gets
		1103	* removed (most likely destroyed), update the player view
		1104	* appropriately.
		1105	*/
		1106	pl->close_container ();
		1107
		1108	pl->contr->ns->floorbox_update ();
		1109	}
		1110
1042	for (tmp = ms.bot; tmp; tmp = tmp->above)	1111	for (tmp = ms.bot; tmp; tmp = tmp->above)
1043	{	1112	{
1044	/* No point updating the players look faces if he is the object	1113	/* No point updating the players look faces if he is the object
1045	* being removed.	1114	* being removed.
1046	*/	1115	*/
1047
1048	if (tmp->type == PLAYER && tmp != this)
1049	{
1050	/* If a container that the player is currently using somehow gets
1051	* removed (most likely destroyed), update the player view
1052	* appropriately.
1053	*/
1054	if (tmp->container == this)
1055	{
1056	flag [FLAG_APPLIED] = 0;
1057	tmp->container = 0;
1058	}
1059
1060	if (tmp->contr->ns)
1061	tmp->contr->ns->floorbox_update ();
1062	}
1063		1116
1064	/* See if object moving off should effect something */	1117	/* See if object moving off should effect something */
1065	if (check_walk_off	1118	if (check_walk_off
1066	&& ((move_type & tmp->move_off)	1119	&& ((move_type & tmp->move_off)
1067	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1120	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1070		1123
1071	if (destroyed ())	1124	if (destroyed ())
1072	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1125	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1073	}	1126	}
1074		1127
1075	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1076	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1077	if (tmp->above == tmp)
1078	tmp->above = 0;
1079
1080	last = tmp;	1128	last = tmp;
1081	}	1129	}
1082		1130
1083	/* last == NULL if there are no objects on this space */	1131	/* last == NULL if there are no objects on this space */
1084	//TODO: this makes little sense, why only update the topmost object?	1132	//TODO: this makes little sense, why only update the topmost object?
…		…
1104	merge_ob (object op, object top)	1152	merge_ob (object op, object top)
1105	{	1153	{
1106	if (!op->nrof)	1154	if (!op->nrof)
1107	return 0;	1155	return 0;
1108		1156
1109	if (top)	1157	if (!top)
1110	for (top = op; top && top->above; top = top->above)	1158	for (top = op; top && top->above; top = top->above)
1111	;	1159	;
1112		1160
1113	for (; top; top = top->below)	1161	for (; top; top = top->below)
1114	{	1162	{
…		…
1135	if (more)	1183	if (more)
1136	return;	1184	return;
1137		1185
1138	object *prev = this;	1186	object *prev = this;
1139		1187
1140	for (archetype *at = arch->more; at; at = at->more)	1188	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1141	{	1189	{
1142	object *op = arch_to_object (at);	1190	object *op = arch_to_object (at);
1143		1191
1144	op->name = name;	1192	op->name = name;
1145	op->name_pl = name_pl;	1193	op->name_pl = name_pl;
…		…
1159	object *	1207	object *
1160	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1161	{	1209	{
1162	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1210	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1163	{	1211	{
1164	tmp->x = x + tmp->arch->clone.x;	1212	tmp->x = x + tmp->arch->x;
1165	tmp->y = y + tmp->arch->clone.y;	1213	tmp->y = y + tmp->arch->y;
1166	}	1214	}
1167		1215
1168	return insert_ob_in_map (op, m, originator, flag);	1216	return insert_ob_in_map (op, m, originator, flag);
1169	}	1217	}
1170		1218
…		…
1191	object *	1239	object *
1192	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1240	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1193	{	1241	{
1194	assert (!op->flag [FLAG_FREED]);	1242	assert (!op->flag [FLAG_FREED]);
1195		1243
1196	object tmp, top, *floor = NULL;	1244	object top, floor = NULL;
1197		1245
1198	op->remove ();	1246	op->remove ();
1199
1200	#if 0
1201	if (!m->active != !op->active)
1202	if (m->active)
1203	op->activate_recursive ();
1204	else
1205	op->deactivate_recursive ();
1206	#endif
1207
1208	if (out_of_map (m, op->x, op->y))
1209	{
1210	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1211	#ifdef MANY_CORES
1212	/* Better to catch this here, as otherwise the next use of this object
1213	* is likely to cause a crash. Better to find out where it is getting
1214	* improperly inserted.
1215	*/
1216	abort ();
1217	#endif
1218	return op;
1219	}
1220
1221	if (object *more = op->more)
1222	{
1223	if (!insert_ob_in_map (more, m, originator, flag))
1224	{
1225	if (!op->head)
1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228	return 0;
1229	}
1230	}
1231
1232	CLEAR_FLAG (op, FLAG_REMOVED);
1233		1247
1234	/* Ideally, the caller figures this out. However, it complicates a lot	1248	/* Ideally, the caller figures this out. However, it complicates a lot
1235	* of areas of callers (eg, anything that uses find_free_spot would now	1249	* of areas of callers (eg, anything that uses find_free_spot would now
1236	* need extra work	1250	* need extra work
1237	*/	1251	*/
1238	if (!xy_normalise (m, op->x, op->y))	1252	if (!xy_normalise (m, op->x, op->y))
		1253	{
		1254	op->destroy ();
1239	return 0;	1255	return 0;
		1256	}
		1257
		1258	if (object *more = op->more)
		1259	if (!insert_ob_in_map (more, m, originator, flag))
		1260	return 0;
		1261
		1262	CLEAR_FLAG (op, FLAG_REMOVED);
1240		1263
1241	op->map = m;	1264	op->map = m;
1242	mapspace &ms = op->ms ();	1265	mapspace &ms = op->ms ();
1243		1266
1244	/* this has to be done after we translate the coordinates.	1267	/* this has to be done after we translate the coordinates.
1245	*/	1268	*/
1246	if (op->nrof && !(flag & INS_NO_MERGE))	1269	if (op->nrof && !(flag & INS_NO_MERGE))
1247	for (tmp = ms.bot; tmp; tmp = tmp->above)	1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1248	if (object::can_merge (op, tmp))	1271	if (object::can_merge (op, tmp))
1249	{	1272	{
1250	op->nrof += tmp->nrof;	1273	op->nrof += tmp->nrof;
1251	tmp->destroy ();	1274	tmp->destroy ();
1252	}	1275	}
…		…
1279	else	1302	else
1280	{	1303	{
1281	top = ms.bot;	1304	top = ms.bot;
1282		1305
1283	/* If there are other objects, then */	1306	/* If there are other objects, then */
1284	if ((!(flag & INS_MAP_LOAD)) && top)	1307	if (top)
1285	{	1308	{
1286	object *last = 0;	1309	object *last = 0;
1287		1310
1288	/*	1311	/*
1289	* If there are multiple objects on this space, we do some trickier handling.	1312	* If there are multiple objects on this space, we do some trickier handling.
…		…
1342	if (last && last->below && last != floor)	1365	if (last && last->below && last != floor)
1343	top = last->below;	1366	top = last->below;
1344	}	1367	}
1345	} /* If objects on this space */	1368	} /* If objects on this space */
1346		1369
1347	if (flag & INS_MAP_LOAD)
1348	top = ms.top;
1349
1350	if (flag & INS_ABOVE_FLOOR_ONLY)	1370	if (flag & INS_ABOVE_FLOOR_ONLY)
1351	top = floor;	1371	top = floor;
1352		1372
1353	/* Top is the object that our object (op) is going to get inserted above.	1373	/* Top is the object that our object (op) is going to get inserted above.
1354	*/	1374	*/
…		…
1386	op->map->touch ();	1406	op->map->touch ();
1387	}	1407	}
1388		1408
1389	op->map->dirty = true;	1409	op->map->dirty = true;
1390		1410
1391	/* If we have a floor, we know the player, if any, will be above
1392	* it, so save a few ticks and start from there.
1393	*/
1394	if (!(flag & INS_MAP_LOAD))
1395	if (object *pl = ms.player ())	1411	if (object *pl = ms.player ())
1396	if (pl->contr->ns)
1397	pl->contr->ns->floorbox_update ();	1412	pl->contr->ns->floorbox_update ();
1398		1413
1399	/* If this object glows, it may affect lighting conditions that are	1414	/* If this object glows, it may affect lighting conditions that are
1400	* visible to others on this map. But update_all_los is really	1415	* visible to others on this map. But update_all_los is really
1401	* an inefficient way to do this, as it means los for all players	1416	* an inefficient way to do this, as it means los for all players
1402	* on the map will get recalculated. The players could very well	1417	* on the map will get recalculated. The players could very well
…		…
1421	* blocked() and wall() work properly), and these flags are updated by	1436	* blocked() and wall() work properly), and these flags are updated by
1422	* update_object().	1437	* update_object().
1423	*/	1438	*/
1424		1439
1425	/* if this is not the head or flag has been passed, don't check walk on status */	1440	/* if this is not the head or flag has been passed, don't check walk on status */
1426	if (!(flag & INS_NO_WALK_ON) && !op->head)	1441	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1427	{	1442	{
1428	if (check_move_on (op, originator))	1443	if (check_move_on (op, originator))
1429	return 0;	1444	return 0;
1430		1445
1431	/* If we are a multi part object, lets work our way through the check	1446	/* If we are a multi part object, lets work our way through the check
1432	* walk on's.	1447	* walk on's.
1433	*/	1448	*/
1434	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1449	for (object *tmp = op->more; tmp; tmp = tmp->more)
1435	if (check_move_on (tmp, originator))	1450	if (check_move_on (tmp, originator))
1436	return 0;	1451	return 0;
1437	}	1452	}
1438		1453
1439	return op;	1454	return op;
…		…
1449	object tmp, tmp1;	1464	object tmp, tmp1;
1450		1465
1451	/* first search for itself and remove any old instances */	1466	/* first search for itself and remove any old instances */
1452		1467
1453	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1454	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1455	tmp->destroy ();	1470	tmp->destroy ();
1456		1471
1457	tmp1 = arch_to_object (archetype::find (arch_string));	1472	tmp1 = arch_to_object (archetype::find (arch_string));
1458		1473
1459	tmp1->x = op->x;	1474	tmp1->x = op->x;
…		…
1620	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1635	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1621	free (dump);	1636	free (dump);
1622	return op;	1637	return op;
1623	}	1638	}
1624		1639
1625	if (where->head)	1640	if (where->head_ () != where)
1626	{	1641	{
1627	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1642	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1628	where = where->head;	1643	where = where->head;
1629	}	1644	}
1630		1645
1631	return where->insert (op);	1646	return where->insert (op);
1632	}	1647	}
…		…
1640	* be != op, if items are merged. -Tero	1655	* be != op, if items are merged. -Tero
1641	*/	1656	*/
1642	object *	1657	object *
1643	object::insert (object *op)	1658	object::insert (object *op)
1644	{	1659	{
1645	object tmp, otmp;
1646
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))	1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();	1661	op->remove ();
1649		1662
1650	if (op->more)	1663	if (op->more)
1651	{	1664	{
…		…
1653	return op;	1666	return op;
1654	}	1667	}
1655		1668
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1670	CLEAR_FLAG (op, FLAG_REMOVED);
		1671
1658	if (op->nrof)	1672	if (op->nrof)
1659	{	1673	{
1660	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1674	for (object *tmp = inv; tmp; tmp = tmp->below)
1661	if (object::can_merge (tmp, op))	1675	if (object::can_merge (tmp, op))
1662	{	1676	{
1663	/* return the original object and remove inserted object	1677	/* return the original object and remove inserted object
1664	(client needs the original object) */	1678	(client needs the original object) */
1665	tmp->nrof += op->nrof;	1679	tmp->nrof += op->nrof;
…		…
1684	add_weight (this, op->weight * op->nrof);	1698	add_weight (this, op->weight * op->nrof);
1685	}	1699	}
1686	else	1700	else
1687	add_weight (this, (op->weight + op->carrying));	1701	add_weight (this, (op->weight + op->carrying));
1688		1702
1689	otmp = this->in_player ();	1703	if (object *otmp = this->in_player ())
1690	if (otmp && otmp->contr)
1691	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();	1705	otmp->update_stats ();
1693		1706
		1707	op->owner = 0; // its his/hers now. period.
1694	op->map = 0;	1708	op->map = 0;
1695	op->env = this;	1709	op->env = this;
1696	op->above = 0;	1710	op->above = 0;
1697	op->below = 0;	1711	op->below = 0;
1698	op->x = 0, op->y = 0;	1712	op->x = op->y = 0;
1699		1713
1700	/* reset the light list and los of the players on the map */	1714	/* reset the light list and los of the players on the map */
1701	if ((op->glow_radius != 0) && map)	1715	if (op->glow_radius && map)
1702	{	1716	{
1703	#ifdef DEBUG_LIGHTS	1717	#ifdef DEBUG_LIGHTS
1704	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1705	#endif /* DEBUG_LIGHTS */	1719	#endif /* DEBUG_LIGHTS */
1706	if (map->darkness)	1720	if (map->darkness)
…		…
1940	* activate recursively a flag on an object inventory	1954	* activate recursively a flag on an object inventory
1941	*/	1955	*/
1942	void	1956	void
1943	flag_inv (object *op, int flag)	1957	flag_inv (object *op, int flag)
1944	{	1958	{
1945	if (op->inv)
1946	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1947	{	1960	{
1948	SET_FLAG (tmp, flag);	1961	SET_FLAG (tmp, flag);
1949	flag_inv (tmp, flag);	1962	flag_inv (tmp, flag);
1950	}	1963	}
1951	}	1964	}
1952		1965
1953	/*	1966	/*
1954	* deactivate recursively a flag on an object inventory	1967	* deactivate recursively a flag on an object inventory
1955	*/	1968	*/
1956	void	1969	void
1957	unflag_inv (object *op, int flag)	1970	unflag_inv (object *op, int flag)
1958	{	1971	{
1959	if (op->inv)
1960	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1961	{	1973	{
1962	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
1963	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
1964	}	1976	}
1965	}
1966
1967	/*
1968	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1969	* all it's inventory (recursively).
1970	* If checksums are used, a player will get set_cheat called for
1971	* him/her-self and all object carried by a call to this function.
1972	*/
1973	void
1974	set_cheat (object *op)
1975	{
1976	SET_FLAG (op, FLAG_WAS_WIZ);
1977	flag_inv (op, FLAG_WAS_WIZ);
1978	}	1977	}
1979		1978
1980	/*	1979	/*
1981	* 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
1982	* 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
…		…
1984	* to search (see the freearr_x/y[] definition).	1983	* to search (see the freearr_x/y[] definition).
1985	* It returns a random choice among the alternatives found.	1984	* It returns a random choice among the alternatives found.
1986	* 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
1987	* does all 4 immediate directions). This returns the index into the	1986	* does all 4 immediate directions). This returns the index into the
1988	* 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)
1989	* Note - this only checks to see if there is space for the head of the
1990	* object - if it is a multispace object, this should be called for all
1991	* pieces.
1992	* Note2: This function does correctly handle tiled maps, but does not	1988	* Note: This function does correctly handle tiled maps, but does not
1993	* inform the caller. However, insert_ob_in_map will update as	1989	* inform the caller. However, insert_ob_in_map will update as
1994	* 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.
1995	* 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
1996	* 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
1997	* 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
…		…
1999	* customized, changed states, etc.	1995	* customized, changed states, etc.
2000	*/	1996	*/
2001	int	1997	int
2002	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)
2003	{	1999	{
		2000	int altern[SIZEOFFREE];
2004	int index = 0, flag;	2001	int index = 0, flag;
2005	int altern[SIZEOFFREE];
2006		2002
2007	for (int i = start; i < stop; i++)	2003	for (int i = start; i < stop; i++)
2008	{	2004	{
2009	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2005	mapxy pos (m, x, y); pos.move (i);
2010	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 && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2020	{
2011	altern [index++] = i;	2021	altern [index++] = i;
		2022	continue;
		2023	}
2012		2024
2013	/* 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.
2014	* 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.
2015	* 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 -
2016	* 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
2017	* 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
2018	* to only the spaces immediately surrounding the target area, and	2030	* to only the spaces immediately surrounding the target area, and
2019	* won't look 2 spaces south of the target space.	2031	* won't look 2 spaces south of the target space.
2020	*/	2032	*/
2021	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2033	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2034	{
2022	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;
2023	}	2049	}
2024		2050
2025	if (!index)	2051	if (!index)
2026	return -1;	2052	return -1;
2027		2053
…		…
2036	*/	2062	*/
2037	int	2063	int
2038	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)
2039	{	2065	{
2040	for (int i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2041	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]))
2042	return i;	2068	return i;
2043		2069
2044	return -1;	2070	return -1;
2045	}	2071	}
2046		2072
…		…
2100	object *tmp;	2126	object *tmp;
2101	maptile *mp;	2127	maptile *mp;
2102		2128
2103	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2104		2130
2105	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2106	{	2132	{
2107	exclude = exclude->head;	2133	exclude = exclude->head;
2108	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2109	}	2135	}
2110	else	2136	else
…		…
2133	max = maxfree[i];	2159	max = maxfree[i];
2134	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2135	{	2161	{
2136	for (tmp = ms.bot; tmp; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2137	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2163	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2138	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2139	break;	2165	break;
2140		2166
2141	if (tmp)	2167	if (tmp)
2142	return freedir[i];	2168	return freedir[i];
2143	}	2169	}
…		…
2323	* 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
2324	* core dumps if they do.	2350	* core dumps if they do.
2325	*	2351	*
2326	* 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)
2327	*/	2353	*/
2328
2329	int	2354	int
2330	can_pick (const object who, const object item)	2355	can_pick (const object who, const object item)
2331	{	2356	{
2332	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2357	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2338	* create clone from object to another	2363	* create clone from object to another
2339	*/	2364	*/
2340	object *	2365	object *
2341	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2342	{	2367	{
2343	object dst = 0, tmp, src, part, prev, item;	2368	object dst = 0, tmp, src, prev, *item;
2344		2369
2345	if (!asrc)	2370	if (!asrc)
2346	return 0;	2371	return 0;
2347		2372
2348	src = asrc;
2349	if (src->head)
2350	src = src->head;	2373	src = asrc->head_ ();
2351		2374
2352	prev = 0;	2375	prev = 0;
2353	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2354	{	2377	{
2355	tmp = part->clone ();	2378	tmp = part->clone ();
2356	tmp->x -= src->x;	2379	tmp->x -= src->x;
2357	tmp->y -= src->y;	2380	tmp->y -= src->y;
2358		2381
…		…
2471	/* Basically, if the archetype has this key set,	2494	/* Basically, if the archetype has this key set,
2472	* we need to store the null value so when we save	2495	* we need to store the null value so when we save
2473	* it, we save the empty value so that when we load,	2496	* it, we save the empty value so that when we load,
2474	* we get this value back again.	2497	* we get this value back again.
2475	*/	2498	*/
2476	if (get_ob_key_link (&op->arch->clone, canonical_key))	2499	if (get_ob_key_link (op->arch, canonical_key))
2477	field->value = 0;	2500	field->value = 0;
2478	else	2501	else
2479	{	2502	{
2480	if (last)	2503	if (last)
2481	last->next = field->next;	2504	last->next = field->next;
…		…
2550	}	2573	}
2551	else	2574	else
2552	item = item->env;	2575	item = item->env;
2553	}	2576	}
2554		2577
2555
2556	const char *	2578	const char *
2557	object::flag_desc (char *desc, int len) const	2579	object::flag_desc (char *desc, int len) const
2558	{	2580	{
2559	char *p = desc;	2581	char *p = desc;
2560	bool first = true;	2582	bool first = true;
…		…
2587	{	2609	{
2588	char flagdesc[512];	2610	char flagdesc[512];
2589	char info2[256 * 4];	2611	char info2[256 * 4];
2590	char *p = info;	2612	char *p = info;
2591		2613
2592	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:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2593	count, uuid.seq,	2615	count,
		2616	uuid.c_str (),
2594	&name,	2617	&name,
2595	title ? "\",title:\"" : "",	2618	title ? "\",title:\"" : "",
2596	title ? (const char *)title : "",	2619	title ? (const char *)title : "",
2597	flag_desc (flagdesc, 512), type);	2620	flag_desc (flagdesc, 512), type);
2598		2621
2599	if (env)	2622	if (!this->flag[FLAG_REMOVED] && env)
2600	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2601		2624
2602	if (map)	2625	if (map)
2603	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2604		2627
…		…
2622	}	2645	}
2623		2646
2624	const materialtype_t *	2647	const materialtype_t *
2625	object::dominant_material () const	2648	object::dominant_material () const
2626	{	2649	{
2627	if (materialtype_t *mat = name_to_material (materialname))	2650	if (materialtype_t *mt = name_to_material (materialname))
2628	return mat;	2651	return mt;
2629		2652
2630	// omfg this is slow, this has to be temporary :)
2631	shstr unknown ("unknown");
2632
2633	return name_to_material (unknown);	2653	return name_to_material (shstr_unknown);
2634	}	2654	}
2635		2655
2636	void	2656	void
2637	object::open_container (object *new_container)	2657	object::open_container (object *new_container)
2638	{	2658	{
…		…
2654	old_container->flag [FLAG_APPLIED] = 0;	2674	old_container->flag [FLAG_APPLIED] = 0;
2655	container = 0;	2675	container = 0;
2656		2676
2657	esrv_update_item (UPD_FLAGS, this, old_container);	2677	esrv_update_item (UPD_FLAGS, this, old_container);
2658	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2678	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2679	play_sound (sound_find ("chest_close"));
2659	}	2680	}
2660		2681
2661	if (new_container)	2682	if (new_container)
2662	{	2683	{
2663	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2684	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2679	new_container->flag [FLAG_APPLIED] = 1;	2700	new_container->flag [FLAG_APPLIED] = 1;
2680	container = new_container;	2701	container = new_container;
2681		2702
2682	esrv_update_item (UPD_FLAGS, this, new_container);	2703	esrv_update_item (UPD_FLAGS, this, new_container);
2683	esrv_send_inventory (this, new_container);	2704	esrv_send_inventory (this, new_container);
		2705	play_sound (sound_find ("chest_open"));
		2706	}
		2707	}
		2708
		2709	object *
		2710	object::force_find (const shstr name)
		2711	{
		2712	/* cycle through his inventory to look for the MARK we want to
		2713	* place
		2714	*/
		2715	for (object *tmp = inv; tmp; tmp = tmp->below)
		2716	if (tmp->type == FORCE && tmp->slaying == name)
		2717	return splay (tmp);
		2718
		2719	return 0;
		2720	}
		2721
		2722	void
		2723	object::force_add (const shstr name, int duration)
		2724	{
		2725	if (object *force = force_find (name))
		2726	force->destroy ();
		2727
		2728	object *force = get_archetype (FORCE_NAME);
		2729
		2730	force->slaying = name;
		2731	force->stats.food = 1;
		2732	force->speed_left = -1.f;
		2733
		2734	force->set_speed (duration ? 1.f / duration : 0.f);
		2735	force->flag [FLAG_IS_USED_UP] = true;
		2736	force->flag [FLAG_APPLIED] = true;
		2737
		2738	insert (force);
		2739	}
		2740
		2741	void
		2742	object::play_sound (faceidx sound) const
		2743	{
		2744	if (!sound)
		2745	return;
		2746
		2747	if (flag [FLAG_REMOVED])
		2748	return;
		2749
		2750	if (env)
2684	}	2751	{
		2752	if (object *pl = in_player ())
		2753	pl->contr->play_sound (sound);
		2754	}
		2755	else
		2756	map->play_sound (sound, x, y);
2685	}	2757	}
2686		2758
2687

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC vs. Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC