ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.142 by root, Fri May 18 19:46:22 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)
		200	maplevel = ob->map->path;
		201
199	ob->remove ();	202	ob->remove ();
200	ob->map = 0;	203	ob->map = 0;
		204	party = 0;
201		205
202	// 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
203	ranges [range_skill] = 0;
204		207
205	players.erase (this);	208	players.erase (this);
206	}	209	}
207		210
208	// connect the player with a specific client	211	// connect the player with a specific client
209	// also changed, rationalises, and fixes some incorrect settings	212	// also changes, rationalises, and fixes some incorrect settings
210	void	213	void
211	player::connect (client *ns)	214	player::connect (client *ns)
212	{	215	{
213	this->ns = ns;	216	this->ns = ns;
214	ns->pl = this;	217	ns->pl = this;
215		218
216	run_on = 0;	219	run_on = 0;
217	fire_on = 0;	220	fire_on = 0;
		221	ob->close_container (); //TODO: client-specific
218		222
219	ns->update_look = 0;	223	ns->update_look = 0;
220	ns->look_position = 0;	224	ns->look_position = 0;
221		225
222	clear_los (ob);	226	clear_los (ob);
…		…
225		229
226	/* make sure he's a player -- needed because of class change. */	230	/* make sure he's a player -- needed because of class change. */
227	ob->type = PLAYER; // we are paranoid	231	ob->type = PLAYER; // we are paranoid
228	ob->race = ob->arch->clone.race;	232	ob->race = ob->arch->clone.race;
229		233
230	if (!legal_range (ob, shoottype))
231	shoottype = range_none;
232
233	ob->carrying = sum_weight (ob);	234	ob->carrying = sum_weight (ob);
234	link_player_skills (ob);	235	link_player_skills (ob);
235		236
236	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
237		238
238	assign (title, ob->arch->clone.name);	239	assign (title, ob->arch->clone.name);
239
240	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
241	* from the class, and not race. I don't see any way to get the class information
242	* to then update this. I don't think this will actually break anything - anyone
243	* that can use armour should be able to use a shield. What this may 'break'
244	* are features new characters get, eg, if someone starts up with a Q, they
245	* should be able to use a shield. However, old Q's won't get that advantage.
246	*/
247	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
248	SET_FLAG (ob, FLAG_USE_SHIELD);
249		240
250	/* if it's a dragon player, set the correct title here */	241	/* if it's a dragon player, set the correct title here */
251	if (is_dragon_pl (ob))	242	if (is_dragon_pl (ob))
252	{	243	{
253	object *tmp, *abil = 0, *skin = 0;	244	object *tmp, *abil = 0, *skin = 0;
…		…
267		258
268	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
269		260
270	esrv_new_player (this, ob->weight + ob->carrying);	261	esrv_new_player (this, ob->weight + ob->carrying);
271		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);
272	ob->update_stats ();	288	ob->update_stats ();
		289
273	ns->floorbox_update ();	290	ns->floorbox_update ();
274
275	esrv_send_inventory (ob, ob);	291	esrv_send_inventory (ob, ob);
276	esrv_add_spells (this, 0);	292	esrv_add_spells (this, 0);
277		293
278	activate ();	294	activate ();
279		295
…		…
293	if (active)	309	if (active)
294	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	310	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
295		311
296	INVOKE_PLAYER (DISCONNECT, this);	312	INVOKE_PLAYER (DISCONNECT, this);
297		313
		314	ns->reset_stats ();
298	ns->pl = 0;	315	ns->pl = 0;
299	this->ns = 0;	316	ns = 0;
300	}	317	}
		318
		319	if (ob)
		320	ob->close_container (); //TODO: client-specific
301		321
302	deactivate ();	322	deactivate ();
303	}	323	}
304		324
305	// the need for this function can be explained	325	// the need for this function can be explained
306	// by load_object not returning the object	326	// by load_object not returning the object
307	void	327	void
308	player::set_object (object *op)	328	player::set_object (object *op)
309	{	329	{
310	ob = op;	330	ob = op;
311	ob->contr = this; /* this aren't yet in archetype */	331	ob->contr = this; /* this aren't yet in archetype */
312		332
		333	ob->speed = 1.0f;
313	ob->speed_left = 0.5;	334	ob->speed_left = 0.5f;
314	ob->speed = 1.0;	335
315	ob->direction = 5; /* So player faces south */	336	ob->direction = 5; /* So player faces south */
316	ob->stats.wc = 2;
317	ob->run_away = 25; /* Then we panick... */
318
319	ob->roll_stats ();
320	}	337	}
321		338
322	player::player ()	339	player::player ()
323	{	340	{
324	/* There are some elements we want initialised to non zero value -	341	/* There are some elements we want initialised to non zero value -
325	* we deal with that below this point.	342	* we deal with that below this point.
326	*/	343	*/
327	outputs_sync = 16; /* Every 2 seconds */	344	outputs_sync = 4;
328	outputs_count = 8; /* Keeps present behaviour */	345	outputs_count = 4;
329	unapply = unapply_nochoice;	346	unapply = unapply_nochoice;
330		347
331	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
332		349
333	gen_sp_armour = 10;	350	gen_sp_armour = 10;
334	shoottype = range_none;
335	bowtype = bow_normal;	351	bowtype = bow_normal;
336	petmode = pet_normal;	352	petmode = pet_normal;
337	listening = 10;	353	listening = 10;
338	usekeys = containers;	354	usekeys = containers;
339	peaceful = 1; /* default peaceful */	355	peaceful = 1; /* default peaceful */
340	do_los = 1;	356	do_los = 1;
		357
		358	weapon_sp = 1.0f;
		359	weapon_sp_left = 0.5f;
341	}	360	}
342		361
343	void	362	void
344	player::do_destroy ()	363	player::do_destroy ()
345	{	364	{
…		…
368	player::create ()	387	player::create ()
369	{	388	{
370	player *pl = new player;	389	player *pl = new player;
371		390
372	pl->set_object (arch_to_object (get_player_archetype (0)));	391	pl->set_object (arch_to_object (get_player_archetype (0)));
		392
		393	pl->ob->roll_stats ();
		394	pl->ob->stats.wc = 2;
		395	pl->ob->run_away = 25; /* Then we panick... */
		396
373	set_first_map (pl->ob);	397	set_first_map (pl->ob);
374		398
375	return pl;	399	return pl;
376	}	400	}
377		401
…		…
523	x = mon->x;	547	x = mon->x;
524	y = mon->y;	548	y = mon->y;
525	m = mon->map;	549	m = mon->map;
526	dir = rv.direction;	550	dir = rv.direction;
527	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	551	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
528	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	552	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		553
529	/* If we can't solve it within the search distance, return now. */	554	/* If we can't solve it within the search distance, return now. */
530	if (diff > max)	555	if (diff > max)
531	return 0;	556	return 0;
		557
532	while (diff > 1 && max > 0)	558	while (diff > 1 && max > 0)
533	{	559	{
534	lastx = x;	560	lastx = x;
535	lasty = y;	561	lasty = y;
536	lastmap = m;	562	lastmap = m;
…		…
618	max--;	644	max--;
619	lastdir = dir;	645	lastdir = dir;
620	if (!firstdir)	646	if (!firstdir)
621	firstdir = dir;	647	firstdir = dir;
622	}	648	}
		649
623	if (diff <= 1)	650	if (diff <= 1)
624	{	651	{
625	/* Recalculate diff (distance) because we may not have actually	652	/* Recalculate diff (distance) because we may not have actually
626	* headed toward player for entire distance.	653	* headed toward player for entire distance.
627	*/	654	*/
628	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	655	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
629	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	656	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
630	}	657	}
		658
631	if (diff > max)	659	if (diff > max)
632	return 0;	660	return 0;
633	}	661	}
		662
634	/* If we reached the max, didn't find a direction in time */	663	/* If we reached the max, didn't find a direction in time */
635	if (!max)	664	if (!max)
636	return 0;	665	return 0;
637		666
638	return firstdir;	667	return firstdir;
…		…
752	roll_stat (void)	781	roll_stat (void)
753	{	782	{
754	int a[4], i, j, k;	783	int a[4], i, j, k;
755		784
756	for (i = 0; i < 4; i++)	785	for (i = 0; i < 4; i++)
757	a[i] = (int) RANDOM () % 6 + 1;	786	a[i] = (int) rndm (6) + 1;
758		787
759	for (i = 0, j = 0, k = 7; i < 4; i++)	788	for (i = 0, j = 0, k = 7; i < 4; i++)
760	if (a[i] < k)	789	if (a[i] < k)
761	k = a[i], j = i;	790	k = a[i], j = i;
762		791
…		…
768	}	797	}
769		798
770	void	799	void
771	object::roll_stats ()	800	object::roll_stats ()
772	{	801	{
773	int statsort [7];	802	int statsort [NUM_STATS];
774		803
775	for (;;)	804	for (;;)
776	{	805	{
777	int sum = 0;	806	int sum = 0;
778	for (int i = 7; i--; )	807	for (int i = NUM_STATS; i--; )
779	sum += statsort [i] = roll_stat ();	808	sum += statsort [i] = roll_stat ();
780		809
781	if (sum >= 82 && sum <= 116)	810	if (sum >= 82 && sum <= 116)
782	break;	811	break;
783	}	812	}
784		813
785	// Sort the stats so that rerolling is easier...	814	// Sort the stats so that rerolling is easier...
786	std::sort (statsort, statsort + 7, std::greater<int>());	815	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
787		816
		817	for (int i = 0; i < NUM_STATS; ++i)
788	stats.Str = statsort[0];	818	stats.stat (i) = statsort [i];
789	stats.Dex = statsort[1];
790	stats.Con = statsort[2];
791	stats.Int = statsort[3];
792	stats.Wis = statsort[4];
793	stats.Pow = statsort[5];
794	stats.Cha = statsort[6];
795		819
796	stats.exp = 0;	820	stats.exp = 0;
797	stats.ac = 0;	821	stats.ac = 0;
798		822
799	stats.hp = stats.maxhp;	823	stats.hp = stats.maxhp;
…		…
811	}	835	}
812		836
813	void	837	void
814	object::swap_stats (int a, int b)	838	object::swap_stats (int a, int b)
815	{	839	{
816	int tmp = get_attr_value (&contr->orig_stats, a);	840	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
817	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
818	set_attr_value (&contr->orig_stats, b, tmp);
819		841
		842	for (int i = 0; i < NUM_STATS; ++i)
820	stats.Str = contr->orig_stats.Str;	843	stats.stat (i) = contr->orig_stats.stat (i);
821	stats.Dex = contr->orig_stats.Dex;
822	stats.Con = contr->orig_stats.Con;
823	stats.Int = contr->orig_stats.Int;
824	stats.Wis = contr->orig_stats.Wis;
825	stats.Pow = contr->orig_stats.Pow;
826	stats.Cha = contr->orig_stats.Cha;
827		844
828	//TODO: the following code looks so borked and should, at the very least,	845	//TODO: the following code looks so borked and should, at the very least,
829	// be merged with the similar code in roll_stats	846	// be merged with the similar code in roll_stats
830	stats.ac = 0;	847	stats.ac = 0;
831		848
…		…
862	* appropriate action with it (change race, or other things).	879	* appropriate action with it (change race, or other things).
863	* The function name is for historical reasons - now we have	880	* The function name is for historical reasons - now we have
864	* separate race and class; this actually changes the RACE,	881	* separate race and class; this actually changes the RACE,
865	* not the class.	882	* not the class.
866	*/	883	*/
867	int	884	void
868	key_change_class (object *op, char key)	885	player::chargen_race_done ()
869	{	886	{
870	int tmp_loop;
871
872	if (key == 'd' || key == 'D')
873	{
874	char buf[MAX_BUF];
875
876	/* this must before then initial items are given */	887	/* this must before then initial items are given */
877	esrv_new_player (op->contr, op->weight + op->carrying);	888	esrv_new_player (ob->contr, ob->weight + ob->carrying);
878		889
879	treasurelist *tl = find_treasurelist ("starting_wealth");	890	treasurelist *tl = treasurelist::find ("starting_wealth");
880	if (tl)	891	if (tl)
881	create_treasure (tl, op, 0, 0, 0);	892	create_treasure (tl, ob, 0, 0, 0);
882		893
883	INVOKE_PLAYER (BIRTH, op->contr);	894	INVOKE_PLAYER (BIRTH, ob->contr);
884	INVOKE_PLAYER (LOGIN, op->contr);	895	INVOKE_PLAYER (LOGIN, ob->contr);
885		896
886	op->contr->ns->state = ST_PLAYING;	897	ob->contr->ns->state = ST_PLAYING;
887		898
888	if (op->msg)	899	if (ob->msg)
889	op->msg = NULL;	900	ob->msg = 0;
890		901
891	/* We create this now because some of the unique maps will need it	902	/* We create this now because some of the unique maps will need it
892	* to save here.	903	* to save here.
893	*/	904	*/
		905	{
		906	char buf[MAX_BUF];
894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	907	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895	make_path_to_file (buf);	908	make_path_to_file (buf);
		909	}
896		910
897	start_info (op);	911	start_info (ob);
898	CLEAR_FLAG (op, FLAG_WIZ);	912	CLEAR_FLAG (ob, FLAG_WIZ);
899	give_initial_items (op, op->randomitems);	913	give_initial_items (ob, ob->randomitems);
900	link_player_skills (op);	914	link_player_skills (ob);
901	esrv_send_inventory (op, op);	915	esrv_send_inventory (ob, ob);
902	op->update_stats ();	916	ob->update_stats ();
903		917
904	/* This moves the player to a different start map, if there	918	/* This moves the player to a different start map, if there
905	* is one for this race	919	* is one for this race
906	*/	920	*/
907	if (*first_map_ext_path)	921	if (*first_map_ext_path)
908	{	922	{
909	object *tmp;	923	object *tmp;
910	char mapname[MAX_BUF];	924	char mapname[MAX_BUF];
911		925
912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	926	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
913	tmp = object::create ();	927	tmp = object::create ();
914	EXIT_PATH (tmp) = mapname;	928	EXIT_PATH (tmp) = mapname;
915	EXIT_X (tmp) = op->x;	929	EXIT_X (tmp) = ob->x;
916	EXIT_Y (tmp) = op->y;	930	EXIT_Y (tmp) = ob->y;
917	op->enter_exit (tmp); /* we don't really care if it succeeded;	931	ob->enter_exit (tmp); /* we don't really care if it succeeded;
918	* if the map isn't there, then stay on the	932	* if the map isn't there, then stay on the
919	* default initial map */	933	* default initial map */
920	tmp->destroy ();	934	tmp->destroy ();
921	}	935	}
922	else	936	else
923	LOG (llevDebug, "first_map_ext_path not set\n");	937	LOG (llevDebug, "first_map_ext_path not set\n");
		938	}
924		939
925	return 0;	940	void
926	}	941	player::chargen_race_next ()
927		942	{
928	/* Following actually changes the race - this is the default command	943	/* Following actually changes the race - this is the default command
929	* if we don't match with one of the options above.	944	* if we don't match with one of the options above.
930	*/	945	*/
931		946
932	tmp_loop = 0;	947	do
933	while (!tmp_loop)
934	{	948	{
935	shstr name = op->name;	949	shstr name = ob->name;
936	int x = op->x, y = op->y;	950	int x = ob->x, y = ob->y;
937		951
938	op->remove_statbonus ();	952	ob->remove_statbonus ();
939	op->remove ();	953	ob->remove ();
940	op->arch = get_player_archetype (op->arch);	954	ob->arch = get_player_archetype (ob->arch);
941	op->arch->clone.copy_to (op);	955	ob->arch->clone.copy_to (ob);
942	op->instantiate ();	956	ob->instantiate ();
943	op->stats = op->contr->orig_stats;	957	ob->stats = ob->contr->orig_stats;
944	op->name = op->name_pl = name;	958	ob->name = ob->name_pl = name;
945	op->x = x;	959	ob->x = x;
946	op->y = y;	960	ob->y = y;
947	SET_ANIMATION (op, 2); /* So player faces south */	961	SET_ANIMATION (ob, 2); /* So player faces south */
948	insert_ob_in_map (op, op->map, op, 0);	962	insert_ob_in_map (ob, ob->map, ob, 0);
949	assign (op->contr->title, op->arch->clone.name);	963	assign (ob->contr->title, ob->arch->clone.name);
950	op->add_statbonus ();	964	ob->add_statbonus ();
951	tmp_loop = allowed_class (op);
952	}	965	}
		966	while (!allowed_class (ob));
953		967
954	update_object (op, UP_OBJ_FACE);	968	update_object (ob, UP_OBJ_FACE);
955	esrv_update_item (UPD_FACE, op, op);	969	esrv_update_item (UPD_FACE, ob, ob);
956	op->update_stats ();	970	ob->update_stats ();
957	op->stats.hp = op->stats.maxhp;	971	ob->stats.hp = ob->stats.maxhp;
958	op->stats.sp = op->stats.maxsp;	972	ob->stats.sp = ob->stats.maxsp;
959	op->stats.grace = 0;	973	ob->stats.grace = 0;
960
961	if (op->msg)
962	new_draw_info (NDI_BLUE, 0, op, op->msg);
963
964	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
965	return 0;
966	}	974	}
967		975
968	void	976	void
969	flee_player (object *op)	977	flee_player (object *op)
970	{	978	{
…		…
1017	/* Cornered, get rid of scared */	1025	/* Cornered, get rid of scared */
1018	CLEAR_FLAG (op, FLAG_SCARED);	1026	CLEAR_FLAG (op, FLAG_SCARED);
1019	op->enemy = NULL;	1027	op->enemy = NULL;
1020	}	1028	}
1021		1029
1022
1023	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1030	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1024	* IT returns 1 if the player should keep on moving, 0 if he should	1031	* It returns 1 if the player should keep on moving, 0 if he should
1025	* stop.	1032	* stop.
1026	*/	1033	*/
1027	int	1034	int
1028	check_pick (object *op)	1035	check_pick (object *op)
1029	{	1036	{
1030	object *tmp, *next;	1037	object *tmp, *next;
1031	int stop = 0;	1038	int stop = 0;
1032	int j, k, wvratio;	1039	int wvratio;
1033	char putstring[128], tmpstr[16];	1040	char putstring[128];
1034		1041
1035	/* if you're flying, you cna't pick up anything */	1042	/* if you're flying, you cna't pick up anything */
1036	if (op->move_type & MOVE_FLYING)	1043	if (op->move_type & MOVE_FLYING)
1037	return 1;	1044	return 1;
1038		1045
…		…
1375	* found object is returned.	1382	* found object is returned.
1376	*/	1383	*/
1377	object *	1384	object *
1378	find_arrow (object *op, const char *type)	1385	find_arrow (object *op, const char *type)
1379	{	1386	{
1380	object *tmp = NULL;	1387	object *tmp = 0;
1381		1388
1382	for (op = op->inv; op; op = op->below)	1389	for (op = op->inv; op; op = op->below)
1383	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1390	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384	tmp = find_arrow (op, type);	1391	tmp = find_arrow (op, type);
1385	else if (op->type == ARROW && op->race == type)	1392	else if (op->type == ARROW && op->race == type)
1386	return op;	1393	return op;
		1394
1387	return tmp;	1395	return tmp;
1388	}	1396	}
1389		1397
1390	/*	1398	/*
1391	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1399	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1392	* against the target. A full test is not performed, simply a basic test	1400	* against the target. A full test is not performed, simply a basic test
1393	* of resistances. The archer is making a quick guess at what he sees down	1401	* of resistances. The archer is making a quick guess at what he sees down
1394	* the hall. Failing that it does it's best to pick the highest plus arrow.	1402	* the hall. Failing that it does it's best to pick the highest plus arrow.
1395	*/	1403	*/
1396
1397	object *	1404	object *
1398	find_better_arrow (object *op, object *target, const char *type, int *better)	1405	find_better_arrow (object *op, object *target, const char *type, int *better)
1399	{	1406	{
1400	object *tmp = NULL, *arrow, *ntmp;	1407	object *tmp = NULL, *arrow, *ntmp;
1401	int attacknum, attacktype, betterby = 0, i;	1408	int attacknum, attacktype, betterby = 0, i;
…		…
1467	* find_better_arrow to find a decent arrow to use.	1474	* find_better_arrow to find a decent arrow to use.
1468	* op = the shooter	1475	* op = the shooter
1469	* type = bow->race	1476	* type = bow->race
1470	* dir = fire direction	1477	* dir = fire direction
1471	*/	1478	*/
1472
1473	object *	1479	object *
1474	pick_arrow_target (object *op, const char *type, int dir)	1480	pick_arrow_target (object *op, const char *type, int dir)
1475	{	1481	{
1476	object *tmp = NULL;	1482	object *tmp = NULL;
1477	maptile *m;	1483	maptile *m;
…		…
1542	*/	1548	*/
1543	int	1549	int
1544	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1550	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1545	{	1551	{
1546	object *left, *bow;	1552	object *left, *bow;
1547	int bowspeed, mflags;	1553	int mflags;
1548	maptile *m;	1554	maptile *m;
1549		1555
1550	if (!dir)	1556	if (!dir)
1551	{	1557	{
1552	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1558	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1553	return 0;	1559	return 0;
1554	}	1560	}
1555		1561
1556	if (op->type == PLAYER)	1562	if (op->contr)
1557	bow = op->contr->ranges[range_bow];	1563	bow = op->current_weapon;
1558	else	1564	else
1559	{	1565	{
1560	for (bow = op->inv; bow; bow = bow->below)	1566	for (bow = op->inv; bow; bow = bow->below)
1561	/* Don't check for applied - monsters don't apply bows - in that way, they	1567	/* Don't check for applied - monsters don't apply bows - in that way, they
1562	* don't need to switch back and forth between bows and weapons.	1568	* don't need to switch back and forth between bows and weapons.
…		…
1567	if (!bow)	1573	if (!bow)
1568	{	1574	{
1569	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1575	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1570	return 0;	1576	return 0;
1571	}	1577	}
		1578
		1579	// optimisation: move object to top so we will find it quickly again
		1580	if (bow->below)
		1581	{
		1582	bow->remove ();
		1583	op->insert (bow);
		1584	}
		1585
1572	}	1586	}
1573		1587
1574	if (!bow->race || !bow->skill)	1588	if (!bow->race || !bow->skill)
1575	{	1589	{
1576	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1577	return 0;	1591	return 0;
1578	}	1592	}
1579
1580	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1581
1582	/* penalize ROF for bestarrow */
1583	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1584	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1585
1586	if (bowspeed < 1)
1587	bowspeed = 1;
1588		1593
1589	if (arrow == NULL)	1594	if (arrow == NULL)
1590	{	1595	{
1591	if ((arrow = find_arrow (op, bow->race)) == NULL)	1596	if ((arrow = find_arrow (op, bow->race)) == NULL)
1592	{	1597	{
1593	if (op->type == PLAYER)	1598	if (op->type == PLAYER)
1594	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1599	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1595	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1600	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1596	else	1601	else
1597	CLEAR_FLAG (op, FLAG_READY_BOW);	1602	CLEAR_FLAG (op, FLAG_READY_BOW);
		1603
1598	return 0;	1604	return 0;
1599	}	1605	}
1600	}	1606	}
1601		1607
1602	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1608	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1626		1632
1627	arrow->set_owner (op);	1633	arrow->set_owner (op);
1628	arrow->skill = bow->skill;	1634	arrow->skill = bow->skill;
1629	arrow->direction = dir;	1635	arrow->direction = dir;
1630		1636
		1637	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1638	arrow->stats.hp = arrow->stats.dam;
		1639	arrow->stats.grace = arrow->attacktype;
		1640
		1641	if (arrow->slaying)
		1642	arrow->spellarg = strdup (arrow->slaying);
		1643
		1644	#if 0
		1645	if (player *pl = op->contr)
		1646	{
		1647	float speed = pl->weapon_sp;
		1648
		1649	/* penalize ROF for bestarrow */
		1650	if (pl->bowtype == bow_bestarrow)
		1651	speed *= .9f;
		1652	else
		1653	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1654
		1655	op->speed_left += speed - op->speed;
		1656	}
		1657	#endif
		1658
		1659	SET_ANIMATION (arrow, arrow->direction);
		1660
		1661	/* update the speed */
		1662	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1663	+ bow->stats.dam / 7.f;
		1664
		1665	arrow->set_speed (max (arrow->speed, 2.f));
		1666	arrow->speed_left = 0;
		1667
		1668	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1669
1631	if (op->type == PLAYER)	1670	if (op->type == PLAYER)
1632	{	1671	{
1633	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1634	op->update_stats ();
1635	}
1636
1637	SET_ANIMATION (arrow, arrow->direction);
1638	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1639	arrow->stats.hp = arrow->stats.dam;
1640	arrow->stats.grace = arrow->attacktype;
1641	if (arrow->slaying != NULL)
1642	arrow->spellarg = strdup (arrow->slaying);
1643
1644	/* Note that this was different for monsters - they got their level
1645	* added to the damage. I think the strength bonus is more proper.
1646	*/
1647
1648	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1649
1650	/* update the speed */
1651	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1652	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1653
1654	arrow->set_speed (max (arrow->speed, 1.0));
1655	arrow->speed_left = 0;
1656
1657	if (op->type == PLAYER)
1658	{
1659	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1660	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1661	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1662
1663	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1672	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1673	wc -= dex_bonus[op->stats.Dex];
		1674
		1675	if (!arrow->slaying)
		1676	arrow->slaying = op->slaying;
		1677
		1678	arrow->attacktype |= op->attacktype;
1664	}	1679	}
1665	else	1680	else
1666	{	1681	{
1667	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1668	arrow->level = op->level;	1682	arrow->level = op->level;
1669	}	1683	arrow->stats.wc -= bow->magic;
1670		1684
1671	if (arrow->attacktype == AT_PHYSICAL)	1685	if (!arrow->slaying)
		1686	arrow->slaying = bow->slaying;
		1687
1672	arrow->attacktype |= bow->attacktype;	1688	arrow->attacktype |= bow->attacktype;
		1689	}
1673		1690
1674	if (bow->slaying)	1691	wc -= arrow->level;
1675	arrow->slaying = bow->slaying;	1692	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1676		1693
		1694	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1677	arrow->move_type = MOVE_FLY_LOW;	1695	arrow->move_type = MOVE_FLY_LOW;
1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1696	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1679		1697
1680	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1698	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1681	m->insert (arrow, sx, sy, op);	1699	m->insert (arrow, sx, sy, op);
…		…
1706	{	1724	{
1707	int ret = 0, wcmod = 0;	1725	int ret = 0, wcmod = 0;
1708		1726
1709	if (op->contr->bowtype == bow_bestarrow)	1727	if (op->contr->bowtype == bow_bestarrow)
1710	{	1728	{
1711	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1729	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1712	}	1730	}
1713	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1731	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1714	{	1732	{
1715	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1733	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1716	wcmod = -1;	1734	wcmod = -1;
…		…
1726	else if (op->contr->bowtype == bow_spreadshot)	1744	else if (op->contr->bowtype == bow_spreadshot)
1727	{	1745	{
1728	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1746	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1729	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1747	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1730	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);
1731
1732	}	1749	}
1733	else	1750	else
1734	{	1751	{
1735	/* Simple case */	1752	/* Simple case */
1736	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1753	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737	}	1754	}
		1755
1738	return ret;	1756	return ret;
1739	}	1757	}
1740
1741		1758
1742	/* Fires a misc (wand/rod/horn) object in 'dir'.	1759	/* Fires a misc (wand/rod/horn) object in 'dir'.
1743	* Broken apart from 'fire' to keep it more readable.	1760	* Broken apart from 'fire' to keep it more readable.
1744	*/	1761	*/
1745	void	1762	void
1746	fire_misc_object (object *op, int dir)	1763	fire_misc_object (object *op, int dir)
1747	{	1764	{
1748	object *item;	1765	object *item = op->contr->ranged_ob;
1749		1766
1750	if (!op->contr->ranges[range_misc])	1767	if (!item)
1751	{	1768	{
1752	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1769	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1753	return;	1770	return;
1754	}	1771	}
1755		1772
1756	item = op->contr->ranges[range_misc];
1757	if (!item->inv)	1773	if (!item->inv)
1758	{	1774	{
1759	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1775	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1760	return;	1776	return;
1761	}	1777	}
		1778
		1779	if (!op->change_weapon (item))
		1780	return;
		1781
1762	if (item->type == WAND)	1782	if (item->type == WAND)
1763	{	1783	{
1764	if (item->stats.food <= 0)	1784	if (item->stats.food <= 0)
1765	{	1785	{
1766	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1767	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1788
1768	return;	1789	return;
1769	}	1790	}
1770	}	1791	}
1771	else if (item->type == ROD || item->type == HORN)	1792	else if (item->type == ROD || item->type == HORN)
1772	{	1793	{
1773	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1794	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1774	{	1795	{
1775	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1796	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1797
1776	if (item->type == ROD)	1798	if (item->type == ROD)
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1799	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1778	else	1800	else
1779	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1801	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1802
1780	return;	1803	return;
1781	}	1804	}
1782	}	1805	}
1783		1806
1784	if (cast_spell (op, item, dir, item->inv, NULL))	1807	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1806	}	1829	}
1807	}	1830	}
1808		1831
1809	/* Received a fire command for the player - go and do it.	1832	/* Received a fire command for the player - go and do it.
1810	*/	1833	*/
1811	void	1834	bool
1812	fire (object *op, int dir)	1835	fire (object *op, int dir)
1813	{	1836	{
1814	int spellcost = 0;	1837	int spellcost = 0;
1815		1838
1816	/* check for loss of invisiblity/hide */	1839	/* check for loss of invisiblity/hide */
1817	if (action_makes_visible (op))	1840	if (action_makes_visible (op))
1818	make_visible (op);	1841	make_visible (op);
1819		1842
1820	switch (op->contr->shoottype)	1843	player *pl = op->contr;
		1844
		1845	if (pl->golem)
		1846	{
		1847	control_golem (op->contr->golem, dir);
		1848	return false;
1821	{	1849	}
1822	case range_none:
1823	return;
1824		1850
1825	case range_bow:	1851	object *ob = pl->ranged_ob;
		1852
		1853	if (!ob)
		1854	return false;
		1855
		1856	if (!op->change_weapon (ob))
		1857	return false;
		1858
		1859	if (op->speed_left > 0.f)
		1860	--op->speed_left;
		1861	else
		1862	return false;
		1863
		1864	switch (ob->type)
		1865	{
		1866	case BOW:
1826	player_fire_bow (op, dir);	1867	player_fire_bow (op, dir);
1827	return;	1868	break;
1828		1869
1829	case range_magic: /* Casting spells */	1870	case SPELL:
1830	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1871	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1831	return;	1872	break;
1832		1873
1833	case range_misc:	1874	case BUILDER:
		1875	apply_map_builder (op, dir);
		1876	break;
		1877
		1878	case SKILL:
		1879	do_skill (op, op, ob, dir, 0);
		1880	break;
		1881
		1882	default:
1834	fire_misc_object (op, dir);	1883	fire_misc_object (op, dir);
1835	return;	1884	break;
1836
1837	case range_golem: /* Control summoned monsters from scrolls */
1838	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1839	{
1840	op->contr->ranges[range_golem] = 0;
1841	op->contr->shoottype = range_none;
1842	}
1843	else
1844	control_golem (op->contr->ranges[range_golem], dir);
1845	return;
1846
1847	case range_skill:
1848	if (!op->chosen_skill)
1849	{
1850	if (op->type == PLAYER)
1851	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1852	return;
1853	}
1854
1855	do_skill (op, op, op->chosen_skill, dir, NULL);
1856	return;
1857	case range_builder:
1858	apply_map_builder (op, dir);
1859	return;
1860	default:
1861	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1862	return;
1863	}	1885	}
1864	}
1865		1886
1866		1887	return true;
		1888	}
1867		1889
1868	/* find_key	1890	/* find_key
1869	* We try to find a key for the door as passed. If we find a key	1891	* We try to find a key for the door as passed. If we find a key
1870	* and successfully use it, we return the key, otherwise NULL	1892	* and successfully use it, we return the key, otherwise NULL
1871	* This function merges both normal and locked door, since the logic	1893	* This function merges both normal and locked door, since the logic
…		…
1873	* pl is the player,	1895	* pl is the player,
1874	* inv is the objects inventory to searched	1896	* inv is the objects inventory to searched
1875	* door is the door we are trying to match against.	1897	* door is the door we are trying to match against.
1876	* This function can be called recursively to search containers.	1898	* This function can be called recursively to search containers.
1877	*/	1899	*/
1878
1879	object *	1900	object *
1880	find_key (object *pl, object *container, object *door)	1901	find_key (object *pl, object *container, object *door)
1881	{	1902	{
1882	object *tmp, *key;	1903	object *tmp, *key;
1883		1904
1884	/* Should not happen, but sanity checking is never bad */	1905	/* Should not happen, but sanity checking is never bad */
1885	if (container->inv == NULL)	1906	if (!container->inv)
1886	return NULL;	1907	return 0;
1887		1908
1888	/* First, lets try to find a key in the top level inventory */	1909	/* First, lets try to find a key in the top level inventory */
1889	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1910	for (tmp = container->inv; tmp; tmp = tmp->below)
1890	{	1911	{
1891	if (door->type == DOOR && tmp->type == KEY)	1912	if (door->type == DOOR && tmp->type == KEY)
1892	break;	1913	break;
1893	/* For sanity, we should really check door type, but other stuff	1914	/* For sanity, we should really check door type, but other stuff
1894	* (like containers) can be locked with special keys	1915	* (like containers) can be locked with special keys
1895	*/	1916	*/
1896	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1917	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897	break;	1918	break;
1898	}	1919	}
		1920
1899	/* No key found - lets search inventories now */	1921	/* No key found - lets search inventories now */
1900	/* If we find and use a key in an inventory, return at that time.	1922	/* If we find and use a key in an inventory, return at that time.
1901	* otherwise, if we search all the inventories and still don't find	1923	* otherwise, if we search all the inventories and still don't find
1902	* a key, return	1924	* a key, return
1903	*/	1925	*/
1904	if (!tmp)	1926	if (!tmp)
1905	{	1927	{
1906	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1928	for (tmp = container->inv; tmp; tmp = tmp->below)
1907	{	1929	{
1908	/* No reason to search empty containers */	1930	/* No reason to search empty containers */
1909	if (tmp->type == CONTAINER && tmp->inv)	1931	if (tmp->type == CONTAINER && tmp->inv)
1910	{	1932	{
1911	if ((key = find_key (pl, tmp, door)) != NULL)	1933	if ((key = find_key (pl, tmp, door)))
1912	return key;	1934	return key;
1913	}	1935	}
1914	}	1936	}
		1937
1915	if (!tmp)	1938	if (!tmp)
1916	return NULL;	1939	return NULL;
1917	}	1940	}
		1941
1918	/* We get down here if we have found a key. Now if its in a container,	1942	/* We get down here if we have found a key. Now if its in a container,
1919	* see if we actually want to use it	1943	* see if we actually want to use it
1920	*/	1944	*/
1921	if (pl != container)	1945	if (pl != container)
1922	{	1946	{
…		…
1943	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1967	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1944	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1968	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945	return NULL;	1969	return NULL;
1946	}	1970	}
1947	}	1971	}
		1972
1948	return tmp;	1973	return tmp;
1949	}	1974	}
1950		1975
1951	/* moved door processing out of move_player_attack.	1976	/* moved door processing out of move_player_attack.
1952	* returns 1 if player has opened the door with a key	1977	* returns 1 if player has opened the door with a key
…		…
1954	* 0 otherwise	1979	* 0 otherwise
1955	*/	1980	*/
1956	static int	1981	static int
1957	player_attack_door (object *op, object *door)	1982	player_attack_door (object *op, object *door)
1958	{	1983	{
1959	/* If its a door, try to find a use a key. If we do destroy the door,	1984	/* If its a door, try to find a key. If we do destroy the door,
1960	* might as well return immediately as there is nothing more to do -	1985	* might as well return immediately as there is nothing more to do -
1961	* otherwise, we fall through to the rest of the code.	1986	* otherwise, we fall through to the rest of the code.
1962	*/	1987	*/
1963	object *key = find_key (op, op, door);	1988	object *key = find_key (op, op, door);
1964		1989
1965	/* IF we found a key, do some extra work */	1990	/* If we found a key, do some extra work */
1966	if (key)	1991	if (key)
1967	{	1992	{
1968	object *container = key->env;	1993	object *container = key->env;
1969		1994
1970	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1995	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1996
1971	if (action_makes_visible (op))	1997	if (action_makes_visible (op))
1972	make_visible (op);	1998	make_visible (op);
		1999
1973	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	2000	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974	spring_trap (door->inv, op);	2001	spring_trap (door->inv, op);
		2002
1975	if (door->type == DOOR)	2003	if (door->type == DOOR)
1976	{
1977	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	2004	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1978	}
1979	else if (door->type == LOCKED_DOOR)	2005	else if (door->type == LOCKED_DOOR)
1980	{	2006	{
1981	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2007	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1982	remove_door2 (door); /* remove door without violence ;-) */	2008	remove_door2 (door); /* remove door without violence ;-) */
1983	}	2009	}
		2010
1984	/* Do this after we print the message */	2011	/* Do this after we print the message */
1985	decrease_ob (key); /* Use up one of the keys */	2012	decrease_ob (key); /* Use up one of the keys */
1986	/* Need to update the weight the container the key was in */	2013	/* Need to update the weight the container the key was in */
1987	if (container != op)	2014	if (container != op)
1988	esrv_update_item (UPD_WEIGHT, op, container);	2015	esrv_update_item (UPD_WEIGHT, op, container);
		2016
1989	return 1; /* Nothing more to do below */	2017	return 1; /* Nothing more to do below */
1990	}	2018	}
1991	else if (door->type == LOCKED_DOOR)	2019	else if (door->type == LOCKED_DOOR)
1992	{	2020	{
1993	/* Might as well return now - no other way to open this */	2021	/* Might as well return now - no other way to open this */
1994	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2022	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995	return 1;	2023	return 1;
1996	}	2024	}
		2025
1997	return 0;	2026	return 0;
1998	}	2027	}
1999		2028
2000	/* This function is just part of a breakup from move_player.	2029	/* This function is just part of a breakup from move_player.
2001	* It should keep the code cleaner.	2030	* It should keep the code cleaner.
2002	* When this is called, the players direction has been updated	2031	* When this is called, the players direction has been updated
2003	* (taking into account confusion.) The player is also actually	2032	* (taking into account confusion.) The player is also actually
2004	* going to try and move (not fire weapons).	2033	* going to try and move (not fire weapons).
2005	*/	2034	*/
2006	void	2035	bool
2007	move_player_attack (object *op, int dir)	2036	move_player_attack (object *op, int dir)
2008	{	2037	{
2009	object *tmp, *mon;
2010	sint16 nx, ny;
2011	int on_battleground;	2038	int on_battleground;
2012	maptile *m;
2013		2039
2014	nx = freearr_x[dir] + op->x;	2040	sint16 nx = freearr_x[dir] + op->x;
2015	ny = freearr_y[dir] + op->y;	2041	sint16 ny = freearr_y[dir] + op->y;
2016		2042
2017	on_battleground = op_on_battleground (op, 0, 0);	2043	on_battleground = op_on_battleground (op, 0, 0);
		2044
		2045	if (out_of_map (op->map, nx, ny))
		2046	return false;
		2047
		2048	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2049	{
		2050	--op->speed_left;
		2051	return true;
		2052	}
2018		2053
2019	/* If braced, or can't move to the square, and it is not out of the	2054	/* If braced, or can't move to the square, and it is not out of the
2020	* map, attack it. Note order of if statement is important - don't	2055	* map, attack it. Note order of if statement is important - don't
2021	* want to be calling move_ob if braced, because move_ob will move the	2056	* want to be calling move_ob if braced, because move_ob will move the
2022	* player. This is a pretty nasty hack, because if we could	2057	* player. This is a pretty nasty hack, because if we could
2023	* move to some space, it then means that if we are braced, we should	2058	* move to some space, it then means that if we are braced, we should
2024	* do nothing at all. As it is, if we are braced, we go through	2059	* do nothing at all. As it is, if we are braced, we go through
2025	* quite a bit of processing. However, it probably is less than what	2060	* quite a bit of processing. However, it probably is less than what
2026	* move_ob uses.	2061	* move_ob uses.
2027	*/	2062	*/
2028	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2029	{
2030	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2031	{
2032	m = op->map->xy_find (nx, ny);	2063	maptile *m = op->map->xy_find (nx, ny);
2033	if (!m)
2034	return; /* Don't think this should happen */
2035	}
2036	else
2037	m = op->map;
2038		2064
2039	if (!(tmp = m->at (nx, ny).bot))
2040	return;
2041
2042	mon = 0;
2043	/* Go through all the objects, and find ones of interest. Only stop if	2065	/* Go through all the objects, and find ones of interest. Only stop if
2044	* we find a monster - that is something we know we want to attack.	2066	* we find a monster - that is something we know we want to attack.
2045	* if its a door or barrel (can roll) see if there may be monsters	2067	* if its a door or barrel (can roll) see if there may be monsters
2046	* on the space	2068	* on the space
2047	*/	2069	*/
2048	while (tmp)	2070	object *mon;
2049	{	2071	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2050	if (tmp == op)	2072	{
2051	{	2073	if ((mon->flag [FLAG_ALIVE]
2052	tmp = tmp->above;	2074	|| mon->type == LOCKED_DOOR
2053	continue;	2075	|| mon->flag [FLAG_CAN_ROLL])
2054	}
2055
2056	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2057	{
2058	mon = tmp;	2076	&& mon != op)
2059	break;	2077	break;
2060	}	2078	}
2061		2079
2062	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2063	mon = tmp;
2064
2065	tmp = tmp->above;
2066	}
2067
2068	if (!mon) /* This happens anytime the player tries to move */	2080	if (!mon) /* This happens anytime the player tries to move */
2069	return; /* into a wall */	2081	return false; /* into a wall */
2070		2082
2071	if (mon->head)
2072	mon = mon->head;	2083	mon = mon->head_ ();
2073		2084
2074	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2085	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2086	if (op->contr->weapon_sp_left > 0.f)
2075	if (player_attack_door (op, mon))	2087	if (player_attack_door (op, mon))
		2088	{
		2089	--op->contr->weapon_sp_left;
2076	return;	2090	return true;
		2091	}
2077		2092
2078	/* The following deals with possibly attacking peaceful	2093	/* The following deals with possibly attacking peaceful
2079	* or frienddly creatures. Basically, all players are considered	2094	* or friendly creatures. Basically, all players are considered
2080	* unaggressive. If the moving player has peaceful set, then the	2095	* unaggressive. If the moving player has peaceful set, then the
2081	* object should be pushed instead of attacked. It is assumed that	2096	* object should be pushed instead of attacked. It is assumed that
2082	* if you are braced, you will not attack friends accidently,	2097	* if you are braced, you will not attack friends accidently,
2083	* and thus will not push them.	2098	* and thus will not push them.
2084	*/	2099	*/
2085		2100
2086	/* If the creature is a pet, push it even if the player is not	2101	/* If the creature is a pet, push it even if the player is not
2087	* peaceful. Our assumption is the creature is a pet if the	2102	* peaceful. Our assumption is the creature is a pet if the
2088	* player owns it and it is either friendly or unagressive.	2103	* player owns it and it is either friendly or unagressive.
2089	*/	2104	*/
2090	if ((op->type == PLAYER)	2105	if (op->type == PLAYER
2091	#if COZY_SERVER
2092	&&
2093	((mon->owner && mon->owner->contr	2106	&& ((mon->owner && mon->owner->contr
2094	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2107	&& same_party (mon->owner->contr->party, op->contr->party))
2095	#else
2096	&& mon->owner == op	2108	|| mon->owner == op)
2097	#endif
2098	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2109	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2099	{	2110	{
2100	/* If we're braced, we don't want to switch places with it */	2111	/* If we're braced, we don't want to switch places with it */
2101	if (op->contr->braced)	2112	if (op->contr->braced)
2102	return;	2113	return false;
		2114
		2115	if (op->speed_left > 0.f)
		2116	{
		2117	--op->speed_left;
2103		2118
2104	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2119	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2105	(void) push_ob (mon, dir, op);	2120	push_ob (mon, dir, op);
		2121
2106	if (op->contr->tmp_invis || op->hide)	2122	if (op->contr->tmp_invis || op->hide)
2107	make_visible (op);	2123	make_visible (op);
2108		2124
2109	return;	2125	return true;
2110	}	2126	}
		2127	else
		2128	return false;
		2129	}
2111		2130
2112	/* in certain circumstances, you shouldn't attack friendly	2131	/* in certain circumstances, you shouldn't attack friendly
2113	* creatures. Note that if you are braced, you can't push	2132	* creatures. Note that if you are braced, you can't push
2114	* someone, but put it inside this loop so that you won't	2133	* someone, but put it inside this loop so that you won't
2115	* attack them either.	2134	* attack them either.
2116	*/	2135	*/
2117	if ((mon->type == PLAYER || mon->enemy != op) &&	2136	if ((mon->type == PLAYER || mon->enemy != op)
2118	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2137	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2119	#ifdef PROHIBIT_PLAYERKILL
2120	(op->contr->peaceful	2138	&& ((op->contr->peaceful
2121	|| (mon->type == PLAYER	2139	|| (mon->type == PLAYER && mon->contr->peaceful))
2122	&& mon->contr->
2123	peaceful)) &&
2124	#else
2125	op->contr->peaceful &&
2126	#endif
2127	!on_battleground))	2140	&& !on_battleground))
		2141	{
		2142	if (op->speed_left > 0.f)
2128	{	2143	{
		2144	--op->speed_left;
		2145
2129	if (!op->contr->braced)	2146	if (!op->contr->braced)
2130	{	2147	{
2131	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);
2132	push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
2133	}	2150	}
2134	else	2151	else
2135	new_draw_info (0, 0, op, "You withhold your attack");	2152	new_draw_info (0, 0, op, "You withhold your attack");
2136		2153
2137	if (op->contr->tmp_invis || op->hide)	2154	if (op->contr->tmp_invis || op->hide)
2138	make_visible (op);	2155	make_visible (op);
2139	}
2140		2156
		2157	return true;
		2158	}
		2159	}
2141	/* If the object is a boulder or other rollable object, then	2160	/* If the object is a boulder or other rollable object, then
2142	* roll it if not braced. You can't roll it if you are braced.	2161	* roll it if not braced. You can't roll it if you are braced.
2143	*/	2162	*/
2144	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2163	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2164	{
		2165	if (op->speed_left > 0.f)
2145	{	2166	{
		2167	--op->speed_left;
		2168
2146	recursive_roll (mon, dir, op);	2169	recursive_roll (mon, dir, op);
2147	if (action_makes_visible (op))	2170	if (action_makes_visible (op))
2148	make_visible (op);	2171	make_visible (op);
2149	}
2150		2172
		2173	return true;
		2174	}
		2175	}
2151	/* Any generic living creature. Including things like doors.	2176	/* Any generic living creature. Including things like doors.
2152	* Way it works is like this: First, it must have some hit points	2177	* Way it works is like this: First, it must have some hit points
2153	* and be living. Then, it must be one of the following:	2178	* and be living. Then, it must be one of the following:
2154	* 1) Not a player, 2) A player, but of a different party. Note	2179	* 1) Not a player, 2) A player, but of a different party. Note
2155	* that party_number -1 is no party, so attacks can still happen.	2180	* that party_number -1 is no party, so attacks can still happen.
2156	*/	2181	*/
2157	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2182	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2158	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2183	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2159	{	2184	{
2160		2185	if (op->contr->weapon_sp_left > 0.f)
2161	/* If the player hasn't hit something this tick, and does
2162	* so, give them speed boost based on weapon speed. Doing
2163	* it here is better than process_players2, which basically
2164	* incurred a 1 tick offset.
2165	*/
2166	if (!op->contr->has_hit)
2167	{	2186	{
2168	op->speed_left += op->speed / op->contr->weapon_sp;	2187	--op->contr->weapon_sp_left;
2169
2170	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2171	}
2172		2188
2173	skill_attack (mon, op, 0, 0, 0);	2189	skill_attack (mon, op, 0, 0, 0);
2174
2175	/* If attacking another player, that player gets automatic
2176	* hitback, and doesn't loose luck either.
2177	* Disable hitback on the battleground or if the target is
2178	* the wiz.
2179	*/
2180	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2181	{
2182	short luck = mon->stats.luck;
2183
2184	mon->contr->has_hit = 1;
2185	skill_attack (op, mon, 0, 0, 0);
2186	mon->stats.luck = luck;
2187	}
2188		2190
2189	if (action_makes_visible (op))	2191	if (action_makes_visible (op))
2190	make_visible (op);	2192	make_visible (op);
2191	}
2192	} /* if player should attack something */
2193	}
2194		2193
2195	int	2194	return true;
		2195	}
		2196	}
		2197
		2198	return false;
		2199	}
		2200
		2201	bool
2196	move_player (object *op, int dir)	2202	move_player (object *op, int dir)
2197	{	2203	{
2198	int pick;	2204	int pick;
2199		2205
2200	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2206	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2207	return 0;	2213	return 0;
2208	}	2214	}
2209		2215
2210	/* peterm: added following line */	2216	/* peterm: added following line */
2211	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2217	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2218	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213		2219
2214	op->facing = dir;	2220	op->facing = dir;
2215		2221
2216	if (op->hide)	2222	if (op->hide)
2217	do_hidden_move (op);	2223	do_hidden_move (op);
2218		2224
		2225	bool retval;
		2226
2219	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2227	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2220	/*nop */ ;	2228	retval = RESULT_INT (0);
2221	else if (op->contr->fire_on)	2229	else if (op->contr->fire_on)
2222	fire (op, dir);	2230	retval = fire (op, dir);
2223	else	2231	else
2224	{	2232	{
2225	move_player_attack (op, dir);	2233	retval = move_player_attack (op, dir);
2226	pick = check_pick (op);	2234	pick = check_pick (op);
2227	}	2235	}
2228		2236
2229	/* Add special check for newcs players and fire on - this way, the	2237	/* Add special check for newcs players and fire on - this way, the
2230	* server can handle repeat firing.	2238	* server can handle repeat firing.
…		…
2237	/* Update how the player looks. Use the facing, so direction may	2245	/* Update how the player looks. Use the facing, so direction may
2238	* get reset to zero. This allows for full animation capabilities	2246	* get reset to zero. This allows for full animation capabilities
2239	* for players.	2247	* for players.
2240	*/	2248	*/
2241	animate_object (op, op->facing);	2249	animate_object (op, op->facing);
2242	return 0;	2250
		2251	return retval;
2243	}	2252	}
2244		2253
2245	/* This is similar to handle_player, below, but is only used by the	2254	/* This is similar to handle_player, below, but is only used by the
2246	* new client/server stuff.	2255	* new client/server stuff.
2247	* This is sort of special, in that the new client/server actually uses	2256	* This is sort of special, in that the new client/server actually uses
2248	* the new speed values for commands.	2257	* the new speed values for commands.
2249	*	2258	*
2250	* Returns true if there are more actions we can do.	2259	* Returns true if there are more actions we can do. Should not do
		2260	* many actions in a row, as that would be too unfair to other
		2261	* players.
2251	*/	2262	*/
2252	int	2263	bool
2253	handle_newcs_player (object *op)	2264	handle_newcs_player (object *op)
2254	{	2265	{
2255	if (op->contr->hidden)
2256	{
2257	op->invisible = 1000;
2258	/* the socket code flashes the player visible/invisible
2259	* depending on the value of invisible, so we need to
2260	* alternate it here for it to work correctly.
2261	*/
2262	if (pticks & 2)
2263	op->invisible--;
2264	}
2265	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2266	{
2267	op->invisible--;
2268	if (!op->invisible)
2269	{
2270	make_visible (op);
2271	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2272	}
2273	}
2274
2275	if (QUERY_FLAG (op, FLAG_SCARED))	2266	if (QUERY_FLAG (op, FLAG_SCARED))
2276	{	2267	{
2277	flee_player (op);	2268	if (op->speed_left > 0.f)
2278	/* If player is still scared, that is his action for this tick */
2279	if (QUERY_FLAG (op, FLAG_SCARED))
2280	{	2269	{
2281	op->speed_left--;	2270	--op->speed_left;
		2271	flee_player (op);
		2272
2282	return 0;	2273	return true;
2283	}	2274	}
		2275	else
		2276	return false;
2284	}	2277	}
2285
2286	/* I've been seeing crashes where the golem has been destroyed, but
2287	* the player object still points to the defunct golem. The code that
2288	* destroys the golem looks correct, and it doesn't always happen, so
2289	* put this in a a workaround to clean up the golem pointer.
2290	*/
2291	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2292	op->contr->ranges[range_golem] = 0;
2293		2278
2294	/* call this here - we also will call this in do_ericserver, but	2279	/* call this here - we also will call this in do_ericserver, but
2295	* the players time has been increased when doericserver has been	2280	* the players time has been increased when doericserver has been
2296	* called, so we recheck it here.	2281	* called, so we recheck it here.
2297	*/	2282	*/
2298	if (op->contr->ns->handle_command ())	2283	if (op->contr->ns->handle_command ())
2299	return 1;	2284	return true;
2300		2285
2301	if (op->speed_left > 0)
2302	{
2303	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2304	{
2305	/* All move commands take 1 tick, at least for now */
2306	op->speed_left--;
2307
2308	/* Instead of all the stuff below, let move_player take care
2309	* of it. Also, some of the skill stuff is only put in
2310	* there, as well as the confusion stuff.
2311	*/
2312	move_player (op, op->direction);	2287	return move_player (op, op->direction);
2313		2288
2314	return op->speed_left > 0;
2315	}
2316	}
2317
2318	return 0;	2289	return false;
2319	}	2290	}
2320		2291
2321	int	2292	int
2322	save_life (object *op)	2293	save_life (object *op)
2323	{	2294	{
…		…
2358	* from.	2329	* from.
2359	*/	2330	*/
2360	void	2331	void
2361	remove_unpaid_objects (object *op, object *env)	2332	remove_unpaid_objects (object *op, object *env)
2362	{	2333	{
2363	object *next;
2364
2365	while (op)	2334	while (op)
2366	{	2335	{
2367	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2336	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2368		2337
2369	if (QUERY_FLAG (op, FLAG_UNPAID))	2338	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2435	int rate_grace = 2000;	2404	int rate_grace = 2000;
2436	const int max_hp = 1;	2405	const int max_hp = 1;
2437	const int max_sp = 1;	2406	const int max_sp = 1;
2438	const int max_grace = 1;	2407	const int max_grace = 1;
2439		2408
2440	if (op->contr->outputs_sync)	2409	if (op->contr->hidden)
		2410	{
		2411	op->invisible = 1000;
		2412	/* the socket code flashes the player visible/invisible
		2413	* depending on the value of invisible, so we need to
		2414	* alternate it here for it to work correctly.
		2415	*/
		2416	if (pticks & 2)
		2417	op->invisible--;
2441	{	2418	}
2442	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2419	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2443	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2420	{
2444	flush_output_element (op, &op->contr->outputs[i]);	2421	if (!op->invisible--)
		2422	{
		2423	make_visible (op);
		2424	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2425	}
2445	}	2426	}
2446		2427
2447	if (op->contr->ns->state == ST_PLAYING)	2428	if (op->contr->ns->state == ST_PLAYING)
2448	{	2429	{
2449	/* these next three if clauses make it possible to SLOW DOWN	2430	/* these next three if clauses make it possible to SLOW DOWN
…		…
2471	gen_grace = op->stats.maxgrace;	2452	gen_grace = op->stats.maxgrace;
2472	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2453	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2473	}	2454	}
2474		2455
2475	/* Regenerate Spell Points */	2456	/* Regenerate Spell Points */
2476	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2457	if (!op->contr->golem && --op->last_sp < 0)
2477	{	2458	{
2478	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2459	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2479	if (op->stats.sp < op->stats.maxsp)	2460	if (op->stats.sp < op->stats.maxsp)
2480	{	2461	{
2481	op->stats.sp++;	2462	op->stats.sp++;
…		…
2579	}	2560	}
2580		2561
2581	/* Digestion */	2562	/* Digestion */
2582	if (--op->last_eat < 0)	2563	if (--op->last_eat < 0)
2583	{	2564	{
2584	#ifdef COZY_SERVER
2585	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2586	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2587	#else
2588	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2565	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2589	#endif
2590		2566
2591	if (op->contr->gen_hp > 0)	2567	if (op->contr->gen_hp > 0)
2592	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2568	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2593	else	2569	else
2594	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2570	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2699	tmp->name = buf;	2675	tmp->name = buf;
2700	sprintf (buf, " This finger has been cut off %s\n"	2676	sprintf (buf, " This finger has been cut off %s\n"
2701	" the %s, when he was defeated at\n level %d by %s.\n",	2677	" the %s, when he was defeated at\n level %d by %s.\n",
2702	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2678	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703	tmp->msg = buf;	2679	tmp->msg = buf;
2704	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2680	tmp->value = 0, tmp->type = 0;
2705	tmp->materialname = NULL;	2681	tmp->materialname = "organics";
2706	tmp->insert_at (op, tmp);	2682	tmp->insert_at (op, tmp);
2707	}	2683	}
2708		2684
2709	/* teleport defeated player to new destination */	2685	/* teleport defeated player to new destination */
2710	transfer_ob (op, x, y, 0, NULL);	2686	transfer_ob (op, x, y, 0, NULL);
…		…
2906	op->stats.hp = op->stats.maxhp;	2882	op->stats.hp = op->stats.maxhp;
2907	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2883	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2884	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909		2885
2910	/*	2886	/*
2911	* Check to see if the player is in a shop. IF so, then check to see if
2912	* the player has any unpaid items. If so, remove them and put them back	2887	* Check to see if the player has any unpaid items. If so, remove them
2913	* in the map.	2888	* and put them back in the map.
2914	*/	2889	*/
2915
2916	if (is_in_shop (op))
2917	remove_unpaid_objects (op->inv, op);	2890	remove_unpaid_objects (op->inv, op);
2918		2891
2919	/****************************************/	2892	/****************************************/
2920	/* */	2893	/* */
2921	/* Move player to his current respawn- */	2894	/* Move player to his current respawn- */
2922	/* position (usually last savebed) */	2895	/* position (usually last savebed) */
…		…
2942	object *force;	2915	object *force;
2943	int at;	2916	int at;
2944		2917
2945	force = get_archetype (FORCE_NAME);	2918	force = get_archetype (FORCE_NAME);
2946	/* 50 ticks should be enough time for the spell to abate */	2919	/* 50 ticks should be enough time for the spell to abate */
2947	force->speed = 0.1;	2920	force->speed = 0.1f;
2948	force->speed_left = -5.0;	2921	force->speed_left = -5.f;
2949	SET_FLAG (force, FLAG_APPLIED);	2922	SET_FLAG (force, FLAG_APPLIED);
2950	for (at = 0; at < NROFATTACKS; at++)	2923	for (at = 0; at < NROFATTACKS; at++)
2951	if (will_kill_again & (1 << at))	2924	if (will_kill_again & (1 << at))
2952	force->resist[at] = 100;	2925	force->resist[at] = 100;
2953		2926
…		…
2962	void	2935	void
2963	loot_object (object *op)	2936	loot_object (object *op)
2964	{ /* Grab and destroy some treasure */	2937	{ /* Grab and destroy some treasure */
2965	object *tmp, *tmp2, *next;	2938	object *tmp, *tmp2, *next;
2966		2939
2967	if (op->container)	2940	op->close_container (); /* close open sack first */
2968	esrv_apply_container (op, op->container); /* close open sack first */
2969		2941
2970	for (tmp = op->inv; tmp; tmp = next)	2942	for (tmp = op->inv; tmp; tmp = next)
2971	{	2943	{
2972	next = tmp->below;	2944	next = tmp->below;
2973		2945
2974	if (tmp->invisible)	2946	if (tmp->invisible)
2975	continue;	2947	continue;
2976		2948
2977	tmp->remove ();	2949	tmp->remove ();
2978	tmp->x = op->x, tmp->y = op->y;	2950	tmp->x = op->x, tmp->y = op->y;
		2951
2979	if (tmp->type == CONTAINER)	2952	if (tmp->type == CONTAINER)
2980	{ /* empty container to ground */	2953	loot_object (tmp); /* empty container to ground */
2981	loot_object (tmp);	2954
2982	}
2983	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2955	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984	{	2956	{
2985	if (tmp->nrof > 1)	2957	if (tmp->nrof > 1)
2986	{	2958	{
2987	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2959	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988	tmp2->destroy ();	2960	tmp2->destroy ();
…		…
2999	/*	2971	/*
3000	* fix_weight(): Check recursively the weight of all players, and fix	2972	* fix_weight(): Check recursively the weight of all players, and fix
3001	* what needs to be fixed. Refresh windows and fix speed if anything	2973	* what needs to be fixed. Refresh windows and fix speed if anything
3002	* was changed.	2974	* was changed.
3003	*/	2975	*/
3004
3005	void	2976	void
3006	fix_weight (void)	2977	fix_weight (void)
3007	{	2978	{
3008	for_all_players (pl)	2979	for_all_players (pl)
3009	{	2980	{
…		…
3069	if (op->type == PLAYER)	3040	if (op->type == PLAYER)
3070	{	3041	{
3071	op->contr->tmp_invis = 0;	3042	op->contr->tmp_invis = 0;
3072	op->contr->invis_race = 0;	3043	op->contr->invis_race = 0;
3073	}	3044	}
		3045
3074	update_object (op, UP_OBJ_FACE);	3046	update_object (op, UP_OBJ_CHANGE);
3075	}	3047	}
3076		3048
3077	int	3049	int
3078	is_true_undead (object *op)	3050	is_true_undead (object *op)
3079	{	3051	{
3080	object *tmp = NULL;
3081
3082	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3052	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083	return 1;	3053	return 1;
3084		3054
3085	return 0;	3055	return 0;
3086	}	3056	}
…		…
3131	/* For Hidden creatures - a chance of becoming 'unhidden'	3101	/* For Hidden creatures - a chance of becoming 'unhidden'
3132	* every time they move - as we subtract off 'invisibility'	3102	* every time they move - as we subtract off 'invisibility'
3133	* AND, for players, if they move into a ridiculously unhideable	3103	* AND, for players, if they move into a ridiculously unhideable
3134	* spot (surrounded by clear terrain in broad daylight). -b.t.	3104	* spot (surrounded by clear terrain in broad daylight). -b.t.
3135	*/	3105	*/
3136
3137	void	3106	void
3138	do_hidden_move (object *op)	3107	do_hidden_move (object *op)
3139	{	3108	{
3140	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3109	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3141	object *skop;	3110	object *skop;
…		…
3374	char buf[MAX_BUF]; /* tmp. string buffer */	3343	char buf[MAX_BUF]; /* tmp. string buffer */
3375	int i = 0, j = 0;	3344	int i = 0, j = 0;
3376		3345
3377	/* get the appropriate treasurelist */	3346	/* get the appropriate treasurelist */
3378	if (atnr == ATNR_FIRE)	3347	if (atnr == ATNR_FIRE)
3379	trlist = find_treasurelist ("dragon_ability_fire");	3348	trlist = treasurelist::find ("dragon_ability_fire");
3380	else if (atnr == ATNR_COLD)	3349	else if (atnr == ATNR_COLD)
3381	trlist = find_treasurelist ("dragon_ability_cold");	3350	trlist = treasurelist::find ("dragon_ability_cold");
3382	else if (atnr == ATNR_ELECTRICITY)	3351	else if (atnr == ATNR_ELECTRICITY)
3383	trlist = find_treasurelist ("dragon_ability_elec");	3352	trlist = treasurelist::find ("dragon_ability_elec");
3384	else if (atnr == ATNR_POISON)	3353	else if (atnr == ATNR_POISON)
3385	trlist = find_treasurelist ("dragon_ability_poison");	3354	trlist = treasurelist::find ("dragon_ability_poison");
3386		3355
3387	if (trlist == NULL || who->type != PLAYER)	3356	if (trlist == NULL || who->type != PLAYER)
3388	return;	3357	return;
3389		3358
3390	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3359	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3522	* not readied.	3491	* not readied.
3523	*/	3492	*/
3524	void	3493	void
3525	player_unready_range_ob (player *pl, object *ob)	3494	player_unready_range_ob (player *pl, object *ob)
3526	{	3495	{
3527	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3496	if (pl->ob->current_weapon == ob)
		3497	pl->ob->current_weapon = 0;
		3498
		3499	if (pl->combat_ob == ob)
		3500	pl->combat_ob = 0;
		3501
3528	if (pl->ranges[i] == ob)	3502	if (pl->ranged_ob == ob)
3529	{
3530	pl->ranges[i] = 0;	3503	pl->ranged_ob = 0;
3531	if (pl->shoottype == i)
3532	pl->shoottype = range_none;
3533	}
3534	}	3504	}
		3505
		3506	sint8
		3507	player::visibility_at (maptile *map, int x, int y) const
		3508	{
		3509	if (!ns)
		3510	return 0;
		3511
		3512	int dx, dy;
		3513	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3514	return 0;
		3515
		3516	x += dx - ns->current_x + ns->mapx / 2;
		3517	y += dy - ns->current_y + ns->mapy / 2;
		3518
		3519	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3520	return 0;
		3521
		3522	return 100 - blocked_los [x][y];
		3523	}

Diff Legend

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