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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.147 by root, Sun Jun 3 17:42:39 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
150	}	150	}
151		151
152	float
153	player::weapon_speed () const
154	{
155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156	}
157
158	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
159	static void	153	static void
160	set_first_map (object *op)	154	set_first_map (object *op)
161	{	155	{
162	op->contr->maplevel = first_map_path;	156	op->contr->maplevel = first_map_path;
163	op->x = -1;	157	op->x = -1;
164	op->y = -1;	158	op->y = -1;
165	}
166
167	void
168	player::enter_map ()
169	{
170	object *tmp = object::create ();
171
172	EXIT_PATH (tmp) = maplevel;
173	EXIT_X (tmp) = ob->x;
174	EXIT_Y (tmp) = ob->y;
175	ob->enter_exit (tmp);
176
177	tmp->destroy ();
178	}	159	}
179		160
180	void	161	void
181	player::activate ()	162	player::activate ()
182	{	163	{
…		…
187	ob->remove ();	168	ob->remove ();
188	ob->map = 0;	169	ob->map = 0;
189	ob->activate_recursive ();	170	ob->activate_recursive ();
190	CLEAR_FLAG (ob, FLAG_FRIENDLY);	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
191	add_friendly_object (ob);	172	add_friendly_object (ob);
192	enter_map ();
193	}	173	}
194		174
195	void	175	void
196	player::deactivate ()	176	player::deactivate ()
197	{	177	{
…		…
227	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
228		208
229	ns->update_look = 0;	209	ns->update_look = 0;
230	ns->look_position = 0;	210	ns->look_position = 0;
231		211
232	clear_los (ob);	212	clear_los (this);
233		213
234	ns->reset_stats ();	214	ns->reset_stats ();
235		215
236	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
237	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
…		…
272		252
273	for (object *op = ob->inv; op; op = op->below)	253	for (object *op = ob->inv; op; op = op->below)
274	if (op->flag [FLAG_APPLIED])	254	if (op->flag [FLAG_APPLIED])
275	switch (op->type)	255	switch (op->type)
276	{	256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
277	case WAND:	261	case WAND:
278	case ROD:	262	case ROD:
279	case HORN:	263	case HORN:
280	case BOW:	264	case BOW:
281	case SKILL_TOOL:	265	ranged_ob = op;
		266	break;
		267
282	case WEAPON:	268	case WEAPON:
283	op->flag [FLAG_APPLIED] = false;	269	combat_ob = op;
284	apply_special (ob, op, AP_APPLY);
285	break;
286
287	case SKILL:
288	op->flag [FLAG_APPLIED] = false;
289	break;	270	break;
290	}	271	}
291		272
292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
293	ob->update_stats ();	274	ob->update_stats ();
…		…
330	// the need for this function can be explained	311	// the need for this function can be explained
331	// by load_object not returning the object	312	// by load_object not returning the object
332	void	313	void
333	player::set_object (object *op)	314	player::set_object (object *op)
334	{	315	{
335	ob = op;	316	ob = observe = op;
336	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
337		318
338	ob->speed_left = 0.5f;
339	ob->speed = 1.0f;	319	ob->speed = 1.0f;
		320	ob->speed_left = 0.5f;
		321
340	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
		323	}
		324
		325	void
		326	player::set_observe (object *op)
		327	{
		328	observe = op ? op : ob;
		329	do_los = 1;
341	}	330	}
342		331
343	player::player ()	332	player::player ()
344	{	333	{
345	/* There are some elements we want initialised to non zero value -	334	/* There are some elements we want initialised to non zero value -
…		…
356	petmode = pet_normal;	345	petmode = pet_normal;
357	listening = 10;	346	listening = 10;
358	usekeys = containers;	347	usekeys = containers;
359	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
360	do_los = 1;	349	do_los = 1;
		350
		351	weapon_sp = 1.0f;
		352	weapon_sp_left = 0.5f;
361	}	353	}
362		354
363	void	355	void
364	player::do_destroy ()	356	player::do_destroy ()
365	{	357	{
…		…
1640	arrow->stats.grace = arrow->attacktype;	1632	arrow->stats.grace = arrow->attacktype;
1641		1633
1642	if (arrow->slaying)	1634	if (arrow->slaying)
1643	arrow->spellarg = strdup (arrow->slaying);	1635	arrow->spellarg = strdup (arrow->slaying);
1644		1636
		1637	#if 0
1645	if (player *pl = op->contr)	1638	if (player *pl = op->contr)
1646	{	1639	{
1647	if (!pl->has_hit)
1648	{
1649	pl->has_hit = 1;
1650	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1651	}
1652	#if 0
1653	float speed = pl->weapon_sp;	1640	float speed = pl->weapon_sp;
1654		1641
1655	/* penalize ROF for bestarrow */	1642	/* penalize ROF for bestarrow */
1656	if (pl->bowtype == bow_bestarrow)	1643	if (pl->bowtype == bow_bestarrow)
1657	speed *= .9f;	1644	speed *= .9f;
1658	else	1645	else
1659	speed = 1.f + dex_bonus[op->stats.Dex] .2f;	1646	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
1660		1647
1661	op->speed_left += speed - op->speed;	1648	op->speed_left += speed - op->speed;
		1649	}
1662	#endif	1650	#endif
1663	}
1664		1651
1665	SET_ANIMATION (arrow, arrow->direction);	1652	SET_ANIMATION (arrow, arrow->direction);
1666		1653
1667	/* update the speed */	1654	/* update the speed */
1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1669	+ bow->stats.dam / 7.0;	1656	+ bow->stats.dam / 7.f;
1670		1657
1671	arrow->set_speed (max (arrow->speed, 2.0));	1658	arrow->set_speed (max (arrow->speed, 2.f));
1672	arrow->speed_left = 0;	1659	arrow->speed_left = 0;
1673		1660
1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1675		1662
1676	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
…		…
1835	}	1822	}
1836	}	1823	}
1837		1824
1838	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1839	*/	1826	*/
1840	void	1827	bool
1841	fire (object *op, int dir)	1828	fire (object *op, int dir)
1842	{	1829	{
1843	int spellcost = 0;	1830	int spellcost = 0;
1844		1831
1845	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
…		…
1849	player *pl = op->contr;	1836	player *pl = op->contr;
1850		1837
1851	if (pl->golem)	1838	if (pl->golem)
1852	{	1839	{
1853	control_golem (op->contr->golem, dir);	1840	control_golem (op->contr->golem, dir);
1854	return;	1841	return false;
1855	}	1842	}
1856		1843
1857	object *ob = pl->ranged_ob;	1844	object *ob = pl->ranged_ob;
1858		1845
1859	if (!ob)	1846	if (!ob)
1860	return;	1847	return false;
1861		1848
1862	if (!op->change_weapon (ob))	1849	if (!op->change_weapon (ob))
1863	return;	1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
1864		1856
1865	switch (ob->type)	1857	switch (ob->type)
1866	{	1858	{
1867	case BOW:	1859	case BOW:
1868	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
…		…
1882		1874
1883	default:	1875	default:
1884	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1885	break;	1877	break;
1886	}	1878	}
		1879
		1880	return true;
1887	}	1881	}
1888		1882
1889	/* find_key	1883	/* find_key
1890	* We try to find a key for the door as passed. If we find a key	1884	* We try to find a key for the door as passed. If we find a key
1891	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
…		…
1978	* 0 otherwise	1972	* 0 otherwise
1979	*/	1973	*/
1980	static int	1974	static int
1981	player_attack_door (object op, object door)	1975	player_attack_door (object op, object door)
1982	{	1976	{
1983	/* If its a door, try to find a use a key. If we do destroy the door,	1977	/* If its a door, try to find a key. If we do destroy the door,
1984	* might as well return immediately as there is nothing more to do -	1978	* might as well return immediately as there is nothing more to do -
1985	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
1986	*/	1980	*/
1987	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
1988		1982
1989	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
1990	if (key)	1984	if (key)
1991	{	1985	{
1992	object *container = key->env;	1986	object *container = key->env;
1993		1987
1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2029	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
2030	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
2031	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
2032	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2033	*/	2027	*/
2034	void	2028	bool
2035	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2036	{	2030	{
2037	object tmp, mon;
2038	int on_battleground;	2031	int on_battleground;
2039	maptile *m;
2040		2032
2041	sint16 nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2042	sint16 ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2043		2035
2044	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
		2037
		2038	if (out_of_map (op->map, nx, ny))
		2039	return false;
		2040
		2041	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2042	{
		2043	--op->speed_left;
		2044	return true;
		2045	}
2045		2046
2046	/* If braced, or can't move to the square, and it is not out of the	2047	/* If braced, or can't move to the square, and it is not out of the
2047	* map, attack it. Note order of if statement is important - don't	2048	* map, attack it. Note order of if statement is important - don't
2048	* want to be calling move_ob if braced, because move_ob will move the	2049	* want to be calling move_ob if braced, because move_ob will move the
2049	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2050	* move to some space, it then means that if we are braced, we should	2051	* move to some space, it then means that if we are braced, we should
2051	* do nothing at all. As it is, if we are braced, we go through	2052	* do nothing at all. As it is, if we are braced, we go through
2052	* quite a bit of processing. However, it probably is less than what	2053	* quite a bit of processing. However, it probably is less than what
2053	* move_ob uses.	2054	* move_ob uses.
2054	*/	2055	*/
2055	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2056	{
2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2058	{
2059	m = op->map->xy_find (nx, ny);	2056	maptile *m = op->map->xy_find (nx, ny);
2060	if (!m)
2061	return; /* Don't think this should happen */
2062	}
2063	else
2064	m = op->map;
2065		2057
2066	if (!(tmp = m->at (nx, ny).bot))
2067	return;
2068
2069	mon = 0;
2070	/* Go through all the objects, and find ones of interest. Only stop if	2058	/* Go through all the objects, and find ones of interest. Only stop if
2071	* we find a monster - that is something we know we want to attack.	2059	* we find a monster - that is something we know we want to attack.
2072	* if its a door or barrel (can roll) see if there may be monsters	2060	* if its a door or barrel (can roll) see if there may be monsters
2073	* on the space	2061	* on the space
2074	*/	2062	*/
2075	while (tmp)	2063	object *mon;
2076	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2077	if (tmp == op)	2065	{
2078	{	2066	if ((mon->flag [FLAG_ALIVE]
2079	tmp = tmp->above;	2067	\|\| mon->type == LOCKED_DOOR
2080	continue;	2068	\|\| mon->flag [FLAG_CAN_ROLL])
2081	}
2082
2083	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2084	{
2085	mon = tmp;	2069	&& mon != op)
2086	break;	2070	break;
2087	}	2071	}
2088		2072
2089	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2090	mon = tmp;
2091
2092	tmp = tmp->above;
2093	}
2094
2095	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2096	return; /* into a wall */	2074	return false; /* into a wall */
2097		2075
2098	if (mon->head)
2099	mon = mon->head;	2076	mon = mon->head_ ();
2100		2077
2101	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2078	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2079	if (op->contr->weapon_sp_left > 0.f)
2102	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2103	return;	2083	return true;
		2084	}
2104		2085
2105	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2106	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2107	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2108	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2109	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2110	* and thus will not push them.	2091	* and thus will not push them.
2111	*/	2092	*/
2112		2093
2113	/* If the creature is a pet, push it even if the player is not	2094	/* If the creature is a pet, push it even if the player is not
2114	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2115	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2116	*/	2097	*/
2117	if (op->type == PLAYER	2098	if (op->type == PLAYER
2118	&& ((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2119	&& same_party (mon->owner->contr->party, op->contr->party))	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2120	\|\| mon->owner == op)	2101	\|\| mon->owner == op)
2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2122	{	2103	{
2123	/* If we're braced, we don't want to switch places with it */	2104	/* If we're braced, we don't want to switch places with it */
2124	if (op->contr->braced)	2105	if (op->contr->braced)
2125	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
2126		2111
2127	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2112	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2128	push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2129	if (op->contr->tmp_invis \|\| op->hide)	2115	if (op->contr->tmp_invis \|\| op->hide)
2130	make_visible (op);	2116	make_visible (op);
2131		2117
2132	return;	2118	return true;
2133	}	2119	}
		2120	else
		2121	return false;
		2122	}
2134		2123
2135	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2136	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2137	* someone, but put it inside this loop so that you won't	2126	* someone, but put it inside this loop so that you won't
2138	* attack them either.	2127	* attack them either.
2139	*/	2128	*/
2140	if ((mon->type == PLAYER \|\| mon->enemy != op)	2129	if ((mon->type == PLAYER \|\| mon->enemy != op)
2141	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	2130	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2142	&& ((op->contr->peaceful	2131	&& ((op->contr->peaceful
2143	\|\| (mon->type == PLAYER && mon->contr->peaceful))	2132	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2144	&& !on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2145	{	2136	{
		2137	--op->speed_left;
		2138
2146	if (!op->contr->braced)	2139	if (!op->contr->braced)
2147	{	2140	{
2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2141	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2149	push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2150	}	2143	}
2151	else	2144	else
2152	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2153		2146
2154	if (op->contr->tmp_invis \|\| op->hide)	2147	if (op->contr->tmp_invis \|\| op->hide)
2155	make_visible (op);	2148	make_visible (op);
2156	}
2157		2149
		2150	return true;
		2151	}
		2152	}
2158	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2159	* roll it if not braced. You can't roll it if you are braced.	2154	* roll it if not braced. You can't roll it if you are braced.
2160	*/	2155	*/
2161	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2157	{
		2158	if (op->speed_left > 0.f)
2162	{	2159	{
		2160	--op->speed_left;
		2161
2163	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2164	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2165	make_visible (op);	2164	make_visible (op);
2166	}
2167		2165
		2166	return true;
		2167	}
		2168	}
2168	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2169	* Way it works is like this: First, it must have some hit points	2170	* Way it works is like this: First, it must have some hit points
2170	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2171	* 1) Not a player, 2) A player, but of a different party. Note	2172	* 1) Not a player, 2) A player, but of a different party. Note
2172	* that party_number -1 is no party, so attacks can still happen.	2173	* that party_number -1 is no party, so attacks can still happen.
2173	*/	2174	*/
2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2175	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2176	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2176	{	2177	{
2177	if (!op->contr->has_hit)	2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2178	{	2179	{
2179	op->contr->has_hit = 1;	2180	--op->contr->weapon_sp_left;
2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2181	}
2182		2181
2183	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2184
2185	/* If attacking another player, that player gets automatic
2186	* hitback, and doesn't loose luck either.
2187	* Disable hitback on the battleground or if the target is
2188	* the wiz.
2189	*/
2190	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2191	{
2192	short luck = mon->stats.luck;
2193
2194	mon->contr->has_hit = 1;
2195	skill_attack (op, mon, 0, 0, 0);
2196	mon->stats.luck = luck;
2197	}
2198		2183
2199	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2200	make_visible (op);	2185	make_visible (op);
2201	}
2202	} /* if player should attack something */
2203	}
2204		2186
2205	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2206	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2207	{	2196	{
2208	int pick;	2197	int pick;
2209		2198
2210	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2224	op->facing = dir;	2213	op->facing = dir;
2225		2214
2226	if (op->hide)	2215	if (op->hide)
2227	do_hidden_move (op);	2216	do_hidden_move (op);
2228		2217
		2218	bool retval;
		2219
2229	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2230	/nop / ;	2221	retval = RESULT_INT (0);
2231	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2232	fire (op, dir);	2223	retval = fire (op, dir);
2233	else	2224	else
2234	{	2225	{
2235	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2236	pick = check_pick (op);	2227	pick = check_pick (op);
2237	}	2228	}
2238		2229
2239	/* Add special check for newcs players and fire on - this way, the	2230	/* Add special check for newcs players and fire on - this way, the
2240	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2247	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2248	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2249	* for players.	2240	* for players.
2250	*/	2241	*/
2251	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2252	return 0;	2243
		2244	return retval;
2253	}	2245	}
2254		2246
2255	/* This is similar to handle_player, below, but is only used by the	2247	/* This is similar to handle_player, below, but is only used by the
2256	* new client/server stuff.	2248	* new client/server stuff.
2257	* This is sort of special, in that the new client/server actually uses	2249	* This is sort of special, in that the new client/server actually uses
2258	* the new speed values for commands.	2250	* the new speed values for commands.
2259	*	2251	*
2260	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do. Should not do
		2253	* many actions in a row, as that would be too unfair to other
		2254	* players.
2261	*/	2255	*/
2262	int	2256	bool
2263	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2264	{	2258	{
2265	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2260	{
2267	flee_player (op);	2261	if (op->speed_left > 0.f)
2268
2269	/* If player is still scared, that is his action for this tick */
2270	if (op->flag [FLAG_SCARED])
2271	{	2262	{
2272	--op->speed_left;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2273	return 0;	2266	return true;
2274	}	2267	}
		2268	else
		2269	return false;
2275	}	2270	}
2276		2271
2277	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2278	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2274	* called, so we recheck it here.
2280	*/	2275	*/
2281	if (op->contr->ns->handle_command ())	2276	if (op->contr->ns->handle_command ())
2282	return 1;	2277	return true;
2283		2278
2284	if (op->speed_left > 0.f)
2285	{
2286	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2287	{
2288	/* All move commands take 1 tick, at least for now */
2289	--op->speed_left;
2290
2291	/* Instead of all the stuff below, let move_player take care
2292	* of it. Also, some of the skill stuff is only put in
2293	* there, as well as the confusion stuff.
2294	*/
2295	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2296		2281
2297	return op->speed_left > 0.f;
2298	}
2299	}
2300
2301	return 0;	2282	return false;
2302	}	2283	}
2303		2284
2304	int	2285	int
2305	save_life (object *op)	2286	save_life (object *op)
2306	{	2287	{
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	3098	*/
3118
3119	void	3099	void
3120	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3121	{	3101	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3123	object *skop;	3103	object *skop;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC vs. Revision 1.147 by root, Sun Jun 3 17:42:39 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.147 by root, Sun Jun 3 17:42:39 2007 UTC