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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.35 by root, Tue Sep 12 18:15:34 2006 UTC

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

Diff Legend

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