ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.51 by root, Sun Sep 17 16:21:53 2006 UTC

1	/*
2	* static char *rcsid_object_c =
3	* "$Id: object.C,v 1.14 2006/09/04 11:07:59 root Exp $";
4	*/
5
6	/*	1	/*
7	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
8		3
9	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
21		16
22	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
23	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
24	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25		20
26	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
27	*/	22	*/
28		23
29	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
30	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
31	variable. */	26	variable. */
32	#include <global.h>	27	#include <global.h>
33	#ifndef WIN32 /* ---win32 exclude headers */
34	#include <stdio.h>	28	#include <stdio.h>
35	#include <sys/types.h>	29	#include <sys/types.h>
36	#include <sys/uio.h>	30	#include <sys/uio.h>
37	#endif /* win32 */
38	#include <object.h>	31	#include <object.h>
39	#include <funcpoint.h>	32	#include <funcpoint.h>
40	#include <skills.h>
41	#include <loader.h>	33	#include <loader.h>
		34
42	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
43		38
44	object *objects; /* Pointer to the list of used objects */
45	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
46		40
47	short freearr_x[SIZEOFFREE]=	41	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,
48	{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,
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};	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	short freearr_y[SIZEOFFREE]=	43	};
51	{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,	44	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,
52	-3,-3,-3,-3,-2,-1,0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3};	45	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	int maxfree[SIZEOFFREE]=	46	};
54	{0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45,	47	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,
55	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};	48	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
		49	};
56	int freedir[SIZEOFFREE]= {	50	int freedir[SIZEOFFREE] = {
57	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,	51	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,
58	1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8};	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		53	};
59		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
60		131
61	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
		133	static int
62	static int compare_ob_value_lists_one(const object * wants, const object * has) {	134	compare_ob_value_lists_one (const object *wants, const object *has)
		135	{
63	key_value * wants_field;	136	key_value *wants_field;
64		137
65	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	138	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
66	* objects with lists are rare, and lists stay short. If not, use a	139	* objects with lists are rare, and lists stay short. If not, use a
67	* different structure or at least keep the lists sorted...	140	* different structure or at least keep the lists sorted...
68	*/	141	*/
69		142
70	/* For each field in wants, */	143	/* For each field in wants, */
71	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) {	144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)
		145	{
72	key_value * has_field;	146	key_value *has_field;
73		147
74	/* Look for a field in has with the same key. */	148	/* Look for a field in has with the same key. */
75	has_field = get_ob_key_link(has, wants_field->key);	149	has_field = get_ob_key_link (has, wants_field->key);
		150
		151	if (has_field == NULL)
76		152	{
77	if (has_field == NULL) {
78	/* No field with that name. */	153	/* No field with that name. */
79	return FALSE;	154	return FALSE;
80	}
81		155	}
		156
82	/* Found the matching field. */	157	/* Found the matching field. */
83	if (has_field->value != wants_field->value) {	158	if (has_field->value != wants_field->value)
		159	{
84	/* Values don't match, so this half of the comparison is false. */	160	/* Values don't match, so this half of the comparison is false. */
85	return FALSE;	161	return FALSE;
86	}	162	}
87		163
88	/* If we get here, we found a match. Now for the next field in wants. */	164	/* If we get here, we found a match. Now for the next field in wants. */
89	}
90		165	}
		166
91	/* If we get here, every field in wants has a matching field in has. */	167	/* If we get here, every field in wants has a matching field in has. */
92	return TRUE;	168	return TRUE;
93	}	169	}
94		170
95	/* Returns TRUE if ob1 has the same key_values as ob2. */	171	/* Returns TRUE if ob1 has the same key_values as ob2. */
		172	static int
96	static int compare_ob_value_lists(const object * ob1, const object * ob2) {	173	compare_ob_value_lists (const object *ob1, const object *ob2)
		174	{
97	/* However, there may be fields in has which aren't partnered in wants,	175	/* However, there may be fields in has which aren't partnered in wants,
98	* so we need to run the comparison *twice*. :(	176	* so we need to run the comparison *twice*. :(
99	*/	177	*/
100	return compare_ob_value_lists_one(ob1, ob2) && compare_ob_value_lists_one(ob2, ob1);	178	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);
101	}	179	}
102		180
103	/* Function examines the 2 objects given to it, and returns true if	181	/* Function examines the 2 objects given to it, and returns true if
104	* they can be merged together.	182	* they can be merged together.
105	*	183	*
…		…
111	*	189	*
112	* Improvements made with merge: Better checking on potion, and also	190	* Improvements made with merge: Better checking on potion, and also
113	* check weight	191	* check weight
114	*/	192	*/
115		193
116	int CAN_MERGE(object *ob1, object *ob2) {	194	bool object::can_merge (object *ob1, object *ob2)
117		195	{
118	/* A couple quicksanity checks */	196	/* A couple quicksanity checks */
119	if ((ob1 == ob2) || (ob1->type != ob2->type)) return 0;	197	if ((ob1 == ob2) || (ob1->type != ob2->type))
		198	return 0;
120		199
121	if (ob1->speed != ob2->speed) return 0;	200	if (ob1->speed != ob2->speed)
122	/* Note sure why the following is the case - either the object has to	201	return 0;
123	* be animated or have a very low speed. Is this an attempted monster	202
124	* check?	203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
		204	* value could not be stored in a sint32 (which unfortunately sometimes is
		205	* used to store nrof).
125	*/	206	*/
126	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)	207	if (ob1->nrof + ob2->nrof >= 1UL << 31)
		208	return 0;
		209
		210	/* If the objects have been identified, set the BEEN_APPLIED flag.
		211	* This is to the comparison of the flags below will be OK. We
		212	* just can't ignore the been applied or identified flags, as they
		213	* are not equal - just if it has been identified, the been_applied
		214	* flags lose any meaning.
		215	*/
		216	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
		217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
		218
		219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
		220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
		221
		222
		223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
		224	* being locked in inventory should prevent merging.
		225	* 0x4 in flags3 is CLIENT_SENT
		226	*/
		227	if ((ob1->arch != ob2->arch) ||
		228	(ob1->flags[0] != ob2->flags[0]) ||
		229	(ob1->flags[1] != ob2->flags[1]) ||
		230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
		231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
		232	(ob1->name != ob2->name) ||
		233	(ob1->title != ob2->title) ||
		234	(ob1->msg != ob2->msg) ||
		235	(ob1->weight != ob2->weight) ||
		236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
		237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
		238	(ob1->attacktype != ob2->attacktype) ||
		239	(ob1->magic != ob2->magic) ||
		240	(ob1->slaying != ob2->slaying) ||
		241	(ob1->skill != ob2->skill) ||
		242	(ob1->value != ob2->value) ||
		243	(ob1->animation_id != ob2->animation_id) ||
		244	(ob1->client_type != ob2->client_type) ||
		245	(ob1->materialname != ob2->materialname) ||
		246	(ob1->lore != ob2->lore) ||
		247	(ob1->subtype != ob2->subtype) ||
		248	(ob1->move_type != ob2->move_type) ||
		249	(ob1->move_block != ob2->move_block) ||
		250	(ob1->move_allow != ob2->move_allow) ||
		251	(ob1->move_on != ob2->move_on) ||
		252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))
		253	return 0;
		254
		255	/* This is really a spellbook check - really, we should
		256	* check all objects in the inventory.
		257	*/
		258	if (ob1->inv || ob2->inv)
		259	{
		260	/* if one object has inventory but the other doesn't, not equiv */
		261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
127	return 0;	262	return 0;
128		263
129	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	264	/* Now check to see if the two inventory objects could merge */
130	* value could not be stored in a sint32 (which unfortunately sometimes is	265	if (!CAN_MERGE (ob1->inv, ob2->inv))
131	* used to store nrof).
132	*/
133	if (ob1->nrof+ob2->nrof >= 1UL<<31)
134	return 0;	266	return 0;
135		267
136	/* This is really a spellbook check - really, we should
137	* check all objects in the inventory.
138	*/
139	if (ob1->inv || ob2->inv) {
140	/* if one object has inventory but the other doesn't, not equiv */
141	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;
142
143	/* Now check to see if the two inventory objects could merge */
144	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;
145
146	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
147	* if it is valid.	269	* if it is valid.
148	*/	270	*/
149	}	271	}
150		272
151	/* If the objects have been identified, set the BEEN_APPLIED flag.
152	* This is to the comparison of the flags below will be OK. We
153	* just can't ignore the been applied or identified flags, as they
154	* are not equal - just if it has been identified, the been_applied
155	* flags lose any meaning.
156	*/
157	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))
158	SET_FLAG(ob1, FLAG_BEEN_APPLIED);
159
160	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))
161	SET_FLAG(ob2, FLAG_BEEN_APPLIED);
162
163
164	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
165	* being locked in inventory should prevent merging.
166	* 0x4 in flags3 is CLIENT_SENT
167	*/
168	if ((ob1->arch != ob2->arch) ||
169	(ob1->flags[0] != ob2->flags[0]) ||
170	(ob1->flags[1] != ob2->flags[1]) ||
171	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||
172	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
173	(ob1->name != ob2->name) ||
174	(ob1->title != ob2->title) ||
175	(ob1->msg != ob2->msg) ||
176	(ob1->weight != ob2->weight) ||
177	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||
178	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||
179	(ob1->attacktype != ob2->attacktype) ||
180	(ob1->magic != ob2->magic) ||
181	(ob1->slaying != ob2->slaying) ||
182	(ob1->skill != ob2->skill) ||
183	(ob1->value != ob2->value) ||
184	(ob1->animation_id != ob2->animation_id) ||
185	(ob1->client_type != ob2->client_type) ||
186	(ob1->materialname != ob2->materialname) ||
187	(ob1->lore != ob2->lore) ||
188	(ob1->subtype != ob2->subtype) ||
189	(ob1->move_type != ob2->move_type) ||
190	(ob1->move_block != ob2->move_block) ||
191	(ob1->move_allow != ob2->move_allow) ||
192	(ob1->move_on != ob2->move_on) ||
193	(ob1->move_off != ob2->move_off) ||
194	(ob1->move_slow != ob2->move_slow) ||
195	(ob1->move_slow_penalty != ob2->move_slow_penalty)
196	)
197	return 0;
198
199	/* Don't merge objects that are applied. With the new 'body' code,	273	/* Don't merge objects that are applied. With the new 'body' code,
200	* it is possible for most any character to have more than one of	274	* it is possible for most any character to have more than one of
201	* some items equipped, and we don't want those to merge.	275	* some items equipped, and we don't want those to merge.
202	*/	276	*/
203	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))	277	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))
		278	return 0;
		279
		280	/* Note sure why the following is the case - either the object has to
		281	* be animated or have a very low speed. Is this an attempted monster
		282	* check?
		283	*/
		284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
		285	return 0;
		286
		287	switch (ob1->type)
		288	{
		289	case SCROLL:
		290	if (ob1->level != ob2->level)
		291	return 0;
		292	break;
		293	}
		294
		295	if (ob1->key_values != NULL || ob2->key_values != NULL)
		296	{
		297	/* At least one of these has key_values. */
		298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))
		299	/* One has fields, but the other one doesn't. */
204	return 0;	300	return 0;
205
206	switch (ob1->type) {
207	case SCROLL:
208	if (ob1->level != ob2->level) return 0;
209	break;
210
211	}
212	if (ob1->key_values != NULL || ob2->key_values != NULL) {
213	/* At least one of these has key_values. */
214	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {
215	/* One has fields, but the other one doesn't. */
216	return 0;
217	} else if (!compare_ob_value_lists(ob1, ob2)) {	301	else if (!compare_ob_value_lists (ob1, ob2))
218	return 0;	302	return 0;
219	}	303	}
		304
		305	//TODO: generate an event or call into perl for additional checks
		306	if (ob1->self || ob2->self)
220	}	307	{
		308	ob1->optimise ();
		309	ob2->optimise ();
221		310
		311	if (ob1->self || ob2->self)
		312	return 0;
		313	}
		314
222	/* Everything passes, must be OK. */	315	/* Everything passes, must be OK. */
223	return 1;	316	return 1;
224	}	317	}
225		318
226	/*	319	/*
227	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
228	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
229	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
230	*/	323	*/
231	signed long sum_weight(object *op) {	324	long
		325	sum_weight (object *op)
		326	{
232	signed long sum;	327	long sum;
233	object *inv;	328	object *inv;
		329
234	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
		331	{
235	if (inv->inv)	332	if (inv->inv)
236	sum_weight(inv);	333	sum_weight (inv);
237	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
238	}	335	}
		336
239	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
240	sum = (sum * (100 - op->stats.Str))/100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
241	if(op->carrying != sum)	340	if (op->carrying != sum)
242	op->carrying = sum;	341	op->carrying = sum;
		342
243	return sum;	343	return sum;
244	}	344	}
245		345
246	/**	346	/**
247	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
248	*/	348	*/
249		349
		350	object *
250	object *object_get_env_recursive (object *op) {	351	object_get_env_recursive (object *op)
		352	{
251	while (op->env != NULL)	353	while (op->env != NULL)
252	op = op->env;	354	op = op->env;
253	return op;	355	return op;
254	}	356	}
255		357
256	/*	358	/*
257	* Eneq(@csd.uu.se): Since we can have items buried in a character we need	359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
258	* a better check. We basically keeping traversing up until we can't	360	* a better check. We basically keeping traversing up until we can't
259	* or find a player.	361	* or find a player.
260	*/	362	*/
261		363
		364	object *
262	object *is_player_inv (object *op) {	365	is_player_inv (object *op)
		366	{
263	for (;op!=NULL&&op->type!=PLAYER; op=op->env)	367	for (; op != NULL && op->type != PLAYER; op = op->env)
264	if (op->env==op)	368	if (op->env == op)
265	op->env = NULL;	369	op->env = NULL;
266	return op;	370	return op;
267	}	371	}
268		372
269	/*	373	/*
270	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
271	* Some error messages.	375	* Some error messages.
272	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
273	*/	377	*/
274		378
		379	void
275	void dump_object2(object *op) {	380	dump_object2 (object *op)
		381	{
276	errmsg[0] = 0;	382	errmsg[0] = 0;
277	return;	383	return;
278	//TODO//D#d#	384	//TODO//D#d#
279	#if 0	385	#if 0
280	char *cp;	386	char *cp;
		387
281	/* object *tmp;*/	388	/* object *tmp;*/
282		389
283	if(op->arch!=NULL) {	390	if (op->arch != NULL)
		391	{
284	strcat(errmsg,"arch ");	392	strcat (errmsg, "arch ");
285	strcat(errmsg,op->arch->name?op->arch->name:"(null)");	393	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
286	strcat(errmsg,"\n");	394	strcat (errmsg, "\n");
287	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	395	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
288	strcat(errmsg,cp);	396	strcat (errmsg, cp);
289	#if 0	397	# if 0
290	/* Don't dump player diffs - they are too long, mostly meaningless, and	398	/* Don't dump player diffs - they are too long, mostly meaningless, and
291	* will overflow the buffer.	399	* will overflow the buffer.
292	* Changed so that we don't dump inventory either. This may	400	* Changed so that we don't dump inventory either. This may
293	* also overflow the buffer.	401	* also overflow the buffer.
294	*/	402	*/
295	if(op->type!=PLAYER && (cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	403	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
296	strcat(errmsg,cp);	404	strcat (errmsg, cp);
297	for (tmp=op->inv; tmp; tmp=tmp->below)	405	for (tmp = op->inv; tmp; tmp = tmp->below)
298	dump_object2(tmp);	406	dump_object2 (tmp);
		407	# endif
		408	strcat (errmsg, "end\n");
		409	}
		410	else
		411	{
		412	strcat (errmsg, "Object ");
		413	if (op->name == NULL)
		414	strcat (errmsg, "(null)");
		415	else
		416	strcat (errmsg, op->name);
		417	strcat (errmsg, "\n");
		418	# if 0
		419	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
		420	strcat (errmsg, cp);
		421	for (tmp = op->inv; tmp; tmp = tmp->below)
		422	dump_object2 (tmp);
		423	# endif
		424	strcat (errmsg, "end\n");
		425	}
299	#endif	426	#endif
300	strcat(errmsg,"end\n");
301	} else {
302	strcat(errmsg,"Object ");
303	if (op->name==NULL) strcat(errmsg, "(null)");
304	else strcat(errmsg,op->name);
305	strcat(errmsg,"\n");
306	#if 0
307	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
308	strcat(errmsg,cp);
309	for (tmp=op->inv; tmp; tmp=tmp->below)
310	dump_object2(tmp);
311	#endif
312	strcat(errmsg,"end\n");
313	}
314	#endif
315	}	427	}
316		428
317	/*	429	/*
318	* Dumps an object. Returns output in the static global errmsg array.	430	* Dumps an object. Returns output in the static global errmsg array.
319	*/	431	*/
320		432
		433	void
321	void dump_object(object *op) {	434	dump_object (object *op)
		435	{
322	if(op==NULL) {	436	if (op == NULL)
		437	{
323	strcpy(errmsg,"[NULL pointer]");	438	strcpy (errmsg, "[NULL pointer]");
324	return;	439	return;
325	}	440	}
326	errmsg[0]='\0';	441	errmsg[0] = '\0';
327	dump_object2(op);	442	dump_object2 (op);
328	}	443	}
329		444
		445	void
330	void dump_all_objects(void) {	446	dump_all_objects (void)
		447	{
331	object *op;	448	object *op;
		449
332	for(op=objects;op!=NULL;op=op->next) {	450	for (op = object::first; op != NULL; op = op->next)
		451	{
333	dump_object(op);	452	dump_object (op);
334	fprintf(logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %s\n", errmsg);
335	}	454	}
336	}	455	}
337		456
338	/*	457	/*
339	* get_nearest_part(multi-object, object 2) returns the part of the	458	* get_nearest_part(multi-object, object 2) returns the part of the
340	* multi-object 1 which is closest to the second object.	459	* multi-object 1 which is closest to the second object.
341	* If it's not a multi-object, it is returned.	460	* If it's not a multi-object, it is returned.
342	*/	461	*/
343		462
		463	object *
344	object *get_nearest_part(object *op, const object *pl) {	464	get_nearest_part (object *op, const object *pl)
		465	{
345	object *tmp,*closest;	466	object *tmp, *closest;
346	int last_dist,i;	467	int last_dist, i;
		468
347	if(op->more==NULL)	469	if (op->more == NULL)
348	return op;	470	return op;
349	for(last_dist=distance(op,pl),closest=op,tmp=op->more;tmp!=NULL;tmp=tmp->more)	471	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
350	if((i=distance(tmp,pl))<last_dist)	472	if ((i = distance (tmp, pl)) < last_dist)
351	closest=tmp,last_dist=i;	473	closest = tmp, last_dist = i;
352	return closest;	474	return closest;
353	}	475	}
354		476
355	/*	477	/*
356	* Returns the object which has the count-variable equal to the argument.	478	* Returns the object which has the count-variable equal to the argument.
357	*/	479	*/
358		480
		481	object *
359	object *find_object(tag_t i) {	482	find_object (tag_t i)
		483	{
360	object *op;	484	object *op;
		485
361	for(op=objects;op!=NULL;op=op->next)	486	for (op = object::first; op != NULL; op = op->next)
362	if(op->count==i)	487	if (op->count == i)
363	break;	488	break;
		489
364	return op;	490	return op;
365	}	491	}
366		492
367	/*	493	/*
368	* Returns the first object which has a name equal to the argument.	494	* Returns the first object which has a name equal to the argument.
369	* Used only by the patch command, but not all that useful.	495	* Used only by the patch command, but not all that useful.
370	* Enables features like "patch <name-of-other-player> food 999"	496	* Enables features like "patch <name-of-other-player> food 999"
371	*/	497	*/
372		498
		499	object *
373	object *find_object_name(const char *str) {	500	find_object_name (const char *str)
374	const char *name = shstr::find (str);	501	{
		502	shstr_cmp str_ (str);
375	object *op;	503	object *op;
		504
376	for(op=objects;op!=NULL;op=op->next)	505	for (op = object::first; op != NULL; op = op->next)
377	if(&op->name == name)	506	if (op->name == str_)
378	break;	507	break;
379		508
380	return op;	509	return op;
381	}	510	}
382		511
		512	void
383	void free_all_object_data ()	513	free_all_object_data ()
384	{	514	{
385	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	515	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
386	}
387
388	/*
389	* Returns the object which this object marks as being the owner.
390	* A id-scheme is used to avoid pointing to objects which have been
391	* freed and are now reused. If this is detected, the owner is
392	* set to NULL, and NULL is returned.
393	* Changed 2004-02-12 - if the player is setting at the play again
394	* prompt, he is removed, and we don't want to treat him as an owner of
395	* anything, so check removed flag. I don't expect that this should break
396	* anything - once an object is removed, it is basically dead anyways.
397	*/
398
399	object *get_owner(object *op) {
400	if(op->owner==NULL)
401	return NULL;
402
403	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
404	op->owner->count==op->ownercount)
405	return op->owner;
406
407	op->owner=NULL;
408	op->ownercount=0;
409	return NULL;
410	}
411
412	void clear_owner(object *op)
413	{
414	if (!op) return;
415
416	if (op->owner && op->ownercount == op->owner->count)
417	op->owner->refcount--;
418
419	op->owner = NULL;
420	op->ownercount = 0;
421	}	516	}
422		517
423	/*	518	/*
424	* Sets the owner and sets the skill and exp pointers to owner's current	519	* Sets the owner and sets the skill and exp pointers to owner's current
425	* skill and experience objects.	520	* skill and experience objects.
426	*/	521	*/
427	void set_owner (object *op, object *owner)	522	void
		523	object::set_owner (object *owner)
428	{	524	{
429	if(owner==NULL||op==NULL)	525	if (!owner)
430	return;	526	return;
431		527
432	/* next line added to allow objects which own objects */	528	/* next line added to allow objects which own objects */
433	/* Add a check for ownercounts in here, as I got into an endless loop	529	/* Add a check for ownercounts in here, as I got into an endless loop
434	* with the fireball owning a poison cloud which then owned the	530	* with the fireball owning a poison cloud which then owned the
435	* fireball. I believe that was caused by one of the objects getting	531	* fireball. I believe that was caused by one of the objects getting
436	* freed and then another object replacing it. Since the ownercounts	532	* freed and then another object replacing it. Since the ownercounts
437	* didn't match, this check is valid and I believe that cause is valid.	533	* didn't match, this check is valid and I believe that cause is valid.
438	*/	534	*/
439	while (owner->owner && owner!=owner->owner &&	535	while (owner->owner)
440	owner->ownercount==owner->owner->count) owner=owner->owner;	536	owner = owner->owner;
441		537
442	/* IF the owner still has an owner, we did not resolve to a final owner.
443	* so lets not add to that.
444	*/
445	if (owner->owner) return;
446
447	op->owner=owner;	538	this->owner = owner;
448
449	op->ownercount=owner->count;
450	owner->refcount++;
451
452	}
453
454	/* Set the owner to clone's current owner and set the skill and experience
455	* objects to clone's objects (typically those objects that where the owner's
456	* current skill and experience objects at the time when clone's owner was
457	* set - not the owner's current skill and experience objects).
458	*
459	* Use this function if player created an object (e.g. fire bullet, swarm
460	* spell), and this object creates further objects whose kills should be
461	* accounted for the player's original skill, even if player has changed
462	* skills meanwhile.
463	*/
464	void copy_owner (object *op, object *clone)
465	{
466	object *owner = get_owner (clone);
467	if (owner == NULL) {
468	/* players don't have owners - they own themselves. Update
469	* as appropriate.
470	*/
471	if (clone->type == PLAYER) owner=clone;
472	else return;
473	}
474	set_owner(op, owner);
475
476	}	539	}
477		540
478	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
479	* refcounts and freeing the links.	542	* refcounts and freeing the links.
480	*/	543	*/
		544	static void
481	static void free_key_values(object * op)	545	free_key_values (object *op)
482	{	546	{
483	for (key_value *i = op->key_values; i != 0; )	547	for (key_value *i = op->key_values; i != 0;)
484	{	548	{
485	key_value *next = i->next;	549	key_value *next = i->next;
486	delete i;	550	delete i;
		551
487	i = next;	552	i = next;
488	}	553	}
489		554
490	op->key_values = 0;	555	op->key_values = 0;
491	}	556	}
492		557
493	void object::clear ()	558	void object::clear ()
494	{	559	{
495	attachable_base::clear ();	560	attachable_base::clear ();
496		561
497	free_key_values (this);	562	free_key_values (this);
498		563
499	name = 0;	564	owner = 0;
		565	name = 0;
500	name_pl = 0;	566	name_pl = 0;
501	title = 0;	567	title = 0;
502	race = 0;	568	race = 0;
503	slaying = 0;	569	slaying = 0;
504	skill = 0;	570	skill = 0;
505	msg = 0;	571	msg = 0;
506	lore = 0;	572	lore = 0;
507	custom_name = 0;	573	custom_name = 0;
508	materialname = 0;	574	materialname = 0;
		575	contr = 0;
		576	below = 0;
		577	above = 0;
		578	inv = 0;
		579	container = 0;
		580	env = 0;
		581	more = 0;
		582	head = 0;
		583	map = 0;
		584	active_next = 0;
		585	active_prev = 0;
509		586
510	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));	587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
511		588
512	SET_FLAG (this, FLAG_REMOVED);	589	SET_FLAG (this, FLAG_REMOVED);
		590
		591	/* What is not cleared is next, prev, and count */
		592
		593	expmul = 1.0;
		594	face = blank_face;
		595
		596	if (settings.casting_time)
		597	casting_time = -1;
513	}	598	}
514		599
515	void object::clone (object *destination)	600	void object::clone (object *destination)
516	{	601	{
517	*(object_copy *)destination = *(object_copy *)this;	602	*(object_copy *)destination = *this;
518	*(object_pod *)destination = *(object_pod *)this;	603	*(object_pod *)destination = *this;
519		604
520	if (self || cb)	605	if (self || cb)
521	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
522	}
523
524	/*
525	* clear_object() frees everything allocated by an object, and also
526	* clears all variables and flags to default settings.
527	*/
528
529	void clear_object (object *op)
530	{
531	op->clear ();
532
533	op->contr = NULL;
534	op->below = NULL;
535	op->above = NULL;
536	op->inv = NULL;
537	op->container=NULL;
538	op->env=NULL;
539	op->more=NULL;
540	op->head=NULL;
541	op->map=NULL;
542	op->refcount=0;
543	op->active_next = NULL;
544	op->active_prev = NULL;
545	/* What is not cleared is next, prev, and count */
546
547	op->expmul = 1.0;
548	op->face = blank_face;
549	op->attacked_by_count = -1;
550
551	if (settings.casting_time)
552	op->casting_time = -1;
553	}	607	}
554		608
555	/*	609	/*
556	* copy object first frees everything allocated by the second object,	610	* copy object first frees everything allocated by the second object,
557	* and then copies the contends of the first object into the second	611	* and then copies the contends of the first object into the second
558	* object, allocating what needs to be allocated. Basically, any	612	* object, allocating what needs to be allocated. Basically, any
559	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	613	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
560	* if the first object is freed, the pointers in the new object	614	* if the first object is freed, the pointers in the new object
561	* will point at garbage.	615	* will point at garbage.
562	*/	616	*/
563		617	void
564	void copy_object (object *op2, object *op)	618	copy_object (object *op2, object *op)
565	{	619	{
566	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
567	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
568		622
569	op2->clone (op);	623	op2->clone (op);
570		624
		625	if (is_freed)
571	if (is_freed) SET_FLAG (op, FLAG_FREED);	626	SET_FLAG (op, FLAG_FREED);
		627	if (is_removed)
572	if (is_removed) SET_FLAG (op, FLAG_REMOVED);	628	SET_FLAG (op, FLAG_REMOVED);
573		629
574	if (op2->speed < 0)	630	if (op2->speed < 0)
575	op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;	631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
576		632
577	/* Copy over key_values, if any. */	633	/* Copy over key_values, if any. */
578	if (op2->key_values != NULL)	634	if (op2->key_values)
579	{	635	{
580	key_value *tail = NULL;	636	key_value *tail = 0;
581	key_value *i;	637	key_value *i;
582		638
583	op->key_values = NULL;	639	op->key_values = 0;
584		640
585	for (i = op2->key_values; i != NULL; i = i->next)	641	for (i = op2->key_values; i; i = i->next)
586	{	642	{
587	key_value *new_link = new key_value;	643	key_value *new_link = new key_value;
588		644
589	new_link->next = NULL;	645	new_link->next = 0;
590	new_link->key = i->key;	646	new_link->key = i->key;
591	new_link->value = i->value;	647	new_link->value = i->value;
592		648
593	/* Try and be clever here, too. */	649	/* Try and be clever here, too. */
594	if (op->key_values == NULL)	650	if (!op->key_values)
595	{	651	{
596	op->key_values = new_link;	652	op->key_values = new_link;
597	tail = new_link;	653	tail = new_link;
598	}	654	}
599	else	655	else
…		…
606		662
607	update_ob_speed (op);	663	update_ob_speed (op);
608	}	664	}
609		665
610	/*	666	/*
611	* get_object() grabs an object from the list of unused objects, makes
612	* sure it is initialised, and returns it.
613	* If there are no free objects, expand_objects() is called to get more.
614	*/
615
616	object *get_object ()
617	{
618	object *op = new object;
619
620	op->count = ++ob_count;
621
622	op->active_next = 0;
623	op->active_prev = 0;
624
625	op->next = objects;
626	op->prev = 0;
627
628	if (objects)
629	objects->prev = op;
630
631	objects = op;
632
633	SET_FLAG (op, FLAG_REMOVED);
634
635	return op;
636	}
637
638	/*
639	* If an object with the IS_TURNABLE() flag needs to be turned due	667	* If an object with the IS_TURNABLE() flag needs to be turned due
640	* to the closest player being on the other side, this function can	668	* to the closest player being on the other side, this function can
641	* be called to update the face variable, _and_ how it looks on the map.	669	* be called to update the face variable, _and_ how it looks on the map.
642	*/	670	*/
643		671
		672	void
644	void update_turn_face(object *op) {	673	update_turn_face (object *op)
		674	{
645	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)	675	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)
646	return;	676	return;
647	SET_ANIMATION(op, op->direction);	677	SET_ANIMATION (op, op->direction);
648	update_object(op,UP_OBJ_FACE);	678	update_object (op, UP_OBJ_FACE);
649	}	679	}
650		680
651	/*	681	/*
652	* Updates the speed of an object. If the speed changes from 0 to another	682	* Updates the speed of an object. If the speed changes from 0 to another
653	* value, or vice versa, then add/remove the object from the active list.	683	* value, or vice versa, then add/remove the object from the active list.
654	* This function needs to be called whenever the speed of an object changes.	684	* This function needs to be called whenever the speed of an object changes.
655	*/	685	*/
656		686	void
657	void update_ob_speed(object *op) {	687	update_ob_speed (object *op)
		688	{
658	extern int arch_init;	689	extern int arch_init;
659		690
660	/* No reason putting the archetypes objects on the speed list,	691	/* No reason putting the archetypes objects on the speed list,
661	* since they never really need to be updated.	692	* since they never really need to be updated.
662	*/	693	*/
663		694
664	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {	695	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
		696	{
665	LOG(llevError,"Object %s is freed but has speed.\n", &op->name);	697	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
666	#ifdef MANY_CORES	698	#ifdef MANY_CORES
667	abort();	699	abort ();
668	#else	700	#else
669	op->speed = 0;	701	op->speed = 0;
670	#endif	702	#endif
671	}	703	}
		704
672	if (arch_init) {	705	if (arch_init)
		706	return;
		707
		708	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
		709	{
		710	/* If already on active list, don't do anything */
		711	if (op->active_next || op->active_prev || op == active_objects)
673	return;	712	return;
674	}
675	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
676	/* If already on active list, don't do anything */
677	if (op->active_next || op->active_prev || op==active_objects)
678	return;
679		713
680	/* process_events() expects us to insert the object at the beginning	714	/* process_events() expects us to insert the object at the beginning
681	* of the list. */	715	* of the list. */
682	op->active_next = active_objects;	716	op->active_next = active_objects;
		717
683	if (op->active_next!=NULL)	718	if (op->active_next != NULL)
684	op->active_next->active_prev = op;	719	op->active_next->active_prev = op;
		720
685	active_objects = op;	721	active_objects = op;
		722	}
		723	else
686	}	724	{
687	else {
688	/* If not on the active list, nothing needs to be done */	725	/* If not on the active list, nothing needs to be done */
689	if (!op->active_next && !op->active_prev && op!=active_objects)	726	if (!op->active_next && !op->active_prev && op != active_objects)
690	return;	727	return;
691		728
692	if (op->active_prev==NULL) {	729	if (op->active_prev == NULL)
		730	{
693	active_objects = op->active_next;	731	active_objects = op->active_next;
		732
694	if (op->active_next!=NULL)	733	if (op->active_next != NULL)
695	op->active_next->active_prev = NULL;	734	op->active_next->active_prev = NULL;
		735	}
		736	else
696	}	737	{
697	else {
698	op->active_prev->active_next = op->active_next;	738	op->active_prev->active_next = op->active_next;
		739
699	if (op->active_next)	740	if (op->active_next)
700	op->active_next->active_prev = op->active_prev;	741	op->active_next->active_prev = op->active_prev;
701	}	742	}
		743
702	op->active_next = NULL;	744	op->active_next = NULL;
703	op->active_prev = NULL;	745	op->active_prev = NULL;
704	}	746	}
705	}	747	}
706		748
707	/* This function removes object 'op' from the list of active	749	/* This function removes object 'op' from the list of active
708	* objects.	750	* objects.
…		…
710	* reference maps where you don't want an object that isn't	752	* reference maps where you don't want an object that isn't
711	* in play chewing up cpu time getting processed.	753	* in play chewing up cpu time getting processed.
712	* The reverse of this is to call update_ob_speed, which	754	* The reverse of this is to call update_ob_speed, which
713	* will do the right thing based on the speed of the object.	755	* will do the right thing based on the speed of the object.
714	*/	756	*/
		757	void
715	void remove_from_active_list(object *op)	758	remove_from_active_list (object *op)
716	{	759	{
717	/* If not on the active list, nothing needs to be done */	760	/* If not on the active list, nothing needs to be done */
718	if (!op->active_next && !op->active_prev && op!=active_objects)	761	if (!op->active_next && !op->active_prev && op != active_objects)
719	return;	762	return;
720		763
721	if (op->active_prev==NULL) {	764	if (op->active_prev == NULL)
		765	{
722	active_objects = op->active_next;	766	active_objects = op->active_next;
723	if (op->active_next!=NULL)	767	if (op->active_next != NULL)
724	op->active_next->active_prev = NULL;	768	op->active_next->active_prev = NULL;
		769	}
		770	else
725	}	771	{
726	else {
727	op->active_prev->active_next = op->active_next;	772	op->active_prev->active_next = op->active_next;
728	if (op->active_next)	773	if (op->active_next)
729	op->active_next->active_prev = op->active_prev;	774	op->active_next->active_prev = op->active_prev;
730	}	775	}
731	op->active_next = NULL;	776	op->active_next = NULL;
732	op->active_prev = NULL;	777	op->active_prev = NULL;
733	}	778	}
734		779
735	/*	780	/*
736	* update_object() updates the array which represents the map.	781	* update_object() updates the array which represents the map.
737	* It takes into account invisible objects (and represent squares covered	782	* It takes into account invisible objects (and represent squares covered
…		…
752	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
753	* as that is easier than trying to look at what may have changed.	798	* as that is easier than trying to look at what may have changed.
754	* UP_OBJ_FACE: only the objects face has changed.	799	* UP_OBJ_FACE: only the objects face has changed.
755	*/	800	*/
756		801
		802	void
757	void update_object(object *op, int action) {	803	update_object (object *op, int action)
		804	{
758	int update_now=0, flags;	805	int update_now = 0, flags;
759	MoveType move_on, move_off, move_block, move_slow;	806	MoveType move_on, move_off, move_block, move_slow;
760		807
761	if (op == NULL) {	808	if (op == NULL)
		809	{
762	/* this should never happen */	810	/* this should never happen */
763	LOG(llevDebug,"update_object() called for NULL object.\n");	811	LOG (llevDebug, "update_object() called for NULL object.\n");
764	return;	812	return;
765	}
766		813	}
		814
767	if(op->env!=NULL) {	815	if (op->env != NULL)
		816	{
768	/* Animation is currently handled by client, so nothing	817	/* Animation is currently handled by client, so nothing
769	* to do in this case.	818	* to do in this case.
770	*/	819	*/
771	return;	820	return;
772	}	821	}
773		822
774	/* If the map is saving, don't do anything as everything is	823	/* If the map is saving, don't do anything as everything is
775	* going to get freed anyways.	824	* going to get freed anyways.
776	*/	825	*/
777	if (!op->map || op->map->in_memory == MAP_SAVING) return;	826	if (!op->map || op->map->in_memory == MAP_SAVING)
778		827	return;
		828
779	/* make sure the object is within map boundaries */	829	/* make sure the object is within map boundaries */
780	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||	830	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))
781	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {	831	{
782	LOG(llevError,"update_object() called for object out of map!\n");	832	LOG (llevError, "update_object() called for object out of map!\n");
783	#ifdef MANY_CORES	833	#ifdef MANY_CORES
784	abort();	834	abort ();
785	#endif	835	#endif
786	return;	836	return;
787	}
788		837	}
		838
789	flags = GET_MAP_FLAGS(op->map, op->x, op->y);	839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);
790	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);	840	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
791	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	841	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
792	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	842	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
793	move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y);	843	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
794	move_off = GET_MAP_MOVE_OFF(op->map, op->x, op->y);	844	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
795		845
796	if (action == UP_OBJ_INSERT) {	846	if (action == UP_OBJ_INSERT)
		847	{
797	if (QUERY_FLAG(op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))
798	update_now=1;	849	update_now = 1;
799		850
800	if (QUERY_FLAG(op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	851	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))
801	update_now=1;	852	update_now = 1;
802		853
803	if (QUERY_FLAG(op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))
804	update_now=1;	855	update_now = 1;
805		856
806	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))	857	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
807	update_now=1;	858	update_now = 1;
808		859
		860	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
		861	update_now = 1;
		862
809	if ((move_on | op->move_on) != move_on) update_now=1;	863	if ((move_on | op->move_on) != move_on)
		864	update_now = 1;
		865
810	if ((move_off | op->move_off) != move_off) update_now=1;	866	if ((move_off | op->move_off) != move_off)
		867	update_now = 1;
		868
811	/* This isn't perfect, but I don't expect a lot of objects to	869	/* This isn't perfect, but I don't expect a lot of objects to
812	* to have move_allow right now.	870	* to have move_allow right now.
813	*/	871	*/
814	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)
815	update_now=1;	873	update_now = 1;
		874
816	if ((move_slow | op->move_slow) != move_slow) update_now=1;	875	if ((move_slow | op->move_slow) != move_slow)
		876	update_now = 1;
817	}	877	}
818	/* if the object is being removed, we can't make intelligent	878	/* if the object is being removed, we can't make intelligent
819	* decisions, because remove_ob can't really pass the object	879	* decisions, because remove_ob can't really pass the object
820	* that is being removed.	880	* that is being removed.
821	*/	881	*/
822	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {	882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
823	update_now=1;	883	update_now = 1;
824	} else if (action == UP_OBJ_FACE) {	884	else if (action == UP_OBJ_FACE)
825	/* Nothing to do for that case */	885	/* Nothing to do for that case */ ;
826	}
827	else {	886	else
828	LOG(llevError,"update_object called with invalid action: %d\n", action);	887	LOG (llevError, "update_object called with invalid action: %d\n", action);
829	}
830		888
831	if (update_now) {	889	if (update_now)
		890	{
832	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833	update_position(op->map, op->x, op->y);	892	update_position (op->map, op->x, op->y);
834	}	893	}
835		894
836	if(op->more!=NULL)	895	if (op->more != NULL)
837	update_object(op->more, action);	896	update_object (op->more, action);
838	}	897	}
839		898
		899	object::vector object::mortals;
		900	object::vector object::objects; // not yet used
		901	object *object::first;
		902
		903	void object::free_mortals ()
		904	{
		905	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
		906	if ((*i)->refcnt)
		907	++i; // further delay freeing
		908	else
		909	{
		910	delete *i;
		911	mortals.erase (i);
		912	}
		913
		914	static int lastmortals = 0;//D
		915
		916	if (mortals.size() != lastmortals && lastmortals > 100)//D
		917	{
		918	lastmortals = mortals.size ();//D
		919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		920	}
		921	}
		922
		923	object::object ()
		924	{
		925	SET_FLAG (this, FLAG_REMOVED);
		926
		927	expmul = 1.0;
		928	face = blank_face;
		929	}
		930
		931	object::~object ()
		932	{
		933	free_key_values (this);
		934	}
		935
		936	void object::link ()
		937	{
		938	count = ++ob_count;
		939	uuid = gen_uuid ();
		940
		941	prev = 0;
		942	next = object::first;
		943
		944	if (object::first)
		945	object::first->prev = this;
		946
		947	object::first = this;
		948	}
		949
		950	void object::unlink ()
		951	{
		952	if (this == object::first)
		953	object::first = next;
		954
		955	/* Remove this object from the list of used objects */
		956	if (prev) prev->next = next;
		957	if (next) next->prev = prev;
		958
		959	prev = 0;
		960	next = 0;
		961	}
		962
		963	object *object::create ()
		964	{
		965	object *op = new object;
		966	op->link ();
		967	return op;
		968	}
840		969
841	/*	970	/*
842	* free_object() frees everything allocated by an object, removes	971	* free_object() frees everything allocated by an object, removes
843	* it from the list of used objects, and puts it on the list of	972	* it from the list of used objects, and puts it on the list of
844	* free objects. The IS_FREED() flag is set in the object.	973	* free objects. The IS_FREED() flag is set in the object.
…		…
846	* this function to succeed.	975	* this function to succeed.
847	*	976	*
848	* If free_inventory is set, free inventory as well. Else drop items in	977	* If free_inventory is set, free inventory as well. Else drop items in
849	* inventory to the ground.	978	* inventory to the ground.
850	*/	979	*/
851		980	void object::free (bool free_inventory)
852	void
853	free_object (object * ob)
854	{	981	{
855	free_object2 (ob, 0);
856	}
857
858	void
859	free_object2 (object * ob, int free_inventory)
860	{
861	object *tmp, *op;
862
863	if (!QUERY_FLAG (ob, FLAG_REMOVED))	982	if (QUERY_FLAG (this, FLAG_FREED))
864	{	983	return;
865	LOG (llevDebug, "Free object called with non removed object\n");
866	dump_object (ob);
867	#ifdef MANY_CORES
868	abort ();
869	#endif
870	}
871		984
872	if (QUERY_FLAG (ob, FLAG_FRIENDLY))	985	if (QUERY_FLAG (this, FLAG_FRIENDLY))
873	{
874	LOG (llevMonster, "Warning: tried to free friendly object.\n");
875	remove_friendly_object (ob);	986	remove_friendly_object (this);
876	}
877		987
878	if (QUERY_FLAG (ob, FLAG_FREED))	988	if (!QUERY_FLAG (this, FLAG_REMOVED))
879	{	989	remove_ob (this);
880	dump_object (ob);	990
881	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	991	SET_FLAG (this, FLAG_FREED);
882	return;	992
		993	if (more)
883	}	994	{
884		995	more->free (free_inventory);
885	if (ob->more != NULL)	996	more = 0;
886	{	997	}
887	free_object2 (ob->more, free_inventory);
888	ob->more = NULL;
889	}
890		998
891	if (ob->inv)	999	if (inv)
892	{	1000	{
893	/* Only if the space blocks everything do we not process -	1001	/* Only if the space blocks everything do we not process -
894	* if some form of movemnt is allowed, let objects	1002	* if some form of movement is allowed, let objects
895	* drop on that space.	1003	* drop on that space.
896	*/	1004	*/
897	if (free_inventory || ob->map == NULL	1005	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
898	|| ob->map->in_memory != MAP_IN_MEMORY	1006	{
899	|| (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL))	1007	object *op = inv;
900	{
901	op = ob->inv;
902		1008
903	while (op != NULL)	1009	while (op)
904	{	1010	{
905	tmp = op->below;	1011	object *tmp = op->below;
906	remove_ob (op);	1012	op->free (free_inventory);
907	free_object2 (op, free_inventory);
908	op = tmp;	1013	op = tmp;
909	}	1014	}
910	}	1015	}
911	else	1016	else
912	{ /* Put objects in inventory onto this space */	1017	{ /* Put objects in inventory onto this space */
913	op = ob->inv;	1018	object *op = inv;
914		1019
915	while (op != NULL)	1020	while (op)
916	{	1021	{
917	tmp = op->below;	1022	object *tmp = op->below;
		1023
918	remove_ob (op);	1024	remove_ob (op);
919		1025
920	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
921	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE	1027	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
922	|| op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1028	free_object (op);
923	free_object (op);	1029	else
924	else	1030	{
925	{	1031	op->x = x;
926	op->x = ob->x;	1032	op->y = y;
927	op->y = ob->y;
928	insert_ob_in_map (op, ob->map, NULL, 0); /* Insert in same map as the envir */	1033	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
929	}	1034	}
930		1035
931	op = tmp;	1036	op = tmp;
		1037	}
		1038	}
932	}	1039	}
933	}	1040
934	}	1041	// clear those pointers that likely might have circular references to us
		1042	owner = 0;
		1043	enemy = 0;
		1044	attacked_by = 0;
935		1045
936	/* Remove object from the active list */	1046	/* Remove object from the active list */
937	ob->speed = 0;	1047	speed = 0;
938	update_ob_speed (ob);	1048	update_ob_speed (this);
939		1049
940	SET_FLAG (ob, FLAG_FREED);	1050	unlink ();
941	ob->count = 0;
942		1051
943	/* Remove this object from the list of used objects */	1052	mortals.push_back (this);
944	if (ob->prev == NULL)
945	{
946	objects = ob->next;
947
948	if (objects != NULL)
949	objects->prev = NULL;
950	}
951	else
952	{
953	ob->prev->next = ob->next;
954
955	if (ob->next != NULL)
956	ob->next->prev = ob->prev;
957	}
958
959	free_key_values (ob);
960
961	/* Now link it with the free_objects list: */
962	ob->prev = 0;
963	ob->next = 0;
964
965	delete ob;
966	}	1053	}
967		1054
968	/*	1055	/*
969	* sub_weight() recursively (outwards) subtracts a number from the	1056	* sub_weight() recursively (outwards) subtracts a number from the
970	* weight of an object (and what is carried by it's environment(s)).	1057	* weight of an object (and what is carried by it's environment(s)).
971	*/	1058	*/
972		1059
		1060	void
973	void sub_weight (object *op, signed long weight) {	1061	sub_weight (object *op, signed long weight)
		1062	{
974	while (op != NULL) {	1063	while (op != NULL)
		1064	{
975	if (op->type == CONTAINER) {	1065	if (op->type == CONTAINER)
976	weight=(signed long)(weight*(100-op->stats.Str)/100);	1066	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
977	}	1067
978	op->carrying-=weight;	1068	op->carrying -= weight;
979	op = op->env;	1069	op = op->env;
980	}	1070	}
981	}	1071	}
982		1072
983	/* remove_ob(op):	1073	/* remove_ob(op):
984	* This function removes the object op from the linked list of objects	1074	* This function removes the object op from the linked list of objects
985	* which it is currently tied to. When this function is done, the	1075	* which it is currently tied to. When this function is done, the
…		…
987	* environment, the x and y coordinates will be updated to	1077	* environment, the x and y coordinates will be updated to
988	* the previous environment.	1078	* the previous environment.
989	* Beware: This function is called from the editor as well!	1079	* Beware: This function is called from the editor as well!
990	*/	1080	*/
991		1081
		1082	void
992	void remove_ob(object *op) {	1083	remove_ob (object *op)
		1084	{
993	object *tmp,*last=NULL;	1085	object *tmp, *last = 0;
994	object *otmp;	1086	object *otmp;
995	tag_t tag;	1087
996	int check_walk_off;	1088	int check_walk_off;
997	mapstruct *m;	1089	maptile *m;
		1090
998	sint16 x,y;	1091	sint16 x, y;
999
1000		1092
1001	if(QUERY_FLAG(op,FLAG_REMOVED)) {	1093	if (QUERY_FLAG (op, FLAG_REMOVED))
1002	dump_object(op);	1094	return;
1003	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1004		1095
1005	/* Changed it to always dump core in this case. As has been learned
1006	* in the past, trying to recover from errors almost always
1007	* make things worse, and this is a real error here - something
1008	* that should not happen.
1009	* Yes, if this was a mission critical app, trying to do something
1010	* to recover may make sense, but that is because failure of the app
1011	* may have other disastrous problems. Cf runs out of a script
1012	* so is easily enough restarted without any real problems.
1013	* MSW 2001-07-01
1014	*/
1015	abort();
1016	}
1017	if(op->more!=NULL)
1018	remove_ob(op->more);
1019
1020	SET_FLAG(op, FLAG_REMOVED);	1096	SET_FLAG (op, FLAG_REMOVED);
1021		1097
		1098	if (op->more != NULL)
		1099	remove_ob (op->more);
		1100
1022	/*	1101	/*
1023	* In this case, the object to be removed is in someones	1102	* In this case, the object to be removed is in someones
1024	* inventory.	1103	* inventory.
1025	*/	1104	*/
1026	if(op->env!=NULL) {	1105	if (op->env != NULL)
		1106	{
1027	if(op->nrof)	1107	if (op->nrof)
1028	sub_weight(op->env, op->weight*op->nrof);	1108	sub_weight (op->env, op->weight * op->nrof);
1029	else	1109	else
1030	sub_weight(op->env, op->weight+op->carrying);	1110	sub_weight (op->env, op->weight + op->carrying);
1031		1111
1032	/* NO_FIX_PLAYER is set when a great many changes are being	1112	/* NO_FIX_PLAYER is set when a great many changes are being
1033	* made to players inventory. If set, avoiding the call	1113	* made to players inventory. If set, avoiding the call
1034	* to save cpu time.	1114	* to save cpu time.
1035	*/	1115	*/
1036	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&	1116	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1037	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1038	fix_player(otmp);	1117	fix_player (otmp);
1039		1118
1040	if(op->above!=NULL)	1119	if (op->above != NULL)
1041	op->above->below=op->below;	1120	op->above->below = op->below;
1042	else	1121	else
1043	op->env->inv=op->below;	1122	op->env->inv = op->below;
1044		1123
1045	if(op->below!=NULL)	1124	if (op->below != NULL)
1046	op->below->above=op->above;	1125	op->below->above = op->above;
1047		1126
1048	/* we set up values so that it could be inserted into	1127	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up	1128	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.	1129	* to the caller to decide what we want to do.
1051	*/	1130	*/
1052	op->x=op->env->x,op->y=op->env->y;	1131	op->x = op->env->x, op->y = op->env->y;
1053	op->map=op->env->map;	1132	op->map = op->env->map;
1054	op->above=NULL,op->below=NULL;	1133	op->above = NULL, op->below = NULL;
1055	op->env=NULL;	1134	op->env = NULL;
		1135	}
		1136	else if (op->map)
		1137	{
		1138	x = op->x;
		1139	y = op->y;
		1140	m = get_map_from_coord (op->map, &x, &y);
		1141
		1142	if (!m)
		1143	{
		1144	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
		1145	op->map->path, op->x, op->y);
		1146	/* in old days, we used to set x and y to 0 and continue.
		1147	* it seems if we get into this case, something is probablye
		1148	* screwed up and should be fixed.
		1149	*/
		1150	abort ();
		1151	}
		1152
		1153	if (op->map != m)
		1154	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1155	op->map->path, m->path, op->x, op->y, x, y);
		1156
		1157	/* Re did the following section of code - it looks like it had
		1158	* lots of logic for things we no longer care about
		1159	*/
		1160
		1161	/* link the object above us */
		1162	if (op->above)
		1163	op->above->below = op->below;
		1164	else
		1165	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
		1166
		1167	/* Relink the object below us, if there is one */
		1168	if (op->below)
		1169	op->below->above = op->above;
		1170	else
		1171	{
		1172	/* Nothing below, which means we need to relink map object for this space
		1173	* use translated coordinates in case some oddness with map tiling is
		1174	* evident
		1175	*/
		1176	if (GET_MAP_OB (m, x, y) != op)
		1177	{
		1178	dump_object (op);
		1179	LOG (llevError,
		1180	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1181	dump_object (GET_MAP_OB (m, x, y));
		1182	LOG (llevError, "%s\n", errmsg);
		1183	}
		1184
		1185	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
		1186	}
		1187
		1188	op->above = 0;
		1189	op->below = 0;
		1190
		1191	if (op->map->in_memory == MAP_SAVING)
1056	return;	1192	return;
1057	}
1058		1193
1059	/* If we get here, we are removing it from a map */
1060	if (op->map == NULL) return;
1061
1062	x = op->x;
1063	y = op->y;
1064	m = get_map_from_coord(op->map, &x, &y);
1065
1066	if (!m) {
1067	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1068	op->map->path, op->x, op->y);
1069	/* in old days, we used to set x and y to 0 and continue.
1070	* it seems if we get into this case, something is probablye
1071	* screwed up and should be fixed.
1072	*/
1073	abort();
1074	}
1075	if (op->map != m) {
1076	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1077	op->map->path, m->path, op->x, op->y, x, y);
1078	}
1079
1080	/* Re did the following section of code - it looks like it had
1081	* lots of logic for things we no longer care about
1082	*/
1083
1084	/* link the object above us */
1085	if (op->above)
1086	op->above->below=op->below;
1087	else
1088	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1089
1090	/* Relink the object below us, if there is one */
1091	if(op->below) {
1092	op->below->above=op->above;
1093	} else {
1094	/* Nothing below, which means we need to relink map object for this space
1095	* use translated coordinates in case some oddness with map tiling is
1096	* evident
1097	*/
1098	if(GET_MAP_OB(m,x,y)!=op) {
1099	dump_object(op);
1100	LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1101	dump_object(GET_MAP_OB(m,x,y));
1102	LOG(llevError,"%s\n",errmsg);
1103	}
1104	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1105	}
1106	op->above=NULL;
1107	op->below=NULL;
1108
1109	if (op->map->in_memory == MAP_SAVING)
1110	return;
1111
1112	tag = op->count;
1113	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);	1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1195
1114	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {	1196	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1197	{
1115	/* No point updating the players look faces if he is the object	1198	/* No point updating the players look faces if he is the object
1116	* being removed.	1199	* being removed.
1117	*/	1200	*/
1118		1201
1119	if(tmp->type==PLAYER && tmp!=op) {	1202	if (tmp->type == PLAYER && tmp != op)
		1203	{
1120	/* If a container that the player is currently using somehow gets	1204	/* If a container that the player is currently using somehow gets
1121	* removed (most likely destroyed), update the player view	1205	* removed (most likely destroyed), update the player view
1122	* appropriately.	1206	* appropriately.
1123	*/	1207	*/
1124	if (tmp->container==op) {	1208	if (tmp->container == op)
		1209	{
1125	CLEAR_FLAG(op, FLAG_APPLIED);	1210	CLEAR_FLAG (op, FLAG_APPLIED);
1126	tmp->container=NULL;	1211	tmp->container = NULL;
		1212	}
		1213
		1214	tmp->contr->socket.update_look = 1;
1127	}	1215	}
1128	tmp->contr->socket.update_look=1;	1216
1129	}
1130	/* See if player moving off should effect something */	1217	/* See if player moving off should effect something */
		1218	if (check_walk_off
1131	if (check_walk_off && ((op->move_type & tmp->move_off) &&	1219	&& ((op->move_type & tmp->move_off)
1132	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {	1220	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1133		1221	{
1134	move_apply(tmp, op, NULL);	1222	move_apply (tmp, op, NULL);
		1223
1135	if (was_destroyed (op, tag)) {	1224	if (op->destroyed ())
1136	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "	1225	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1137	"leaving object\n", &tmp->name, &tmp->arch->name);
1138	}	1226	}
1139	}
1140		1227
1141	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1228	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1142		1229
1143	if(tmp->above == tmp)	1230	if (tmp->above == tmp)
1144	tmp->above = NULL;	1231	tmp->above = NULL;
		1232
1145	last=tmp;	1233	last = tmp;
1146	}	1234	}
		1235
1147	/* last == NULL of there are no objects on this space */	1236	/* last == NULL of there are no objects on this space */
1148	if (last==NULL) {	1237	if (last == NULL)
		1238	{
1149	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1239	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1150	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1240	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1151	* those out anyways, and if there are any flags set right now, they won't	1241	* those out anyways, and if there are any flags set right now, they won't
1152	* be correct anyways.	1242	* be correct anyways.
1153	*/	1243	*/
1154	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);	1244	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1155	update_position(op->map, op->x, op->y);	1245	update_position (op->map, op->x, op->y);
1156	}	1246	}
1157	else	1247	else
1158	update_object(last, UP_OBJ_REMOVE);	1248	update_object (last, UP_OBJ_REMOVE);
1159		1249
1160	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))	1250	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1161	update_all_los(op->map, op->x, op->y);	1251	update_all_los (op->map, op->x, op->y);
1162		1252	}
1163	}	1253	}
1164		1254
1165	/*	1255	/*
1166	* merge_ob(op,top):	1256	* merge_ob(op,top):
1167	*	1257	*
1168	* This function goes through all objects below and including top, and	1258	* This function goes through all objects below and including top, and
1169	* merges op to the first matching object.	1259	* merges op to the first matching object.
1170	* If top is NULL, it is calculated.	1260	* If top is NULL, it is calculated.
1171	* Returns pointer to object if it succeded in the merge, otherwise NULL	1261	* Returns pointer to object if it succeded in the merge, otherwise NULL
1172	*/	1262	*/
1173		1263	object *
1174	object *merge_ob(object *op, object *top) {	1264	merge_ob (object *op, object *top)
		1265	{
1175	if(!op->nrof)	1266	if (!op->nrof)
1176	return 0;	1267	return 0;
		1268
1177	if(top==NULL)	1269	if (top == NULL)
1178	for(top=op;top!=NULL&&top->above!=NULL;top=top->above);	1270	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1271
1179	for(;top!=NULL;top=top->below) {	1272	for (; top != NULL; top = top->below)
		1273	{
1180	if(top==op)	1274	if (top == op)
1181	continue;	1275	continue;
1182	if (CAN_MERGE(op,top))	1276	if (CAN_MERGE (op, top))
1183	{	1277	{
1184	top->nrof+=op->nrof;	1278	top->nrof += op->nrof;
		1279
1185	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1280	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1186	op->weight = 0; /* Don't want any adjustements now */	1281	op->weight = 0; /* Don't want any adjustements now */
1187	remove_ob(op);	1282	remove_ob (op);
1188	free_object(op);	1283	free_object (op);
1189	return top;	1284	return top;
1190	}	1285	}
1191	}	1286	}
		1287
1192	return NULL;	1288	return 0;
1193	}	1289	}
1194		1290
1195	/*	1291	/*
1196	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1292	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1197	* job preparing multi-part monsters	1293	* job preparing multi-part monsters
1198	*/	1294	*/
		1295	object *
1199	object *insert_ob_in_map_at(object *op, mapstruct *m, object *originator, int flag, int x, int y){	1296	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
		1297	{
1200	object* tmp;	1298	object *tmp;
		1299
1201	if (op->head)	1300	if (op->head)
1202	op=op->head;	1301	op = op->head;
		1302
1203	for (tmp=op;tmp;tmp=tmp->more){	1303	for (tmp = op; tmp; tmp = tmp->more)
		1304	{
1204	tmp->x=x+tmp->arch->clone.x;	1305	tmp->x = x + tmp->arch->clone.x;
1205	tmp->y=y+tmp->arch->clone.y;	1306	tmp->y = y + tmp->arch->clone.y;
1206	}	1307	}
		1308
1207	return insert_ob_in_map (op, m, originator, flag);	1309	return insert_ob_in_map (op, m, originator, flag);
1208	}	1310	}
1209		1311
1210	/*	1312	/*
1211	* insert_ob_in_map (op, map, originator, flag):	1313	* insert_ob_in_map (op, map, originator, flag):
1212	* This function inserts the object in the two-way linked list	1314	* This function inserts the object in the two-way linked list
…		…
1226	* new object if 'op' was merged with other object	1328	* new object if 'op' was merged with other object
1227	* NULL if 'op' was destroyed	1329	* NULL if 'op' was destroyed
1228	* just 'op' otherwise	1330	* just 'op' otherwise
1229	*/	1331	*/
1230		1332
		1333	object *
1231	object *insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1334	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1232	{	1335	{
1233	object *tmp, *top, *floor=NULL;	1336	object *tmp, *top, *floor = NULL;
1234	sint16 x,y;	1337	sint16 x, y;
1235		1338
1236	if (QUERY_FLAG (op, FLAG_FREED)) {	1339	if (QUERY_FLAG (op, FLAG_FREED))
		1340	{
1237	LOG (llevError, "Trying to insert freed object!\n");	1341	LOG (llevError, "Trying to insert freed object!\n");
		1342	return NULL;
		1343	}
		1344
		1345	if (m == NULL)
		1346	{
		1347	dump_object (op);
		1348	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
		1349	return op;
		1350	}
		1351
		1352	if (out_of_map (m, op->x, op->y))
		1353	{
		1354	dump_object (op);
		1355	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
		1356	#ifdef MANY_CORES
		1357	/* Better to catch this here, as otherwise the next use of this object
		1358	* is likely to cause a crash. Better to find out where it is getting
		1359	* improperly inserted.
		1360	*/
		1361	abort ();
		1362	#endif
		1363	return op;
		1364	}
		1365
		1366	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1367	{
		1368	dump_object (op);
		1369	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
		1370	return op;
		1371	}
		1372
		1373	if (op->more != NULL)
		1374	{
		1375	/* The part may be on a different map. */
		1376
		1377	object *more = op->more;
		1378
		1379	/* We really need the caller to normalize coordinates - if
		1380	* we set the map, that doesn't work if the location is within
		1381	* a map and this is straddling an edge. So only if coordinate
		1382	* is clear wrong do we normalize it.
		1383	*/
		1384	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
		1385	more->map = get_map_from_coord (m, &more->x, &more->y);
		1386	else if (!more->map)
		1387	{
		1388	/* For backwards compatibility - when not dealing with tiled maps,
		1389	* more->map should always point to the parent.
		1390	*/
		1391	more->map = m;
		1392	}
		1393
		1394	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
		1395	{
		1396	if (!op->head)
		1397	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1398
		1399	return NULL;
		1400	}
		1401	}
		1402
		1403	CLEAR_FLAG (op, FLAG_REMOVED);
		1404
		1405	/* Ideally, the caller figures this out. However, it complicates a lot
		1406	* of areas of callers (eg, anything that uses find_free_spot would now
		1407	* need extra work
		1408	*/
		1409	op->map = get_map_from_coord (m, &op->x, &op->y);
		1410	x = op->x;
		1411	y = op->y;
		1412
		1413	/* this has to be done after we translate the coordinates.
		1414	*/
		1415	if (op->nrof && !(flag & INS_NO_MERGE))
		1416	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
		1417	if (CAN_MERGE (op, tmp))
		1418	{
		1419	op->nrof += tmp->nrof;
		1420	remove_ob (tmp);
		1421	free_object (tmp);
		1422	}
		1423
		1424	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
		1425	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1426
		1427	if (!QUERY_FLAG (op, FLAG_ALIVE))
		1428	CLEAR_FLAG (op, FLAG_NO_STEAL);
		1429
		1430	if (flag & INS_BELOW_ORIGINATOR)
		1431	{
		1432	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
		1433	{
		1434	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
		1435	abort ();
		1436	}
		1437
		1438	op->above = originator;
		1439	op->below = originator->below;
		1440
		1441	if (op->below)
		1442	op->below->above = op;
		1443	else
		1444	SET_MAP_OB (op->map, op->x, op->y, op);
		1445
		1446	/* since *below* originator, no need to update top */
		1447	originator->below = op;
		1448	}
		1449	else
		1450	{
		1451	/* If there are other objects, then */
		1452	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
		1453	{
		1454	object *last = NULL;
		1455
		1456	/*
		1457	* If there are multiple objects on this space, we do some trickier handling.
		1458	* We've already dealt with merging if appropriate.
		1459	* Generally, we want to put the new object on top. But if
		1460	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
		1461	* floor, we want to insert above that and no further.
		1462	* Also, if there are spell objects on this space, we stop processing
		1463	* once we get to them. This reduces the need to traverse over all of
		1464	* them when adding another one - this saves quite a bit of cpu time
		1465	* when lots of spells are cast in one area. Currently, it is presumed
		1466	* that flying non pickable objects are spell objects.
		1467	*/
		1468
		1469	while (top != NULL)
		1470	{
		1471	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
		1472	floor = top;
		1473
		1474	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
		1475	{
		1476	/* We insert above top, so we want this object below this */
		1477	top = top->below;
		1478	break;
		1479	}
		1480
		1481	last = top;
		1482	top = top->above;
		1483	}
		1484
		1485	/* Don't want top to be NULL, so set it to the last valid object */
		1486	top = last;
		1487
		1488	/* We let update_position deal with figuring out what the space
		1489	* looks like instead of lots of conditions here.
		1490	* makes things faster, and effectively the same result.
		1491	*/
		1492
		1493	/* Have object 'fall below' other objects that block view.
		1494	* Unless those objects are exits, type 66
		1495	* If INS_ON_TOP is used, don't do this processing
		1496	* Need to find the object that in fact blocks view, otherwise
		1497	* stacking is a bit odd.
		1498	*/
		1499	if (!(flag & INS_ON_TOP) &&
		1500	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
		1501	{
		1502	for (last = top; last != floor; last = last->below)
		1503	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
		1504	break;
		1505	/* Check to see if we found the object that blocks view,
		1506	* and make sure we have a below pointer for it so that
		1507	* we can get inserted below this one, which requires we
		1508	* set top to the object below us.
		1509	*/
		1510	if (last && last->below && last != floor)
		1511	top = last->below;
		1512	}
		1513	} /* If objects on this space */
		1514
		1515	if (flag & INS_MAP_LOAD)
		1516	top = GET_MAP_TOP (op->map, op->x, op->y);
		1517
		1518	if (flag & INS_ABOVE_FLOOR_ONLY)
		1519	top = floor;
		1520
		1521	/* Top is the object that our object (op) is going to get inserted above.
		1522	*/
		1523
		1524	/* First object on this space */
		1525	if (!top)
		1526	{
		1527	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1528
		1529	if (op->above)
		1530	op->above->below = op;
		1531
		1532	op->below = NULL;
		1533	SET_MAP_OB (op->map, op->x, op->y, op);
		1534	}
		1535	else
		1536	{ /* get inserted into the stack above top */
		1537	op->above = top->above;
		1538
		1539	if (op->above)
		1540	op->above->below = op;
		1541
		1542	op->below = top;
		1543	top->above = op;
		1544	}
		1545
		1546	if (op->above == NULL)
		1547	SET_MAP_TOP (op->map, op->x, op->y, op);
		1548	} /* else not INS_BELOW_ORIGINATOR */
		1549
		1550	if (op->type == PLAYER)
		1551	op->contr->do_los = 1;
		1552
		1553	/* If we have a floor, we know the player, if any, will be above
		1554	* it, so save a few ticks and start from there.
		1555	*/
		1556	if (!(flag & INS_MAP_LOAD))
		1557	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
		1558	if (tmp->type == PLAYER)
		1559	tmp->contr->socket.update_look = 1;
		1560
		1561	/* If this object glows, it may affect lighting conditions that are
		1562	* visible to others on this map. But update_all_los is really
		1563	* an inefficient way to do this, as it means los for all players
		1564	* on the map will get recalculated. The players could very well
		1565	* be far away from this change and not affected in any way -
		1566	* this should get redone to only look for players within range,
		1567	* or just updating the P_NEED_UPDATE for spaces within this area
		1568	* of effect may be sufficient.
		1569	*/
		1570	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
		1571	update_all_los (op->map, op->x, op->y);
		1572
		1573	/* updates flags (blocked, alive, no magic, etc) for this map space */
		1574	update_object (op, UP_OBJ_INSERT);
		1575
		1576	/* Don't know if moving this to the end will break anything. However,
		1577	* we want to have update_look set above before calling this.
		1578	*
		1579	* check_move_on() must be after this because code called from
		1580	* check_move_on() depends on correct map flags (so functions like
		1581	* blocked() and wall() work properly), and these flags are updated by
		1582	* update_object().
		1583	*/
		1584
		1585	/* if this is not the head or flag has been passed, don't check walk on status */
		1586	if (!(flag & INS_NO_WALK_ON) && !op->head)
		1587	{
		1588	if (check_move_on (op, originator))
1238	return NULL;	1589	return NULL;
1239	}
1240	if(m==NULL) {
1241	dump_object(op);
1242	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1243	return op;
1244	}
1245	if(out_of_map(m,op->x,op->y)) {
1246	dump_object(op);
1247	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1248	#ifdef MANY_CORES
1249	/* Better to catch this here, as otherwise the next use of this object
1250	* is likely to cause a crash. Better to find out where it is getting
1251	* improperly inserted.
1252	*/
1253	abort();
1254	#endif
1255	return op;
1256	}
1257	if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1258	dump_object(op);
1259	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1260	return op;
1261	}
1262	if(op->more!=NULL) {
1263	/* The part may be on a different map. */
1264		1590
1265	object *more = op->more;
1266
1267	/* We really need the caller to normalize coordinates - if
1268	* we set the map, that doesn't work if the location is within
1269	* a map and this is straddling an edge. So only if coordinate
1270	* is clear wrong do we normalize it.
1271	*/
1272	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1273	more->map = get_map_from_coord(m, &more->x, &more->y);
1274	} else if (!more->map) {
1275	/* For backwards compatibility - when not dealing with tiled maps,
1276	* more->map should always point to the parent.
1277	*/
1278	more->map = m;
1279	}
1280
1281	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1282	if ( ! op->head)
1283	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1284	return NULL;
1285	}
1286	}
1287	CLEAR_FLAG(op,FLAG_REMOVED);
1288
1289	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work
1292	*/
1293	op->map=get_map_from_coord(m, &op->x, &op->y);
1294	x = op->x;
1295	y = op->y;
1296
1297	/* this has to be done after we translate the coordinates.
1298	*/
1299	if(op->nrof && !(flag & INS_NO_MERGE)) {
1300	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1301	if (CAN_MERGE(op,tmp)) {
1302	op->nrof+=tmp->nrof;
1303	remove_ob(tmp);
1304	free_object(tmp);
1305	}
1306	}
1307
1308	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1309	CLEAR_FLAG(op, FLAG_INV_LOCKED);
1310	if (!QUERY_FLAG(op, FLAG_ALIVE))
1311	CLEAR_FLAG(op, FLAG_NO_STEAL);
1312
1313	if (flag & INS_BELOW_ORIGINATOR) {
1314	if (originator->map != op->map || originator->x != op->x ||
1315	originator->y != op->y) {
1316	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1317	abort();
1318	}
1319	op->above = originator;
1320	op->below = originator->below;
1321	if (op->below) op->below->above = op;
1322	else SET_MAP_OB(op->map, op->x, op->y, op);
1323	/* since *below* originator, no need to update top */
1324	originator->below = op;
1325	} else {
1326	/* If there are other objects, then */
1327	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1328	object *last=NULL;
1329	/*
1330	* If there are multiple objects on this space, we do some trickier handling.
1331	* We've already dealt with merging if appropriate.
1332	* Generally, we want to put the new object on top. But if
1333	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1334	* floor, we want to insert above that and no further.
1335	* Also, if there are spell objects on this space, we stop processing
1336	* once we get to them. This reduces the need to traverse over all of
1337	* them when adding another one - this saves quite a bit of cpu time
1338	* when lots of spells are cast in one area. Currently, it is presumed
1339	* that flying non pickable objects are spell objects.
1340	*/
1341
1342	while (top != NULL) {
1343	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1344	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1345	if (QUERY_FLAG(top, FLAG_NO_PICK)
1346	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1347	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))
1348	{
1349	/* We insert above top, so we want this object below this */
1350	top=top->below;
1351	break;
1352	}
1353	last = top;
1354	top = top->above;
1355	}
1356	/* Don't want top to be NULL, so set it to the last valid object */
1357	top = last;
1358
1359	/* We let update_position deal with figuring out what the space
1360	* looks like instead of lots of conditions here.
1361	* makes things faster, and effectively the same result.
1362	*/
1363
1364	/* Have object 'fall below' other objects that block view.
1365	* Unless those objects are exits, type 66
1366	* If INS_ON_TOP is used, don't do this processing
1367	* Need to find the object that in fact blocks view, otherwise
1368	* stacking is a bit odd.
1369	*/
1370	if (!(flag & INS_ON_TOP) &&
1371	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1372	(op->face && !op->face->visibility)) {
1373	for (last=top; last != floor; last=last->below)
1374	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1375	/* Check to see if we found the object that blocks view,
1376	* and make sure we have a below pointer for it so that
1377	* we can get inserted below this one, which requires we
1378	* set top to the object below us.
1379	*/
1380	if (last && last->below && last != floor) top=last->below;
1381	}
1382	} /* If objects on this space */
1383	if (flag & INS_MAP_LOAD)
1384	top = GET_MAP_TOP(op->map,op->x,op->y);
1385	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1386
1387	/* Top is the object that our object (op) is going to get inserted above.
1388	*/
1389
1390	/* First object on this space */
1391	if (!top) {
1392	op->above = GET_MAP_OB(op->map, op->x, op->y);
1393	if (op->above) op->above->below = op;
1394	op->below = NULL;
1395	SET_MAP_OB(op->map, op->x, op->y, op);
1396	} else { /* get inserted into the stack above top */
1397	op->above = top->above;
1398	if (op->above) op->above->below = op;
1399	op->below = top;
1400	top->above = op;
1401	}
1402	if (op->above==NULL)
1403	SET_MAP_TOP(op->map,op->x, op->y, op);
1404	} /* else not INS_BELOW_ORIGINATOR */
1405
1406	if(op->type==PLAYER)
1407	op->contr->do_los=1;
1408
1409	/* If we have a floor, we know the player, if any, will be above
1410	* it, so save a few ticks and start from there.
1411	*/
1412	if (!(flag & INS_MAP_LOAD))
1413	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1414	if (tmp->type == PLAYER)
1415	tmp->contr->socket.update_look=1;
1416	}
1417
1418	/* If this object glows, it may affect lighting conditions that are
1419	* visible to others on this map. But update_all_los is really
1420	* an inefficient way to do this, as it means los for all players
1421	* on the map will get recalculated. The players could very well
1422	* be far away from this change and not affected in any way -
1423	* this should get redone to only look for players within range,
1424	* or just updating the P_NEED_UPDATE for spaces within this area
1425	* of effect may be sufficient.
1426	*/
1427	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1428	update_all_los(op->map, op->x, op->y);
1429
1430
1431	/* updates flags (blocked, alive, no magic, etc) for this map space */
1432	update_object(op,UP_OBJ_INSERT);
1433
1434
1435	/* Don't know if moving this to the end will break anything. However,
1436	* we want to have update_look set above before calling this.
1437	*
1438	* check_move_on() must be after this because code called from
1439	* check_move_on() depends on correct map flags (so functions like
1440	* blocked() and wall() work properly), and these flags are updated by
1441	* update_object().
1442	*/
1443
1444	/* if this is not the head or flag has been passed, don't check walk on status */
1445
1446	if (!(flag & INS_NO_WALK_ON) && !op->head) {
1447	if (check_move_on(op, originator))
1448	return NULL;
1449
1450	/* If we are a multi part object, lets work our way through the check	1591	/* If we are a multi part object, lets work our way through the check
1451	* walk on's.	1592	* walk on's.
1452	*/	1593	*/
1453	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)	1594	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1454	if (check_move_on (tmp, originator))	1595	if (check_move_on (tmp, originator))
1455	return NULL;	1596	return NULL;
1456	}	1597	}
		1598
1457	return op;	1599	return op;
1458	}	1600	}
1459		1601
1460	/* this function inserts an object in the map, but if it	1602	/* this function inserts an object in the map, but if it
1461	* finds an object of its own type, it'll remove that one first.	1603	* finds an object of its own type, it'll remove that one first.
1462	* op is the object to insert it under: supplies x and the map.	1604	* op is the object to insert it under: supplies x and the map.
1463	*/	1605	*/
		1606	void
1464	void replace_insert_ob_in_map(const char *arch_string, object *op) {	1607	replace_insert_ob_in_map (const char *arch_string, object *op)
		1608	{
1465	object *tmp;	1609	object *
1466	object *tmp1;	1610	tmp;
		1611	object *
		1612	tmp1;
1467		1613
1468	/* first search for itself and remove any old instances */	1614	/* first search for itself and remove any old instances */
1469		1615
1470	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {	1616	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
		1617	{
1471	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {	1618	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
		1619	{
1472	remove_ob(tmp);	1620	remove_ob (tmp);
1473	free_object(tmp);	1621	free_object (tmp);
1474	}	1622	}
1475	}	1623	}
1476		1624
1477	tmp1=arch_to_object(find_archetype(arch_string));	1625	tmp1 = arch_to_object (archetype::find (arch_string));
1478		1626
1479		1627	tmp1->x = op->x;
1480	tmp1->x = op->x; tmp1->y = op->y;	1628	tmp1->y = op->y;
1481	insert_ob_in_map(tmp1,op->map,op,0);	1629	insert_ob_in_map (tmp1, op->map, op, 0);
1482	}	1630	}
1483		1631
1484	/*	1632	/*
1485	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1633	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1486	* is returned contains nr objects, and the remaining parts contains	1634	* is returned contains nr objects, and the remaining parts contains
1487	* the rest (or is removed and freed if that number is 0).	1635	* the rest (or is removed and freed if that number is 0).
1488	* On failure, NULL is returned, and the reason put into the	1636	* On failure, NULL is returned, and the reason put into the
1489	* global static errmsg array.	1637	* global static errmsg array.
1490	*/	1638	*/
1491		1639
		1640	object *
1492	object *get_split_ob(object *orig_ob, uint32 nr) {	1641	get_split_ob (object *orig_ob, uint32 nr)
1493	object *newob;	1642	{
		1643	object *
		1644	newob;
		1645	int
1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1646	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1495		1647
1496	if(orig_ob->nrof<nr) {	1648	if (orig_ob->nrof < nr)
1497	sprintf(errmsg,"There are only %d %ss.",	1649	{
1498	orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);	1650	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1499	return NULL;	1651	return NULL;
1500	}	1652	}
		1653
1501	newob = object_create_clone(orig_ob);	1654	newob = object_create_clone (orig_ob);
		1655
1502	if((orig_ob->nrof-=nr)<1) {	1656	if ((orig_ob->nrof -= nr) < 1)
		1657	{
1503	if ( ! is_removed)	1658	if (!is_removed)
1504	remove_ob(orig_ob);	1659	remove_ob (orig_ob);
1505	free_object2(orig_ob, 1);	1660	free_object2 (orig_ob, 1);
1506	}	1661	}
1507	else if ( ! is_removed) {	1662	else if (!is_removed)
		1663	{
1508	if(orig_ob->env!=NULL)	1664	if (orig_ob->env != NULL)
1509	sub_weight (orig_ob->env,orig_ob->weight*nr);	1665	sub_weight (orig_ob->env, orig_ob->weight * nr);
1510	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {	1666	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
		1667	{
1511	strcpy(errmsg, "Tried to split object whose map is not in memory.");	1668	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1512	LOG(llevDebug,
1513	"Error, Tried to split object whose map is not in memory.\n");	1669	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1514	return NULL;	1670	return NULL;
1515	}	1671	}
1516	}	1672	}
		1673
1517	newob->nrof=nr;	1674	newob->nrof = nr;
1518		1675
1519	return newob;	1676	return newob;
1520	}	1677	}
1521		1678
1522	/*	1679	/*
1523	* decrease_ob_nr(object, number) decreases a specified number from	1680	* decrease_ob_nr(object, number) decreases a specified number from
1524	* the amount of an object. If the amount reaches 0, the object	1681	* the amount of an object. If the amount reaches 0, the object
1525	* is subsequently removed and freed.	1682	* is subsequently removed and freed.
1526	*	1683	*
1527	* Return value: 'op' if something is left, NULL if the amount reached 0	1684	* Return value: 'op' if something is left, NULL if the amount reached 0
1528	*/	1685	*/
1529		1686
		1687	object *
1530	object *decrease_ob_nr (object *op, uint32 i)	1688	decrease_ob_nr (object *op, uint32 i)
1531	{	1689	{
1532	object *tmp;	1690	object *tmp;
1533	player *pl;	1691	player *pl;
1534		1692
1535	if (i == 0) /* objects with op->nrof require this check */	1693	if (i == 0) /* objects with op->nrof require this check */
1536	return op;	1694	return op;
1537		1695
1538	if (i > op->nrof)	1696	if (i > op->nrof)
1539	i = op->nrof;	1697	i = op->nrof;
1540		1698
1541	if (QUERY_FLAG (op, FLAG_REMOVED))	1699	if (QUERY_FLAG (op, FLAG_REMOVED))
		1700	op->nrof -= i;
		1701	else if (op->env != NULL)
		1702	{
		1703	/* is this object in the players inventory, or sub container
		1704	* therein?
		1705	*/
		1706	tmp = is_player_inv (op->env);
		1707	/* nope. Is this a container the player has opened?
		1708	* If so, set tmp to that player.
		1709	* IMO, searching through all the players will mostly
		1710	* likely be quicker than following op->env to the map,
		1711	* and then searching the map for a player.
		1712	*/
		1713	if (!tmp)
		1714	{
		1715	for (pl = first_player; pl; pl = pl->next)
		1716	if (pl->ob->container == op->env)
		1717	break;
		1718	if (pl)
		1719	tmp = pl->ob;
		1720	else
		1721	tmp = NULL;
		1722	}
		1723
		1724	if (i < op->nrof)
		1725	{
		1726	sub_weight (op->env, op->weight * i);
		1727	op->nrof -= i;
		1728	if (tmp)
		1729	{
		1730	esrv_send_item (tmp, op);
		1731	}
		1732	}
		1733	else
		1734	{
		1735	remove_ob (op);
		1736	op->nrof = 0;
		1737	if (tmp)
		1738	{
		1739	esrv_del_item (tmp->contr, op->count);
		1740	}
		1741	}
1542	{	1742	}
		1743	else
		1744	{
		1745	object *above = op->above;
		1746
		1747	if (i < op->nrof)
1543	op->nrof -= i;	1748	op->nrof -= i;
1544	}	1749	else
1545	else if (op->env != NULL)
1546	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = is_player_inv (op->env);
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp) {
1558	for (pl=first_player; pl; pl=pl->next)
1559	if (pl->ob->container == op->env) break;
1560	if (pl) tmp=pl->ob;
1561	else tmp=NULL;
1562	}	1750	{
1563
1564	if (i < op->nrof) {
1565	sub_weight (op->env, op->weight * i);
1566	op->nrof -= i;
1567	if (tmp) {
1568	esrv_send_item(tmp, op);
1569	}
1570	} else {
1571	remove_ob (op);	1751	remove_ob (op);
1572	op->nrof = 0;	1752	op->nrof = 0;
1573	if (tmp) {
1574	esrv_del_item(tmp->contr, op->count);
1575	}	1753	}
1576	}
1577	}
1578	else
1579	{
1580	object *above = op->above;
1581		1754
1582	if (i < op->nrof) {
1583	op->nrof -= i;
1584	} else {
1585	remove_ob (op);
1586	op->nrof = 0;
1587	}
1588	/* Since we just removed op, op->above is null */	1755	/* Since we just removed op, op->above is null */
1589	for (tmp = above; tmp != NULL; tmp = tmp->above)	1756	for (tmp = above; tmp != NULL; tmp = tmp->above)
1590	if (tmp->type == PLAYER) {	1757	if (tmp->type == PLAYER)
		1758	{
1591	if (op->nrof)	1759	if (op->nrof)
1592	esrv_send_item(tmp, op);	1760	esrv_send_item (tmp, op);
1593	else	1761	else
1594	esrv_del_item(tmp->contr, op->count);	1762	esrv_del_item (tmp->contr, op->count);
1595	}	1763	}
1596	}	1764	}
1597		1765
1598	if (op->nrof) {	1766	if (op->nrof)
1599	return op;	1767	return op;
1600	} else {	1768	else
		1769	{
1601	free_object (op);	1770	free_object (op);
1602	return NULL;	1771	return NULL;
1603	}	1772	}
1604	}	1773	}
1605		1774
1606	/*	1775	/*
1607	* add_weight(object, weight) adds the specified weight to an object,	1776	* add_weight(object, weight) adds the specified weight to an object,
1608	* and also updates how much the environment(s) is/are carrying.	1777	* and also updates how much the environment(s) is/are carrying.
1609	*/	1778	*/
1610		1779
		1780	void
1611	void add_weight (object *op, signed long weight) {	1781	add_weight (object *op, signed long weight)
		1782	{
1612	while (op!=NULL) {	1783	while (op != NULL)
		1784	{
1613	if (op->type == CONTAINER) {	1785	if (op->type == CONTAINER)
1614	weight=(signed long)(weight*(100-op->stats.Str)/100);	1786	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1615	}	1787
1616	op->carrying+=weight;	1788	op->carrying += weight;
1617	op=op->env;	1789	op = op->env;
1618	}	1790	}
1619	}	1791	}
1620		1792
1621	/*	1793	/*
1622	* insert_ob_in_ob(op,environment):	1794	* insert_ob_in_ob(op,environment):
1623	* This function inserts the object op in the linked list	1795	* This function inserts the object op in the linked list
…		…
1630	*	1802	*
1631	* The function returns now pointer to inserted item, and return value can	1803	* The function returns now pointer to inserted item, and return value can
1632	* be != op, if items are merged. -Tero	1804	* be != op, if items are merged. -Tero
1633	*/	1805	*/
1634		1806
		1807	object *
1635	object *insert_ob_in_ob(object *op,object *where) {	1808	insert_ob_in_ob (object *op, object *where)
1636	object *tmp, *otmp;	1809	{
		1810	object *
		1811	tmp, *
		1812	otmp;
1637		1813
1638	if(!QUERY_FLAG(op,FLAG_REMOVED)) {	1814	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1815	{
1639	dump_object(op);	1816	dump_object (op);
1640	LOG(llevError,"Trying to insert (ob) inserted object.\n%s\n", errmsg);	1817	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1641	return op;	1818	return op;
1642	}	1819	}
		1820
1643	if(where==NULL) {	1821	if (where == NULL)
		1822	{
1644	dump_object(op);	1823	dump_object (op);
1645	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);	1824	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1646	return op;	1825	return op;
1647	}	1826	}
		1827
1648	if (where->head) {	1828	if (where->head)
1649	LOG(llevDebug,	1829	{
1650	"Warning: Tried to insert object wrong part of multipart object.\n");	1830	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1651	where = where->head;	1831	where = where->head;
1652	}	1832	}
		1833
1653	if (op->more) {	1834	if (op->more)
		1835	{
1654	LOG(llevError, "Tried to insert multipart object %s (%d)\n",	1836	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1655	&op->name, op->count);
1656	return op;	1837	return op;
1657	}	1838	}
		1839
1658	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);	1840	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1659	CLEAR_FLAG(op, FLAG_REMOVED);	1841	CLEAR_FLAG (op, FLAG_REMOVED);
1660	if(op->nrof) {	1842	if (op->nrof)
		1843	{
1661	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)	1844	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
1662	if ( CAN_MERGE(tmp,op) ) {	1845	if (CAN_MERGE (tmp, op))
		1846	{
1663	/* return the original object and remove inserted object	1847	/* return the original object and remove inserted object
1664	(client needs the original object) */	1848	(client needs the original object) */
1665	tmp->nrof += op->nrof;	1849	tmp->nrof += op->nrof;
1666	/* Weight handling gets pretty funky. Since we are adding to	1850	/* Weight handling gets pretty funky. Since we are adding to
1667	* tmp->nrof, we need to increase the weight.	1851	* tmp->nrof, we need to increase the weight.
1668	*/	1852	*/
1669	add_weight (where, op->weight*op->nrof);	1853	add_weight (where, op->weight * op->nrof);
1670	SET_FLAG(op, FLAG_REMOVED);	1854	SET_FLAG (op, FLAG_REMOVED);
1671	free_object(op); /* free the inserted object */	1855	free_object (op); /* free the inserted object */
1672	op = tmp;	1856	op = tmp;
1673	remove_ob (op); /* and fix old object's links */	1857	remove_ob (op); /* and fix old object's links */
1674	CLEAR_FLAG(op, FLAG_REMOVED);	1858	CLEAR_FLAG (op, FLAG_REMOVED);
1675	break;	1859	break;
1676	}	1860	}
1677		1861
1678	/* I assume combined objects have no inventory	1862	/* I assume combined objects have no inventory
1679	* We add the weight - this object could have just been removed	1863	* We add the weight - this object could have just been removed
1680	* (if it was possible to merge). calling remove_ob will subtract	1864	* (if it was possible to merge). calling remove_ob will subtract
1681	* the weight, so we need to add it in again, since we actually do	1865	* the weight, so we need to add it in again, since we actually do
1682	* the linking below	1866	* the linking below
1683	*/	1867	*/
1684	add_weight (where, op->weight*op->nrof);	1868	add_weight (where, op->weight * op->nrof);
		1869	}
1685	} else	1870	else
1686	add_weight (where, (op->weight+op->carrying));	1871	add_weight (where, (op->weight + op->carrying));
1687		1872
1688	otmp=is_player_inv(where);	1873	otmp = is_player_inv (where);
1689	if (otmp&&otmp->contr!=NULL) {	1874	if (otmp && otmp->contr != NULL)
		1875	{
1690	if (!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))	1876	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1691	fix_player(otmp);	1877	fix_player (otmp);
1692	}	1878	}
1693		1879
1694	op->map=NULL;	1880	op->map = NULL;
1695	op->env=where;	1881	op->env = where;
1696	op->above=NULL;	1882	op->above = NULL;
1697	op->below=NULL;	1883	op->below = NULL;
1698	op->x=0,op->y=0;	1884	op->x = 0, op->y = 0;
1699		1885
1700	/* reset the light list and los of the players on the map */	1886	/* reset the light list and los of the players on the map */
1701	if((op->glow_radius!=0)&&where->map)	1887	if ((op->glow_radius != 0) && where->map)
1702	{	1888	{
1703	#ifdef DEBUG_LIGHTS	1889	#ifdef DEBUG_LIGHTS
1704	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",	1890	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1705	op->name);
1706	#endif /* DEBUG_LIGHTS */	1891	#endif /* DEBUG_LIGHTS */
		1892	if (MAP_DARKNESS (where->map))
1707	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);	1893	update_all_los (where->map, where->x, where->y);
1708	}	1894	}
1709		1895
1710	/* Client has no idea of ordering so lets not bother ordering it here.	1896	/* Client has no idea of ordering so lets not bother ordering it here.
1711	* It sure simplifies this function...	1897	* It sure simplifies this function...
1712	*/	1898	*/
1713	if (where->inv==NULL)	1899	if (where->inv == NULL)
1714	where->inv=op;	1900	where->inv = op;
1715	else {	1901	else
		1902	{
1716	op->below = where->inv;	1903	op->below = where->inv;
1717	op->below->above = op;	1904	op->below->above = op;
1718	where->inv = op;	1905	where->inv = op;
1719	}	1906	}
1720	return op;	1907	return op;
1721	}	1908	}
1722		1909
1723	/*	1910	/*
1724	* Checks if any objects has a move_type that matches objects	1911	* Checks if any objects has a move_type that matches objects
…		…
1739	* MSW 2001-07-08: Check all objects on space, not just those below	1926	* MSW 2001-07-08: Check all objects on space, not just those below
1740	* object being inserted. insert_ob_in_map may not put new objects	1927	* object being inserted. insert_ob_in_map may not put new objects
1741	* on top.	1928	* on top.
1742	*/	1929	*/
1743		1930
		1931	int
1744	int check_move_on (object *op, object *originator)	1932	check_move_on (object *op, object *originator)
1745	{	1933	{
1746	object *tmp;	1934	object *tmp;
1747	tag_t tag;
1748	mapstruct *m=op->map;	1935	maptile *m = op->map;
1749	int x=op->x, y=op->y;	1936	int x = op->x, y = op->y;
		1937
1750	MoveType move_on, move_slow, move_block;	1938	MoveType move_on, move_slow, move_block;
1751		1939
1752	if(QUERY_FLAG(op,FLAG_NO_APPLY))	1940	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1753	return 0;	1941	return 0;
1754		1942
1755	tag = op->count;
1756
1757	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	1943	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1758	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	1944	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1759	move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y);	1945	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1760		1946
1761	/* if nothing on this space will slow op down or be applied,	1947	/* if nothing on this space will slow op down or be applied,
1762	* no need to do checking below. have to make sure move_type	1948	* no need to do checking below. have to make sure move_type
1763	* is set, as lots of objects don't have it set - we treat that	1949	* is set, as lots of objects don't have it set - we treat that
1764	* as walking.	1950	* as walking.
1765	*/	1951	*/
1766	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))	1952	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
1767	return 0;	1953	return 0;
1768		1954
1769	/* This is basically inverse logic of that below - basically,	1955	/* This is basically inverse logic of that below - basically,
1770	* if the object can avoid the move on or slow move, they do so,	1956	* if the object can avoid the move on or slow move, they do so,
1771	* but can't do it if the alternate movement they are using is	1957	* but can't do it if the alternate movement they are using is
1772	* blocked. Logic on this seems confusing, but does seem correct.	1958	* blocked. Logic on this seems confusing, but does seem correct.
1773	*/	1959	*/
1774	if ((op->move_type & ~move_on & ~move_block) != 0 &&	1960	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1775	(op->move_type & ~move_slow & ~move_block) != 0) return 0;	1961	return 0;
1776		1962
1777	/* The objects have to be checked from top to bottom.	1963	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1964	* Hence, we first go to the top:
1779	*/	1965	*/
1780		1966
1781	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&	1967	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1782	tmp->above!=NULL; tmp=tmp->above) {	1968	{
1783	/* Trim the search when we find the first other spell effect	1969	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1970	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1971	* we don't need to check all of them.
1786	*/	1972	*/
1787	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;	1973	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
		1974	break;
		1975	}
		1976
		1977	for (; tmp; tmp = tmp->below)
1788	}	1978	{
1789	for(;tmp!=NULL; tmp=tmp->below) {	1979	if (tmp == op)
1790	if (tmp == op) continue; /* Can't apply yourself */	1980	continue; /* Can't apply yourself */
1791		1981
1792	/* Check to see if one of the movement types should be slowed down.	1982	/* Check to see if one of the movement types should be slowed down.
1793	* Second check makes sure that the movement types not being slowed	1983	* Second check makes sure that the movement types not being slowed
1794	* (~slow_move) is not blocked on this space - just because the	1984	* (~slow_move) is not blocked on this space - just because the
1795	* space doesn't slow down swimming (for example), if you can't actually	1985	* space doesn't slow down swimming (for example), if you can't actually
1796	* swim on that space, can't use it to avoid the penalty.	1986	* swim on that space, can't use it to avoid the penalty.
1797	*/	1987	*/
1798	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {	1988	if (!QUERY_FLAG (op, FLAG_WIZPASS))
		1989	{
1799	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1990	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1800	((op->move_type & tmp->move_slow) &&
1801	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {	1991	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
		1992	{
1802		1993
1803	float diff;	1994	float
1804
1805	diff = tmp->move_slow_penalty*FABS(op->speed);	1995	diff = tmp->move_slow_penalty * FABS (op->speed);
		1996
1806	if (op->type == PLAYER) {	1997	if (op->type == PLAYER)
1807	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||	1998	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1808	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {	1999	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1809	diff /= 4.0;	2000	diff /= 4.0;
1810	}	2001
1811	}
1812	op->speed_left -= diff;	2002	op->speed_left -= diff;
1813	}	2003	}
1814	}	2004	}
1815		2005
1816	/* Basically same logic as above, except now for actual apply. */	2006	/* Basically same logic as above, except now for actual apply. */
1817	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2007	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1818	((op->move_type & tmp->move_on) &&
1819	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {	2008	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1820		2009	{
1821	move_apply(tmp, op, originator);	2010	move_apply (tmp, op, originator);
		2011
1822	if (was_destroyed (op, tag))	2012	if (op->destroyed ())
1823	return 1;	2013	return 1;
1824		2014
1825	/* what the person/creature stepped onto has moved the object	2015	/* what the person/creature stepped onto has moved the object
1826	* someplace new. Don't process any further - if we did,	2016	* someplace new. Don't process any further - if we did,
1827	* have a feeling strange problems would result.	2017	* have a feeling strange problems would result.
1828	*/	2018	*/
1829	if (op->map != m || op->x != x || op->y != y) return 0;	2019	if (op->map != m || op->x != x || op->y != y)
		2020	return 0;
1830	}	2021	}
1831	}	2022	}
		2023
1832	return 0;	2024	return 0;
1833	}	2025	}
1834		2026
1835	/*	2027	/*
1836	* present_arch(arch, map, x, y) searches for any objects with	2028	* present_arch(arch, map, x, y) searches for any objects with
1837	* a matching archetype at the given map and coordinates.	2029	* a matching archetype at the given map and coordinates.
1838	* The first matching object is returned, or NULL if none.	2030	* The first matching object is returned, or NULL if none.
1839	*/	2031	*/
1840		2032
		2033	object *
1841	object *present_arch(const archetype *at, mapstruct *m, int x, int y) {	2034	present_arch (const archetype *at, maptile *m, int x, int y)
		2035	{
1842	object *tmp;	2036	object *
		2037	tmp;
		2038
1843	if(m==NULL || out_of_map(m,x,y)) {	2039	if (m == NULL || out_of_map (m, x, y))
		2040	{
1844	LOG(llevError,"Present_arch called outside map.\n");	2041	LOG (llevError, "Present_arch called outside map.\n");
1845	return NULL;	2042	return NULL;
1846	}	2043	}
1847	for(tmp=GET_MAP_OB(m,x,y); tmp != NULL; tmp = tmp->above)	2044	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1848	if(tmp->arch == at)	2045	if (tmp->arch == at)
1849	return tmp;	2046	return tmp;
1850	return NULL;	2047	return NULL;
1851	}	2048	}
1852		2049
1853	/*	2050	/*
1854	* present(type, map, x, y) searches for any objects with	2051	* present(type, map, x, y) searches for any objects with
1855	* a matching type variable at the given map and coordinates.	2052	* a matching type variable at the given map and coordinates.
1856	* The first matching object is returned, or NULL if none.	2053	* The first matching object is returned, or NULL if none.
1857	*/	2054	*/
1858		2055
		2056	object *
1859	object *present(unsigned char type,mapstruct *m, int x,int y) {	2057	present (unsigned char type, maptile *m, int x, int y)
		2058	{
1860	object *tmp;	2059	object *
		2060	tmp;
		2061
1861	if(out_of_map(m,x,y)) {	2062	if (out_of_map (m, x, y))
		2063	{
1862	LOG(llevError,"Present called outside map.\n");	2064	LOG (llevError, "Present called outside map.\n");
1863	return NULL;	2065	return NULL;
1864	}	2066	}
1865	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above)	2067	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1866	if(tmp->type==type)	2068	if (tmp->type == type)
1867	return tmp;	2069	return tmp;
1868	return NULL;	2070	return NULL;
1869	}	2071	}
1870		2072
1871	/*	2073	/*
1872	* present_in_ob(type, object) searches for any objects with	2074	* present_in_ob(type, object) searches for any objects with
1873	* a matching type variable in the inventory of the given object.	2075	* a matching type variable in the inventory of the given object.
1874	* The first matching object is returned, or NULL if none.	2076	* The first matching object is returned, or NULL if none.
1875	*/	2077	*/
1876		2078
		2079	object *
1877	object *present_in_ob(unsigned char type, const object *op) {	2080	present_in_ob (unsigned char type, const object *op)
		2081	{
1878	object *tmp;	2082	object *
		2083	tmp;
		2084
1879	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)	2085	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1880	if(tmp->type==type)	2086	if (tmp->type == type)
1881	return tmp;	2087	return tmp;
1882	return NULL;	2088	return NULL;
1883	}	2089	}
1884		2090
1885	/*	2091	/*
…		…
1895	* the object name, not the archetype name. this is so that the	2101	* the object name, not the archetype name. this is so that the
1896	* spell code can use one object type (force), but change it's name	2102	* spell code can use one object type (force), but change it's name
1897	* to be unique.	2103	* to be unique.
1898	*/	2104	*/
1899		2105
		2106	object *
1900	object *present_in_ob_by_name(int type, const char *str, const object *op) {	2107	present_in_ob_by_name (int type, const char *str, const object *op)
		2108	{
1901	object *tmp;	2109	object *
		2110	tmp;
1902		2111
1903	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {	2112	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2113	{
1904	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))	2114	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1905	return tmp;	2115	return tmp;
1906	}	2116	}
1907	return NULL;	2117	return NULL;
1908	}	2118	}
1909		2119
1910	/*	2120	/*
1911	* present_arch_in_ob(archetype, object) searches for any objects with	2121	* present_arch_in_ob(archetype, object) searches for any objects with
1912	* a matching archetype in the inventory of the given object.	2122	* a matching archetype in the inventory of the given object.
1913	* The first matching object is returned, or NULL if none.	2123	* The first matching object is returned, or NULL if none.
1914	*/	2124	*/
1915		2125
		2126	object *
1916	object *present_arch_in_ob(const archetype *at, const object *op) {	2127	present_arch_in_ob (const archetype *at, const object *op)
		2128	{
1917	object *tmp;	2129	object *
		2130	tmp;
		2131
1918	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)	2132	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1919	if( tmp->arch == at)	2133	if (tmp->arch == at)
1920	return tmp;	2134	return tmp;
1921	return NULL;	2135	return NULL;
1922	}	2136	}
1923		2137
1924	/*	2138	/*
1925	* activate recursively a flag on an object inventory	2139	* activate recursively a flag on an object inventory
1926	*/	2140	*/
		2141	void
1927	void flag_inv(object*op, int flag){	2142	flag_inv (object *op, int flag)
		2143	{
1928	object *tmp;	2144	object *
		2145	tmp;
		2146
1929	if(op->inv)	2147	if (op->inv)
1930	for(tmp = op->inv; tmp != NULL; tmp = tmp->below){	2148	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2149	{
1931	SET_FLAG(tmp, flag);	2150	SET_FLAG (tmp, flag);
1932	flag_inv(tmp,flag);	2151	flag_inv (tmp, flag);
1933	}	2152	}
1934	}/*	2153	} /*
1935	* desactivate recursively a flag on an object inventory	2154	* desactivate recursively a flag on an object inventory
1936	*/	2155	*/
		2156	void
1937	void unflag_inv(object*op, int flag){	2157	unflag_inv (object *op, int flag)
		2158	{
1938	object *tmp;	2159	object *
		2160	tmp;
		2161
1939	if(op->inv)	2162	if (op->inv)
1940	for(tmp = op->inv; tmp != NULL; tmp = tmp->below){	2163	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2164	{
1941	CLEAR_FLAG(tmp, flag);	2165	CLEAR_FLAG (tmp, flag);
1942	unflag_inv(tmp,flag);	2166	unflag_inv (tmp, flag);
1943	}	2167	}
1944	}	2168	}
1945		2169
1946	/*	2170	/*
1947	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	2171	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1948	* all it's inventory (recursively).	2172	* all it's inventory (recursively).
1949	* If checksums are used, a player will get set_cheat called for	2173	* If checksums are used, a player will get set_cheat called for
1950	* him/her-self and all object carried by a call to this function.	2174	* him/her-self and all object carried by a call to this function.
1951	*/	2175	*/
1952		2176
		2177	void
1953	void set_cheat(object *op) {	2178	set_cheat (object *op)
		2179	{
1954	SET_FLAG(op, FLAG_WAS_WIZ);	2180	SET_FLAG (op, FLAG_WAS_WIZ);
1955	flag_inv(op, FLAG_WAS_WIZ);	2181	flag_inv (op, FLAG_WAS_WIZ);
1956	}	2182	}
1957		2183
1958	/*	2184	/*
1959	* find_free_spot(object, map, x, y, start, stop) will search for	2185	* find_free_spot(object, map, x, y, start, stop) will search for
1960	* a spot at the given map and coordinates which will be able to contain	2186	* a spot at the given map and coordinates which will be able to contain
…		…
1975	* to know if the space in question will block the object. We can't use	2201	* to know if the space in question will block the object. We can't use
1976	* the archetype because that isn't correct if the monster has been	2202	* the archetype because that isn't correct if the monster has been
1977	* customized, changed states, etc.	2203	* customized, changed states, etc.
1978	*/	2204	*/
1979		2205
		2206	int
1980	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {	2207	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
		2208	{
		2209	int
		2210	i,
1981	int i,index=0, flag;	2211	index = 0, flag;
		2212	static int
1982	static int altern[SIZEOFFREE];	2213	altern[SIZEOFFREE];
1983		2214
1984	for(i=start;i<stop;i++) {	2215	for (i = start; i < stop; i++)
		2216	{
1985	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);	2217	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
1986	if(!flag)	2218	if (!flag)
1987	altern[index++]=i;	2219	altern[index++] = i;
1988		2220
1989	/* Basically, if we find a wall on a space, we cut down the search size.	2221	/* Basically, if we find a wall on a space, we cut down the search size.
1990	* In this way, we won't return spaces that are on another side of a wall.	2222	* In this way, we won't return spaces that are on another side of a wall.
1991	* This mostly work, but it cuts down the search size in all directions -	2223	* This mostly work, but it cuts down the search size in all directions -
1992	* if the space being examined only has a wall to the north and empty	2224	* if the space being examined only has a wall to the north and empty
1993	* spaces in all the other directions, this will reduce the search space	2225	* spaces in all the other directions, this will reduce the search space
1994	* to only the spaces immediately surrounding the target area, and	2226	* to only the spaces immediately surrounding the target area, and
1995	* won't look 2 spaces south of the target space.	2227	* won't look 2 spaces south of the target space.
1996	*/	2228	*/
1997	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)	2229	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)
1998	stop=maxfree[i];	2230	stop = maxfree[i];
1999	}	2231	}
2000	if(!index) return -1;	2232	if (!index)
		2233	return -1;
2001	return altern[RANDOM()%index];	2234	return altern[RANDOM () % index];
2002	}	2235	}
2003		2236
2004	/*	2237	/*
2005	* find_first_free_spot(archetype, mapstruct, x, y) works like	2238	* find_first_free_spot(archetype, maptile, x, y) works like
2006	* find_free_spot(), but it will search max number of squares.	2239	* find_free_spot(), but it will search max number of squares.
2007	* But it will return the first available spot, not a random choice.	2240	* But it will return the first available spot, not a random choice.
2008	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2241	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2009	*/	2242	*/
2010		2243
		2244	int
2011	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {	2245	find_first_free_spot (const object *ob, maptile *m, int x, int y)
		2246	{
		2247	int
2012	int i;	2248	i;
		2249
2013	for(i=0;i<SIZEOFFREE;i++) {	2250	for (i = 0; i < SIZEOFFREE; i++)
		2251	{
2014	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))	2252	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2015	return i;	2253	return i;
2016	}	2254	}
2017	return -1;	2255	return -1;
2018	}	2256	}
2019		2257
2020	/*	2258	/*
2021	* The function permute(arr, begin, end) randomly reorders the array	2259	* The function permute(arr, begin, end) randomly reorders the array
2022	* arr[begin..end-1].	2260	* arr[begin..end-1].
2023	*/	2261	*/
		2262	static void
2024	static void permute(int *arr, int begin, int end)	2263	permute (int *arr, int begin, int end)
2025	{	2264	{
2026	int i, j, tmp, len;	2265	int
		2266	i,
		2267	j,
		2268	tmp,
		2269	len;
2027		2270
2028	len = end-begin;	2271	len = end - begin;
2029	for(i = begin; i < end; i++)	2272	for (i = begin; i < end; i++)
2030	{	2273	{
2031	j = begin+RANDOM()%len;	2274	j = begin + RANDOM () % len;
2032		2275
2033	tmp = arr[i];	2276	tmp = arr[i];
2034	arr[i] = arr[j];	2277	arr[i] = arr[j];
2035	arr[j] = tmp;	2278	arr[j] = tmp;
2036	}	2279	}
2037	}	2280	}
2038		2281
2039	/* new function to make monster searching more efficient, and effective!	2282	/* new function to make monster searching more efficient, and effective!
2040	* This basically returns a randomized array (in the passed pointer) of	2283	* This basically returns a randomized array (in the passed pointer) of
2041	* the spaces to find monsters. In this way, it won't always look for	2284	* the spaces to find monsters. In this way, it won't always look for
2042	* monsters to the north first. However, the size of the array passed	2285	* monsters to the north first. However, the size of the array passed
2043	* covers all the spaces, so within that size, all the spaces within	2286	* covers all the spaces, so within that size, all the spaces within
2044	* the 3x3 area will be searched, just not in a predictable order.	2287	* the 3x3 area will be searched, just not in a predictable order.
2045	*/	2288	*/
		2289	void
2046	void get_search_arr(int *search_arr)	2290	get_search_arr (int *search_arr)
2047	{	2291	{
		2292	int
2048	int i;	2293	i;
2049		2294
2050	for(i = 0; i < SIZEOFFREE; i++)	2295	for (i = 0; i < SIZEOFFREE; i++)
2051	{	2296	{
2052	search_arr[i] = i;	2297	search_arr[i] = i;
2053	}	2298	}
2054		2299
2055	permute(search_arr, 1, SIZEOFFREE1+1);	2300	permute (search_arr, 1, SIZEOFFREE1 + 1);
2056	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);	2301	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2057	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);	2302	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2058	}	2303	}
2059		2304
2060	/*	2305	/*
2061	* find_dir(map, x, y, exclude) will search some close squares in the	2306	* find_dir(map, x, y, exclude) will search some close squares in the
2062	* given map at the given coordinates for live objects.	2307	* given map at the given coordinates for live objects.
…		…
2068	* is actually want is going to try and move there. We need this info	2313	* is actually want is going to try and move there. We need this info
2069	* because we have to know what movement the thing looking to move	2314	* because we have to know what movement the thing looking to move
2070	* there is capable of.	2315	* there is capable of.
2071	*/	2316	*/
2072		2317
		2318	int
2073	int find_dir(mapstruct *m, int x, int y, object *exclude) {	2319	find_dir (maptile *m, int x, int y, object *exclude)
		2320	{
		2321	int
		2322	i,
2074	int i,max=SIZEOFFREE, mflags;	2323	max = SIZEOFFREE, mflags;
		2324
2075	sint16 nx, ny;	2325	sint16 nx, ny;
2076	object *tmp;	2326	object *
2077	mapstruct *mp;	2327	tmp;
		2328	maptile *
		2329	mp;
		2330
2078	MoveType blocked, move_type;	2331	MoveType blocked, move_type;
2079		2332
2080	if (exclude && exclude->head) {	2333	if (exclude && exclude->head)
		2334	{
2081	exclude = exclude->head;	2335	exclude = exclude->head;
2082	move_type = exclude->move_type;	2336	move_type = exclude->move_type;
2083	} else {	2337	}
		2338	else
		2339	{
2084	/* If we don't have anything, presume it can use all movement types. */	2340	/* If we don't have anything, presume it can use all movement types. */
2085	move_type=MOVE_ALL;	2341	move_type = MOVE_ALL;
		2342	}
		2343
		2344	for (i = 1; i < max; i++)
2086	}	2345	{
2087
2088	for(i=1;i<max;i++) {
2089	mp = m;	2346	mp = m;
2090	nx = x + freearr_x[i];	2347	nx = x + freearr_x[i];
2091	ny = y + freearr_y[i];	2348	ny = y + freearr_y[i];
2092		2349
2093	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);	2350	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2094	if (mflags & P_OUT_OF_MAP) {	2351	if (mflags & P_OUT_OF_MAP)
		2352	{
2095	max = maxfree[i];	2353	max = maxfree[i];
		2354	}
2096	} else {	2355	else
		2356	{
2097	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);	2357	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2098		2358
2099	if ((move_type & blocked) == move_type) {	2359	if ((move_type & blocked) == move_type)
		2360	{
2100	max=maxfree[i];	2361	max = maxfree[i];
		2362	}
2101	} else if (mflags & P_IS_ALIVE) {	2363	else if (mflags & P_IS_ALIVE)
		2364	{
2102	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {	2365	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2103	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&	2366	{
2104	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {	2367	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
		2368	{
2105	break;	2369	break;
2106	}	2370	}
2107	}	2371	}
2108	if(tmp) {	2372	if (tmp)
		2373	{
2109	return freedir[i];	2374	return freedir[i];
2110	}	2375	}
2111	}	2376	}
2112	}	2377	}
2113	}	2378	}
2114	return 0;	2379	return 0;
2115	}	2380	}
2116		2381
2117	/*	2382	/*
2118	* distance(object 1, object 2) will return the square of the	2383	* distance(object 1, object 2) will return the square of the
2119	* distance between the two given objects.	2384	* distance between the two given objects.
2120	*/	2385	*/
2121		2386
		2387	int
2122	int distance(const object *ob1, const object *ob2) {	2388	distance (const object *ob1, const object *ob2)
		2389	{
2123	int i;	2390	int
2124	i= (ob1->x - ob2->x)*(ob1->x - ob2->x)+	2391	i;
2125	(ob1->y - ob2->y)*(ob1->y - ob2->y);	2392
		2393	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2126	return i;	2394	return i;
2127	}	2395	}
2128		2396
2129	/*	2397	/*
2130	* find_dir_2(delta-x,delta-y) will return a direction in which	2398	* find_dir_2(delta-x,delta-y) will return a direction in which
2131	* an object which has subtracted the x and y coordinates of another	2399	* an object which has subtracted the x and y coordinates of another
2132	* object, needs to travel toward it.	2400	* object, needs to travel toward it.
2133	*/	2401	*/
2134		2402
		2403	int
2135	int find_dir_2(int x, int y) {	2404	find_dir_2 (int x, int y)
		2405	{
2136	int q;	2406	int
		2407	q;
2137		2408
2138	if(y)	2409	if (y)
2139	q=x*100/y;	2410	q = x * 100 / y;
2140	else if (x)	2411	else if (x)
2141	q= -300*x;	2412	q = -300 * x;
2142	else	2413	else
2143	return 0;	2414	return 0;
2144		2415
2145	if(y>0) {	2416	if (y > 0)
		2417	{
2146	if(q < -242)	2418	if (q < -242)
2147	return 3 ;	2419	return 3;
2148	if (q < -41)	2420	if (q < -41)
2149	return 2 ;	2421	return 2;
2150	if (q < 41)	2422	if (q < 41)
2151	return 1 ;	2423	return 1;
2152	if (q < 242)	2424	if (q < 242)
2153	return 8 ;	2425	return 8;
2154	return 7 ;	2426	return 7;
2155	}	2427	}
2156		2428
2157	if (q < -242)	2429	if (q < -242)
2158	return 7 ;	2430	return 7;
2159	if (q < -41)	2431	if (q < -41)
2160	return 6 ;	2432	return 6;
2161	if (q < 41)	2433	if (q < 41)
2162	return 5 ;	2434	return 5;
2163	if (q < 242)	2435	if (q < 242)
2164	return 4 ;	2436	return 4;
2165		2437
2166	return 3 ;	2438	return 3;
2167	}	2439	}
2168		2440
2169	/*	2441	/*
2170	* absdir(int): Returns a number between 1 and 8, which represent	2442	* absdir(int): Returns a number between 1 and 8, which represent
2171	* the "absolute" direction of a number (it actually takes care of	2443	* the "absolute" direction of a number (it actually takes care of
2172	* "overflow" in previous calculations of a direction).	2444	* "overflow" in previous calculations of a direction).
2173	*/	2445	*/
2174		2446
		2447	int
2175	int absdir(int d) {	2448	absdir (int d)
2176	while(d<1) d+=8;	2449	{
2177	while(d>8) d-=8;	2450	while (d < 1)
		2451	d += 8;
		2452	while (d > 8)
		2453	d -= 8;
2178	return d;	2454	return d;
2179	}	2455	}
2180		2456
2181	/*	2457	/*
2182	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2458	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2183	* between two directions (which are expected to be absolute (see absdir())	2459	* between two directions (which are expected to be absolute (see absdir())
2184	*/	2460	*/
2185		2461
		2462	int
2186	int dirdiff(int dir1, int dir2) {	2463	dirdiff (int dir1, int dir2)
		2464	{
2187	int d;	2465	int
		2466	d;
		2467
2188	d = abs(dir1 - dir2);	2468	d = abs (dir1 - dir2);
2189	if(d>4)	2469	if (d > 4)
2190	d = 8 - d;	2470	d = 8 - d;
2191	return d;	2471	return d;
2192	}	2472	}
2193		2473
2194	/* peterm:	2474	/* peterm:
…		…
2199	* direction 4, 14, or 16 to get back to where we are.	2479	* direction 4, 14, or 16 to get back to where we are.
2200	* Moved from spell_util.c to object.c with the other related direction	2480	* Moved from spell_util.c to object.c with the other related direction
2201	* functions.	2481	* functions.
2202	*/	2482	*/
2203		2483
		2484	int
2204	int reduction_dir[SIZEOFFREE][3] = {	2485	reduction_dir[SIZEOFFREE][3] = {
2205	{0,0,0}, /* 0 */	2486	{0, 0, 0}, /* 0 */
2206	{0,0,0}, /* 1 */	2487	{0, 0, 0}, /* 1 */
2207	{0,0,0}, /* 2 */	2488	{0, 0, 0}, /* 2 */
2208	{0,0,0}, /* 3 */	2489	{0, 0, 0}, /* 3 */
2209	{0,0,0}, /* 4 */	2490	{0, 0, 0}, /* 4 */
2210	{0,0,0}, /* 5 */	2491	{0, 0, 0}, /* 5 */
2211	{0,0,0}, /* 6 */	2492	{0, 0, 0}, /* 6 */
2212	{0,0,0}, /* 7 */	2493	{0, 0, 0}, /* 7 */
2213	{0,0,0}, /* 8 */	2494	{0, 0, 0}, /* 8 */
2214	{8,1,2}, /* 9 */	2495	{8, 1, 2}, /* 9 */
2215	{1,2,-1}, /* 10 */	2496	{1, 2, -1}, /* 10 */
2216	{2,10,12}, /* 11 */	2497	{2, 10, 12}, /* 11 */
2217	{2,3,-1}, /* 12 */	2498	{2, 3, -1}, /* 12 */
2218	{2,3,4}, /* 13 */	2499	{2, 3, 4}, /* 13 */
2219	{3,4,-1}, /* 14 */	2500	{3, 4, -1}, /* 14 */
2220	{4,14,16}, /* 15 */	2501	{4, 14, 16}, /* 15 */
2221	{5,4,-1}, /* 16 */	2502	{5, 4, -1}, /* 16 */
2222	{4,5,6}, /* 17 */	2503	{4, 5, 6}, /* 17 */
2223	{6,5,-1}, /* 18 */	2504	{6, 5, -1}, /* 18 */
2224	{6,20,18}, /* 19 */	2505	{6, 20, 18}, /* 19 */
2225	{7,6,-1}, /* 20 */	2506	{7, 6, -1}, /* 20 */
2226	{6,7,8}, /* 21 */	2507	{6, 7, 8}, /* 21 */
2227	{7,8,-1}, /* 22 */	2508	{7, 8, -1}, /* 22 */
2228	{8,22,24}, /* 23 */	2509	{8, 22, 24}, /* 23 */
2229	{8,1,-1}, /* 24 */	2510	{8, 1, -1}, /* 24 */
2230	{24,9,10}, /* 25 */	2511	{24, 9, 10}, /* 25 */
2231	{9,10,-1}, /* 26 */	2512	{9, 10, -1}, /* 26 */
2232	{10,11,-1}, /* 27 */	2513	{10, 11, -1}, /* 27 */
2233	{27,11,29}, /* 28 */	2514	{27, 11, 29}, /* 28 */
2234	{11,12,-1}, /* 29 */	2515	{11, 12, -1}, /* 29 */
2235	{12,13,-1}, /* 30 */	2516	{12, 13, -1}, /* 30 */
2236	{12,13,14}, /* 31 */	2517	{12, 13, 14}, /* 31 */
2237	{13,14,-1}, /* 32 */	2518	{13, 14, -1}, /* 32 */
2238	{14,15,-1}, /* 33 */	2519	{14, 15, -1}, /* 33 */
2239	{33,15,35}, /* 34 */	2520	{33, 15, 35}, /* 34 */
2240	{16,15,-1}, /* 35 */	2521	{16, 15, -1}, /* 35 */
2241	{17,16,-1}, /* 36 */	2522	{17, 16, -1}, /* 36 */
2242	{18,17,16}, /* 37 */	2523	{18, 17, 16}, /* 37 */
2243	{18,17,-1}, /* 38 */	2524	{18, 17, -1}, /* 38 */
2244	{18,19,-1}, /* 39 */	2525	{18, 19, -1}, /* 39 */
2245	{41,19,39}, /* 40 */	2526	{41, 19, 39}, /* 40 */
2246	{19,20,-1}, /* 41 */	2527	{19, 20, -1}, /* 41 */
2247	{20,21,-1}, /* 42 */	2528	{20, 21, -1}, /* 42 */
2248	{20,21,22}, /* 43 */	2529	{20, 21, 22}, /* 43 */
2249	{21,22,-1}, /* 44 */	2530	{21, 22, -1}, /* 44 */
2250	{23,22,-1}, /* 45 */	2531	{23, 22, -1}, /* 45 */
2251	{45,47,23}, /* 46 */	2532	{45, 47, 23}, /* 46 */
2252	{23,24,-1}, /* 47 */	2533	{23, 24, -1}, /* 47 */
2253	{24,9,-1}}; /* 48 */	2534	{24, 9, -1}
		2535	}; /* 48 */
2254		2536
2255	/* Recursive routine to step back and see if we can	2537	/* Recursive routine to step back and see if we can
2256	* find a path to that monster that we found. If not,	2538	* find a path to that monster that we found. If not,
2257	* we don't bother going toward it. Returns 1 if we	2539	* we don't bother going toward it. Returns 1 if we
2258	* can see a direct way to get it	2540	* can see a direct way to get it
2259	* Modified to be map tile aware -.MSW	2541	* Modified to be map tile aware -.MSW
2260	*/	2542	*/
2261
2262		2543
		2544
		2545	int
2263	int can_see_monsterP(mapstruct *m, int x, int y,int dir) {	2546	can_see_monsterP (maptile *m, int x, int y, int dir)
		2547	{
2264	sint16 dx, dy;	2548	sint16 dx, dy;
		2549	int
2265	int mflags;	2550	mflags;
2266		2551
		2552	if (dir < 0)
2267	if(dir<0) return 0; /* exit condition: invalid direction */	2553	return 0; /* exit condition: invalid direction */
2268		2554
2269	dx = x + freearr_x[dir];	2555	dx = x + freearr_x[dir];
2270	dy = y + freearr_y[dir];	2556	dy = y + freearr_y[dir];
2271		2557
2272	mflags = get_map_flags(m, &m, dx, dy, &dx, &dy);	2558	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2273		2559
2274	/* This functional arguably was incorrect before - it was	2560	/* This functional arguably was incorrect before - it was
2275	* checking for P_WALL - that was basically seeing if	2561	* checking for P_WALL - that was basically seeing if
2276	* we could move to the monster - this is being more	2562	* we could move to the monster - this is being more
2277	* literal on if we can see it. To know if we can actually	2563	* literal on if we can see it. To know if we can actually
2278	* move to the monster, we'd need the monster passed in or	2564	* move to the monster, we'd need the monster passed in or
2279	* at least its move type.	2565	* at least its move type.
2280	*/	2566	*/
2281	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;	2567	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
		2568	return 0;
2282		2569
2283	/* yes, can see. */	2570	/* yes, can see. */
2284	if(dir < 9) return 1;	2571	if (dir < 9)
		2572	return 1;
2285	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |	2573	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2286	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |	2574	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2287	can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2288	}	2575	}
2289		2576
2290		2577
2291		2578
2292	/*	2579	/*
2293	* can_pick(picker, item): finds out if an object is possible to be	2580	* can_pick(picker, item): finds out if an object is possible to be
2294	* picked up by the picker. Returnes 1 if it can be	2581	* picked up by the picker. Returnes 1 if it can be
2295	* picked up, otherwise 0.	2582	* picked up, otherwise 0.
2296	*	2583	*
…		…
2298	* core dumps if they do.	2585	* core dumps if they do.
2299	*	2586	*
2300	* Add a check so we can't pick up invisible objects (0.93.8)	2587	* Add a check so we can't pick up invisible objects (0.93.8)
2301	*/	2588	*/
2302		2589
		2590	int
2303	int can_pick(const object *who, const object *item) {	2591	can_pick (const object *who, const object *item)
		2592	{
2304	return /*QUERY_FLAG(who,FLAG_WIZ)||*/	2593	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2305	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&	2594	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2306	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&	2595	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2307	(who->type==PLAYER||item->weight<who->weight/3));
2308	}	2596	}
2309		2597
2310		2598
2311	/*	2599	/*
2312	* create clone from object to another	2600	* create clone from object to another
2313	*/	2601	*/
		2602	object *
2314	object *object_create_clone (object *asrc) {	2603	object_create_clone (object *asrc)
		2604	{
		2605	object *
2315	object *dst = NULL,*tmp,*src,*part,*prev, *item;	2606	dst = NULL, *tmp, *src, *part, *prev, *item;
2316		2607
		2608	if (!asrc)
2317	if(!asrc) return NULL;	2609	return NULL;
2318	src = asrc;	2610	src = asrc;
2319	if(src->head)	2611	if (src->head)
2320	src = src->head;	2612	src = src->head;
2321		2613
2322	prev = NULL;	2614	prev = NULL;
2323	for(part = src; part; part = part->more) {	2615	for (part = src; part; part = part->more)
		2616	{
2324	tmp = get_object();	2617	tmp = get_object ();
2325	copy_object(part,tmp);	2618	copy_object (part, tmp);
2326	tmp->x -= src->x;	2619	tmp->x -= src->x;
2327	tmp->y -= src->y;	2620	tmp->y -= src->y;
2328	if(!part->head) {	2621	if (!part->head)
		2622	{
2329	dst = tmp;	2623	dst = tmp;
2330	tmp->head = NULL;	2624	tmp->head = NULL;
		2625	}
2331	} else {	2626	else
		2627	{
2332	tmp->head = dst;	2628	tmp->head = dst;
2333	}	2629	}
2334	tmp->more = NULL;	2630	tmp->more = NULL;
2335	if(prev)	2631	if (prev)
2336	prev->more = tmp;	2632	prev->more = tmp;
2337	prev = tmp;	2633	prev = tmp;
2338	}	2634	}
2339	/*** copy inventory ***/	2635
2340	for(item = src->inv; item; item = item->below) {	2636	for (item = src->inv; item; item = item->below)
2341	(void) insert_ob_in_ob(object_create_clone(item),dst);	2637	insert_ob_in_ob (object_create_clone (item), dst);
2342	}
2343		2638
2344	return dst;	2639	return dst;
2345	}
2346
2347	/* return true if the object was destroyed, 0 otherwise */
2348	int was_destroyed (const object *op, tag_t old_tag)
2349	{
2350	/* checking for FLAG_FREED isn't necessary, but makes this function more
2351	* robust */
2352	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2353	}	2640	}
2354		2641
2355	/* GROS - Creates an object using a string representing its content. */	2642	/* GROS - Creates an object using a string representing its content. */
2356	/* Basically, we save the content of the string to a temp file, then call */	2643	/* Basically, we save the content of the string to a temp file, then call */
2357	/* load_object on it. I admit it is a highly inefficient way to make things, */	2644	/* load_object on it. I admit it is a highly inefficient way to make things, */
2358	/* but it was simple to make and allows reusing the load_object function. */	2645	/* but it was simple to make and allows reusing the load_object function. */
2359	/* Remember not to use load_object_str in a time-critical situation. */	2646	/* Remember not to use load_object_str in a time-critical situation. */
2360	/* Also remember that multiparts objects are not supported for now. */	2647	/* Also remember that multiparts objects are not supported for now. */
2361		2648
		2649	object *
2362	object* load_object_str(const char *obstr)	2650	load_object_str (const char *obstr)
2363	{	2651	{
2364	object *op;	2652	object *op;
2365	char filename[MAX_BUF];	2653	char filename[MAX_BUF];
		2654
2366	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);	2655	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2367		2656
2368	FILE *tempfile=fopen(filename,"w");	2657	FILE *tempfile = fopen (filename, "w");
		2658
2369	if (tempfile == NULL)	2659	if (tempfile == NULL)
2370	{	2660	{
2371	LOG(llevError,"Error - Unable to access load object temp file\n");	2661	LOG (llevError, "Error - Unable to access load object temp file\n");
2372	return NULL;	2662	return NULL;
2373	};	2663	}
		2664
2374	fprintf(tempfile,obstr);	2665	fprintf (tempfile, obstr);
2375	fclose(tempfile);	2666	fclose (tempfile);
2376		2667
2377	op=get_object();	2668	op = get_object ();
2378		2669
2379	object_thawer thawer (filename);	2670	object_thawer thawer (filename);
2380		2671
2381	if (thawer)	2672	if (thawer)
2382	load_object(thawer,op,0);	2673	load_object (thawer, op, 0);
2383		2674
2384	LOG(llevDebug," load str completed, object=%s\n", &op->name);	2675	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2385	CLEAR_FLAG(op,FLAG_REMOVED);	2676	CLEAR_FLAG (op, FLAG_REMOVED);
2386		2677
2387	return op;	2678	return op;
2388	}	2679	}
2389		2680
2390	/* This returns the first object in who's inventory that	2681	/* This returns the first object in who's inventory that
2391	* has the same type and subtype match.	2682	* has the same type and subtype match.
2392	* returns NULL if no match.	2683	* returns NULL if no match.
2393	*/	2684	*/
		2685	object *
2394	object *find_obj_by_type_subtype(const object *who, int type, int subtype)	2686	find_obj_by_type_subtype (const object *who, int type, int subtype)
2395	{	2687	{
2396	object *tmp;	2688	object *tmp;
2397		2689
2398	for (tmp=who->inv; tmp; tmp=tmp->below)	2690	for (tmp = who->inv; tmp; tmp = tmp->below)
2399	if (tmp->type == type && tmp->subtype == subtype) return tmp;	2691	if (tmp->type == type && tmp->subtype == subtype)
		2692	return tmp;
2400		2693
2401	return NULL;	2694	return NULL;
2402	}	2695	}
2403		2696
2404	/* If ob has a field named key, return the link from the list,	2697	/* If ob has a field named key, return the link from the list,
2405	* otherwise return NULL.	2698	* otherwise return NULL.
2406	*	2699	*
2407	* key must be a passed in shared string - otherwise, this won't	2700	* key must be a passed in shared string - otherwise, this won't
2408	* do the desired thing.	2701	* do the desired thing.
2409	*/	2702	*/
		2703	key_value *
2410	key_value * get_ob_key_link(const object * ob, const char * key) {	2704	get_ob_key_link (const object *ob, const char *key)
		2705	{
2411	key_value * link;	2706	key_value *link;
2412		2707
2413	for (link = ob->key_values; link != NULL; link = link->next) {	2708	for (link = ob->key_values; link != NULL; link = link->next)
2414	if (link->key == key) {	2709	if (link->key == key)
2415	return link;	2710	return link;
2416	}	2711
2417	}
2418
2419	return NULL;	2712	return NULL;
2420	}	2713	}
2421		2714
2422	/*	2715	/*
2423	* Returns the value of op has an extra_field for key, or NULL.	2716	* Returns the value of op has an extra_field for key, or NULL.
2424	*	2717	*
2425	* The argument doesn't need to be a shared string.	2718	* The argument doesn't need to be a shared string.
2426	*	2719	*
2427	* The returned string is shared.	2720	* The returned string is shared.
2428	*/	2721	*/
		2722	const char *
2429	const char * get_ob_key_value(const object * op, const char * const key) {	2723	get_ob_key_value (const object *op, const char *const key)
		2724	{
2430	key_value * link;	2725	key_value *link;
2431	const char * canonical_key;	2726	shstr_cmp canonical_key (key);
		2727
		2728	if (!canonical_key)
2432		2729	{
2433	canonical_key = shstr::find (key);
2434
2435	if (canonical_key == NULL) {
2436	/* 1. There being a field named key on any object	2730	/* 1. There being a field named key on any object
2437	* implies there'd be a shared string to find.	2731	* implies there'd be a shared string to find.
2438	* 2. Since there isn't, no object has this field.	2732	* 2. Since there isn't, no object has this field.
2439	* 3. Therefore, *this* object doesn't have this field.	2733	* 3. Therefore, *this* object doesn't have this field.
2440	*/	2734	*/
2441	return NULL;	2735	return 0;
2442	}	2736	}
2443		2737
2444	/* This is copied from get_ob_key_link() above -	2738	/* This is copied from get_ob_key_link() above -
2445	* only 4 lines, and saves the function call overhead.	2739	* only 4 lines, and saves the function call overhead.
2446	*/	2740	*/
2447	for (link = op->key_values; link != NULL; link = link->next) {	2741	for (link = op->key_values; link; link = link->next)
2448	if (link->key == canonical_key) {	2742	if (link->key == canonical_key)
2449	return link->value;	2743	return link->value;
2450	}	2744
2451	}	2745	return 0;
2452	return NULL;
2453	}	2746	}
2454		2747
2455		2748
2456	/*	2749	/*
2457	* Updates the canonical_key in op to value.	2750	* Updates the canonical_key in op to value.
…		…
2461	* Unless add_key is TRUE, it won't add fields, only change the value of existing	2754	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2462	* keys.	2755	* keys.
2463	*	2756	*
2464	* Returns TRUE on success.	2757	* Returns TRUE on success.
2465	*/	2758	*/
		2759	int
2466	int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {	2760	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
		2761	{
		2762	key_value *
2467	key_value * field = NULL, *last=NULL;	2763	field = NULL, *last = NULL;
2468		2764
2469	for (field=op->key_values; field != NULL; field=field->next) {	2765	for (field = op->key_values; field != NULL; field = field->next)
		2766	{
2470	if (field->key != canonical_key) {	2767	if (field->key != canonical_key)
		2768	{
2471	last = field;	2769	last = field;
2472	continue;	2770	continue;
2473	}	2771	}
2474		2772
2475	if (value)	2773	if (value)
2476	field->value = value;	2774	field->value = value;
2477	else {	2775	else
		2776	{
2478	/* Basically, if the archetype has this key set,	2777	/* Basically, if the archetype has this key set,
2479	* we need to store the null value so when we save	2778	* we need to store the null value so when we save
2480	* it, we save the empty value so that when we load,	2779	* it, we save the empty value so that when we load,
2481	* we get this value back again.	2780	* we get this value back again.
2482	*/	2781	*/
2483	if (get_ob_key_link (&op->arch->clone, canonical_key))	2782	if (get_ob_key_link (&op->arch->clone, canonical_key))
2484	field->value = 0;	2783	field->value = 0;
		2784	else
		2785	{
		2786	if (last)
		2787	last->next = field->next;
2485	else	2788	else
2486	{
2487	if (last) last->next = field->next;
2488	else op->key_values = field->next;	2789	op->key_values = field->next;
2489		2790
2490	delete field;	2791	delete field;
2491	}	2792	}
2492	}	2793	}
2493	return TRUE;	2794	return TRUE;
2494	}	2795	}
2495	/* IF we get here, key doesn't exist */	2796	/* IF we get here, key doesn't exist */
2496		2797
2497	/* No field, we'll have to add it. */	2798	/* No field, we'll have to add it. */
		2799
		2800	if (!add_key)
2498		2801	{
2499	if (!add_key) {
2500	return FALSE;	2802	return FALSE;
2501	}	2803	}
2502	/* There isn't any good reason to store a null	2804	/* There isn't any good reason to store a null
2503	* value in the key/value list. If the archetype has	2805	* value in the key/value list. If the archetype has
2504	* this key, then we should also have it, so shouldn't	2806	* this key, then we should also have it, so shouldn't
2505	* be here. If user wants to store empty strings,	2807	* be here. If user wants to store empty strings,
2506	* should pass in ""	2808	* should pass in ""
2507	*/	2809	*/
2508	if (value == NULL) return TRUE;	2810	if (value == NULL)
2509
2510	field = new key_value;
2511
2512	field->key = canonical_key;
2513	field->value = value;
2514	/* Usual prepend-addition. */
2515	field->next = op->key_values;
2516	op->key_values = field;
2517
2518	return TRUE;	2811	return TRUE;
		2812
		2813	field = new key_value;
		2814
		2815	field->key = canonical_key;
		2816	field->value = value;
		2817	/* Usual prepend-addition. */
		2818	field->next = op->key_values;
		2819	op->key_values = field;
		2820
		2821	return TRUE;
2519	}	2822	}
2520		2823
2521	/*	2824	/*
2522	* Updates the key in op to value.	2825	* Updates the key in op to value.
2523	*	2826	*
…		…
2525	* and not add new ones.	2828	* and not add new ones.
2526	* In general, should be little reason FALSE is ever passed in for add_key	2829	* In general, should be little reason FALSE is ever passed in for add_key
2527	*	2830	*
2528	* Returns TRUE on success.	2831	* Returns TRUE on success.
2529	*/	2832	*/
		2833	int
2530	int set_ob_key_value(object * op, const char *key, const char * value, int add_key)	2834	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2531	{	2835	{
2532	shstr key_ (key);	2836	shstr key_ (key);
		2837
2533	return set_ob_key_value_s (op, key_, value, add_key);	2838	return set_ob_key_value_s (op, key_, value, add_key);
2534	}	2839	}
		2840
		2841	object::depth_iterator::depth_iterator (object *container)
		2842	: iterator_base (container)
		2843	{
		2844	while (item->inv)
		2845	item = item->inv;
		2846	}
		2847
		2848	void
		2849	object::depth_iterator::next ()
		2850	{
		2851	if (item->below)
		2852	{
		2853	item = item->below;
		2854
		2855	while (item->inv)
		2856	item = item->inv;
		2857	}
		2858	else
		2859	item = item->env;
		2860	}
		2861
		2862	// return a suitable string describing an objetc in enough detail to find it
		2863	const char *
		2864	object::debug_desc (char *info) const
		2865	{
		2866	char info2[256 * 3];
		2867	char *p = info;
		2868
		2869	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2870	count,
		2871	&name,
		2872	title ? " " : "",
		2873	title ? (const char *)title : "");
		2874
		2875	if (env)
		2876	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2877
		2878	if (map)
		2879	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2880
		2881	return info;
		2882	}
		2883
		2884	const char *
		2885	object::debug_desc () const
		2886	{
		2887	static char info[256 * 3];
		2888	return debug_desc (info);
		2889	}
		2890

Diff Legend

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