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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.141 by root, Fri May 18 15:05:09 2007 UTC vs.
Revision 1.152 by root, Sun Jul 1 05:00:20 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
157	op->x = -1;	156	op->x = -1;
158	op->y = -1;	157	op->y = -1;
159	}	158	}
160		159
161	void	160	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	161	player::activate ()
176	{	162	{
177	if (active)	163	if (active)
178	return;	164	return;
179		165
…		…
181	ob->remove ();	167	ob->remove ();
182	ob->map = 0;	168	ob->map = 0;
183	ob->activate_recursive ();	169	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	171	add_friendly_object (ob);
186	enter_map ();
187	}	172	}
188		173
189	void	174	void
190	player::deactivate ()	175	player::deactivate ()
191	{	176	{
…		…
221	ob->close_container (); //TODO: client-specific	206	ob->close_container (); //TODO: client-specific
222		207
223	ns->update_look = 0;	208	ns->update_look = 0;
224	ns->look_position = 0;	209	ns->look_position = 0;
225		210
226	clear_los (ob);	211	clear_los (this);
227		212
228	ns->reset_stats ();	213	ns->reset_stats ();
229		214
230	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
233		218
234	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
235	link_player_skills (ob);	220	link_player_skills (ob);
236		221
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		223
239	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
240		225
241	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
243	{	228	{
244	object tmp, abil = 0, *skin = 0;	229	object tmp, abil = 0, *skin = 0;
…		…
246	shstr_cmp dragon_ability_force ("dragon_ability_force");	231	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");	232	shstr_cmp dragon_skin_force ("dragon_skin_force");
248		233
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	234	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	235	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	236	if (tmp->arch->archname == dragon_ability_force)
252	abil = tmp;	237	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	238	else if (tmp->arch->archname == dragon_skin_force)
254	skin = tmp;	239	skin = tmp;
255		240
256	set_dragon_name (ob, abil, skin);	241	set_dragon_name (ob, abil, skin);
257	}	242	}
258		243
…		…
317	}	302	}
318		303
319	if (ob)	304	if (ob)
320	ob->close_container (); //TODO: client-specific	305	ob->close_container (); //TODO: client-specific
321		306
		307	observe = ob;
		308
322	deactivate ();	309	deactivate ();
323	}	310	}
324		311
325	// the need for this function can be explained	312	// the need for this function can be explained
326	// by load_object not returning the object	313	// by load_object not returning the object
327	void	314	void
328	player::set_object (object *op)	315	player::set_object (object *op)
329	{	316	{
330	ob = op;	317	ob = observe = op;
331	ob->contr = this; /* this aren't yet in archetype */	318	ob->contr = this; /* this aren't yet in archetype */
332		319
333	ob->speed_left = 0.5f;
334	ob->speed = 1.0f;	320	ob->speed = 1.0f;
		321	ob->speed_left = 0.5f;
		322
335	ob->direction = 5; /* So player faces south */	323	ob->direction = 5; /* So player faces south */
		324	}
		325
		326	void
		327	player::set_observe (object *op)
		328	{
		329	observe = op ? op : ob;
		330	do_los = 1;
336	}	331	}
337		332
338	player::player ()	333	player::player ()
339	{	334	{
340	/* There are some elements we want initialised to non zero value -	335	/* There are some elements we want initialised to non zero value -
…		…
351	petmode = pet_normal;	346	petmode = pet_normal;
352	listening = 10;	347	listening = 10;
353	usekeys = containers;	348	usekeys = containers;
354	peaceful = 1; /* default peaceful */	349	peaceful = 1; /* default peaceful */
355	do_los = 1;	350	do_los = 1;
		351
		352	weapon_sp = 1.0f;
		353	weapon_sp_left = 0.5f;
356	}	354	}
357		355
358	void	356	void
359	player::do_destroy ()	357	player::do_destroy ()
360	{	358	{
…		…
365	if (ob)	363	if (ob)
366	{	364	{
367	ob->destroy_inv (false);	365	ob->destroy_inv (false);
368	ob->destroy ();	366	ob->destroy ();
369	}	367	}
		368
		369	ob = observe = 0;
370	}	370	}
371		371
372	player::~player ()	372	player::~player ()
373	{	373	{
374	/* Clear item stack */	374	/* Clear item stack */
…		…
401	* Note: there MUST be at least one player archetype!	401	* Note: there MUST be at least one player archetype!
402	*/	402	*/
403	archetype *	403	archetype *
404	get_player_archetype (archetype *at)	404	get_player_archetype (archetype *at)
405	{	405	{
406	archetype *start = at;	406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
407		407
408	for (;;)	408	for (;;)
409	{	409	{
410	if (at == NULL \|\| at->next == NULL)	410	if (++i == archetypes.end ())
411	at = first_archetype;	411	i = archetypes.begin ();
412	else	412	else if (*i == at)
413	at = at->next;	413	cleanup ("not a single player archetype found");
414		414
415	if (at->clone.type == PLAYER)	415	if ((*i)->type == PLAYER)
416	return at;	416	return *i;
417
418	if (at == start)
419	{
420	LOG (llevError, "No Player archetypes\n");
421	exit (-1);
422	}
423	}	417	}
424	}	418	}
425		419
426	object *	420	object *
427	get_nearest_player (object *mon)	421	get_nearest_player (object *mon)
…		…
917	if (*first_map_ext_path)	911	if (*first_map_ext_path)
918	{	912	{
919	object *tmp;	913	object *tmp;
920	char mapname[MAX_BUF];	914	char mapname[MAX_BUF];
921		915
922	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
923	tmp = object::create ();	917	tmp = object::create ();
924	EXIT_PATH (tmp) = mapname;	918	EXIT_PATH (tmp) = mapname;
925	EXIT_X (tmp) = ob->x;	919	EXIT_X (tmp) = ob->x;
926	EXIT_Y (tmp) = ob->y;	920	EXIT_Y (tmp) = ob->y;
927	ob->enter_exit (tmp); /* we don't really care if it succeeded;	921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
946	int x = ob->x, y = ob->y;	940	int x = ob->x, y = ob->y;
947		941
948	ob->remove_statbonus ();	942	ob->remove_statbonus ();
949	ob->remove ();	943	ob->remove ();
950	ob->arch = get_player_archetype (ob->arch);	944	ob->arch = get_player_archetype (ob->arch);
951	ob->arch->clone.copy_to (ob);	945	ob->arch->copy_to (ob);
952	ob->instantiate ();	946	ob->instantiate ();
953	ob->stats = ob->contr->orig_stats;	947	ob->stats = ob->contr->orig_stats;
954	ob->name = ob->name_pl = name;	948	ob->name = ob->name_pl = name;
955	ob->x = x;	949	ob->x = x;
956	ob->y = y;	950	ob->y = y;
957	SET_ANIMATION (ob, 2); /* So player faces south */	951	SET_ANIMATION (ob, 2); /* So player faces south */
958	insert_ob_in_map (ob, ob->map, ob, 0);	952	insert_ob_in_map (ob, ob->map, ob, 0);
959	assign (ob->contr->title, ob->arch->clone.name);	953	assign (ob->contr->title, ob->arch->object::name);
960	ob->add_statbonus ();	954	ob->add_statbonus ();
961	}	955	}
962	while (!allowed_class (ob));	956	while (!allowed_class (ob));
963		957
964	update_object (ob, UP_OBJ_FACE);	958	update_object (ob, UP_OBJ_FACE);
…		…
1109	if (tmp->name != NULL)	1103	if (tmp->name != NULL)
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112	else	1106	else
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115		1109
1116	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1117	}	1111	}
1118		1112
1119	/* philosophy:	1113	/* philosophy:
…		…
1312	/* careful: chairs and tables are weapons! */	1306	/* careful: chairs and tables are weapons! */
1313	if (op->contr->mode & PU_ALLWEAPON)	1307	if (op->contr->mode & PU_ALLWEAPON)
1314	{	1308	{
1315	if (tmp->type == WEAPON && tmp->name != NULL)	1309	if (tmp->type == WEAPON && tmp->name != NULL)
1316	{	1310	{
1317	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1318	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1313	{
1320	pick_up (op, tmp);	1314	pick_up (op, tmp);
1321	continue;	1315	continue;
1322	}	1316	}
1323	}	1317	}
1324		1318
1325	if (tmp->type == WEAPON && tmp->name == NULL)	1319	if (tmp->type == WEAPON && tmp->name == NULL)
1326	{	1320	{
1327	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1328	{	1322	{
1329	pick_up (op, tmp);	1323	pick_up (op, tmp);
1330	continue;	1324	continue;
1331	}	1325	}
1332	}	1326	}
…		…
1357	if (tmp->name != NULL)	1351	if (tmp->name != NULL)
1358	{	1352	{
1359	fprintf (stderr, "%s", tmp->name);	1353	fprintf (stderr, "%s", tmp->name);
1360	}	1354	}
1361	else	1355	else
1362	fprintf (stderr, "%s", tmp->arch->name);	1356	fprintf (stderr, "%s", tmp->arch->archname);
1363	fprintf (stderr, ",%d] = ", tmp->type);	1357	fprintf (stderr, ",%d] = ", tmp->type);
1364	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1365	#endif	1359	#endif
1366	continue;	1360	continue;
1367	}	1361	}
…		…
1437	else	1431	else
1438	{	1432	{
1439	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1440	{	1434	{
1441	attacktype = 1 << attacknum;	1435	attacktype = 1 << attacknum;
1442	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1436	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1443	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1437	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1444	{	1438	{
1445	tmp = arrow;	1439	tmp = arrow;
1446	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1447	}	1441	}
1448	}	1442	}
1449	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1450	{	1444	{
1451	tmp = arrow;	1445	tmp = arrow;
…		…
1635	arrow->stats.grace = arrow->attacktype;	1629	arrow->stats.grace = arrow->attacktype;
1636		1630
1637	if (arrow->slaying)	1631	if (arrow->slaying)
1638	arrow->spellarg = strdup (arrow->slaying);	1632	arrow->spellarg = strdup (arrow->slaying);
1639		1633
		1634	#if 0
1640	if (player *pl = op->contr)	1635	if (player *pl = op->contr)
1641	{	1636	{
1642	if (!pl->has_hit)
1643	{
1644	pl->has_hit = 1;
1645	pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
1646	}
1647	#if 0
1648	float speed = pl->weapon_sp;	1637	float speed = pl->weapon_sp;
1649		1638
1650	/* penalize ROF for bestarrow */	1639	/* penalize ROF for bestarrow */
1651	if (pl->bowtype == bow_bestarrow)	1640	if (pl->bowtype == bow_bestarrow)
1652	speed *= .9f;	1641	speed *= .9f;
1653	else	1642	else
1654	speed = 1.f + dex_bonus[op->stats.Dex] .2f;	1643	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
1655		1644
1656	op->speed_left += speed - op->speed;	1645	op->speed_left += speed - op->speed;
		1646	}
1657	#endif	1647	#endif
1658	}
1659		1648
1660	SET_ANIMATION (arrow, arrow->direction);	1649	SET_ANIMATION (arrow, arrow->direction);
1661		1650
1662	/* update the speed */	1651	/* update the speed */
1663	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1664	+ bow->stats.dam / 7.0;	1653	+ bow->stats.dam / 7.f;
1665		1654
1666	arrow->set_speed (max (arrow->speed, 2.0));	1655	arrow->set_speed (max (arrow->speed, 2.f));
1667	arrow->speed_left = 0;	1656	arrow->speed_left = 0;
1668		1657
1669	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1670		1659
1671	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
…		…
1815	object *tmp;	1804	object *tmp;
1816		1805
1817	if (item->arch)	1806	if (item->arch)
1818	{	1807	{
1819	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
1820	item->face = item->arch->clone.face;	1809	item->face = item->arch->face;
1821	item->set_speed (0);	1810	item->set_speed (0);
1822	}	1811	}
1823		1812
1824	if ((tmp = item->in_player ()))	1813	if ((tmp = item->in_player ()))
1825	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1830	}	1819	}
1831	}	1820	}
1832		1821
1833	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
1834	*/	1823	*/
1835	void	1824	bool
1836	fire (object *op, int dir)	1825	fire (object *op, int dir)
1837	{	1826	{
1838	int spellcost = 0;	1827	int spellcost = 0;
1839		1828
1840	/* check for loss of invisiblity/hide */	1829	/* check for loss of invisiblity/hide */
…		…
1844	player *pl = op->contr;	1833	player *pl = op->contr;
1845		1834
1846	if (pl->golem)	1835	if (pl->golem)
1847	{	1836	{
1848	control_golem (op->contr->golem, dir);	1837	control_golem (op->contr->golem, dir);
1849	return;	1838	return false;
1850	}	1839	}
1851		1840
1852	object *ob = pl->ranged_ob;	1841	object *ob = pl->ranged_ob;
1853		1842
1854	if (!ob)	1843	if (!ob)
1855	return;	1844	return false;
1856		1845
1857	if (!op->change_weapon (ob))	1846	if (!op->change_weapon (ob))
1858	return;	1847	return false;
		1848
		1849	if (op->speed_left > 0.f)
		1850	--op->speed_left;
		1851	else
		1852	return false;
1859		1853
1860	switch (ob->type)	1854	switch (ob->type)
1861	{	1855	{
1862	case BOW:	1856	case BOW:
1863	player_fire_bow (op, dir);	1857	player_fire_bow (op, dir);
…		…
1877		1871
1878	default:	1872	default:
1879	fire_misc_object (op, dir);	1873	fire_misc_object (op, dir);
1880	break;	1874	break;
1881	}	1875	}
		1876
		1877	return true;
1882	}	1878	}
1883		1879
1884	/* find_key	1880	/* find_key
1885	* We try to find a key for the door as passed. If we find a key	1881	* We try to find a key for the door as passed. If we find a key
1886	* and successfully use it, we return the key, otherwise NULL	1882	* and successfully use it, we return the key, otherwise NULL
…		…
1973	* 0 otherwise	1969	* 0 otherwise
1974	*/	1970	*/
1975	static int	1971	static int
1976	player_attack_door (object op, object door)	1972	player_attack_door (object op, object door)
1977	{	1973	{
1978	/* If its a door, try to find a use a key. If we do destroy the door,	1974	/* If its a door, try to find a key. If we do destroy the door,
1979	* might as well return immediately as there is nothing more to do -	1975	* might as well return immediately as there is nothing more to do -
1980	* otherwise, we fall through to the rest of the code.	1976	* otherwise, we fall through to the rest of the code.
1981	*/	1977	*/
1982	object *key = find_key (op, op, door);	1978	object *key = find_key (op, op, door);
1983		1979
1984	/* IF we found a key, do some extra work */	1980	/* If we found a key, do some extra work */
1985	if (key)	1981	if (key)
1986	{	1982	{
1987	object *container = key->env;	1983	object *container = key->env;
1988		1984
1989	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
…		…
2024	* It should keep the code cleaner.	2020	* It should keep the code cleaner.
2025	* When this is called, the players direction has been updated	2021	* When this is called, the players direction has been updated
2026	* (taking into account confusion.) The player is also actually	2022	* (taking into account confusion.) The player is also actually
2027	* going to try and move (not fire weapons).	2023	* going to try and move (not fire weapons).
2028	*/	2024	*/
2029	void	2025	bool
2030	move_player_attack (object *op, int dir)	2026	move_player_attack (object *op, int dir)
2031	{	2027	{
2032	object tmp, mon;
2033	int on_battleground;	2028	int on_battleground;
2034	maptile *m;
2035		2029
2036	sint16 nx = freearr_x[dir] + op->x;	2030	sint16 nx = freearr_x[dir] + op->x;
2037	sint16 ny = freearr_y[dir] + op->y;	2031	sint16 ny = freearr_y[dir] + op->y;
2038		2032
2039	on_battleground = op_on_battleground (op, 0, 0);	2033	on_battleground = op_on_battleground (op, 0, 0);
		2034
		2035	if (out_of_map (op->map, nx, ny))
		2036	return false;
		2037
		2038	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2039	{
		2040	--op->speed_left;
		2041	return true;
		2042	}
2040		2043
2041	/* If braced, or can't move to the square, and it is not out of the	2044	/* If braced, or can't move to the square, and it is not out of the
2042	* map, attack it. Note order of if statement is important - don't	2045	* map, attack it. Note order of if statement is important - don't
2043	* want to be calling move_ob if braced, because move_ob will move the	2046	* want to be calling move_ob if braced, because move_ob will move the
2044	* player. This is a pretty nasty hack, because if we could	2047	* player. This is a pretty nasty hack, because if we could
2045	* move to some space, it then means that if we are braced, we should	2048	* move to some space, it then means that if we are braced, we should
2046	* do nothing at all. As it is, if we are braced, we go through	2049	* do nothing at all. As it is, if we are braced, we go through
2047	* quite a bit of processing. However, it probably is less than what	2050	* quite a bit of processing. However, it probably is less than what
2048	* move_ob uses.	2051	* move_ob uses.
2049	*/	2052	*/
2050	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2051	{
2052	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2053	{
2054	m = op->map->xy_find (nx, ny);	2053	maptile *m = op->map->xy_find (nx, ny);
2055	if (!m)
2056	return; /* Don't think this should happen */
2057	}
2058	else
2059	m = op->map;
2060		2054
2061	if (!(tmp = m->at (nx, ny).bot))
2062	return;
2063
2064	mon = 0;
2065	/* Go through all the objects, and find ones of interest. Only stop if	2055	/* Go through all the objects, and find ones of interest. Only stop if
2066	* we find a monster - that is something we know we want to attack.	2056	* we find a monster - that is something we know we want to attack.
2067	* if its a door or barrel (can roll) see if there may be monsters	2057	* if its a door or barrel (can roll) see if there may be monsters
2068	* on the space	2058	* on the space
2069	*/	2059	*/
2070	while (tmp)	2060	object *mon;
2071	{	2061	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2072	if (tmp == op)	2062	{
2073	{	2063	if ((mon->flag [FLAG_ALIVE]
2074	tmp = tmp->above;	2064	\|\| mon->type == LOCKED_DOOR
2075	continue;	2065	\|\| mon->flag [FLAG_CAN_ROLL])
2076	}
2077
2078	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2079	{
2080	mon = tmp;	2066	&& mon != op)
2081	break;	2067	break;
2082	}	2068	}
2083		2069
2084	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2085	mon = tmp;
2086
2087	tmp = tmp->above;
2088	}
2089
2090	if (!mon) /* This happens anytime the player tries to move */	2070	if (!mon) /* This happens anytime the player tries to move */
2091	return; /* into a wall */	2071	return false; /* into a wall */
2092		2072
2093	if (mon->head)
2094	mon = mon->head;	2073	mon = mon->head_ ();
2095		2074
2096	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2075	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2076	if (op->contr->weapon_sp_left > 0.f)
2097	if (player_attack_door (op, mon))	2077	if (player_attack_door (op, mon))
		2078	{
		2079	--op->contr->weapon_sp_left;
2098	return;	2080	return true;
		2081	}
2099		2082
2100	/* The following deals with possibly attacking peaceful	2083	/* The following deals with possibly attacking peaceful
2101	* or frienddly creatures. Basically, all players are considered	2084	* or friendly creatures. Basically, all players are considered
2102	* unaggressive. If the moving player has peaceful set, then the	2085	* unaggressive. If the moving player has peaceful set, then the
2103	* object should be pushed instead of attacked. It is assumed that	2086	* object should be pushed instead of attacked. It is assumed that
2104	* if you are braced, you will not attack friends accidently,	2087	* if you are braced, you will not attack friends accidently,
2105	* and thus will not push them.	2088	* and thus will not push them.
2106	*/	2089	*/
2107		2090
2108	/* If the creature is a pet, push it even if the player is not	2091	/* If the creature is a pet, push it even if the player is not
2109	* peaceful. Our assumption is the creature is a pet if the	2092	* peaceful. Our assumption is the creature is a pet if the
2110	* player owns it and it is either friendly or unagressive.	2093	* player owns it and it is either friendly or unagressive.
2111	*/	2094	*/
2112	if (op->type == PLAYER	2095	if (op->type == PLAYER
2113	&& ((mon->owner && mon->owner->contr	2096	&& ((mon->owner && mon->owner->contr
2114	&& same_party (mon->owner->contr->party, op->contr->party))	2097	&& same_party (mon->owner->contr->party, op->contr->party))
2115	\|\| mon->owner == op)	2098	\|\| mon->owner == op)
2116	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2099	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2117	{	2100	{
2118	/* If we're braced, we don't want to switch places with it */	2101	/* If we're braced, we don't want to switch places with it */
2119	if (op->contr->braced)	2102	if (op->contr->braced)
2120	return;	2103	return false;
		2104
		2105	if (op->speed_left > 0.f)
		2106	{
		2107	--op->speed_left;
2121		2108
2122	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2123	push_ob (mon, dir, op);	2110	push_ob (mon, dir, op);
		2111
2124	if (op->contr->tmp_invis \|\| op->hide)	2112	if (op->contr->tmp_invis \|\| op->hide)
2125	make_visible (op);	2113	make_visible (op);
2126		2114
2127	return;	2115	return true;
2128	}	2116	}
		2117	else
		2118	return false;
		2119	}
2129		2120
2130	/* in certain circumstances, you shouldn't attack friendly	2121	/* in certain circumstances, you shouldn't attack friendly
2131	* creatures. Note that if you are braced, you can't push	2122	* creatures. Note that if you are braced, you can't push
2132	* someone, but put it inside this loop so that you won't	2123	* someone, but put it inside this loop so that you won't
2133	* attack them either.	2124	* attack them either.
2134	*/	2125	*/
2135	if ((mon->type == PLAYER \|\| mon->enemy != op)	2126	if ((mon->type == PLAYER \|\| mon->enemy != op)
2136	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	2127	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2137	&& ((op->contr->peaceful	2128	&& ((op->contr->peaceful
2138	\|\| (mon->type == PLAYER && mon->contr->peaceful))	2129	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2139	&& !on_battleground))	2130	&& !on_battleground))
		2131	{
		2132	if (op->speed_left > 0.f)
2140	{	2133	{
		2134	--op->speed_left;
		2135
2141	if (!op->contr->braced)	2136	if (!op->contr->braced)
2142	{	2137	{
2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2138	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2144	push_ob (mon, dir, op);	2139	push_ob (mon, dir, op);
2145	}	2140	}
2146	else	2141	else
2147	new_draw_info (0, 0, op, "You withhold your attack");	2142	new_draw_info (0, 0, op, "You withhold your attack");
2148		2143
2149	if (op->contr->tmp_invis \|\| op->hide)	2144	if (op->contr->tmp_invis \|\| op->hide)
2150	make_visible (op);	2145	make_visible (op);
2151	}
2152		2146
		2147	return true;
		2148	}
		2149	}
2153	/* If the object is a boulder or other rollable object, then	2150	/* If the object is a boulder or other rollable object, then
2154	* roll it if not braced. You can't roll it if you are braced.	2151	* roll it if not braced. You can't roll it if you are braced.
2155	*/	2152	*/
2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2154	{
		2155	if (op->speed_left > 0.f)
2157	{	2156	{
		2157	--op->speed_left;
		2158
2158	recursive_roll (mon, dir, op);	2159	recursive_roll (mon, dir, op);
2159	if (action_makes_visible (op))	2160	if (action_makes_visible (op))
2160	make_visible (op);	2161	make_visible (op);
2161	}
2162		2162
		2163	return true;
		2164	}
		2165	}
2163	/* Any generic living creature. Including things like doors.	2166	/* Any generic living creature. Including things like doors.
2164	* Way it works is like this: First, it must have some hit points	2167	* Way it works is like this: First, it must have some hit points
2165	* and be living. Then, it must be one of the following:	2168	* and be living. Then, it must be one of the following:
2166	* 1) Not a player, 2) A player, but of a different party. Note	2169	* 1) Not a player, 2) A player, but of a different party. Note
2167	* that party_number -1 is no party, so attacks can still happen.	2170	* that party_number -1 is no party, so attacks can still happen.
2168	*/	2171	*/
2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2172	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2173	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2171	{	2174	{
2172	if (!op->contr->has_hit)	2175	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2173	{	2176	{
2174	op->contr->has_hit = 1;	2177	--op->contr->weapon_sp_left;
2175	op->speed_left += op->contr->weapon_sp - op->speed;
2176	}
2177		2178
2178	skill_attack (mon, op, 0, 0, 0);	2179	skill_attack (mon, op, 0, 0, 0);
2179
2180	/* If attacking another player, that player gets automatic
2181	* hitback, and doesn't loose luck either.
2182	* Disable hitback on the battleground or if the target is
2183	* the wiz.
2184	*/
2185	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2186	{
2187	short luck = mon->stats.luck;
2188
2189	mon->contr->has_hit = 1;
2190	skill_attack (op, mon, 0, 0, 0);
2191	mon->stats.luck = luck;
2192	}
2193		2180
2194	if (action_makes_visible (op))	2181	if (action_makes_visible (op))
2195	make_visible (op);	2182	make_visible (op);
2196	}
2197	} /* if player should attack something */
2198	}
2199		2183
2200	int	2184	return true;
		2185	}
		2186	}
		2187
		2188	return false;
		2189	}
		2190
		2191	bool
2201	move_player (object *op, int dir)	2192	move_player (object *op, int dir)
2202	{	2193	{
2203	int pick;	2194	int pick;
2204		2195
2205	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2196	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2219	op->facing = dir;	2210	op->facing = dir;
2220		2211
2221	if (op->hide)	2212	if (op->hide)
2222	do_hidden_move (op);	2213	do_hidden_move (op);
2223		2214
		2215	bool retval;
		2216
2224	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2225	/nop / ;	2218	retval = RESULT_INT (0);
2226	else if (op->contr->fire_on)	2219	else if (op->contr->fire_on)
2227	fire (op, dir);	2220	retval = fire (op, dir);
2228	else	2221	else
2229	{	2222	{
2230	move_player_attack (op, dir);	2223	retval = move_player_attack (op, dir);
2231	pick = check_pick (op);	2224	pick = check_pick (op);
2232	}	2225	}
2233		2226
2234	/* Add special check for newcs players and fire on - this way, the	2227	/* Add special check for newcs players and fire on - this way, the
2235	* server can handle repeat firing.	2228	* server can handle repeat firing.
…		…
2242	/* Update how the player looks. Use the facing, so direction may	2235	/* Update how the player looks. Use the facing, so direction may
2243	* get reset to zero. This allows for full animation capabilities	2236	* get reset to zero. This allows for full animation capabilities
2244	* for players.	2237	* for players.
2245	*/	2238	*/
2246	animate_object (op, op->facing);	2239	animate_object (op, op->facing);
2247	return 0;	2240
		2241	return retval;
2248	}	2242	}
2249		2243
2250	/* This is similar to handle_player, below, but is only used by the	2244	/* This is similar to handle_player, below, but is only used by the
2251	* new client/server stuff.	2245	* new client/server stuff.
2252	* This is sort of special, in that the new client/server actually uses	2246	* This is sort of special, in that the new client/server actually uses
2253	* the new speed values for commands.	2247	* the new speed values for commands.
2254	*	2248	*
2255	* Returns true if there are more actions we can do.	2249	* Returns true if there are more actions we can do. Should not do
		2250	* many actions in a row, as that would be too unfair to other
		2251	* players.
2256	*/	2252	*/
2257	int	2253	bool
2258	handle_newcs_player (object *op)	2254	handle_newcs_player (object *op)
2259	{	2255	{
2260	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2261	{	2257	{
2262	flee_player (op);	2258	if (op->speed_left > 0.f)
2263
2264	/* If player is still scared, that is his action for this tick */
2265	if (op->flag [FLAG_SCARED])
2266	{	2259	{
2267	--op->speed_left;	2260	--op->speed_left;
		2261	flee_player (op);
		2262
2268	return 0;	2263	return true;
2269	}	2264	}
		2265	else
		2266	return false;
2270	}	2267	}
2271		2268
2272	/* call this here - we also will call this in do_ericserver, but	2269	/* call this here - we also will call this in do_ericserver, but
2273	* the players time has been increased when doericserver has been	2270	* the players time has been increased when doericserver has been
2274	* called, so we recheck it here.	2271	* called, so we recheck it here.
2275	*/	2272	*/
2276	if (op->contr->ns->handle_command ())	2273	if (op->contr->ns->handle_command ())
2277	return 1;	2274	return true;
2278		2275
2279	if (op->speed_left > 0.f)
2280	{
2281	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2276	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2282	{
2283	/* All move commands take 1 tick, at least for now */
2284	--op->speed_left;
2285
2286	/* Instead of all the stuff below, let move_player take care
2287	* of it. Also, some of the skill stuff is only put in
2288	* there, as well as the confusion stuff.
2289	*/
2290	move_player (op, op->direction);	2277	return move_player (op, op->direction);
2291		2278
2292	return op->speed_left > 0.f;
2293	}
2294	}
2295
2296	return 0;	2279	return false;
2297	}	2280	}
2298		2281
2299	int	2282	int
2300	save_life (object *op)	2283	save_life (object *op)
2301	{	2284	{
…		…
3054	}	3037	}
3055		3038
3056	int	3039	int
3057	is_true_undead (object *op)	3040	is_true_undead (object *op)
3058	{	3041	{
3059	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3042	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3060	return 1;	3043	return 1;
3061		3044
3062	return 0;	3045	return 0;
3063	}	3046	}
3064		3047
…		…
3108	/* For Hidden creatures - a chance of becoming 'unhidden'	3091	/* For Hidden creatures - a chance of becoming 'unhidden'
3109	* every time they move - as we subtract off 'invisibility'	3092	* every time they move - as we subtract off 'invisibility'
3110	* AND, for players, if they move into a ridiculously unhideable	3093	* AND, for players, if they move into a ridiculously unhideable
3111	* spot (surrounded by clear terrain in broad daylight). -b.t.	3094	* spot (surrounded by clear terrain in broad daylight). -b.t.
3112	*/	3095	*/
3113
3114	void	3096	void
3115	do_hidden_move (object *op)	3097	do_hidden_move (object *op)
3116	{	3098	{
3117	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3099	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3118	object *skop;	3100	object *skop;
…		…
3235	* a blocked los square.	3217	* a blocked los square.
3236	* we use the archetype to figure out offsets.	3218	* we use the archetype to figure out offsets.
3237	*/	3219	*/
3238	while (op)	3220	while (op)
3239	{	3221	{
3240	dx = rv.distance_x + op->arch->clone.x;	3222	dx = rv.distance_x + op->arch->x;
3241	dy = rv.distance_y + op->arch->clone.y;	3223	dy = rv.distance_y + op->arch->y;
3242		3224
3243	/* only the viewable area the player sees is updated by LOS	3225	/* only the viewable area the player sees is updated by LOS
3244	* code, so we need to restrict ourselves to that range of values	3226	* code, so we need to restrict ourselves to that range of values
3245	* for any meaningful values.	3227	* for any meaningful values.
3246	*/	3228	*/
…		…
3371	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3353	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3372	return;	3354	return;
3373	}	3355	}
3374		3356
3375	/* everything seems okay - now bring on the gift: */	3357	/* everything seems okay - now bring on the gift: */
3376	item = &(tr->item->clone);	3358	item = tr->item;
3377		3359
3378	if (item->type == SPELL)	3360	if (item->type == SPELL)
3379	{	3361	{
3380	if (check_spell_known (who, item->name))	3362	if (check_spell_known (who, item->name))
3381	return;	3363	return;
…		…
3441	/* forces in the treasurelist can alter the player's stats */	3423	/* forces in the treasurelist can alter the player's stats */
3442	object *skin;	3424	object *skin;
3443		3425
3444	/* first get the dragon skin force */	3426	/* first get the dragon skin force */
3445	shstr_cmp dragon_skin_force ("dragon_skin_force");	3427	shstr_cmp dragon_skin_force ("dragon_skin_force");
3446	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3428	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3447	;	3429	;
3448		3430
3449	if (!skin)	3431	if (!skin)
3450	return;	3432	return;
3451		3433

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.141 by root, Fri May 18 15:05:09 2007 UTC vs. Revision 1.152 by root, Sun Jul 1 05:00:20 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.141 by root, Fri May 18 15:05:09 2007 UTC vs.
Revision 1.152 by root, Sun Jul 1 05:00:20 2007 UTC