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

Diff Legend

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