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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.102 by root, Wed Feb 7 02:04:47 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>
…		…
116		115
117	news[0] = '\0';	116	news[0] = '\0';
118	subject[0] = '\0';	117	subject[0] = '\0';
119	size = 0;	118	size = 0;
120		119
121	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
122	{	121	{
123	if (*buf == '#')	122	if (*buf == '#')
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;
		210	party = 0;
202		211
203	// 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
204	ranges [range_skill] = 0;
205		213
206	players.erase (this);	214	players.erase (this);
207	}	215	}
208		216
209	// connect the player with a specific client	217	// connect the player with a specific client
210	// also changed, rationalises, and fixes some incorrect settings	218	// also changes, rationalises, and fixes some incorrect settings
211	void	219	void
212	player::connect (client *ns)	220	player::connect (client *ns)
213	{	221	{
214	this->ns = ns;	222	this->ns = ns;
215	ns->pl = this;	223	ns->pl = this;
216		224
217	run_on = 0;	225	run_on = 0;
218	fire_on = 0;	226	fire_on = 0;
219	ob->container = 0; //TODO: client-specific	227	ob->close_container (); //TODO: client-specific
220		228
221	ns->update_look = 0;	229	ns->update_look = 0;
222	ns->look_position = 0;	230	ns->look_position = 0;
223		231
224	clear_los (ob);	232	clear_los (ob);
…		…
227		235
228	/* make sure he's a player -- needed because of class change. */	236	/* make sure he's a player -- needed because of class change. */
229	ob->type = PLAYER; // we are paranoid	237	ob->type = PLAYER; // we are paranoid
230	ob->race = ob->arch->clone.race;	238	ob->race = ob->arch->clone.race;
231		239
232	if (!legal_range (ob, shoottype))
233	shoottype = range_none;
234
235	ob->carrying = sum_weight (ob);	240	ob->carrying = sum_weight (ob);
236	link_player_skills (ob);	241	link_player_skills (ob);
237		242
238	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239		244
240	assign (title, ob->arch->clone.name);	245	assign (title, ob->arch->clone.name);
241
242	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
243	* from the class, and not race. I don't see any way to get the class information
244	* to then update this. I don't think this will actually break anything - anyone
245	* that can use armour should be able to use a shield. What this may 'break'
246	* are features new characters get, eg, if someone starts up with a Q, they
247	* should be able to use a shield. However, old Q's won't get that advantage.
248	*/
249	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
250	SET_FLAG (ob, FLAG_USE_SHIELD);
251		246
252	/* if it's a dragon player, set the correct title here */	247	/* if it's a dragon player, set the correct title here */
253	if (is_dragon_pl (ob))	248	if (is_dragon_pl (ob))
254	{	249	{
255	object tmp, abil = 0, *skin = 0;	250	object tmp, abil = 0, *skin = 0;
…		…
269		264
270	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
271		266
272	esrv_new_player (this, ob->weight + ob->carrying);	267	esrv_new_player (this, ob->weight + ob->carrying);
273		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);
274	ob->update_stats ();	293	ob->update_stats ();
		294
275	ns->floorbox_update ();	295	ns->floorbox_update ();
276
277	esrv_send_inventory (ob, ob);	296	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);	297	esrv_add_spells (this, 0);
279		298
280	activate ();	299	activate ();
281		300
…		…
297		316
298	INVOKE_PLAYER (DISCONNECT, this);	317	INVOKE_PLAYER (DISCONNECT, this);
299		318
300	ns->reset_stats ();	319	ns->reset_stats ();
301	ns->pl = 0;	320	ns->pl = 0;
302	this->ns = 0;	321	ns = 0;
303	}	322	}
304		323
		324	if (ob)
305	ob->container = 0; //TODO: client-specific	325	ob->close_container (); //TODO: client-specific
		326
306	deactivate ();	327	deactivate ();
307	}	328	}
308		329
309	// the need for this function can be explained	330	// the need for this function can be explained
310	// by load_object not returning the object	331	// by load_object not returning the object
311	void	332	void
312	player::set_object (object *op)	333	player::set_object (object *op)
313	{	334	{
314	ob = op;	335	ob = op;
315	ob->contr = this; /* this aren't yet in archetype */	336	ob->contr = this; /* this aren't yet in archetype */
316		337
317	ob->speed_left = 0.5;	338	ob->speed_left = 0.5f;
318	ob->speed = 1.0;	339	ob->speed = 1.0f;
319	ob->direction = 5; /* So player faces south */	340	ob->direction = 5; /* So player faces south */
320	ob->stats.wc = 2;
321	ob->run_away = 25; /* Then we panick... */
322
323	ob->roll_stats ();
324	}	341	}
325		342
326	player::player ()	343	player::player ()
327	{	344	{
328	/* There are some elements we want initialised to non zero value -	345	/* There are some elements we want initialised to non zero value -
329	* we deal with that below this point.	346	* we deal with that below this point.
330	*/	347	*/
331	outputs_sync = 16; /* Every 2 seconds */	348	outputs_sync = 4;
332	outputs_count = 8; /* Keeps present behaviour */	349	outputs_count = 4;
333	unapply = unapply_nochoice;	350	unapply = unapply_nochoice;
334		351
335	savebed_map = first_map_path; /* Init. respawn position */	352	savebed_map = first_map_path; /* Init. respawn position */
336		353
337	gen_sp_armour = 10;	354	gen_sp_armour = 10;
338	shoottype = range_none;
339	bowtype = bow_normal;	355	bowtype = bow_normal;
340	petmode = pet_normal;	356	petmode = pet_normal;
341	listening = 10;	357	listening = 10;
342	usekeys = containers;	358	usekeys = containers;
343	peaceful = 1; /* default peaceful */	359	peaceful = 1; /* default peaceful */
…		…
372	player::create ()	388	player::create ()
373	{	389	{
374	player *pl = new player;	390	player *pl = new player;
375		391
376	pl->set_object (arch_to_object (get_player_archetype (0)));	392	pl->set_object (arch_to_object (get_player_archetype (0)));
		393
		394	pl->ob->roll_stats ();
		395	pl->ob->stats.wc = 2;
		396	pl->ob->run_away = 25; /* Then we panick... */
		397
377	set_first_map (pl->ob);	398	set_first_map (pl->ob);
378		399
379	return pl;	400	return pl;
380	}	401	}
381		402
…		…
777	}	798	}
778		799
779	void	800	void
780	object::roll_stats ()	801	object::roll_stats ()
781	{	802	{
782	int statsort [7];	803	int statsort [NUM_STATS];
783		804
784	for (;;)	805	for (;;)
785	{	806	{
786	int sum = 0;	807	int sum = 0;
787	for (int i = 7; i--; )	808	for (int i = NUM_STATS; i--; )
788	sum += statsort [i] = roll_stat ();	809	sum += statsort [i] = roll_stat ();
789		810
790	if (sum >= 82 && sum <= 116)	811	if (sum >= 82 && sum <= 116)
791	break;	812	break;
792	}	813	}
793		814
794	// Sort the stats so that rerolling is easier...	815	// Sort the stats so that rerolling is easier...
795	std::sort (statsort, statsort + 7, std::greater<int>());	816	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
796		817
		818	for (int i = 0; i < NUM_STATS; ++i)
797	stats.Str = statsort[0];	819	stats.stat (i) = statsort [i];
798	stats.Dex = statsort[1];
799	stats.Con = statsort[2];
800	stats.Int = statsort[3];
801	stats.Wis = statsort[4];
802	stats.Pow = statsort[5];
803	stats.Cha = statsort[6];
804		820
805	stats.exp = 0;	821	stats.exp = 0;
806	stats.ac = 0;	822	stats.ac = 0;
807		823
808	stats.hp = stats.maxhp;	824	stats.hp = stats.maxhp;
…		…
820	}	836	}
821		837
822	void	838	void
823	object::swap_stats (int a, int b)	839	object::swap_stats (int a, int b)
824	{	840	{
825	int tmp = get_attr_value (&contr->orig_stats, a);	841	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
826	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
827	set_attr_value (&contr->orig_stats, b, tmp);
828		842
		843	for (int i = 0; i < NUM_STATS; ++i)
829	stats.Str = contr->orig_stats.Str;	844	stats.stat (i) = contr->orig_stats.stat (i);
830	stats.Dex = contr->orig_stats.Dex;
831	stats.Con = contr->orig_stats.Con;
832	stats.Int = contr->orig_stats.Int;
833	stats.Wis = contr->orig_stats.Wis;
834	stats.Pow = contr->orig_stats.Pow;
835	stats.Cha = contr->orig_stats.Cha;
836		845
837	//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,
838	// be merged with the similar code in roll_stats	847	// be merged with the similar code in roll_stats
839	stats.ac = 0;	848	stats.ac = 0;
840		849
…		…
871	* appropriate action with it (change race, or other things).	880	* appropriate action with it (change race, or other things).
872	* The function name is for historical reasons - now we have	881	* The function name is for historical reasons - now we have
873	* separate race and class; this actually changes the RACE,	882	* separate race and class; this actually changes the RACE,
874	* not the class.	883	* not the class.
875	*/	884	*/
876	int	885	void
877	key_change_class (object *op, char key)	886	player::chargen_race_done ()
878	{	887	{
879	int tmp_loop;
880
881	if (key == 'd' \|\| key == 'D')
882	{
883	char buf[MAX_BUF];
884
885	/* this must before then initial items are given */	888	/* this must before then initial items are given */
886	esrv_new_player (op->contr, op->weight + op->carrying);	889	esrv_new_player (ob->contr, ob->weight + ob->carrying);
887		890
888	treasurelist *tl = find_treasurelist ("starting_wealth");	891	treasurelist *tl = treasurelist::find ("starting_wealth");
889	if (tl)	892	if (tl)
890	create_treasure (tl, op, 0, 0, 0);	893	create_treasure (tl, ob, 0, 0, 0);
891		894
892	INVOKE_PLAYER (BIRTH, op->contr);	895	INVOKE_PLAYER (BIRTH, ob->contr);
893	INVOKE_PLAYER (LOGIN, op->contr);	896	INVOKE_PLAYER (LOGIN, ob->contr);
894		897
895	op->contr->ns->state = ST_PLAYING;	898	ob->contr->ns->state = ST_PLAYING;
896		899
897	if (op->msg)	900	if (ob->msg)
898	op->msg = NULL;	901	ob->msg = 0;
899		902
900	/* 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
901	* to save here.	904	* to save here.
902	*/	905	*/
		906	{
		907	char buf[MAX_BUF];
903	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	908	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
904	make_path_to_file (buf);	909	make_path_to_file (buf);
		910	}
905		911
906	start_info (op);	912	start_info (ob);
907	CLEAR_FLAG (op, FLAG_WIZ);	913	CLEAR_FLAG (ob, FLAG_WIZ);
908	give_initial_items (op, op->randomitems);	914	give_initial_items (ob, ob->randomitems);
909	link_player_skills (op);	915	link_player_skills (ob);
910	esrv_send_inventory (op, op);	916	esrv_send_inventory (ob, ob);
911	op->update_stats ();	917	ob->update_stats ();
912		918
913	/* This moves the player to a different start map, if there	919	/* This moves the player to a different start map, if there
914	* is one for this race	920	* is one for this race
915	*/	921	*/
916	if (*first_map_ext_path)	922	if (*first_map_ext_path)
917	{	923	{
918	object *tmp;	924	object *tmp;
919	char mapname[MAX_BUF];	925	char mapname[MAX_BUF];
920		926
921	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);
922	tmp = object::create ();	928	tmp = object::create ();
923	EXIT_PATH (tmp) = mapname;	929	EXIT_PATH (tmp) = mapname;
924	EXIT_X (tmp) = op->x;	930	EXIT_X (tmp) = ob->x;
925	EXIT_Y (tmp) = op->y;	931	EXIT_Y (tmp) = ob->y;
926	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;
927	* if the map isn't there, then stay on the	933	* if the map isn't there, then stay on the
928	* default initial map */	934	* default initial map */
929	tmp->destroy ();	935	tmp->destroy ();
930	}	936	}
931	else	937	else
932	LOG (llevDebug, "first_map_ext_path not set\n");	938	LOG (llevDebug, "first_map_ext_path not set\n");
		939	}
933		940
934	return 0;	941	void
935	}	942	player::chargen_race_next ()
936		943	{
937	/* Following actually changes the race - this is the default command	944	/* Following actually changes the race - this is the default command
938	* if we don't match with one of the options above.	945	* if we don't match with one of the options above.
939	*/	946	*/
940		947
941	tmp_loop = 0;	948	do
942	while (!tmp_loop)
943	{	949	{
944	shstr name = op->name;	950	shstr name = ob->name;
945	int x = op->x, y = op->y;	951	int x = ob->x, y = ob->y;
946		952
947	op->remove_statbonus ();	953	ob->remove_statbonus ();
948	op->remove ();	954	ob->remove ();
949	op->arch = get_player_archetype (op->arch);	955	ob->arch = get_player_archetype (ob->arch);
950	op->arch->clone.copy_to (op);	956	ob->arch->clone.copy_to (ob);
951	op->instantiate ();	957	ob->instantiate ();
952	op->stats = op->contr->orig_stats;	958	ob->stats = ob->contr->orig_stats;
953	op->name = op->name_pl = name;	959	ob->name = ob->name_pl = name;
954	op->x = x;	960	ob->x = x;
955	op->y = y;	961	ob->y = y;
956	SET_ANIMATION (op, 2); /* So player faces south */	962	SET_ANIMATION (ob, 2); /* So player faces south */
957	insert_ob_in_map (op, op->map, op, 0);	963	insert_ob_in_map (ob, ob->map, ob, 0);
958	assign (op->contr->title, op->arch->clone.name);	964	assign (ob->contr->title, ob->arch->clone.name);
959	op->add_statbonus ();	965	ob->add_statbonus ();
960	tmp_loop = allowed_class (op);
961	}	966	}
		967	while (!allowed_class (ob));
962		968
963	update_object (op, UP_OBJ_FACE);	969	update_object (ob, UP_OBJ_FACE);
964	esrv_update_item (UPD_FACE, op, op);	970	esrv_update_item (UPD_FACE, ob, ob);
965	op->update_stats ();	971	ob->update_stats ();
966	op->stats.hp = op->stats.maxhp;	972	ob->stats.hp = ob->stats.maxhp;
967	op->stats.sp = op->stats.maxsp;	973	ob->stats.sp = ob->stats.maxsp;
968	op->stats.grace = 0;	974	ob->stats.grace = 0;
969
970	if (op->msg)
971	new_draw_info (NDI_BLUE, 0, op, op->msg);
972
973	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
974	return 0;
975	}	975	}
976		976
977	void	977	void
978	flee_player (object *op)	978	flee_player (object *op)
979	{	979	{
…		…
1026	/* Cornered, get rid of scared */	1026	/* Cornered, get rid of scared */
1027	CLEAR_FLAG (op, FLAG_SCARED);	1027	CLEAR_FLAG (op, FLAG_SCARED);
1028	op->enemy = NULL;	1028	op->enemy = NULL;
1029	}	1029	}
1030		1030
1031
1032	/* 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.
1033	* 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
1034	* stop.	1033	* stop.
1035	*/	1034	*/
1036	int	1035	int
1037	check_pick (object *op)	1036	check_pick (object *op)
1038	{	1037	{
1039	object tmp, next;	1038	object tmp, next;
1040	int stop = 0;	1039	int stop = 0;
1041	int j, k, wvratio;	1040	int wvratio;
1042	char putstring[128], tmpstr[16];	1041	char putstring[128];
1043		1042
1044	/* if you're flying, you cna't pick up anything */	1043	/* if you're flying, you cna't pick up anything */
1045	if (op->move_type & MOVE_FLYING)	1044	if (op->move_type & MOVE_FLYING)
1046	return 1;	1045	return 1;
1047		1046
…		…
1384	* found object is returned.	1383	* found object is returned.
1385	*/	1384	*/
1386	object *	1385	object *
1387	find_arrow (object op, const char type)	1386	find_arrow (object op, const char type)
1388	{	1387	{
1389	object *tmp = NULL;	1388	object *tmp = 0;
1390		1389
1391	for (op = op->inv; op; op = op->below)	1390	for (op = op->inv; op; op = op->below)
1392	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1391	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1393	tmp = find_arrow (op, type);	1392	tmp = find_arrow (op, type);
1394	else if (op->type == ARROW && op->race == type)	1393	else if (op->type == ARROW && op->race == type)
1395	return op;	1394	return op;
		1395
1396	return tmp;	1396	return tmp;
1397	}	1397	}
1398		1398
1399	/*	1399	/*
1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1401	* against the target. A full test is not performed, simply a basic test	1401	* against the target. A full test is not performed, simply a basic test
1402	* of resistances. The archer is making a quick guess at what he sees down	1402	* of resistances. The archer is making a quick guess at what he sees down
1403	* the hall. Failing that it does it's best to pick the highest plus arrow.	1403	* the hall. Failing that it does it's best to pick the highest plus arrow.
1404	*/	1404	*/
1405
1406	object *	1405	object *
1407	find_better_arrow (object op, object target, const char type, int better)	1406	find_better_arrow (object op, object target, const char type, int better)
1408	{	1407	{
1409	object tmp = NULL, arrow, *ntmp;	1408	object tmp = NULL, arrow, *ntmp;
1410	int attacknum, attacktype, betterby = 0, i;	1409	int attacknum, attacktype, betterby = 0, i;
…		…
1476	* find_better_arrow to find a decent arrow to use.	1475	* find_better_arrow to find a decent arrow to use.
1477	* op = the shooter	1476	* op = the shooter
1478	* type = bow->race	1477	* type = bow->race
1479	* dir = fire direction	1478	* dir = fire direction
1480	*/	1479	*/
1481
1482	object *	1480	object *
1483	pick_arrow_target (object op, const char type, int dir)	1481	pick_arrow_target (object op, const char type, int dir)
1484	{	1482	{
1485	object *tmp = NULL;	1483	object *tmp = NULL;
1486	maptile *m;	1484	maptile *m;
…		…
1551	*/	1549	*/
1552	int	1550	int
1553	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)
1554	{	1552	{
1555	object left, bow;	1553	object left, bow;
1556	int bowspeed, mflags;	1554	int mflags;
1557	maptile *m;	1555	maptile *m;
1558		1556
1559	if (!dir)	1557	if (!dir)
1560	{	1558	{
1561	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!");
1562	return 0;	1560	return 0;
1563	}	1561	}
1564		1562
1565	if (op->type == PLAYER)	1563	if (op->contr)
1566	bow = op->contr->ranges[range_bow];	1564	bow = op->current_weapon;
1567	else	1565	else
1568	{	1566	{
1569	for (bow = op->inv; bow; bow = bow->below)	1567	for (bow = op->inv; bow; bow = bow->below)
1570	/* 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
1571	* 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.
…		…
1576	if (!bow)	1574	if (!bow)
1577	{	1575	{
1578	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1576	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1579	return 0;	1577	return 0;
1580	}	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
1581	}	1587	}
1582		1588
1583	if (!bow->race \|\| !bow->skill)	1589	if (!bow->race \|\| !bow->skill)
1584	{	1590	{
1585	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);
1586	return 0;	1592	return 0;
1587	}	1593	}
1588
1589	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1590
1591	/* penalize ROF for bestarrow */
1592	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1593	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1594
1595	if (bowspeed < 1)
1596	bowspeed = 1;
1597		1594
1598	if (arrow == NULL)	1595	if (arrow == NULL)
1599	{	1596	{
1600	if ((arrow = find_arrow (op, bow->race)) == NULL)	1597	if ((arrow = find_arrow (op, bow->race)) == NULL)
1601	{	1598	{
1602	if (op->type == PLAYER)	1599	if (op->type == PLAYER)
1603	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);
1604	/* 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 */
1605	else	1602	else
1606	CLEAR_FLAG (op, FLAG_READY_BOW);	1603	CLEAR_FLAG (op, FLAG_READY_BOW);
		1604
1607	return 0;	1605	return 0;
1608	}	1606	}
1609	}	1607	}
1610		1608
1611	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1609	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1635		1633
1636	arrow->set_owner (op);	1634	arrow->set_owner (op);
1637	arrow->skill = bow->skill;	1635	arrow->skill = bow->skill;
1638	arrow->direction = dir;	1636	arrow->direction = dir;
1639		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
1640	if (op->type == PLAYER)	1676	if (op->type == PLAYER)
1641	{	1677	{
1642	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1643	op->update_stats ();
1644	}
1645
1646	SET_ANIMATION (arrow, arrow->direction);
1647	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1648	arrow->stats.hp = arrow->stats.dam;
1649	arrow->stats.grace = arrow->attacktype;
1650	if (arrow->slaying != NULL)
1651	arrow->spellarg = strdup (arrow->slaying);
1652
1653	/* Note that this was different for monsters - they got their level
1654	* added to the damage. I think the strength bonus is more proper.
1655	*/
1656
1657	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1658
1659	/* update the speed */
1660	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1661	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1662
1663	arrow->set_speed (max (arrow->speed, 1.0));
1664	arrow->speed_left = 0;
1665
1666	if (op->type == PLAYER)
1667	{
1668	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1669	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1670	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1671
1672	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;
1673	}	1685	}
1674	else	1686	else
1675	{	1687	{
1676	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1677	arrow->level = op->level;	1688	arrow->level = op->level;
1678	}	1689	arrow->stats.wc -= bow->magic;
1679		1690
1680	if (arrow->attacktype == AT_PHYSICAL)	1691	if (!arrow->slaying)
		1692	arrow->slaying = bow->slaying;
		1693
1681	arrow->attacktype \|= bow->attacktype;	1694	arrow->attacktype \|= bow->attacktype;
		1695	}
1682		1696
1683	if (bow->slaying)	1697	wc -= arrow->level;
1684	arrow->slaying = bow->slaying;	1698	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1685		1699
		1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686	arrow->move_type = MOVE_FLY_LOW;	1701	arrow->move_type = MOVE_FLY_LOW;
1687	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1702	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1688		1703
1689	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);
1690	m->insert (arrow, sx, sy, op);	1705	m->insert (arrow, sx, sy, op);
…		…
1715	{	1730	{
1716	int ret = 0, wcmod = 0;	1731	int ret = 0, wcmod = 0;
1717		1732
1718	if (op->contr->bowtype == bow_bestarrow)	1733	if (op->contr->bowtype == bow_bestarrow)
1719	{	1734	{
1720	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);
1721	}	1736	}
1722	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)
1723	{	1738	{
1724	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1725	wcmod = -1;	1740	wcmod = -1;
…		…
1735	else if (op->contr->bowtype == bow_spreadshot)	1750	else if (op->contr->bowtype == bow_spreadshot)
1736	{	1751	{
1737	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);
1738	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);
1739	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);
1740
1741	}	1755	}
1742	else	1756	else
1743	{	1757	{
1744	/* Simple case */	1758	/* Simple case */
1745	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);
1746	}	1760	}
		1761
1747	return ret;	1762	return ret;
1748	}	1763	}
1749
1750		1764
1751	/* Fires a misc (wand/rod/horn) object in 'dir'.	1765	/* Fires a misc (wand/rod/horn) object in 'dir'.
1752	* Broken apart from 'fire' to keep it more readable.	1766	* Broken apart from 'fire' to keep it more readable.
1753	*/	1767	*/
1754	void	1768	void
1755	fire_misc_object (object *op, int dir)	1769	fire_misc_object (object *op, int dir)
1756	{	1770	{
1757	object *item;	1771	object *item = op->contr->ranged_ob;
1758		1772
1759	if (!op->contr->ranges[range_misc])	1773	if (!item)
1760	{	1774	{
1761	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.");
1762	return;	1776	return;
1763	}	1777	}
1764		1778
1765	item = op->contr->ranges[range_misc];
1766	if (!item->inv)	1779	if (!item->inv)
1767	{	1780	{
1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1781	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769	return;	1782	return;
1770	}	1783	}
		1784
		1785	if (!op->change_weapon (item))
		1786	return;
		1787
1771	if (item->type == WAND)	1788	if (item->type == WAND)
1772	{	1789	{
1773	if (item->stats.food <= 0)	1790	if (item->stats.food <= 0)
1774	{	1791	{
1775	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1776	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
1777	return;	1795	return;
1778	}	1796	}
1779	}	1797	}
1780	else if (item->type == ROD \|\| item->type == HORN)	1798	else if (item->type == ROD \|\| item->type == HORN)
1781	{	1799	{
1782	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))
1783	{	1801	{
1784	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1803
1785	if (item->type == ROD)	1804	if (item->type == ROD)
1786	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));
1787	else	1806	else
1788	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
1789	return;	1809	return;
1790	}	1810	}
1791	}	1811	}
1792		1812
1793	if (cast_spell (op, item, dir, item->inv, NULL))	1813	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1824		1844
1825	/* check for loss of invisiblity/hide */	1845	/* check for loss of invisiblity/hide */
1826	if (action_makes_visible (op))	1846	if (action_makes_visible (op))
1827	make_visible (op);	1847	make_visible (op);
1828		1848
1829	switch (op->contr->shoottype)	1849	player *pl = op->contr;
		1850
		1851	if (pl->golem)
1830	{	1852	{
1831	case range_none:	1853	control_golem (op->contr->golem, dir);
1832	return;	1854	return;
		1855	}
1833		1856
1834	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:
1835	player_fire_bow (op, dir);	1868	player_fire_bow (op, dir);
1836	return;	1869	break;
1837		1870
1838	case range_magic: /* Casting spells */	1871	case SPELL:
1839	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);
1840	return;	1873	break;
1841		1874
1842	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:
1843	fire_misc_object (op, dir);	1884	fire_misc_object (op, dir);
1844	return;	1885	break;
1845
1846	case range_golem: /* Control summoned monsters from scrolls */
1847	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1848	{
1849	op->contr->ranges[range_golem] = 0;
1850	op->contr->shoottype = range_none;
1851	}
1852	else
1853	control_golem (op->contr->ranges[range_golem], dir);
1854	return;
1855
1856	case range_skill:
1857	if (!op->chosen_skill)
1858	{
1859	if (op->type == PLAYER)
1860	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1861	return;
1862	}
1863
1864	do_skill (op, op, op->chosen_skill, dir, NULL);
1865	return;
1866	case range_builder:
1867	apply_map_builder (op, dir);
1868	return;
1869	default:
1870	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1871	return;
1872	}	1886	}
1873	}	1887	}
1874
1875
1876		1888
1877	/* find_key	1889	/* find_key
1878	* 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
1879	* and successfully use it, we return the key, otherwise NULL	1891	* and successfully use it, we return the key, otherwise NULL
1880	* This function merges both normal and locked door, since the logic	1892	* This function merges both normal and locked door, since the logic
…		…
1882	* pl is the player,	1894	* pl is the player,
1883	* inv is the objects inventory to searched	1895	* inv is the objects inventory to searched
1884	* door is the door we are trying to match against.	1896	* door is the door we are trying to match against.
1885	* This function can be called recursively to search containers.	1897	* This function can be called recursively to search containers.
1886	*/	1898	*/
1887
1888	object *	1899	object *
1889	find_key (object pl, object container, object *door)	1900	find_key (object pl, object container, object *door)
1890	{	1901	{
1891	object tmp, key;	1902	object tmp, key;
1892		1903
1893	/* Should not happen, but sanity checking is never bad */	1904	/* Should not happen, but sanity checking is never bad */
1894	if (container->inv == NULL)	1905	if (!container->inv)
1895	return NULL;	1906	return 0;
1896		1907
1897	/* First, lets try to find a key in the top level inventory */	1908	/* First, lets try to find a key in the top level inventory */
1898	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1909	for (tmp = container->inv; tmp; tmp = tmp->below)
1899	{	1910	{
1900	if (door->type == DOOR && tmp->type == KEY)	1911	if (door->type == DOOR && tmp->type == KEY)
1901	break;	1912	break;
1902	/* For sanity, we should really check door type, but other stuff	1913	/* For sanity, we should really check door type, but other stuff
1903	* (like containers) can be locked with special keys	1914	* (like containers) can be locked with special keys
1904	*/	1915	*/
1905	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1916	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1906	break;	1917	break;
1907	}	1918	}
		1919
1908	/* No key found - lets search inventories now */	1920	/* No key found - lets search inventories now */
1909	/* If we find and use a key in an inventory, return at that time.	1921	/* If we find and use a key in an inventory, return at that time.
1910	* otherwise, if we search all the inventories and still don't find	1922	* otherwise, if we search all the inventories and still don't find
1911	* a key, return	1923	* a key, return
1912	*/	1924	*/
1913	if (!tmp)	1925	if (!tmp)
1914	{	1926	{
1915	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1927	for (tmp = container->inv; tmp; tmp = tmp->below)
1916	{	1928	{
1917	/* No reason to search empty containers */	1929	/* No reason to search empty containers */
1918	if (tmp->type == CONTAINER && tmp->inv)	1930	if (tmp->type == CONTAINER && tmp->inv)
1919	{	1931	{
1920	if ((key = find_key (pl, tmp, door)) != NULL)	1932	if ((key = find_key (pl, tmp, door)))
1921	return key;	1933	return key;
1922	}	1934	}
1923	}	1935	}
		1936
1924	if (!tmp)	1937	if (!tmp)
1925	return NULL;	1938	return NULL;
1926	}	1939	}
		1940
1927	/* We get down here if we have found a key. Now if its in a container,	1941	/* We get down here if we have found a key. Now if its in a container,
1928	* see if we actually want to use it	1942	* see if we actually want to use it
1929	*/	1943	*/
1930	if (pl != container)	1944	if (pl != container)
1931	{	1945	{
…		…
1952	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1966	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1953	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1967	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1954	return NULL;	1968	return NULL;
1955	}	1969	}
1956	}	1970	}
		1971
1957	return tmp;	1972	return tmp;
1958	}	1973	}
1959		1974
1960	/* moved door processing out of move_player_attack.	1975	/* moved door processing out of move_player_attack.
1961	* returns 1 if player has opened the door with a key	1976	* returns 1 if player has opened the door with a key
…		…
1975	if (key)	1990	if (key)
1976	{	1991	{
1977	object *container = key->env;	1992	object *container = key->env;
1978		1993
1979	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
1980	if (action_makes_visible (op))	1996	if (action_makes_visible (op))
1981	make_visible (op);	1997	make_visible (op);
		1998
1982	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1999	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1983	spring_trap (door->inv, op);	2000	spring_trap (door->inv, op);
		2001
1984	if (door->type == DOOR)	2002	if (door->type == DOOR)
1985	{
1986	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 */
1987	}
1988	else if (door->type == LOCKED_DOOR)	2004	else if (door->type == LOCKED_DOOR)
1989	{	2005	{
1990	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1991	remove_door2 (door); /* remove door without violence ;-) */	2007	remove_door2 (door); /* remove door without violence ;-) */
1992	}	2008	}
		2009
1993	/* Do this after we print the message */	2010	/* Do this after we print the message */
1994	decrease_ob (key); /* Use up one of the keys */	2011	decrease_ob (key); /* Use up one of the keys */
1995	/* Need to update the weight the container the key was in */	2012	/* Need to update the weight the container the key was in */
1996	if (container != op)	2013	if (container != op)
1997	esrv_update_item (UPD_WEIGHT, op, container);	2014	esrv_update_item (UPD_WEIGHT, op, container);
		2015
1998	return 1; /* Nothing more to do below */	2016	return 1; /* Nothing more to do below */
1999	}	2017	}
2000	else if (door->type == LOCKED_DOOR)	2018	else if (door->type == LOCKED_DOOR)
2001	{	2019	{
2002	/* Might as well return now - no other way to open this */	2020	/* Might as well return now - no other way to open this */
2003	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	2021	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2004	return 1;	2022	return 1;
2005	}	2023	}
		2024
2006	return 0;	2025	return 0;
2007	}	2026	}
2008		2027
2009	/* This function is just part of a breakup from move_player.	2028	/* This function is just part of a breakup from move_player.
2010	* It should keep the code cleaner.	2029	* It should keep the code cleaner.
…		…
2014	*/	2033	*/
2015	void	2034	void
2016	move_player_attack (object *op, int dir)	2035	move_player_attack (object *op, int dir)
2017	{	2036	{
2018	object tmp, mon;	2037	object tmp, mon;
2019	sint16 nx, ny;
2020	int on_battleground;	2038	int on_battleground;
2021	maptile *m;	2039	maptile *m;
2022		2040
2023	nx = freearr_x[dir] + op->x;	2041	sint16 nx = freearr_x[dir] + op->x;
2024	ny = freearr_y[dir] + op->y;	2042	sint16 ny = freearr_y[dir] + op->y;
2025		2043
2026	on_battleground = op_on_battleground (op, 0, 0);	2044	on_battleground = op_on_battleground (op, 0, 0);
2027		2045
2028	/* 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
2029	* 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
…		…
2094		2112
2095	/* 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
2096	* peaceful. Our assumption is the creature is a pet if the	2114	* peaceful. Our assumption is the creature is a pet if the
2097	* player owns it and it is either friendly or unagressive.	2115	* player owns it and it is either friendly or unagressive.
2098	*/	2116	*/
2099	if ((op->type == PLAYER)	2117	if (op->type == PLAYER
2100	#if COZY_SERVER
2101	&&
2102	((mon->owner && mon->owner->contr	2118	&& ((mon->owner && mon->owner->contr
2103	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2119	&& same_party (mon->owner->contr->party, op->contr->party))
2104	#else
2105	&& mon->owner == op	2120	\|\| mon->owner == op)
2106	#endif
2107	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108	{	2122	{
2109	/* 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 */
2110	if (op->contr->braced)	2124	if (op->contr->braced)
2111	return;	2125	return;
2112		2126
2113	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);
2114	(void) push_ob (mon, dir, op);	2128	push_ob (mon, dir, op);
2115	if (op->contr->tmp_invis \|\| op->hide)	2129	if (op->contr->tmp_invis \|\| op->hide)
2116	make_visible (op);	2130	make_visible (op);
2117		2131
2118	return;	2132	return;
2119	}	2133	}
…		…
2121	/* in certain circumstances, you shouldn't attack friendly	2135	/* in certain circumstances, you shouldn't attack friendly
2122	* creatures. Note that if you are braced, you can't push	2136	* creatures. Note that if you are braced, you can't push
2123	* 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
2124	* attack them either.	2138	* attack them either.
2125	*/	2139	*/
2126	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2140	if ((mon->type == PLAYER \|\| mon->enemy != op)
2127	(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))
2128	#ifdef PROHIBIT_PLAYERKILL
2129	(op->contr->peaceful	2142	&& ((op->contr->peaceful
2130	\|\| (mon->type == PLAYER	2143	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2131	&& mon->contr->
2132	peaceful)) &&
2133	#else
2134	op->contr->peaceful &&
2135	#endif
2136	!on_battleground))	2144	&& !on_battleground))
2137	{	2145	{
2138	if (!op->contr->braced)	2146	if (!op->contr->braced)
2139	{	2147	{
2140	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);
2141	push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
…		…
2164	* 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.
2165	*/	2173	*/
2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167	((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)))
2168	{	2176	{
2169
2170	/* If the player hasn't hit something this tick, and does
2171	* so, give them speed boost based on weapon speed. Doing
2172	* it here is better than process_players2, which basically
2173	* incurred a 1 tick offset.
2174	*/
2175	if (!op->contr->has_hit)	2177	if (!op->contr->has_hit)
2176	{	2178	{
		2179	op->contr->has_hit = 1;
2177	op->speed_left += op->speed / op->contr->weapon_sp;	2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2178
2179	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180	}	2181	}
2181		2182
2182	skill_attack (mon, op, 0, 0, 0);	2183	skill_attack (mon, op, 0, 0, 0);
2183		2184
2184	/* If attacking another player, that player gets automatic	2185	/* If attacking another player, that player gets automatic
…		…
2259	* Returns true if there are more actions we can do.	2260	* Returns true if there are more actions we can do.
2260	*/	2261	*/
2261	int	2262	int
2262	handle_newcs_player (object *op)	2263	handle_newcs_player (object *op)
2263	{	2264	{
2264	if (op->contr->hidden)
2265	{
2266	op->invisible = 1000;
2267	/* the socket code flashes the player visible/invisible
2268	* depending on the value of invisible, so we need to
2269	* alternate it here for it to work correctly.
2270	*/
2271	if (pticks & 2)
2272	op->invisible--;
2273	}
2274	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2275	{
2276	op->invisible--;
2277	if (!op->invisible)
2278	{
2279	make_visible (op);
2280	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2281	}
2282	}
2283
2284	if (QUERY_FLAG (op, FLAG_SCARED))	2265	if (QUERY_FLAG (op, FLAG_SCARED))
2285	{	2266	{
2286	flee_player (op);	2267	flee_player (op);
		2268
2287	/* 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 */
2288	if (QUERY_FLAG (op, FLAG_SCARED))	2270	if (op->flag [FLAG_SCARED])
2289	{	2271	{
2290	op->speed_left--;	2272	--op->speed_left;
2291	return 0;	2273	return 0;
2292	}	2274	}
2293	}	2275	}
2294
2295	/* I've been seeing crashes where the golem has been destroyed, but
2296	* the player object still points to the defunct golem. The code that
2297	* destroys the golem looks correct, and it doesn't always happen, so
2298	* put this in a a workaround to clean up the golem pointer.
2299	*/
2300	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2301	op->contr->ranges[range_golem] = 0;
2302		2276
2303	/* 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
2304	* the players time has been increased when doericserver has been	2278	* the players time has been increased when doericserver has been
2305	* called, so we recheck it here.	2279	* called, so we recheck it here.
2306	*/	2280	*/
2307	if (op->contr->ns->handle_command ())	2281	if (op->contr->ns->handle_command ())
2308	return 1;	2282	return 1;
2309		2283
2310	if (op->speed_left > 0)	2284	if (op->speed_left > 0.f)
2311	{	2285	{
2312	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2313	{	2287	{
2314	/* All move commands take 1 tick, at least for now */	2288	/* All move commands take 1 tick, at least for now */
2315	op->speed_left--;	2289	--op->speed_left;
2316		2290
2317	/* Instead of all the stuff below, let move_player take care	2291	/* Instead of all the stuff below, let move_player take care
2318	* 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
2319	* there, as well as the confusion stuff.	2293	* there, as well as the confusion stuff.
2320	*/	2294	*/
2321	move_player (op, op->direction);	2295	move_player (op, op->direction);
2322		2296
2323	return op->speed_left > 0;	2297	return op->speed_left > 0.f;
2324	}	2298	}
2325	}	2299	}
2326		2300
2327	return 0;	2301	return 0;
2328	}	2302	}
…		…
2367	* from.	2341	* from.
2368	*/	2342	*/
2369	void	2343	void
2370	remove_unpaid_objects (object op, object env)	2344	remove_unpaid_objects (object op, object env)
2371	{	2345	{
2372	object *next;
2373
2374	while (op)	2346	while (op)
2375	{	2347	{
2376	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2348	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2377		2349
2378	if (QUERY_FLAG (op, FLAG_UNPAID))	2350	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2444	int rate_grace = 2000;	2416	int rate_grace = 2000;
2445	const int max_hp = 1;	2417	const int max_hp = 1;
2446	const int max_sp = 1;	2418	const int max_sp = 1;
2447	const int max_grace = 1;	2419	const int max_grace = 1;
2448		2420
2449	if (op->contr->outputs_sync)	2421	if (op->contr->hidden)
		2422	{
		2423	op->invisible = 1000;
		2424	/* the socket code flashes the player visible/invisible
		2425	* depending on the value of invisible, so we need to
		2426	* alternate it here for it to work correctly.
		2427	*/
		2428	if (pticks & 2)
		2429	op->invisible--;
2450	{	2430	}
2451	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2431	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2452	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2432	{
2453	flush_output_element (op, &op->contr->outputs[i]);	2433	if (!op->invisible--)
		2434	{
		2435	make_visible (op);
		2436	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2437	}
2454	}	2438	}
2455		2439
2456	if (op->contr->ns->state == ST_PLAYING)	2440	if (op->contr->ns->state == ST_PLAYING)
2457	{	2441	{
2458	/* these next three if clauses make it possible to SLOW DOWN	2442	/* these next three if clauses make it possible to SLOW DOWN
…		…
2480	gen_grace = op->stats.maxgrace;	2464	gen_grace = op->stats.maxgrace;
2481	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2482	}	2466	}
2483		2467
2484	/* Regenerate Spell Points */	2468	/* Regenerate Spell Points */
2485	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2469	if (!op->contr->golem && --op->last_sp < 0)
2486	{	2470	{
2487	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);
2488	if (op->stats.sp < op->stats.maxsp)	2472	if (op->stats.sp < op->stats.maxsp)
2489	{	2473	{
2490	op->stats.sp++;	2474	op->stats.sp++;
…		…
2588	}	2572	}
2589		2573
2590	/* Digestion */	2574	/* Digestion */
2591	if (--op->last_eat < 0)	2575	if (--op->last_eat < 0)
2592	{	2576	{
2593	#ifdef COZY_SERVER
2594	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2595	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2596	#else
2597	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;
2598	#endif
2599		2578
2600	if (op->contr->gen_hp > 0)	2579	if (op->contr->gen_hp > 0)
2601	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);
2602	else	2581	else
2603	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2915	op->stats.hp = op->stats.maxhp;	2894	op->stats.hp = op->stats.maxhp;
2916	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2917	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2918		2897
2919	/*	2898	/*
2920	* Check to see if the player is in a shop. IF so, then check to see if
2921	* the player has any unpaid items. If so, remove them and put them back	2899	* Check to see if the player has any unpaid items. If so, remove them
2922	* in the map.	2900	* and put them back in the map.
2923	*/	2901	*/
2924
2925	if (is_in_shop (op))
2926	remove_unpaid_objects (op->inv, op);	2902	remove_unpaid_objects (op->inv, op);
2927		2903
2928	/****************************************/	2904	/****************************************/
2929	/* */	2905	/* */
2930	/* Move player to his current respawn- */	2906	/* Move player to his current respawn- */
2931	/* position (usually last savebed) */	2907	/* position (usually last savebed) */
…		…
2951	object *force;	2927	object *force;
2952	int at;	2928	int at;
2953		2929
2954	force = get_archetype (FORCE_NAME);	2930	force = get_archetype (FORCE_NAME);
2955	/* 50 ticks should be enough time for the spell to abate */	2931	/* 50 ticks should be enough time for the spell to abate */
2956	force->speed = 0.1;	2932	force->speed = 0.1f;
2957	force->speed_left = -5.0;	2933	force->speed_left = -5.f;
2958	SET_FLAG (force, FLAG_APPLIED);	2934	SET_FLAG (force, FLAG_APPLIED);
2959	for (at = 0; at < NROFATTACKS; at++)	2935	for (at = 0; at < NROFATTACKS; at++)
2960	if (will_kill_again & (1 << at))	2936	if (will_kill_again & (1 << at))
2961	force->resist[at] = 100;	2937	force->resist[at] = 100;
2962		2938
…		…
2971	void	2947	void
2972	loot_object (object *op)	2948	loot_object (object *op)
2973	{ /* Grab and destroy some treasure */	2949	{ /* Grab and destroy some treasure */
2974	object tmp, tmp2, *next;	2950	object tmp, tmp2, *next;
2975		2951
2976	if (op->container)	2952	op->close_container (); /* close open sack first */
2977	esrv_apply_container (op, op->container); /* close open sack first */
2978		2953
2979	for (tmp = op->inv; tmp; tmp = next)	2954	for (tmp = op->inv; tmp; tmp = next)
2980	{	2955	{
2981	next = tmp->below;	2956	next = tmp->below;
2982		2957
2983	if (tmp->invisible)	2958	if (tmp->invisible)
2984	continue;	2959	continue;
2985		2960
2986	tmp->remove ();	2961	tmp->remove ();
2987	tmp->x = op->x, tmp->y = op->y;	2962	tmp->x = op->x, tmp->y = op->y;
		2963
2988	if (tmp->type == CONTAINER)	2964	if (tmp->type == CONTAINER)
2989	{ /* empty container to ground */	2965	loot_object (tmp); /* empty container to ground */
2990	loot_object (tmp);	2966
2991	}
2992	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))	2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
2993	{	2968	{
2994	if (tmp->nrof > 1)	2969	if (tmp->nrof > 1)
2995	{	2970	{
2996	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
…		…
3008	/*	2983	/*
3009	* fix_weight(): Check recursively the weight of all players, and fix	2984	* fix_weight(): Check recursively the weight of all players, and fix
3010	* what needs to be fixed. Refresh windows and fix speed if anything	2985	* what needs to be fixed. Refresh windows and fix speed if anything
3011	* was changed.	2986	* was changed.
3012	*/	2987	*/
3013
3014	void	2988	void
3015	fix_weight (void)	2989	fix_weight (void)
3016	{	2990	{
3017	for_all_players (pl)	2991	for_all_players (pl)
3018	{	2992	{
…		…
3078	if (op->type == PLAYER)	3052	if (op->type == PLAYER)
3079	{	3053	{
3080	op->contr->tmp_invis = 0;	3054	op->contr->tmp_invis = 0;
3081	op->contr->invis_race = 0;	3055	op->contr->invis_race = 0;
3082	}	3056	}
		3057
3083	update_object (op, UP_OBJ_FACE);	3058	update_object (op, UP_OBJ_CHANGE);
3084	}	3059	}
3085		3060
3086	int	3061	int
3087	is_true_undead (object *op)	3062	is_true_undead (object *op)
3088	{	3063	{
3089	object *tmp = NULL;
3090
3091	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3092	return 1;	3065	return 1;
3093		3066
3094	return 0;	3067	return 0;
3095	}	3068	}
…		…
3383	char buf[MAX_BUF]; /* tmp. string buffer */	3356	char buf[MAX_BUF]; /* tmp. string buffer */
3384	int i = 0, j = 0;	3357	int i = 0, j = 0;
3385		3358
3386	/* get the appropriate treasurelist */	3359	/* get the appropriate treasurelist */
3387	if (atnr == ATNR_FIRE)	3360	if (atnr == ATNR_FIRE)
3388	trlist = find_treasurelist ("dragon_ability_fire");	3361	trlist = treasurelist::find ("dragon_ability_fire");
3389	else if (atnr == ATNR_COLD)	3362	else if (atnr == ATNR_COLD)
3390	trlist = find_treasurelist ("dragon_ability_cold");	3363	trlist = treasurelist::find ("dragon_ability_cold");
3391	else if (atnr == ATNR_ELECTRICITY)	3364	else if (atnr == ATNR_ELECTRICITY)
3392	trlist = find_treasurelist ("dragon_ability_elec");	3365	trlist = treasurelist::find ("dragon_ability_elec");
3393	else if (atnr == ATNR_POISON)	3366	else if (atnr == ATNR_POISON)
3394	trlist = find_treasurelist ("dragon_ability_poison");	3367	trlist = treasurelist::find ("dragon_ability_poison");
3395		3368
3396	if (trlist == NULL \|\| who->type != PLAYER)	3369	if (trlist == NULL \|\| who->type != PLAYER)
3397	return;	3370	return;
3398		3371
3399	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3531	* not readied.	3504	* not readied.
3532	*/	3505	*/
3533	void	3506	void
3534	player_unready_range_ob (player pl, object ob)	3507	player_unready_range_ob (player pl, object ob)
3535	{	3508	{
3536	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
3537	if (pl->ranges[i] == ob)	3515	if (pl->ranged_ob == ob)
3538	{
3539	pl->ranges[i] = 0;	3516	pl->ranged_ob = 0;
3540	if (pl->shoottype == i)
3541	pl->shoottype = range_none;
3542	}
3543	}	3517	}
3544		3518
3545	sint8	3519	sint8
3546	player::visibility_at (maptile *map, int x, int y) const	3520	player::visibility_at (maptile *map, int x, int y) const
3547	{	3521	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.102 by root, Wed Feb 7 02:04:47 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.102 by root, Wed Feb 7 02:04:47 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC