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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.141 by root, Fri May 18 15:05:09 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);
151	}	150	}
152		151
153	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
154	static void	153	static void
…		…
194	return;	193	return;
195		194
196	terminate_all_pets (ob);	195	terminate_all_pets (ob);
197	remove_friendly_object (ob);	196	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	197	ob->deactivate_recursive ();
		198
		199	if (ob->map)
199	maplevel = ob->map->path;	200	maplevel = ob->map->path;
		201
200	ob->remove ();	202	ob->remove ();
201	ob->map = 0;	203	ob->map = 0;
		204	party = 0;
202		205
203	// for weird reasons, this is often "ob", keeping a circular reference	206	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
204	ranges [range_skill] = 0;
205		207
206	players.erase (this);	208	players.erase (this);
207	}	209	}
208		210
209	// connect the player with a specific client	211	// connect the player with a specific client
210	// also changed, rationalises, and fixes some incorrect settings	212	// also changes, rationalises, and fixes some incorrect settings
211	void	213	void
212	player::connect (client *ns)	214	player::connect (client *ns)
213	{	215	{
214	this->ns = ns;	216	this->ns = ns;
215	ns->pl = this;	217	ns->pl = this;
216		218
217	run_on = 0;	219	run_on = 0;
218	fire_on = 0;	220	fire_on = 0;
219	ob->container = 0; //TODO: client-specific	221	ob->close_container (); //TODO: client-specific
220		222
221	ns->update_look = 0;	223	ns->update_look = 0;
222	ns->look_position = 0;	224	ns->look_position = 0;
223		225
224	clear_los (ob);	226	clear_los (ob);
…		…
227		229
228	/* make sure he's a player -- needed because of class change. */	230	/* make sure he's a player -- needed because of class change. */
229	ob->type = PLAYER; // we are paranoid	231	ob->type = PLAYER; // we are paranoid
230	ob->race = ob->arch->clone.race;	232	ob->race = ob->arch->clone.race;
231		233
232	if (!legal_range (ob, shoottype))
233	shoottype = range_none;
234
235	ob->carrying = sum_weight (ob);	234	ob->carrying = sum_weight (ob);
236	link_player_skills (ob);	235	link_player_skills (ob);
237		236
238	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239		238
240	assign (title, ob->arch->clone.name);	239	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		240
252	/* if it's a dragon player, set the correct title here */	241	/* if it's a dragon player, set the correct title here */
253	if (is_dragon_pl (ob))	242	if (is_dragon_pl (ob))
254	{	243	{
255	object tmp, abil = 0, *skin = 0;	244	object tmp, abil = 0, *skin = 0;
…		…
269		258
270	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
271		260
272	esrv_new_player (this, ob->weight + ob->carrying);	261	esrv_new_player (this, ob->weight + ob->carrying);
273		262
		263	ob->flag [FLAG_READY_WEAPON] = false;
		264	ob->flag [FLAG_READY_SKILL] = false;
		265	ob->flag [FLAG_READY_BOW] = false;
		266
		267	for (object *op = ob->inv; op; op = op->below)
		268	if (op->flag [FLAG_APPLIED])
		269	switch (op->type)
		270	{
		271	case SKILL:
		272	ob->flag [FLAG_APPLIED] = false;
		273	break;
		274
		275	case WAND:
		276	case ROD:
		277	case HORN:
		278	case BOW:
		279	ranged_ob = op;
		280	break;
		281
		282	case WEAPON:
		283	combat_ob = op;
		284	break;
		285	}
		286
		287	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274	ob->update_stats ();	288	ob->update_stats ();
		289
275	ns->floorbox_update ();	290	ns->floorbox_update ();
276
277	esrv_send_inventory (ob, ob);	291	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);	292	esrv_add_spells (this, 0);
279		293
280	activate ();	294	activate ();
281		295
…		…
297		311
298	INVOKE_PLAYER (DISCONNECT, this);	312	INVOKE_PLAYER (DISCONNECT, this);
299		313
300	ns->reset_stats ();	314	ns->reset_stats ();
301	ns->pl = 0;	315	ns->pl = 0;
302	this->ns = 0;	316	ns = 0;
303	}	317	}
304		318
		319	if (ob)
305	ob->container = 0; //TODO: client-specific	320	ob->close_container (); //TODO: client-specific
		321
306	deactivate ();	322	deactivate ();
307	}	323	}
308		324
309	// the need for this function can be explained	325	// the need for this function can be explained
310	// by load_object not returning the object	326	// by load_object not returning the object
311	void	327	void
312	player::set_object (object *op)	328	player::set_object (object *op)
313	{	329	{
314	ob = op;	330	ob = op;
315	ob->contr = this; /* this aren't yet in archetype */	331	ob->contr = this; /* this aren't yet in archetype */
316		332
317	ob->speed_left = 0.5;	333	ob->speed_left = 0.5f;
318	ob->speed = 1.0;	334	ob->speed = 1.0f;
319	ob->direction = 5; /* So player faces south */	335	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	}	336	}
325		337
326	player::player ()	338	player::player ()
327	{	339	{
328	/* There are some elements we want initialised to non zero value -	340	/* There are some elements we want initialised to non zero value -
329	* we deal with that below this point.	341	* we deal with that below this point.
330	*/	342	*/
331	outputs_sync = 16; /* Every 2 seconds */	343	outputs_sync = 4;
332	outputs_count = 8; /* Keeps present behaviour */	344	outputs_count = 4;
333	unapply = unapply_nochoice;	345	unapply = unapply_nochoice;
334		346
335	savebed_map = first_map_path; /* Init. respawn position */	347	savebed_map = first_map_path; /* Init. respawn position */
336		348
337	gen_sp_armour = 10;	349	gen_sp_armour = 10;
338	shoottype = range_none;
339	bowtype = bow_normal;	350	bowtype = bow_normal;
340	petmode = pet_normal;	351	petmode = pet_normal;
341	listening = 10;	352	listening = 10;
342	usekeys = containers;	353	usekeys = containers;
343	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
…		…
372	player::create ()	383	player::create ()
373	{	384	{
374	player *pl = new player;	385	player *pl = new player;
375		386
376	pl->set_object (arch_to_object (get_player_archetype (0)));	387	pl->set_object (arch_to_object (get_player_archetype (0)));
		388
		389	pl->ob->roll_stats ();
		390	pl->ob->stats.wc = 2;
		391	pl->ob->run_away = 25; /* Then we panick... */
		392
377	set_first_map (pl->ob);	393	set_first_map (pl->ob);
378		394
379	return pl;	395	return pl;
380	}	396	}
381		397
…		…
527	x = mon->x;	543	x = mon->x;
528	y = mon->y;	544	y = mon->y;
529	m = mon->map;	545	m = mon->map;
530	dir = rv.direction;	546	dir = rv.direction;
531	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	547	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
532	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	548	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		549
533	/* If we can't solve it within the search distance, return now. */	550	/* If we can't solve it within the search distance, return now. */
534	if (diff > max)	551	if (diff > max)
535	return 0;	552	return 0;
		553
536	while (diff > 1 && max > 0)	554	while (diff > 1 && max > 0)
537	{	555	{
538	lastx = x;	556	lastx = x;
539	lasty = y;	557	lasty = y;
540	lastmap = m;	558	lastmap = m;
…		…
622	max--;	640	max--;
623	lastdir = dir;	641	lastdir = dir;
624	if (!firstdir)	642	if (!firstdir)
625	firstdir = dir;	643	firstdir = dir;
626	}	644	}
		645
627	if (diff <= 1)	646	if (diff <= 1)
628	{	647	{
629	/* Recalculate diff (distance) because we may not have actually	648	/* Recalculate diff (distance) because we may not have actually
630	* headed toward player for entire distance.	649	* headed toward player for entire distance.
631	*/	650	*/
632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	651	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	652	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
634	}	653	}
		654
635	if (diff > max)	655	if (diff > max)
636	return 0;	656	return 0;
637	}	657	}
		658
638	/* If we reached the max, didn't find a direction in time */	659	/* If we reached the max, didn't find a direction in time */
639	if (!max)	660	if (!max)
640	return 0;	661	return 0;
641		662
642	return firstdir;	663	return firstdir;
…		…
772	}	793	}
773		794
774	void	795	void
775	object::roll_stats ()	796	object::roll_stats ()
776	{	797	{
777	int statsort [7];	798	int statsort [NUM_STATS];
778		799
779	for (;;)	800	for (;;)
780	{	801	{
781	int sum = 0;	802	int sum = 0;
782	for (int i = 7; i--; )	803	for (int i = NUM_STATS; i--; )
783	sum += statsort [i] = roll_stat ();	804	sum += statsort [i] = roll_stat ();
784		805
785	if (sum >= 82 && sum <= 116)	806	if (sum >= 82 && sum <= 116)
786	break;	807	break;
787	}	808	}
788		809
789	// Sort the stats so that rerolling is easier...	810	// Sort the stats so that rerolling is easier...
790	std::sort (statsort, statsort + 7, std::greater<int>());	811	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
791		812
		813	for (int i = 0; i < NUM_STATS; ++i)
792	stats.Str = statsort[0];	814	stats.stat (i) = statsort [i];
793	stats.Dex = statsort[1];
794	stats.Con = statsort[2];
795	stats.Int = statsort[3];
796	stats.Wis = statsort[4];
797	stats.Pow = statsort[5];
798	stats.Cha = statsort[6];
799		815
800	stats.exp = 0;	816	stats.exp = 0;
801	stats.ac = 0;	817	stats.ac = 0;
802		818
803	stats.hp = stats.maxhp;	819	stats.hp = stats.maxhp;
…		…
815	}	831	}
816		832
817	void	833	void
818	object::swap_stats (int a, int b)	834	object::swap_stats (int a, int b)
819	{	835	{
820	int tmp = get_attr_value (&contr->orig_stats, a);	836	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
821	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
822	set_attr_value (&contr->orig_stats, b, tmp);
823		837
		838	for (int i = 0; i < NUM_STATS; ++i)
824	stats.Str = contr->orig_stats.Str;	839	stats.stat (i) = contr->orig_stats.stat (i);
825	stats.Dex = contr->orig_stats.Dex;
826	stats.Con = contr->orig_stats.Con;
827	stats.Int = contr->orig_stats.Int;
828	stats.Wis = contr->orig_stats.Wis;
829	stats.Pow = contr->orig_stats.Pow;
830	stats.Cha = contr->orig_stats.Cha;
831		840
832	//TODO: the following code looks so borked and should, at the very least,	841	//TODO: the following code looks so borked and should, at the very least,
833	// be merged with the similar code in roll_stats	842	// be merged with the similar code in roll_stats
834	stats.ac = 0;	843	stats.ac = 0;
835		844
…		…
866	* appropriate action with it (change race, or other things).	875	* appropriate action with it (change race, or other things).
867	* The function name is for historical reasons - now we have	876	* The function name is for historical reasons - now we have
868	* separate race and class; this actually changes the RACE,	877	* separate race and class; this actually changes the RACE,
869	* not the class.	878	* not the class.
870	*/	879	*/
871	int	880	void
872	key_change_class (object *op, char key)	881	player::chargen_race_done ()
873	{	882	{
874	int tmp_loop;
875
876	if (key == 'd' \|\| key == 'D')
877	{
878	char buf[MAX_BUF];
879
880	/* this must before then initial items are given */	883	/* this must before then initial items are given */
881	esrv_new_player (op->contr, op->weight + op->carrying);	884	esrv_new_player (ob->contr, ob->weight + ob->carrying);
882		885
883	treasurelist *tl = find_treasurelist ("starting_wealth");	886	treasurelist *tl = treasurelist::find ("starting_wealth");
884	if (tl)	887	if (tl)
885	create_treasure (tl, op, 0, 0, 0);	888	create_treasure (tl, ob, 0, 0, 0);
886		889
887	INVOKE_PLAYER (BIRTH, op->contr);	890	INVOKE_PLAYER (BIRTH, ob->contr);
888	INVOKE_PLAYER (LOGIN, op->contr);	891	INVOKE_PLAYER (LOGIN, ob->contr);
889		892
890	op->contr->ns->state = ST_PLAYING;	893	ob->contr->ns->state = ST_PLAYING;
891		894
892	if (op->msg)	895	if (ob->msg)
893	op->msg = NULL;	896	ob->msg = 0;
894		897
895	/* We create this now because some of the unique maps will need it	898	/* We create this now because some of the unique maps will need it
896	* to save here.	899	* to save here.
897	*/	900	*/
		901	{
		902	char buf[MAX_BUF];
898	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	903	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
899	make_path_to_file (buf);	904	make_path_to_file (buf);
		905	}
900		906
901	start_info (op);	907	start_info (ob);
902	CLEAR_FLAG (op, FLAG_WIZ);	908	CLEAR_FLAG (ob, FLAG_WIZ);
903	give_initial_items (op, op->randomitems);	909	give_initial_items (ob, ob->randomitems);
904	link_player_skills (op);	910	link_player_skills (ob);
905	esrv_send_inventory (op, op);	911	esrv_send_inventory (ob, ob);
906	op->update_stats ();	912	ob->update_stats ();
907		913
908	/* This moves the player to a different start map, if there	914	/* This moves the player to a different start map, if there
909	* is one for this race	915	* is one for this race
910	*/	916	*/
911	if (*first_map_ext_path)	917	if (*first_map_ext_path)
912	{	918	{
913	object *tmp;	919	object *tmp;
914	char mapname[MAX_BUF];	920	char mapname[MAX_BUF];
915		921
916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	922	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
917	tmp = object::create ();	923	tmp = object::create ();
918	EXIT_PATH (tmp) = mapname;	924	EXIT_PATH (tmp) = mapname;
919	EXIT_X (tmp) = op->x;	925	EXIT_X (tmp) = ob->x;
920	EXIT_Y (tmp) = op->y;	926	EXIT_Y (tmp) = ob->y;
921	op->enter_exit (tmp); /* we don't really care if it succeeded;	927	ob->enter_exit (tmp); /* we don't really care if it succeeded;
922	* if the map isn't there, then stay on the	928	* if the map isn't there, then stay on the
923	* default initial map */	929	* default initial map */
924	tmp->destroy ();	930	tmp->destroy ();
925	}	931	}
926	else	932	else
927	LOG (llevDebug, "first_map_ext_path not set\n");	933	LOG (llevDebug, "first_map_ext_path not set\n");
		934	}
928		935
929	return 0;	936	void
930	}	937	player::chargen_race_next ()
931		938	{
932	/* Following actually changes the race - this is the default command	939	/* Following actually changes the race - this is the default command
933	* if we don't match with one of the options above.	940	* if we don't match with one of the options above.
934	*/	941	*/
935		942
936	tmp_loop = 0;	943	do
937	while (!tmp_loop)
938	{	944	{
939	shstr name = op->name;	945	shstr name = ob->name;
940	int x = op->x, y = op->y;	946	int x = ob->x, y = ob->y;
941		947
942	op->remove_statbonus ();	948	ob->remove_statbonus ();
943	op->remove ();	949	ob->remove ();
944	op->arch = get_player_archetype (op->arch);	950	ob->arch = get_player_archetype (ob->arch);
945	op->arch->clone.copy_to (op);	951	ob->arch->clone.copy_to (ob);
946	op->instantiate ();	952	ob->instantiate ();
947	op->stats = op->contr->orig_stats;	953	ob->stats = ob->contr->orig_stats;
948	op->name = op->name_pl = name;	954	ob->name = ob->name_pl = name;
949	op->x = x;	955	ob->x = x;
950	op->y = y;	956	ob->y = y;
951	SET_ANIMATION (op, 2); /* So player faces south */	957	SET_ANIMATION (ob, 2); /* So player faces south */
952	insert_ob_in_map (op, op->map, op, 0);	958	insert_ob_in_map (ob, ob->map, ob, 0);
953	assign (op->contr->title, op->arch->clone.name);	959	assign (ob->contr->title, ob->arch->clone.name);
954	op->add_statbonus ();	960	ob->add_statbonus ();
955	tmp_loop = allowed_class (op);
956	}	961	}
		962	while (!allowed_class (ob));
957		963
958	update_object (op, UP_OBJ_FACE);	964	update_object (ob, UP_OBJ_FACE);
959	esrv_update_item (UPD_FACE, op, op);	965	esrv_update_item (UPD_FACE, ob, ob);
960	op->update_stats ();	966	ob->update_stats ();
961	op->stats.hp = op->stats.maxhp;	967	ob->stats.hp = ob->stats.maxhp;
962	op->stats.sp = op->stats.maxsp;	968	ob->stats.sp = ob->stats.maxsp;
963	op->stats.grace = 0;	969	ob->stats.grace = 0;
964
965	if (op->msg)
966	new_draw_info (NDI_BLUE, 0, op, op->msg);
967
968	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
969	return 0;
970	}	970	}
971		971
972	void	972	void
973	flee_player (object *op)	973	flee_player (object *op)
974	{	974	{
…		…
1021	/* Cornered, get rid of scared */	1021	/* Cornered, get rid of scared */
1022	CLEAR_FLAG (op, FLAG_SCARED);	1022	CLEAR_FLAG (op, FLAG_SCARED);
1023	op->enemy = NULL;	1023	op->enemy = NULL;
1024	}	1024	}
1025		1025
1026
1027	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1028	* IT returns 1 if the player should keep on moving, 0 if he should	1027	* It returns 1 if the player should keep on moving, 0 if he should
1029	* stop.	1028	* stop.
1030	*/	1029	*/
1031	int	1030	int
1032	check_pick (object *op)	1031	check_pick (object *op)
1033	{	1032	{
1034	object tmp, next;	1033	object tmp, next;
1035	int stop = 0;	1034	int stop = 0;
1036	int j, k, wvratio;	1035	int wvratio;
1037	char putstring[128], tmpstr[16];	1036	char putstring[128];
1038		1037
1039	/* if you're flying, you cna't pick up anything */	1038	/* if you're flying, you cna't pick up anything */
1040	if (op->move_type & MOVE_FLYING)	1039	if (op->move_type & MOVE_FLYING)
1041	return 1;	1040	return 1;
1042		1041
…		…
1379	* found object is returned.	1378	* found object is returned.
1380	*/	1379	*/
1381	object *	1380	object *
1382	find_arrow (object op, const char type)	1381	find_arrow (object op, const char type)
1383	{	1382	{
1384	object *tmp = NULL;	1383	object *tmp = 0;
1385		1384
1386	for (op = op->inv; op; op = op->below)	1385	for (op = op->inv; op; op = op->below)
1387	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1386	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1388	tmp = find_arrow (op, type);	1387	tmp = find_arrow (op, type);
1389	else if (op->type == ARROW && op->race == type)	1388	else if (op->type == ARROW && op->race == type)
1390	return op;	1389	return op;
		1390
1391	return tmp;	1391	return tmp;
1392	}	1392	}
1393		1393
1394	/*	1394	/*
1395	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1395	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1396	* against the target. A full test is not performed, simply a basic test	1396	* against the target. A full test is not performed, simply a basic test
1397	* of resistances. The archer is making a quick guess at what he sees down	1397	* of resistances. The archer is making a quick guess at what he sees down
1398	* the hall. Failing that it does it's best to pick the highest plus arrow.	1398	* the hall. Failing that it does it's best to pick the highest plus arrow.
1399	*/	1399	*/
1400
1401	object *	1400	object *
1402	find_better_arrow (object op, object target, const char type, int better)	1401	find_better_arrow (object op, object target, const char type, int better)
1403	{	1402	{
1404	object tmp = NULL, arrow, *ntmp;	1403	object tmp = NULL, arrow, *ntmp;
1405	int attacknum, attacktype, betterby = 0, i;	1404	int attacknum, attacktype, betterby = 0, i;
…		…
1471	* find_better_arrow to find a decent arrow to use.	1470	* find_better_arrow to find a decent arrow to use.
1472	* op = the shooter	1471	* op = the shooter
1473	* type = bow->race	1472	* type = bow->race
1474	* dir = fire direction	1473	* dir = fire direction
1475	*/	1474	*/
1476
1477	object *	1475	object *
1478	pick_arrow_target (object op, const char type, int dir)	1476	pick_arrow_target (object op, const char type, int dir)
1479	{	1477	{
1480	object *tmp = NULL;	1478	object *tmp = NULL;
1481	maptile *m;	1479	maptile *m;
…		…
1546	*/	1544	*/
1547	int	1545	int
1548	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1546	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1549	{	1547	{
1550	object left, bow;	1548	object left, bow;
1551	int bowspeed, mflags;	1549	int mflags;
1552	maptile *m;	1550	maptile *m;
1553		1551
1554	if (!dir)	1552	if (!dir)
1555	{	1553	{
1556	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1554	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1557	return 0;	1555	return 0;
1558	}	1556	}
1559		1557
1560	if (op->type == PLAYER)	1558	if (op->contr)
1561	bow = op->contr->ranges[range_bow];	1559	bow = op->current_weapon;
1562	else	1560	else
1563	{	1561	{
1564	for (bow = op->inv; bow; bow = bow->below)	1562	for (bow = op->inv; bow; bow = bow->below)
1565	/* Don't check for applied - monsters don't apply bows - in that way, they	1563	/* Don't check for applied - monsters don't apply bows - in that way, they
1566	* don't need to switch back and forth between bows and weapons.	1564	* don't need to switch back and forth between bows and weapons.
…		…
1571	if (!bow)	1569	if (!bow)
1572	{	1570	{
1573	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1571	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1574	return 0;	1572	return 0;
1575	}	1573	}
		1574
		1575	// optimisation: move object to top so we will find it quickly again
		1576	if (bow->below)
		1577	{
		1578	bow->remove ();
		1579	op->insert (bow);
		1580	}
		1581
1576	}	1582	}
1577		1583
1578	if (!bow->race \|\| !bow->skill)	1584	if (!bow->race \|\| !bow->skill)
1579	{	1585	{
1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1586	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1581	return 0;	1587	return 0;
1582	}	1588	}
1583
1584	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1585
1586	/* penalize ROF for bestarrow */
1587	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1588	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1589
1590	if (bowspeed < 1)
1591	bowspeed = 1;
1592		1589
1593	if (arrow == NULL)	1590	if (arrow == NULL)
1594	{	1591	{
1595	if ((arrow = find_arrow (op, bow->race)) == NULL)	1592	if ((arrow = find_arrow (op, bow->race)) == NULL)
1596	{	1593	{
1597	if (op->type == PLAYER)	1594	if (op->type == PLAYER)
1598	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1595	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1599	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1596	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1600	else	1597	else
1601	CLEAR_FLAG (op, FLAG_READY_BOW);	1598	CLEAR_FLAG (op, FLAG_READY_BOW);
		1599
1602	return 0;	1600	return 0;
1603	}	1601	}
1604	}	1602	}
1605		1603
1606	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1604	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1630		1628
1631	arrow->set_owner (op);	1629	arrow->set_owner (op);
1632	arrow->skill = bow->skill;	1630	arrow->skill = bow->skill;
1633	arrow->direction = dir;	1631	arrow->direction = dir;
1634		1632
		1633	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1634	arrow->stats.hp = arrow->stats.dam;
		1635	arrow->stats.grace = arrow->attacktype;
		1636
		1637	if (arrow->slaying)
		1638	arrow->spellarg = strdup (arrow->slaying);
		1639
		1640	if (player *pl = op->contr)
		1641	{
		1642	if (!pl->has_hit)
		1643	{
		1644	pl->has_hit = 1;
		1645	pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
		1646	}
		1647	#if 0
		1648	float speed = pl->weapon_sp;
		1649
		1650	/* penalize ROF for bestarrow */
		1651	if (pl->bowtype == bow_bestarrow)
		1652	speed *= .9f;
		1653	else
		1654	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1655
		1656	op->speed_left += speed - op->speed;
		1657	#endif
		1658	}
		1659
		1660	SET_ANIMATION (arrow, arrow->direction);
		1661
		1662	/* update the speed */
		1663	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1664	+ bow->stats.dam / 7.0;
		1665
		1666	arrow->set_speed (max (arrow->speed, 2.0));
		1667	arrow->speed_left = 0;
		1668
		1669	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1670
1635	if (op->type == PLAYER)	1671	if (op->type == PLAYER)
1636	{	1672	{
1637	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1638	op->update_stats ();
1639	}
1640
1641	SET_ANIMATION (arrow, arrow->direction);
1642	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1643	arrow->stats.hp = arrow->stats.dam;
1644	arrow->stats.grace = arrow->attacktype;
1645	if (arrow->slaying != NULL)
1646	arrow->spellarg = strdup (arrow->slaying);
1647
1648	/* Note that this was different for monsters - they got their level
1649	* added to the damage. I think the strength bonus is more proper.
1650	*/
1651
1652	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1653
1654	/* update the speed */
1655	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1656	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1657
1658	arrow->set_speed (max (arrow->speed, 1.0));
1659	arrow->speed_left = 0;
1660
1661	if (op->type == PLAYER)
1662	{
1663	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1664	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1665	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1666
1667	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1673	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1674	wc -= dex_bonus[op->stats.Dex];
		1675
		1676	if (!arrow->slaying)
		1677	arrow->slaying = op->slaying;
		1678
		1679	arrow->attacktype \|= op->attacktype;
1668	}	1680	}
1669	else	1681	else
1670	{	1682	{
1671	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1672	arrow->level = op->level;	1683	arrow->level = op->level;
1673	}	1684	arrow->stats.wc -= bow->magic;
1674		1685
1675	if (arrow->attacktype == AT_PHYSICAL)	1686	if (!arrow->slaying)
		1687	arrow->slaying = bow->slaying;
		1688
1676	arrow->attacktype \|= bow->attacktype;	1689	arrow->attacktype \|= bow->attacktype;
		1690	}
1677		1691
1678	if (bow->slaying)	1692	wc -= arrow->level;
1679	arrow->slaying = bow->slaying;	1693	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1680		1694
		1695	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1681	arrow->move_type = MOVE_FLY_LOW;	1696	arrow->move_type = MOVE_FLY_LOW;
1682	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1697	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1683		1698
1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1699	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1685	m->insert (arrow, sx, sy, op);	1700	m->insert (arrow, sx, sy, op);
…		…
1710	{	1725	{
1711	int ret = 0, wcmod = 0;	1726	int ret = 0, wcmod = 0;
1712		1727
1713	if (op->contr->bowtype == bow_bestarrow)	1728	if (op->contr->bowtype == bow_bestarrow)
1714	{	1729	{
1715	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1730	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1716	}	1731	}
1717	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1732	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1718	{	1733	{
1719	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1734	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1720	wcmod = -1;	1735	wcmod = -1;
…		…
1730	else if (op->contr->bowtype == bow_spreadshot)	1745	else if (op->contr->bowtype == bow_spreadshot)
1731	{	1746	{
1732	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1747	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1733	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1748	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1734	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1749	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1735
1736	}	1750	}
1737	else	1751	else
1738	{	1752	{
1739	/* Simple case */	1753	/* Simple case */
1740	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1754	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1741	}	1755	}
		1756
1742	return ret;	1757	return ret;
1743	}	1758	}
1744
1745		1759
1746	/* Fires a misc (wand/rod/horn) object in 'dir'.	1760	/* Fires a misc (wand/rod/horn) object in 'dir'.
1747	* Broken apart from 'fire' to keep it more readable.	1761	* Broken apart from 'fire' to keep it more readable.
1748	*/	1762	*/
1749	void	1763	void
1750	fire_misc_object (object *op, int dir)	1764	fire_misc_object (object *op, int dir)
1751	{	1765	{
1752	object *item;	1766	object *item = op->contr->ranged_ob;
1753		1767
1754	if (!op->contr->ranges[range_misc])	1768	if (!item)
1755	{	1769	{
1756	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1770	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1757	return;	1771	return;
1758	}	1772	}
1759		1773
1760	item = op->contr->ranges[range_misc];
1761	if (!item->inv)	1774	if (!item->inv)
1762	{	1775	{
1763	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1776	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1764	return;	1777	return;
1765	}	1778	}
		1779
		1780	if (!op->change_weapon (item))
		1781	return;
		1782
1766	if (item->type == WAND)	1783	if (item->type == WAND)
1767	{	1784	{
1768	if (item->stats.food <= 0)	1785	if (item->stats.food <= 0)
1769	{	1786	{
1770	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1787	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1771	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1789
1772	return;	1790	return;
1773	}	1791	}
1774	}	1792	}
1775	else if (item->type == ROD \|\| item->type == HORN)	1793	else if (item->type == ROD \|\| item->type == HORN)
1776	{	1794	{
1777	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1795	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1778	{	1796	{
1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1797	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1798
1780	if (item->type == ROD)	1799	if (item->type == ROD)
1781	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1800	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1782	else	1801	else
1783	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1802	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1803
1784	return;	1804	return;
1785	}	1805	}
1786	}	1806	}
1787		1807
1788	if (cast_spell (op, item, dir, item->inv, NULL))	1808	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1819		1839
1820	/* check for loss of invisiblity/hide */	1840	/* check for loss of invisiblity/hide */
1821	if (action_makes_visible (op))	1841	if (action_makes_visible (op))
1822	make_visible (op);	1842	make_visible (op);
1823		1843
1824	switch (op->contr->shoottype)	1844	player *pl = op->contr;
		1845
		1846	if (pl->golem)
1825	{	1847	{
1826	case range_none:	1848	control_golem (op->contr->golem, dir);
1827	return;	1849	return;
		1850	}
1828		1851
1829	case range_bow:	1852	object *ob = pl->ranged_ob;
		1853
		1854	if (!ob)
		1855	return;
		1856
		1857	if (!op->change_weapon (ob))
		1858	return;
		1859
		1860	switch (ob->type)
		1861	{
		1862	case BOW:
1830	player_fire_bow (op, dir);	1863	player_fire_bow (op, dir);
1831	return;	1864	break;
1832		1865
1833	case range_magic: /* Casting spells */	1866	case SPELL:
1834	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1867	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1835	return;	1868	break;
1836		1869
1837	case range_misc:	1870	case BUILDER:
		1871	apply_map_builder (op, dir);
		1872	break;
		1873
		1874	case SKILL:
		1875	do_skill (op, op, ob, dir, 0);
		1876	break;
		1877
		1878	default:
1838	fire_misc_object (op, dir);	1879	fire_misc_object (op, dir);
1839	return;	1880	break;
1840
1841	case range_golem: /* Control summoned monsters from scrolls */
1842	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1843	{
1844	op->contr->ranges[range_golem] = 0;
1845	op->contr->shoottype = range_none;
1846	}
1847	else
1848	control_golem (op->contr->ranges[range_golem], dir);
1849	return;
1850
1851	case range_skill:
1852	if (!op->chosen_skill)
1853	{
1854	if (op->type == PLAYER)
1855	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1856	return;
1857	}
1858
1859	do_skill (op, op, op->chosen_skill, dir, NULL);
1860	return;
1861	case range_builder:
1862	apply_map_builder (op, dir);
1863	return;
1864	default:
1865	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1866	return;
1867	}	1881	}
1868	}	1882	}
1869
1870
1871		1883
1872	/* find_key	1884	/* find_key
1873	* We try to find a key for the door as passed. If we find a key	1885	* We try to find a key for the door as passed. If we find a key
1874	* and successfully use it, we return the key, otherwise NULL	1886	* and successfully use it, we return the key, otherwise NULL
1875	* This function merges both normal and locked door, since the logic	1887	* This function merges both normal and locked door, since the logic
…		…
1877	* pl is the player,	1889	* pl is the player,
1878	* inv is the objects inventory to searched	1890	* inv is the objects inventory to searched
1879	* door is the door we are trying to match against.	1891	* door is the door we are trying to match against.
1880	* This function can be called recursively to search containers.	1892	* This function can be called recursively to search containers.
1881	*/	1893	*/
1882
1883	object *	1894	object *
1884	find_key (object pl, object container, object *door)	1895	find_key (object pl, object container, object *door)
1885	{	1896	{
1886	object tmp, key;	1897	object tmp, key;
1887		1898
1888	/* Should not happen, but sanity checking is never bad */	1899	/* Should not happen, but sanity checking is never bad */
1889	if (container->inv == NULL)	1900	if (!container->inv)
1890	return NULL;	1901	return 0;
1891		1902
1892	/* First, lets try to find a key in the top level inventory */	1903	/* First, lets try to find a key in the top level inventory */
1893	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1904	for (tmp = container->inv; tmp; tmp = tmp->below)
1894	{	1905	{
1895	if (door->type == DOOR && tmp->type == KEY)	1906	if (door->type == DOOR && tmp->type == KEY)
1896	break;	1907	break;
1897	/* For sanity, we should really check door type, but other stuff	1908	/* For sanity, we should really check door type, but other stuff
1898	* (like containers) can be locked with special keys	1909	* (like containers) can be locked with special keys
1899	*/	1910	*/
1900	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1911	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1901	break;	1912	break;
1902	}	1913	}
		1914
1903	/* No key found - lets search inventories now */	1915	/* No key found - lets search inventories now */
1904	/* If we find and use a key in an inventory, return at that time.	1916	/* If we find and use a key in an inventory, return at that time.
1905	* otherwise, if we search all the inventories and still don't find	1917	* otherwise, if we search all the inventories and still don't find
1906	* a key, return	1918	* a key, return
1907	*/	1919	*/
1908	if (!tmp)	1920	if (!tmp)
1909	{	1921	{
1910	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1922	for (tmp = container->inv; tmp; tmp = tmp->below)
1911	{	1923	{
1912	/* No reason to search empty containers */	1924	/* No reason to search empty containers */
1913	if (tmp->type == CONTAINER && tmp->inv)	1925	if (tmp->type == CONTAINER && tmp->inv)
1914	{	1926	{
1915	if ((key = find_key (pl, tmp, door)) != NULL)	1927	if ((key = find_key (pl, tmp, door)))
1916	return key;	1928	return key;
1917	}	1929	}
1918	}	1930	}
		1931
1919	if (!tmp)	1932	if (!tmp)
1920	return NULL;	1933	return NULL;
1921	}	1934	}
		1935
1922	/* We get down here if we have found a key. Now if its in a container,	1936	/* We get down here if we have found a key. Now if its in a container,
1923	* see if we actually want to use it	1937	* see if we actually want to use it
1924	*/	1938	*/
1925	if (pl != container)	1939	if (pl != container)
1926	{	1940	{
…		…
1947	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1961	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1948	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1962	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1949	return NULL;	1963	return NULL;
1950	}	1964	}
1951	}	1965	}
		1966
1952	return tmp;	1967	return tmp;
1953	}	1968	}
1954		1969
1955	/* moved door processing out of move_player_attack.	1970	/* moved door processing out of move_player_attack.
1956	* returns 1 if player has opened the door with a key	1971	* returns 1 if player has opened the door with a key
…		…
1970	if (key)	1985	if (key)
1971	{	1986	{
1972	object *container = key->env;	1987	object *container = key->env;
1973		1988
1974	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1989	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1990
1975	if (action_makes_visible (op))	1991	if (action_makes_visible (op))
1976	make_visible (op);	1992	make_visible (op);
		1993
1977	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1994	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1978	spring_trap (door->inv, op);	1995	spring_trap (door->inv, op);
		1996
1979	if (door->type == DOOR)	1997	if (door->type == DOOR)
1980	{
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1998	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1982	}
1983	else if (door->type == LOCKED_DOOR)	1999	else if (door->type == LOCKED_DOOR)
1984	{	2000	{
1985	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2001	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1986	remove_door2 (door); /* remove door without violence ;-) */	2002	remove_door2 (door); /* remove door without violence ;-) */
1987	}	2003	}
		2004
1988	/* Do this after we print the message */	2005	/* Do this after we print the message */
1989	decrease_ob (key); /* Use up one of the keys */	2006	decrease_ob (key); /* Use up one of the keys */
1990	/* Need to update the weight the container the key was in */	2007	/* Need to update the weight the container the key was in */
1991	if (container != op)	2008	if (container != op)
1992	esrv_update_item (UPD_WEIGHT, op, container);	2009	esrv_update_item (UPD_WEIGHT, op, container);
		2010
1993	return 1; /* Nothing more to do below */	2011	return 1; /* Nothing more to do below */
1994	}	2012	}
1995	else if (door->type == LOCKED_DOOR)	2013	else if (door->type == LOCKED_DOOR)
1996	{	2014	{
1997	/* Might as well return now - no other way to open this */	2015	/* Might as well return now - no other way to open this */
1998	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	2016	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
1999	return 1;	2017	return 1;
2000	}	2018	}
		2019
2001	return 0;	2020	return 0;
2002	}	2021	}
2003		2022
2004	/* This function is just part of a breakup from move_player.	2023	/* This function is just part of a breakup from move_player.
2005	* It should keep the code cleaner.	2024	* It should keep the code cleaner.
…		…
2009	*/	2028	*/
2010	void	2029	void
2011	move_player_attack (object *op, int dir)	2030	move_player_attack (object *op, int dir)
2012	{	2031	{
2013	object tmp, mon;	2032	object tmp, mon;
2014	sint16 nx, ny;
2015	int on_battleground;	2033	int on_battleground;
2016	maptile *m;	2034	maptile *m;
2017		2035
2018	nx = freearr_x[dir] + op->x;	2036	sint16 nx = freearr_x[dir] + op->x;
2019	ny = freearr_y[dir] + op->y;	2037	sint16 ny = freearr_y[dir] + op->y;
2020		2038
2021	on_battleground = op_on_battleground (op, 0, 0);	2039	on_battleground = op_on_battleground (op, 0, 0);
2022		2040
2023	/* If braced, or can't move to the square, and it is not out of the	2041	/* If braced, or can't move to the square, and it is not out of the
2024	* map, attack it. Note order of if statement is important - don't	2042	* map, attack it. Note order of if statement is important - don't
…		…
2089		2107
2090	/* If the creature is a pet, push it even if the player is not	2108	/* If the creature is a pet, push it even if the player is not
2091	* peaceful. Our assumption is the creature is a pet if the	2109	* peaceful. Our assumption is the creature is a pet if the
2092	* player owns it and it is either friendly or unagressive.	2110	* player owns it and it is either friendly or unagressive.
2093	*/	2111	*/
2094	if ((op->type == PLAYER)	2112	if (op->type == PLAYER
2095	#if COZY_SERVER
2096	&&
2097	((mon->owner && mon->owner->contr	2113	&& ((mon->owner && mon->owner->contr
2098	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2114	&& same_party (mon->owner->contr->party, op->contr->party))
2099	#else
2100	&& mon->owner == op	2115	\|\| mon->owner == op)
2101	#endif
2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2116	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2103	{	2117	{
2104	/* If we're braced, we don't want to switch places with it */	2118	/* If we're braced, we don't want to switch places with it */
2105	if (op->contr->braced)	2119	if (op->contr->braced)
2106	return;	2120	return;
2107		2121
2108	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2122	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2109	(void) push_ob (mon, dir, op);	2123	push_ob (mon, dir, op);
2110	if (op->contr->tmp_invis \|\| op->hide)	2124	if (op->contr->tmp_invis \|\| op->hide)
2111	make_visible (op);	2125	make_visible (op);
2112		2126
2113	return;	2127	return;
2114	}	2128	}
…		…
2116	/* in certain circumstances, you shouldn't attack friendly	2130	/* in certain circumstances, you shouldn't attack friendly
2117	* creatures. Note that if you are braced, you can't push	2131	* creatures. Note that if you are braced, you can't push
2118	* someone, but put it inside this loop so that you won't	2132	* someone, but put it inside this loop so that you won't
2119	* attack them either.	2133	* attack them either.
2120	*/	2134	*/
2121	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2135	if ((mon->type == PLAYER \|\| mon->enemy != op)
2122	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2136	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2123	#ifdef PROHIBIT_PLAYERKILL
2124	(op->contr->peaceful	2137	&& ((op->contr->peaceful
2125	\|\| (mon->type == PLAYER	2138	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2126	&& mon->contr->
2127	peaceful)) &&
2128	#else
2129	op->contr->peaceful &&
2130	#endif
2131	!on_battleground))	2139	&& !on_battleground))
2132	{	2140	{
2133	if (!op->contr->braced)	2141	if (!op->contr->braced)
2134	{	2142	{
2135	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2136	push_ob (mon, dir, op);	2144	push_ob (mon, dir, op);
…		…
2159	* that party_number -1 is no party, so attacks can still happen.	2167	* that party_number -1 is no party, so attacks can still happen.
2160	*/	2168	*/
2161	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2162	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2170	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2163	{	2171	{
2164
2165	/* If the player hasn't hit something this tick, and does
2166	* so, give them speed boost based on weapon speed. Doing
2167	* it here is better than process_players2, which basically
2168	* incurred a 1 tick offset.
2169	*/
2170	if (!op->contr->has_hit)	2172	if (!op->contr->has_hit)
2171	{	2173	{
		2174	op->contr->has_hit = 1;
2172	op->speed_left += op->speed / op->contr->weapon_sp;	2175	op->speed_left += op->contr->weapon_sp - op->speed;
2173
2174	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2175	}	2176	}
2176		2177
2177	skill_attack (mon, op, 0, 0, 0);	2178	skill_attack (mon, op, 0, 0, 0);
2178		2179
2179	/* If attacking another player, that player gets automatic	2180	/* If attacking another player, that player gets automatic
…		…
2254	* Returns true if there are more actions we can do.	2255	* Returns true if there are more actions we can do.
2255	*/	2256	*/
2256	int	2257	int
2257	handle_newcs_player (object *op)	2258	handle_newcs_player (object *op)
2258	{	2259	{
2259	if (op->contr->hidden)
2260	{
2261	op->invisible = 1000;
2262	/* the socket code flashes the player visible/invisible
2263	* depending on the value of invisible, so we need to
2264	* alternate it here for it to work correctly.
2265	*/
2266	if (pticks & 2)
2267	op->invisible--;
2268	}
2269	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2270	{
2271	op->invisible--;
2272	if (!op->invisible)
2273	{
2274	make_visible (op);
2275	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2276	}
2277	}
2278
2279	if (QUERY_FLAG (op, FLAG_SCARED))	2260	if (QUERY_FLAG (op, FLAG_SCARED))
2280	{	2261	{
2281	flee_player (op);	2262	flee_player (op);
		2263
2282	/* If player is still scared, that is his action for this tick */	2264	/* If player is still scared, that is his action for this tick */
2283	if (QUERY_FLAG (op, FLAG_SCARED))	2265	if (op->flag [FLAG_SCARED])
2284	{	2266	{
2285	op->speed_left--;	2267	--op->speed_left;
2286	return 0;	2268	return 0;
2287	}	2269	}
2288	}	2270	}
2289
2290	/* I've been seeing crashes where the golem has been destroyed, but
2291	* the player object still points to the defunct golem. The code that
2292	* destroys the golem looks correct, and it doesn't always happen, so
2293	* put this in a a workaround to clean up the golem pointer.
2294	*/
2295	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2296	op->contr->ranges[range_golem] = 0;
2297		2271
2298	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2299	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2300	* called, so we recheck it here.	2274	* called, so we recheck it here.
2301	*/	2275	*/
2302	if (op->contr->ns->handle_command ())	2276	if (op->contr->ns->handle_command ())
2303	return 1;	2277	return 1;
2304		2278
2305	if (op->speed_left > 0)	2279	if (op->speed_left > 0.f)
2306	{	2280	{
2307	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2281	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2308	{	2282	{
2309	/* All move commands take 1 tick, at least for now */	2283	/* All move commands take 1 tick, at least for now */
2310	op->speed_left--;	2284	--op->speed_left;
2311		2285
2312	/* Instead of all the stuff below, let move_player take care	2286	/* Instead of all the stuff below, let move_player take care
2313	* of it. Also, some of the skill stuff is only put in	2287	* of it. Also, some of the skill stuff is only put in
2314	* there, as well as the confusion stuff.	2288	* there, as well as the confusion stuff.
2315	*/	2289	*/
2316	move_player (op, op->direction);	2290	move_player (op, op->direction);
2317		2291
2318	return op->speed_left > 0;	2292	return op->speed_left > 0.f;
2319	}	2293	}
2320	}	2294	}
2321		2295
2322	return 0;	2296	return 0;
2323	}	2297	}
…		…
2362	* from.	2336	* from.
2363	*/	2337	*/
2364	void	2338	void
2365	remove_unpaid_objects (object op, object env)	2339	remove_unpaid_objects (object op, object env)
2366	{	2340	{
2367	object *next;
2368
2369	while (op)	2341	while (op)
2370	{	2342	{
2371	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2343	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2372		2344
2373	if (QUERY_FLAG (op, FLAG_UNPAID))	2345	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2439	int rate_grace = 2000;	2411	int rate_grace = 2000;
2440	const int max_hp = 1;	2412	const int max_hp = 1;
2441	const int max_sp = 1;	2413	const int max_sp = 1;
2442	const int max_grace = 1;	2414	const int max_grace = 1;
2443		2415
2444	if (op->contr->outputs_sync)	2416	if (op->contr->hidden)
		2417	{
		2418	op->invisible = 1000;
		2419	/* the socket code flashes the player visible/invisible
		2420	* depending on the value of invisible, so we need to
		2421	* alternate it here for it to work correctly.
		2422	*/
		2423	if (pticks & 2)
		2424	op->invisible--;
2445	{	2425	}
2446	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2426	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2447	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2427	{
2448	flush_output_element (op, &op->contr->outputs[i]);	2428	if (!op->invisible--)
		2429	{
		2430	make_visible (op);
		2431	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2432	}
2449	}	2433	}
2450		2434
2451	if (op->contr->ns->state == ST_PLAYING)	2435	if (op->contr->ns->state == ST_PLAYING)
2452	{	2436	{
2453	/* these next three if clauses make it possible to SLOW DOWN	2437	/* these next three if clauses make it possible to SLOW DOWN
…		…
2475	gen_grace = op->stats.maxgrace;	2459	gen_grace = op->stats.maxgrace;
2476	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2460	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477	}	2461	}
2478		2462
2479	/* Regenerate Spell Points */	2463	/* Regenerate Spell Points */
2480	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2464	if (!op->contr->golem && --op->last_sp < 0)
2481	{	2465	{
2482	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2466	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483	if (op->stats.sp < op->stats.maxsp)	2467	if (op->stats.sp < op->stats.maxsp)
2484	{	2468	{
2485	op->stats.sp++;	2469	op->stats.sp++;
…		…
2583	}	2567	}
2584		2568
2585	/* Digestion */	2569	/* Digestion */
2586	if (--op->last_eat < 0)	2570	if (--op->last_eat < 0)
2587	{	2571	{
2588	#ifdef COZY_SERVER
2589	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2590	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2591	#else
2592	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2572	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2593	#endif
2594		2573
2595	if (op->contr->gen_hp > 0)	2574	if (op->contr->gen_hp > 0)
2596	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2575	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2597	else	2576	else
2598	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2577	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2703	tmp->name = buf;	2682	tmp->name = buf;
2704	sprintf (buf, " This finger has been cut off %s\n"	2683	sprintf (buf, " This finger has been cut off %s\n"
2705	" the %s, when he was defeated at\n level %d by %s.\n",	2684	" the %s, when he was defeated at\n level %d by %s.\n",
2706	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2685	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2707	tmp->msg = buf;	2686	tmp->msg = buf;
2708	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2687	tmp->value = 0, tmp->type = 0;
2709	tmp->materialname = NULL;	2688	tmp->materialname = "organics";
2710	tmp->insert_at (op, tmp);	2689	tmp->insert_at (op, tmp);
2711	}	2690	}
2712		2691
2713	/* teleport defeated player to new destination */	2692	/* teleport defeated player to new destination */
2714	transfer_ob (op, x, y, 0, NULL);	2693	transfer_ob (op, x, y, 0, NULL);
…		…
2910	op->stats.hp = op->stats.maxhp;	2889	op->stats.hp = op->stats.maxhp;
2911	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2890	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2891	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913		2892
2914	/*	2893	/*
2915	* Check to see if the player is in a shop. IF so, then check to see if
2916	* the player has any unpaid items. If so, remove them and put them back	2894	* Check to see if the player has any unpaid items. If so, remove them
2917	* in the map.	2895	* and put them back in the map.
2918	*/	2896	*/
2919
2920	if (is_in_shop (op))
2921	remove_unpaid_objects (op->inv, op);	2897	remove_unpaid_objects (op->inv, op);
2922		2898
2923	/****************************************/	2899	/****************************************/
2924	/* */	2900	/* */
2925	/* Move player to his current respawn- */	2901	/* Move player to his current respawn- */
2926	/* position (usually last savebed) */	2902	/* position (usually last savebed) */
…		…
2946	object *force;	2922	object *force;
2947	int at;	2923	int at;
2948		2924
2949	force = get_archetype (FORCE_NAME);	2925	force = get_archetype (FORCE_NAME);
2950	/* 50 ticks should be enough time for the spell to abate */	2926	/* 50 ticks should be enough time for the spell to abate */
2951	force->speed = 0.1;	2927	force->speed = 0.1f;
2952	force->speed_left = -5.0;	2928	force->speed_left = -5.f;
2953	SET_FLAG (force, FLAG_APPLIED);	2929	SET_FLAG (force, FLAG_APPLIED);
2954	for (at = 0; at < NROFATTACKS; at++)	2930	for (at = 0; at < NROFATTACKS; at++)
2955	if (will_kill_again & (1 << at))	2931	if (will_kill_again & (1 << at))
2956	force->resist[at] = 100;	2932	force->resist[at] = 100;
2957		2933
…		…
2966	void	2942	void
2967	loot_object (object *op)	2943	loot_object (object *op)
2968	{ /* Grab and destroy some treasure */	2944	{ /* Grab and destroy some treasure */
2969	object tmp, tmp2, *next;	2945	object tmp, tmp2, *next;
2970		2946
2971	if (op->container)	2947	op->close_container (); /* close open sack first */
2972	esrv_apply_container (op, op->container); /* close open sack first */
2973		2948
2974	for (tmp = op->inv; tmp; tmp = next)	2949	for (tmp = op->inv; tmp; tmp = next)
2975	{	2950	{
2976	next = tmp->below;	2951	next = tmp->below;
2977		2952
2978	if (tmp->invisible)	2953	if (tmp->invisible)
2979	continue;	2954	continue;
2980		2955
2981	tmp->remove ();	2956	tmp->remove ();
2982	tmp->x = op->x, tmp->y = op->y;	2957	tmp->x = op->x, tmp->y = op->y;
		2958
2983	if (tmp->type == CONTAINER)	2959	if (tmp->type == CONTAINER)
2984	{ /* empty container to ground */	2960	loot_object (tmp); /* empty container to ground */
2985	loot_object (tmp);	2961
2986	}
2987	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))	2962	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
2988	{	2963	{
2989	if (tmp->nrof > 1)	2964	if (tmp->nrof > 1)
2990	{	2965	{
2991	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2966	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
…		…
3003	/*	2978	/*
3004	* fix_weight(): Check recursively the weight of all players, and fix	2979	* fix_weight(): Check recursively the weight of all players, and fix
3005	* what needs to be fixed. Refresh windows and fix speed if anything	2980	* what needs to be fixed. Refresh windows and fix speed if anything
3006	* was changed.	2981	* was changed.
3007	*/	2982	*/
3008
3009	void	2983	void
3010	fix_weight (void)	2984	fix_weight (void)
3011	{	2985	{
3012	for_all_players (pl)	2986	for_all_players (pl)
3013	{	2987	{
…		…
3073	if (op->type == PLAYER)	3047	if (op->type == PLAYER)
3074	{	3048	{
3075	op->contr->tmp_invis = 0;	3049	op->contr->tmp_invis = 0;
3076	op->contr->invis_race = 0;	3050	op->contr->invis_race = 0;
3077	}	3051	}
		3052
3078	update_object (op, UP_OBJ_FACE);	3053	update_object (op, UP_OBJ_CHANGE);
3079	}	3054	}
3080		3055
3081	int	3056	int
3082	is_true_undead (object *op)	3057	is_true_undead (object *op)
3083	{	3058	{
3084	object *tmp = NULL;
3085
3086	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3059	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3087	return 1;	3060	return 1;
3088		3061
3089	return 0;	3062	return 0;
3090	}	3063	}
…		…
3378	char buf[MAX_BUF]; /* tmp. string buffer */	3351	char buf[MAX_BUF]; /* tmp. string buffer */
3379	int i = 0, j = 0;	3352	int i = 0, j = 0;
3380		3353
3381	/* get the appropriate treasurelist */	3354	/* get the appropriate treasurelist */
3382	if (atnr == ATNR_FIRE)	3355	if (atnr == ATNR_FIRE)
3383	trlist = find_treasurelist ("dragon_ability_fire");	3356	trlist = treasurelist::find ("dragon_ability_fire");
3384	else if (atnr == ATNR_COLD)	3357	else if (atnr == ATNR_COLD)
3385	trlist = find_treasurelist ("dragon_ability_cold");	3358	trlist = treasurelist::find ("dragon_ability_cold");
3386	else if (atnr == ATNR_ELECTRICITY)	3359	else if (atnr == ATNR_ELECTRICITY)
3387	trlist = find_treasurelist ("dragon_ability_elec");	3360	trlist = treasurelist::find ("dragon_ability_elec");
3388	else if (atnr == ATNR_POISON)	3361	else if (atnr == ATNR_POISON)
3389	trlist = find_treasurelist ("dragon_ability_poison");	3362	trlist = treasurelist::find ("dragon_ability_poison");
3390		3363
3391	if (trlist == NULL \|\| who->type != PLAYER)	3364	if (trlist == NULL \|\| who->type != PLAYER)
3392	return;	3365	return;
3393		3366
3394	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3367	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3526	* not readied.	3499	* not readied.
3527	*/	3500	*/
3528	void	3501	void
3529	player_unready_range_ob (player pl, object ob)	3502	player_unready_range_ob (player pl, object ob)
3530	{	3503	{
3531	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3504	if (pl->ob->current_weapon == ob)
		3505	pl->ob->current_weapon = 0;
		3506
		3507	if (pl->combat_ob == ob)
		3508	pl->combat_ob = 0;
		3509
3532	if (pl->ranges[i] == ob)	3510	if (pl->ranged_ob == ob)
3533	{
3534	pl->ranges[i] = 0;	3511	pl->ranged_ob = 0;
3535	if (pl->shoottype == i)
3536	pl->shoottype = range_none;
3537	}
3538	}	3512	}
		3513
		3514	sint8
		3515	player::visibility_at (maptile *map, int x, int y) const
		3516	{
		3517	if (!ns)
		3518	return 0;
		3519
		3520	int dx, dy;
		3521	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3522	return 0;
		3523
		3524	x += dx - ns->current_x + ns->mapx / 2;
		3525	y += dy - ns->current_y + ns->mapy / 2;
		3526
		3527	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
		3528	return 0;
		3529
		3530	return 100 - blocked_los [x][y];
		3531	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.99 by root, Thu Jan 18 19:42:10 2007 UTC vs. Revision 1.141 by root, Fri May 18 15:05:09 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.141 by root, Fri May 18 15:05:09 2007 UTC