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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.153 by root, Thu May 17 21:11:01 2007 UTC vs.
Revision 1.205 by root, Sun Apr 13 01:34:08 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;	39	static uint64_t seq_next_save;
41	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
42		41
43	objectvec objects;	42	objectvec objects;
44	activevec actives;	43	activevec actives;
45		44
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,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	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	49	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	};	50	};
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,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-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	55	-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	};	56	};
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,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	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	61	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	};	62	};
55	int freedir[SIZEOFFREE] = {	63	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,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	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	67	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	};	68	};
59		69
60	static void	70	static void
61	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
62	{	72	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
64		74	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		77	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	}	78	}
80		79
81	static void	80	static void
82	read_uuid (void)	81	read_uuid (void)
83	{	82	{
84	char filename[MAX_BUF];	83	char filename[MAX_BUF];
85		84
86	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
87		86
		87	seq_next_save = 0;
		88
88	FILE *fp;	89	FILE *fp;
89		90
90	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
91	{	92	{
92	if (errno == ENOENT)	93	if (errno == ENOENT)
93	{	94	{
94	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	96	UUID::cur.seq = 0;
96	write_uuid ();	97	write_uuid (UUID_GAP, true);
97	return;	98	return;
98	}	99	}
99		100
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	102	_exit (1);
102	}	103	}
103		104
104	int version;	105	UUID::BUF buf;
105	unsigned long long uid;	106	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
107	{	110	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	112	_exit (1);
110	}	113	}
111		114
112	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	116
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
115	fclose (fp);	118	fclose (fp);
116	}	119	}
117		120
118	UUID	121	UUID
119	gen_uuid ()	122	UUID::gen ()
120	{	123	{
121	UUID uid;	124	UUID uid;
122		125
123	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
124		127
125	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
126	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
127		134
128	return uid;	135	return uid;
129	}	136	}
130		137
131	void	138	void
132	init_uuid ()	139	UUID::init ()
133	{	140	{
134	read_uuid ();	141	read_uuid ();
135	}	142	}
136		143
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	145	static bool
139	compare_ob_value_lists_one (const object wants, const object has)	146	compare_ob_value_lists_one (const object wants, const object has)
140	{	147	{
141	key_value *wants_field;	148	key_value *wants_field;
142		149
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
151	key_value *has_field;	158	key_value *has_field;
152		159
153	/* Look for a field in has with the same key. */	160	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);	161	has_field = get_ob_key_link (has, wants_field->key);
155		162
156	if (has_field == NULL)	163	if (!has_field)
157	{
158	/* No field with that name. */	164	return 0; /* No field with that name. */
159	return FALSE;
160	}
161		165
162	/* Found the matching field. */	166	/* Found the matching field. */
163	if (has_field->value != wants_field->value)	167	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */	168	return 0; /* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168		169
169	/* If we get here, we found a match. Now for the next field in wants. */	170	/* If we get here, we found a match. Now for the next field in wants. */
170	}	171	}
171		172
172	/* If we get here, every field in wants has a matching field in has. */	173	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	174	return 1;
174	}	175	}
175		176
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	177	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	178	static bool
178	compare_ob_value_lists (const object ob1, const object ob2)	179	compare_ob_value_lists (const object ob1, const object ob2)
179	{	180	{
180	/* However, there may be fields in has which aren't partnered in wants,	181	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison twice. :(	182	* so we need to run the comparison twice. :(
182	*/	183	*/
…		…
203	\|\| ob1->speed != ob2->speed	204	\|\| ob1->speed != ob2->speed
204	\|\| ob1->value != ob2->value	205	\|\| ob1->value != ob2->value
205	\|\| ob1->name != ob2->name)	206	\|\| ob1->name != ob2->name)
206	return 0;	207	return 0;
207		208
208	//TODO: this ain't working well, use nicer and correct overflow check	209	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	210	* for unsigned overflow (2c), second part checks wether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	211	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	212	* nrof values.
212	*/	213	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	214	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	215	return 0;
215		216
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	217	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	218	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	219	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	220	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	221	* flags lose any meaning.
221	*/	222	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
250	\|\| ob1->move_off != ob2->move_off	251	\|\| ob1->move_off != ob2->move_off
251	\|\| ob1->move_slow != ob2->move_slow	252	\|\| ob1->move_slow != ob2->move_slow
252	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	253	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	254	return 0;
254		255
255	/* This is really a spellbook check - really, we should	256	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	257	* not merge objects with real inventories, as splitting them
		258	* is hard.
257	*/	259	*/
258	if (ob1->inv \|\| ob2->inv)	260	if (ob1->inv \|\| ob2->inv)
259	{	261	{
260	/* if one object has inventory but the other doesn't, not equiv */	262	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	263	return 0; /* inventories differ in length */
262	return 0;
263		264
264	/* Now check to see if the two inventory objects could merge */	265	if (ob1->inv->below \|\| ob2->inv->below)
		266	return 0; /* more than one object in inv */
		267
265	if (!object::can_merge (ob1->inv, ob2->inv))	268	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	269	return 0; /* inventory objects differ */
267		270
268	/* inventory ok - still need to check rest of this object to see	271	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	272	* if it is valid.
270	*/	273	*/
271	}	274	}
…		…
290	if (ob1->level != ob2->level)	293	if (ob1->level != ob2->level)
291	return 0;	294	return 0;
292	break;	295	break;
293	}	296	}
294		297
295	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	298	if (ob1->key_values \|\| ob2->key_values)
296	{	299	{
297	/* At least one of these has key_values. */	300	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	301	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	302	/* One has fields, but the other one doesn't. */
300	return 0;	303	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))	304	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	305	return 0;
303	}	306	}
304		307
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self \|\| ob2->self)	308	if (ob1->self \|\| ob2->self)
307	{	309	{
308	ob1->optimise ();	310	ob1->optimise ();
309	ob2->optimise ();	311	ob2->optimise ();
310		312
311	if (ob1->self \|\| ob2->self)	313	if (ob1->self \|\| ob2->self)
		314	{
		315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		317
		318	if (k1 != k2)
312	return 0;	319	return 0;
		320	else if (k1 == 0)
		321	return 1;
		322	else if (!cfperl_can_merge (ob1, ob2))
		323	return 0;
		324	}
313	}	325	}
314		326
315	/* Everything passes, must be OK. */	327	/* Everything passes, must be OK. */
316	return 1;	328	return 1;
317	}	329	}
…		…
375	/*	387	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	388	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	389	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	390	* If it's not a multi-object, it is returned.
379	*/	391	*/
380
381	object *	392	object *
382	get_nearest_part (object op, const object pl)	393	get_nearest_part (object op, const object pl)
383	{	394	{
384	object tmp, closest;	395	object tmp, closest;
385	int last_dist, i;	396	int last_dist, i;
…		…
421	break;	432	break;
422		433
423	return op;	434	return op;
424	}	435	}
425		436
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	437	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	438	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	439	* skill and experience objects.
		440	* ACTUALLY NO! investigate! TODO
435	*/	441	*/
436	void	442	void
437	object::set_owner (object *owner)	443	object::set_owner (object *owner)
438	{	444	{
		445	// allow objects which own objects
439	if (!owner)	446	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)	447	while (owner->owner)
450	owner = owner->owner;	448	owner = owner->owner;
		449
		450	if (flag [FLAG_FREED])
		451	{
		452	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		453	return;
		454	}
451		455
452	this->owner = owner;	456	this->owner = owner;
453	}	457	}
454		458
455	int	459	int
…		…
495	{	499	{
496	current_weapon = chosen_skill = 0;	500	current_weapon = chosen_skill = 0;
497	update_stats ();	501	update_stats ();
498		502
499	new_draw_info_format (NDI_UNIQUE, 0, this,	503	new_draw_info_format (NDI_UNIQUE, 0, this,
500	"You try to balance your applied items all at once, but the %s is too much. "	504	"You try to balance all your items at once, "
		505	"but the %s is just too much for your body. "
501	"You need to unapply some items first.", &ob->name);	506	"[You need to unapply some items first.]", &ob->name);
502	return false;	507	return false;
503	}	508	}
504		509
505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	510	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506	}	511	}
…		…
586	object::copy_to (object *dst)	591	object::copy_to (object *dst)
587	{	592	{
588	dst = this;	593	dst = this;
589		594
590	if (speed < 0)	595	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	596	dst->speed_left -= rndm ();
592		597
593	dst->set_speed (dst->speed);	598	dst->set_speed (dst->speed);
594	}	599	}
595		600
596	void	601	void
597	object::instantiate ()	602	object::instantiate ()
598	{	603	{
599	if (!uuid.seq) // HACK	604	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	605	uuid = UUID::gen ();
601		606
602	speed_left = -0.1f;	607	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	608	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	609	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	610	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	769	static int object_count;
765		770
766	void object::link ()	771	void object::link ()
767	{	772	{
768	assert (!index);//D	773	assert (!index);//D
769	uuid = gen_uuid ();	774	uuid = UUID::gen ();
770	count = ++object_count;	775	count = ++object_count;
771		776
772	refcnt_inc ();	777	refcnt_inc ();
773	objects.insert (this);	778	objects.insert (this);
774	}	779	}
…		…
923		928
924	if (!freed_map)	929	if (!freed_map)
925	{	930	{
926	freed_map = new maptile;	931	freed_map = new maptile;
927		932
		933	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	934	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	935	freed_map->width = 3;
930	freed_map->height = 3;	936	freed_map->height = 3;
		937	freed_map->nodrop = 1;
931		938
932	freed_map->alloc ();	939	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	940	freed_map->in_memory = MAP_IN_MEMORY;
934	}	941	}
935		942
936	map = freed_map;	943	map = freed_map;
937	x = 1;	944	x = 1;
938	y = 1;	945	y = 1;
939	}	946	}
940		947
941	head = 0;
942
943	if (more)	948	if (more)
944	{	949	{
945	more->destroy ();	950	more->destroy ();
946	more = 0;	951	more = 0;
947	}	952	}
948		953
		954	head = 0;
		955
949	// clear those pointers that likely might have circular references to us	956	// clear those pointers that likely might cause circular references
950	owner = 0;	957	owner = 0;
951	enemy = 0;	958	enemy = 0;
952	attacked_by = 0;	959	attacked_by = 0;
		960	current_weapon = 0;
953	}	961	}
954		962
955	void	963	void
956	object::destroy (bool destroy_inventory)	964	object::destroy (bool destroy_inventory)
957	{	965	{
958	if (destroyed ())	966	if (destroyed ())
959	return;	967	return;
960		968
961	if (destroy_inventory)	969	if (destroy_inventory)
962	destroy_inv (false);	970	destroy_inv (false);
		971
		972	if (is_head ())
		973	if (sound_destroy)
		974	play_sound (sound_destroy);
		975	else if (flag [FLAG_MONSTER])
		976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963		977
964	attachable::destroy ();	978	attachable::destroy ();
965	}	979	}
966		980
967	/*	981	/*
…		…
1082	if (map->in_memory == MAP_SAVING)	1096	if (map->in_memory == MAP_SAVING)
1083	return;	1097	return;
1084		1098
1085	int check_walk_off = !flag [FLAG_NO_APPLY];	1099	int check_walk_off = !flag [FLAG_NO_APPLY];
1086		1100
		1101	if (object *pl = ms.player ())
		1102	{
		1103	if (pl->container == this)
		1104	/* If a container that the player is currently using somehow gets
		1105	* removed (most likely destroyed), update the player view
		1106	* appropriately.
		1107	*/
		1108	pl->close_container ();
		1109
		1110	pl->contr->ns->floorbox_update ();
		1111	}
		1112
1087	for (tmp = ms.bot; tmp; tmp = tmp->above)	1113	for (tmp = ms.bot; tmp; tmp = tmp->above)
1088	{	1114	{
1089	/* No point updating the players look faces if he is the object	1115	/* No point updating the players look faces if he is the object
1090	* being removed.	1116	* being removed.
1091	*/	1117	*/
1092
1093	if (tmp->type == PLAYER && tmp != this)
1094	{
1095	/* If a container that the player is currently using somehow gets
1096	* removed (most likely destroyed), update the player view
1097	* appropriately.
1098	*/
1099	if (tmp->container == this)
1100	{
1101	flag [FLAG_APPLIED] = 0;
1102	tmp->container = 0;
1103	}
1104
1105	if (tmp->contr->ns)
1106	tmp->contr->ns->floorbox_update ();
1107	}
1108		1118
1109	/* See if object moving off should effect something */	1119	/* See if object moving off should effect something */
1110	if (check_walk_off	1120	if (check_walk_off
1111	&& ((move_type & tmp->move_off)	1121	&& ((move_type & tmp->move_off)
1112	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1122	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1115		1125
1116	if (destroyed ())	1126	if (destroyed ())
1117	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1127	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118	}	1128	}
1119		1129
1120	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1121	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1122	if (tmp->above == tmp)
1123	tmp->above = 0;
1124
1125	last = tmp;	1130	last = tmp;
1126	}	1131	}
1127		1132
1128	/* last == NULL if there are no objects on this space */	1133	/* last == NULL if there are no objects on this space */
1129	//TODO: this makes little sense, why only update the topmost object?	1134	//TODO: this makes little sense, why only update the topmost object?
…		…
1149	merge_ob (object op, object top)	1154	merge_ob (object op, object top)
1150	{	1155	{
1151	if (!op->nrof)	1156	if (!op->nrof)
1152	return 0;	1157	return 0;
1153		1158
1154	if (top)	1159	if (!top)
1155	for (top = op; top && top->above; top = top->above)	1160	for (top = op; top && top->above; top = top->above)
1156	;	1161	;
1157		1162
1158	for (; top; top = top->below)	1163	for (; top; top = top->below)
1159	{	1164	{
…		…
1180	if (more)	1185	if (more)
1181	return;	1186	return;
1182		1187
1183	object *prev = this;	1188	object *prev = this;
1184		1189
1185	for (archetype *at = arch->more; at; at = at->more)	1190	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1186	{	1191	{
1187	object *op = arch_to_object (at);	1192	object *op = arch_to_object (at);
1188		1193
1189	op->name = name;	1194	op->name = name;
1190	op->name_pl = name_pl;	1195	op->name_pl = name_pl;
…		…
1204	object *	1209	object *
1205	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1210	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1206	{	1211	{
1207	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1212	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208	{	1213	{
1209	tmp->x = x + tmp->arch->clone.x;	1214	tmp->x = x + tmp->arch->x;
1210	tmp->y = y + tmp->arch->clone.y;	1215	tmp->y = y + tmp->arch->y;
1211	}	1216	}
1212		1217
1213	return insert_ob_in_map (op, m, originator, flag);	1218	return insert_ob_in_map (op, m, originator, flag);
1214	}	1219	}
1215		1220
…		…
1236	object *	1241	object *
1237	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1242	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1238	{	1243	{
1239	assert (!op->flag [FLAG_FREED]);	1244	assert (!op->flag [FLAG_FREED]);
1240		1245
1241	object tmp, top, *floor = NULL;	1246	object top, floor = NULL;
1242		1247
1243	op->remove ();	1248	op->remove ();
1244
1245	#if 0
1246	if (!m->active != !op->active)
1247	if (m->active)
1248	op->activate_recursive ();
1249	else
1250	op->deactivate_recursive ();
1251	#endif
1252
1253	if (out_of_map (m, op->x, op->y))
1254	{
1255	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1256	#ifdef MANY_CORES
1257	/* Better to catch this here, as otherwise the next use of this object
1258	* is likely to cause a crash. Better to find out where it is getting
1259	* improperly inserted.
1260	*/
1261	abort ();
1262	#endif
1263	return op;
1264	}
1265
1266	if (object *more = op->more)
1267	{
1268	if (!insert_ob_in_map (more, m, originator, flag))
1269	{
1270	if (!op->head)
1271	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1272
1273	return 0;
1274	}
1275	}
1276
1277	CLEAR_FLAG (op, FLAG_REMOVED);
1278		1249
1279	/* Ideally, the caller figures this out. However, it complicates a lot	1250	/* Ideally, the caller figures this out. However, it complicates a lot
1280	* of areas of callers (eg, anything that uses find_free_spot would now	1251	* of areas of callers (eg, anything that uses find_free_spot would now
1281	* need extra work	1252	* need extra work
1282	*/	1253	*/
1283	if (!xy_normalise (m, op->x, op->y))	1254	if (!xy_normalise (m, op->x, op->y))
		1255	{
		1256	op->destroy ();
1284	return 0;	1257	return 0;
		1258	}
		1259
		1260	if (object *more = op->more)
		1261	if (!insert_ob_in_map (more, m, originator, flag))
		1262	return 0;
		1263
		1264	CLEAR_FLAG (op, FLAG_REMOVED);
1285		1265
1286	op->map = m;	1266	op->map = m;
1287	mapspace &ms = op->ms ();	1267	mapspace &ms = op->ms ();
1288		1268
1289	/* this has to be done after we translate the coordinates.	1269	/* this has to be done after we translate the coordinates.
1290	*/	1270	*/
1291	if (op->nrof && !(flag & INS_NO_MERGE))	1271	if (op->nrof && !(flag & INS_NO_MERGE))
1292	for (tmp = ms.bot; tmp; tmp = tmp->above)	1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1293	if (object::can_merge (op, tmp))	1273	if (object::can_merge (op, tmp))
1294	{	1274	{
1295	op->nrof += tmp->nrof;	1275	op->nrof += tmp->nrof;
1296	tmp->destroy ();	1276	tmp->destroy ();
1297	}	1277	}
…		…
1324	else	1304	else
1325	{	1305	{
1326	top = ms.bot;	1306	top = ms.bot;
1327		1307
1328	/* If there are other objects, then */	1308	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && top)	1309	if (top)
1330	{	1310	{
1331	object *last = 0;	1311	object *last = 0;
1332		1312
1333	/*	1313	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1314	* If there are multiple objects on this space, we do some trickier handling.
…		…
1387	if (last && last->below && last != floor)	1367	if (last && last->below && last != floor)
1388	top = last->below;	1368	top = last->below;
1389	}	1369	}
1390	} /* If objects on this space */	1370	} /* If objects on this space */
1391		1371
1392	if (flag & INS_MAP_LOAD)
1393	top = ms.top;
1394
1395	if (flag & INS_ABOVE_FLOOR_ONLY)	1372	if (flag & INS_ABOVE_FLOOR_ONLY)
1396	top = floor;	1373	top = floor;
1397		1374
1398	/* Top is the object that our object (op) is going to get inserted above.	1375	/* Top is the object that our object (op) is going to get inserted above.
1399	*/	1376	*/
…		…
1431	op->map->touch ();	1408	op->map->touch ();
1432	}	1409	}
1433		1410
1434	op->map->dirty = true;	1411	op->map->dirty = true;
1435		1412
1436	/* If we have a floor, we know the player, if any, will be above
1437	* it, so save a few ticks and start from there.
1438	*/
1439	if (!(flag & INS_MAP_LOAD))
1440	if (object *pl = ms.player ())	1413	if (object *pl = ms.player ())
1441	if (pl->contr->ns)
1442	pl->contr->ns->floorbox_update ();	1414	pl->contr->ns->floorbox_update ();
1443		1415
1444	/* If this object glows, it may affect lighting conditions that are	1416	/* If this object glows, it may affect lighting conditions that are
1445	* visible to others on this map. But update_all_los is really	1417	* visible to others on this map. But update_all_los is really
1446	* an inefficient way to do this, as it means los for all players	1418	* an inefficient way to do this, as it means los for all players
1447	* on the map will get recalculated. The players could very well	1419	* on the map will get recalculated. The players could very well
…		…
1466	* blocked() and wall() work properly), and these flags are updated by	1438	* blocked() and wall() work properly), and these flags are updated by
1467	* update_object().	1439	* update_object().
1468	*/	1440	*/
1469		1441
1470	/* if this is not the head or flag has been passed, don't check walk on status */	1442	/* if this is not the head or flag has been passed, don't check walk on status */
1471	if (!(flag & INS_NO_WALK_ON) && !op->head)	1443	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1472	{	1444	{
1473	if (check_move_on (op, originator))	1445	if (check_move_on (op, originator))
1474	return 0;	1446	return 0;
1475		1447
1476	/* If we are a multi part object, lets work our way through the check	1448	/* If we are a multi part object, lets work our way through the check
1477	* walk on's.	1449	* walk on's.
1478	*/	1450	*/
1479	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1451	for (object *tmp = op->more; tmp; tmp = tmp->more)
1480	if (check_move_on (tmp, originator))	1452	if (check_move_on (tmp, originator))
1481	return 0;	1453	return 0;
1482	}	1454	}
1483		1455
1484	return op;	1456	return op;
…		…
1494	object tmp, tmp1;	1466	object tmp, tmp1;
1495		1467
1496	/* first search for itself and remove any old instances */	1468	/* first search for itself and remove any old instances */
1497		1469
1498	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1500	tmp->destroy ();	1472	tmp->destroy ();
1501		1473
1502	tmp1 = arch_to_object (archetype::find (arch_string));	1474	tmp1 = arch_to_object (archetype::find (arch_string));
1503		1475
1504	tmp1->x = op->x;	1476	tmp1->x = op->x;
…		…
1507	}	1479	}
1508		1480
1509	object *	1481	object *
1510	object::insert_at (object where, object originator, int flags)	1482	object::insert_at (object where, object originator, int flags)
1511	{	1483	{
		1484	if (where->env)
		1485	return where->env->insert (this);
		1486	else
1512	return where->map->insert (this, where->x, where->y, originator, flags);	1487	return where->map->insert (this, where->x, where->y, originator, flags);
1513	}	1488	}
1514		1489
1515	/*	1490	/*
1516	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1517	* is returned contains nr objects, and the remaining parts contains	1492	* is returned contains nr objects, and the remaining parts contains
…		…
1665	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1640	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1666	free (dump);	1641	free (dump);
1667	return op;	1642	return op;
1668	}	1643	}
1669		1644
1670	if (where->head)	1645	if (where->head_ () != where)
1671	{	1646	{
1672	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");	1647	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1673	where = where->head;	1648	where = where->head;
1674	}	1649	}
1675		1650
…		…
1685	* be != op, if items are merged. -Tero	1660	* be != op, if items are merged. -Tero
1686	*/	1661	*/
1687	object *	1662	object *
1688	object::insert (object *op)	1663	object::insert (object *op)
1689	{	1664	{
1690	object tmp, otmp;
1691
1692	if (!QUERY_FLAG (op, FLAG_REMOVED))	1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1693	op->remove ();	1666	op->remove ();
1694		1667
1695	if (op->more)	1668	if (op->more)
1696	{	1669	{
…		…
1698	return op;	1671	return op;
1699	}	1672	}
1700		1673
1701	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1702	CLEAR_FLAG (op, FLAG_REMOVED);	1675	CLEAR_FLAG (op, FLAG_REMOVED);
		1676
1703	if (op->nrof)	1677	if (op->nrof)
1704	{	1678	{
1705	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1679	for (object *tmp = inv; tmp; tmp = tmp->below)
1706	if (object::can_merge (tmp, op))	1680	if (object::can_merge (tmp, op))
1707	{	1681	{
1708	/* return the original object and remove inserted object	1682	/* return the original object and remove inserted object
1709	(client needs the original object) */	1683	(client needs the original object) */
1710	tmp->nrof += op->nrof;	1684	tmp->nrof += op->nrof;
…		…
1729	add_weight (this, op->weight * op->nrof);	1703	add_weight (this, op->weight * op->nrof);
1730	}	1704	}
1731	else	1705	else
1732	add_weight (this, (op->weight + op->carrying));	1706	add_weight (this, (op->weight + op->carrying));
1733		1707
1734	otmp = this->in_player ();	1708	if (object *otmp = this->in_player ())
1735	if (otmp && otmp->contr)
1736	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1737	otmp->update_stats ();	1710	otmp->update_stats ();
1738		1711
		1712	op->owner = 0; // its his/hers now. period.
1739	op->map = 0;	1713	op->map = 0;
1740	op->env = this;	1714	op->env = this;
1741	op->above = 0;	1715	op->above = 0;
1742	op->below = 0;	1716	op->below = 0;
1743	op->x = 0, op->y = 0;	1717	op->x = op->y = 0;
1744		1718
1745	/* reset the light list and los of the players on the map */	1719	/* reset the light list and los of the players on the map */
1746	if ((op->glow_radius != 0) && map)	1720	if (op->glow_radius && map)
1747	{	1721	{
1748	#ifdef DEBUG_LIGHTS	1722	#ifdef DEBUG_LIGHTS
1749	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1750	#endif /* DEBUG_LIGHTS */	1724	#endif /* DEBUG_LIGHTS */
1751	if (map->darkness)	1725	if (map->darkness)
…		…
1985	* activate recursively a flag on an object inventory	1959	* activate recursively a flag on an object inventory
1986	*/	1960	*/
1987	void	1961	void
1988	flag_inv (object *op, int flag)	1962	flag_inv (object *op, int flag)
1989	{	1963	{
1990	if (op->inv)
1991	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1992	{	1965	{
1993	SET_FLAG (tmp, flag);	1966	SET_FLAG (tmp, flag);
1994	flag_inv (tmp, flag);	1967	flag_inv (tmp, flag);
1995	}	1968	}
1996	}	1969	}
1997		1970
1998	/*	1971	/*
1999	* deactivate recursively a flag on an object inventory	1972	* deactivate recursively a flag on an object inventory
2000	*/	1973	*/
2001	void	1974	void
2002	unflag_inv (object *op, int flag)	1975	unflag_inv (object *op, int flag)
2003	{	1976	{
2004	if (op->inv)
2005	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006	{	1978	{
2007	CLEAR_FLAG (tmp, flag);	1979	CLEAR_FLAG (tmp, flag);
2008	unflag_inv (tmp, flag);	1980	unflag_inv (tmp, flag);
2009	}	1981	}
2010	}	1982	}
2011		1983
2012	/*	1984	/*
2013	* find_free_spot(object, map, x, y, start, stop) will search for	1985	* find_free_spot(object, map, x, y, start, stop) will search for
2014	* a spot at the given map and coordinates which will be able to contain	1986	* a spot at the given map and coordinates which will be able to contain
…		…
2016	* to search (see the freearr_x/y[] definition).	1988	* to search (see the freearr_x/y[] definition).
2017	* It returns a random choice among the alternatives found.	1989	* It returns a random choice among the alternatives found.
2018	* start and stop are where to start relative to the free_arr array (1,9	1990	* start and stop are where to start relative to the free_arr array (1,9
2019	* does all 4 immediate directions). This returns the index into the	1991	* does all 4 immediate directions). This returns the index into the
2020	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1992	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2021	* Note - this only checks to see if there is space for the head of the
2022	* object - if it is a multispace object, this should be called for all
2023	* pieces.
2024	* Note2: This function does correctly handle tiled maps, but does not	1993	* Note: This function does correctly handle tiled maps, but does not
2025	* inform the caller. However, insert_ob_in_map will update as	1994	* inform the caller. However, insert_ob_in_map will update as
2026	* necessary, so the caller shouldn't need to do any special work.	1995	* necessary, so the caller shouldn't need to do any special work.
2027	* Note - updated to take an object instead of archetype - this is necessary	1996	* Note - updated to take an object instead of archetype - this is necessary
2028	* because arch_blocked (now ob_blocked) needs to know the movement type	1997	* because arch_blocked (now ob_blocked) needs to know the movement type
2029	* to know if the space in question will block the object. We can't use	1998	* to know if the space in question will block the object. We can't use
…		…
2031	* customized, changed states, etc.	2000	* customized, changed states, etc.
2032	*/	2001	*/
2033	int	2002	int
2034	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2003	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2035	{	2004	{
		2005	int altern[SIZEOFFREE];
2036	int index = 0, flag;	2006	int index = 0, flag;
2037	int altern[SIZEOFFREE];
2038		2007
2039	for (int i = start; i < stop; i++)	2008	for (int i = start; i < stop; i++)
2040	{	2009	{
2041	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2010	mapxy pos (m, x, y); pos.move (i);
2042	if (!flag)	2011
		2012	if (!pos.normalise ())
		2013	continue;
		2014
		2015	mapspace &ms = *pos;
		2016
		2017	if (ms.flags () & P_IS_ALIVE)
		2018	continue;
		2019
		2020	/* However, often
		2021	* ob doesn't have any move type (when used to place exits)
		2022	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2023	*/
		2024	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2025	{
2043	altern [index++] = i;	2026	altern [index++] = i;
		2027	continue;
		2028	}
2044		2029
2045	/* Basically, if we find a wall on a space, we cut down the search size.	2030	/* Basically, if we find a wall on a space, we cut down the search size.
2046	* In this way, we won't return spaces that are on another side of a wall.	2031	* In this way, we won't return spaces that are on another side of a wall.
2047	* This mostly work, but it cuts down the search size in all directions -	2032	* This mostly work, but it cuts down the search size in all directions -
2048	* if the space being examined only has a wall to the north and empty	2033	* if the space being examined only has a wall to the north and empty
2049	* spaces in all the other directions, this will reduce the search space	2034	* spaces in all the other directions, this will reduce the search space
2050	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2051	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2052	*/	2037	*/
2053	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2038	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2039	{
2054	stop = maxfree[i];	2040	stop = maxfree[i];
		2041	continue;
		2042	}
		2043
		2044	/* Note it is intentional that we check ob - the movement type of the
		2045	* head of the object should correspond for the entire object.
		2046	*/
		2047	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2048	continue;
		2049
		2050	if (ob->blocked (m, pos.x, pos.y))
		2051	continue;
		2052
		2053	altern [index++] = i;
2055	}	2054	}
2056		2055
2057	if (!index)	2056	if (!index)
2058	return -1;	2057	return -1;
2059		2058
…		…
2068	*/	2067	*/
2069	int	2068	int
2070	find_first_free_spot (const object ob, maptile m, int x, int y)	2069	find_first_free_spot (const object ob, maptile m, int x, int y)
2071	{	2070	{
2072	for (int i = 0; i < SIZEOFFREE; i++)	2071	for (int i = 0; i < SIZEOFFREE; i++)
2073	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2072	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074	return i;	2073	return i;
2075		2074
2076	return -1;	2075	return -1;
2077	}	2076	}
2078		2077
…		…
2132	object *tmp;	2131	object *tmp;
2133	maptile *mp;	2132	maptile *mp;
2134		2133
2135	MoveType blocked, move_type;	2134	MoveType blocked, move_type;
2136		2135
2137	if (exclude && exclude->head)	2136	if (exclude && exclude->head_ () != exclude)
2138	{	2137	{
2139	exclude = exclude->head;	2138	exclude = exclude->head;
2140	move_type = exclude->move_type;	2139	move_type = exclude->move_type;
2141	}	2140	}
2142	else	2141	else
…		…
2165	max = maxfree[i];	2164	max = maxfree[i];
2166	else if (mflags & P_IS_ALIVE)	2165	else if (mflags & P_IS_ALIVE)
2167	{	2166	{
2168	for (tmp = ms.bot; tmp; tmp = tmp->above)	2167	for (tmp = ms.bot; tmp; tmp = tmp->above)
2169	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2168	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2170	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2169	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171	break;	2170	break;
2172		2171
2173	if (tmp)	2172	if (tmp)
2174	return freedir[i];	2173	return freedir[i];
2175	}	2174	}
…		…
2355	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2354	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356	* core dumps if they do.	2355	* core dumps if they do.
2357	*	2356	*
2358	* Add a check so we can't pick up invisible objects (0.93.8)	2357	* Add a check so we can't pick up invisible objects (0.93.8)
2359	*/	2358	*/
2360
2361	int	2359	int
2362	can_pick (const object who, const object item)	2360	can_pick (const object who, const object item)
2363	{	2361	{
2364	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2362	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2370	* create clone from object to another	2368	* create clone from object to another
2371	*/	2369	*/
2372	object *	2370	object *
2373	object_create_clone (object *asrc)	2371	object_create_clone (object *asrc)
2374	{	2372	{
2375	object dst = 0, tmp, src, part, prev, item;	2373	object dst = 0, tmp, src, prev, *item;
2376		2374
2377	if (!asrc)	2375	if (!asrc)
2378	return 0;	2376	return 0;
2379		2377
2380	src = asrc;
2381	if (src->head)
2382	src = src->head;	2378	src = asrc->head_ ();
2383		2379
2384	prev = 0;	2380	prev = 0;
2385	for (part = src; part; part = part->more)	2381	for (object *part = src; part; part = part->more)
2386	{	2382	{
2387	tmp = part->clone ();	2383	tmp = part->clone ();
2388	tmp->x -= src->x;	2384	tmp->x -= src->x;
2389	tmp->y -= src->y;	2385	tmp->y -= src->y;
2390		2386
…		…
2503	/* Basically, if the archetype has this key set,	2499	/* Basically, if the archetype has this key set,
2504	* we need to store the null value so when we save	2500	* we need to store the null value so when we save
2505	* it, we save the empty value so that when we load,	2501	* it, we save the empty value so that when we load,
2506	* we get this value back again.	2502	* we get this value back again.
2507	*/	2503	*/
2508	if (get_ob_key_link (&op->arch->clone, canonical_key))	2504	if (get_ob_key_link (op->arch, canonical_key))
2509	field->value = 0;	2505	field->value = 0;
2510	else	2506	else
2511	{	2507	{
2512	if (last)	2508	if (last)
2513	last->next = field->next;	2509	last->next = field->next;
…		…
2582	}	2578	}
2583	else	2579	else
2584	item = item->env;	2580	item = item->env;
2585	}	2581	}
2586		2582
2587
2588	const char *	2583	const char *
2589	object::flag_desc (char *desc, int len) const	2584	object::flag_desc (char *desc, int len) const
2590	{	2585	{
2591	char *p = desc;	2586	char *p = desc;
2592	bool first = true;	2587	bool first = true;
…		…
2619	{	2614	{
2620	char flagdesc[512];	2615	char flagdesc[512];
2621	char info2[256 * 4];	2616	char info2[256 * 4];
2622	char *p = info;	2617	char *p = info;
2623		2618
2624	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2619	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2625	count, uuid.seq,	2620	count,
		2621	uuid.c_str (),
2626	&name,	2622	&name,
2627	title ? "\",title:\"" : "",	2623	title ? "\",title:\"" : "",
2628	title ? (const char *)title : "",	2624	title ? (const char *)title : "",
2629	flag_desc (flagdesc, 512), type);	2625	flag_desc (flagdesc, 512), type);
2630		2626
2631	if (env)	2627	if (!this->flag[FLAG_REMOVED] && env)
2632	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633		2629
2634	if (map)	2630	if (map)
2635	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2631	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636		2632
…		…
2654	}	2650	}
2655		2651
2656	const materialtype_t *	2652	const materialtype_t *
2657	object::dominant_material () const	2653	object::dominant_material () const
2658	{	2654	{
2659	if (materialtype_t *mat = name_to_material (materialname))	2655	if (materialtype_t *mt = name_to_material (materialname))
2660	return mat;	2656	return mt;
2661		2657
2662	// omfg this is slow, this has to be temporary :)
2663	shstr unknown ("unknown");
2664
2665	return name_to_material (unknown);	2658	return name_to_material (shstr_unknown);
2666	}	2659	}
2667		2660
2668	void	2661	void
2669	object::open_container (object *new_container)	2662	object::open_container (object *new_container)
2670	{	2663	{
…		…
2686	old_container->flag [FLAG_APPLIED] = 0;	2679	old_container->flag [FLAG_APPLIED] = 0;
2687	container = 0;	2680	container = 0;
2688		2681
2689	esrv_update_item (UPD_FLAGS, this, old_container);	2682	esrv_update_item (UPD_FLAGS, this, old_container);
2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2683	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2684	play_sound (sound_find ("chest_close"));
2691	}	2685	}
2692		2686
2693	if (new_container)	2687	if (new_container)
2694	{	2688	{
2695	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2689	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2711	new_container->flag [FLAG_APPLIED] = 1;	2705	new_container->flag [FLAG_APPLIED] = 1;
2712	container = new_container;	2706	container = new_container;
2713		2707
2714	esrv_update_item (UPD_FLAGS, this, new_container);	2708	esrv_update_item (UPD_FLAGS, this, new_container);
2715	esrv_send_inventory (this, new_container);	2709	esrv_send_inventory (this, new_container);
		2710	play_sound (sound_find ("chest_open"));
		2711	}
		2712	}
		2713
		2714	object *
		2715	object::force_find (const shstr name)
		2716	{
		2717	/* cycle through his inventory to look for the MARK we want to
		2718	* place
		2719	*/
		2720	for (object *tmp = inv; tmp; tmp = tmp->below)
		2721	if (tmp->type == FORCE && tmp->slaying == name)
		2722	return splay (tmp);
		2723
		2724	return 0;
		2725	}
		2726
		2727	void
		2728	object::force_add (const shstr name, int duration)
		2729	{
		2730	if (object *force = force_find (name))
		2731	force->destroy ();
		2732
		2733	object *force = get_archetype (FORCE_NAME);
		2734
		2735	force->slaying = name;
		2736	force->stats.food = 1;
		2737	force->speed_left = -1.f;
		2738
		2739	force->set_speed (duration ? 1.f / duration : 0.f);
		2740	force->flag [FLAG_IS_USED_UP] = true;
		2741	force->flag [FLAG_APPLIED] = true;
		2742
		2743	insert (force);
		2744	}
		2745
		2746	void
		2747	object::play_sound (faceidx sound) const
		2748	{
		2749	if (!sound)
		2750	return;
		2751
		2752	if (flag [FLAG_REMOVED])
		2753	return;
		2754
		2755	if (env)
2716	}	2756	{
		2757	if (object *pl = in_player ())
		2758	pl->contr->play_sound (sound);
		2759	}
		2760	else
		2761	map->play_sound (sound, x, y);
2717	}	2762	}
2718		2763
2719

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.153 by root, Thu May 17 21:11:01 2007 UTC vs. Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.153 by root, Thu May 17 21:11:01 2007 UTC vs.
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC