ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

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

Diff Legend

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