ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.29 by root, Mon Sep 11 12:38:36 2006 UTC

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

Diff Legend

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