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.11 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

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

Diff Legend

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