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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.107 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

…		…
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author 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>
…		…
124	continue;	123	continue;
125		124
126	if (*buf == '%')	125	if (*buf == '%')
127	{ /* send one news */	126	{ /* send one news */
128	if (size > 0)	127	if (size > 0)
129	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /send previously read news /	128	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char )"%s\n%s", subject, news); /send previously read news */
130		129
131	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
132	strip_endline (subject);	131	strip_endline (subject);
133	size = 0;	132	size = 0;
134	news[0] = '\0';	133	news[0] = '\0';
…		…
144	size += strlen (buf);	143	size += strlen (buf);
145	}	144	}
146	}	145	}
147		146
148	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
151	}	150	}
152		151
153	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
154	static void	153	static void
155	set_first_map (object *op)	154	set_first_map (object *op)
156	{	155	{
157	op->contr->maplevel = first_map_path;	156	op->contr->maplevel = first_map_path;
158	op->x = -1;	157	op->x = -1;
159	op->y = -1;	158	op->y = -1;
160	}
161
162	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	}	159	}
174		160
175	void	161	void
176	player::activate ()	162	player::activate ()
177	{	163	{
…		…
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	{
…		…
194	return;	179	return;
195		180
196	terminate_all_pets (ob);	181	terminate_all_pets (ob);
197	remove_friendly_object (ob);	182	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
199	maplevel = ob->map->path;	186	maplevel = ob->map->path;
		187
200	ob->remove ();	188	ob->remove ();
201	ob->map = 0;	189	ob->map = 0;
202	party = 0;	190	party = 0;
203		191
204	// 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
205	ranges [range_skill] = 0;
206		193
207	players.erase (this);	194	players.erase (this);
208	}	195	}
209		196
210	// connect the player with a specific client	197	// connect the player with a specific client
211	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
212	void	199	void
213	player::connect (client *ns)	200	player::connect (client *ns)
214	{	201	{
215	this->ns = ns;	202	this->ns = ns;
216	ns->pl = this;	203	ns->pl = this;
…		…
227	ns->reset_stats ();	214	ns->reset_stats ();
228		215
229	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
230	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
231	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
232
233	if (!legal_range (ob, shoottype))
234	shoottype = range_none;
235		219
236	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
237	link_player_skills (ob);	221	link_player_skills (ob);
238		222
239	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
…		…
260		244
261	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262		246
263	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
264		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);
265	ob->update_stats ();	274	ob->update_stats ();
		275
266	ns->floorbox_update ();	276	ns->floorbox_update ();
267
268	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
269	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
270		279
271	activate ();	280	activate ();
272		281
…		…
288		297
289	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
290		299
291	ns->reset_stats ();	300	ns->reset_stats ();
292	ns->pl = 0;	301	ns->pl = 0;
293	this->ns = 0;	302	ns = 0;
294	}	303	}
295		304
296	if (ob)	305	if (ob)
297	ob->close_container (); //TODO: client-specific	306	ob->close_container (); //TODO: client-specific
298		307
…		…
305	player::set_object (object *op)	314	player::set_object (object *op)
306	{	315	{
307	ob = op;	316	ob = op;
308	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
309		318
310	ob->speed_left = 0.5;
311	ob->speed = 1.0;	319	ob->speed = 1.0f;
		320	ob->speed_left = 0.5f;
		321
312	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
313	}	323	}
314		324
315	player::player ()	325	player::player ()
316	{	326	{
317	/* There are some elements we want initialised to non zero value -	327	/* There are some elements we want initialised to non zero value -
318	* we deal with that below this point.	328	* we deal with that below this point.
319	*/	329	*/
320	outputs_sync = 16; /* Every 2 seconds */	330	outputs_sync = 4;
321	outputs_count = 8; /* Keeps present behaviour */	331	outputs_count = 4;
322	unapply = unapply_nochoice;	332	unapply = unapply_nochoice;
323		333
324	savebed_map = first_map_path; /* Init. respawn position */	334	savebed_map = first_map_path; /* Init. respawn position */
325		335
326	gen_sp_armour = 10;	336	gen_sp_armour = 10;
327	shoottype = range_none;
328	bowtype = bow_normal;	337	bowtype = bow_normal;
329	petmode = pet_normal;	338	petmode = pet_normal;
330	listening = 10;	339	listening = 10;
331	usekeys = containers;	340	usekeys = containers;
332	peaceful = 1; /* default peaceful */	341	peaceful = 1; /* default peaceful */
333	do_los = 1;	342	do_los = 1;
		343
		344	weapon_sp = 1.0f;
		345	weapon_sp_left = 0.5f;
334	}	346	}
335		347
336	void	348	void
337	player::do_destroy ()	349	player::do_destroy ()
338	{	350	{
…		…
771	}	783	}
772		784
773	void	785	void
774	object::roll_stats ()	786	object::roll_stats ()
775	{	787	{
776	int statsort [7];	788	int statsort [NUM_STATS];
777		789
778	for (;;)	790	for (;;)
779	{	791	{
780	int sum = 0;	792	int sum = 0;
781	for (int i = 7; i--; )	793	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	794	sum += statsort [i] = roll_stat ();
783		795
784	if (sum >= 82 && sum <= 116)	796	if (sum >= 82 && sum <= 116)
785	break;	797	break;
786	}	798	}
787		799
788	// Sort the stats so that rerolling is easier...	800	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	801	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		802
		803	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	804	stats.stat (i) = statsort [i];
792	stats.Dex = statsort[1];
793	stats.Con = statsort[2];
794	stats.Int = statsort[3];
795	stats.Wis = statsort[4];
796	stats.Pow = statsort[5];
797	stats.Cha = statsort[6];
798		805
799	stats.exp = 0;	806	stats.exp = 0;
800	stats.ac = 0;	807	stats.ac = 0;
801		808
802	stats.hp = stats.maxhp;	809	stats.hp = stats.maxhp;
…		…
814	}	821	}
815		822
816	void	823	void
817	object::swap_stats (int a, int b)	824	object::swap_stats (int a, int b)
818	{	825	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	826	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
820	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
821	set_attr_value (&contr->orig_stats, b, tmp);
822		827
		828	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	829	stats.stat (i) = contr->orig_stats.stat (i);
824	stats.Dex = contr->orig_stats.Dex;
825	stats.Con = contr->orig_stats.Con;
826	stats.Int = contr->orig_stats.Int;
827	stats.Wis = contr->orig_stats.Wis;
828	stats.Pow = contr->orig_stats.Pow;
829	stats.Cha = contr->orig_stats.Cha;
830		830
831	//TODO: the following code looks so borked and should, at the very least,	831	//TODO: the following code looks so borked and should, at the very least,
832	// be merged with the similar code in roll_stats	832	// be merged with the similar code in roll_stats
833	stats.ac = 0;	833	stats.ac = 0;
834		834
…		…
865	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
867	* separate race and class; this actually changes the RACE,	867	* separate race and class; this actually changes the RACE,
868	* not the class.	868	* not the class.
869	*/	869	*/
870	int	870	void
871	key_change_class (object *op, char key)	871	player::chargen_race_done ()
872	{	872	{
873	int tmp_loop;
874
875	if (key == 'd' \|\| key == 'D')
876	{
877	char buf[MAX_BUF];
878
879	/* this must before then initial items are given */	873	/* this must before then initial items are given */
880	esrv_new_player (op->contr, op->weight + op->carrying);	874	esrv_new_player (ob->contr, ob->weight + ob->carrying);
881		875
882	treasurelist *tl = find_treasurelist ("starting_wealth");	876	treasurelist *tl = treasurelist::find ("starting_wealth");
883	if (tl)	877	if (tl)
884	create_treasure (tl, op, 0, 0, 0);	878	create_treasure (tl, ob, 0, 0, 0);
885		879
886	INVOKE_PLAYER (BIRTH, op->contr);	880	INVOKE_PLAYER (BIRTH, ob->contr);
887	INVOKE_PLAYER (LOGIN, op->contr);	881	INVOKE_PLAYER (LOGIN, ob->contr);
888		882
889	op->contr->ns->state = ST_PLAYING;	883	ob->contr->ns->state = ST_PLAYING;
890		884
891	if (op->msg)	885	if (ob->msg)
892	op->msg = NULL;	886	ob->msg = 0;
893		887
894	/* We create this now because some of the unique maps will need it	888	/* We create this now because some of the unique maps will need it
895	* to save here.	889	* to save here.
896	*/	890	*/
		891	{
		892	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	893	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);	894	make_path_to_file (buf);
		895	}
899		896
900	start_info (op);	897	start_info (ob);
901	CLEAR_FLAG (op, FLAG_WIZ);	898	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (op, op->randomitems);	899	give_initial_items (ob, ob->randomitems);
903	link_player_skills (op);	900	link_player_skills (ob);
904	esrv_send_inventory (op, op);	901	esrv_send_inventory (ob, ob);
905	op->update_stats ();	902	ob->update_stats ();
906		903
907	/* This moves the player to a different start map, if there	904	/* This moves the player to a different start map, if there
908	* is one for this race	905	* is one for this race
909	*/	906	*/
910	if (*first_map_ext_path)	907	if (*first_map_ext_path)
911	{	908	{
912	object *tmp;	909	object *tmp;
913	char mapname[MAX_BUF];	910	char mapname[MAX_BUF];
914		911
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
916	tmp = object::create ();	913	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	914	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = op->x;	915	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = op->y;	916	EXIT_Y (tmp) = ob->y;
920	op->enter_exit (tmp); /* we don't really care if it succeeded;	917	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the	918	* if the map isn't there, then stay on the
922	* default initial map */	919	* default initial map */
923	tmp->destroy ();	920	tmp->destroy ();
924	}	921	}
925	else	922	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	923	LOG (llevDebug, "first_map_ext_path not set\n");
		924	}
927		925
928	return 0;	926	void
929	}	927	player::chargen_race_next ()
930		928	{
931	/* Following actually changes the race - this is the default command	929	/* Following actually changes the race - this is the default command
932	* if we don't match with one of the options above.	930	* if we don't match with one of the options above.
933	*/	931	*/
934		932
935	tmp_loop = 0;	933	do
936	while (!tmp_loop)
937	{	934	{
938	shstr name = op->name;	935	shstr name = ob->name;
939	int x = op->x, y = op->y;	936	int x = ob->x, y = ob->y;
940		937
941	op->remove_statbonus ();	938	ob->remove_statbonus ();
942	op->remove ();	939	ob->remove ();
943	op->arch = get_player_archetype (op->arch);	940	ob->arch = get_player_archetype (ob->arch);
944	op->arch->clone.copy_to (op);	941	ob->arch->clone.copy_to (ob);
945	op->instantiate ();	942	ob->instantiate ();
946	op->stats = op->contr->orig_stats;	943	ob->stats = ob->contr->orig_stats;
947	op->name = op->name_pl = name;	944	ob->name = ob->name_pl = name;
948	op->x = x;	945	ob->x = x;
949	op->y = y;	946	ob->y = y;
950	SET_ANIMATION (op, 2); /* So player faces south */	947	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (op, op->map, op, 0);	948	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (op->contr->title, op->arch->clone.name);	949	assign (ob->contr->title, ob->arch->clone.name);
953	op->add_statbonus ();	950	ob->add_statbonus ();
954	tmp_loop = allowed_class (op);
955	}	951	}
		952	while (!allowed_class (ob));
956		953
957	update_object (op, UP_OBJ_FACE);	954	update_object (ob, UP_OBJ_FACE);
958	esrv_update_item (UPD_FACE, op, op);	955	esrv_update_item (UPD_FACE, ob, ob);
959	op->update_stats ();	956	ob->update_stats ();
960	op->stats.hp = op->stats.maxhp;	957	ob->stats.hp = ob->stats.maxhp;
961	op->stats.sp = op->stats.maxsp;	958	ob->stats.sp = ob->stats.maxsp;
962	op->stats.grace = 0;	959	ob->stats.grace = 0;
963
964	if (op->msg)
965	new_draw_info (NDI_BLUE, 0, op, op->msg);
966
967	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
968	return 0;
969	}	960	}
970		961
971	void	962	void
972	flee_player (object *op)	963	flee_player (object *op)
973	{	964	{
…		…
1020	/* Cornered, get rid of scared */	1011	/* Cornered, get rid of scared */
1021	CLEAR_FLAG (op, FLAG_SCARED);	1012	CLEAR_FLAG (op, FLAG_SCARED);
1022	op->enemy = NULL;	1013	op->enemy = NULL;
1023	}	1014	}
1024		1015
1025
1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1016	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1027	* IT returns 1 if the player should keep on moving, 0 if he should	1017	* It returns 1 if the player should keep on moving, 0 if he should
1028	* stop.	1018	* stop.
1029	*/	1019	*/
1030	int	1020	int
1031	check_pick (object *op)	1021	check_pick (object *op)
1032	{	1022	{
…		…
1470	* find_better_arrow to find a decent arrow to use.	1460	* find_better_arrow to find a decent arrow to use.
1471	* op = the shooter	1461	* op = the shooter
1472	* type = bow->race	1462	* type = bow->race
1473	* dir = fire direction	1463	* dir = fire direction
1474	*/	1464	*/
1475
1476	object *	1465	object *
1477	pick_arrow_target (object op, const char type, int dir)	1466	pick_arrow_target (object op, const char type, int dir)
1478	{	1467	{
1479	object *tmp = NULL;	1468	object *tmp = NULL;
1480	maptile *m;	1469	maptile *m;
…		…
1545	*/	1534	*/
1546	int	1535	int
1547	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1536	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548	{	1537	{
1549	object left, bow;	1538	object left, bow;
1550	int bowspeed, mflags;	1539	int mflags;
1551	maptile *m;	1540	maptile *m;
1552		1541
1553	if (!dir)	1542	if (!dir)
1554	{	1543	{
1555	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!");
1556	return 0;	1545	return 0;
1557	}	1546	}
1558		1547
1559	if (op->type == PLAYER)	1548	if (op->contr)
1560	bow = op->contr->ranges[range_bow];	1549	bow = op->current_weapon;
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.
…		…
1570	if (!bow)	1559	if (!bow)
1571	{	1560	{
1572	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1561	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573	return 0;	1562	return 0;
1574	}	1563	}
		1564
		1565	// optimisation: move object to top so we will find it quickly again
		1566	if (bow->below)
		1567	{
		1568	bow->remove ();
		1569	op->insert (bow);
		1570	}
		1571
1575	}	1572	}
1576		1573
1577	if (!bow->race \|\| !bow->skill)	1574	if (!bow->race \|\| !bow->skill)
1578	{	1575	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1576	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580	return 0;	1577	return 0;
1581	}	1578	}
1582
1583	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1584
1585	/* penalize ROF for bestarrow */
1586	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1587	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1588
1589	if (bowspeed < 1)
1590	bowspeed = 1;
1591		1579
1592	if (arrow == NULL)	1580	if (arrow == NULL)
1593	{	1581	{
1594	if ((arrow = find_arrow (op, bow->race)) == NULL)	1582	if ((arrow = find_arrow (op, bow->race)) == NULL)
1595	{	1583	{
1596	if (op->type == PLAYER)	1584	if (op->type == PLAYER)
1597	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1585	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1598	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1586	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599	else	1587	else
1600	CLEAR_FLAG (op, FLAG_READY_BOW);	1588	CLEAR_FLAG (op, FLAG_READY_BOW);
		1589
1601	return 0;	1590	return 0;
1602	}	1591	}
1603	}	1592	}
1604		1593
1605	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1594	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1629		1618
1630	arrow->set_owner (op);	1619	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1620	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1621	arrow->direction = dir;
1633		1622
		1623	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1624	arrow->stats.hp = arrow->stats.dam;
		1625	arrow->stats.grace = arrow->attacktype;
		1626
		1627	if (arrow->slaying)
		1628	arrow->spellarg = strdup (arrow->slaying);
		1629
		1630	#if 0
		1631	if (player *pl = op->contr)
		1632	{
		1633	float speed = pl->weapon_sp;
		1634
		1635	/* penalize ROF for bestarrow */
		1636	if (pl->bowtype == bow_bestarrow)
		1637	speed *= .9f;
		1638	else
		1639	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1640
		1641	op->speed_left += speed - op->speed;
		1642	}
		1643	#endif
		1644
		1645	SET_ANIMATION (arrow, arrow->direction);
		1646
		1647	/* update the speed */
		1648	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1649	+ bow->stats.dam / 7.f;
		1650
		1651	arrow->set_speed (max (arrow->speed, 2.f));
		1652	arrow->speed_left = 0;
		1653
		1654	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1655
1634	if (op->type == PLAYER)	1656	if (op->type == PLAYER)
1635	{	1657	{
1636	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1637	op->update_stats ();
1638	}
1639
1640	SET_ANIMATION (arrow, arrow->direction);
1641	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1642	arrow->stats.hp = arrow->stats.dam;
1643	arrow->stats.grace = arrow->attacktype;
1644	if (arrow->slaying != NULL)
1645	arrow->spellarg = strdup (arrow->slaying);
1646
1647	/* Note that this was different for monsters - they got their level
1648	* added to the damage. I think the strength bonus is more proper.
1649	*/
1650
1651	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1652
1653	/* update the speed */
1654	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1655	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1656
1657	arrow->set_speed (max (arrow->speed, 1.0));
1658	arrow->speed_left = 0;
1659
1660	if (op->type == PLAYER)
1661	{
1662	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1663	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1664	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1665
1666	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1658	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1659	wc -= dex_bonus[op->stats.Dex];
		1660
		1661	if (!arrow->slaying)
		1662	arrow->slaying = op->slaying;
		1663
		1664	arrow->attacktype \|= op->attacktype;
1667	}	1665	}
1668	else	1666	else
1669	{	1667	{
1670	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671	arrow->level = op->level;	1668	arrow->level = op->level;
1672	}	1669	arrow->stats.wc -= bow->magic;
1673		1670
1674	if (arrow->attacktype == AT_PHYSICAL)	1671	if (!arrow->slaying)
		1672	arrow->slaying = bow->slaying;
		1673
1675	arrow->attacktype \|= bow->attacktype;	1674	arrow->attacktype \|= bow->attacktype;
		1675	}
1676		1676
1677	if (bow->slaying)	1677	wc -= arrow->level;
1678	arrow->slaying = bow->slaying;	1678	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679		1679
		1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680	arrow->move_type = MOVE_FLY_LOW;	1681	arrow->move_type = MOVE_FLY_LOW;
1681	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1682	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1682		1683
1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1684	m->insert (arrow, sx, sy, op);	1685	m->insert (arrow, sx, sy, op);
…		…
1709	{	1710	{
1710	int ret = 0, wcmod = 0;	1711	int ret = 0, wcmod = 0;
1711		1712
1712	if (op->contr->bowtype == bow_bestarrow)	1713	if (op->contr->bowtype == bow_bestarrow)
1713	{	1714	{
1714	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1715	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715	}	1716	}
1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1717	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717	{	1718	{
1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1719	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719	wcmod = -1;	1720	wcmod = -1;
…		…
1729	else if (op->contr->bowtype == bow_spreadshot)	1730	else if (op->contr->bowtype == bow_spreadshot)
1730	{	1731	{
1731	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1732	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1732	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1733	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1733	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1734	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735	}	1735	}
1736	else	1736	else
1737	{	1737	{
1738	/* Simple case */	1738	/* Simple case */
1739	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);
1740	}	1740	}
		1741
1741	return ret;	1742	return ret;
1742	}	1743	}
1743
1744		1744
1745	/* Fires a misc (wand/rod/horn) object in 'dir'.	1745	/* Fires a misc (wand/rod/horn) object in 'dir'.
1746	* Broken apart from 'fire' to keep it more readable.	1746	* Broken apart from 'fire' to keep it more readable.
1747	*/	1747	*/
1748	void	1748	void
1749	fire_misc_object (object *op, int dir)	1749	fire_misc_object (object *op, int dir)
1750	{	1750	{
1751	object *item;	1751	object *item = op->contr->ranged_ob;
1752		1752
1753	if (!op->contr->ranges[range_misc])	1753	if (!item)
1754	{	1754	{
1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756	return;	1756	return;
1757	}	1757	}
1758		1758
1759	item = op->contr->ranges[range_misc];
1760	if (!item->inv)	1759	if (!item->inv)
1761	{	1760	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1761	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1762	return;
1764	}	1763	}
		1764
		1765	if (!op->change_weapon (item))
		1766	return;
		1767
1765	if (item->type == WAND)	1768	if (item->type == WAND)
1766	{	1769	{
1767	if (item->stats.food <= 0)	1770	if (item->stats.food <= 0)
1768	{	1771	{
1769	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1770	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1774
1771	return;	1775	return;
1772	}	1776	}
1773	}	1777	}
1774	else if (item->type == ROD \|\| item->type == HORN)	1778	else if (item->type == ROD \|\| item->type == HORN)
1775	{	1779	{
1776	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777	{	1781	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1783
1779	if (item->type == ROD)	1784	if (item->type == ROD)
1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781	else	1786	else
1782	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1788
1783	return;	1789	return;
1784	}	1790	}
1785	}	1791	}
1786		1792
1787	if (cast_spell (op, item, dir, item->inv, NULL))	1793	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1809	}	1815	}
1810	}	1816	}
1811		1817
1812	/* Received a fire command for the player - go and do it.	1818	/* Received a fire command for the player - go and do it.
1813	*/	1819	*/
1814	void	1820	bool
1815	fire (object *op, int dir)	1821	fire (object *op, int dir)
1816	{	1822	{
1817	int spellcost = 0;	1823	int spellcost = 0;
1818		1824
1819	/* check for loss of invisiblity/hide */	1825	/* check for loss of invisiblity/hide */
1820	if (action_makes_visible (op))	1826	if (action_makes_visible (op))
1821	make_visible (op);	1827	make_visible (op);
1822		1828
1823	switch (op->contr->shoottype)	1829	player *pl = op->contr;
		1830
		1831	if (pl->golem)
		1832	{
		1833	control_golem (op->contr->golem, dir);
		1834	return false;
1824	{	1835	}
1825	case range_none:
1826	return;
1827		1836
1828	case range_bow:	1837	object *ob = pl->ranged_ob;
		1838
		1839	if (!ob)
		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;
		1849
		1850	switch (ob->type)
		1851	{
		1852	case BOW:
1829	player_fire_bow (op, dir);	1853	player_fire_bow (op, dir);
1830	return;	1854	break;
1831		1855
1832	case range_magic: /* Casting spells */	1856	case SPELL:
1833	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1857	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834	return;	1858	break;
1835		1859
1836	case range_misc:	1860	case BUILDER:
		1861	apply_map_builder (op, dir);
		1862	break;
		1863
		1864	case SKILL:
		1865	do_skill (op, op, ob, dir, 0);
		1866	break;
		1867
		1868	default:
1837	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1838	return;	1870	break;
1839
1840	case range_golem: /* Control summoned monsters from scrolls */
1841	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1842	{
1843	op->contr->ranges[range_golem] = 0;
1844	op->contr->shoottype = range_none;
1845	}
1846	else
1847	control_golem (op->contr->ranges[range_golem], dir);
1848	return;
1849
1850	case range_skill:
1851	if (!op->chosen_skill)
1852	{
1853	if (op->type == PLAYER)
1854	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1855	return;
1856	}
1857
1858	do_skill (op, op, op->chosen_skill, dir, NULL);
1859	return;
1860	case range_builder:
1861	apply_map_builder (op, dir);
1862	return;
1863	default:
1864	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1865	return;
1866	}	1871	}
		1872
		1873	return true;
1867	}	1874	}
1868		1875
1869	/* find_key	1876	/* find_key
1870	* 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
1871	* and successfully use it, we return the key, otherwise NULL	1878	* and successfully use it, we return the key, otherwise NULL
…		…
1958	* 0 otherwise	1965	* 0 otherwise
1959	*/	1966	*/
1960	static int	1967	static int
1961	player_attack_door (object op, object door)	1968	player_attack_door (object op, object door)
1962	{	1969	{
1963	/* 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,
1964	* 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 -
1965	* otherwise, we fall through to the rest of the code.	1972	* otherwise, we fall through to the rest of the code.
1966	*/	1973	*/
1967	object *key = find_key (op, op, door);	1974	object *key = find_key (op, op, door);
1968		1975
1969	/* IF we found a key, do some extra work */	1976	/* If we found a key, do some extra work */
1970	if (key)	1977	if (key)
1971	{	1978	{
1972	object *container = key->env;	1979	object *container = key->env;
1973		1980
1974	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);
		1982
1975	if (action_makes_visible (op))	1983	if (action_makes_visible (op))
1976	make_visible (op);	1984	make_visible (op);
		1985
1977	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1986	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1978	spring_trap (door->inv, op);	1987	spring_trap (door->inv, op);
1979		1988
1980	if (door->type == DOOR)	1989	if (door->type == DOOR)
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1990	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
2007	* It should keep the code cleaner.	2016	* It should keep the code cleaner.
2008	* When this is called, the players direction has been updated	2017	* When this is called, the players direction has been updated
2009	* (taking into account confusion.) The player is also actually	2018	* (taking into account confusion.) The player is also actually
2010	* going to try and move (not fire weapons).	2019	* going to try and move (not fire weapons).
2011	*/	2020	*/
2012	void	2021	bool
2013	move_player_attack (object *op, int dir)	2022	move_player_attack (object *op, int dir)
2014	{	2023	{
2015	object tmp, mon;
2016	sint16 nx, ny;
2017	int on_battleground;	2024	int on_battleground;
2018	maptile *m;
2019		2025
2020	nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2021	ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2022		2028
2023	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	}
2024		2039
2025	/* 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
2026	* 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
2027	* 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
2028	* player. This is a pretty nasty hack, because if we could	2043	* player. This is a pretty nasty hack, because if we could
2029	* 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
2030	* 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
2031	* 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
2032	* move_ob uses.	2047	* move_ob uses.
2033	*/	2048	*/
2034	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2035	{
2036	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2037	{
2038	m = op->map->xy_find (nx, ny);	2049	maptile *m = op->map->xy_find (nx, ny);
2039	if (!m)
2040	return; /* Don't think this should happen */
2041	}
2042	else
2043	m = op->map;
2044		2050
2045	if (!(tmp = m->at (nx, ny).bot))
2046	return;
2047
2048	mon = 0;
2049	/* 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
2050	* 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.
2051	* 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
2052	* on the space	2054	* on the space
2053	*/	2055	*/
2054	while (tmp)	2056	object *mon;
2055	{	2057	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2056	if (tmp == op)	2058	{
2057	{	2059	if ((mon->flag [FLAG_ALIVE]
2058	tmp = tmp->above;	2060	\|\| mon->type == LOCKED_DOOR
2059	continue;	2061	\|\| mon->flag [FLAG_CAN_ROLL])
2060	}
2061
2062	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2063	{
2064	mon = tmp;	2062	&& mon != op)
2065	break;	2063	break;
2066	}	2064	}
2067		2065
2068	if (tmp->type == LOCKED_DOOR \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2069	mon = tmp;
2070
2071	tmp = tmp->above;
2072	}
2073
2074	if (!mon) /* This happens anytime the player tries to move */	2066	if (!mon) /* This happens anytime the player tries to move */
2075	return; /* into a wall */	2067	return false; /* into a wall */
2076		2068
2077	if (mon->head)
2078	mon = mon->head;	2069	mon = mon->head_ ();
2079		2070
2080	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)
2081	if (player_attack_door (op, mon))	2073	if (player_attack_door (op, mon))
		2074	{
		2075	--op->contr->weapon_sp_left;
2082	return;	2076	return true;
		2077	}
2083		2078
2084	/* The following deals with possibly attacking peaceful	2079	/* The following deals with possibly attacking peaceful
2085	* or frienddly creatures. Basically, all players are considered	2080	* or friendly creatures. Basically, all players are considered
2086	* unaggressive. If the moving player has peaceful set, then the	2081	* unaggressive. If the moving player has peaceful set, then the
2087	* object should be pushed instead of attacked. It is assumed that	2082	* object should be pushed instead of attacked. It is assumed that
2088	* if you are braced, you will not attack friends accidently,	2083	* if you are braced, you will not attack friends accidently,
2089	* and thus will not push them.	2084	* and thus will not push them.
2090	*/	2085	*/
2091		2086
2092	/* 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
2093	* peaceful. Our assumption is the creature is a pet if the	2088	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2089	* player owns it and it is either friendly or unagressive.
2095	*/	2090	*/
2096	if ((op->type == PLAYER)	2091	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2092	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2093	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2094	\|\| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2096	{
2106	/* 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 */
2107	if (op->contr->braced)	2098	if (op->contr->braced)
2108	return;	2099	return false;
		2100
		2101	if (op->speed_left > 0.f)
		2102	{
		2103	--op->speed_left;
2109		2104
2110	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);
2111	(void) push_ob (mon, dir, op);	2106	push_ob (mon, dir, op);
		2107
2112	if (op->contr->tmp_invis \|\| op->hide)	2108	if (op->contr->tmp_invis \|\| op->hide)
2113	make_visible (op);	2109	make_visible (op);
2114		2110
2115	return;	2111	return true;
2116	}	2112	}
		2113	else
		2114	return false;
		2115	}
2117		2116
2118	/* in certain circumstances, you shouldn't attack friendly	2117	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2118	* creatures. Note that if you are braced, you can't push
2120	* 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
2121	* attack them either.	2120	* attack them either.
2122	*/	2121	*/
2123	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2122	if ((mon->type == PLAYER \|\| mon->enemy != op)
2124	(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))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2124	&& ((op->contr->peaceful
2127	\|\| (mon->type == PLAYER	2125	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2126	&& !on_battleground))
		2127	{
		2128	if (op->speed_left > 0.f)
2134	{	2129	{
		2130	--op->speed_left;
		2131
2135	if (!op->contr->braced)	2132	if (!op->contr->braced)
2136	{	2133	{
2137	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);
2138	push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2139	}	2136	}
2140	else	2137	else
2141	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2142		2139
2143	if (op->contr->tmp_invis \|\| op->hide)	2140	if (op->contr->tmp_invis \|\| op->hide)
2144	make_visible (op);	2141	make_visible (op);
2145	}
2146		2142
		2143	return true;
		2144	}
		2145	}
2147	/* If the object is a boulder or other rollable object, then	2146	/* If the object is a boulder or other rollable object, then
2148	* 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.
2149	*/	2148	*/
2150	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)
2151	{	2152	{
		2153	--op->speed_left;
		2154
2152	recursive_roll (mon, dir, op);	2155	recursive_roll (mon, dir, op);
2153	if (action_makes_visible (op))	2156	if (action_makes_visible (op))
2154	make_visible (op);	2157	make_visible (op);
2155	}
2156		2158
		2159	return true;
		2160	}
		2161	}
2157	/* Any generic living creature. Including things like doors.	2162	/* Any generic living creature. Including things like doors.
2158	* 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
2159	* and be living. Then, it must be one of the following:	2164	* and be living. Then, it must be one of the following:
2160	* 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
2161	* 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.
2162	*/	2167	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2164	((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)))
2165	{	2170	{
2166		2171	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2167	/* If the player hasn't hit something this tick, and does
2168	* so, give them speed boost based on weapon speed. Doing
2169	* it here is better than process_players2, which basically
2170	* incurred a 1 tick offset.
2171	*/
2172	if (!op->contr->has_hit)
2173	{	2172	{
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2173	--op->contr->weapon_sp_left;
2175
2176	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2177	}
2178		2174
2179	skill_attack (mon, op, 0, 0, 0);	2175	skill_attack (mon, op, 0, 0, 0);
2180
2181	/* If attacking another player, that player gets automatic
2182	* hitback, and doesn't loose luck either.
2183	* Disable hitback on the battleground or if the target is
2184	* the wiz.
2185	*/
2186	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2187	{
2188	short luck = mon->stats.luck;
2189
2190	mon->contr->has_hit = 1;
2191	skill_attack (op, mon, 0, 0, 0);
2192	mon->stats.luck = luck;
2193	}
2194		2176
2195	if (action_makes_visible (op))	2177	if (action_makes_visible (op))
2196	make_visible (op);	2178	make_visible (op);
2197	}
2198	} /* if player should attack something */
2199	}
2200		2179
2201	int	2180	return true;
		2181	}
		2182	}
		2183
		2184	return false;
		2185	}
		2186
		2187	bool
2202	move_player (object *op, int dir)	2188	move_player (object *op, int dir)
2203	{	2189	{
2204	int pick;	2190	int pick;
2205		2191
2206	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2192	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2220	op->facing = dir;	2206	op->facing = dir;
2221		2207
2222	if (op->hide)	2208	if (op->hide)
2223	do_hidden_move (op);	2209	do_hidden_move (op);
2224		2210
		2211	bool retval;
		2212
2225	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2213	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2226	/nop / ;	2214	retval = RESULT_INT (0);
2227	else if (op->contr->fire_on)	2215	else if (op->contr->fire_on)
2228	fire (op, dir);	2216	retval = fire (op, dir);
2229	else	2217	else
2230	{	2218	{
2231	move_player_attack (op, dir);	2219	retval = move_player_attack (op, dir);
2232	pick = check_pick (op);	2220	pick = check_pick (op);
2233	}	2221	}
2234		2222
2235	/* 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
2236	* server can handle repeat firing.	2224	* server can handle repeat firing.
…		…
2243	/* Update how the player looks. Use the facing, so direction may	2231	/* Update how the player looks. Use the facing, so direction may
2244	* get reset to zero. This allows for full animation capabilities	2232	* get reset to zero. This allows for full animation capabilities
2245	* for players.	2233	* for players.
2246	*/	2234	*/
2247	animate_object (op, op->facing);	2235	animate_object (op, op->facing);
2248	return 0;	2236
		2237	return retval;
2249	}	2238	}
2250		2239
2251	/* 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
2252	* new client/server stuff.	2241	* new client/server stuff.
2253	* 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
2254	* the new speed values for commands.	2243	* the new speed values for commands.
2255	*	2244	*
2256	* 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.
2257	*/	2248	*/
2258	int	2249	bool
2259	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2260	{	2251	{
2261	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2262	{	2253	{
2263	flee_player (op);	2254	if (op->speed_left > 0.f)
2264	/* If player is still scared, that is his action for this tick */
2265	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2255	{
2267	op->speed_left--;	2256	--op->speed_left;
		2257	flee_player (op);
		2258
2268	return 0;	2259	return true;
2269	}	2260	}
		2261	else
		2262	return false;
2270	}	2263	}
2271
2272	/* I've been seeing crashes where the golem has been destroyed, but
2273	* the player object still points to the defunct golem. The code that
2274	* destroys the golem looks correct, and it doesn't always happen, so
2275	* put this in a a workaround to clean up the golem pointer.
2276	*/
2277	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2278	op->contr->ranges[range_golem] = 0;
2279		2264
2280	/* 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
2281	* the players time has been increased when doericserver has been	2266	* the players time has been increased when doericserver has been
2282	* called, so we recheck it here.	2267	* called, so we recheck it here.
2283	*/	2268	*/
2284	if (op->contr->ns->handle_command ())	2269	if (op->contr->ns->handle_command ())
2285	return 1;	2270	return true;
2286		2271
2287	if (op->speed_left > 0)
2288	{
2289	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2272	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2290	{
2291	/* All move commands take 1 tick, at least for now */
2292	op->speed_left--;
2293
2294	/* Instead of all the stuff below, let move_player take care
2295	* of it. Also, some of the skill stuff is only put in
2296	* there, as well as the confusion stuff.
2297	*/
2298	move_player (op, op->direction);	2273	return move_player (op, op->direction);
2299		2274
2300	return op->speed_left > 0;
2301	}
2302	}
2303
2304	return 0;	2275	return false;
2305	}	2276	}
2306		2277
2307	int	2278	int
2308	save_life (object *op)	2279	save_life (object *op)
2309	{	2280	{
…		…
2438	make_visible (op);	2409	make_visible (op);
2439	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2410	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440	}	2411	}
2441	}	2412	}
2442		2413
2443	if (op->contr->outputs_sync)
2444	{
2445	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2446	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2447	flush_output_element (op, &op->contr->outputs[i]);
2448	}
2449
2450	if (op->contr->ns->state == ST_PLAYING)	2414	if (op->contr->ns->state == ST_PLAYING)
2451	{	2415	{
2452	/* these next three if clauses make it possible to SLOW DOWN	2416	/* these next three if clauses make it possible to SLOW DOWN
2453	hp/grace/spellpoint regeneration. */	2417	hp/grace/spellpoint regeneration. */
2454	if (op->contr->gen_hp >= 0)	2418	if (op->contr->gen_hp >= 0)
…		…
2474	gen_grace = op->stats.maxgrace;	2438	gen_grace = op->stats.maxgrace;
2475	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476	}	2440	}
2477		2441
2478	/* Regenerate Spell Points */	2442	/* Regenerate Spell Points */
2479	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2443	if (!op->contr->golem && --op->last_sp < 0)
2480	{	2444	{
2481	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2445	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2482	if (op->stats.sp < op->stats.maxsp)	2446	if (op->stats.sp < op->stats.maxsp)
2483	{	2447	{
2484	op->stats.sp++;	2448	op->stats.sp++;
…		…
2582	}	2546	}
2583		2547
2584	/* Digestion */	2548	/* Digestion */
2585	if (--op->last_eat < 0)	2549	if (--op->last_eat < 0)
2586	{	2550	{
2587	#ifdef COZY_SERVER
2588	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2589	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2590	#else
2591	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;
2592	#endif
2593		2552
2594	if (op->contr->gen_hp > 0)	2553	if (op->contr->gen_hp > 0)
2595	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);
2596	else	2555	else
2597	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2909	op->stats.hp = op->stats.maxhp;	2868	op->stats.hp = op->stats.maxhp;
2910	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2869	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2911	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2870	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2912		2871
2913	/*	2872	/*
2914	* Check to see if the player is in a shop. IF so, then check to see if
2915	* the player has any unpaid items. If so, remove them and put them back	2873	* Check to see if the player has any unpaid items. If so, remove them
2916	* in the map.	2874	* and put them back in the map.
2917	*/	2875	*/
2918
2919	if (is_in_shop (op))
2920	remove_unpaid_objects (op->inv, op);	2876	remove_unpaid_objects (op->inv, op);
2921		2877
2922	/****************************************/	2878	/****************************************/
2923	/* */	2879	/* */
2924	/* Move player to his current respawn- */	2880	/* Move player to his current respawn- */
2925	/* position (usually last savebed) */	2881	/* position (usually last savebed) */
…		…
2945	object *force;	2901	object *force;
2946	int at;	2902	int at;
2947		2903
2948	force = get_archetype (FORCE_NAME);	2904	force = get_archetype (FORCE_NAME);
2949	/* 50 ticks should be enough time for the spell to abate */	2905	/* 50 ticks should be enough time for the spell to abate */
2950	force->speed = 0.1;	2906	force->speed = 0.1f;
2951	force->speed_left = -5.0;	2907	force->speed_left = -5.f;
2952	SET_FLAG (force, FLAG_APPLIED);	2908	SET_FLAG (force, FLAG_APPLIED);
2953	for (at = 0; at < NROFATTACKS; at++)	2909	for (at = 0; at < NROFATTACKS; at++)
2954	if (will_kill_again & (1 << at))	2910	if (will_kill_again & (1 << at))
2955	force->resist[at] = 100;	2911	force->resist[at] = 100;
2956		2912
…		…
3131	/* For Hidden creatures - a chance of becoming 'unhidden'	3087	/* For Hidden creatures - a chance of becoming 'unhidden'
3132	* every time they move - as we subtract off 'invisibility'	3088	* every time they move - as we subtract off 'invisibility'
3133	* AND, for players, if they move into a ridiculously unhideable	3089	* AND, for players, if they move into a ridiculously unhideable
3134	* spot (surrounded by clear terrain in broad daylight). -b.t.	3090	* spot (surrounded by clear terrain in broad daylight). -b.t.
3135	*/	3091	*/
3136
3137	void	3092	void
3138	do_hidden_move (object *op)	3093	do_hidden_move (object *op)
3139	{	3094	{
3140	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3141	object *skop;	3096	object *skop;
…		…
3374	char buf[MAX_BUF]; /* tmp. string buffer */	3329	char buf[MAX_BUF]; /* tmp. string buffer */
3375	int i = 0, j = 0;	3330	int i = 0, j = 0;
3376		3331
3377	/* get the appropriate treasurelist */	3332	/* get the appropriate treasurelist */
3378	if (atnr == ATNR_FIRE)	3333	if (atnr == ATNR_FIRE)
3379	trlist = find_treasurelist ("dragon_ability_fire");	3334	trlist = treasurelist::find ("dragon_ability_fire");
3380	else if (atnr == ATNR_COLD)	3335	else if (atnr == ATNR_COLD)
3381	trlist = find_treasurelist ("dragon_ability_cold");	3336	trlist = treasurelist::find ("dragon_ability_cold");
3382	else if (atnr == ATNR_ELECTRICITY)	3337	else if (atnr == ATNR_ELECTRICITY)
3383	trlist = find_treasurelist ("dragon_ability_elec");	3338	trlist = treasurelist::find ("dragon_ability_elec");
3384	else if (atnr == ATNR_POISON)	3339	else if (atnr == ATNR_POISON)
3385	trlist = find_treasurelist ("dragon_ability_poison");	3340	trlist = treasurelist::find ("dragon_ability_poison");
3386		3341
3387	if (trlist == NULL \|\| who->type != PLAYER)	3342	if (trlist == NULL \|\| who->type != PLAYER)
3388	return;	3343	return;
3389		3344
3390	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3345	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3522	* not readied.	3477	* not readied.
3523	*/	3478	*/
3524	void	3479	void
3525	player_unready_range_ob (player pl, object ob)	3480	player_unready_range_ob (player pl, object ob)
3526	{	3481	{
3527	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
		3484
		3485	if (pl->combat_ob == ob)
		3486	pl->combat_ob = 0;
		3487
3528	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3529	{
3530	pl->ranges[i] = 0;	3489	pl->ranged_ob = 0;
3531	if (pl->shoottype == i)
3532	pl->shoottype = range_none;
3533	}
3534	}	3490	}
3535		3491
3536	sint8	3492	sint8
3537	player::visibility_at (maptile *map, int x, int y) const	3493	player::visibility_at (maptile *map, int x, int y) const
3538	{	3494	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.107 by root, Wed Mar 14 04:12:29 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.107 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC