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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

…		…
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	{
…		…
264		244
265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266		246
267	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
268		248
		249	ob->flag [FLAG_READY_WEAPON] = false;
		250	ob->flag [FLAG_READY_SKILL] = false;
		251	ob->flag [FLAG_READY_BOW] = false;
		252
269	for (object *op = ob->inv; op; op = op->below)	253	for (object *op = ob->inv; op; op = op->below)
270	if (op->flag [FLAG_APPLIED])	254	if (op->flag [FLAG_APPLIED])
271	switch (op->type)	255	switch (op->type)
272	{	256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
273	case WAND:	261	case WAND:
274	case ROD:	262	case ROD:
275	case HORN:	263	case HORN:
276	case BOW:	264	case BOW:
277	case SKILL:	265	ranged_ob = op;
278	case SKILL_TOOL:	266	break;
		267
279	case WEAPON:	268	case WEAPON:
280	apply_special (ob, op, AP_UNAPPLY);	269	combat_ob = op;
281	apply_special (ob, op, AP_APPLY);
282	break;	270	break;
283	}	271	}
284		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
285	ob->update_stats ();	274	ob->update_stats ();
		275
286	ns->floorbox_update ();	276	ns->floorbox_update ();
287
288	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
289	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
290		279
291	activate ();	280	activate ();
292		281
…		…
325	player::set_object (object *op)	314	player::set_object (object *op)
326	{	315	{
327	ob = op;	316	ob = op;
328	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
329		318
330	ob->speed_left = 0.5f;
331	ob->speed = 1.0f;	319	ob->speed = 1.0f;
		320	ob->speed_left = 0.5f;
		321
332	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
333	}	323	}
334		324
335	player::player ()	325	player::player ()
336	{	326	{
337	/* There are some elements we want initialised to non zero value -	327	/* There are some elements we want initialised to non zero value -
…		…
348	petmode = pet_normal;	338	petmode = pet_normal;
349	listening = 10;	339	listening = 10;
350	usekeys = containers;	340	usekeys = containers;
351	peaceful = 1; /* default peaceful */	341	peaceful = 1; /* default peaceful */
352	do_los = 1;	342	do_los = 1;
		343
		344	weapon_sp = 1.0f;
		345	weapon_sp_left = 0.5f;
353	}	346	}
354		347
355	void	348	void
356	player::do_destroy ()	349	player::do_destroy ()
357	{	350	{
…		…
1550	{	1543	{
1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1544	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1552	return 0;	1545	return 0;
1553	}	1546	}
1554		1547
1555	if (player *pl = op->contr)	1548	if (op->contr)
1556	{	1549	bow = op->current_weapon;
1557	bow = pl->ranged_ob;
1558	if (!op->change_weapon (bow))
1559	return 0;
1560	}
1561	else	1550	else
1562	{	1551	{
1563	for (bow = op->inv; bow; bow = bow->below)	1552	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1553	/* Don't check for applied - monsters don't apply bows - in that way, they
1565	* don't need to switch back and forth between bows and weapons.	1554	* don't need to switch back and forth between bows and weapons.
…		…
1636	arrow->stats.grace = arrow->attacktype;	1625	arrow->stats.grace = arrow->attacktype;
1637		1626
1638	if (arrow->slaying)	1627	if (arrow->slaying)
1639	arrow->spellarg = strdup (arrow->slaying);	1628	arrow->spellarg = strdup (arrow->slaying);
1640		1629
		1630	#if 0
1641	if (player *pl = op->contr)	1631	if (player *pl = op->contr)
1642	{	1632	{
1643	if (!pl->has_hit)
1644	{
1645	pl->has_hit = 1;
1646	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1647	}
1648	#if 0
1649	float speed = pl->weapon_sp;	1633	float speed = pl->weapon_sp;
1650		1634
1651	/* penalize ROF for bestarrow */	1635	/* penalize ROF for bestarrow */
1652	if (pl->bowtype == bow_bestarrow)	1636	if (pl->bowtype == bow_bestarrow)
1653	speed *= .9f;	1637	speed *= .9f;
1654	else	1638	else
1655	speed = 1.f + dex_bonus[op->stats.Dex] .2f;	1639	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
1656		1640
1657	op->speed_left += speed - op->speed;	1641	op->speed_left += speed - op->speed;
		1642	}
1658	#endif	1643	#endif
1659	}
1660		1644
1661	SET_ANIMATION (arrow, arrow->direction);	1645	SET_ANIMATION (arrow, arrow->direction);
1662		1646
1663	/* update the speed */	1647	/* update the speed */
1664	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1648	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1665	+ bow->stats.dam / 7.0;	1649	+ bow->stats.dam / 7.f;
1666		1650
1667	arrow->set_speed (max (arrow->speed, 2.0));	1651	arrow->set_speed (max (arrow->speed, 2.f));
1668	arrow->speed_left = 0;	1652	arrow->speed_left = 0;
1669		1653
1670	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1654	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1671		1655
1672	if (op->type == PLAYER)	1656	if (op->type == PLAYER)
…		…
1831	}	1815	}
1832	}	1816	}
1833		1817
1834	/* Received a fire command for the player - go and do it.	1818	/* Received a fire command for the player - go and do it.
1835	*/	1819	*/
1836	void	1820	bool
1837	fire (object *op, int dir)	1821	fire (object *op, int dir)
1838	{	1822	{
1839	int spellcost = 0;	1823	int spellcost = 0;
1840		1824
1841	/* check for loss of invisiblity/hide */	1825	/* check for loss of invisiblity/hide */
…		…
1845	player *pl = op->contr;	1829	player *pl = op->contr;
1846		1830
1847	if (pl->golem)	1831	if (pl->golem)
1848	{	1832	{
1849	control_golem (op->contr->golem, dir);	1833	control_golem (op->contr->golem, dir);
1850	return;	1834	return false;
1851	}	1835	}
1852		1836
1853	object *ob = pl->ranged_ob;	1837	object *ob = pl->ranged_ob;
1854		1838
1855	if (!ob)	1839	if (!ob)
1856	return;	1840	return false;
		1841
		1842	if (!op->change_weapon (ob))
		1843	return false;
		1844
		1845	if (op->speed_left > 0.f)
		1846	--op->speed_left;
		1847	else
		1848	return false;
1857		1849
1858	switch (ob->type)	1850	switch (ob->type)
1859	{	1851	{
1860	case BOW:	1852	case BOW:
1861	player_fire_bow (op, dir);	1853	player_fire_bow (op, dir);
…		…
1868	case BUILDER:	1860	case BUILDER:
1869	apply_map_builder (op, dir);	1861	apply_map_builder (op, dir);
1870	break;	1862	break;
1871		1863
1872	case SKILL:	1864	case SKILL:
1873	case SKILL_TOOL:
1874	do_skill (op, op, ob, dir, 0);	1865	do_skill (op, op, ob, dir, 0);
1875	break;	1866	break;
1876		1867
1877	default:	1868	default:
1878	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1879	break;	1870	break;
1880	}	1871	}
		1872
		1873	return true;
1881	}	1874	}
1882		1875
1883	/* find_key	1876	/* find_key
1884	* We try to find a key for the door as passed. If we find a key	1877	* We try to find a key for the door as passed. If we find a key
1885	* and successfully use it, we return the key, otherwise NULL	1878	* and successfully use it, we return the key, otherwise NULL
…		…
1972	* 0 otherwise	1965	* 0 otherwise
1973	*/	1966	*/
1974	static int	1967	static int
1975	player_attack_door (object op, object door)	1968	player_attack_door (object op, object door)
1976	{	1969	{
1977	/* If its a door, try to find a use a key. If we do destroy the door,	1970	/* If its a door, try to find a key. If we do destroy the door,
1978	* might as well return immediately as there is nothing more to do -	1971	* might as well return immediately as there is nothing more to do -
1979	* otherwise, we fall through to the rest of the code.	1972	* otherwise, we fall through to the rest of the code.
1980	*/	1973	*/
1981	object *key = find_key (op, op, door);	1974	object *key = find_key (op, op, door);
1982		1975
1983	/* IF we found a key, do some extra work */	1976	/* If we found a key, do some extra work */
1984	if (key)	1977	if (key)
1985	{	1978	{
1986	object *container = key->env;	1979	object *container = key->env;
1987		1980
1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2023	* It should keep the code cleaner.	2016	* It should keep the code cleaner.
2024	* When this is called, the players direction has been updated	2017	* When this is called, the players direction has been updated
2025	* (taking into account confusion.) The player is also actually	2018	* (taking into account confusion.) The player is also actually
2026	* going to try and move (not fire weapons).	2019	* going to try and move (not fire weapons).
2027	*/	2020	*/
2028	void	2021	bool
2029	move_player_attack (object *op, int dir)	2022	move_player_attack (object *op, int dir)
2030	{	2023	{
2031	object tmp, mon;
2032	int on_battleground;	2024	int on_battleground;
2033	maptile *m;
2034		2025
2035	sint16 nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2036	sint16 ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2037		2028
2038	on_battleground = op_on_battleground (op, 0, 0);	2029	on_battleground = op_on_battleground (op, 0, 0);
		2030
		2031	if (out_of_map (op->map, nx, ny))
		2032	return false;
		2033
		2034	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2035	{
		2036	--op->speed_left;
		2037	return true;
		2038	}
2039		2039
2040	/* If braced, or can't move to the square, and it is not out of the	2040	/* If braced, or can't move to the square, and it is not out of the
2041	* map, attack it. Note order of if statement is important - don't	2041	* map, attack it. Note order of if statement is important - don't
2042	* want to be calling move_ob if braced, because move_ob will move the	2042	* want to be calling move_ob if braced, because move_ob will move the
2043	* player. This is a pretty nasty hack, because if we could	2043	* player. This is a pretty nasty hack, because if we could
2044	* move to some space, it then means that if we are braced, we should	2044	* move to some space, it then means that if we are braced, we should
2045	* do nothing at all. As it is, if we are braced, we go through	2045	* do nothing at all. As it is, if we are braced, we go through
2046	* quite a bit of processing. However, it probably is less than what	2046	* quite a bit of processing. However, it probably is less than what
2047	* move_ob uses.	2047	* move_ob uses.
2048	*/	2048	*/
2049	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2050	{
2051	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2052	{
2053	m = op->map->xy_find (nx, ny);	2049	maptile *m = op->map->xy_find (nx, ny);
2054	if (!m)
2055	return; /* Don't think this should happen */
2056	}
2057	else
2058	m = op->map;
2059		2050
2060	if (!(tmp = m->at (nx, ny).bot))
2061	return;
2062
2063	mon = 0;
2064	/* Go through all the objects, and find ones of interest. Only stop if	2051	/* Go through all the objects, and find ones of interest. Only stop if
2065	* we find a monster - that is something we know we want to attack.	2052	* we find a monster - that is something we know we want to attack.
2066	* if its a door or barrel (can roll) see if there may be monsters	2053	* if its a door or barrel (can roll) see if there may be monsters
2067	* on the space	2054	* on the space
2068	*/	2055	*/
2069	while (tmp)	2056	object *mon;
2070	{	2057	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2071	if (tmp == op)	2058	{
2072	{	2059	if ((mon->flag [FLAG_ALIVE]
2073	tmp = tmp->above;	2060	\|\| mon->type == LOCKED_DOOR
2074	continue;	2061	\|\| mon->flag [FLAG_CAN_ROLL])
2075	}
2076
2077	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2078	{
2079	mon = tmp;	2062	&& mon != op)
2080	break;	2063	break;
2081	}	2064	}
2082		2065
2083	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2084	mon = tmp;
2085
2086	tmp = tmp->above;
2087	}
2088
2089	if (!mon) /* This happens anytime the player tries to move */	2066	if (!mon) /* This happens anytime the player tries to move */
2090	return; /* into a wall */	2067	return false; /* into a wall */
2091		2068
2092	if (mon->head)
2093	mon = mon->head;	2069	mon = mon->head_ ();
2094		2070
2095	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2071	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2072	if (op->contr->weapon_sp_left > 0.f)
2096	if (player_attack_door (op, mon))	2073	if (player_attack_door (op, mon))
		2074	{
		2075	--op->contr->weapon_sp_left;
2097	return;	2076	return true;
		2077	}
2098		2078
2099	/* The following deals with possibly attacking peaceful	2079	/* The following deals with possibly attacking peaceful
2100	* or frienddly creatures. Basically, all players are considered	2080	* or friendly creatures. Basically, all players are considered
2101	* unaggressive. If the moving player has peaceful set, then the	2081	* unaggressive. If the moving player has peaceful set, then the
2102	* object should be pushed instead of attacked. It is assumed that	2082	* object should be pushed instead of attacked. It is assumed that
2103	* if you are braced, you will not attack friends accidently,	2083	* if you are braced, you will not attack friends accidently,
2104	* and thus will not push them.	2084	* and thus will not push them.
2105	*/	2085	*/
2106		2086
2107	/* If the creature is a pet, push it even if the player is not	2087	/* If the creature is a pet, push it even if the player is not
2108	* peaceful. Our assumption is the creature is a pet if the	2088	* peaceful. Our assumption is the creature is a pet if the
2109	* player owns it and it is either friendly or unagressive.	2089	* player owns it and it is either friendly or unagressive.
2110	*/	2090	*/
2111	if ((op->type == PLAYER)	2091	if (op->type == PLAYER
2112	#if COZY_SERVER
2113	&&
2114	((mon->owner && mon->owner->contr	2092	&& ((mon->owner && mon->owner->contr
2115	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2093	&& same_party (mon->owner->contr->party, op->contr->party))
2116	#else
2117	&& mon->owner == op	2094	\|\| mon->owner == op)
2118	#endif
2119	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2120	{	2096	{
2121	/* If we're braced, we don't want to switch places with it */	2097	/* If we're braced, we don't want to switch places with it */
2122	if (op->contr->braced)	2098	if (op->contr->braced)
2123	return;	2099	return false;
		2100
		2101	if (op->speed_left > 0.f)
		2102	{
		2103	--op->speed_left;
2124		2104
2125	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2105	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2126	push_ob (mon, dir, op);	2106	push_ob (mon, dir, op);
		2107
2127	if (op->contr->tmp_invis \|\| op->hide)	2108	if (op->contr->tmp_invis \|\| op->hide)
2128	make_visible (op);	2109	make_visible (op);
2129		2110
2130	return;	2111	return true;
2131	}	2112	}
		2113	else
		2114	return false;
		2115	}
2132		2116
2133	/* in certain circumstances, you shouldn't attack friendly	2117	/* in certain circumstances, you shouldn't attack friendly
2134	* creatures. Note that if you are braced, you can't push	2118	* creatures. Note that if you are braced, you can't push
2135	* someone, but put it inside this loop so that you won't	2119	* someone, but put it inside this loop so that you won't
2136	* attack them either.	2120	* attack them either.
2137	*/	2121	*/
2138	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2122	if ((mon->type == PLAYER \|\| mon->enemy != op)
2139	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2123	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2140	#ifdef PROHIBIT_PLAYERKILL
2141	(op->contr->peaceful	2124	&& ((op->contr->peaceful
2142	\|\| (mon->type == PLAYER	2125	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2143	&& mon->contr->
2144	peaceful)) &&
2145	#else
2146	op->contr->peaceful &&
2147	#endif
2148	!on_battleground))	2126	&& !on_battleground))
		2127	{
		2128	if (op->speed_left > 0.f)
2149	{	2129	{
		2130	--op->speed_left;
		2131
2150	if (!op->contr->braced)	2132	if (!op->contr->braced)
2151	{	2133	{
2152	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2153	push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2154	}	2136	}
2155	else	2137	else
2156	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2157		2139
2158	if (op->contr->tmp_invis \|\| op->hide)	2140	if (op->contr->tmp_invis \|\| op->hide)
2159	make_visible (op);	2141	make_visible (op);
2160	}
2161		2142
		2143	return true;
		2144	}
		2145	}
2162	/* If the object is a boulder or other rollable object, then	2146	/* If the object is a boulder or other rollable object, then
2163	* roll it if not braced. You can't roll it if you are braced.	2147	* roll it if not braced. You can't roll it if you are braced.
2164	*/	2148	*/
2165	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2149	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2150	{
		2151	if (op->speed_left > 0.f)
2166	{	2152	{
		2153	--op->speed_left;
		2154
2167	recursive_roll (mon, dir, op);	2155	recursive_roll (mon, dir, op);
2168	if (action_makes_visible (op))	2156	if (action_makes_visible (op))
2169	make_visible (op);	2157	make_visible (op);
2170	}
2171		2158
		2159	return true;
		2160	}
		2161	}
2172	/* Any generic living creature. Including things like doors.	2162	/* Any generic living creature. Including things like doors.
2173	* Way it works is like this: First, it must have some hit points	2163	* Way it works is like this: First, it must have some hit points
2174	* and be living. Then, it must be one of the following:	2164	* and be living. Then, it must be one of the following:
2175	* 1) Not a player, 2) A player, but of a different party. Note	2165	* 1) Not a player, 2) A player, but of a different party. Note
2176	* that party_number -1 is no party, so attacks can still happen.	2166	* that party_number -1 is no party, so attacks can still happen.
2177	*/	2167	*/
2178	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2179	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2169	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2180	{	2170	{
2181	if (!op->contr->has_hit)	2171	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2182	{	2172	{
2183	op->contr->has_hit = 1;	2173	--op->contr->weapon_sp_left;
2184	op->speed_left += op->contr->weapon_speed () - op->speed;
2185	}
2186		2174
2187	skill_attack (mon, op, 0, 0, 0);	2175	skill_attack (mon, op, 0, 0, 0);
2188
2189	/* If attacking another player, that player gets automatic
2190	* hitback, and doesn't loose luck either.
2191	* Disable hitback on the battleground or if the target is
2192	* the wiz.
2193	*/
2194	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2195	{
2196	short luck = mon->stats.luck;
2197
2198	mon->contr->has_hit = 1;
2199	skill_attack (op, mon, 0, 0, 0);
2200	mon->stats.luck = luck;
2201	}
2202		2176
2203	if (action_makes_visible (op))	2177	if (action_makes_visible (op))
2204	make_visible (op);	2178	make_visible (op);
2205	}
2206	} /* if player should attack something */
2207	}
2208		2179
2209	int	2180	return true;
		2181	}
		2182	}
		2183
		2184	return false;
		2185	}
		2186
		2187	bool
2210	move_player (object *op, int dir)	2188	move_player (object *op, int dir)
2211	{	2189	{
2212	int pick;	2190	int pick;
2213		2191
2214	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2192	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2228	op->facing = dir;	2206	op->facing = dir;
2229		2207
2230	if (op->hide)	2208	if (op->hide)
2231	do_hidden_move (op);	2209	do_hidden_move (op);
2232		2210
		2211	bool retval;
		2212
2233	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2213	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2234	/nop / ;	2214	retval = RESULT_INT (0);
2235	else if (op->contr->fire_on)	2215	else if (op->contr->fire_on)
2236	fire (op, dir);	2216	retval = fire (op, dir);
2237	else	2217	else
2238	{	2218	{
2239	move_player_attack (op, dir);	2219	retval = move_player_attack (op, dir);
2240	pick = check_pick (op);	2220	pick = check_pick (op);
2241	}	2221	}
2242		2222
2243	/* Add special check for newcs players and fire on - this way, the	2223	/* Add special check for newcs players and fire on - this way, the
2244	* server can handle repeat firing.	2224	* server can handle repeat firing.
…		…
2251	/* Update how the player looks. Use the facing, so direction may	2231	/* Update how the player looks. Use the facing, so direction may
2252	* get reset to zero. This allows for full animation capabilities	2232	* get reset to zero. This allows for full animation capabilities
2253	* for players.	2233	* for players.
2254	*/	2234	*/
2255	animate_object (op, op->facing);	2235	animate_object (op, op->facing);
2256	return 0;	2236
		2237	return retval;
2257	}	2238	}
2258		2239
2259	/* This is similar to handle_player, below, but is only used by the	2240	/* This is similar to handle_player, below, but is only used by the
2260	* new client/server stuff.	2241	* new client/server stuff.
2261	* This is sort of special, in that the new client/server actually uses	2242	* This is sort of special, in that the new client/server actually uses
2262	* the new speed values for commands.	2243	* the new speed values for commands.
2263	*	2244	*
2264	* Returns true if there are more actions we can do.	2245	* Returns true if there are more actions we can do. Should not do
		2246	* many actions in a row, as that would be too unfair to other
		2247	* players.
2265	*/	2248	*/
2266	int	2249	bool
2267	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2268	{	2251	{
2269	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2270	{	2253	{
2271	flee_player (op);	2254	if (op->speed_left > 0.f)
2272
2273	/* If player is still scared, that is his action for this tick */
2274	if (op->flag [FLAG_SCARED])
2275	{	2255	{
2276	--op->speed_left;	2256	--op->speed_left;
		2257	flee_player (op);
		2258
2277	return 0;	2259	return true;
2278	}	2260	}
		2261	else
		2262	return false;
2279	}	2263	}
2280		2264
2281	/* call this here - we also will call this in do_ericserver, but	2265	/* call this here - we also will call this in do_ericserver, but
2282	* the players time has been increased when doericserver has been	2266	* the players time has been increased when doericserver has been
2283	* called, so we recheck it here.	2267	* called, so we recheck it here.
2284	*/	2268	*/
2285	if (op->contr->ns->handle_command ())	2269	if (op->contr->ns->handle_command ())
2286	return 1;	2270	return true;
2287		2271
2288	if (op->speed_left > 0.f)
2289	{
2290	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2272	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2291	{
2292	/* All move commands take 1 tick, at least for now */
2293	--op->speed_left;
2294
2295	/* Instead of all the stuff below, let move_player take care
2296	* of it. Also, some of the skill stuff is only put in
2297	* there, as well as the confusion stuff.
2298	*/
2299	move_player (op, op->direction);	2273	return move_player (op, op->direction);
2300		2274
2301	return op->speed_left > 0.f;
2302	}
2303	}
2304
2305	return 0;	2275	return false;
2306	}	2276	}
2307		2277
2308	int	2278	int
2309	save_life (object *op)	2279	save_life (object *op)
2310	{	2280	{
…		…
2576	}	2546	}
2577		2547
2578	/* Digestion */	2548	/* Digestion */
2579	if (--op->last_eat < 0)	2549	if (--op->last_eat < 0)
2580	{	2550	{
2581	#ifdef COZY_SERVER
2582	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2583	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2584	#else
2585	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2551	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2586	#endif
2587		2552
2588	if (op->contr->gen_hp > 0)	2553	if (op->contr->gen_hp > 0)
2589	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2554	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2590	else	2555	else
2591	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
3122	/* For Hidden creatures - a chance of becoming 'unhidden'	3087	/* For Hidden creatures - a chance of becoming 'unhidden'
3123	* every time they move - as we subtract off 'invisibility'	3088	* every time they move - as we subtract off 'invisibility'
3124	* AND, for players, if they move into a ridiculously unhideable	3089	* AND, for players, if they move into a ridiculously unhideable
3125	* spot (surrounded by clear terrain in broad daylight). -b.t.	3090	* spot (surrounded by clear terrain in broad daylight). -b.t.
3126	*/	3091	*/
3127
3128	void	3092	void
3129	do_hidden_move (object *op)	3093	do_hidden_move (object *op)
3130	{	3094	{
3131	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3132	object *skop;	3096	object *skop;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs. Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.135 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC