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.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.66 by root, Wed Dec 13 03:28:42 2006 UTC

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

Diff Legend

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