ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC

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

Diff Legend

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