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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC

…		…
37	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	activevec actives;	40	activevec actives;
41		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;
		47
42	//+GPL	48	//+GPL
43		49
44	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
45	0,	51	0,
46	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
…		…
266	* 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
267	* 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
268	* 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
269	* flags lose any meaning.	275	* flags lose any meaning.
270	*/	276	*/
271	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
273		279
274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
276		282
277	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
278	\|\| ob1->name != ob2->name	284	\|\| ob1->name != ob2->name
279	\|\| ob1->title != ob2->title	285	\|\| ob1->title != ob2->title
280	\|\| ob1->msg != ob2->msg	286	\|\| ob1->msg != ob2->msg
…		…
329		335
330	/* 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,
331	* 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
332	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
333	*/	339	*/
334	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
335	return 0;	341	return 0;
336		342
337	/* 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
338	* 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
339	* check?	345	* check?
340	*/	346	*/
341	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342	return 0;	348	return 0;
343		349
344	switch (ob1->type)	350	switch (ob1->type)
345	{	351	{
346	case SCROLL:	352	case SCROLL:
…		…
574	}	580	}
575		581
576	this->owner = owner;	582	this->owner = owner;
577	}	583	}
578		584
579	int
580	object::slottype () const
581	{
582	if (type == SKILL)
583	{
584	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586	}
587	else
588	{
589	if (slot [body_combat].info) return slot_combat;
590	if (slot [body_range ].info) return slot_ranged;
591	}
592
593	return slot_none;
594	}
595
596	bool
597	object::change_weapon (object *ob)
598	{
599	if (current_weapon == ob)
600	return true;
601
602	if (current_weapon && current_weapon->flag [FLAG_APPLIED])
603	{
604	manual_apply (this, current_weapon, AP_UNAPPLY);
605
606	if (current_weapon && !current_weapon->flag [FLAG_APPLIED])//D
607	LOG (llevError, "FATAL: did not clear current_weapon (%s)\n", current_weapon->debug_desc ());
608
609	if (current_weapon && current_weapon->flag [FLAG_APPLIED])
610	return false;
611	}
612
613	current_weapon = 0;
614
615	if (ob && !ob->flag [FLAG_APPLIED])
616	{
617	manual_apply (this, ob, AP_APPLY);
618
619	if (ob->flag [FLAG_APPLIED])
620	current_weapon = ob;
621	else
622	return false;
623	}
624
625	return true;
626	}
627
628	/* Zero the key_values on op, decrementing the shared-string	585	/* Zero the key_values on op, decrementing the shared-string
629	* refcounts and freeing the links.	586	* refcounts and freeing the links.
630	*/	587	*/
631	static void	588	static void
632	free_key_values (object *op)	589	free_key_values (object *op)
…		…
732	* 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.
733	*/	690	*/
734	void	691	void
735	update_turn_face (object *op)	692	update_turn_face (object *op)
736	{	693	{
737	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
738	return;	695	return;
739		696
740	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
741	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
742	}	699	}
…		…
808	/* nop */;	765	/* nop */;
809	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
810	{	767	{
811	#if 0	768	#if 0
812	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
813	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
814	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
815	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
816	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
817	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
818	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
819	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
820	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
821	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
822	/* 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
823	* have move_allow right now.	780	* have move_allow right now.
…		…
844	update_object (op->more, action);	801	update_object (op->more, action);
845	}	802	}
846		803
847	object::object ()	804	object::object ()
848	{	805	{
849	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
850		807
851	//expmul = 1.0; declared const for the time being	808	//expmul = 1.0; declared const for the time being
852	face = blank_face;	809	face = blank_face;
853	material = MATERIAL_NULL;	810	material = MATERIAL_NULL;
854	}	811	}
…		…
858	unlink ();	815	unlink ();
859		816
860	free_key_values (this);	817	free_key_values (this);
861	}	818	}
862		819
863	static int object_count;
864
865	void object::link ()	820	void object::link ()
866	{	821	{
867	assert (!index);//D	822	assert (!index);//D
868	uuid = UUID::gen ();	823	uuid = UUID::gen ();
869	count = ++object_count;
870		824
871	refcnt_inc ();	825	refcnt_inc ();
872	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
873	}	830	}
874		831
875	void object::unlink ()	832	void object::unlink ()
876	{	833	{
877	if (!index)	834	if (!index)
878	return;	835	return;
		836
		837	++destroy_count;
879		838
880	objects.erase (this);	839	objects.erase (this);
881	refcnt_dec ();	840	refcnt_dec ();
882	}	841	}
883		842
…		…
988	map->insert (op, x, y);	947	map->insert (op, x, y);
989	}	948	}
990	}	949	}
991	}	950	}
992		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 *
993	object *object::create ()	989	object::create ()
994	{	990	{
995	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
996	op->link ();	1013	op->link ();
		1014
997	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;
998	}	1031	}
999		1032
1000	static struct freed_map : maptile	1033	static struct freed_map : maptile
1001	{	1034	{
1002	freed_map ()	1035	freed_map ()
…		…
1067	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1100	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1068	head->destroy ();	1101	head->destroy ();
1069	return;	1102	return;
1070	}	1103	}
1071		1104
1072	destroy_inv (false);	1105	destroy_inv_fast ();
1073		1106
1074	if (is_head ())	1107	if (is_head ())
1075	if (sound_destroy)	1108	if (sound_destroy)
1076	play_sound (sound_destroy);	1109	play_sound (sound_destroy);
1077	else if (flag [FLAG_MONSTER])	1110	else if (flag [FLAG_MONSTER])
…		…
1177	else if (pl->container_ () == this)	1210	else if (pl->container_ () == this)
1178	{	1211	{
1179	// removing a container should close it	1212	// removing a container should close it
1180	close_container ();	1213	close_container ();
1181	}	1214	}
1182		1215	else
1183	esrv_del_item (pl->contr, count);	1216	esrv_del_item (pl->contr, count);
1184	}	1217	}
1185		1218
1186	/* link the object above us */	1219	/* link the object above us */
1187	// re-link, make sure compiler can easily use cmove	1220	// re-link, make sure compiler can easily use cmove
1188	*(above ? &above->below : &ms.top) = below;	1221	*(above ? &above->below : &ms.top) = below;
…		…
1374	// from here :/	1407	// from here :/
1375	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1376	tmp->destroy ();	1409	tmp->destroy ();
1377	}	1410	}
1378		1411
1379	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 */
1380	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1381		1414
1382	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1383	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1384		1417
1385	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1386	{	1419	{
1387	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)
1388	{	1421	{
…		…
1423	* 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
1424	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1425	*/	1458	*/
1426	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1427	{	1460	{
1428	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])
1429	floor = tmp;	1462	floor = tmp;
1430		1463
1431	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])
1432	{	1465	{
1433	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1434	top = tmp->below;	1467	top = tmp->below;
1435	break;	1468	break;
1436	}	1469	}
…		…
1454	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1455	{	1488	{
1456	object *last;	1489	object *last;
1457		1490
1458	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1459	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1460	break;	1493	break;
1461		1494
1462	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1463	* 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
1464	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1595	\|\| (items < m->max_items	1628	\|\| (items < m->max_items
1596	&& ms.volume () < m->max_volume))	1629	&& ms.volume () < m->max_volume))
1597	return true;	1630	return true;
1598		1631
1599	if (originator && originator->is_player ())	1632	if (originator && originator->is_player ())
1600	originator->contr->failmsg (format (	1633	originator->contr->failmsgf (
1601	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1634	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1602	query_name ()	1635	query_name ()
1603	));	1636	);
1604		1637
1605	return false;	1638	return false;
1606	}	1639	}
1607		1640
1608	/*	1641	/*
…		…
1782	* on top.	1815	* on top.
1783	*/	1816	*/
1784	int	1817	int
1785	check_move_on (object op, object originator)	1818	check_move_on (object op, object originator)
1786	{	1819	{
1787	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1820	if (op->flag [FLAG_NO_APPLY])
1788	return 0;	1821	return 0;
1789		1822
1790	object *tmp;	1823	object *tmp;
1791	maptile *m = op->map;	1824	maptile *m = op->map;
1792	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
…		…
1829	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1830	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1831	* 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
1832	* 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.
1833	*/	1866	*/
1834	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1835	{	1868	{
1836	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1837	((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))
1838	{	1871	{
1839	float diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1970	void	2003	void
1971	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1972	{	2005	{
1973	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1974	{	2007	{
1975	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1976	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1977	}	2010	}
1978	}	2011	}
1979		2012
1980	/*	2013	/*
…		…
1983	void	2016	void
1984	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1985	{	2018	{
1986	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1987	{	2020	{
1988	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1989	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1990	}	2023	}
1991	}	2024	}
1992		2025
1993	/*	2026	/*
…		…
2353	* 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)
2354	*/	2387	*/
2355	int	2388	int
2356	can_pick (const object who, const object item)	2389	can_pick (const object who, const object item)
2357	{	2390	{
2358	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2391	return /who->flag [FLAG_WIZ]\|\| /
2359	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2360	!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));
2361	}	2394	}
2362		2395
2363	/*	2396	/*
2364	* create clone from object to another	2397	* create clone from object to another
2365	*/	2398	*/

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.317 by root, Fri Apr 2 03:41:24 2010 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.317 by root, Fri Apr 2 03:41:24 2010 UTC vs.
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC