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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.320 by root, Wed Apr 7 19:54:44 2010 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 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:
…		…
683	* 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.
684	*/	690	*/
685	void	691	void
686	update_turn_face (object *op)	692	update_turn_face (object *op)
687	{	693	{
688	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	694	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
689	return;	695	return;
690		696
691	SET_ANIMATION (op, op->direction);	697	SET_ANIMATION (op, op->direction);
692	update_object (op, UP_OBJ_FACE);	698	update_object (op, UP_OBJ_FACE);
693	}	699	}
…		…
759	/* nop */;	765	/* nop */;
760	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
761	{	767	{
762	#if 0	768	#if 0
763	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
766	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
770	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
771	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
772	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
773	/* 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
774	* have move_allow right now.	780	* have move_allow right now.
…		…
795	update_object (op->more, action);	801	update_object (op->more, action);
796	}	802	}
797		803
798	object::object ()	804	object::object ()
799	{	805	{
800	SET_FLAG (this, FLAG_REMOVED);	806	this->set_flag (FLAG_REMOVED);
801		807
802	//expmul = 1.0; declared const for the time being	808	//expmul = 1.0; declared const for the time being
803	face = blank_face;	809	face = blank_face;
804	material = MATERIAL_NULL;	810	material = MATERIAL_NULL;
805	}	811	}
…		…
809	unlink ();	815	unlink ();
810		816
811	free_key_values (this);	817	free_key_values (this);
812	}	818	}
813		819
814	static int object_count;
815
816	void object::link ()	820	void object::link ()
817	{	821	{
818	assert (!index);//D	822	assert (!index);//D
819	uuid = UUID::gen ();	823	uuid = UUID::gen ();
820	count = ++object_count;
821		824
822	refcnt_inc ();	825	refcnt_inc ();
823	objects.insert (this);	826	objects.insert (this);
		827
		828	++create_count;
		829
824	}	830	}
825		831
826	void object::unlink ()	832	void object::unlink ()
827	{	833	{
828	if (!index)	834	if (!index)
829	return;	835	return;
		836
		837	++destroy_count;
830		838
831	objects.erase (this);	839	objects.erase (this);
832	refcnt_dec ();	840	refcnt_dec ();
833	}	841	}
834		842
…		…
960	// then destroy	968	// then destroy
961	op->destroy ();	969	op->destroy ();
962	}	970	}
963	}	971	}
964		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 *
965	object *object::create ()	989	object::create ()
966	{	990	{
967	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
968	op->link ();	1013	op->link ();
		1014
969	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;
970	}	1031	}
971		1032
972	static struct freed_map : maptile	1033	static struct freed_map : maptile
973	{	1034	{
974	freed_map ()	1035	freed_map ()
…		…
1149	else if (pl->container_ () == this)	1210	else if (pl->container_ () == this)
1150	{	1211	{
1151	// removing a container should close it	1212	// removing a container should close it
1152	close_container ();	1213	close_container ();
1153	}	1214	}
1154		1215	else
1155	esrv_del_item (pl->contr, count);	1216	esrv_del_item (pl->contr, count);
1156	}	1217	}
1157		1218
1158	/* link the object above us */	1219	/* link the object above us */
1159	// re-link, make sure compiler can easily use cmove	1220	// re-link, make sure compiler can easily use cmove
1160	*(above ? &above->below : &ms.top) = below;	1221	*(above ? &above->below : &ms.top) = below;
…		…
1346	// from here :/	1407	// from here :/
1347	op->nrof += tmp->nrof;	1408	op->nrof += tmp->nrof;
1348	tmp->destroy ();	1409	tmp->destroy ();
1349	}	1410	}
1350		1411
1351	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 */
1352	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1413	op->clr_flag (FLAG_INV_LOCKED);
1353		1414
1354	if (!QUERY_FLAG (op, FLAG_ALIVE))	1415	if (!op->flag [FLAG_ALIVE])
1355	CLEAR_FLAG (op, FLAG_NO_STEAL);	1416	op->clr_flag (FLAG_NO_STEAL);
1356		1417
1357	if (flag & INS_BELOW_ORIGINATOR)	1418	if (flag & INS_BELOW_ORIGINATOR)
1358	{	1419	{
1359	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)
1360	{	1421	{
…		…
1395	* 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
1396	* that flying non pickable objects are spell objects.	1457	* that flying non pickable objects are spell objects.
1397	*/	1458	*/
1398	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1459	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1399	{	1460	{
1400	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])
1401	floor = tmp;	1462	floor = tmp;
1402		1463
1403	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])
1404	{	1465	{
1405	/* We insert above top, so we want this object below this */	1466	/* We insert above top, so we want this object below this */
1406	top = tmp->below;	1467	top = tmp->below;
1407	break;	1468	break;
1408	}	1469	}
…		…
1426	&& (op->face && !faces [op->face].visibility))	1487	&& (op->face && !faces [op->face].visibility))
1427	{	1488	{
1428	object *last;	1489	object *last;
1429		1490
1430	for (last = top; last != floor; last = last->below)	1491	for (last = top; last != floor; last = last->below)
1431	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1492	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1432	break;	1493	break;
1433		1494
1434	/* Check to see if we found the object that blocks view,	1495	/* Check to see if we found the object that blocks view,
1435	* 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
1436	* we can get inserted below this one, which requires we	1497	* we can get inserted below this one, which requires we
…		…
1567	\|\| (items < m->max_items	1628	\|\| (items < m->max_items
1568	&& ms.volume () < m->max_volume))	1629	&& ms.volume () < m->max_volume))
1569	return true;	1630	return true;
1570		1631
1571	if (originator && originator->is_player ())	1632	if (originator && originator->is_player ())
1572	originator->contr->failmsg (format (	1633	originator->contr->failmsgf (
1573	"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.>",
1574	query_name ()	1635	query_name ()
1575	));	1636	);
1576		1637
1577	return false;	1638	return false;
1578	}	1639	}
1579		1640
1580	/*	1641	/*
…		…
1754	* on top.	1815	* on top.
1755	*/	1816	*/
1756	int	1817	int
1757	check_move_on (object op, object originator)	1818	check_move_on (object op, object originator)
1758	{	1819	{
1759	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1820	if (op->flag [FLAG_NO_APPLY])
1760	return 0;	1821	return 0;
1761		1822
1762	object *tmp;	1823	object *tmp;
1763	maptile *m = op->map;	1824	maptile *m = op->map;
1764	int x = op->x, y = op->y;	1825	int x = op->x, y = op->y;
…		…
1801	* Second check makes sure that the movement types not being slowed	1862	* Second check makes sure that the movement types not being slowed
1802	* (~slow_move) is not blocked on this space - just because the	1863	* (~slow_move) is not blocked on this space - just because the
1803	* 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
1804	* 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.
1805	*/	1866	*/
1806	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1867	if (!op->flag [FLAG_WIZPASS])
1807	{	1868	{
1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1869	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1809	((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))
1810	{	1871	{
1811	float diff = tmp->move_slow_penalty * fabs (op->speed);	1872	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1942	void	2003	void
1943	flag_inv (object *op, int flag)	2004	flag_inv (object *op, int flag)
1944	{	2005	{
1945	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1946	{	2007	{
1947	SET_FLAG (tmp, flag);	2008	tmp->set_flag (flag);
1948	flag_inv (tmp, flag);	2009	flag_inv (tmp, flag);
1949	}	2010	}
1950	}	2011	}
1951		2012
1952	/*	2013	/*
…		…
1955	void	2016	void
1956	unflag_inv (object *op, int flag)	2017	unflag_inv (object *op, int flag)
1957	{	2018	{
1958	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2019	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959	{	2020	{
1960	CLEAR_FLAG (tmp, flag);	2021	tmp->clr_flag (flag);
1961	unflag_inv (tmp, flag);	2022	unflag_inv (tmp, flag);
1962	}	2023	}
1963	}	2024	}
1964		2025
1965	/*	2026	/*
…		…
2325	* 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)
2326	*/	2387	*/
2327	int	2388	int
2328	can_pick (const object who, const object item)	2389	can_pick (const object who, const object item)
2329	{	2390	{
2330	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2391	return /who->flag [FLAG_WIZ]\|\| /
2331	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2392	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2332	!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));
2333	}	2394	}
2334		2395
2335	/*	2396	/*
2336	* create clone from object to another	2397	* create clone from object to another
2337	*/	2398	*/
…		…
2677	}	2738	}
2678	else	2739	else
2679	move_type = mt;	2740	move_type = mt;
2680	}	2741	}
2681		2742
		2743	/* object should be a player.
		2744	* we return the object the player has marked with the 'mark' command
		2745	* below. If no match is found (or object has changed), we return
		2746	* NULL. We leave it up to the calling function to print messages if
		2747	* nothing is found.
		2748	*/
		2749	object *
		2750	object::mark () const
		2751	{
		2752	if (contr && contr->mark && contr->mark->env == this)
		2753	return contr->mark;
		2754	else
		2755	return 0;
		2756	}
		2757

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.320 by root, Wed Apr 7 19:54:44 2010 UTC vs. Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.320 by root, Wed Apr 7 19:54:44 2010 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC