[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.326 by root, Thu Apr 15 00:56:40 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:
…		…
477		483
478	sum = weight_adjust_for (this, sum);	484	sum = weight_adjust_for (this, sum);
479		485
480	if (sum != carrying)	486	if (sum != carrying)
481	{	487	{
		488	if (carrying != sum)//D
		489	LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
		490	(long long)sum, (long long)carrying, debug_desc ());
		491
482	carrying = sum;	492	carrying = sum;
483		493
484	if (object *pl = visible_to ())	494	if (object *pl = visible_to ())
485	if (pl != this) // player is handled lazily	495	if (pl != this) // player is handled lazily
486	esrv_update_item (UPD_WEIGHT, pl, this);	496	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
683	* be called to update the face variable, _and_ how it looks on the map.	693	* be called to update the face variable, _and_ how it looks on the map.
684	*/	694	*/
685	void	695	void
686	update_turn_face (object *op)	696	update_turn_face (object *op)
687	{	697	{
688	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
689	return;	699	return;
690		700
691	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
692	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
693	}	703	}
…		…
759	/* nop */;	769	/* nop */;
760	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
761	{	771	{
762	#if 0	772	#if 0
763	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
766	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	776	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
770	\|\| (m.move_on \| op->move_on ) != m.move_on	780	\|\| (m.move_on \| op->move_on ) != m.move_on
771	\|\| (m.move_off \| op->move_off ) != m.move_off	781	\|\| (m.move_off \| op->move_off ) != m.move_off
772	\|\| (m.move_slow \| op->move_slow) != m.move_slow	782	\|\| (m.move_slow \| op->move_slow) != m.move_slow
773	/* This isn't perfect, but I don't expect a lot of objects to	783	/* This isn't perfect, but I don't expect a lot of objects to
774	* have move_allow right now.	784	* have move_allow right now.
…		…
795	update_object (op->more, action);	805	update_object (op->more, action);
796	}	806	}
797		807
798	object::object ()	808	object::object ()
799	{	809	{
800	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
801		811
802	//expmul = 1.0; declared const for the time being	812	//expmul = 1.0; declared const for the time being
803	face = blank_face;	813	face = blank_face;
804	material = MATERIAL_NULL;	814	material = MATERIAL_NULL;
805	}	815	}
…		…
809	unlink ();	819	unlink ();
810		820
811	free_key_values (this);	821	free_key_values (this);
812	}	822	}
813		823
814	static int object_count;
815
816	void object::link ()	824	void object::link ()
817	{	825	{
818	assert (!index);//D	826	assert (!index);//D
819	uuid = UUID::gen ();	827	uuid = UUID::gen ();
820	count = ++object_count;
821		828
822	refcnt_inc ();	829	refcnt_inc ();
823	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
824	}	834	}
825		835
826	void object::unlink ()	836	void object::unlink ()
827	{	837	{
828	if (!index)	838	if (!index)
829	return;	839	return;
		840
		841	++destroy_count;
830		842
831	objects.erase (this);	843	objects.erase (this);
832	refcnt_dec ();	844	refcnt_dec ();
833	}	845	}
834		846
…		…
960	// then destroy	972	// then destroy
961	op->destroy ();	973	op->destroy ();
962	}	974	}
963	}	975	}
964		976
		977	void
		978	object::freelist_free (int count)
		979	{
		980	while (count-- && freelist)
		981	{
		982	freelist_item *next = freelist->next;
		983	// count is being "destroyed"
		984
		985	sfree ((char *)freelist, sizeof (object));
		986
		987	freelist = next;
		988	--free_count;
		989	}
		990	}
		991
		992	object *
965	object *object::create ()	993	object::create ()
966	{	994	{
967	object *op = new object;	995	object *op;
		996
		997	if (freelist)
		998	{
		999	freelist_item li = *freelist;
		1000	memset (freelist, 0, sizeof (object));
		1001
		1002	op = new (freelist) object;
		1003	op->count = li.count;
		1004
		1005	freelist = li.next;
		1006	--free_count;
		1007	}
		1008	else
		1009	{
		1010	void *ni = salloc0<char> (sizeof (object));
		1011
		1012	op = new(ni) object;
		1013
		1014	op->count = ++object_count;
		1015	}
		1016
968	op->link ();	1017	op->link ();
		1018
969	return op;	1019	return op;
		1020	}
		1021
		1022	void
		1023	object::do_delete ()
		1024	{
		1025	uint32_t count = this->count;
		1026
		1027	this->~object ();
		1028
		1029	freelist_item li = (freelist_item )this;
		1030	li->next = freelist;
		1031	li->count = count;
		1032
		1033	freelist = li;
		1034	++free_count;
970	}	1035	}
971		1036
972	static struct freed_map : maptile	1037	static struct freed_map : maptile
973	{	1038	{
974	freed_map ()	1039	freed_map ()
…		…
1149	else if (pl->container_ () == this)	1214	else if (pl->container_ () == this)
1150	{	1215	{
1151	// removing a container should close it	1216	// removing a container should close it
1152	close_container ();	1217	close_container ();
1153	}	1218	}
1154		1219	else
1155	esrv_del_item (pl->contr, count);	1220	esrv_del_item (pl->contr, count);
1156	}	1221	}
1157		1222
1158	/* link the object above us */	1223	/* link the object above us */
1159	// re-link, make sure compiler can easily use cmove	1224	// re-link, make sure compiler can easily use cmove
1160	*(above ? &above->below : &ms.top) = below;	1225	*(above ? &above->below : &ms.top) = below;
…		…
1346	// from here :/	1411	// from here :/
1347	op->nrof += tmp->nrof;	1412	op->nrof += tmp->nrof;
1348	tmp->destroy ();	1413	tmp->destroy ();
1349	}	1414	}
1350		1415
1351	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1416	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1352	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1417	op->clr_flag (FLAG_INV_LOCKED);
1353		1418
1354	if (!QUERY_FLAG (op, FLAG_ALIVE))	1419	if (!op->flag [FLAG_ALIVE])
1355	CLEAR_FLAG (op, FLAG_NO_STEAL);	1420	op->clr_flag (FLAG_NO_STEAL);
1356		1421
1357	if (flag & INS_BELOW_ORIGINATOR)	1422	if (flag & INS_BELOW_ORIGINATOR)
1358	{	1423	{
1359	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1424	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1360	{	1425	{
…		…
1395	* when lots of spells are cast in one area. Currently, it is presumed	1460	* when lots of spells are cast in one area. Currently, it is presumed
1396	* that flying non pickable objects are spell objects.	1461	* that flying non pickable objects are spell objects.
1397	*/	1462	*/
1398	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1463	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1399	{	1464	{
1400	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1465	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1401	floor = tmp;	1466	floor = tmp;
1402		1467
1403	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1468	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1404	{	1469	{
1405	/* We insert above top, so we want this object below this */	1470	/* We insert above top, so we want this object below this */
1406	top = tmp->below;	1471	top = tmp->below;
1407	break;	1472	break;
1408	}	1473	}
…		…
1426	&& (op->face && !faces [op->face].visibility))	1491	&& (op->face && !faces [op->face].visibility))
1427	{	1492	{
1428	object *last;	1493	object *last;
1429		1494
1430	for (last = top; last != floor; last = last->below)	1495	for (last = top; last != floor; last = last->below)
1431	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1496	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1432	break;	1497	break;
1433		1498
1434	/* Check to see if we found the object that blocks view,	1499	/* Check to see if we found the object that blocks view,
1435	* and make sure we have a below pointer for it so that	1500	* and make sure we have a below pointer for it so that
1436	* we can get inserted below this one, which requires we	1501	* we can get inserted below this one, which requires we
…		…
1567	\|\| (items < m->max_items	1632	\|\| (items < m->max_items
1568	&& ms.volume () < m->max_volume))	1633	&& ms.volume () < m->max_volume))
1569	return true;	1634	return true;
1570		1635
1571	if (originator && originator->is_player ())	1636	if (originator && originator->is_player ())
1572	originator->contr->failmsg (format (	1637	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.>",	1638	"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 ()	1639	query_name ()
1575	));	1640	);
1576		1641
1577	return false;	1642	return false;
1578	}	1643	}
1579		1644
1580	/*	1645	/*
…		…
1754	* on top.	1819	* on top.
1755	*/	1820	*/
1756	int	1821	int
1757	check_move_on (object op, object originator)	1822	check_move_on (object op, object originator)
1758	{	1823	{
1759	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1824	if (op->flag [FLAG_NO_APPLY])
1760	return 0;	1825	return 0;
1761		1826
1762	object *tmp;	1827	object *tmp;
1763	maptile *m = op->map;	1828	maptile *m = op->map;
1764	int x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
…		…
1801	* Second check makes sure that the movement types not being slowed	1866	* Second check makes sure that the movement types not being slowed
1802	* (~slow_move) is not blocked on this space - just because the	1867	* (~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	1868	* 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.	1869	* swim on that space, can't use it to avoid the penalty.
1805	*/	1870	*/
1806	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1871	if (!op->flag [FLAG_WIZPASS])
1807	{	1872	{
1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1873	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))	1874	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1810	{	1875	{
1811	float diff = tmp->move_slow_penalty * fabs (op->speed);	1876	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1942	void	2007	void
1943	flag_inv (object *op, int flag)	2008	flag_inv (object *op, int flag)
1944	{	2009	{
1945	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2010	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1946	{	2011	{
1947	SET_FLAG (tmp, flag);	2012	tmp->set_flag (flag);
1948	flag_inv (tmp, flag);	2013	flag_inv (tmp, flag);
1949	}	2014	}
1950	}	2015	}
1951		2016
1952	/*	2017	/*
…		…
1955	void	2020	void
1956	unflag_inv (object *op, int flag)	2021	unflag_inv (object *op, int flag)
1957	{	2022	{
1958	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2023	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959	{	2024	{
1960	CLEAR_FLAG (tmp, flag);	2025	tmp->clr_flag (flag);
1961	unflag_inv (tmp, flag);	2026	unflag_inv (tmp, flag);
1962	}	2027	}
1963	}	2028	}
1964		2029
1965	/*	2030	/*
…		…
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2390	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2391	*/
2327	int	2392	int
2328	can_pick (const object who, const object item)	2393	can_pick (const object who, const object item)
2329	{	2394	{
2330	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2395	return /who->flag [FLAG_WIZ]\|\| /
2331	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2396	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2332	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2397	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2333	}	2398	}
2334		2399
2335	/*	2400	/*
2336	* create clone from object to another	2401	* create clone from object to another
2337	*/	2402	*/
…		…
2677	}	2742	}
2678	else	2743	else
2679	move_type = mt;	2744	move_type = mt;
2680	}	2745	}
2681		2746
		2747	/* object should be a player.
		2748	* we return the object the player has marked with the 'mark' command
		2749	* below. If no match is found (or object has changed), we return
		2750	* NULL. We leave it up to the calling function to print messages if
		2751	* nothing is found.
		2752	*/
		2753	object *
		2754	object::mark () const
		2755	{
		2756	if (contr && contr->mark && contr->mark->env == this)
		2757	return contr->mark;
		2758	else
		2759	return 0;
		2760	}
		2761

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.326 by root, Thu Apr 15 00:56:40 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.326 by root, Thu Apr 15 00:56:40 2010 UTC