ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.80 by root, Sat Dec 23 06:41:39 2006 UTC

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

Diff Legend

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