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.40 by root, Thu Sep 14 00:07:15 2006 UTC vs.
Revision 1.175 by root, Fri Aug 10 01:47:52 2007 UTC

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

Diff Legend

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