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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC vs.
Revision 1.138 by root, Thu May 17 20:27:01 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);
		150	}
		151
		152	float
		153	player::weapon_speed () const
		154	{
		155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
151	}	156	}
152		157
153	/* This loads the first map an puts the player on it. */	158	/* This loads the first map an puts the player on it. */
154	static void	159	static void
155	set_first_map (object *op)	160	set_first_map (object *op)
…		…
194	return;	199	return;
195		200
196	terminate_all_pets (ob);	201	terminate_all_pets (ob);
197	remove_friendly_object (ob);	202	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	203	ob->deactivate_recursive ();
		204
		205	if (ob->map)
199	maplevel = ob->map->path;	206	maplevel = ob->map->path;
		207
200	ob->remove ();	208	ob->remove ();
201	ob->map = 0;	209	ob->map = 0;
202	party = 0;	210	party = 0;
203		211
204	// for weird reasons, this is often "ob", keeping a circular reference	212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
205	ranges [range_skill] = 0;
206		213
207	players.erase (this);	214	players.erase (this);
208	}	215	}
209		216
210	// connect the player with a specific client	217	// connect the player with a specific client
211	// also changed, rationalises, and fixes some incorrect settings	218	// also changes, rationalises, and fixes some incorrect settings
212	void	219	void
213	player::connect (client *ns)	220	player::connect (client *ns)
214	{	221	{
215	this->ns = ns;	222	this->ns = ns;
216	ns->pl = this;	223	ns->pl = this;
…		…
227	ns->reset_stats ();	234	ns->reset_stats ();
228		235
229	/* make sure he's a player -- needed because of class change. */	236	/* make sure he's a player -- needed because of class change. */
230	ob->type = PLAYER; // we are paranoid	237	ob->type = PLAYER; // we are paranoid
231	ob->race = ob->arch->clone.race;	238	ob->race = ob->arch->clone.race;
232
233	if (!legal_range (ob, shoottype))
234	shoottype = range_none;
235		239
236	ob->carrying = sum_weight (ob);	240	ob->carrying = sum_weight (ob);
237	link_player_skills (ob);	241	link_player_skills (ob);
238		242
239	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
…		…
260		264
261	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262		266
263	esrv_new_player (this, ob->weight + ob->carrying);	267	esrv_new_player (this, ob->weight + ob->carrying);
264		268
		269	for (object *op = ob->inv; op; op = op->below)
		270	if (op->flag [FLAG_APPLIED])
		271	switch (op->type)
		272	{
		273	case WAND:
		274	case ROD:
		275	case HORN:
		276	case BOW:
		277	case SKILL_TOOL:
		278	case WEAPON:
		279	op->flag [FLAG_APPLIED] = false;
		280	apply_special (ob, op, AP_APPLY);
		281	break;
		282	}
		283
265	ob->update_stats ();	284	ob->update_stats ();
266	ns->floorbox_update ();	285	ns->floorbox_update ();
267		286
268	esrv_send_inventory (ob, ob);	287	esrv_send_inventory (ob, ob);
269	esrv_add_spells (this, 0);	288	esrv_add_spells (this, 0);
…		…
288		307
289	INVOKE_PLAYER (DISCONNECT, this);	308	INVOKE_PLAYER (DISCONNECT, this);
290		309
291	ns->reset_stats ();	310	ns->reset_stats ();
292	ns->pl = 0;	311	ns->pl = 0;
293	this->ns = 0;	312	ns = 0;
294	}	313	}
295		314
296	if (ob)	315	if (ob)
297	ob->close_container (); //TODO: client-specific	316	ob->close_container (); //TODO: client-specific
298		317
…		…
305	player::set_object (object *op)	324	player::set_object (object *op)
306	{	325	{
307	ob = op;	326	ob = op;
308	ob->contr = this; /* this aren't yet in archetype */	327	ob->contr = this; /* this aren't yet in archetype */
309		328
310	ob->speed_left = 0.5;	329	ob->speed_left = 0.5f;
311	ob->speed = 1.0;	330	ob->speed = 1.0f;
312	ob->direction = 5; /* So player faces south */	331	ob->direction = 5; /* So player faces south */
313	}	332	}
314		333
315	player::player ()	334	player::player ()
316	{	335	{
317	/* There are some elements we want initialised to non zero value -	336	/* There are some elements we want initialised to non zero value -
318	* we deal with that below this point.	337	* we deal with that below this point.
319	*/	338	*/
320	outputs_sync = 16; /* Every 2 seconds */	339	outputs_sync = 4;
321	outputs_count = 8; /* Keeps present behaviour */	340	outputs_count = 4;
322	unapply = unapply_nochoice;	341	unapply = unapply_nochoice;
323		342
324	savebed_map = first_map_path; /* Init. respawn position */	343	savebed_map = first_map_path; /* Init. respawn position */
325		344
326	gen_sp_armour = 10;	345	gen_sp_armour = 10;
327	shoottype = range_none;
328	bowtype = bow_normal;	346	bowtype = bow_normal;
329	petmode = pet_normal;	347	petmode = pet_normal;
330	listening = 10;	348	listening = 10;
331	usekeys = containers;	349	usekeys = containers;
332	peaceful = 1; /* default peaceful */	350	peaceful = 1; /* default peaceful */
…		…
771	}	789	}
772		790
773	void	791	void
774	object::roll_stats ()	792	object::roll_stats ()
775	{	793	{
776	int statsort [7];	794	int statsort [NUM_STATS];
777		795
778	for (;;)	796	for (;;)
779	{	797	{
780	int sum = 0;	798	int sum = 0;
781	for (int i = 7; i--; )	799	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	800	sum += statsort [i] = roll_stat ();
783		801
784	if (sum >= 82 && sum <= 116)	802	if (sum >= 82 && sum <= 116)
785	break;	803	break;
786	}	804	}
787		805
788	// Sort the stats so that rerolling is easier...	806	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	807	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		808
		809	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	810	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		811
799	stats.exp = 0;	812	stats.exp = 0;
800	stats.ac = 0;	813	stats.ac = 0;
801		814
802	stats.hp = stats.maxhp;	815	stats.hp = stats.maxhp;
…		…
814	}	827	}
815		828
816	void	829	void
817	object::swap_stats (int a, int b)	830	object::swap_stats (int a, int b)
818	{	831	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	832	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		833
		834	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	835	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		836
831	//TODO: the following code looks so borked and should, at the very least,	837	//TODO: the following code looks so borked and should, at the very least,
832	// be merged with the similar code in roll_stats	838	// be merged with the similar code in roll_stats
833	stats.ac = 0;	839	stats.ac = 0;
834		840
…		…
865	* appropriate action with it (change race, or other things).	871	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	872	* The function name is for historical reasons - now we have
867	* separate race and class; this actually changes the RACE,	873	* separate race and class; this actually changes the RACE,
868	* not the class.	874	* not the class.
869	*/	875	*/
870	int	876	void
871	key_change_class (object *op, char key)	877	player::chargen_race_done ()
872	{	878	{
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 */	879	/* this must before then initial items are given */
880	esrv_new_player (op->contr, op->weight + op->carrying);	880	esrv_new_player (ob->contr, ob->weight + ob->carrying);
881		881
882	treasurelist *tl = find_treasurelist ("starting_wealth");	882	treasurelist *tl = treasurelist::find ("starting_wealth");
883	if (tl)	883	if (tl)
884	create_treasure (tl, op, 0, 0, 0);	884	create_treasure (tl, ob, 0, 0, 0);
885		885
886	INVOKE_PLAYER (BIRTH, op->contr);	886	INVOKE_PLAYER (BIRTH, ob->contr);
887	INVOKE_PLAYER (LOGIN, op->contr);	887	INVOKE_PLAYER (LOGIN, ob->contr);
888		888
889	op->contr->ns->state = ST_PLAYING;	889	ob->contr->ns->state = ST_PLAYING;
890		890
891	if (op->msg)	891	if (ob->msg)
892	op->msg = NULL;	892	ob->msg = 0;
893		893
894	/* We create this now because some of the unique maps will need it	894	/* We create this now because some of the unique maps will need it
895	* to save here.	895	* to save here.
896	*/	896	*/
		897	{
		898	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	899	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);	900	make_path_to_file (buf);
		901	}
899		902
900	start_info (op);	903	start_info (ob);
901	CLEAR_FLAG (op, FLAG_WIZ);	904	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (op, op->randomitems);	905	give_initial_items (ob, ob->randomitems);
903	link_player_skills (op);	906	link_player_skills (ob);
904	esrv_send_inventory (op, op);	907	esrv_send_inventory (ob, ob);
905	op->update_stats ();	908	ob->update_stats ();
906		909
907	/* This moves the player to a different start map, if there	910	/* This moves the player to a different start map, if there
908	* is one for this race	911	* is one for this race
909	*/	912	*/
910	if (*first_map_ext_path)	913	if (*first_map_ext_path)
911	{	914	{
912	object *tmp;	915	object *tmp;
913	char mapname[MAX_BUF];	916	char mapname[MAX_BUF];
914		917
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	918	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
916	tmp = object::create ();	919	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	920	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = op->x;	921	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = op->y;	922	EXIT_Y (tmp) = ob->y;
920	op->enter_exit (tmp); /* we don't really care if it succeeded;	923	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the	924	* if the map isn't there, then stay on the
922	* default initial map */	925	* default initial map */
923	tmp->destroy ();	926	tmp->destroy ();
924	}	927	}
925	else	928	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	929	LOG (llevDebug, "first_map_ext_path not set\n");
		930	}
927		931
928	return 0;	932	void
929	}	933	player::chargen_race_next ()
930		934	{
931	/* Following actually changes the race - this is the default command	935	/* Following actually changes the race - this is the default command
932	* if we don't match with one of the options above.	936	* if we don't match with one of the options above.
933	*/	937	*/
934		938
935	tmp_loop = 0;	939	do
936	while (!tmp_loop)
937	{	940	{
938	shstr name = op->name;	941	shstr name = ob->name;
939	int x = op->x, y = op->y;	942	int x = ob->x, y = ob->y;
940		943
941	op->remove_statbonus ();	944	ob->remove_statbonus ();
942	op->remove ();	945	ob->remove ();
943	op->arch = get_player_archetype (op->arch);	946	ob->arch = get_player_archetype (ob->arch);
944	op->arch->clone.copy_to (op);	947	ob->arch->clone.copy_to (ob);
945	op->instantiate ();	948	ob->instantiate ();
946	op->stats = op->contr->orig_stats;	949	ob->stats = ob->contr->orig_stats;
947	op->name = op->name_pl = name;	950	ob->name = ob->name_pl = name;
948	op->x = x;	951	ob->x = x;
949	op->y = y;	952	ob->y = y;
950	SET_ANIMATION (op, 2); /* So player faces south */	953	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (op, op->map, op, 0);	954	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (op->contr->title, op->arch->clone.name);	955	assign (ob->contr->title, ob->arch->clone.name);
953	op->add_statbonus ();	956	ob->add_statbonus ();
954	tmp_loop = allowed_class (op);
955	}	957	}
		958	while (!allowed_class (ob));
956		959
957	update_object (op, UP_OBJ_FACE);	960	update_object (ob, UP_OBJ_FACE);
958	esrv_update_item (UPD_FACE, op, op);	961	esrv_update_item (UPD_FACE, ob, ob);
959	op->update_stats ();	962	ob->update_stats ();
960	op->stats.hp = op->stats.maxhp;	963	ob->stats.hp = ob->stats.maxhp;
961	op->stats.sp = op->stats.maxsp;	964	ob->stats.sp = ob->stats.maxsp;
962	op->stats.grace = 0;	965	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	}	966	}
970		967
971	void	968	void
972	flee_player (object *op)	969	flee_player (object *op)
973	{	970	{
…		…
1020	/* Cornered, get rid of scared */	1017	/* Cornered, get rid of scared */
1021	CLEAR_FLAG (op, FLAG_SCARED);	1018	CLEAR_FLAG (op, FLAG_SCARED);
1022	op->enemy = NULL;	1019	op->enemy = NULL;
1023	}	1020	}
1024		1021
1025
1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1022	/* 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	1023	* It returns 1 if the player should keep on moving, 0 if he should
1028	* stop.	1024	* stop.
1029	*/	1025	*/
1030	int	1026	int
1031	check_pick (object *op)	1027	check_pick (object *op)
1032	{	1028	{
…		…
1470	* find_better_arrow to find a decent arrow to use.	1466	* find_better_arrow to find a decent arrow to use.
1471	* op = the shooter	1467	* op = the shooter
1472	* type = bow->race	1468	* type = bow->race
1473	* dir = fire direction	1469	* dir = fire direction
1474	*/	1470	*/
1475
1476	object *	1471	object *
1477	pick_arrow_target (object op, const char type, int dir)	1472	pick_arrow_target (object op, const char type, int dir)
1478	{	1473	{
1479	object *tmp = NULL;	1474	object *tmp = NULL;
1480	maptile *m;	1475	maptile *m;
…		…
1545	*/	1540	*/
1546	int	1541	int
1547	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1542	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548	{	1543	{
1549	object left, bow;	1544	object left, bow;
1550	int bowspeed, mflags;	1545	int mflags;
1551	maptile *m;	1546	maptile *m;
1552		1547
1553	if (!dir)	1548	if (!dir)
1554	{	1549	{
1555	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1550	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1556	return 0;	1551	return 0;
1557	}	1552	}
1558		1553
1559	if (op->type == PLAYER)	1554	if (op->contr)
1560	bow = op->contr->ranges[range_bow];	1555	bow = op->current_weapon;
1561	else	1556	else
1562	{	1557	{
1563	for (bow = op->inv; bow; bow = bow->below)	1558	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1559	/* 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.	1560	* don't need to switch back and forth between bows and weapons.
…		…
1570	if (!bow)	1565	if (!bow)
1571	{	1566	{
1572	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1567	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573	return 0;	1568	return 0;
1574	}	1569	}
		1570
		1571	// optimisation: move object to top so we will find it quickly again
		1572	if (bow->below)
		1573	{
		1574	bow->remove ();
		1575	op->insert (bow);
		1576	}
		1577
1575	}	1578	}
1576		1579
1577	if (!bow->race \|\| !bow->skill)	1580	if (!bow->race \|\| !bow->skill)
1578	{	1581	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1582	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580	return 0;	1583	return 0;
1581	}	1584	}
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		1585
1592	if (arrow == NULL)	1586	if (arrow == NULL)
1593	{	1587	{
1594	if ((arrow = find_arrow (op, bow->race)) == NULL)	1588	if ((arrow = find_arrow (op, bow->race)) == NULL)
1595	{	1589	{
1596	if (op->type == PLAYER)	1590	if (op->type == PLAYER)
1597	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1591	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 */	1592	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599	else	1593	else
1600	CLEAR_FLAG (op, FLAG_READY_BOW);	1594	CLEAR_FLAG (op, FLAG_READY_BOW);
		1595
1601	return 0;	1596	return 0;
1602	}	1597	}
1603	}	1598	}
1604		1599
1605	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1600	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1629		1624
1630	arrow->set_owner (op);	1625	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1626	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1627	arrow->direction = dir;
1633		1628
		1629	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1630	arrow->stats.hp = arrow->stats.dam;
		1631	arrow->stats.grace = arrow->attacktype;
		1632
		1633	if (arrow->slaying)
		1634	arrow->spellarg = strdup (arrow->slaying);
		1635
		1636	if (player *pl = op->contr)
		1637	{
		1638	if (!pl->has_hit)
		1639	{
		1640	pl->has_hit = 1;
		1641	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
		1642	}
		1643	#if 0
		1644	float speed = pl->weapon_sp;
		1645
		1646	/* penalize ROF for bestarrow */
		1647	if (pl->bowtype == bow_bestarrow)
		1648	speed *= .9f;
		1649	else
		1650	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1651
		1652	op->speed_left += speed - op->speed;
		1653	#endif
		1654	}
		1655
		1656	SET_ANIMATION (arrow, arrow->direction);
		1657
		1658	/* update the speed */
		1659	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1660	+ bow->stats.dam / 7.0;
		1661
		1662	arrow->set_speed (max (arrow->speed, 2.0));
		1663	arrow->speed_left = 0;
		1664
		1665	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1666
1634	if (op->type == PLAYER)	1667	if (op->type == PLAYER)
1635	{	1668	{
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;	1669	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1670	wc -= dex_bonus[op->stats.Dex];
		1671
		1672	if (!arrow->slaying)
		1673	arrow->slaying = op->slaying;
		1674
		1675	arrow->attacktype \|= op->attacktype;
1667	}	1676	}
1668	else	1677	else
1669	{	1678	{
1670	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671	arrow->level = op->level;	1679	arrow->level = op->level;
1672	}	1680	arrow->stats.wc -= bow->magic;
1673		1681
1674	if (arrow->attacktype == AT_PHYSICAL)	1682	if (!arrow->slaying)
		1683	arrow->slaying = bow->slaying;
		1684
1675	arrow->attacktype \|= bow->attacktype;	1685	arrow->attacktype \|= bow->attacktype;
		1686	}
1676		1687
1677	if (bow->slaying)	1688	wc -= arrow->level;
1678	arrow->slaying = bow->slaying;	1689	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679		1690
		1691	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680	arrow->move_type = MOVE_FLY_LOW;	1692	arrow->move_type = MOVE_FLY_LOW;
1681	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1693	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1682		1694
1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1695	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1684	m->insert (arrow, sx, sy, op);	1696	m->insert (arrow, sx, sy, op);
…		…
1709	{	1721	{
1710	int ret = 0, wcmod = 0;	1722	int ret = 0, wcmod = 0;
1711		1723
1712	if (op->contr->bowtype == bow_bestarrow)	1724	if (op->contr->bowtype == bow_bestarrow)
1713	{	1725	{
1714	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1726	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715	}	1727	}
1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1728	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717	{	1729	{
1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1730	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719	wcmod = -1;	1731	wcmod = -1;
…		…
1729	else if (op->contr->bowtype == bow_spreadshot)	1741	else if (op->contr->bowtype == bow_spreadshot)
1730	{	1742	{
1731	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1743	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);	1744	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);	1745	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735	}	1746	}
1736	else	1747	else
1737	{	1748	{
1738	/* Simple case */	1749	/* Simple case */
1739	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1750	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740	}	1751	}
		1752
1741	return ret;	1753	return ret;
1742	}	1754	}
1743
1744		1755
1745	/* Fires a misc (wand/rod/horn) object in 'dir'.	1756	/* Fires a misc (wand/rod/horn) object in 'dir'.
1746	* Broken apart from 'fire' to keep it more readable.	1757	* Broken apart from 'fire' to keep it more readable.
1747	*/	1758	*/
1748	void	1759	void
1749	fire_misc_object (object *op, int dir)	1760	fire_misc_object (object *op, int dir)
1750	{	1761	{
1751	object *item;	1762	object *item = op->contr->ranged_ob;
1752		1763
1753	if (!op->contr->ranges[range_misc])	1764	if (!item)
1754	{	1765	{
1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1766	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756	return;	1767	return;
1757	}	1768	}
1758		1769
1759	item = op->contr->ranges[range_misc];
1760	if (!item->inv)	1770	if (!item->inv)
1761	{	1771	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1772	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1773	return;
1764	}	1774	}
		1775
		1776	if (!op->change_weapon (item))
		1777	return;
		1778
1765	if (item->type == WAND)	1779	if (item->type == WAND)
1766	{	1780	{
1767	if (item->stats.food <= 0)	1781	if (item->stats.food <= 0)
1768	{	1782	{
1769	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1783	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));	1784	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1785
1771	return;	1786	return;
1772	}	1787	}
1773	}	1788	}
1774	else if (item->type == ROD \|\| item->type == HORN)	1789	else if (item->type == ROD \|\| item->type == HORN)
1775	{	1790	{
1776	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1791	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777	{	1792	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1793	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1794
1779	if (item->type == ROD)	1795	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));	1796	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781	else	1797	else
1782	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1798	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1799
1783	return;	1800	return;
1784	}	1801	}
1785	}	1802	}
1786		1803
1787	if (cast_spell (op, item, dir, item->inv, NULL))	1804	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1818		1835
1819	/* check for loss of invisiblity/hide */	1836	/* check for loss of invisiblity/hide */
1820	if (action_makes_visible (op))	1837	if (action_makes_visible (op))
1821	make_visible (op);	1838	make_visible (op);
1822		1839
1823	switch (op->contr->shoottype)	1840	player *pl = op->contr;
		1841
		1842	if (pl->golem)
1824	{	1843	{
1825	case range_none:	1844	control_golem (op->contr->golem, dir);
1826	return;	1845	return;
		1846	}
1827		1847
1828	case range_bow:	1848	object *ob = pl->ranged_ob;
		1849
		1850	if (!ob)
		1851	return;
		1852
		1853	if (!op->change_weapon (ob))
		1854	return;
		1855
		1856	switch (ob->type)
		1857	{
		1858	case BOW:
1829	player_fire_bow (op, dir);	1859	player_fire_bow (op, dir);
1830	return;	1860	break;
1831		1861
1832	case range_magic: /* Casting spells */	1862	case SPELL:
1833	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1863	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834	return;	1864	break;
1835		1865
1836	case range_misc:	1866	case BUILDER:
		1867	apply_map_builder (op, dir);
		1868	break;
		1869
		1870	case SKILL:
		1871	do_skill (op, op, ob, dir, 0);
		1872	break;
		1873
		1874	default:
1837	fire_misc_object (op, dir);	1875	fire_misc_object (op, dir);
1838	return;	1876	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	}	1877	}
1867	}	1878	}
1868		1879
1869	/* find_key	1880	/* find_key
1870	* We try to find a key for the door as passed. If we find a key	1881	* We try to find a key for the door as passed. If we find a key
…		…
1970	if (key)	1981	if (key)
1971	{	1982	{
1972	object *container = key->env;	1983	object *container = key->env;
1973		1984
1974	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1986
1975	if (action_makes_visible (op))	1987	if (action_makes_visible (op))
1976	make_visible (op);	1988	make_visible (op);
		1989
1977	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1990	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1978	spring_trap (door->inv, op);	1991	spring_trap (door->inv, op);
1979		1992
1980	if (door->type == DOOR)	1993	if (door->type == DOOR)
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1994	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
2011	*/	2024	*/
2012	void	2025	void
2013	move_player_attack (object *op, int dir)	2026	move_player_attack (object *op, int dir)
2014	{	2027	{
2015	object tmp, mon;	2028	object tmp, mon;
2016	sint16 nx, ny;
2017	int on_battleground;	2029	int on_battleground;
2018	maptile *m;	2030	maptile *m;
2019		2031
2020	nx = freearr_x[dir] + op->x;	2032	sint16 nx = freearr_x[dir] + op->x;
2021	ny = freearr_y[dir] + op->y;	2033	sint16 ny = freearr_y[dir] + op->y;
2022		2034
2023	on_battleground = op_on_battleground (op, 0, 0);	2035	on_battleground = op_on_battleground (op, 0, 0);
2024		2036
2025	/* If braced, or can't move to the square, and it is not out of the	2037	/* 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	2038	* map, attack it. Note order of if statement is important - don't
…		…
2091		2103
2092	/* If the creature is a pet, push it even if the player is not	2104	/* 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	2105	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2106	* player owns it and it is either friendly or unagressive.
2095	*/	2107	*/
2096	if ((op->type == PLAYER)	2108	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2109	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2110	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2111	\|\| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2112	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2113	{
2106	/* If we're braced, we don't want to switch places with it */	2114	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced)	2115	if (op->contr->braced)
2108	return;	2116	return;
2109		2117
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2118	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2111	(void) push_ob (mon, dir, op);	2119	push_ob (mon, dir, op);
2112	if (op->contr->tmp_invis \|\| op->hide)	2120	if (op->contr->tmp_invis \|\| op->hide)
2113	make_visible (op);	2121	make_visible (op);
2114		2122
2115	return;	2123	return;
2116	}	2124	}
…		…
2118	/* in certain circumstances, you shouldn't attack friendly	2126	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2127	* creatures. Note that if you are braced, you can't push
2120	* someone, but put it inside this loop so that you won't	2128	* someone, but put it inside this loop so that you won't
2121	* attack them either.	2129	* attack them either.
2122	*/	2130	*/
2123	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2131	if ((mon->type == PLAYER \|\| mon->enemy != op)
2124	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2132	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2133	&& ((op->contr->peaceful
2127	\|\| (mon->type == PLAYER	2134	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2135	&& !on_battleground))
2134	{	2136	{
2135	if (!op->contr->braced)	2137	if (!op->contr->braced)
2136	{	2138	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2139	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2138	push_ob (mon, dir, op);	2140	push_ob (mon, dir, op);
…		…
2161	* that party_number -1 is no party, so attacks can still happen.	2163	* that party_number -1 is no party, so attacks can still happen.
2162	*/	2164	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2165	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)))	2166	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2165	{	2167	{
2166
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)	2168	if (!op->contr->has_hit)
2173	{	2169	{
		2170	op->contr->has_hit = 1;
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2171	op->speed_left += op->contr->weapon_speed () - op->speed;
2175
2176	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2177	}	2172	}
2178		2173
2179	skill_attack (mon, op, 0, 0, 0);	2174	skill_attack (mon, op, 0, 0, 0);
2180		2175
2181	/* If attacking another player, that player gets automatic	2176	/* If attacking another player, that player gets automatic
…		…
2256	* Returns true if there are more actions we can do.	2251	* Returns true if there are more actions we can do.
2257	*/	2252	*/
2258	int	2253	int
2259	handle_newcs_player (object *op)	2254	handle_newcs_player (object *op)
2260	{	2255	{
2261	if (op->contr->hidden)
2262	{
2263	op->invisible = 1000;
2264	/* the socket code flashes the player visible/invisible
2265	* depending on the value of invisible, so we need to
2266	* alternate it here for it to work correctly.
2267	*/
2268	if (pticks & 2)
2269	op->invisible--;
2270	}
2271	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2272	{
2273	op->invisible--;
2274	if (!op->invisible)
2275	{
2276	make_visible (op);
2277	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2278	}
2279	}
2280
2281	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2282	{	2257	{
2283	flee_player (op);	2258	flee_player (op);
		2259
2284	/* If player is still scared, that is his action for this tick */	2260	/* If player is still scared, that is his action for this tick */
2285	if (QUERY_FLAG (op, FLAG_SCARED))	2261	if (op->flag [FLAG_SCARED])
2286	{	2262	{
2287	op->speed_left--;	2263	--op->speed_left;
2288	return 0;	2264	return 0;
2289	}	2265	}
2290	}	2266	}
2291
2292	/* I've been seeing crashes where the golem has been destroyed, but
2293	* the player object still points to the defunct golem. The code that
2294	* destroys the golem looks correct, and it doesn't always happen, so
2295	* put this in a a workaround to clean up the golem pointer.
2296	*/
2297	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2298	op->contr->ranges[range_golem] = 0;
2299		2267
2300	/* call this here - we also will call this in do_ericserver, but	2268	/* call this here - we also will call this in do_ericserver, but
2301	* the players time has been increased when doericserver has been	2269	* the players time has been increased when doericserver has been
2302	* called, so we recheck it here.	2270	* called, so we recheck it here.
2303	*/	2271	*/
2304	if (op->contr->ns->handle_command ())	2272	if (op->contr->ns->handle_command ())
2305	return 1;	2273	return 1;
2306		2274
2307	if (op->speed_left > 0)	2275	if (op->speed_left > 0.f)
2308	{	2276	{
2309	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2277	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2310	{	2278	{
2311	/* All move commands take 1 tick, at least for now */	2279	/* All move commands take 1 tick, at least for now */
2312	op->speed_left--;	2280	--op->speed_left;
2313		2281
2314	/* Instead of all the stuff below, let move_player take care	2282	/* Instead of all the stuff below, let move_player take care
2315	* of it. Also, some of the skill stuff is only put in	2283	* of it. Also, some of the skill stuff is only put in
2316	* there, as well as the confusion stuff.	2284	* there, as well as the confusion stuff.
2317	*/	2285	*/
2318	move_player (op, op->direction);	2286	move_player (op, op->direction);
2319		2287
2320	return op->speed_left > 0;	2288	return op->speed_left > 0.f;
2321	}	2289	}
2322	}	2290	}
2323		2291
2324	return 0;	2292	return 0;
2325	}	2293	}
…		…
2439	int rate_grace = 2000;	2407	int rate_grace = 2000;
2440	const int max_hp = 1;	2408	const int max_hp = 1;
2441	const int max_sp = 1;	2409	const int max_sp = 1;
2442	const int max_grace = 1;	2410	const int max_grace = 1;
2443		2411
2444	if (op->contr->outputs_sync)	2412	if (op->contr->hidden)
		2413	{
		2414	op->invisible = 1000;
		2415	/* the socket code flashes the player visible/invisible
		2416	* depending on the value of invisible, so we need to
		2417	* alternate it here for it to work correctly.
		2418	*/
		2419	if (pticks & 2)
		2420	op->invisible--;
2445	{	2421	}
2446	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2422	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2447	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2423	{
2448	flush_output_element (op, &op->contr->outputs[i]);	2424	if (!op->invisible--)
		2425	{
		2426	make_visible (op);
		2427	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2428	}
2449	}	2429	}
2450		2430
2451	if (op->contr->ns->state == ST_PLAYING)	2431	if (op->contr->ns->state == ST_PLAYING)
2452	{	2432	{
2453	/* these next three if clauses make it possible to SLOW DOWN	2433	/* these next three if clauses make it possible to SLOW DOWN
…		…
2475	gen_grace = op->stats.maxgrace;	2455	gen_grace = op->stats.maxgrace;
2476	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2456	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477	}	2457	}
2478		2458
2479	/* Regenerate Spell Points */	2459	/* Regenerate Spell Points */
2480	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2460	if (!op->contr->golem && --op->last_sp < 0)
2481	{	2461	{
2482	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2462	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483	if (op->stats.sp < op->stats.maxsp)	2463	if (op->stats.sp < op->stats.maxsp)
2484	{	2464	{
2485	op->stats.sp++;	2465	op->stats.sp++;
…		…
2583	}	2563	}
2584		2564
2585	/* Digestion */	2565	/* Digestion */
2586	if (--op->last_eat < 0)	2566	if (--op->last_eat < 0)
2587	{	2567	{
2588	#ifdef COZY_SERVER
2589	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2590	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2591	#else
2592	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2568	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2593	#endif
2594		2569
2595	if (op->contr->gen_hp > 0)	2570	if (op->contr->gen_hp > 0)
2596	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2571	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2597	else	2572	else
2598	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2573	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2910	op->stats.hp = op->stats.maxhp;	2885	op->stats.hp = op->stats.maxhp;
2911	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2886	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2887	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913		2888
2914	/*	2889	/*
2915	* Check to see if the player is in a shop. IF so, then check to see if
2916	* the player has any unpaid items. If so, remove them and put them back	2890	* Check to see if the player has any unpaid items. If so, remove them
2917	* in the map.	2891	* and put them back in the map.
2918	*/	2892	*/
2919
2920	if (is_in_shop (op))
2921	remove_unpaid_objects (op->inv, op);	2893	remove_unpaid_objects (op->inv, op);
2922		2894
2923	/****************************************/	2895	/****************************************/
2924	/* */	2896	/* */
2925	/* Move player to his current respawn- */	2897	/* Move player to his current respawn- */
2926	/* position (usually last savebed) */	2898	/* position (usually last savebed) */
…		…
2946	object *force;	2918	object *force;
2947	int at;	2919	int at;
2948		2920
2949	force = get_archetype (FORCE_NAME);	2921	force = get_archetype (FORCE_NAME);
2950	/* 50 ticks should be enough time for the spell to abate */	2922	/* 50 ticks should be enough time for the spell to abate */
2951	force->speed = 0.1;	2923	force->speed = 0.1f;
2952	force->speed_left = -5.0;	2924	force->speed_left = -5.f;
2953	SET_FLAG (force, FLAG_APPLIED);	2925	SET_FLAG (force, FLAG_APPLIED);
2954	for (at = 0; at < NROFATTACKS; at++)	2926	for (at = 0; at < NROFATTACKS; at++)
2955	if (will_kill_again & (1 << at))	2927	if (will_kill_again & (1 << at))
2956	force->resist[at] = 100;	2928	force->resist[at] = 100;
2957		2929
…		…
3071	if (op->type == PLAYER)	3043	if (op->type == PLAYER)
3072	{	3044	{
3073	op->contr->tmp_invis = 0;	3045	op->contr->tmp_invis = 0;
3074	op->contr->invis_race = 0;	3046	op->contr->invis_race = 0;
3075	}	3047	}
		3048
3076	update_object (op, UP_OBJ_FACE);	3049	update_object (op, UP_OBJ_CHANGE);
3077	}	3050	}
3078		3051
3079	int	3052	int
3080	is_true_undead (object *op)	3053	is_true_undead (object *op)
3081	{	3054	{
…		…
3374	char buf[MAX_BUF]; /* tmp. string buffer */	3347	char buf[MAX_BUF]; /* tmp. string buffer */
3375	int i = 0, j = 0;	3348	int i = 0, j = 0;
3376		3349
3377	/* get the appropriate treasurelist */	3350	/* get the appropriate treasurelist */
3378	if (atnr == ATNR_FIRE)	3351	if (atnr == ATNR_FIRE)
3379	trlist = find_treasurelist ("dragon_ability_fire");	3352	trlist = treasurelist::find ("dragon_ability_fire");
3380	else if (atnr == ATNR_COLD)	3353	else if (atnr == ATNR_COLD)
3381	trlist = find_treasurelist ("dragon_ability_cold");	3354	trlist = treasurelist::find ("dragon_ability_cold");
3382	else if (atnr == ATNR_ELECTRICITY)	3355	else if (atnr == ATNR_ELECTRICITY)
3383	trlist = find_treasurelist ("dragon_ability_elec");	3356	trlist = treasurelist::find ("dragon_ability_elec");
3384	else if (atnr == ATNR_POISON)	3357	else if (atnr == ATNR_POISON)
3385	trlist = find_treasurelist ("dragon_ability_poison");	3358	trlist = treasurelist::find ("dragon_ability_poison");
3386		3359
3387	if (trlist == NULL \|\| who->type != PLAYER)	3360	if (trlist == NULL \|\| who->type != PLAYER)
3388	return;	3361	return;
3389		3362
3390	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3363	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3522	* not readied.	3495	* not readied.
3523	*/	3496	*/
3524	void	3497	void
3525	player_unready_range_ob (player pl, object ob)	3498	player_unready_range_ob (player pl, object ob)
3526	{	3499	{
3527	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3500	if (pl->ob->current_weapon == ob)
		3501	pl->ob->current_weapon = 0;
		3502
		3503	if (pl->combat_ob == ob)
		3504	pl->combat_ob = 0;
		3505
3528	if (pl->ranges[i] == ob)	3506	if (pl->ranged_ob == ob)
3529	{
3530	pl->ranges[i] = 0;	3507	pl->ranged_ob = 0;
3531	if (pl->shoottype == i)
3532	pl->shoottype = range_none;
3533	}
3534	}	3508	}
3535		3509
3536	sint8	3510	sint8
3537	player::visibility_at (maptile *map, int x, int y) const	3511	player::visibility_at (maptile *map, int x, int y) const
3538	{	3512	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC vs. Revision 1.138 by root, Thu May 17 20:27:01 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC vs.
Revision 1.138 by root, Thu May 17 20:27:01 2007 UTC