[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.330 by root, Sun Apr 18 14:01:33 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);
…		…
572	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	582	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573	return;	583	return;
574	}	584	}
575		585
576	this->owner = owner;	586	this->owner = owner;
577	}
578
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	}	587	}
627		588
628	/* Zero the key_values on op, decrementing the shared-string	589	/* Zero the key_values on op, decrementing the shared-string
629	* refcounts and freeing the links.	590	* refcounts and freeing the links.
630	*/	591	*/
…		…
732	* 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.
733	*/	694	*/
734	void	695	void
735	update_turn_face (object *op)	696	update_turn_face (object *op)
736	{	697	{
737	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
738	return;	699	return;
739		700
740	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
741	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
742	}	703	}
…		…
808	/* nop */;	769	/* nop */;
809	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
810	{	771	{
811	#if 0	772	#if 0
812	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
813	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
814	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
815	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	776	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
816	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
817	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
818	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
819	\|\| (m.move_on \| op->move_on ) != m.move_on	780	\|\| (m.move_on \| op->move_on ) != m.move_on
820	\|\| (m.move_off \| op->move_off ) != m.move_off	781	\|\| (m.move_off \| op->move_off ) != m.move_off
821	\|\| (m.move_slow \| op->move_slow) != m.move_slow	782	\|\| (m.move_slow \| op->move_slow) != m.move_slow
822	/* 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
823	* have move_allow right now.	784	* have move_allow right now.
…		…
844	update_object (op->more, action);	805	update_object (op->more, action);
845	}	806	}
846		807
847	object::object ()	808	object::object ()
848	{	809	{
849	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
850		811
851	//expmul = 1.0; declared const for the time being	812	//expmul = 1.0; declared const for the time being
852	face = blank_face;	813	face = blank_face;
853	material = MATERIAL_NULL;	814	material = MATERIAL_NULL;
854	}	815	}
…		…
858	unlink ();	819	unlink ();
859		820
860	free_key_values (this);	821	free_key_values (this);
861	}	822	}
862		823
863	static int object_count;
864
865	void object::link ()	824	void object::link ()
866	{	825	{
867	assert (!index);//D	826	assert (!index);//D
868	uuid = UUID::gen ();	827	uuid = UUID::gen ();
869	count = ++object_count;
870		828
871	refcnt_inc ();	829	refcnt_inc ();
872	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
873	}	834	}
874		835
875	void object::unlink ()	836	void object::unlink ()
876	{	837	{
877	if (!index)	838	if (!index)
878	return;	839	return;
		840
		841	++destroy_count;
879		842
880	objects.erase (this);	843	objects.erase (this);
881	refcnt_dec ();	844	refcnt_dec ();
882	}	845	}
883		846
…		…
988	map->insert (op, x, y);	951	map->insert (op, x, y);
989	}	952	}
990	}	953	}
991	}	954	}
992		955
		956	/*
		957	* Remove and free all objects in the inventory of the given object.
		958	* Unlike destroy_inv, this assumes the *this is destroyed as well
		959	* well, so we can (and have to!) take shortcuts.
		960	*/
		961	void
		962	object::destroy_inv_fast ()
		963	{
		964	while (object *op = inv)
		965	{
		966	// remove from object the fast way
		967	op->flag [FLAG_REMOVED] = true;
		968	op->env = 0;
		969	if ((inv = inv->below))
		970	inv->above = 0;
		971
		972	// then destroy
		973	op->destroy ();
		974	}
		975	}
		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 *
993	object *object::create ()	993	object::create ()
994	{	994	{
995	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
996	op->link ();	1017	op->link ();
		1018
997	return op;	1019	return op;
998	}	1020	}
999		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;
		1035	}
		1036
1000	static struct freed_map : maptile	1037	static struct freed_map : maptile
1001	{	1038	{
1002	freed_map ()	1039	freed_map ()
		1040	: maptile (3, 3)
1003	{	1041	{
1004	path = "<freed objects map>";	1042	path = "<freed objects map>";
1005	name = "/internal/freed_objects_map";	1043	name = "/internal/freed_objects_map";
1006	width = 3;
1007	height = 3;
1008	no_drop = 1;	1044	no_drop = 1;
1009	no_reset = 1;	1045	no_reset = 1;
1010		1046
1011	alloc ();
1012	in_memory = MAP_ACTIVE;	1047	in_memory = MAP_ACTIVE;
1013	}	1048	}
1014		1049
1015	~freed_map ()	1050	~freed_map ()
1016	{	1051	{
…		…
1067	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1102	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1068	head->destroy ();	1103	head->destroy ();
1069	return;	1104	return;
1070	}	1105	}
1071		1106
1072	destroy_inv (false);	1107	destroy_inv_fast ();
1073		1108
1074	if (is_head ())	1109	if (is_head ())
1075	if (sound_destroy)	1110	if (sound_destroy)
1076	play_sound (sound_destroy);	1111	play_sound (sound_destroy);
1077	else if (flag [FLAG_MONSTER])	1112	else if (flag [FLAG_MONSTER])
…		…
1177	else if (pl->container_ () == this)	1212	else if (pl->container_ () == this)
1178	{	1213	{
1179	// removing a container should close it	1214	// removing a container should close it
1180	close_container ();	1215	close_container ();
1181	}	1216	}
1182		1217	else
1183	esrv_del_item (pl->contr, count);	1218	esrv_del_item (pl->contr, count);
1184	}	1219	}
1185		1220
1186	/* link the object above us */	1221	/* link the object above us */
1187	// re-link, make sure compiler can easily use cmove	1222	// re-link, make sure compiler can easily use cmove
1188	*(above ? &above->below : &ms.top) = below;	1223	*(above ? &above->below : &ms.top) = below;
…		…
1374	// from here :/	1409	// from here :/
1375	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1376	tmp->destroy ();	1411	tmp->destroy ();
1377	}	1412	}
1378		1413
1379	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1414	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1380	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1381		1416
1382	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1383	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1384		1419
1385	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1386	{	1421	{
1387	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1422	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1388	{	1423	{
…		…
1423	* when lots of spells are cast in one area. Currently, it is presumed	1458	* when lots of spells are cast in one area. Currently, it is presumed
1424	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1425	*/	1460	*/
1426	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1427	{	1462	{
1428	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1463	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1429	floor = tmp;	1464	floor = tmp;
1430		1465
1431	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1466	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1432	{	1467	{
1433	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1434	top = tmp->below;	1469	top = tmp->below;
1435	break;	1470	break;
1436	}	1471	}
…		…
1454	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1455	{	1490	{
1456	object *last;	1491	object *last;
1457		1492
1458	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1459	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1460	break;	1495	break;
1461		1496
1462	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1463	* and make sure we have a below pointer for it so that	1498	* and make sure we have a below pointer for it so that
1464	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1595	\|\| (items < m->max_items	1630	\|\| (items < m->max_items
1596	&& ms.volume () < m->max_volume))	1631	&& ms.volume () < m->max_volume))
1597	return true;	1632	return true;
1598		1633
1599	if (originator && originator->is_player ())	1634	if (originator && originator->is_player ())
1600	originator->contr->failmsg (format (	1635	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.>",	1636	"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 ()	1637	query_name ()
1603	));	1638	);
1604		1639
1605	return false;	1640	return false;
1606	}	1641	}
1607		1642
1608	/*	1643	/*
…		…
1782	* on top.	1817	* on top.
1783	*/	1818	*/
1784	int	1819	int
1785	check_move_on (object op, object originator)	1820	check_move_on (object op, object originator)
1786	{	1821	{
1787	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1822	if (op->flag [FLAG_NO_APPLY])
1788	return 0;	1823	return 0;
1789		1824
1790	object *tmp;	1825	object *tmp;
1791	maptile *m = op->map;	1826	maptile *m = op->map;
1792	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
…		…
1829	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1830	* (~slow_move) is not blocked on this space - just because the	1865	* (~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	1866	* 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.	1867	* swim on that space, can't use it to avoid the penalty.
1833	*/	1868	*/
1834	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1835	{	1870	{
1836	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1871	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))	1872	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1838	{	1873	{
1839	float diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1970	void	2005	void
1971	flag_inv (object *op, int flag)	2006	flag_inv (object *op, int flag)
1972	{	2007	{
1973	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2008	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1974	{	2009	{
1975	SET_FLAG (tmp, flag);	2010	tmp->set_flag (flag);
1976	flag_inv (tmp, flag);	2011	flag_inv (tmp, flag);
1977	}	2012	}
1978	}	2013	}
1979		2014
1980	/*	2015	/*
…		…
1983	void	2018	void
1984	unflag_inv (object *op, int flag)	2019	unflag_inv (object *op, int flag)
1985	{	2020	{
1986	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1987	{	2022	{
1988	CLEAR_FLAG (tmp, flag);	2023	tmp->clr_flag (flag);
1989	unflag_inv (tmp, flag);	2024	unflag_inv (tmp, flag);
1990	}	2025	}
1991	}	2026	}
1992		2027
1993	/*	2028	/*
…		…
2183	{	2218	{
2184	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2219	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2185	}	2220	}
2186		2221
2187	/*	2222	/*
2188	* find_dir_2(delta-x,delta-y) will return a direction in which	2223	* find_dir_2(delta-x,delta-y) will return a direction value
2189	* an object which has subtracted the x and y coordinates of another	2224	* for running into direct [dx, dy].
2190	* object, needs to travel toward it.	2225	* (the opposite of crossfire's find_dir_2!)
2191	*/	2226	*/
2192	int	2227	int
2193	find_dir_2 (int x, int y)	2228	find_dir_2 (int x, int y)
2194	{	2229	{
		2230	#if 1 // new algorithm
		2231	// this works by putting x, y into 16 sectors, which
		2232	// are not equal sized, but are a better approximation
		2233	// then the old algorithm, and then using a mapping
		2234	// table to map it into a direction value.
		2235
		2236	static const uint8 dir[16] = {
		2237	4, 5, 4, 3,
		2238	2, 1, 2, 3,
		2239	6, 5, 6, 7,
		2240	8, 1, 8, 7,
		2241	};
		2242	int sector = 0;
		2243
		2244	// this is a bit ugly, but more likely to result in branchless code
		2245	sector \|= x < 0 ? 8 : 0;
		2246	x = x < 0 ? -x : x; // abs
		2247
		2248	sector \|= y < 0 ? 4 : 0;
		2249	y = y < 0 ? -y : y; // abs
		2250
		2251	if (x > y)
		2252	{
		2253	sector \|= 2;
		2254
		2255	if (x > y * 2)
		2256	sector \|= 1;
		2257	}
		2258	else
		2259	{
		2260	if (y > x * 2)
		2261	sector \|= 1;
		2262	else if (!y)
		2263	return 0; // x == 0 here
		2264	}
		2265
		2266	return dir [sector];
		2267	#else // old algorithm
2195	int q;	2268	int q;
2196		2269
2197	if (y)	2270	if (y)
2198	q = x * 100 / y;	2271	q = 128 * x / y;
2199	else if (x)	2272	else if (x)
2200	q = -300 * x;	2273	q = -512 * x; // to make it > 309
2201	else	2274	else
2202	return 0;	2275	return 0;
2203		2276
2204	if (y > 0)	2277	if (y > 0)
2205	{	2278	{
2206	if (q < -242)	2279	if (q < -309) return 7;
		2280	if (q < -52) return 6;
		2281	if (q < 52) return 5;
		2282	if (q < 309) return 4;
		2283
2207	return 3;	2284	return 3;
2208	if (q < -41)	2285	}
2209	return 2;	2286	else
2210	if (q < 41)	2287	{
2211	return 1;	2288	if (q < -309) return 3;
2212	if (q < 242)	2289	if (q < -52) return 2;
2213	return 8;	2290	if (q < 52) return 1;
		2291	if (q < 309) return 8;
		2292
2214	return 7;	2293	return 7;
2215	}	2294	}
2216		2295	#endif
2217	if (q < -242)
2218	return 7;
2219	if (q < -41)
2220	return 6;
2221	if (q < 41)
2222	return 5;
2223	if (q < 242)
2224	return 4;
2225
2226	return 3;
2227	}	2296	}
2228		2297
2229	/*	2298	/*
2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2299	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231	* between two directions (which are expected to be absolute (see absdir())	2300	* between two directions (which are expected to be absolute (see absdir())
2232	*/	2301	*/
2233	int	2302	int
2234	dirdiff (int dir1, int dir2)	2303	dirdiff (int dir1, int dir2)
2235	{	2304	{
2236	int d;
2237
2238	d = abs (dir1 - dir2);	2305	int d = abs (dir1 - dir2);
2239	if (d > 4)
2240	d = 8 - d;
2241		2306
2242	return d;	2307	return d > 4 ? 8 - d : d;
2243	}	2308	}
2244		2309
2245	/* peterm:	2310	/* peterm:
2246	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2311	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2247	* Basically, this is a table of directions, and what directions	2312	* Basically, this is a table of directions, and what directions
…		…
2353	* Add a check so we can't pick up invisible objects (0.93.8)	2418	* Add a check so we can't pick up invisible objects (0.93.8)
2354	*/	2419	*/
2355	int	2420	int
2356	can_pick (const object who, const object item)	2421	can_pick (const object who, const object item)
2357	{	2422	{
2358	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2423	return /who->flag [FLAG_WIZ]\|\| /
2359	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2424	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2360	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2425	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2361	}	2426	}
2362		2427
2363	/*	2428	/*
2364	* create clone from object to another	2429	* create clone from object to another
2365	*/	2430	*/
…		…
2705	}	2770	}
2706	else	2771	else
2707	move_type = mt;	2772	move_type = mt;
2708	}	2773	}
2709		2774
		2775	/* object should be a player.
		2776	* we return the object the player has marked with the 'mark' command
		2777	* below. If no match is found (or object has changed), we return
		2778	* NULL. We leave it up to the calling function to print messages if
		2779	* nothing is found.
		2780	*/
		2781	object *
		2782	object::mark () const
		2783	{
		2784	if (contr && contr->mark && contr->mark->env == this)
		2785	return contr->mark;
		2786	else
		2787	return 0;
		2788	}
		2789

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.330 by root, Sun Apr 18 14:01:33 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.330 by root, Sun Apr 18 14:01:33 2010 UTC