[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC vs.
Revision 1.367 by root, Sun Nov 18 15:19:48 2018 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	9	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	10	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the Affero GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	20	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	21	* <http://www.gnu.org/licenses/>.
21	*	22	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	#include <global.h>	26	#include <global.h>
26	#include <stdio.h>	27	#include <stdio.h>
45	uint32_t object::create_count;	46	uint32_t object::create_count;
46	uint32_t object::destroy_count;	47	uint32_t object::destroy_count;
47		48
48	//+GPL	49	//+GPL
49		50
50	short freearr_x[SIZEOFFREE] = {	51	int freearr_x[SIZEOFFREE] = {
51	0,	52	0,
52	0, 1, 1, 1, 0, -1, -1, -1,	53	0, 1, 1, 1, 0, -1, -1, -1,
53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	54	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
54	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	55	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
55	};	56	};
56	short freearr_y[SIZEOFFREE] = {	57	int freearr_y[SIZEOFFREE] = {
57	0,	58	0,
58	-1, -1, 0, 1, 1, 1, 0, -1,	59	-1, -1, 0, 1, 1, 1, 0, -1,
59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	60	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	61	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
61	};	62	};
…		…
72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,	73	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	74	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
74	};	75	};
75		76
76	const char *wall_suffix[16] = {	77	const char *wall_suffix[16] = {
77	"0",	78	"0",
78	"1_3",	79	"1_3",
79	"1_4",	80	"1_4",
80	"2_1_2",	81	"2_1_2",
81	"1_2",	82	"1_2",
82	"2_2_4",	83	"2_2_4",
83	"2_2_1",	84	"2_2_1",
84	"3_1",	85	"3_1",
85	"1_1",	86	"1_1",
86	"2_2_3",	87	"2_2_3",
87	"2_2_2",	88	"2_2_2",
88	"3_3",	89	"3_3",
89	"2_1_1",	90	"2_1_1",
90	"3_4",	91	"3_4",
91	"3_2",	92	"3_2",
92	"4"	93	"4"
93	};	94	};
94		95
95	static void	96	static void
96	write_uuid (uval64 skip, bool sync)	97	write_uuid (uval64 skip, bool sync)
97	{	98	{
…		…
233		234
234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	235	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
235	static bool	236	static bool
236	compare_ob_value_lists_one (const object wants, const object has)	237	compare_ob_value_lists_one (const object wants, const object has)
237	{	238	{
238	/* n-squared behaviour (see kv_get), but I'm hoping both	239	/* n-squared behaviour (see kv.get), but I'm hoping both
239	* objects with lists are rare, and lists stay short. If not, use a	240	* objects with lists are rare, and lists stay short. If not, use a
240	* different structure or at least keep the lists sorted...	241	* different structure or at least keep the lists sorted...
241	*/	242	*/
242		243
243	/* For each field in wants, */	244	/* For each field in wants, */
244	for (key_value *kv = wants->key_values; kv; kv = kv->next)	245	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
245	if (has->kv_get (kv->key) != kv->value)	246	if (has->kv.get (kv->key) != kv->value)
246	return false;	247	return false;
247		248
248	/* If we get here, every field in wants has a matching field in has. */	249	/* If we get here, every field in wants has a matching field in has. */
249	return true;	250	return true;
250	}	251	}
…		…
351	/* inventory ok - still need to check rest of this object to see	352	/* inventory ok - still need to check rest of this object to see
352	* if it is valid.	353	* if it is valid.
353	*/	354	*/
354	}	355	}
355		356
356	/* Don't merge objects that are applied. With the new 'body' code,	357	/* Don't merge objects that are applied. With the new 'body' code,
357	* it is possible for most any character to have more than one of	358	* it is possible for most any character to have more than one of
358	* some items equipped, and we don't want those to merge.	359	* some items equipped, and we don't want those to merge.
359	*/	360	*/
360	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])	361	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
361	return 0;	362	return 0;
362		363
363	/* Note sure why the following is the case - either the object has to	364	/* Not sure why the following is the case - either the object has to
364	* be animated or have a very low speed. Is this an attempted monster	365	* be animated or have a very low speed. Is this an attempted monster
365	* check?	366	* check?
366	*/	367	*/
367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())	368	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
368	return 0;	369	return 0;
369		370
…		…
373	if (ob1->level != ob2->level)	374	if (ob1->level != ob2->level)
374	return 0;	375	return 0;
375	break;	376	break;
376	}	377	}
377		378
378	if (ob1->key_values \|\| ob2->key_values)	379	if (!ob1->kv.empty () \|\| !ob2->kv.empty ())
379	{	380	{
380	/* At least one of these has key_values. */	381	/* At least one of these has key_values. */
381	if ((!ob1->key_values) != (!ob2->key_values))	382	if (ob1->kv.empty () != ob2->kv.empty ())
382	return 0; /* One has fields, but the other one doesn't. */	383	return 0; /* One has fields, but the other one doesn't. */
383		384
384	if (!compare_ob_value_lists (ob1, ob2))	385	if (!compare_ob_value_lists (ob1, ob2))
385	return 0;	386	return 0;
386	}	387	}
…		…
446		447
447	return 0;	448	return 0;
448	}	449	}
449		450
450	// adjust weight per container type ("of holding")	451	// adjust weight per container type ("of holding")
451	static uint32	452	static weight_t
452	weight_adjust_for (object *op, uint32 weight)	453	weight_adjust_for (object *op, weight_t weight)
453	{	454	{
454	return op->type == CONTAINER	455	if (op->type == CONTAINER)
455	? weight - weight * op->stats.Str / 100	456	weight -= weight * op->stats.Str / 100;
456	: weight;	457
		458	return weight;
457	}	459	}
458		460
459	/*	461	/*
460	* subtracts, then adds, the specified weight to an object,	462	* subtracts, then adds, the specified weight to an object,
461	* and also updates how much the environment(s) is/are carrying.	463	* and also updates how much the environment(s) is/are carrying.
462	*/	464	*/
463	static void	465	static void
464	adjust_weight (object *op, sint32 sub, sint32 add)	466	adjust_weight (object *op, weight_t sub, weight_t add)
465	{	467	{
466	while (op)	468	while (op)
467	{	469	{
468	sint32 ocarrying = op->carrying;	470	weight_t carrying = (weight_t)op->carrying
		471	- weight_adjust_for (op, sub)
		472	+ weight_adjust_for (op, add);
469		473
470	op->carrying -= weight_adjust_for (op, sub);	474	sub = op->carrying;
471	op->carrying += weight_adjust_for (op, add);	475	op->carrying = carrying;
		476	add = op->carrying;
472		477
473	if (object *pl = op->visible_to ())	478	if (object *pl = op->visible_to ())
474	if (pl != op) // player is handled lazily	479	if (pl != op) // player is handled lazily
475	esrv_update_item (UPD_WEIGHT, pl, op);	480	esrv_update_item (UPD_WEIGHT, pl, op);
476		481
477	sub = ocarrying;
478	add = op->carrying;
479
480	op = op->env;	482	op = op->env;
481	}	483	}
482	}	484	}
483		485
484	/*	486	/*
…		…
487	* containers are carrying, and sums it up.	489	* containers are carrying, and sums it up.
488	*/	490	*/
489	void	491	void
490	object::update_weight ()	492	object::update_weight ()
491	{	493	{
492	sint32 sum = 0;	494	weight_t sum = 0;
493		495
494	for (object *op = inv; op; op = op->below)	496	for (object *op = inv; op; op = op->below)
495	{	497	{
496	op->update_weight ();	498	op->update_weight ();
497		499
…		…
597	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	599	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
598	return;	600	return;
599	}	601	}
600		602
601	this->owner = owner;	603	this->owner = owner;
602	}
603
604	/* Zero the key_values on op, decrementing the shared-string
605	* refcounts and freeing the links.
606	*/
607	static void
608	free_key_values (object *op)
609	{
610	for (key_value *i = op->key_values; i; )
611	{
612	key_value *next = i->next;
613	delete i;
614
615	i = next;
616	}
617
618	op->key_values = 0;
619	}	604	}
620		605
621	/*	606	/*
622	* copy_to first frees everything allocated by the dst object,	607	* copy_to first frees everything allocated by the dst object,
623	* and then copies the contents of itself into the second	608	* and then copies the contents of itself into the second
…		…
629	void	614	void
630	object::copy_to (object *dst)	615	object::copy_to (object *dst)
631	{	616	{
632	dst->remove ();	617	dst->remove ();
633	(object_copy )dst = *this;	618	(object_copy )dst = *this;
		619
		620	// maybe move to object_copy?
		621	dst->kv = kv;
		622
634	dst->flag [FLAG_REMOVED] = true;	623	dst->flag [FLAG_REMOVED] = true;
635
636	/* Copy over key_values, if any. */
637	if (key_values)
638	{
639	key_value *tail = 0;
640	dst->key_values = 0;
641
642	for (key_value *i = key_values; i; i = i->next)
643	{
644	key_value *new_link = new key_value;
645
646	new_link->next = 0;
647	new_link->key = i->key;
648	new_link->value = i->value;
649
650	/* Try and be clever here, too. */
651	if (!dst->key_values)
652	{
653	dst->key_values = new_link;
654	tail = new_link;
655	}
656	else
657	{
658	tail->next = new_link;
659	tail = new_link;
660	}
661	}
662	}
663
664	dst->activate ();	624	dst->activate ();
665	}	625	}
666		626
667	void	627	void
668	object::instantiate ()	628	object::instantiate ()
…		…
677	speed_left = -1.;	637	speed_left = -1.;
678		638
679	/* copy the body_info to the body_used - this is only really	639	/* copy the body_info to the body_used - this is only really
680	* need for monsters, but doesn't hurt to do it for everything.	640	* need for monsters, but doesn't hurt to do it for everything.
681	* by doing so, when a monster is created, it has good starting	641	* by doing so, when a monster is created, it has good starting
682	* values for the body_used info, so when items are created	642	* values for the body_used info, so when items are created
683	* for it, they can be properly equipped.	643	* for it, they can be properly equipped.
684	*/	644	*/
685	for (int i = NUM_BODY_LOCATIONS; i--; )	645	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
686	slot[i].used = slot[i].info;	646	slot[i].used = slot[i].info;
687		647
688	attachable::instantiate ();	648	attachable::instantiate ();
689	}	649	}
690		650
…		…
700		660
701	neu->map = map; // not copied by copy_to	661	neu->map = map; // not copied by copy_to
702	return neu;	662	return neu;
703	}	663	}
704		664
		665	// update the anhimation frame of an object, but only if it has an animation
		666	// assigned and the frame number if within the animation.
		667	void object::update_anim_frame (int frame)
		668	{
		669	if (ecb_expect_false (!has_anim () \|\| frame >= anim_frames ()))
		670	return;
		671
		672	set_anim_frame (frame);
		673	update_object (this, UP_OBJ_FACE);
		674	}
		675
705	/*	676	/*
706	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
707	* to the closest player being on the other side, this function can	678	* to the closest player being on the other side, this function can
708	* be called to update the face variable, _and_ how it looks on the map.	679	* be called to update the face variable, _and_ how it looks on the map.
709	*/	680	*/
…		…
711	update_turn_face (object *op)	682	update_turn_face (object *op)
712	{	683	{
713	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)	684	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
714	return;	685	return;
715		686
716	SET_ANIMATION (op, op->direction);	687	op->update_anim_frame (op->direction);
717	update_object (op, UP_OBJ_FACE);
718	}	688	}
719		689
720	/*	690	/*
721	* Updates the speed of an object. If the speed changes from 0 to another	691	* Updates the speed of an object. If the speed changes from 0 to another
722	* value, or vice versa, then add/remove the object from the active list.	692	* value, or vice versa, then add/remove the object from the active list.
…		…
732	else	702	else
733	deactivate ();	703	deactivate ();
734	}	704	}
735		705
736	/*	706	/*
737	* update_object() updates the the map.	707	* update_object() updates the map.
738	* It takes into account invisible objects (and represent squares covered	708	* It takes into account invisible objects (and represent squares covered
739	* by invisible objects by whatever is below them (unless it's another	709	* by invisible objects by whatever is below them (unless it's another
740	* invisible object, etc...)	710	* invisible object, etc...)
741	* If the object being updated is beneath a player, the look-window	711	* If the object being updated is beneath a player, the look-window
742	* of that player is updated (this might be a suboptimal way of	712	* of that player is updated (this might be a suboptimal way of
…		…
779	}	749	}
780		750
781	mapspace &m = op->ms ();	751	mapspace &m = op->ms ();
782		752
783	if (!(m.flags_ & P_UPTODATE))	753	if (!(m.flags_ & P_UPTODATE))
784	/* nop */;	754	m.update_up (); // nothing to do except copy up
785	else if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
786	{	756	{
787	#if 0	757	#if 0
788	// this is likely overkill, TODO: revisit (schmorp)	758	// this is likely overkill, TODO: revisit (schmorp)
789	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))	759	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
…		…
794	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))	764	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
795	\|\| (m.move_on \| op->move_on ) != m.move_on	765	\|\| (m.move_on \| op->move_on ) != m.move_on
796	\|\| (m.move_off \| op->move_off ) != m.move_off	766	\|\| (m.move_off \| op->move_off ) != m.move_off
797	\|\| (m.move_slow \| op->move_slow) != m.move_slow	767	\|\| (m.move_slow \| op->move_slow) != m.move_slow
798	/* This isn't perfect, but I don't expect a lot of objects to	768	/* This isn't perfect, but I don't expect a lot of objects to
799	* have move_allow right now.	769	* have move_allow right now.
800	*/	770	*/
801	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	771	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
802	m.invalidate ();	772	m.invalidate ();
803	#else	773	#else
804	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)	774	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
…		…
810	* that is being removed.	780	* that is being removed.
811	*/	781	*/
812	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
813	m.invalidate ();	783	m.invalidate ();
814	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
815	/* Nothing to do for that case */ ;	785	m.update_up (); // nothing to do for that case, except copy up
816	else	786	else
817	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
818		788
819	if (op->more)	789	if (op->more)
820	update_object (op->more, action);	790	update_object (op->more, action);
…		…
831		801
832	object::~object ()	802	object::~object ()
833	{	803	{
834	unlink ();	804	unlink ();
835		805
836	free_key_values (this);	806	kv.clear ();
837	}	807	}
838		808
839	void object::link ()	809	void object::link ()
840	{	810	{
841	assert (!index);//D	811	assert (!index);//D
…		…
884	op->activate_recursive ();	854	op->activate_recursive ();
885	}	855	}
886		856
887	/* This function removes object 'op' from the list of active	857	/* This function removes object 'op' from the list of active
888	* objects.	858	* objects.
889	* This should only be used for style maps or other such	859	* This should only be used for style maps or other such
890	* reference maps where you don't want an object that isn't	860	* reference maps where you don't want an object that isn't
891	* in play chewing up cpu time getting processed.	861	* in play chewing up cpu time getting processed.
892	* The reverse of this is to call update_ob_speed, which	862	* The reverse of this is to call update_ob_speed, which
893	* will do the right thing based on the speed of the object.	863	* will do the right thing based on the speed of the object.
894	*/	864	*/
…		…
940	* if some form of movement is allowed, let objects	910	* if some form of movement is allowed, let objects
941	* drop on that space.	911	* drop on that space.
942	*/	912	*/
943	if (!drop_to_ground	913	if (!drop_to_ground
944	\|\| !map	914	\|\| !map
945	\|\| map->in_memory != MAP_ACTIVE	915	\|\| !map->linkable ()
946	\|\| map->no_drop	916	\|\| map->no_drop
947	\|\| ms ().move_block == MOVE_ALL)	917	\|\| ms ().move_block == MOVE_ALL)
948	{	918	{
949	while (inv)	919	while (inv)
950	inv->destroy ();	920	inv->destroy ();
…		…
1047		1017
1048	freelist = li;	1018	freelist = li;
1049	++free_count;	1019	++free_count;
1050	}	1020	}
1051		1021
1052	static struct freed_map : maptile
1053	{
1054	freed_map ()
1055	: maptile (3, 3)
1056	{
1057	path = "<freed objects map>";
1058	name = "/internal/freed_objects_map";
1059	no_drop = 1;
1060	no_reset = 1;
1061
1062	in_memory = MAP_ACTIVE;
1063	}
1064
1065	~freed_map ()
1066	{
1067	destroy ();
1068	}
1069	} freed_map; // freed objects are moved here to avoid crashes
1070
1071	void	1022	void
1072	object::do_destroy ()	1023	object::do_destroy ()
1073	{	1024	{
1074	if (flag [FLAG_IS_LINKED])	1025	if (flag [FLAG_IS_LINKED])
1075	remove_link ();	1026	remove_link ();
…		…
1148	flag [FLAG_REMOVED] = true;	1099	flag [FLAG_REMOVED] = true;
1149		1100
1150	if (more)	1101	if (more)
1151	more->remove ();	1102	more->remove ();
1152		1103
1153	/*	1104	/*
1154	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1155	* inventory.	1106	* inventory.
1156	*/	1107	*/
1157	if (env)	1108	if (env)
1158	{	1109	{
…		…
1240		1191
1241	above = 0;	1192	above = 0;
1242	below = 0;	1193	below = 0;
1243		1194
1244	ms.invalidate ();	1195	ms.invalidate ();
1245
1246	if (map->in_memory == MAP_SAVING)
1247	return;
1248		1196
1249	int check_walk_off = !flag [FLAG_NO_APPLY];	1197	int check_walk_off = !flag [FLAG_NO_APPLY];
1250		1198
1251	if (object *pl = ms.player ())	1199	if (object *pl = ms.player ())
1252	{	1200	{
…		…
1387	{	1335	{
1388	op->remove ();	1336	op->remove ();
1389		1337
1390	if (m == &freed_map)//D TODO: remove soon	1338	if (m == &freed_map)//D TODO: remove soon
1391	{//D	1339	{//D
1392	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1340	LOG (llevError \| logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1393	}//D	1341	}//D
1394		1342
1395	/* Ideally, the caller figures this out. However, it complicates a lot	1343	/* Ideally, the caller figures this out. However, it complicates a lot
1396	* of areas of callers (eg, anything that uses find_free_spot would now	1344	* of areas of callers (eg, anything that uses find_free_spot would now
1397	* need extra work	1345	* need extra work
…		…
1466	* We've already dealt with merging if appropriate.	1414	* We've already dealt with merging if appropriate.
1467	* Generally, we want to put the new object on top. But if	1415	* Generally, we want to put the new object on top. But if
1468	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1416	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1469	* floor, we want to insert above that and no further.	1417	* floor, we want to insert above that and no further.
1470	* Also, if there are spell objects on this space, we stop processing	1418	* Also, if there are spell objects on this space, we stop processing
1471	* once we get to them. This reduces the need to traverse over all of	1419	* once we get to them. This reduces the need to traverse over all of
1472	* them when adding another one - this saves quite a bit of cpu time	1420	* them when adding another one - this saves quite a bit of cpu time
1473	* when lots of spells are cast in one area. Currently, it is presumed	1421	* when lots of spells are cast in one area. Currently, it is presumed
1474	* that flying non pickable objects are spell objects.	1422	* that flying non pickable objects are spell objects.
1475	*/	1423	*/
1476	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1424	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
…		…
1602		1550
1603	return op;	1551	return op;
1604	}	1552	}
1605		1553
1606	/* this function inserts an object in the map, but if it	1554	/* this function inserts an object in the map, but if it
1607	* finds an object of its own type, it'll remove that one first.	1555	* finds an object of its own type, it'll remove that one first.
1608	* op is the object to insert it under: supplies x and the map.	1556	* op is the object to insert it under: supplies x and the map.
1609	*/	1557	*/
1610	void	1558	void
1611	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1559	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1612	{	1560	{
…		…
1644	if (!items // testing !items ensures we can drop at least one item	1592	if (!items // testing !items ensures we can drop at least one item
1645	\|\| (items < m->max_items	1593	\|\| (items < m->max_items
1646	&& ms.volume () < m->max_volume))	1594	&& ms.volume () < m->max_volume))
1647	return true;	1595	return true;
1648		1596
1649	if (originator && originator->is_player ())	1597	if (originator)
1650	originator->contr->failmsgf (	1598	originator->failmsgf (
1651	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1599	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1652	query_name ()	1600	query_name ()
1653	);	1601	);
1654		1602
1655	return false;	1603	return false;
1656	}	1604	}
…		…
1670		1618
1671	nr = min (nr, nrof);	1619	nr = min (nr, nrof);
1672		1620
1673	if (nrof > nr)	1621	if (nrof > nr)
1674	{	1622	{
1675	sint64 oweight = total_weight ();	1623	weight_t oweight = total_weight ();
1676		1624
1677	nrof -= nr;	1625	nrof -= nr;
1678		1626
1679	if (object *pl = visible_to ())	1627	if (object *pl = visible_to ())
1680	esrv_update_item (UPD_NROF, pl, this);	1628	esrv_update_item (UPD_NROF, pl, this);
…		…
1741	/*	1689	/*
1742	* env->insert (op)	1690	* env->insert (op)
1743	* This function inserts the object op in the linked list	1691	* This function inserts the object op in the linked list
1744	* inside the object environment.	1692	* inside the object environment.
1745	*	1693	*
1746	* The function returns now pointer to inserted item, and return value can	1694	* The function returns now pointer to inserted item, and return value can
1747	* be != op, if items are merged. -Tero	1695	* be != op, if items are merged. -Tero
1748	*/	1696	*/
1749	object *	1697	object *
1750	object::insert (object *op)	1698	object::insert (object *op)
1751	{	1699	{
…		…
1764	if (object::can_merge (tmp, op))	1712	if (object::can_merge (tmp, op))
1765	{	1713	{
1766	/* return the original object and remove inserted object	1714	/* return the original object and remove inserted object
1767	(client prefers the original object) */	1715	(client prefers the original object) */
1768		1716
1769	// carring must be 0 for mergable objects	1717	// carrying must be 0 for mergable objects
1770	sint64 oweight = tmp->weight * tmp->nrof;	1718	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
1771		1719
1772	tmp->nrof += op->nrof;	1720	tmp->nrof += op->nrof;
1773		1721
1774	if (object *pl = tmp->visible_to ())	1722	if (object *pl = tmp->visible_to ())
1775	esrv_update_item (UPD_NROF, pl, tmp);	1723	esrv_update_item (UPD_NROF, pl, tmp);
1776		1724
1777	adjust_weight (this, oweight, tmp->weight * tmp->nrof);	1725	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1778		1726
1779	op->destroy ();	1727	op->destroy ();
1780	op = tmp;	1728	op = tmp;
1781	goto inserted;	1729	goto inserted;
1782	}	1730	}
…		…
1871	*/	1819	*/
1872	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1820	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1873	return 0;	1821	return 0;
1874		1822
1875	/* The objects have to be checked from top to bottom.	1823	/* The objects have to be checked from top to bottom.
1876	* Hence, we first go to the top:	1824	* Hence, we first go to the top:
1877	*/	1825	*/
1878	for (object next, tmp = ms.top; tmp; tmp = next)	1826	for (object next, tmp = ms.top; tmp; tmp = next)
1879	{	1827	{
1880	next = tmp->below;	1828	next = tmp->below;
1881		1829
…		…
2065	* inform the caller. However, insert_ob_in_map will update as	2013	* inform the caller. However, insert_ob_in_map will update as
2066	* necessary, so the caller shouldn't need to do any special work.	2014	* necessary, so the caller shouldn't need to do any special work.
2067	* Note - updated to take an object instead of archetype - this is necessary	2015	* Note - updated to take an object instead of archetype - this is necessary
2068	* because arch_blocked (now ob_blocked) needs to know the movement type	2016	* because arch_blocked (now ob_blocked) needs to know the movement type
2069	* to know if the space in question will block the object. We can't use	2017	* to know if the space in question will block the object. We can't use
2070	* the archetype because that isn't correct if the monster has been	2018	* the archetype because that isn't correct if the monster has been
2071	* customized, changed states, etc.	2019	* customized, changed states, etc.
2072	*/	2020	*/
2073	int	2021	int
2074	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2022	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2075	{	2023	{
2076	int altern[SIZEOFFREE];	2024	int altern[SIZEOFFREE];
2077	int index = 0, flag;	2025	int index = 0;
2078		2026
2079	for (int i = start; i < stop; i++)	2027	for (int i = start; i < stop; i++)
2080	{	2028	{
2081	mapxy pos (m, x, y); pos.move (i);	2029	mapxy pos (m, x, y); pos.move (i);
2082		2030
…		…
2098	continue;	2046	continue;
2099	}	2047	}
2100		2048
2101	/* Basically, if we find a wall on a space, we cut down the search size.	2049	/* Basically, if we find a wall on a space, we cut down the search size.
2102	* In this way, we won't return spaces that are on another side of a wall.	2050	* In this way, we won't return spaces that are on another side of a wall.
2103	* This mostly work, but it cuts down the search size in all directions -	2051	* This mostly work, but it cuts down the search size in all directions -
2104	* if the space being examined only has a wall to the north and empty	2052	* if the space being examined only has a wall to the north and empty
2105	* spaces in all the other directions, this will reduce the search space	2053	* spaces in all the other directions, this will reduce the search space
2106	* to only the spaces immediately surrounding the target area, and	2054	* to only the spaces immediately surrounding the target area, and
2107	* won't look 2 spaces south of the target space.	2055	* won't look 2 spaces south of the target space.
2108	*/	2056	*/
…		…
2138	*/	2086	*/
2139	int	2087	int
2140	find_first_free_spot (const object ob, maptile m, int x, int y)	2088	find_first_free_spot (const object ob, maptile m, int x, int y)
2141	{	2089	{
2142	for (int i = 0; i < SIZEOFFREE; i++)	2090	for (int i = 0; i < SIZEOFFREE; i++)
2143	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))	2091	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2144	return i;	2092	return i;
2145		2093
2146	return -1;	2094	return -1;
2147	}	2095	}
2148		2096
…		…
2159		2107
2160	while (--end)	2108	while (--end)
2161	swap (arr [end], arr [rndm (end + 1)]);	2109	swap (arr [end], arr [rndm (end + 1)]);
2162	}	2110	}
2163		2111
2164	/* new function to make monster searching more efficient, and effective!	2112	/* new function to make monster searching more efficient, and effective!
2165	* This basically returns a randomized array (in the passed pointer) of	2113	* This basically returns a randomized array (in the passed pointer) of
2166	* the spaces to find monsters. In this way, it won't always look for	2114	* the spaces to find monsters. In this way, it won't always look for
2167	* monsters to the north first. However, the size of the array passed	2115	* monsters to the north first. However, the size of the array passed
2168	* covers all the spaces, so within that size, all the spaces within	2116	* covers all the spaces, so within that size, all the spaces within
2169	* the 3x3 area will be searched, just not in a predictable order.	2117	* the 3x3 area will be searched, just not in a predictable order.
…		…
2194	* there is capable of.	2142	* there is capable of.
2195	*/	2143	*/
2196	int	2144	int
2197	find_dir (maptile m, int x, int y, object exclude)	2145	find_dir (maptile m, int x, int y, object exclude)
2198	{	2146	{
2199	int max = SIZEOFFREE, mflags;	2147	int max = SIZEOFFREE;
2200	MoveType move_type;	2148	MoveType move_type;
2201		2149
2202	if (exclude && exclude->head_ () != exclude)	2150	if (exclude && exclude->head_ () != exclude)
2203	{	2151	{
2204	exclude = exclude->head;	2152	exclude = exclude->head;
…		…
2413	int mflags;	2361	int mflags;
2414		2362
2415	if (dir < 0)	2363	if (dir < 0)
2416	return 0; /* exit condition: invalid direction */	2364	return 0; /* exit condition: invalid direction */
2417		2365
2418	dx = x + freearr_x[dir];	2366	dx = x + DIRX (dir);
2419	dy = y + freearr_y[dir];	2367	dy = y + DIRY (dir);
2420		2368
2421	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2369	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2422		2370
2423	/* This functional arguably was incorrect before - it was	2371	/* This functional arguably was incorrect before - it was
2424	* checking for P_WALL - that was basically seeing if	2372	* checking for P_WALL - that was basically seeing if
…		…
2455	return /who->flag [FLAG_WIZ]\|\| /	2403	return /who->flag [FLAG_WIZ]\|\| /
2456	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&	2404	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2457	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2405	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2458	}	2406	}
2459		2407
		2408	//-GPL
		2409
2460	/*	2410	/*
2461	* create clone from object to another	2411	* create clone from object to another
2462	*/	2412	*/
2463	object *	2413	object *
2464	object::deep_clone ()	2414	object::deep_clone ()
…		…
2494	return tmp;	2444	return tmp;
2495		2445
2496	return 0;	2446	return 0;
2497	}	2447	}
2498		2448
		2449	/* Zero the key_values on op, decrementing the shared-string
		2450	* refcounts and freeing the links.
		2451	*/
		2452	void
		2453	key_values::clear ()
		2454	{
		2455	for (key_value *kvp = first; kvp; )
		2456	{
		2457	key_value *next = kvp->next;
		2458	delete kvp;
		2459	kvp = next;
		2460	}
		2461
		2462	first = 0;
		2463	}
		2464
2499	shstr_tmp	2465	shstr_tmp
2500	object::kv_get (shstr_tmp key) const	2466	key_values::get (shstr_tmp key) const
2501	{	2467	{
2502	for (key_value *kv = key_values; kv; kv = kv->next)	2468	for (key_value *kv = first; kv; kv = kv->next)
2503	if (kv->key == key)	2469	if (kv->key == key)
2504	return kv->value;	2470	return kv->value;
2505		2471
2506	return shstr ();	2472	return shstr ();
2507	}	2473	}
2508		2474
2509	void	2475	void
		2476	key_values::add (shstr_tmp key, shstr_tmp value)
		2477	{
		2478	key_value *kv = new key_value;
		2479
		2480	kv->next = first;
		2481	kv->key = key;
		2482	kv->value = value;
		2483
		2484	first = kv;
		2485	}
		2486
		2487	void
2510	object::kv_set (shstr_tmp key, shstr_tmp value)	2488	key_values::set (shstr_tmp key, shstr_tmp value)
2511	{	2489	{
2512	for (key_value *kv = key_values; kv; kv = kv->next)	2490	for (key_value *kv = first; kv; kv = kv->next)
2513	if (kv->key == key)	2491	if (kv->key == key)
2514	{	2492	{
2515	kv->value = value;	2493	kv->value = value;
2516	return;	2494	return;
2517	}	2495	}
2518		2496
2519	key_value *kv = new key_value;	2497	add (key, value);
2520
2521	kv->next = key_values;
2522	kv->key = key;
2523	kv->value = value;
2524
2525	key_values = kv;
2526	}	2498	}
2527		2499
2528	void	2500	void
2529	object::kv_del (shstr_tmp key)	2501	key_values::del (shstr_tmp key)
2530	{	2502	{
2531	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2503	for (key_value *kvp = &first; kvp; kvp = &(*kvp)->next)
2532	if ((*kvp)->key == key)	2504	if ((*kvp)->key == key)
2533	{	2505	{
2534	key_value kv = kvp;	2506	key_value kv = kvp;
2535	kvp = (kvp)->next;	2507	kvp = (kvp)->next;
2536	delete kv;	2508	delete kv;
2537	return;	2509	return;
2538	}	2510	}
		2511	}
		2512
		2513	void
		2514	key_values::reverse ()
		2515	{
		2516	key_value *prev = 0;
		2517	key_value *head = first;
		2518
		2519	while (head)
		2520	{
		2521	key_value *node = head;
		2522	head = head->next;
		2523	node->next = prev;
		2524	prev = node;
		2525	}
		2526
		2527	first = prev;
		2528	}
		2529
		2530	key_values &
		2531	key_values::operator =(const key_values &kv)
		2532	{
		2533	clear ();
		2534
		2535	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2536	add (kvp->key, kvp->value);
		2537
		2538	reverse ();
2539	}	2539	}
2540		2540
2541	object::depth_iterator::depth_iterator (object *container)	2541	object::depth_iterator::depth_iterator (object *container)
2542	: iterator_base (container)	2542	: iterator_base (container)
2543	{	2543	{
…		…
2626	object::region () const	2626	object::region () const
2627	{	2627	{
2628	return map ? map->region (x, y)	2628	return map ? map->region (x, y)
2629	: region::default_region ();	2629	: region::default_region ();
2630	}	2630	}
		2631
		2632	//+GPL
2631		2633
2632	void	2634	void
2633	object::open_container (object *new_container)	2635	object::open_container (object *new_container)
2634	{	2636	{
2635	if (container == new_container)	2637	if (container == new_container)
…		…
2693	}	2695	}
2694	// else if (!old_container->env && contr && contr->ns)	2696	// else if (!old_container->env && contr && contr->ns)
2695	// contr->ns->floorbox_reset ();	2697	// contr->ns->floorbox_reset ();
2696	}	2698	}
2697		2699
		2700	//-GPL
		2701
		2702	// prefetch some flat area around the player
		2703	static void
		2704	prefetch_surrounding_area (object op, maptile map, int range)
		2705	{
		2706	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2707	op->x - range , op->y - range ,
		2708	op->x + range + 1, op->y + range + 1);
		2709	rect->m;
		2710	++rect)
		2711	{
		2712	rect->m->touch ();
		2713	rect->m->activate ();
		2714	}
		2715	}
		2716
		2717	// prefetch a generous area around the player, also up and down
		2718	void
		2719	object::prefetch_surrounding_maps ()
		2720	{
		2721	prefetch_surrounding_area (this, map, 40);
		2722
		2723	if (maptile *m = map->tile_available (TILE_DOWN))
		2724	prefetch_surrounding_area (this, m, 20);
		2725
		2726	if (maptile *m = map->tile_available (TILE_UP))
		2727	prefetch_surrounding_area (this, m, 20);
		2728	}
		2729
		2730	//+GPL
		2731
2698	object *	2732	object *
2699	object::force_find (shstr_tmp name)	2733	object::force_find (shstr_tmp name)
2700	{	2734	{
2701	/* cycle through his inventory to look for the MARK we want to	2735	/* cycle through his inventory to look for the MARK we want to
2702	* place	2736	* place
2703	*/	2737	*/
2704	for (object *tmp = inv; tmp; tmp = tmp->below)	2738	for (object *tmp = inv; tmp; tmp = tmp->below)
2705	if (tmp->type == FORCE && tmp->slaying == name)	2739	if (tmp->type == FORCE && tmp->slaying == name)
2706	return splay (tmp);	2740	return splay (tmp);
2707		2741
2708	return 0;	2742	return 0;
2709	}	2743	}
2710		2744
2711	//-GPL
2712
2713	void	2745	void
2714	object::force_set_timer (int duration)	2746	object::force_set_timer (int duration)
2715	{	2747	{
2716	this->duration = 1;	2748	this->duration = 1;
2717	this->speed_left = -1.f;	2749	this->speed_left = -1.f;
…		…
2723	object::force_add (shstr_tmp name, int duration)	2755	object::force_add (shstr_tmp name, int duration)
2724	{	2756	{
2725	if (object *force = force_find (name))	2757	if (object *force = force_find (name))
2726	force->destroy ();	2758	force->destroy ();
2727		2759
2728	object *force = get_archetype (FORCE_NAME);	2760	object *force = archetype::get (FORCE_NAME);
2729		2761
2730	force->slaying = name;	2762	force->slaying = name;
2731	force->force_set_timer (duration);	2763	force->force_set_timer (duration);
2732	force->flag [FLAG_APPLIED] = true;	2764	force->flag [FLAG_APPLIED] = true;
2733		2765

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC vs. Revision 1.367 by root, Sun Nov 18 15:19:48 2018 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC vs.
Revision 1.367 by root, Sun Nov 18 15:19:48 2018 UTC