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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC

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

Diff Legend

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