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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 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 (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* 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	9	* 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	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <sys/types.h>	27	#include <sys/types.h>
28	#include <sys/uio.h>	28	#include <sys/uio.h>
29	#include <object.h>	29	#include <object.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
35	UUID UUID::cur;	34	UUID UUID::cur;
36	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
38	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
39		38
40	objectvec objects;	39	objectvec objects;
41	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
42		47
43	//+GPL	48	//+GPL
44		49
45	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
46	0,	51	0,
…		…
77	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
78	CALL_END;	83	CALL_END;
79	}	84	}
80		85
81	static void	86	static void
82	read_uuid (void)	87	read_uuid ()
83	{	88	{
84	char filename[MAX_BUF];	89	char filename[MAX_BUF];
85		90
86	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
87		92
…		…
101		106
102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
103	_exit (1);	108	_exit (1);
104	}	109	}
105		110
106	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
107	buf[0] = 0;	112	buf[0] = 0;
108	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
109		114
110	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
111	{	116	{
…		…
138		143
139	void	144	void
140	UUID::init ()	145	UUID::init ()
141	{	146	{
142	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) \| digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz \|= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
143	}	213	}
144		214
145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
146	static bool	216	static bool
147	compare_ob_value_lists_one (const object wants, const object has)	217	compare_ob_value_lists_one (const object wants, const object has)
…		…
183	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
184	* check weight	254	* check weight
185	*/	255	*/
186	bool object::can_merge_slow (object ob1, object ob2)	256	bool object::can_merge_slow (object ob1, object ob2)
187	{	257	{
188	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
189	if (ob1 == ob2	259	if (ob1 == ob2
190	\|\| ob1->type != ob2->type	260	\|\| ob1->type != ob2->type
191	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
192	\|\| ob1->value != ob2->value	261	\|\| ob1->value != ob2->value
193	\|\| ob1->name != ob2->name)	262	\|\| ob1->name != ob2->name
		263	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
194	return 0;	264	return 0;
195		265
196	/* Do not merge objects if nrof would overflow, assume nrof	266	/* Do not merge objects if nrof would overflow, assume nrof
197	* is always 0 .. 2*31-1 /	267	* is always 0 .. 2*31-1 /
198	if (ob1->nrof > 0x7fffffff - ob2->nrof)	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
202	* This is to the comparison of the flags below will be OK. We	272	* This is to the comparison of the flags below will be OK. We
203	* just can't ignore the been applied or identified flags, as they	273	* just can't ignore the been applied or identified flags, as they
204	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
205	* flags lose any meaning.	275	* flags lose any meaning.
206	*/	276	*/
207	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
208	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
209		279
210	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
211	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
212		282
213	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
214	\|\| ob1->name != ob2->name	284	\|\| ob1->name != ob2->name
215	\|\| ob1->title != ob2->title	285	\|\| ob1->title != ob2->title
216	\|\| ob1->msg != ob2->msg	286	\|\| ob1->msg != ob2->msg
…		…
219	\|\| ob1->magic != ob2->magic	289	\|\| ob1->magic != ob2->magic
220	\|\| ob1->slaying != ob2->slaying	290	\|\| ob1->slaying != ob2->slaying
221	\|\| ob1->skill != ob2->skill	291	\|\| ob1->skill != ob2->skill
222	\|\| ob1->value != ob2->value	292	\|\| ob1->value != ob2->value
223	\|\| ob1->animation_id != ob2->animation_id	293	\|\| ob1->animation_id != ob2->animation_id
224	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	294	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
225	\|\| ob1->client_type != ob2->client_type	295	\|\| ob1->client_type != ob2->client_type
226	\|\| ob1->materialname != ob2->materialname	296	\|\| ob1->material != ob2->material
227	\|\| ob1->lore != ob2->lore	297	\|\| ob1->lore != ob2->lore
228	\|\| ob1->subtype != ob2->subtype	298	\|\| ob1->subtype != ob2->subtype
229	\|\| ob1->move_type != ob2->move_type	299	\|\| ob1->move_type != ob2->move_type
230	\|\| ob1->move_block != ob2->move_block	300	\|\| ob1->move_block != ob2->move_block
231	\|\| ob1->move_allow != ob2->move_allow	301	\|\| ob1->move_allow != ob2->move_allow
…		…
265		335
266	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
267	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
268	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
269	*/	339	*/
270	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
271	return 0;	341	return 0;
272		342
273	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
274	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
275	* check?	345	* check?
276	*/	346	*/
277	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
278	return 0;	348	return 0;
279		349
280	switch (ob1->type)	350	switch (ob1->type)
281	{	351	{
282	case SCROLL:	352	case SCROLL:
…		…
456		526
457	return 0;	527	return 0;
458	}	528	}
459		529
460	/*	530	/*
		531	* Returns the object which has the uuid equal to the argument.
		532	* MOAR VERRRY slow.
		533	*/
		534
		535	object *
		536	find_object_uuid (UUID i)
		537	{
		538	for_all_objects (op)
		539	if (op->uuid == i)
		540	return op;
		541
		542	return 0;
		543	}
		544
		545	/*
461	* Returns the first object which has a name equal to the argument.	546	* Returns the first object which has a name equal to the argument.
462	* Used only by the patch command, but not all that useful.	547	* Used only by the patch command, but not all that useful.
463	* Enables features like "patch <name-of-other-player> food 999"	548	* Enables features like "patch <name-of-other-player> food 999"
464	*/	549	*/
465	object *	550	object *
…		…
493	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	578	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
494	return;	579	return;
495	}	580	}
496		581
497	this->owner = owner;	582	this->owner = owner;
498	}
499
500	int
501	object::slottype () const
502	{
503	if (type == SKILL)
504	{
505	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
506	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
507	}
508	else
509	{
510	if (slot [body_combat].info) return slot_combat;
511	if (slot [body_range ].info) return slot_ranged;
512	}
513
514	return slot_none;
515	}
516
517	bool
518	object::change_weapon (object *ob)
519	{
520	if (current_weapon == ob)
521	return true;
522
523	if (chosen_skill)
524	chosen_skill->flag [FLAG_APPLIED] = false;
525
526	current_weapon = ob;
527	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
528
529	if (chosen_skill)
530	chosen_skill->flag [FLAG_APPLIED] = true;
531
532	update_stats ();
533
534	if (ob)
535	{
536	// now check wether any body locations became invalid, in which case
537	// we cannot apply the weapon at the moment.
538	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
539	if (slot[i].used < 0)
540	{
541	current_weapon = chosen_skill = 0;
542	update_stats ();
543
544	new_draw_info_format (NDI_UNIQUE, 0, this,
545	"You try to balance all your items at once, "
546	"but the %s is just too much for your body. "
547	"[You need to unapply some items first - use the 'body' command to see "
548	"how many items you cna wera on a specific body part.]", &ob->name);
549	return false;
550	}
551
552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
553	}
554	else
555	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
556
557	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
558	{
559	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
560	&name, ob->debug_desc ());
561	return false;
562	}
563
564	return true;
565	}	583	}
566		584
567	/* Zero the key_values on op, decrementing the shared-string	585	/* Zero the key_values on op, decrementing the shared-string
568	* refcounts and freeing the links.	586	* refcounts and freeing the links.
569	*/	587	*/
…		…
622	tail = new_link;	640	tail = new_link;
623	}	641	}
624	}	642	}
625	}	643	}
626		644
627	if (speed < 0)
628	dst->speed_left -= rndm ();
629
630	dst->activate ();	645	dst->activate ();
631	}	646	}
632		647
633	void	648	void
634	object::instantiate ()	649	object::instantiate ()
635	{	650	{
636	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
637	uuid = UUID::gen ();	652	uuid = UUID::gen ();
638		653
		654	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		655	if (flag [FLAG_RANDOM_SPEED] && speed)
		656	speed_left = - speed - rndm (); // TODO animation
		657	else
639	speed_left = -0.1f;	658	speed_left = -1.;
		659
640	/* copy the body_info to the body_used - this is only really	660	/* copy the body_info to the body_used - this is only really
641	* need for monsters, but doesn't hurt to do it for everything.	661	* need for monsters, but doesn't hurt to do it for everything.
642	* by doing so, when a monster is created, it has good starting	662	* by doing so, when a monster is created, it has good starting
643	* values for the body_used info, so when items are created	663	* values for the body_used info, so when items are created
644	* for it, they can be properly equipped.	664	* for it, they can be properly equipped.
…		…
652	object *	672	object *
653	object::clone ()	673	object::clone ()
654	{	674	{
655	object *neu = create ();	675	object *neu = create ();
656	copy_to (neu);	676	copy_to (neu);
		677
		678	// TODO: unclean state changes, should not be done in clone AND instantiate
		679	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		680	neu->speed_left = - neu->speed - rndm (); // TODO animation
		681
657	neu->map = map; // not copied by copy_to	682	neu->map = map; // not copied by copy_to
658	return neu;	683	return neu;
659	}	684	}
660		685
661	/*	686	/*
…		…
664	* be called to update the face variable, _and_ how it looks on the map.	689	* be called to update the face variable, _and_ how it looks on the map.
665	*/	690	*/
666	void	691	void
667	update_turn_face (object *op)	692	update_turn_face (object *op)
668	{	693	{
669	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
670	return;	695	return;
671		696
672	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
673	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
674	}	699	}
…		…
740	/* nop */;	765	/* nop */;
741	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
742	{	767	{
743	#if 0	768	#if 0
744	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
746	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
747	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
748	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
749	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
750	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
751	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
752	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
753	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
754	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
755	* have move_allow right now.	780	* have move_allow right now.
…		…
776	update_object (op->more, action);	801	update_object (op->more, action);
777	}	802	}
778		803
779	object::object ()	804	object::object ()
780	{	805	{
781	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
782		807
783	//expmul = 1.0; declared const for the time being	808	//expmul = 1.0; declared const for the time being
784	face = blank_face;	809	face = blank_face;
		810	material = MATERIAL_NULL;
785	}	811	}
786		812
787	object::~object ()	813	object::~object ()
788	{	814	{
789	unlink ();	815	unlink ();
790		816
791	free_key_values (this);	817	free_key_values (this);
792	}	818	}
793
794	static int object_count;
795		819
796	void object::link ()	820	void object::link ()
797	{	821	{
798	assert (!index);//D	822	assert (!index);//D
799	uuid = UUID::gen ();	823	uuid = UUID::gen ();
800	count = ++object_count;
801		824
802	refcnt_inc ();	825	refcnt_inc ();
803	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
804	}	830	}
805		831
806	void object::unlink ()	832	void object::unlink ()
807	{	833	{
808	if (!index)	834	if (!index)
809	return;	835	return;
		836
		837	++destroy_count;
810		838
811	objects.erase (this);	839	objects.erase (this);
812	refcnt_dec ();	840	refcnt_dec ();
813	}	841	}
814		842
…		…
919	map->insert (op, x, y);	947	map->insert (op, x, y);
920	}	948	}
921	}	949	}
922	}	950	}
923		951
		952	/*
		953	* Remove and free all objects in the inventory of the given object.
		954	* Unlike destroy_inv, this assumes the *this is destroyed as well
		955	* well, so we can (and have to!) take shortcuts.
		956	*/
		957	void
		958	object::destroy_inv_fast ()
		959	{
		960	while (object *op = inv)
		961	{
		962	// remove from object the fast way
		963	op->flag [FLAG_REMOVED] = true;
		964	op->env = 0;
		965	if ((inv = inv->below))
		966	inv->above = 0;
		967
		968	// then destroy
		969	op->destroy ();
		970	}
		971	}
		972
		973	void
		974	object::freelist_free (int count)
		975	{
		976	while (count-- && freelist)
		977	{
		978	freelist_item *next = freelist->next;
		979	// count is being "destroyed"
		980
		981	sfree ((char *)freelist, sizeof (object));
		982
		983	freelist = next;
		984	--free_count;
		985	}
		986	}
		987
		988	object *
924	object *object::create ()	989	object::create ()
925	{	990	{
926	object *op = new object;	991	object *op;
		992
		993	if (freelist)
		994	{
		995	freelist_item li = *freelist;
		996	memset (freelist, 0, sizeof (object));
		997
		998	op = new (freelist) object;
		999	op->count = li.count;
		1000
		1001	freelist = li.next;
		1002	--free_count;
		1003	}
		1004	else
		1005	{
		1006	void *ni = salloc0<char> (sizeof (object));
		1007
		1008	op = new(ni) object;
		1009
		1010	op->count = ++object_count;
		1011	}
		1012
927	op->link ();	1013	op->link ();
		1014
928	return op;	1015	return op;
		1016	}
		1017
		1018	void
		1019	object::do_delete ()
		1020	{
		1021	uint32_t count = this->count;
		1022
		1023	this->~object ();
		1024
		1025	freelist_item li = (freelist_item )this;
		1026	li->next = freelist;
		1027	li->count = count;
		1028
		1029	freelist = li;
		1030	++free_count;
929	}	1031	}
930		1032
931	static struct freed_map : maptile	1033	static struct freed_map : maptile
932	{	1034	{
933	freed_map ()	1035	freed_map ()
…		…
998	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1100	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
999	head->destroy ();	1101	head->destroy ();
1000	return;	1102	return;
1001	}	1103	}
1002		1104
1003	destroy_inv (false);	1105	destroy_inv_fast ();
1004		1106
1005	if (is_head ())	1107	if (is_head ())
1006	if (sound_destroy)	1108	if (sound_destroy)
1007	play_sound (sound_destroy);	1109	play_sound (sound_destroy);
1008	else if (flag [FLAG_MONSTER])	1110	else if (flag [FLAG_MONSTER])
…		…
1060		1162
1061	above = 0;	1163	above = 0;
1062	below = 0;	1164	below = 0;
1063	env = 0;	1165	env = 0;
1064		1166
1065	/* NO_FIX_PLAYER is set when a great many changes are being	1167	if (pl && pl->is_player ())
1066	* made to players inventory. If set, avoiding the call
1067	* to save cpu time.
1068	*/	1168	{
1069	if (pl)	1169	if (expect_false (pl->contr->combat_ob == this))
1070	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1071	{	1170	{
1072	pl->update_stats ();	1171	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1172	pl->contr->combat_ob = 0;
		1173	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1174	}
1073		1175
		1176	if (expect_false (pl->contr->ranged_ob == this))
		1177	{
		1178	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1179	pl->contr->ranged_ob = 0;
		1180	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1181	}
		1182
		1183	pl->contr->queue_stats_update ();
		1184
1074	if (glow_radius && pl->is_on_map ())	1185	if (expect_false (glow_radius) && pl->is_on_map ())
1075	update_all_los (pl->map, pl->x, pl->y);	1186	update_all_los (pl->map, pl->x, pl->y);
1076	}	1187	}
1077	}	1188	}
1078	else if (map)	1189	else if (map)
1079	{	1190	{
1080	map->dirty = true;	1191	map->dirty = true;
1081	mapspace &ms = this->ms ();	1192	mapspace &ms = this->ms ();
…		…
1099	else if (pl->container_ () == this)	1210	else if (pl->container_ () == this)
1100	{	1211	{
1101	// removing a container should close it	1212	// removing a container should close it
1102	close_container ();	1213	close_container ();
1103	}	1214	}
1104		1215	else
1105	esrv_del_item (pl->contr, count);	1216	esrv_del_item (pl->contr, count);
1106	}	1217	}
1107		1218
1108	/* link the object above us */	1219	/* link the object above us */
1109	// re-link, make sure compiler can easily use cmove	1220	// re-link, make sure compiler can easily use cmove
1110	*(above ? &above->below : &ms.top) = below;	1221	*(above ? &above->below : &ms.top) = below;
…		…
1201		1312
1202	object *prev = this;	1313	object *prev = this;
1203		1314
1204	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1315	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1205	{	1316	{
1206	object *op = arch_to_object (at);	1317	object *op = at->instance ();
1207		1318
1208	op->name = name;	1319	op->name = name;
1209	op->name_pl = name_pl;	1320	op->name_pl = name_pl;
1210	op->title = title;	1321	op->title = title;
1211		1322
…		…
1249	* Passing 0 for flag gives proper default values, so flag really only needs	1360	* Passing 0 for flag gives proper default values, so flag really only needs
1250	* to be set if special handling is needed.	1361	* to be set if special handling is needed.
1251	*	1362	*
1252	* Return value:	1363	* Return value:
1253	* new object if 'op' was merged with other object	1364	* new object if 'op' was merged with other object
1254	* NULL if 'op' was destroyed	1365	* NULL if there was an error (destroyed, blocked etc.)
1255	* just 'op' otherwise	1366	* just 'op' otherwise
1256	*/	1367	*/
1257	object *	1368	object *
1258	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1369	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1259	{	1370	{
…		…
1296	// from here :/	1407	// from here :/
1297	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1409	tmp->destroy ();
1299	}	1410	}
1300		1411
1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1412	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1303		1414
1304	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1305	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1306		1417
1307	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1308	{	1419	{
1309	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1420	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1310	{	1421	{
…		…
1345	* when lots of spells are cast in one area. Currently, it is presumed	1456	* when lots of spells are cast in one area. Currently, it is presumed
1346	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1347	*/	1458	*/
1348	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1349	{	1460	{
1350	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1461	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1351	floor = tmp;	1462	floor = tmp;
1352		1463
1353	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1464	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1354	{	1465	{
1355	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1356	top = tmp->below;	1467	top = tmp->below;
1357	break;	1468	break;
1358	}	1469	}
…		…
1376	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1377	{	1488	{
1378	object *last;	1489	object *last;
1379		1490
1380	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1381	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1382	break;	1493	break;
1383		1494
1384	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1385	* and make sure we have a below pointer for it so that	1496	* and make sure we have a below pointer for it so that
1386	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1486		1597
1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1598	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488	if (tmp->arch->archname == archname) /* same archetype */	1599	if (tmp->arch->archname == archname) /* same archetype */
1489	tmp->destroy ();	1600	tmp->destroy ();
1490		1601
1491	object *tmp = arch_to_object (archetype::find (archname));	1602	object *tmp = archetype::find (archname)->instance ();
1492		1603
1493	tmp->x = op->x;	1604	tmp->x = op->x;
1494	tmp->y = op->y;	1605	tmp->y = op->y;
1495		1606
1496	insert_ob_in_map (tmp, op->map, op, 0);	1607	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1501	{	1612	{
1502	if (where->env)	1613	if (where->env)
1503	return where->env->insert (this);	1614	return where->env->insert (this);
1504	else	1615	else
1505	return where->map->insert (this, where->x, where->y, originator, flags);	1616	return where->map->insert (this, where->x, where->y, originator, flags);
		1617	}
		1618
		1619	// check whether we can put this into the map, respect max_volume, max_items
		1620	bool
		1621	object::can_drop_at (maptile m, int x, int y, object originator)
		1622	{
		1623	mapspace &ms = m->at (x, y);
		1624
		1625	int items = ms.items ();
		1626
		1627	if (!items // testing !items ensures we can drop at least one item
		1628	\|\| (items < m->max_items
		1629	&& ms.volume () < m->max_volume))
		1630	return true;
		1631
		1632	if (originator && originator->is_player ())
		1633	originator->contr->failmsgf (
		1634	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1635	query_name ()
		1636	);
		1637
		1638	return false;
1506	}	1639	}
1507		1640
1508	/*	1641	/*
1509	* decrease(object, number) decreases a specified number from	1642	* decrease(object, number) decreases a specified number from
1510	* the amount of an object. If the amount reaches 0, the object	1643	* the amount of an object. If the amount reaches 0, the object
…		…
1650	if (op->glow_radius && is_on_map ())	1783	if (op->glow_radius && is_on_map ())
1651	{	1784	{
1652	update_stats ();	1785	update_stats ();
1653	update_all_los (map, x, y);	1786	update_all_los (map, x, y);
1654	}	1787	}
1655	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1788	else if (is_player ())
1656	// if this is a player's inventory, update stats	1789	// if this is a player's inventory, update stats
1657	update_stats ();	1790	contr->queue_stats_update ();
1658		1791
1659	INVOKE_OBJECT (INSERT, this);	1792	INVOKE_OBJECT (INSERT, this);
1660		1793
1661	return op;	1794	return op;
1662	}	1795	}
…		…
1682	* on top.	1815	* on top.
1683	*/	1816	*/
1684	int	1817	int
1685	check_move_on (object op, object originator)	1818	check_move_on (object op, object originator)
1686	{	1819	{
1687	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1820	if (op->flag [FLAG_NO_APPLY])
1688	return 0;	1821	return 0;
1689		1822
1690	object *tmp;	1823	object *tmp;
1691	maptile *m = op->map;	1824	maptile *m = op->map;
1692	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
…		…
1729	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1730	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1731	* space doesn't slow down swimming (for example), if you can't actually	1864	* space doesn't slow down swimming (for example), if you can't actually
1732	* swim on that space, can't use it to avoid the penalty.	1865	* swim on that space, can't use it to avoid the penalty.
1733	*/	1866	*/
1734	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1735	{	1868	{
1736	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1737	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1870	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1738	{	1871	{
1739	float diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1870	void	2003	void
1871	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1872	{	2005	{
1873	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1874	{	2007	{
1875	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1876	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1877	}	2010	}
1878	}	2011	}
1879		2012
1880	/*	2013	/*
…		…
1883	void	2016	void
1884	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1885	{	2018	{
1886	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1887	{	2020	{
1888	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1889	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1890	}	2023	}
1891	}	2024	}
1892		2025
1893	/*	2026	/*
…		…
2253	* Add a check so we can't pick up invisible objects (0.93.8)	2386	* Add a check so we can't pick up invisible objects (0.93.8)
2254	*/	2387	*/
2255	int	2388	int
2256	can_pick (const object who, const object item)	2389	can_pick (const object who, const object item)
2257	{	2390	{
2258	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2391	return /who->flag [FLAG_WIZ]\|\| /
2259	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2260	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2393	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2261	}	2394	}
2262		2395
2263	/*	2396	/*
2264	* create clone from object to another	2397	* create clone from object to another
2265	*/	2398	*/
…		…
2430	{	2563	{
2431	return map ? map->region (x, y)	2564	return map ? map->region (x, y)
2432	: region::default_region ();	2565	: region::default_region ();
2433	}	2566	}
2434		2567
2435	const materialtype_t *
2436	object::dominant_material () const
2437	{
2438	if (materialtype_t *mt = name_to_material (materialname))
2439	return mt;
2440
2441	return name_to_material (shstr_unknown);
2442	}
2443
2444	void	2568	void
2445	object::open_container (object *new_container)	2569	object::open_container (object *new_container)
2446	{	2570	{
2447	if (container == new_container)	2571	if (container == new_container)
2448	return;	2572	return;
…		…
2482	// TODO: this does not seem to serve any purpose anymore?	2606	// TODO: this does not seem to serve any purpose anymore?
2483	#if 0	2607	#if 0
2484	// insert the "Close Container" object.	2608	// insert the "Close Container" object.
2485	if (archetype *closer = new_container->other_arch)	2609	if (archetype *closer = new_container->other_arch)
2486	{	2610	{
2487	object *closer = arch_to_object (new_container->other_arch);	2611	object *closer = new_container->other_arch->instance ();
2488	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2612	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2489	new_container->insert (closer);	2613	new_container->insert (closer);
2490	}	2614	}
2491	#endif	2615	#endif
2492		2616
…		…
2598		2722
2599	insert (force);	2723	insert (force);
2600	}	2724	}
2601	}	2725	}
2602		2726
		2727	void object::change_move_type (MoveType mt)
		2728	{
		2729	if (move_type == mt)
		2730	return;
		2731
		2732	if (is_on_map ())
		2733	{
		2734	// we are on the map, so handle move_on/off effects
		2735	remove ();
		2736	move_type = mt;
		2737	map->insert (this, x, y, this);
		2738	}
		2739	else
		2740	move_type = mt;
		2741	}
		2742

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC vs. Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC