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.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.118 by root, Thu Jan 18 19:42:09 2007 UTC

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

Diff Legend

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