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.6 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.89 by root, Tue Dec 26 09:52:40 2006 UTC

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

Diff Legend

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