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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.114 by root, Wed Apr 25 18:47:51 2007 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 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 <pwd.h>
27	#include <sproto.h>	26	#include <sproto.h>
28	#include <sounds.h>	27	#include <sounds.h>
29	#include <living.h>	28	#include <living.h>
30	#include <object.h>	29	#include <object.h>
31	#include <spells.h>	30	#include <spells.h>
158	op->x = -1;	157	op->x = -1;
159	op->y = -1;	158	op->y = -1;
160	}	159	}
161		160
162	void	161	void
163	player::enter_map ()
164	{
165	object *tmp = object::create ();
166
167	EXIT_PATH (tmp) = maplevel;
168	EXIT_X (tmp) = ob->x;
169	EXIT_Y (tmp) = ob->y;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}
174
175	void
176	player::activate ()	162	player::activate ()
177	{	163	{
178	if (active)	164	if (active)
179	return;	165	return;
180		166
…		…
182	ob->remove ();	168	ob->remove ();
183	ob->map = 0;	169	ob->map = 0;
184	ob->activate_recursive ();	170	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	172	add_friendly_object (ob);
187	enter_map ();
188	}	173	}
189		174
190	void	175	void
191	player::deactivate ()	176	player::deactivate ()
192	{	177	{
…		…
202		187
203	ob->remove ();	188	ob->remove ();
204	ob->map = 0;	189	ob->map = 0;
205	party = 0;	190	party = 0;
206		191
207	// for weird reasons, this is often "ob", keeping a circular reference	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208	ranges [range_skill] = 0;
209		193
210	players.erase (this);	194	players.erase (this);
211	}	195	}
212		196
213	// connect the player with a specific client	197	// connect the player with a specific client
214	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
215	void	199	void
216	player::connect (client *ns)	200	player::connect (client *ns)
217	{	201	{
218	this->ns = ns;	202	this->ns = ns;
219	ns->pl = this;	203	ns->pl = this;
…		…
223	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
224		208
225	ns->update_look = 0;	209	ns->update_look = 0;
226	ns->look_position = 0;	210	ns->look_position = 0;
227		211
228	clear_los (ob);	212	clear_los (this);
229		213
230	ns->reset_stats ();	214	ns->reset_stats ();
231		215
232	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
233	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
234	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
235		219
236	if (!legal_range (ob, shoottype))
237	shoottype = range_none;
238
239	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
240	link_player_skills (ob);	221	link_player_skills (ob);
241		222
242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243		224
…		…
251	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
252	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
253		234
254	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
255	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
256	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
257	abil = tmp;	238	abil = tmp;
258	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
259	skin = tmp;	240	skin = tmp;
260		241
261	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
262	}	243	}
263		244
264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265		246
266	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
267		248
		249	ob->flag [FLAG_READY_WEAPON] = false;
		250	ob->flag [FLAG_READY_SKILL] = false;
		251	ob->flag [FLAG_READY_BOW] = false;
		252
		253	for (object *op = ob->inv; op; op = op->below)
		254	if (op->flag [FLAG_APPLIED])
		255	switch (op->type)
		256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
		261	case WAND:
		262	case ROD:
		263	case HORN:
		264	case BOW:
		265	ranged_ob = op;
		266	break;
		267
		268	case WEAPON:
		269	combat_ob = op;
		270	break;
		271	}
		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
268	ob->update_stats ();	274	ob->update_stats ();
		275
269	ns->floorbox_update ();	276	ns->floorbox_update ();
270
271	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
272	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
273		279
274	activate ();	280	activate ();
275		281
…		…
291		297
292	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
293		299
294	ns->reset_stats ();	300	ns->reset_stats ();
295	ns->pl = 0;	301	ns->pl = 0;
296	this->ns = 0;	302	ns = 0;
297	}	303	}
298		304
299	if (ob)	305	if (ob)
300	ob->close_container (); //TODO: client-specific	306	ob->close_container (); //TODO: client-specific
301		307
…		…
305	// the need for this function can be explained	311	// the need for this function can be explained
306	// by load_object not returning the object	312	// by load_object not returning the object
307	void	313	void
308	player::set_object (object *op)	314	player::set_object (object *op)
309	{	315	{
310	ob = op;	316	ob = observe = op;
311	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
312		318
313	ob->speed_left = 0.5;
314	ob->speed = 1.0;	319	ob->speed = 1.0f;
		320	ob->speed_left = 0.5f;
		321
315	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;
316	}	330	}
317		331
318	player::player ()	332	player::player ()
319	{	333	{
320	/* There are some elements we want initialised to non zero value -	334	/* There are some elements we want initialised to non zero value -
…		…
325	unapply = unapply_nochoice;	339	unapply = unapply_nochoice;
326		340
327	savebed_map = first_map_path; /* Init. respawn position */	341	savebed_map = first_map_path; /* Init. respawn position */
328		342
329	gen_sp_armour = 10;	343	gen_sp_armour = 10;
330	shoottype = range_none;
331	bowtype = bow_normal;	344	bowtype = bow_normal;
332	petmode = pet_normal;	345	petmode = pet_normal;
333	listening = 10;	346	listening = 10;
334	usekeys = containers;	347	usekeys = containers;
335	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
336	do_los = 1;	349	do_los = 1;
		350
		351	weapon_sp = 1.0f;
		352	weapon_sp_left = 0.5f;
337	}	353	}
338		354
339	void	355	void
340	player::do_destroy ()	356	player::do_destroy ()
341	{	357	{
…		…
774	}	790	}
775		791
776	void	792	void
777	object::roll_stats ()	793	object::roll_stats ()
778	{	794	{
779	int statsort [7];	795	int statsort [NUM_STATS];
780		796
781	for (;;)	797	for (;;)
782	{	798	{
783	int sum = 0;	799	int sum = 0;
784	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
785	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
786		802
787	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
788	break;	804	break;
789	}	805	}
790		806
791	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
792	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
793		809
		810	for (int i = 0; i < NUM_STATS; ++i)
794	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
795	stats.Dex = statsort[1];
796	stats.Con = statsort[2];
797	stats.Int = statsort[3];
798	stats.Wis = statsort[4];
799	stats.Pow = statsort[5];
800	stats.Cha = statsort[6];
801		812
802	stats.exp = 0;	813	stats.exp = 0;
803	stats.ac = 0;	814	stats.ac = 0;
804		815
805	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
817	}	828	}
818		829
819	void	830	void
820	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
821	{	832	{
822	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
823	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
824	set_attr_value (&contr->orig_stats, b, tmp);
825		834
		835	for (int i = 0; i < NUM_STATS; ++i)
826	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
827	stats.Dex = contr->orig_stats.Dex;
828	stats.Con = contr->orig_stats.Con;
829	stats.Int = contr->orig_stats.Int;
830	stats.Wis = contr->orig_stats.Wis;
831	stats.Pow = contr->orig_stats.Pow;
832	stats.Cha = contr->orig_stats.Cha;
833		837
834	//TODO: the following code looks so borked and should, at the very least,	838	//TODO: the following code looks so borked and should, at the very least,
835	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
836	stats.ac = 0;	840	stats.ac = 0;
837		841
…		…
910	if (*first_map_ext_path)	914	if (*first_map_ext_path)
911	{	915	{
912	object *tmp;	916	object *tmp;
913	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
914		918
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916	tmp = object::create ();	920	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = ob->x;	922	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = ob->y;	923	EXIT_Y (tmp) = ob->y;
920	ob->enter_exit (tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
1014	/* Cornered, get rid of scared */	1018	/* Cornered, get rid of scared */
1015	CLEAR_FLAG (op, FLAG_SCARED);	1019	CLEAR_FLAG (op, FLAG_SCARED);
1016	op->enemy = NULL;	1020	op->enemy = NULL;
1017	}	1021	}
1018		1022
1019
1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1023	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1021	* IT returns 1 if the player should keep on moving, 0 if he should	1024	* It returns 1 if the player should keep on moving, 0 if he should
1022	* stop.	1025	* stop.
1023	*/	1026	*/
1024	int	1027	int
1025	check_pick (object *op)	1028	check_pick (object *op)
1026	{	1029	{
…		…
1103	if (tmp->name != NULL)	1106	if (tmp->name != NULL)
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106	else	1109	else
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109		1112
1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111	}	1114	}
1112		1115
1113	/* philosophy:	1116	/* philosophy:
…		…
1306	/* careful: chairs and tables are weapons! */	1309	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)	1310	if (op->contr->mode & PU_ALLWEAPON)
1308	{	1311	{
1309	if (tmp->type == WEAPON && tmp->name != NULL)	1312	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{	1313	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1315	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{	1316	{
1314	pick_up (op, tmp);	1317	pick_up (op, tmp);
1315	continue;	1318	continue;
1316	}	1319	}
1317	}	1320	}
1318		1321
1319	if (tmp->type == WEAPON && tmp->name == NULL)	1322	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{	1323	{
1321	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1324	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1325	{
1323	pick_up (op, tmp);	1326	pick_up (op, tmp);
1324	continue;	1327	continue;
1325	}	1328	}
1326	}	1329	}
…		…
1351	if (tmp->name != NULL)	1354	if (tmp->name != NULL)
1352	{	1355	{
1353	fprintf (stderr, "%s", tmp->name);	1356	fprintf (stderr, "%s", tmp->name);
1354	}	1357	}
1355	else	1358	else
1356	fprintf (stderr, "%s", tmp->arch->name);	1359	fprintf (stderr, "%s", tmp->arch->archname);
1357	fprintf (stderr, ",%d] = ", tmp->type);	1360	fprintf (stderr, ",%d] = ", tmp->type);
1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1359	#endif	1362	#endif
1360	continue;	1363	continue;
1361	}	1364	}
…		…
1464	* find_better_arrow to find a decent arrow to use.	1467	* find_better_arrow to find a decent arrow to use.
1465	* op = the shooter	1468	* op = the shooter
1466	* type = bow->race	1469	* type = bow->race
1467	* dir = fire direction	1470	* dir = fire direction
1468	*/	1471	*/
1469
1470	object *	1472	object *
1471	pick_arrow_target (object op, const char type, int dir)	1473	pick_arrow_target (object op, const char type, int dir)
1472	{	1474	{
1473	object *tmp = NULL;	1475	object *tmp = NULL;
1474	maptile *m;	1476	maptile *m;
…		…
1539	*/	1541	*/
1540	int	1542	int
1541	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1543	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1542	{	1544	{
1543	object left, bow;	1545	object left, bow;
1544	int bowspeed, mflags;	1546	int mflags;
1545	maptile *m;	1547	maptile *m;
1546		1548
1547	if (!dir)	1549	if (!dir)
1548	{	1550	{
1549	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1550	return 0;	1552	return 0;
1551	}	1553	}
1552		1554
1553	if (op->type == PLAYER)	1555	if (op->contr)
1554	bow = op->contr->ranges[range_bow];	1556	bow = op->current_weapon;
1555	else	1557	else
1556	{	1558	{
1557	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1558	/* Don't check for applied - monsters don't apply bows - in that way, they	1560	/* Don't check for applied - monsters don't apply bows - in that way, they
1559	* don't need to switch back and forth between bows and weapons.	1561	* don't need to switch back and forth between bows and weapons.
…		…
1564	if (!bow)	1566	if (!bow)
1565	{	1567	{
1566	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1568	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567	return 0;	1569	return 0;
1568	}	1570	}
		1571
		1572	// optimisation: move object to top so we will find it quickly again
		1573	if (bow->below)
		1574	{
		1575	bow->remove ();
		1576	op->insert (bow);
		1577	}
		1578
1569	}	1579	}
1570		1580
1571	if (!bow->race \|\| !bow->skill)	1581	if (!bow->race \|\| !bow->skill)
1572	{	1582	{
1573	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1574	return 0;	1584	return 0;
1575	}	1585	}
1576
1577	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1578
1579	/* penalize ROF for bestarrow */
1580	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1581	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1583	if (bowspeed < 1)
1584	bowspeed = 1;
1585		1586
1586	if (arrow == NULL)	1587	if (arrow == NULL)
1587	{	1588	{
1588	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1589	{	1590	{
1590	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
1591	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1592	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1593	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1593	else	1594	else
1594	CLEAR_FLAG (op, FLAG_READY_BOW);	1595	CLEAR_FLAG (op, FLAG_READY_BOW);
		1596
1595	return 0;	1597	return 0;
1596	}	1598	}
1597	}	1599	}
1598		1600
1599	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1601	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1623		1625
1624	arrow->set_owner (op);	1626	arrow->set_owner (op);
1625	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1626	arrow->direction = dir;	1628	arrow->direction = dir;
1627		1629
		1630	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1631	arrow->stats.hp = arrow->stats.dam;
		1632	arrow->stats.grace = arrow->attacktype;
		1633
		1634	if (arrow->slaying)
		1635	arrow->spellarg = strdup (arrow->slaying);
		1636
		1637	#if 0
		1638	if (player *pl = op->contr)
		1639	{
		1640	float speed = pl->weapon_sp;
		1641
		1642	/* penalize ROF for bestarrow */
		1643	if (pl->bowtype == bow_bestarrow)
		1644	speed *= .9f;
		1645	else
		1646	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1647
		1648	op->speed_left += speed - op->speed;
		1649	}
		1650	#endif
		1651
		1652	SET_ANIMATION (arrow, arrow->direction);
		1653
		1654	/* update the speed */
		1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1656	+ bow->stats.dam / 7.f;
		1657
		1658	arrow->set_speed (max (arrow->speed, 2.f));
		1659	arrow->speed_left = 0;
		1660
		1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1662
1628	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
1629	{	1664	{
1630	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1631	op->update_stats ();
1632	}
1633
1634	SET_ANIMATION (arrow, arrow->direction);
1635	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1636	arrow->stats.hp = arrow->stats.dam;
1637	arrow->stats.grace = arrow->attacktype;
1638	if (arrow->slaying != NULL)
1639	arrow->spellarg = strdup (arrow->slaying);
1640
1641	/* Note that this was different for monsters - they got their level
1642	* added to the damage. I think the strength bonus is more proper.
1643	*/
1644
1645	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1646
1647	/* update the speed */
1648	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1649	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1650
1651	arrow->set_speed (max (arrow->speed, 1.0));
1652	arrow->speed_left = 0;
1653
1654	if (op->type == PLAYER)
1655	{
1656	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1657	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1658	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1659
1660	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1666	wc -= dex_bonus[op->stats.Dex];
		1667
		1668	if (!arrow->slaying)
		1669	arrow->slaying = op->slaying;
		1670
		1671	arrow->attacktype \|= op->attacktype;
1661	}	1672	}
1662	else	1673	else
1663	{	1674	{
1664	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1665	arrow->level = op->level;	1675	arrow->level = op->level;
1666	}	1676	arrow->stats.wc -= bow->magic;
1667		1677
1668	if (arrow->attacktype == AT_PHYSICAL)	1678	if (!arrow->slaying)
		1679	arrow->slaying = bow->slaying;
		1680
1669	arrow->attacktype \|= bow->attacktype;	1681	arrow->attacktype \|= bow->attacktype;
		1682	}
1670		1683
1671	if (bow->slaying)	1684	wc -= arrow->level;
1672	arrow->slaying = bow->slaying;	1685	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1673		1686
		1687	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1674	arrow->move_type = MOVE_FLY_LOW;	1688	arrow->move_type = MOVE_FLY_LOW;
1675	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1689	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1676		1690
1677	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1691	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1678	m->insert (arrow, sx, sy, op);	1692	m->insert (arrow, sx, sy, op);
…		…
1703	{	1717	{
1704	int ret = 0, wcmod = 0;	1718	int ret = 0, wcmod = 0;
1705		1719
1706	if (op->contr->bowtype == bow_bestarrow)	1720	if (op->contr->bowtype == bow_bestarrow)
1707	{	1721	{
1708	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1722	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1709	}	1723	}
1710	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1724	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1711	{	1725	{
1712	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1726	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1713	wcmod = -1;	1727	wcmod = -1;
…		…
1723	else if (op->contr->bowtype == bow_spreadshot)	1737	else if (op->contr->bowtype == bow_spreadshot)
1724	{	1738	{
1725	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1739	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1726	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1740	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1727	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1741	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1728
1729	}	1742	}
1730	else	1743	else
1731	{	1744	{
1732	/* Simple case */	1745	/* Simple case */
1733	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734	}	1747	}
		1748
1735	return ret;	1749	return ret;
1736	}	1750	}
1737
1738		1751
1739	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1740	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1741	*/	1754	*/
1742	void	1755	void
1743	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
1744	{	1757	{
1745	object *item;	1758	object *item = op->contr->ranged_ob;
1746		1759
1747	if (!op->contr->ranges[range_misc])	1760	if (!item)
1748	{	1761	{
1749	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1750	return;	1763	return;
1751	}	1764	}
1752		1765
1753	item = op->contr->ranges[range_misc];
1754	if (!item->inv)	1766	if (!item->inv)
1755	{	1767	{
1756	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1757	return;	1769	return;
1758	}	1770	}
		1771
		1772	if (!op->change_weapon (item))
		1773	return;
		1774
1759	if (item->type == WAND)	1775	if (item->type == WAND)
1760	{	1776	{
1761	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1762	{	1778	{
1763	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1764	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1781
1765	return;	1782	return;
1766	}	1783	}
1767	}	1784	}
1768	else if (item->type == ROD \|\| item->type == HORN)	1785	else if (item->type == ROD \|\| item->type == HORN)
1769	{	1786	{
1770	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1771	{	1788	{
1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1790
1773	if (item->type == ROD)	1791	if (item->type == ROD)
1774	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1775	else	1793	else
1776	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1795
1777	return;	1796	return;
1778	}	1797	}
1779	}	1798	}
1780		1799
1781	if (cast_spell (op, item, dir, item->inv, NULL))	1800	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1803	}	1822	}
1804	}	1823	}
1805		1824
1806	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1807	*/	1826	*/
1808	void	1827	bool
1809	fire (object *op, int dir)	1828	fire (object *op, int dir)
1810	{	1829	{
1811	int spellcost = 0;	1830	int spellcost = 0;
1812		1831
1813	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
1814	if (action_makes_visible (op))	1833	if (action_makes_visible (op))
1815	make_visible (op);	1834	make_visible (op);
1816		1835
1817	switch (op->contr->shoottype)	1836	player *pl = op->contr;
		1837
		1838	if (pl->golem)
		1839	{
		1840	control_golem (op->contr->golem, dir);
		1841	return false;
1818	{	1842	}
1819	case range_none:
1820	return;
1821		1843
1822	case range_bow:	1844	object *ob = pl->ranged_ob;
		1845
		1846	if (!ob)
		1847	return false;
		1848
		1849	if (!op->change_weapon (ob))
		1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
		1856
		1857	switch (ob->type)
		1858	{
		1859	case BOW:
1823	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
1824	return;	1861	break;
1825		1862
1826	case range_magic: /* Casting spells */	1863	case SPELL:
1827	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1864	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1828	return;	1865	break;
1829		1866
1830	case range_misc:	1867	case BUILDER:
		1868	apply_map_builder (op, dir);
		1869	break;
		1870
		1871	case SKILL:
		1872	do_skill (op, op, ob, dir, 0);
		1873	break;
		1874
		1875	default:
1831	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1832	return;	1877	break;
1833
1834	case range_golem: /* Control summoned monsters from scrolls */
1835	control_golem (op->contr->ranges[range_golem], dir);
1836	return;
1837
1838	case range_skill:
1839	if (!op->chosen_skill)
1840	{
1841	if (op->type == PLAYER)
1842	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1843
1844	return;
1845	}
1846
1847	do_skill (op, op, op->chosen_skill, dir, NULL);
1848	return;
1849	case range_builder:
1850	apply_map_builder (op, dir);
1851	return;
1852	default:
1853	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1854	return;
1855	}	1878	}
		1879
		1880	return true;
1856	}	1881	}
1857		1882
1858	/* find_key	1883	/* find_key
1859	* 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
1860	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
…		…
1947	* 0 otherwise	1972	* 0 otherwise
1948	*/	1973	*/
1949	static int	1974	static int
1950	player_attack_door (object op, object door)	1975	player_attack_door (object op, object door)
1951	{	1976	{
1952	/* 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,
1953	* 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 -
1954	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
1955	*/	1980	*/
1956	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
1957		1982
1958	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
1959	if (key)	1984	if (key)
1960	{	1985	{
1961	object *container = key->env;	1986	object *container = key->env;
1962		1987
1963	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);
		1989
1964	if (action_makes_visible (op))	1990	if (action_makes_visible (op))
1965	make_visible (op);	1991	make_visible (op);
		1992
1966	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1993	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1967	spring_trap (door->inv, op);	1994	spring_trap (door->inv, op);
1968		1995
1969	if (door->type == DOOR)	1996	if (door->type == DOOR)
1970	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1997	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
1996	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
1997	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
1998	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
1999	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2000	*/	2027	*/
2001	void	2028	bool
2002	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2003	{	2030	{
2004	object tmp, mon;
2005	sint16 nx, ny;
2006	int on_battleground;	2031	int on_battleground;
2007	maptile *m;
2008		2032
2009	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2010	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2011		2035
2012	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	}
2013		2046
2014	/* 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
2015	* 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
2016	* 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
2017	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2018	* 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
2019	* 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
2020	* 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
2021	* move_ob uses.	2054	* move_ob uses.
2022	*/	2055	*/
2023	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2024	{
2025	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2026	{
2027	m = op->map->xy_find (nx, ny);	2056	maptile *m = op->map->xy_find (nx, ny);
2028	if (!m)
2029	return; /* Don't think this should happen */
2030	}
2031	else
2032	m = op->map;
2033		2057
2034	if (!(tmp = m->at (nx, ny).bot))
2035	return;
2036
2037	mon = 0;
2038	/* 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
2039	* 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.
2040	* 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
2041	* on the space	2061	* on the space
2042	*/	2062	*/
2043	while (tmp)	2063	object *mon;
2044	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2045	if (tmp == op)	2065	{
2046	{	2066	if ((mon->flag [FLAG_ALIVE]
2047	tmp = tmp->above;	2067	\|\| mon->type == LOCKED_DOOR
2048	continue;	2068	\|\| mon->flag [FLAG_CAN_ROLL])
2049	}
2050
2051	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2052	{
2053	mon = tmp;	2069	&& mon != op)
2054	break;	2070	break;
2055	}	2071	}
2056		2072
2057	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2058	mon = tmp;
2059
2060	tmp = tmp->above;
2061	}
2062
2063	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2064	return; /* into a wall */	2074	return false; /* into a wall */
2065		2075
2066	if (mon->head)
2067	mon = mon->head;	2076	mon = mon->head_ ();
2068		2077
2069	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)
2070	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2071	return;	2083	return true;
		2084	}
2072		2085
2073	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2074	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2075	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2076	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2077	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2078	* and thus will not push them.	2091	* and thus will not push them.
2079	*/	2092	*/
2080		2093
2081	/* 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
2082	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2083	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2084	*/	2097	*/
2085	if ((op->type == PLAYER)	2098	if (op->type == PLAYER
2086	#if COZY_SERVER
2087	&&
2088	((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2089	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2090	#else
2091	&& mon->owner == op	2101	\|\| mon->owner == op)
2092	#endif
2093	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2094	{	2103	{
2095	/* 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 */
2096	if (op->contr->braced)	2105	if (op->contr->braced)
2097	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
2098		2111
2099	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);
2100	(void) push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2101	if (op->contr->tmp_invis \|\| op->hide)	2115	if (op->contr->tmp_invis \|\| op->hide)
2102	make_visible (op);	2116	make_visible (op);
2103		2117
2104	return;	2118	return true;
2105	}	2119	}
		2120	else
		2121	return false;
		2122	}
2106		2123
2107	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2108	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2109	* 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
2110	* attack them either.	2127	* attack them either.
2111	*/	2128	*/
2112	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2129	if ((mon->type == PLAYER \|\| mon->enemy != op)
2113	(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))
2114	#ifdef PROHIBIT_PLAYERKILL
2115	(op->contr->peaceful	2131	&& ((op->contr->peaceful
2116	\|\| (mon->type == PLAYER	2132	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2117	&& mon->contr->
2118	peaceful)) &&
2119	#else
2120	op->contr->peaceful &&
2121	#endif
2122	!on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2123	{	2136	{
		2137	--op->speed_left;
		2138
2124	if (!op->contr->braced)	2139	if (!op->contr->braced)
2125	{	2140	{
2126	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);
2127	push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2128	}	2143	}
2129	else	2144	else
2130	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2131		2146
2132	if (op->contr->tmp_invis \|\| op->hide)	2147	if (op->contr->tmp_invis \|\| op->hide)
2133	make_visible (op);	2148	make_visible (op);
2134	}
2135		2149
		2150	return true;
		2151	}
		2152	}
2136	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2137	* 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.
2138	*/	2155	*/
2139	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)
2140	{	2159	{
		2160	--op->speed_left;
		2161
2141	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2142	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2143	make_visible (op);	2164	make_visible (op);
2144	}
2145		2165
		2166	return true;
		2167	}
		2168	}
2146	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2147	* 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
2148	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2149	* 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
2150	* 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.
2151	*/	2174	*/
2152	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2153	((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)))
2154	{	2177	{
2155		2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2156	/* If the player hasn't hit something this tick, and does
2157	* so, give them speed boost based on weapon speed. Doing
2158	* it here is better than process_players2, which basically
2159	* incurred a 1 tick offset.
2160	*/
2161	if (!op->contr->has_hit)
2162	{	2179	{
2163	op->speed_left += op->speed / op->contr->weapon_sp;	2180	--op->contr->weapon_sp_left;
2164
2165	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2166	}
2167		2181
2168	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2169
2170	/* If attacking another player, that player gets automatic
2171	* hitback, and doesn't loose luck either.
2172	* Disable hitback on the battleground or if the target is
2173	* the wiz.
2174	*/
2175	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2176	{
2177	short luck = mon->stats.luck;
2178
2179	mon->contr->has_hit = 1;
2180	skill_attack (op, mon, 0, 0, 0);
2181	mon->stats.luck = luck;
2182	}
2183		2183
2184	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2185	make_visible (op);	2185	make_visible (op);
2186	}
2187	} /* if player should attack something */
2188	}
2189		2186
2190	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2191	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2192	{	2196	{
2193	int pick;	2197	int pick;
2194		2198
2195	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2209	op->facing = dir;	2213	op->facing = dir;
2210		2214
2211	if (op->hide)	2215	if (op->hide)
2212	do_hidden_move (op);	2216	do_hidden_move (op);
2213		2217
		2218	bool retval;
		2219
2214	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2215	/nop / ;	2221	retval = RESULT_INT (0);
2216	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2217	fire (op, dir);	2223	retval = fire (op, dir);
2218	else	2224	else
2219	{	2225	{
2220	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2221	pick = check_pick (op);	2227	pick = check_pick (op);
2222	}	2228	}
2223		2229
2224	/* 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
2225	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2232	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2233	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2234	* for players.	2240	* for players.
2235	*/	2241	*/
2236	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2237	return 0;	2243
		2244	return retval;
2238	}	2245	}
2239		2246
2240	/* 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
2241	* new client/server stuff.	2248	* new client/server stuff.
2242	* 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
2243	* the new speed values for commands.	2250	* the new speed values for commands.
2244	*	2251	*
2245	* 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.
2246	*/	2255	*/
2247	int	2256	bool
2248	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2249	{	2258	{
2250	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2251	{	2260	{
2252	flee_player (op);	2261	if (op->speed_left > 0.f)
2253	/* If player is still scared, that is his action for this tick */
2254	if (QUERY_FLAG (op, FLAG_SCARED))
2255	{	2262	{
2256	op->speed_left--;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2257	return 0;	2266	return true;
2258	}	2267	}
		2268	else
		2269	return false;
2259	}	2270	}
2260		2271
2261	/* 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
2262	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2263	* called, so we recheck it here.	2274	* called, so we recheck it here.
2264	*/	2275	*/
2265	if (op->contr->ns->handle_command ())	2276	if (op->contr->ns->handle_command ())
2266	return 1;	2277	return true;
2267		2278
2268	if (op->speed_left > 0)
2269	{
2270	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2271	{
2272	/* All move commands take 1 tick, at least for now */
2273	op->speed_left--;
2274
2275	/* Instead of all the stuff below, let move_player take care
2276	* of it. Also, some of the skill stuff is only put in
2277	* there, as well as the confusion stuff.
2278	*/
2279	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2280		2281
2281	return op->speed_left > 0;
2282	}
2283	}
2284
2285	return 0;	2282	return false;
2286	}	2283	}
2287		2284
2288	int	2285	int
2289	save_life (object *op)	2286	save_life (object *op)
2290	{	2287	{
…		…
2448	gen_grace = op->stats.maxgrace;	2445	gen_grace = op->stats.maxgrace;
2449	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2446	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2450	}	2447	}
2451		2448
2452	/* Regenerate Spell Points */	2449	/* Regenerate Spell Points */
2453	if (!op->contr->ranges[range_golem] && --op->last_sp < 0)	2450	if (!op->contr->golem && --op->last_sp < 0)
2454	{	2451	{
2455	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2452	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2456	if (op->stats.sp < op->stats.maxsp)	2453	if (op->stats.sp < op->stats.maxsp)
2457	{	2454	{
2458	op->stats.sp++;	2455	op->stats.sp++;
…		…
2556	}	2553	}
2557		2554
2558	/* Digestion */	2555	/* Digestion */
2559	if (--op->last_eat < 0)	2556	if (--op->last_eat < 0)
2560	{	2557	{
2561	#ifdef COZY_SERVER
2562	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2563	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2564	#else
2565	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2558	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2566	#endif
2567		2559
2568	if (op->contr->gen_hp > 0)	2560	if (op->contr->gen_hp > 0)
2569	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2570	else	2562	else
2571	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2916	object *force;	2908	object *force;
2917	int at;	2909	int at;
2918		2910
2919	force = get_archetype (FORCE_NAME);	2911	force = get_archetype (FORCE_NAME);
2920	/* 50 ticks should be enough time for the spell to abate */	2912	/* 50 ticks should be enough time for the spell to abate */
2921	force->speed = 0.1;	2913	force->speed = 0.1f;
2922	force->speed_left = -5.0;	2914	force->speed_left = -5.f;
2923	SET_FLAG (force, FLAG_APPLIED);	2915	SET_FLAG (force, FLAG_APPLIED);
2924	for (at = 0; at < NROFATTACKS; at++)	2916	for (at = 0; at < NROFATTACKS; at++)
2925	if (will_kill_again & (1 << at))	2917	if (will_kill_again & (1 << at))
2926	force->resist[at] = 100;	2918	force->resist[at] = 100;
2927		2919
…		…
3102	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3103	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3104	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3105	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3106	*/	3098	*/
3107
3108	void	3099	void
3109	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3110	{	3101	{
3111	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3112	object *skop;	3103	object *skop;
…		…
3435	/* forces in the treasurelist can alter the player's stats */	3426	/* forces in the treasurelist can alter the player's stats */
3436	object *skin;	3427	object *skin;
3437		3428
3438	/* first get the dragon skin force */	3429	/* first get the dragon skin force */
3439	shstr_cmp dragon_skin_force ("dragon_skin_force");	3430	shstr_cmp dragon_skin_force ("dragon_skin_force");
3440	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3431	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3441	;	3432	;
3442		3433
3443	if (!skin)	3434	if (!skin)
3444	return;	3435	return;
3445		3436
…		…
3493	* not readied.	3484	* not readied.
3494	*/	3485	*/
3495	void	3486	void
3496	player_unready_range_ob (player pl, object ob)	3487	player_unready_range_ob (player pl, object ob)
3497	{	3488	{
3498	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3489	if (pl->ob->current_weapon == ob)
		3490	pl->ob->current_weapon = 0;
		3491
		3492	if (pl->combat_ob == ob)
		3493	pl->combat_ob = 0;
		3494
3499	if (pl->ranges[i] == ob)	3495	if (pl->ranged_ob == ob)
3500	{
3501	pl->ranges[i] = 0;	3496	pl->ranged_ob = 0;
3502	if (pl->shoottype == i)
3503	pl->shoottype = range_none;
3504	}
3505	}	3497	}
3506		3498
3507	sint8	3499	sint8
3508	player::visibility_at (maptile *map, int x, int y) const	3500	player::visibility_at (maptile *map, int x, int y) const
3509	{	3501	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.114 by root, Wed Apr 25 18:47:51 2007 UTC vs. Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.114 by root, Wed Apr 25 18:47:51 2007 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC