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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.110 by root, Mon Apr 16 06:23:43 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 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>
…		…
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", (char *)"%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
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	ob->flag [FLAG_READY_WEAPON] = false;
		270	ob->flag [FLAG_READY_SKILL] = false;
		271	ob->flag [FLAG_READY_BOW] = false;
		272
		273	for (object *op = ob->inv; op; op = op->below)
		274	if (op->flag [FLAG_APPLIED])
		275	switch (op->type)
		276	{
		277	case WAND:
		278	case ROD:
		279	case HORN:
		280	case BOW:
		281	case SKILL_TOOL:
		282	case WEAPON:
		283	op->flag [FLAG_APPLIED] = false;
		284	apply_special (ob, op, AP_APPLY);
		285	break;
		286
		287	case SKILL:
		288	op->flag [FLAG_APPLIED] = false;
		289	break;
		290	}
		291
		292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
265	ob->update_stats ();	293	ob->update_stats ();
		294
266	ns->floorbox_update ();	295	ns->floorbox_update ();
267
268	esrv_send_inventory (ob, ob);	296	esrv_send_inventory (ob, ob);
269	esrv_add_spells (this, 0);	297	esrv_add_spells (this, 0);
270		298
271	activate ();	299	activate ();
272		300
…		…
288		316
289	INVOKE_PLAYER (DISCONNECT, this);	317	INVOKE_PLAYER (DISCONNECT, this);
290		318
291	ns->reset_stats ();	319	ns->reset_stats ();
292	ns->pl = 0;	320	ns->pl = 0;
293	this->ns = 0;	321	ns = 0;
294	}	322	}
295		323
296	if (ob)	324	if (ob)
297	ob->close_container (); //TODO: client-specific	325	ob->close_container (); //TODO: client-specific
298		326
…		…
305	player::set_object (object *op)	333	player::set_object (object *op)
306	{	334	{
307	ob = op;	335	ob = op;
308	ob->contr = this; /* this aren't yet in archetype */	336	ob->contr = this; /* this aren't yet in archetype */
309		337
310	ob->speed_left = 0.5;	338	ob->speed_left = 0.5f;
311	ob->speed = 1.0;	339	ob->speed = 1.0f;
312	ob->direction = 5; /* So player faces south */	340	ob->direction = 5; /* So player faces south */
313	}	341	}
314		342
315	player::player ()	343	player::player ()
316	{	344	{
317	/* There are some elements we want initialised to non zero value -	345	/* There are some elements we want initialised to non zero value -
318	* we deal with that below this point.	346	* we deal with that below this point.
319	*/	347	*/
320	outputs_sync = 6; /* Every 2 seconds */	348	outputs_sync = 4;
321	outputs_count = 10; /* Keeps present behaviour */	349	outputs_count = 4;
322	unapply = unapply_nochoice;	350	unapply = unapply_nochoice;
323		351
324	savebed_map = first_map_path; /* Init. respawn position */	352	savebed_map = first_map_path; /* Init. respawn position */
325		353
326	gen_sp_armour = 10;	354	gen_sp_armour = 10;
327	shoottype = range_none;
328	bowtype = bow_normal;	355	bowtype = bow_normal;
329	petmode = pet_normal;	356	petmode = pet_normal;
330	listening = 10;	357	listening = 10;
331	usekeys = containers;	358	usekeys = containers;
332	peaceful = 1; /* default peaceful */	359	peaceful = 1; /* default peaceful */
…		…
771	}	798	}
772		799
773	void	800	void
774	object::roll_stats ()	801	object::roll_stats ()
775	{	802	{
776	int statsort [7];	803	int statsort [NUM_STATS];
777		804
778	for (;;)	805	for (;;)
779	{	806	{
780	int sum = 0;	807	int sum = 0;
781	for (int i = 7; i--; )	808	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	809	sum += statsort [i] = roll_stat ();
783		810
784	if (sum >= 82 && sum <= 116)	811	if (sum >= 82 && sum <= 116)
785	break;	812	break;
786	}	813	}
787		814
788	// Sort the stats so that rerolling is easier...	815	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	816	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		817
		818	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	819	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		820
799	stats.exp = 0;	821	stats.exp = 0;
800	stats.ac = 0;	822	stats.ac = 0;
801		823
802	stats.hp = stats.maxhp;	824	stats.hp = stats.maxhp;
…		…
814	}	836	}
815		837
816	void	838	void
817	object::swap_stats (int a, int b)	839	object::swap_stats (int a, int b)
818	{	840	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	841	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		842
		843	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	844	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		845
831	//TODO: the following code looks so borked and should, at the very least,	846	//TODO: the following code looks so borked and should, at the very least,
832	// be merged with the similar code in roll_stats	847	// be merged with the similar code in roll_stats
833	stats.ac = 0;	848	stats.ac = 0;
834		849
…		…
865	* appropriate action with it (change race, or other things).	880	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	881	* The function name is for historical reasons - now we have
867	* separate race and class; this actually changes the RACE,	882	* separate race and class; this actually changes the RACE,
868	* not the class.	883	* not the class.
869	*/	884	*/
870	int	885	void
871	key_change_class (object *op, char key)	886	player::chargen_race_done ()
872	{	887	{
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 */	888	/* this must before then initial items are given */
880	esrv_new_player (op->contr, op->weight + op->carrying);	889	esrv_new_player (ob->contr, ob->weight + ob->carrying);
881		890
882	treasurelist *tl = treasurelist::find ("starting_wealth");	891	treasurelist *tl = treasurelist::find ("starting_wealth");
883	if (tl)	892	if (tl)
884	create_treasure (tl, op, 0, 0, 0);	893	create_treasure (tl, ob, 0, 0, 0);
885		894
886	INVOKE_PLAYER (BIRTH, op->contr);	895	INVOKE_PLAYER (BIRTH, ob->contr);
887	INVOKE_PLAYER (LOGIN, op->contr);	896	INVOKE_PLAYER (LOGIN, ob->contr);
888		897
889	op->contr->ns->state = ST_PLAYING;	898	ob->contr->ns->state = ST_PLAYING;
890		899
891	if (op->msg)	900	if (ob->msg)
892	op->msg = NULL;	901	ob->msg = 0;
893		902
894	/* We create this now because some of the unique maps will need it	903	/* We create this now because some of the unique maps will need it
895	* to save here.	904	* to save here.
896	*/	905	*/
		906	{
		907	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	908	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);	909	make_path_to_file (buf);
		910	}
899		911
900	start_info (op);	912	start_info (ob);
901	CLEAR_FLAG (op, FLAG_WIZ);	913	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (op, op->randomitems);	914	give_initial_items (ob, ob->randomitems);
903	link_player_skills (op);	915	link_player_skills (ob);
904	esrv_send_inventory (op, op);	916	esrv_send_inventory (ob, ob);
905	op->update_stats ();	917	ob->update_stats ();
906		918
907	/* This moves the player to a different start map, if there	919	/* This moves the player to a different start map, if there
908	* is one for this race	920	* is one for this race
909	*/	921	*/
910	if (*first_map_ext_path)	922	if (*first_map_ext_path)
911	{	923	{
912	object *tmp;	924	object *tmp;
913	char mapname[MAX_BUF];	925	char mapname[MAX_BUF];
914		926
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	927	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
916	tmp = object::create ();	928	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	929	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = op->x;	930	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = op->y;	931	EXIT_Y (tmp) = ob->y;
920	op->enter_exit (tmp); /* we don't really care if it succeeded;	932	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the	933	* if the map isn't there, then stay on the
922	* default initial map */	934	* default initial map */
923	tmp->destroy ();	935	tmp->destroy ();
924	}	936	}
925	else	937	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	938	LOG (llevDebug, "first_map_ext_path not set\n");
		939	}
927		940
928	return 0;	941	void
929	}	942	player::chargen_race_next ()
930		943	{
931	/* Following actually changes the race - this is the default command	944	/* Following actually changes the race - this is the default command
932	* if we don't match with one of the options above.	945	* if we don't match with one of the options above.
933	*/	946	*/
934		947
935	tmp_loop = 0;	948	do
936	while (!tmp_loop)
937	{	949	{
938	shstr name = op->name;	950	shstr name = ob->name;
939	int x = op->x, y = op->y;	951	int x = ob->x, y = ob->y;
940		952
941	op->remove_statbonus ();	953	ob->remove_statbonus ();
942	op->remove ();	954	ob->remove ();
943	op->arch = get_player_archetype (op->arch);	955	ob->arch = get_player_archetype (ob->arch);
944	op->arch->clone.copy_to (op);	956	ob->arch->clone.copy_to (ob);
945	op->instantiate ();	957	ob->instantiate ();
946	op->stats = op->contr->orig_stats;	958	ob->stats = ob->contr->orig_stats;
947	op->name = op->name_pl = name;	959	ob->name = ob->name_pl = name;
948	op->x = x;	960	ob->x = x;
949	op->y = y;	961	ob->y = y;
950	SET_ANIMATION (op, 2); /* So player faces south */	962	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (op, op->map, op, 0);	963	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (op->contr->title, op->arch->clone.name);	964	assign (ob->contr->title, ob->arch->clone.name);
953	op->add_statbonus ();	965	ob->add_statbonus ();
954	tmp_loop = allowed_class (op);
955	}	966	}
		967	while (!allowed_class (ob));
956		968
957	update_object (op, UP_OBJ_FACE);	969	update_object (ob, UP_OBJ_FACE);
958	esrv_update_item (UPD_FACE, op, op);	970	esrv_update_item (UPD_FACE, ob, ob);
959	op->update_stats ();	971	ob->update_stats ();
960	op->stats.hp = op->stats.maxhp;	972	ob->stats.hp = ob->stats.maxhp;
961	op->stats.sp = op->stats.maxsp;	973	ob->stats.sp = ob->stats.maxsp;
962	op->stats.grace = 0;	974	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	}	975	}
970		976
971	void	977	void
972	flee_player (object *op)	978	flee_player (object *op)
973	{	979	{
…		…
1020	/* Cornered, get rid of scared */	1026	/* Cornered, get rid of scared */
1021	CLEAR_FLAG (op, FLAG_SCARED);	1027	CLEAR_FLAG (op, FLAG_SCARED);
1022	op->enemy = NULL;	1028	op->enemy = NULL;
1023	}	1029	}
1024		1030
1025
1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1031	/* 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	1032	* It returns 1 if the player should keep on moving, 0 if he should
1028	* stop.	1033	* stop.
1029	*/	1034	*/
1030	int	1035	int
1031	check_pick (object *op)	1036	check_pick (object *op)
1032	{	1037	{
…		…
1470	* find_better_arrow to find a decent arrow to use.	1475	* find_better_arrow to find a decent arrow to use.
1471	* op = the shooter	1476	* op = the shooter
1472	* type = bow->race	1477	* type = bow->race
1473	* dir = fire direction	1478	* dir = fire direction
1474	*/	1479	*/
1475
1476	object *	1480	object *
1477	pick_arrow_target (object op, const char type, int dir)	1481	pick_arrow_target (object op, const char type, int dir)
1478	{	1482	{
1479	object *tmp = NULL;	1483	object *tmp = NULL;
1480	maptile *m;	1484	maptile *m;
…		…
1545	*/	1549	*/
1546	int	1550	int
1547	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1551	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548	{	1552	{
1549	object left, bow;	1553	object left, bow;
1550	int bowspeed, mflags;	1554	int mflags;
1551	maptile *m;	1555	maptile *m;
1552		1556
1553	if (!dir)	1557	if (!dir)
1554	{	1558	{
1555	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1559	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1556	return 0;	1560	return 0;
1557	}	1561	}
1558		1562
1559	if (op->type == PLAYER)	1563	if (op->contr)
1560	bow = op->contr->ranges[range_bow];	1564	bow = op->current_weapon;
1561	else	1565	else
1562	{	1566	{
1563	for (bow = op->inv; bow; bow = bow->below)	1567	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1568	/* 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.	1569	* don't need to switch back and forth between bows and weapons.
…		…
1570	if (!bow)	1574	if (!bow)
1571	{	1575	{
1572	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1576	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573	return 0;	1577	return 0;
1574	}	1578	}
		1579
		1580	// optimisation: move object to top so we will find it quickly again
		1581	if (bow->below)
		1582	{
		1583	bow->remove ();
		1584	op->insert (bow);
		1585	}
		1586
1575	}	1587	}
1576		1588
1577	if (!bow->race \|\| !bow->skill)	1589	if (!bow->race \|\| !bow->skill)
1578	{	1590	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580	return 0;	1592	return 0;
1581	}	1593	}
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		1594
1592	if (arrow == NULL)	1595	if (arrow == NULL)
1593	{	1596	{
1594	if ((arrow = find_arrow (op, bow->race)) == NULL)	1597	if ((arrow = find_arrow (op, bow->race)) == NULL)
1595	{	1598	{
1596	if (op->type == PLAYER)	1599	if (op->type == PLAYER)
1597	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1600	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 */	1601	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599	else	1602	else
1600	CLEAR_FLAG (op, FLAG_READY_BOW);	1603	CLEAR_FLAG (op, FLAG_READY_BOW);
		1604
1601	return 0;	1605	return 0;
1602	}	1606	}
1603	}	1607	}
1604		1608
1605	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1609	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1629		1633
1630	arrow->set_owner (op);	1634	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1635	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1636	arrow->direction = dir;
1633		1637
		1638	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1639	arrow->stats.hp = arrow->stats.dam;
		1640	arrow->stats.grace = arrow->attacktype;
		1641
		1642	if (arrow->slaying)
		1643	arrow->spellarg = strdup (arrow->slaying);
		1644
		1645	if (player *pl = op->contr)
		1646	{
		1647	if (!pl->has_hit)
		1648	{
		1649	pl->has_hit = 1;
		1650	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
		1651	}
		1652	#if 0
		1653	float speed = pl->weapon_sp;
		1654
		1655	/* penalize ROF for bestarrow */
		1656	if (pl->bowtype == bow_bestarrow)
		1657	speed *= .9f;
		1658	else
		1659	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1660
		1661	op->speed_left += speed - op->speed;
		1662	#endif
		1663	}
		1664
		1665	SET_ANIMATION (arrow, arrow->direction);
		1666
		1667	/* update the speed */
		1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1669	+ bow->stats.dam / 7.0;
		1670
		1671	arrow->set_speed (max (arrow->speed, 2.0));
		1672	arrow->speed_left = 0;
		1673
		1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1675
1634	if (op->type == PLAYER)	1676	if (op->type == PLAYER)
1635	{	1677	{
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;	1678	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1679	wc -= dex_bonus[op->stats.Dex];
		1680
		1681	if (!arrow->slaying)
		1682	arrow->slaying = op->slaying;
		1683
		1684	arrow->attacktype \|= op->attacktype;
1667	}	1685	}
1668	else	1686	else
1669	{	1687	{
1670	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671	arrow->level = op->level;	1688	arrow->level = op->level;
1672	}	1689	arrow->stats.wc -= bow->magic;
1673		1690
1674	if (arrow->attacktype == AT_PHYSICAL)	1691	if (!arrow->slaying)
		1692	arrow->slaying = bow->slaying;
		1693
1675	arrow->attacktype \|= bow->attacktype;	1694	arrow->attacktype \|= bow->attacktype;
		1695	}
1676		1696
1677	if (bow->slaying)	1697	wc -= arrow->level;
1678	arrow->slaying = bow->slaying;	1698	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679		1699
		1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680	arrow->move_type = MOVE_FLY_LOW;	1701	arrow->move_type = MOVE_FLY_LOW;
1681	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1702	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1682		1703
1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1684	m->insert (arrow, sx, sy, op);	1705	m->insert (arrow, sx, sy, op);
…		…
1709	{	1730	{
1710	int ret = 0, wcmod = 0;	1731	int ret = 0, wcmod = 0;
1711		1732
1712	if (op->contr->bowtype == bow_bestarrow)	1733	if (op->contr->bowtype == bow_bestarrow)
1713	{	1734	{
1714	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1735	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715	}	1736	}
1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1737	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717	{	1738	{
1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719	wcmod = -1;	1740	wcmod = -1;
…		…
1729	else if (op->contr->bowtype == bow_spreadshot)	1750	else if (op->contr->bowtype == bow_spreadshot)
1730	{	1751	{
1731	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1752	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);	1753	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);	1754	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735	}	1755	}
1736	else	1756	else
1737	{	1757	{
1738	/* Simple case */	1758	/* Simple case */
1739	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1759	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740	}	1760	}
		1761
1741	return ret;	1762	return ret;
1742	}	1763	}
1743
1744		1764
1745	/* Fires a misc (wand/rod/horn) object in 'dir'.	1765	/* Fires a misc (wand/rod/horn) object in 'dir'.
1746	* Broken apart from 'fire' to keep it more readable.	1766	* Broken apart from 'fire' to keep it more readable.
1747	*/	1767	*/
1748	void	1768	void
1749	fire_misc_object (object *op, int dir)	1769	fire_misc_object (object *op, int dir)
1750	{	1770	{
1751	object *item;	1771	object *item = op->contr->ranged_ob;
1752		1772
1753	if (!op->contr->ranges[range_misc])	1773	if (!item)
1754	{	1774	{
1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1775	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756	return;	1776	return;
1757	}	1777	}
1758		1778
1759	item = op->contr->ranges[range_misc];
1760	if (!item->inv)	1779	if (!item->inv)
1761	{	1780	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1781	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1782	return;
1764	}	1783	}
		1784
		1785	if (!op->change_weapon (item))
		1786	return;
		1787
1765	if (item->type == WAND)	1788	if (item->type == WAND)
1766	{	1789	{
1767	if (item->stats.food <= 0)	1790	if (item->stats.food <= 0)
1768	{	1791	{
1769	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1792	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));	1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1794
1771	return;	1795	return;
1772	}	1796	}
1773	}	1797	}
1774	else if (item->type == ROD \|\| item->type == HORN)	1798	else if (item->type == ROD \|\| item->type == HORN)
1775	{	1799	{
1776	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777	{	1801	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1803
1779	if (item->type == ROD)	1804	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));	1805	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781	else	1806	else
1782	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1808
1783	return;	1809	return;
1784	}	1810	}
1785	}	1811	}
1786		1812
1787	if (cast_spell (op, item, dir, item->inv, NULL))	1813	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1818		1844
1819	/* check for loss of invisiblity/hide */	1845	/* check for loss of invisiblity/hide */
1820	if (action_makes_visible (op))	1846	if (action_makes_visible (op))
1821	make_visible (op);	1847	make_visible (op);
1822		1848
1823	switch (op->contr->shoottype)	1849	player *pl = op->contr;
		1850
		1851	if (pl->golem)
1824	{	1852	{
1825	case range_none:	1853	control_golem (op->contr->golem, dir);
1826	return;	1854	return;
		1855	}
1827		1856
1828	case range_bow:	1857	object *ob = pl->ranged_ob;
		1858
		1859	if (!ob)
		1860	return;
		1861
		1862	if (!op->change_weapon (ob))
		1863	return;
		1864
		1865	switch (ob->type)
		1866	{
		1867	case BOW:
1829	player_fire_bow (op, dir);	1868	player_fire_bow (op, dir);
1830	return;	1869	break;
1831		1870
1832	case range_magic: /* Casting spells */	1871	case SPELL:
1833	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1872	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834	return;	1873	break;
1835		1874
1836	case range_misc:	1875	case BUILDER:
		1876	apply_map_builder (op, dir);
		1877	break;
		1878
		1879	case SKILL:
		1880	do_skill (op, op, ob, dir, 0);
		1881	break;
		1882
		1883	default:
1837	fire_misc_object (op, dir);	1884	fire_misc_object (op, dir);
1838	return;	1885	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	}	1886	}
1867	}	1887	}
1868		1888
1869	/* find_key	1889	/* find_key
1870	* We try to find a key for the door as passed. If we find a key	1890	* We try to find a key for the door as passed. If we find a key
…		…
1970	if (key)	1990	if (key)
1971	{	1991	{
1972	object *container = key->env;	1992	object *container = key->env;
1973		1993
1974	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1995
1975	if (action_makes_visible (op))	1996	if (action_makes_visible (op))
1976	make_visible (op);	1997	make_visible (op);
		1998
1977	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1999	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1978	spring_trap (door->inv, op);	2000	spring_trap (door->inv, op);
1979		2001
1980	if (door->type == DOOR)	2002	if (door->type == DOOR)
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
2011	*/	2033	*/
2012	void	2034	void
2013	move_player_attack (object *op, int dir)	2035	move_player_attack (object *op, int dir)
2014	{	2036	{
2015	object tmp, mon;	2037	object tmp, mon;
2016	sint16 nx, ny;
2017	int on_battleground;	2038	int on_battleground;
2018	maptile *m;	2039	maptile *m;
2019		2040
2020	nx = freearr_x[dir] + op->x;	2041	sint16 nx = freearr_x[dir] + op->x;
2021	ny = freearr_y[dir] + op->y;	2042	sint16 ny = freearr_y[dir] + op->y;
2022		2043
2023	on_battleground = op_on_battleground (op, 0, 0);	2044	on_battleground = op_on_battleground (op, 0, 0);
2024		2045
2025	/* If braced, or can't move to the square, and it is not out of the	2046	/* 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	2047	* map, attack it. Note order of if statement is important - don't
…		…
2091		2112
2092	/* If the creature is a pet, push it even if the player is not	2113	/* 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	2114	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2115	* player owns it and it is either friendly or unagressive.
2095	*/	2116	*/
2096	if ((op->type == PLAYER)	2117	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2118	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2119	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2120	\|\| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2122	{
2106	/* If we're braced, we don't want to switch places with it */	2123	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced)	2124	if (op->contr->braced)
2108	return;	2125	return;
2109		2126
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2127	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2111	(void) push_ob (mon, dir, op);	2128	push_ob (mon, dir, op);
2112	if (op->contr->tmp_invis \|\| op->hide)	2129	if (op->contr->tmp_invis \|\| op->hide)
2113	make_visible (op);	2130	make_visible (op);
2114		2131
2115	return;	2132	return;
2116	}	2133	}
…		…
2118	/* in certain circumstances, you shouldn't attack friendly	2135	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2136	* creatures. Note that if you are braced, you can't push
2120	* someone, but put it inside this loop so that you won't	2137	* someone, but put it inside this loop so that you won't
2121	* attack them either.	2138	* attack them either.
2122	*/	2139	*/
2123	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2140	if ((mon->type == PLAYER \|\| mon->enemy != op)
2124	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2141	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2142	&& ((op->contr->peaceful
2127	\|\| (mon->type == PLAYER	2143	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2144	&& !on_battleground))
2134	{	2145	{
2135	if (!op->contr->braced)	2146	if (!op->contr->braced)
2136	{	2147	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2138	push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
…		…
2161	* that party_number -1 is no party, so attacks can still happen.	2172	* that party_number -1 is no party, so attacks can still happen.
2162	*/	2173	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2174	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)))	2175	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2165	{	2176	{
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)	2177	if (!op->contr->has_hit)
2173	{	2178	{
		2179	op->contr->has_hit = 1;
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2180	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	}	2181	}
2178		2182
2179	skill_attack (mon, op, 0, 0, 0);	2183	skill_attack (mon, op, 0, 0, 0);
2180		2184
2181	/* If attacking another player, that player gets automatic	2185	/* If attacking another player, that player gets automatic
…		…
2259	handle_newcs_player (object *op)	2263	handle_newcs_player (object *op)
2260	{	2264	{
2261	if (QUERY_FLAG (op, FLAG_SCARED))	2265	if (QUERY_FLAG (op, FLAG_SCARED))
2262	{	2266	{
2263	flee_player (op);	2267	flee_player (op);
		2268
2264	/* If player is still scared, that is his action for this tick */	2269	/* If player is still scared, that is his action for this tick */
2265	if (QUERY_FLAG (op, FLAG_SCARED))	2270	if (op->flag [FLAG_SCARED])
2266	{	2271	{
2267	op->speed_left--;	2272	--op->speed_left;
2268	return 0;	2273	return 0;
2269	}	2274	}
2270	}	2275	}
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		2276
2280	/* call this here - we also will call this in do_ericserver, but	2277	/* call this here - we also will call this in do_ericserver, but
2281	* the players time has been increased when doericserver has been	2278	* the players time has been increased when doericserver has been
2282	* called, so we recheck it here.	2279	* called, so we recheck it here.
2283	*/	2280	*/
2284	if (op->contr->ns->handle_command ())	2281	if (op->contr->ns->handle_command ())
2285	return 1;	2282	return 1;
2286		2283
2287	if (op->speed_left > 0)	2284	if (op->speed_left > 0.f)
2288	{	2285	{
2289	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2290	{	2287	{
2291	/* All move commands take 1 tick, at least for now */	2288	/* All move commands take 1 tick, at least for now */
2292	op->speed_left--;	2289	--op->speed_left;
2293		2290
2294	/* Instead of all the stuff below, let move_player take care	2291	/* Instead of all the stuff below, let move_player take care
2295	* of it. Also, some of the skill stuff is only put in	2292	* of it. Also, some of the skill stuff is only put in
2296	* there, as well as the confusion stuff.	2293	* there, as well as the confusion stuff.
2297	*/	2294	*/
2298	move_player (op, op->direction);	2295	move_player (op, op->direction);
2299		2296
2300	return op->speed_left > 0;	2297	return op->speed_left > 0.f;
2301	}	2298	}
2302	}	2299	}
2303		2300
2304	return 0;	2301	return 0;
2305	}	2302	}
…		…
2438	make_visible (op);	2435	make_visible (op);
2439	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2436	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440	}	2437	}
2441	}	2438	}
2442		2439
2443	if (op->contr->outputs_sync)
2444	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2445	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2446	flush_output_element (op, &op->contr->outputs[i]);
2447
2448	if (op->contr->ns->state == ST_PLAYING)	2440	if (op->contr->ns->state == ST_PLAYING)
2449	{	2441	{
2450	/* these next three if clauses make it possible to SLOW DOWN	2442	/* these next three if clauses make it possible to SLOW DOWN
2451	hp/grace/spellpoint regeneration. */	2443	hp/grace/spellpoint regeneration. */
2452	if (op->contr->gen_hp >= 0)	2444	if (op->contr->gen_hp >= 0)
…		…
2472	gen_grace = op->stats.maxgrace;	2464	gen_grace = op->stats.maxgrace;
2473	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2474	}	2466	}
2475		2467
2476	/* Regenerate Spell Points */	2468	/* Regenerate Spell Points */
2477	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2469	if (!op->contr->golem && --op->last_sp < 0)
2478	{	2470	{
2479	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2471	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2480	if (op->stats.sp < op->stats.maxsp)	2472	if (op->stats.sp < op->stats.maxsp)
2481	{	2473	{
2482	op->stats.sp++;	2474	op->stats.sp++;
…		…
2580	}	2572	}
2581		2573
2582	/* Digestion */	2574	/* Digestion */
2583	if (--op->last_eat < 0)	2575	if (--op->last_eat < 0)
2584	{	2576	{
2585	#ifdef COZY_SERVER
2586	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2587	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2588	#else
2589	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2590	#endif
2591		2578
2592	if (op->contr->gen_hp > 0)	2579	if (op->contr->gen_hp > 0)
2593	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2594	else	2581	else
2595	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2940	object *force;	2927	object *force;
2941	int at;	2928	int at;
2942		2929
2943	force = get_archetype (FORCE_NAME);	2930	force = get_archetype (FORCE_NAME);
2944	/* 50 ticks should be enough time for the spell to abate */	2931	/* 50 ticks should be enough time for the spell to abate */
2945	force->speed = 0.1;	2932	force->speed = 0.1f;
2946	force->speed_left = -5.0;	2933	force->speed_left = -5.f;
2947	SET_FLAG (force, FLAG_APPLIED);	2934	SET_FLAG (force, FLAG_APPLIED);
2948	for (at = 0; at < NROFATTACKS; at++)	2935	for (at = 0; at < NROFATTACKS; at++)
2949	if (will_kill_again & (1 << at))	2936	if (will_kill_again & (1 << at))
2950	force->resist[at] = 100;	2937	force->resist[at] = 100;
2951		2938
…		…
3517	* not readied.	3504	* not readied.
3518	*/	3505	*/
3519	void	3506	void
3520	player_unready_range_ob (player pl, object ob)	3507	player_unready_range_ob (player pl, object ob)
3521	{	3508	{
3522	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3509	if (pl->ob->current_weapon == ob)
		3510	pl->ob->current_weapon = 0;
		3511
		3512	if (pl->combat_ob == ob)
		3513	pl->combat_ob = 0;
		3514
3523	if (pl->ranges[i] == ob)	3515	if (pl->ranged_ob == ob)
3524	{
3525	pl->ranges[i] = 0;	3516	pl->ranged_ob = 0;
3526	if (pl->shoottype == i)
3527	pl->shoottype = range_none;
3528	}
3529	}	3517	}
3530		3518
3531	sint8	3519	sint8
3532	player::visibility_at (maptile *map, int x, int y) const	3520	player::visibility_at (maptile *map, int x, int y) const
3533	{	3521	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.110 by root, Mon Apr 16 06:23:43 2007 UTC vs. Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.110 by root, Mon Apr 16 06:23:43 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC