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.91 by elmex, Tue Dec 26 10:51:52 2006 UTC vs.
Revision 1.194 by root, Tue Oct 16 00:30:24 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	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
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		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,
…		…
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_slow (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	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
253	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
254	* check all objects in the inventory.	255	* check all objects in the inventory.
255	*/	256	*/
256	if (ob1->inv || ob2->inv)	257	if (ob1->inv || ob2->inv)
257	{	258	{
258	/* if one object has inventory but the other doesn't, not equiv */	259	if (!(ob1->inv && ob2->inv))
259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	return 0; /* inventories differ in length */
260	return 0;
261		261
262	/* Now check to see if the two inventory objects could merge */	262	if (ob1->inv->below || ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
263	if (!object::can_merge (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
264	return 0;	266	return 0; /* inventory objexts differ */
265		267
266	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
267	* if it is valid.	269	* if it is valid.
268	*/	270	*/
269	}	271	}
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
298	return 0;	300	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	301	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	302	return 0;
301	}	303	}
302		304
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	305	if (ob1->self || ob2->self)
305	{	306	{
306	ob1->optimise ();	307	ob1->optimise ();
307	ob2->optimise ();	308	ob2->optimise ();
308		309
309	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
		311	{
		312	int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
		314
		315	if (k1 != k2)
310	return 0;	316	return 0;
		317	else if (k1 == 0)
		318	return 1;
		319	else if (!cfperl_can_merge (ob1, ob2))
		320	return 0;
		321	}
311	}	322	}
312		323
313	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
314	return 1;	325	return 1;
315	}	326	}
…		…
323	sum_weight (object *op)	334	sum_weight (object *op)
324	{	335	{
325	long sum;	336	long sum;
326	object *inv;	337	object *inv;
327		338
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	339	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	340	{
330	if (inv->inv)	341	if (inv->inv)
331	sum_weight (inv);	342	sum_weight (inv);
		343
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	345	}
334		346
335	if (op->type == CONTAINER && op->stats.Str)	347	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	348	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	368	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	370	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	371	* The result of the dump is stored in the static global errmsg array.
360	*/	372	*/
361
362	char *	373	char *
363	dump_object (object *op)	374	dump_object (object *op)
364	{	375	{
365	if (!op)	376	if (!op)
366	return strdup ("[NULLOBJ]");	377	return strdup ("[NULLOBJ]");
367		378
368	object_freezer freezer;	379	object_freezer freezer;
369	save_object (freezer, op, 1);	380	op->write (freezer);
370	return freezer.as_string ();	381	return freezer.as_string ();
371	}	382	}
372		383
373	/*	384	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	385	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
377	*/	388	*/
378
379	object *	389	object *
380	get_nearest_part (object *op, const object *pl)	390	get_nearest_part (object *op, const object *pl)
381	{	391	{
382	object *tmp, *closest;	392	object *tmp, *closest;
383	int last_dist, i;	393	int last_dist, i;
…		…
391	}	401	}
392		402
393	/*	403	/*
394	* Returns the object which has the count-variable equal to the argument.	404	* Returns the object which has the count-variable equal to the argument.
395	*/	405	*/
396
397	object *	406	object *
398	find_object (tag_t i)	407	find_object (tag_t i)
399	{	408	{
400	for (object *op = object::first; op; op = op->next)	409	for_all_objects (op)
401	if (op->count == i)	410	if (op->count == i)
402	return op;	411	return op;
403		412
404	return 0;	413	return 0;
405	}	414	}
406		415
407	/*	416	/*
408	* Returns the first object which has a name equal to the argument.	417	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	418	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	419	* Enables features like "patch <name-of-other-player> food 999"
411	*/	420	*/
412
413	object *	421	object *
414	find_object_name (const char *str)	422	find_object_name (const char *str)
415	{	423	{
416	shstr_cmp str_ (str);	424	shstr_cmp str_ (str);
417	object *op;	425	object *op;
418		426
419	for (op = object::first; op != NULL; op = op->next)	427	for_all_objects (op)
420	if (op->name == str_)	428	if (op->name == str_)
421	break;	429	break;
422		430
423	return op;	431	return op;
424	}	432	}
…		…
430	}	438	}
431		439
432	/*	440	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	441	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
435	*/	444	*/
436	void	445	void
437	object::set_owner (object *owner)	446	object::set_owner (object *owner)
438	{	447	{
		448	// allow objects which own objects
439	if (!owner)	449	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	450	while (owner->owner)
450	owner = owner->owner;	451	owner = owner->owner;
451		452
452	this->owner = owner;	453	this->owner = owner;
		454	}
		455
		456	int
		457	object::slottype () const
		458	{
		459	if (type == SKILL)
		460	{
		461	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		462	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		463	}
		464	else
		465	{
		466	if (slot [body_combat].info) return slot_combat;
		467	if (slot [body_range ].info) return slot_ranged;
		468	}
		469
		470	return slot_none;
		471	}
		472
		473	bool
		474	object::change_weapon (object *ob)
		475	{
		476	if (current_weapon == ob)
		477	return true;
		478
		479	if (chosen_skill)
		480	chosen_skill->flag [FLAG_APPLIED] = false;
		481
		482	current_weapon = ob;
		483	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		484
		485	if (chosen_skill)
		486	chosen_skill->flag [FLAG_APPLIED] = true;
		487
		488	update_stats ();
		489
		490	if (ob)
		491	{
		492	// now check wether any body locations became invalid, in which case
		493	// we cannot apply the weapon at the moment.
		494	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		495	if (slot[i].used < 0)
		496	{
		497	current_weapon = chosen_skill = 0;
		498	update_stats ();
		499
		500	new_draw_info_format (NDI_UNIQUE, 0, this,
		501	"You try to balance all your items at once, "
		502	"but the %s is just too much for your body. "
		503	"[You need to unapply some items first.]", &ob->name);
		504	return false;
		505	}
		506
		507	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		508	}
		509	else
		510	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		511
		512	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		513	{
		514	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		515	&name, ob->debug_desc ());
		516	return false;
		517	}
		518
		519	return true;
453	}	520	}
454		521
455	/* Zero the key_values on op, decrementing the shared-string	522	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	523	* refcounts and freeing the links.
457	*/	524	*/
458	static void	525	static void
459	free_key_values (object *op)	526	free_key_values (object *op)
460	{	527	{
461	for (key_value *i = op->key_values; i != 0;)	528	for (key_value *i = op->key_values; i; )
462	{	529	{
463	key_value *next = i->next;	530	key_value *next = i->next;
464	delete i;	531	delete i;
465		532
466	i = next;	533	i = next;
467	}	534	}
468		535
469	op->key_values = 0;	536	op->key_values = 0;
470	}	537	}
471		538
472	/*	539	object &
473	* copy_to first frees everything allocated by the dst object,	540	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	541	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	542	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	543	bool is_removed = flag [FLAG_REMOVED];
485		544
486	*(object_copy *)dst = *this;	545	*(object_copy *)this = src;
487		546
488	if (is_freed)	547	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	548	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		549
497	/* Copy over key_values, if any. */	550	/* Copy over key_values, if any. */
498	if (key_values)	551	if (src.key_values)
499	{	552	{
500	key_value *tail = 0;	553	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	554	key_values = 0;
504		555
505	for (i = key_values; i; i = i->next)	556	for (key_value *i = src.key_values; i; i = i->next)
506	{	557	{
507	key_value *new_link = new key_value;	558	key_value *new_link = new key_value;
508		559
509	new_link->next = 0;	560	new_link->next = 0;
510	new_link->key = i->key;	561	new_link->key = i->key;
511	new_link->value = i->value;	562	new_link->value = i->value;
512		563
513	/* Try and be clever here, too. */	564	/* Try and be clever here, too. */
514	if (!dst->key_values)	565	if (!key_values)
515	{	566	{
516	dst->key_values = new_link;	567	key_values = new_link;
517	tail = new_link;	568	tail = new_link;
518	}	569	}
519	else	570	else
520	{	571	{
521	tail->next = new_link;	572	tail->next = new_link;
522	tail = new_link;	573	tail = new_link;
523	}	574	}
524	}	575	}
525	}	576	}
		577	}
		578
		579	/*
		580	* copy_to first frees everything allocated by the dst object,
		581	* and then copies the contents of itself into the second
		582	* object, allocating what needs to be allocated. Basically, any
		583	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		584	* if the first object is freed, the pointers in the new object
		585	* will point at garbage.
		586	*/
		587	void
		588	object::copy_to (object *dst)
		589	{
		590	*dst = *this;
		591
		592	if (speed < 0)
		593	dst->speed_left -= rndm ();
526		594
527	dst->set_speed (dst->speed);	595	dst->set_speed (dst->speed);
		596	}
		597
		598	void
		599	object::instantiate ()
		600	{
		601	if (!uuid.seq) // HACK
		602	uuid = gen_uuid ();
		603
		604	speed_left = -0.1f;
		605	/* copy the body_info to the body_used - this is only really
		606	* need for monsters, but doesn't hurt to do it for everything.
		607	* by doing so, when a monster is created, it has good starting
		608	* values for the body_used info, so when items are created
		609	* for it, they can be properly equipped.
		610	*/
		611	for (int i = NUM_BODY_LOCATIONS; i--; )
		612	slot[i].used = slot[i].info;
		613
		614	attachable::instantiate ();
528	}	615	}
529		616
530	object *	617	object *
531	object::clone ()	618	object::clone ()
532	{	619	{
…		…
538	/*	625	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	626	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	627	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	628	* be called to update the face variable, _and_ how it looks on the map.
542	*/	629	*/
543
544	void	630	void
545	update_turn_face (object *op)	631	update_turn_face (object *op)
546	{	632	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	633	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	634	return;
		635
549	SET_ANIMATION (op, op->direction);	636	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	637	update_object (op, UP_OBJ_FACE);
551	}	638	}
552		639
553	/*	640	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	643	* This function needs to be called whenever the speed of an object changes.
557	*/	644	*/
558	void	645	void
559	object::set_speed (float speed)	646	object::set_speed (float speed)
560	{	647	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	648	if (flag [FLAG_FREED] && speed)
567	{	649	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	650	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	651	speed = 0;
570	}	652	}
571		653
572	this->speed = speed;	654	this->speed = speed;
573		655
574	if (arch_init)	656	if (has_active_speed ())
575	return;	657	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	658	else
593	{	659	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	660	}
648		661
649	/*	662	/*
650	* update_object() updates the the map.	663	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	664	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	677	* UP_OBJ_FACE: only the objects face has changed.
665	*/	678	*/
666	void	679	void
667	update_object (object *op, int action)	680	update_object (object *op, int action)
668	{	681	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	682	if (op == NULL)
672	{	683	{
673	/* this should never happen */	684	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	685	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	686	return;
…		…
699	return;	710	return;
700	}	711	}
701		712
702	mapspace &m = op->ms ();	713	mapspace &m = op->ms ();
703		714
704	if (m.flags_ & P_NEED_UPDATE)	715	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	716	/* nop */;
706	else if (action == UP_OBJ_INSERT)	717	else if (action == UP_OBJ_INSERT)
707	{	718	{
708	// this is likely overkill, TODO: revisit (schmorp)	719	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	720	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	729	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	730	* to have move_allow right now.
720	*/	731	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	732	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	733	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	734	m.flags_ = 0;
724	}	735	}
725	/* if the object is being removed, we can't make intelligent	736	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	737	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	738	* that is being removed.
728	*/	739	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	740	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	741	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	742	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	743	/* Nothing to do for that case */ ;
733	else	744	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	745	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		746
736	if (op->more)	747	if (op->more)
737	update_object (op->more, action);	748	update_object (op->more, action);
738	}	749	}
739		750
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	751	object::object ()
744	{	752	{
745	SET_FLAG (this, FLAG_REMOVED);	753	SET_FLAG (this, FLAG_REMOVED);
746		754
747	expmul = 1.0;	755	expmul = 1.0;
748	face = blank_face;	756	face = blank_face;
749	}	757	}
750		758
751	object::~object ()	759	object::~object ()
752	{	760	{
		761	unlink ();
		762
753	free_key_values (this);	763	free_key_values (this);
754	}	764	}
755		765
		766	static int object_count;
		767
756	void object::link ()	768	void object::link ()
757	{	769	{
758	count = ++ob_count;	770	assert (!index);//D
759	uuid = gen_uuid ();	771	uuid = gen_uuid ();
		772	count = ++object_count;
760		773
761	prev = 0;	774	refcnt_inc ();
762	next = object::first;	775	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	776	}
769		777
770	void object::unlink ()	778	void object::unlink ()
771	{	779	{
772	if (this == object::first)	780	if (!index)
773	object::first = next;	781	return;
774		782
775	/* Remove this object from the list of used objects */	783	objects.erase (this);
776	if (prev) prev->next = next;	784	refcnt_dec ();
777	if (next) next->prev = prev;	785	}
778		786
779	prev = 0;	787	void
780	next = 0;	788	object::activate ()
		789	{
		790	/* If already on active list, don't do anything */
		791	if (active)
		792	return;
		793
		794	if (has_active_speed ())
		795	actives.insert (this);
		796	}
		797
		798	void
		799	object::activate_recursive ()
		800	{
		801	activate ();
		802
		803	for (object *op = inv; op; op = op->below)
		804	op->activate_recursive ();
		805	}
		806
		807	/* This function removes object 'op' from the list of active
		808	* objects.
		809	* This should only be used for style maps or other such
		810	* reference maps where you don't want an object that isn't
		811	* in play chewing up cpu time getting processed.
		812	* The reverse of this is to call update_ob_speed, which
		813	* will do the right thing based on the speed of the object.
		814	*/
		815	void
		816	object::deactivate ()
		817	{
		818	/* If not on the active list, nothing needs to be done */
		819	if (!active)
		820	return;
		821
		822	actives.erase (this);
		823	}
		824
		825	void
		826	object::deactivate_recursive ()
		827	{
		828	for (object *op = inv; op; op = op->below)
		829	op->deactivate_recursive ();
		830
		831	deactivate ();
		832	}
		833
		834	void
		835	object::set_flag_inv (int flag, int value)
		836	{
		837	for (object *op = inv; op; op = op->below)
		838	{
		839	op->flag [flag] = value;
		840	op->set_flag_inv (flag, value);
		841	}
781	}	842	}
782		843
783	/*	844	/*
784	* Remove and free all objects in the inventory of the given object.	845	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	846	* object.c ?
786	*/	847	*/
787	void	848	void
788	object::destroy_inv (bool drop_to_ground)	849	object::destroy_inv (bool drop_to_ground)
789	{	850	{
		851	// need to check first, because the checks below might segfault
		852	// as we might be on an invalid mapspace and crossfire code
		853	// is too buggy to ensure that the inventory is empty.
		854	// corollary: if you create arrows etc. with stuff in tis inventory,
		855	// cf will crash below with off-map x and y
		856	if (!inv)
		857	return;
		858
790	/* Only if the space blocks everything do we not process -	859	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	860	* if some form of movement is allowed, let objects
792	* drop on that space.	861	* drop on that space.
793	*/	862	*/
794	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	863	if (!drop_to_ground
		864	|| !map
		865	|| map->in_memory != MAP_IN_MEMORY
		866	|| map->nodrop
		867	|| ms ().move_block == MOVE_ALL)
795	{	868	{
796	while (inv)	869	while (inv)
		870	{
		871	inv->destroy_inv (drop_to_ground);
797	inv->destroy ();	872	inv->destroy ();
		873	}
798	}	874	}
799	else	875	else
800	{ /* Put objects in inventory onto this space */	876	{ /* Put objects in inventory onto this space */
801	while (inv)	877	while (inv)
802	{	878	{
…		…
804		880
805	if (op->flag [FLAG_STARTEQUIP]	881	if (op->flag [FLAG_STARTEQUIP]
806	|| op->flag [FLAG_NO_DROP]	882	|| op->flag [FLAG_NO_DROP]
807	|| op->type == RUNE	883	|| op->type == RUNE
808	|| op->type == TRAP	884	|| op->type == TRAP
809	|| op->flag [FLAG_IS_A_TEMPLATE])	885	|| op->flag [FLAG_IS_A_TEMPLATE]
		886	|| op->flag [FLAG_DESTROY_ON_DEATH])
810	op->destroy ();	887	op->destroy ();
811	else	888	else
812	{	889	map->insert (op, x, y);
813	op->remove ();
814	op->x = x;
815	op->y = y;
816	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817	}
818	}	890	}
819	}	891	}
820	}	892	}
821		893
822	object *object::create ()	894	object *object::create ()
…		…
827	}	899	}
828		900
829	void	901	void
830	object::do_destroy ()	902	object::do_destroy ()
831	{	903	{
		904	attachable::do_destroy ();
		905
832	if (flag [FLAG_IS_LINKED])	906	if (flag [FLAG_IS_LINKED])
833	remove_button_link (this);	907	remove_button_link (this);
834		908
835	if (flag [FLAG_FRIENDLY])	909	if (flag [FLAG_FRIENDLY])
836	remove_friendly_object (this);	910	remove_friendly_object (this);
837		911
838	if (!flag [FLAG_REMOVED])	912	if (!flag [FLAG_REMOVED])
839	remove ();	913	remove ();
840		914
841	if (flag [FLAG_FREED])	915	destroy_inv (true);
842	return;	916
		917	deactivate ();
		918	unlink ();
843		919
844	flag [FLAG_FREED] = 1;	920	flag [FLAG_FREED] = 1;
845
846	attachable::do_destroy ();
847
848	destroy_inv (true);
849	set_speed (0);
850	unlink ();
851		921
852	// hack to ensure that freed objects still have a valid map	922	// hack to ensure that freed objects still have a valid map
853	{	923	{
854	static maptile *freed_map; // freed objects are moved here to avoid crashes	924	static maptile *freed_map; // freed objects are moved here to avoid crashes
855		925
856	if (!freed_map)	926	if (!freed_map)
857	{	927	{
858	freed_map = new maptile;	928	freed_map = new maptile;
859		929
		930	freed_map->path = "<freed objects map>";
860	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	932	freed_map->width = 3;
862	freed_map->height = 3;	933	freed_map->height = 3;
863		934
864	freed_map->allocate ();	935	freed_map->alloc ();
		936	freed_map->in_memory = MAP_IN_MEMORY;
865	}	937	}
866		938
867	map = freed_map;	939	map = freed_map;
868	x = 1;	940	x = 1;
869	y = 1;	941	y = 1;
870	}	942	}
871		943
872	head = 0;
873
874	if (more)	944	if (more)
875	{	945	{
876	more->destroy ();	946	more->destroy ();
877	more = 0;	947	more = 0;
878	}	948	}
879		949
		950	head = 0;
		951
880	// clear those pointers that likely might have circular references to us	952	// clear those pointers that likely might cause circular references
881	owner = 0;	953	owner = 0;
882	enemy = 0;	954	enemy = 0;
883	attacked_by = 0;	955	attacked_by = 0;
884		956	current_weapon = 0;
885	// only relevant for players(?), but make sure of it anyways
886	contr = 0;
887	}	957	}
888		958
889	void	959	void
890	object::destroy (bool destroy_inventory)	960	object::destroy (bool destroy_inventory)
891	{	961	{
892	if (destroyed ())	962	if (destroyed ())
893	return;	963	return;
894		964
895	if (destroy_inventory)	965	if (destroy_inventory)
896	destroy_inv (false);	966	destroy_inv (false);
		967
		968	if (is_head ())
		969	if (sound_destroy)
		970	play_sound (sound_destroy);
		971	else if (flag [FLAG_MONSTER])
		972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
897		973
898	attachable::destroy ();	974	attachable::destroy ();
899	}	975	}
900		976
901	/*	977	/*
…		…
919	* This function removes the object op from the linked list of objects	995	* This function removes the object op from the linked list of objects
920	* which it is currently tied to. When this function is done, the	996	* which it is currently tied to. When this function is done, the
921	* object will have no environment. If the object previously had an	997	* object will have no environment. If the object previously had an
922	* environment, the x and y coordinates will be updated to	998	* environment, the x and y coordinates will be updated to
923	* the previous environment.	999	* the previous environment.
924	* Beware: This function is called from the editor as well!
925	*/	1000	*/
926	void	1001	void
927	object::remove ()	1002	object::do_remove ()
928	{	1003	{
929	object *tmp, *last = 0;	1004	object *tmp, *last = 0;
930	object *otmp;	1005	object *otmp;
931		1006
932	if (QUERY_FLAG (this, FLAG_REMOVED))	1007	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
954	* to save cpu time.	1029	* to save cpu time.
955	*/	1030	*/
956	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
957	otmp->update_stats ();	1032	otmp->update_stats ();
958		1033
959	if (above != NULL)	1034	if (above)
960	above->below = below;	1035	above->below = below;
961	else	1036	else
962	env->inv = below;	1037	env->inv = below;
963		1038
964	if (below != NULL)	1039	if (below)
965	below->above = above;	1040	below->above = above;
966		1041
967	/* we set up values so that it could be inserted into	1042	/* we set up values so that it could be inserted into
968	* the map, but we don't actually do that - it is up	1043	* the map, but we don't actually do that - it is up
969	* to the caller to decide what we want to do.	1044	* to the caller to decide what we want to do.
…		…
973	above = 0, below = 0;	1048	above = 0, below = 0;
974	env = 0;	1049	env = 0;
975	}	1050	}
976	else if (map)	1051	else if (map)
977	{	1052	{
978	/* Re did the following section of code - it looks like it had	1053	if (type == PLAYER)
979	* lots of logic for things we no longer care about
980	*/	1054	{
		1055	// leaving a spot always closes any open container on the ground
		1056	if (container && !container->env)
		1057	// this causes spurious floorbox updates, but it ensures
		1058	// that the CLOSE event is being sent.
		1059	close_container ();
		1060
		1061	--map->players;
		1062	map->touch ();
		1063	}
		1064
		1065	map->dirty = true;
		1066	mapspace &ms = this->ms ();
981		1067
982	/* link the object above us */	1068	/* link the object above us */
983	if (above)	1069	if (above)
984	above->below = below;	1070	above->below = below;
985	else	1071	else
986	map->at (x, y).top = below; /* we were top, set new top */	1072	ms.top = below; /* we were top, set new top */
987		1073
988	/* Relink the object below us, if there is one */	1074	/* Relink the object below us, if there is one */
989	if (below)	1075	if (below)
990	below->above = above;	1076	below->above = above;
991	else	1077	else
…		…
993	/* Nothing below, which means we need to relink map object for this space	1079	/* Nothing below, which means we need to relink map object for this space
994	* use translated coordinates in case some oddness with map tiling is	1080	* use translated coordinates in case some oddness with map tiling is
995	* evident	1081	* evident
996	*/	1082	*/
997	if (GET_MAP_OB (map, x, y) != this)	1083	if (GET_MAP_OB (map, x, y) != this)
998	{
999	char *dump = dump_object (this);
1000	LOG (llevError,
1001	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1084	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 ());
1002	free (dump);
1003	dump = dump_object (GET_MAP_OB (map, x, y));
1004	LOG (llevError, "%s\n", dump);
1005	free (dump);
1006	}
1007		1085
1008	map->at (x, y).bot = above; /* goes on above it. */	1086	ms.bot = above; /* goes on above it. */
1009	}	1087	}
1010		1088
1011	above = 0;	1089	above = 0;
1012	below = 0;	1090	below = 0;
1013		1091
1014	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
1015	return;	1093	return;
1016		1094
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		1096
		1097	if (object *pl = ms.player ())
		1098	{
		1099	if (pl->container == this)
		1100	/* If a container that the player is currently using somehow gets
		1101	* removed (most likely destroyed), update the player view
		1102	* appropriately.
		1103	*/
		1104	pl->close_container ();
		1105
		1106	pl->contr->ns->floorbox_update ();
		1107	}
		1108
1019	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1110	{
1021	/* No point updating the players look faces if he is the object	1111	/* No point updating the players look faces if he is the object
1022	* being removed.	1112	* being removed.
1023	*/	1113	*/
1024		1114
1025	if (tmp->type == PLAYER && tmp != this)
1026	{
1027	/* If a container that the player is currently using somehow gets
1028	* removed (most likely destroyed), update the player view
1029	* appropriately.
1030	*/
1031	if (tmp->container == this)
1032	{
1033	flag [FLAG_APPLIED] = 0;
1034	tmp->container = 0;
1035	}
1036
1037	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();
1039	}
1040
1041	/* See if player moving off should effect something */	1115	/* See if object moving off should effect something */
1042	if (check_walk_off	1116	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045	{	1119	{
1046	move_apply (tmp, this, 0);	1120	move_apply (tmp, this, 0);
1047		1121
1048	if (destroyed ())	1122	if (destroyed ())
1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050	}	1124	}
1051		1125
1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053
1054	if (tmp->above == tmp)
1055	tmp->above = 0;
1056
1057	last = tmp;	1126	last = tmp;
1058	}	1127	}
1059		1128
1060	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1061	if (!last)	1131	if (!last)
1062	map->at (x, y).flags_ = P_NEED_UPDATE;	1132	map->at (x, y).flags_ = 0;
1063	else	1133	else
1064	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1065		1135
1066	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1067	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
…		…
1080	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1081	{	1151	{
1082	if (!op->nrof)	1152	if (!op->nrof)
1083	return 0;	1153	return 0;
1084		1154
1085	if (top)	1155	if (!top)
1086	for (top = op; top && top->above; top = top->above)	1156	for (top = op; top && top->above; top = top->above)
1087	;	1157	;
1088		1158
1089	for (; top; top = top->below)	1159	for (; top; top = top->below)
1090	{	1160	{
…		…
1103	}	1173	}
1104		1174
1105	return 0;	1175	return 0;
1106	}	1176	}
1107		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1108	/*	1201	/*
1109	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1110	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1111	*/	1204	*/
1112	object *	1205	object *
1113	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1114	{	1207	{
1115	object *tmp;
1116
1117	if (op->head)
1118	op = op->head;
1119
1120	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1121	{	1209	{
1122	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1123	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1124	}	1212	}
1125		1213
1126	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1127	}	1215	}
1128		1216
…		…
1147	* just 'op' otherwise	1235	* just 'op' otherwise
1148	*/	1236	*/
1149	object *	1237	object *
1150	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1151	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1152	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1153	sint16 x, y;
1154		1243
1155	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1156	{
1157	LOG (llevError, "Trying to insert freed object!\n");
1158	return NULL;
1159	}
1160
1161	if (m == NULL)
1162	{
1163	char *dump = dump_object (op);
1164	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1165	free (dump);
1166	return op;
1167	}
1168
1169	if (out_of_map (m, op->x, op->y))
1170	{
1171	char *dump = dump_object (op);
1172	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1173	#ifdef MANY_CORES
1174	/* Better to catch this here, as otherwise the next use of this object
1175	* is likely to cause a crash. Better to find out where it is getting
1176	* improperly inserted.
1177	*/
1178	abort ();
1179	#endif
1180	free (dump);
1181	return op;
1182	}
1183
1184	if (!QUERY_FLAG (op, FLAG_REMOVED))
1185	{
1186	char *dump = dump_object (op);
1187	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1188	free (dump);
1189	return op;
1190	}
1191
1192	if (op->more)
1193	{
1194	/* The part may be on a different map. */
1195
1196	object *more = op->more;
1197
1198	/* We really need the caller to normalize coordinates - if
1199	* we set the map, that doesn't work if the location is within
1200	* a map and this is straddling an edge. So only if coordinate
1201	* is clear wrong do we normalize it.
1202	*/
1203	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1204	more->map = get_map_from_coord (m, &more->x, &more->y);
1205	else if (!more->map)
1206	{
1207	/* For backwards compatibility - when not dealing with tiled maps,
1208	* more->map should always point to the parent.
1209	*/
1210	more->map = m;
1211	}
1212
1213	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1214	{
1215	if (!op->head)
1216	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218	return 0;
1219	}
1220	}
1221
1222	CLEAR_FLAG (op, FLAG_REMOVED);
1223		1245
1224	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1225	* of areas of callers (eg, anything that uses find_free_spot would now	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1226	* need extra work	1248	* need extra work
1227	*/	1249	*/
1228	op->map = get_map_from_coord (m, &op->x, &op->y);	1250	if (!xy_normalise (m, op->x, op->y))
1229	x = op->x;	1251	{
1230	y = op->y;	1252	op->destroy ();
		1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
		1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1231		1264
1232	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1233	*/	1266	*/
1234	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1235	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1236	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1237	{	1270	{
1238	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1239	tmp->destroy ();	1272	tmp->destroy ();
1240	}	1273	}
…		…
1257	op->below = originator->below;	1290	op->below = originator->below;
1258		1291
1259	if (op->below)	1292	if (op->below)
1260	op->below->above = op;	1293	op->below->above = op;
1261	else	1294	else
1262	op->ms ().bot = op;	1295	ms.bot = op;
1263		1296
1264	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1265	originator->below = op;	1298	originator->below = op;
1266	}	1299	}
1267	else	1300	else
1268	{	1301	{
		1302	top = ms.bot;
		1303
1269	/* If there are other objects, then */	1304	/* If there are other objects, then */
1270	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if (top)
1271	{	1306	{
1272	object *last = NULL;	1307	object *last = 0;
1273		1308
1274	/*	1309	/*
1275	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
1276	* We've already dealt with merging if appropriate.	1311	* We've already dealt with merging if appropriate.
1277	* Generally, we want to put the new object on top. But if	1312	* Generally, we want to put the new object on top. But if
…		…
1281	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1282	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1283	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1284	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1285	*/	1320	*/
1286		1321	for (top = ms.bot; top; top = top->above)
1287	while (top != NULL)
1288	{	1322	{
1289	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1290	floor = top;	1324	floor = top;
1291		1325
1292	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1295	top = top->below;	1329	top = top->below;
1296	break;	1330	break;
1297	}	1331	}
1298		1332
1299	last = top;	1333	last = top;
1300	top = top->above;
1301	}	1334	}
1302		1335
1303	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1304	top = last;	1337	top = last;
1305		1338
…		…
1307	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1308	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1309	*/	1342	*/
1310		1343
1311	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1312	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1313	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1314	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1315	* stacking is a bit odd.	1348	* stacking is a bit odd.
1316	*/	1349	*/
1317	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1318	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1319	{	1353	{
1320	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1321	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1322	break;	1356	break;
		1357
1323	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1324	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1325	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1326	* set top to the object below us.	1361	* set top to the object below us.
1327	*/	1362	*/
1328	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1329	top = last->below;	1364	top = last->below;
1330	}	1365	}
1331	} /* If objects on this space */	1366	} /* If objects on this space */
1332		1367
1333	if (flag & INS_MAP_LOAD)
1334	top = GET_MAP_TOP (op->map, op->x, op->y);
1335
1336	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1337	top = floor;	1369	top = floor;
1338		1370
1339	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
1340	*/	1372	*/
1341		1373
1342	/* First object on this space */	1374	/* First object on this space */
1343	if (!top)	1375	if (!top)
1344	{	1376	{
1345	op->above = GET_MAP_OB (op->map, op->x, op->y);	1377	op->above = ms.bot;
1346		1378
1347	if (op->above)	1379	if (op->above)
1348	op->above->below = op;	1380	op->above->below = op;
1349		1381
1350	op->below = NULL;	1382	op->below = 0;
1351	op->ms ().bot = op;	1383	ms.bot = op;
1352	}	1384	}
1353	else	1385	else
1354	{ /* get inserted into the stack above top */	1386	{ /* get inserted into the stack above top */
1355	op->above = top->above;	1387	op->above = top->above;
1356		1388
…		…
1359		1391
1360	op->below = top;	1392	op->below = top;
1361	top->above = op;	1393	top->above = op;
1362	}	1394	}
1363		1395
1364	if (op->above == NULL)	1396	if (!op->above)
1365	op->ms ().top = op;	1397	ms.top = op;
1366	} /* else not INS_BELOW_ORIGINATOR */	1398	} /* else not INS_BELOW_ORIGINATOR */
1367		1399
1368	if (op->type == PLAYER)	1400	if (op->type == PLAYER)
		1401	{
1369	op->contr->do_los = 1;	1402	op->contr->do_los = 1;
		1403	++op->map->players;
		1404	op->map->touch ();
		1405	}
1370		1406
1371	/* If we have a floor, we know the player, if any, will be above	1407	op->map->dirty = true;
1372	* it, so save a few ticks and start from there.	1408
1373	*/
1374	if (!(flag & INS_MAP_LOAD))
1375	if (object *pl = op->ms ().player ())	1409	if (object *pl = ms.player ())
1376	if (pl->contr->ns)
1377	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1378		1411
1379	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1380	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1381	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1382	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
1383	* be far away from this change and not affected in any way -	1416	* be far away from this change and not affected in any way -
1384	* this should get redone to only look for players within range,	1417	* this should get redone to only look for players within range,
1385	* or just updating the P_NEED_UPDATE for spaces within this area	1418	* or just updating the P_UPTODATE for spaces within this area
1386	* of effect may be sufficient.	1419	* of effect may be sufficient.
1387	*/	1420	*/
1388	if (op->map->darkness && (op->glow_radius != 0))	1421	if (op->map->darkness && (op->glow_radius != 0))
1389	update_all_los (op->map, op->x, op->y);	1422	update_all_los (op->map, op->x, op->y);
1390		1423
…		…
1401	* blocked() and wall() work properly), and these flags are updated by	1434	* blocked() and wall() work properly), and these flags are updated by
1402	* update_object().	1435	* update_object().
1403	*/	1436	*/
1404		1437
1405	/* if this is not the head or flag has been passed, don't check walk on status */	1438	/* if this is not the head or flag has been passed, don't check walk on status */
1406	if (!(flag & INS_NO_WALK_ON) && !op->head)	1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1407	{	1440	{
1408	if (check_move_on (op, originator))	1441	if (check_move_on (op, originator))
1409	return 0;	1442	return 0;
1410		1443
1411	/* If we are a multi part object, lets work our way through the check	1444	/* If we are a multi part object, lets work our way through the check
1412	* walk on's.	1445	* walk on's.
1413	*/	1446	*/
1414	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1447	for (object *tmp = op->more; tmp; tmp = tmp->more)
1415	if (check_move_on (tmp, originator))	1448	if (check_move_on (tmp, originator))
1416	return 0;	1449	return 0;
1417	}	1450	}
1418		1451
1419	return op;	1452	return op;
…		…
1428	{	1461	{
1429	object *tmp, *tmp1;	1462	object *tmp, *tmp1;
1430		1463
1431	/* first search for itself and remove any old instances */	1464	/* first search for itself and remove any old instances */
1432		1465
1433	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1434	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1435	tmp->destroy ();	1468	tmp->destroy ();
1436		1469
1437	tmp1 = arch_to_object (archetype::find (arch_string));	1470	tmp1 = arch_to_object (archetype::find (arch_string));
1438		1471
1439	tmp1->x = op->x;	1472	tmp1->x = op->x;
1440	tmp1->y = op->y;	1473	tmp1->y = op->y;
1441	insert_ob_in_map (tmp1, op->map, op, 0);	1474	insert_ob_in_map (tmp1, op->map, op, 0);
		1475	}
		1476
		1477	object *
		1478	object::insert_at (object *where, object *originator, int flags)
		1479	{
		1480	return where->map->insert (this, where->x, where->y, originator, flags);
1442	}	1481	}
1443		1482
1444	/*	1483	/*
1445	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1446	* is returned contains nr objects, and the remaining parts contains	1485	* is returned contains nr objects, and the remaining parts contains
1447	* the rest (or is removed and freed if that number is 0).	1486	* the rest (or is removed and freed if that number is 0).
1448	* On failure, NULL is returned, and the reason put into the	1487	* On failure, NULL is returned, and the reason put into the
1449	* global static errmsg array.	1488	* global static errmsg array.
1450	*/	1489	*/
1451
1452	object *	1490	object *
1453	get_split_ob (object *orig_ob, uint32 nr)	1491	get_split_ob (object *orig_ob, uint32 nr)
1454	{	1492	{
1455	object *newob;	1493	object *newob;
1456	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1487	* the amount of an object. If the amount reaches 0, the object	1525	* the amount of an object. If the amount reaches 0, the object
1488	* is subsequently removed and freed.	1526	* is subsequently removed and freed.
1489	*	1527	*
1490	* Return value: 'op' if something is left, NULL if the amount reached 0	1528	* Return value: 'op' if something is left, NULL if the amount reached 0
1491	*/	1529	*/
1492
1493	object *	1530	object *
1494	decrease_ob_nr (object *op, uint32 i)	1531	decrease_ob_nr (object *op, uint32 i)
1495	{	1532	{
1496	object *tmp;	1533	object *tmp;
1497		1534
…		…
1572		1609
1573	/*	1610	/*
1574	* add_weight(object, weight) adds the specified weight to an object,	1611	* add_weight(object, weight) adds the specified weight to an object,
1575	* and also updates how much the environment(s) is/are carrying.	1612	* and also updates how much the environment(s) is/are carrying.
1576	*/	1613	*/
1577
1578	void	1614	void
1579	add_weight (object *op, signed long weight)	1615	add_weight (object *op, signed long weight)
1580	{	1616	{
1581	while (op != NULL)	1617	while (op != NULL)
1582	{	1618	{
…		…
1597	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1633	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598	free (dump);	1634	free (dump);
1599	return op;	1635	return op;
1600	}	1636	}
1601		1637
1602	if (where->head)	1638	if (where->head_ () != where)
1603	{	1639	{
1604	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1640	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605	where = where->head;	1641	where = where->head;
1606	}	1642	}
1607		1643
1608	return where->insert (op);	1644	return where->insert (op);
1609	}	1645	}
…		…
1614	* inside the object environment.	1650	* inside the object environment.
1615	*	1651	*
1616	* The function returns now pointer to inserted item, and return value can	1652	* The function returns now pointer to inserted item, and return value can
1617	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1618	*/	1654	*/
1619
1620	object *	1655	object *
1621	object::insert (object *op)	1656	object::insert (object *op)
1622	{	1657	{
1623	object *tmp, *otmp;
1624
1625	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1626	op->remove ();	1659	op->remove ();
1627		1660
1628	if (op->more)	1661	if (op->more)
1629	{	1662	{
…		…
1631	return op;	1664	return op;
1632	}	1665	}
1633		1666
1634	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1635	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1636	if (op->nrof)	1670	if (op->nrof)
1637	{	1671	{
1638	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1639	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1640	{	1674	{
1641	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1642	(client needs the original object) */	1676	(client needs the original object) */
1643	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1662	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1663	}	1697	}
1664	else	1698	else
1665	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1666		1700
1667	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1668	if (otmp && otmp->contr)
1669	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1670	otmp->update_stats ();	1703	otmp->update_stats ();
1671		1704
		1705	op->owner = 0; // its his/hers now. period.
1672	op->map = 0;	1706	op->map = 0;
1673	op->env = this;	1707	op->env = this;
1674	op->above = 0;	1708	op->above = 0;
1675	op->below = 0;	1709	op->below = 0;
1676	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1677		1711
1678	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1679	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1680	{	1714	{
1681	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1682	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1683	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1684	if (map->darkness)	1718	if (map->darkness)
…		…
1720	*	1754	*
1721	* MSW 2001-07-08: Check all objects on space, not just those below	1755	* MSW 2001-07-08: Check all objects on space, not just those below
1722	* object being inserted. insert_ob_in_map may not put new objects	1756	* object being inserted. insert_ob_in_map may not put new objects
1723	* on top.	1757	* on top.
1724	*/	1758	*/
1725
1726	int	1759	int
1727	check_move_on (object *op, object *originator)	1760	check_move_on (object *op, object *originator)
1728	{	1761	{
1729	object *tmp;	1762	object *tmp;
1730	maptile *m = op->map;	1763	maptile *m = op->map;
…		…
1757		1790
1758	/* The objects have to be checked from top to bottom.	1791	/* The objects have to be checked from top to bottom.
1759	* Hence, we first go to the top:	1792	* Hence, we first go to the top:
1760	*/	1793	*/
1761		1794
1762	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1795	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1763	{	1796	{
1764	/* Trim the search when we find the first other spell effect	1797	/* Trim the search when we find the first other spell effect
1765	* this helps performance so that if a space has 50 spell objects,	1798	* this helps performance so that if a space has 50 spell objects,
1766	* we don't need to check all of them.	1799	* we don't need to check all of them.
1767	*/	1800	*/
…		…
1785	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1818	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1786	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1819	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1787	{	1820	{
1788		1821
1789	float	1822	float
1790	diff = tmp->move_slow_penalty * FABS (op->speed);	1823	diff = tmp->move_slow_penalty * fabs (op->speed);
1791		1824
1792	if (op->type == PLAYER)	1825	if (op->type == PLAYER)
1793	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1826	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1794	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1827	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1795	diff /= 4.0;	1828	diff /= 4.0;
…		…
1825	* The first matching object is returned, or NULL if none.	1858	* The first matching object is returned, or NULL if none.
1826	*/	1859	*/
1827	object *	1860	object *
1828	present_arch (const archetype *at, maptile *m, int x, int y)	1861	present_arch (const archetype *at, maptile *m, int x, int y)
1829	{	1862	{
1830	if (m == NULL || out_of_map (m, x, y))	1863	if (!m || out_of_map (m, x, y))
1831	{	1864	{
1832	LOG (llevError, "Present_arch called outside map.\n");	1865	LOG (llevError, "Present_arch called outside map.\n");
1833	return NULL;	1866	return NULL;
1834	}	1867	}
1835		1868
1836	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1869	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837	if (tmp->arch == at)	1870	if (tmp->arch == at)
1838	return tmp;	1871	return tmp;
1839		1872
1840	return NULL;	1873	return NULL;
1841	}	1874	}
…		…
1852	{	1885	{
1853	LOG (llevError, "Present called outside map.\n");	1886	LOG (llevError, "Present called outside map.\n");
1854	return NULL;	1887	return NULL;
1855	}	1888	}
1856		1889
1857	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1890	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1858	if (tmp->type == type)	1891	if (tmp->type == type)
1859	return tmp;	1892	return tmp;
1860		1893
1861	return NULL;	1894	return NULL;
1862	}	1895	}
…		…
1939	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1940	{	1973	{
1941	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
1942	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
1943	}	1976	}
1944	}
1945
1946	/*
1947	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1948	* all it's inventory (recursively).
1949	* If checksums are used, a player will get set_cheat called for
1950	* him/her-self and all object carried by a call to this function.
1951	*/
1952	void
1953	set_cheat (object *op)
1954	{
1955	SET_FLAG (op, FLAG_WAS_WIZ);
1956	flag_inv (op, FLAG_WAS_WIZ);
1957	}	1977	}
1958		1978
1959	/*	1979	/*
1960	* find_free_spot(object, map, x, y, start, stop) will search for	1980	* find_free_spot(object, map, x, y, start, stop) will search for
1961	* a spot at the given map and coordinates which will be able to contain	1981	* a spot at the given map and coordinates which will be able to contain
…		…
1978	* customized, changed states, etc.	1998	* customized, changed states, etc.
1979	*/	1999	*/
1980	int	2000	int
1981	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2001	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1982	{	2002	{
		2003	int altern[SIZEOFFREE];
1983	int index = 0, flag;	2004	int index = 0, flag;
1984	int altern[SIZEOFFREE];
1985		2005
1986	for (int i = start; i < stop; i++)	2006	for (int i = start; i < stop; i++)
1987	{	2007	{
1988	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2008	mapxy pos (m, x, y); pos.move (i);
1989	if (!flag)	2009
		2010	if (!pos.normalise ())
		2011	continue;
		2012
		2013	mapspace &ms = *pos;
		2014
		2015	if (ms.flags () & P_IS_ALIVE)
		2016	continue;
		2017
		2018	/* However, often
		2019	* ob doesn't have any move type (when used to place exits)
		2020	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2021	*/
		2022	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2023	{
1990	altern [index++] = i;	2024	altern [index++] = i;
		2025	continue;
		2026	}
1991		2027
1992	/* Basically, if we find a wall on a space, we cut down the search size.	2028	/* Basically, if we find a wall on a space, we cut down the search size.
1993	* In this way, we won't return spaces that are on another side of a wall.	2029	* In this way, we won't return spaces that are on another side of a wall.
1994	* This mostly work, but it cuts down the search size in all directions -	2030	* This mostly work, but it cuts down the search size in all directions -
1995	* if the space being examined only has a wall to the north and empty	2031	* if the space being examined only has a wall to the north and empty
1996	* spaces in all the other directions, this will reduce the search space	2032	* spaces in all the other directions, this will reduce the search space
1997	* to only the spaces immediately surrounding the target area, and	2033	* to only the spaces immediately surrounding the target area, and
1998	* won't look 2 spaces south of the target space.	2034	* won't look 2 spaces south of the target space.
1999	*/	2035	*/
2000	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2036	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2037	{
2001	stop = maxfree[i];	2038	stop = maxfree[i];
		2039	continue;
		2040	}
		2041
		2042	/* Note it is intentional that we check ob - the movement type of the
		2043	* head of the object should correspond for the entire object.
		2044	*/
		2045	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2046	continue;
		2047
		2048	altern [index++] = i;
2002	}	2049	}
2003		2050
2004	if (!index)	2051	if (!index)
2005	return -1;	2052	return -1;
2006		2053
2007	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
2008	}	2055	}
2009		2056
2010	/*	2057	/*
2011	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
2012	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
…		…
2015	*/	2062	*/
2016	int	2063	int
2017	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2018	{	2065	{
2019	for (int i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2020	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2021	return i;	2068	return i;
2022		2069
2023	return -1;	2070	return -1;
2024	}	2071	}
2025		2072
…		…
2033	{	2080	{
2034	arr += begin;	2081	arr += begin;
2035	end -= begin;	2082	end -= begin;
2036		2083
2037	while (--end)	2084	while (--end)
2038	swap (arr [end], arr [RANDOM () % (end + 1)]);	2085	swap (arr [end], arr [rndm (end + 1)]);
2039	}	2086	}
2040		2087
2041	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2042	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2043	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2079	object *tmp;	2126	object *tmp;
2080	maptile *mp;	2127	maptile *mp;
2081		2128
2082	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2083		2130
2084	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2085	{	2132	{
2086	exclude = exclude->head;	2133	exclude = exclude->head;
2087	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2088	}	2135	}
2089	else	2136	else
…		…
2112	max = maxfree[i];	2159	max = maxfree[i];
2113	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2114	{	2161	{
2115	for (tmp = ms.bot; tmp; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2116	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2117	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2118	break;	2165	break;
2119		2166
2120	if (tmp)	2167	if (tmp)
2121	return freedir[i];	2168	return freedir[i];
2122	}	2169	}
…		…
2177		2224
2178	return 3;	2225	return 3;
2179	}	2226	}
2180		2227
2181	/*	2228	/*
2182	* absdir(int): Returns a number between 1 and 8, which represent
2183	* the "absolute" direction of a number (it actually takes care of
2184	* "overflow" in previous calculations of a direction).
2185	*/
2186
2187	int
2188	absdir (int d)
2189	{
2190	while (d < 1)
2191	d += 8;
2192
2193	while (d > 8)
2194	d -= 8;
2195
2196	return d;
2197	}
2198
2199	/*
2200	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2201	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2202	*/	2231	*/
2203
2204	int	2232	int
2205	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2206	{	2234	{
2207	int d;	2235	int d;
2208		2236
…		…
2321	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2349	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2322	* core dumps if they do.	2350	* core dumps if they do.
2323	*	2351	*
2324	* Add a check so we can't pick up invisible objects (0.93.8)	2352	* Add a check so we can't pick up invisible objects (0.93.8)
2325	*/	2353	*/
2326
2327	int	2354	int
2328	can_pick (const object *who, const object *item)	2355	can_pick (const object *who, const object *item)
2329	{	2356	{
2330	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2357	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2331	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2336	* create clone from object to another	2363	* create clone from object to another
2337	*/	2364	*/
2338	object *	2365	object *
2339	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2340	{	2367	{
2341	object *dst = 0, *tmp, *src, *part, *prev, *item;	2368	object *dst = 0, *tmp, *src, *prev, *item;
2342		2369
2343	if (!asrc)	2370	if (!asrc)
2344	return 0;	2371	return 0;
2345		2372
2346	src = asrc;
2347	if (src->head)
2348	src = src->head;	2373	src = asrc->head_ ();
2349		2374
2350	prev = 0;	2375	prev = 0;
2351	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2352	{	2377	{
2353	tmp = part->clone ();	2378	tmp = part->clone ();
2354	tmp->x -= src->x;	2379	tmp->x -= src->x;
2355	tmp->y -= src->y;	2380	tmp->y -= src->y;
2356		2381
…		…
2372		2397
2373	for (item = src->inv; item; item = item->below)	2398	for (item = src->inv; item; item = item->below)
2374	insert_ob_in_ob (object_create_clone (item), dst);	2399	insert_ob_in_ob (object_create_clone (item), dst);
2375		2400
2376	return dst;	2401	return dst;
2377	}
2378
2379	/* GROS - Creates an object using a string representing its content. */
2380	/* Basically, we save the content of the string to a temp file, then call */
2381	/* load_object on it. I admit it is a highly inefficient way to make things, */
2382	/* but it was simple to make and allows reusing the load_object function. */
2383	/* Remember not to use load_object_str in a time-critical situation. */
2384	/* Also remember that multiparts objects are not supported for now. */
2385	object *
2386	load_object_str (const char *obstr)
2387	{
2388	object *op;
2389	char filename[MAX_BUF];
2390
2391	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2392
2393	FILE *tempfile = fopen (filename, "w");
2394
2395	if (tempfile == NULL)
2396	{
2397	LOG (llevError, "Error - Unable to access load object temp file\n");
2398	return NULL;
2399	}
2400
2401	fprintf (tempfile, obstr);
2402	fclose (tempfile);
2403
2404	op = object::create ();
2405
2406	object_thawer thawer (filename);
2407
2408	if (thawer)
2409	load_object (thawer, op, 0);
2410
2411	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2412	CLEAR_FLAG (op, FLAG_REMOVED);
2413
2414	return op;
2415	}	2402	}
2416		2403
2417	/* This returns the first object in who's inventory that	2404	/* This returns the first object in who's inventory that
2418	* has the same type and subtype match.	2405	* has the same type and subtype match.
2419	* returns NULL if no match.	2406	* returns NULL if no match.
…		…
2474	if (link->key == canonical_key)	2461	if (link->key == canonical_key)
2475	return link->value;	2462	return link->value;
2476		2463
2477	return 0;	2464	return 0;
2478	}	2465	}
2479
2480		2466
2481	/*	2467	/*
2482	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
2483	*	2469	*
2484	* canonical_key is a shared string (value doesn't have to be).	2470	* canonical_key is a shared string (value doesn't have to be).
…		…
2508	/* Basically, if the archetype has this key set,	2494	/* Basically, if the archetype has this key set,
2509	* we need to store the null value so when we save	2495	* we need to store the null value so when we save
2510	* it, we save the empty value so that when we load,	2496	* it, we save the empty value so that when we load,
2511	* we get this value back again.	2497	* we get this value back again.
2512	*/	2498	*/
2513	if (get_ob_key_link (&op->arch->clone, canonical_key))	2499	if (get_ob_key_link (op->arch, canonical_key))
2514	field->value = 0;	2500	field->value = 0;
2515	else	2501	else
2516	{	2502	{
2517	if (last)	2503	if (last)
2518	last->next = field->next;	2504	last->next = field->next;
…		…
2587	}	2573	}
2588	else	2574	else
2589	item = item->env;	2575	item = item->env;
2590	}	2576	}
2591		2577
		2578	const char *
		2579	object::flag_desc (char *desc, int len) const
		2580	{
		2581	char *p = desc;
		2582	bool first = true;
		2583
		2584	*p = 0;
		2585
		2586	for (int i = 0; i < NUM_FLAGS; i++)
		2587	{
		2588	if (len <= 10) // magic constant!
		2589	{
		2590	snprintf (p, len, ",...");
		2591	break;
		2592	}
		2593
		2594	if (flag [i])
		2595	{
		2596	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2597	len -= cnt;
		2598	p += cnt;
		2599	first = false;
		2600	}
		2601	}
		2602
		2603	return desc;
		2604	}
		2605
2592	// return a suitable string describing an objetc in enough detail to find it	2606	// return a suitable string describing an object in enough detail to find it
2593	const char *	2607	const char *
2594	object::debug_desc (char *info) const	2608	object::debug_desc (char *info) const
2595	{	2609	{
		2610	char flagdesc[512];
2596	char info2[256 * 3];	2611	char info2[256 * 4];
2597	char *p = info;	2612	char *p = info;
2598		2613
2599	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2614	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2600	count,	2615	count, uuid.seq,
2601	&name,	2616	&name,
2602	title ? " " : "",	2617	title ? "\",title:\"" : "",
2603	title ? (const char *)title : "");	2618	title ? (const char *)title : "",
		2619	flag_desc (flagdesc, 512), type);
2604		2620
2605	if (env)	2621	if (!this->flag[FLAG_REMOVED] && env)
2606	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2622	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2607		2623
2608	if (map)	2624	if (map)
2609	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2625	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2610		2626
2611	return info;	2627	return info;
2612	}	2628	}
2613		2629
2614	const char *	2630	const char *
2615	object::debug_desc () const	2631	object::debug_desc () const
2616	{	2632	{
2617	static char info[256 * 3];	2633	static char info[3][256 * 4];
		2634	static int info_idx;
		2635
2618	return debug_desc (info);	2636	return debug_desc (info [++info_idx % 3]);
2619	}	2637	}
2620		2638
		2639	struct region *
		2640	object::region () const
		2641	{
		2642	return map ? map->region (x, y)
		2643	: region::default_region ();
		2644	}
		2645
		2646	const materialtype_t *
		2647	object::dominant_material () const
		2648	{
		2649	if (materialtype_t *mt = name_to_material (materialname))
		2650	return mt;
		2651
		2652	return name_to_material (shstr_unknown);
		2653	}
		2654
		2655	void
		2656	object::open_container (object *new_container)
		2657	{
		2658	if (container == new_container)
		2659	return;
		2660
		2661	if (object *old_container = container)
		2662	{
		2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2664	return;
		2665
		2666	#if 0
		2667	// remove the "Close old_container" object.
		2668	if (object *closer = old_container->inv)
		2669	if (closer->type == CLOSE_CON)
		2670	closer->destroy ();
		2671	#endif
		2672
		2673	old_container->flag [FLAG_APPLIED] = 0;
		2674	container = 0;
		2675
		2676	esrv_update_item (UPD_FLAGS, this, old_container);
		2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2678	play_sound (sound_find ("chest_close"));
		2679	}
		2680
		2681	if (new_container)
		2682	{
		2683	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2684	return;
		2685
		2686	// TODO: this does not seem to serve any purpose anymore?
		2687	#if 0
		2688	// insert the "Close Container" object.
		2689	if (archetype *closer = new_container->other_arch)
		2690	{
		2691	object *closer = arch_to_object (new_container->other_arch);
		2692	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2693	new_container->insert (closer);
		2694	}
		2695	#endif
		2696
		2697	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2698
		2699	new_container->flag [FLAG_APPLIED] = 1;
		2700	container = new_container;
		2701
		2702	esrv_update_item (UPD_FLAGS, this, new_container);
		2703	esrv_send_inventory (this, new_container);
		2704	play_sound (sound_find ("chest_open"));
		2705	}
		2706	}
		2707
		2708	object *
		2709	object::force_find (const shstr name)
		2710	{
		2711	/* cycle through his inventory to look for the MARK we want to
		2712	* place
		2713	*/
		2714	for (object *tmp = inv; tmp; tmp = tmp->below)
		2715	if (tmp->type == FORCE && tmp->slaying == name)
		2716	return splay (tmp);
		2717
		2718	return 0;
		2719	}
		2720
		2721	void
		2722	object::force_add (const shstr name, int duration)
		2723	{
		2724	if (object *force = force_find (name))
		2725	force->destroy ();
		2726
		2727	object *force = get_archetype (FORCE_NAME);
		2728
		2729	force->slaying = name;
		2730	force->stats.food = 1;
		2731	force->speed_left = -1.f;
		2732
		2733	force->set_speed (duration ? 1.f / duration : 0.f);
		2734	force->flag [FLAG_IS_USED_UP] = true;
		2735	force->flag [FLAG_APPLIED] = true;
		2736
		2737	insert (force);
		2738	}
		2739
		2740	void
		2741	object::play_sound (faceidx sound) const
		2742	{
		2743	if (!sound)
		2744	return;
		2745
		2746	if (flag [FLAG_REMOVED])
		2747	return;
		2748
		2749	if (env)
		2750	{
		2751	if (object *pl = in_player ())
		2752	pl->contr->play_sound (sound);
		2753	}
		2754	else
		2755	map->play_sound (sound, x, y);
		2756	}
		2757

Diff Legend

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