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.15 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC

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

Diff Legend

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