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.10 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.31 by root, Mon Sep 11 23:33:27 2006 UTC

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

Diff Legend

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