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.176 by root, Sun Dec 16 01:25:17 2007 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
32	#include <algorithm>	33	#include <algorithm>
33	#include <functional>	34	#include <functional>
34		35
35	playervec players;	36	playervec players;
36		37
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	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 */
128
129	strcpy (subject, buf + 1);
130	strip_endline (subject);
131	size = 0;
132	news[0] = '\0';
133	}
134	else
135	{
136	if (size + strlen (buf) >= HUGE_BUF)
137	{
138	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
139	break;
140	}
141	strncat (news + size, buf, HUGE_BUF - size);
142	size += strlen (buf);
143	}
144	}
145
146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
148	close_and_delete (fp, comp);
149	}
150
151	/* This loads the first map an puts the player on it. */	38	/* This loads the first map an puts the player on it. */
152	static void	39	static void
153	set_first_map (object *op)	40	set_first_map (object *op)
154	{	41	{
155	op->contr->maplevel = first_map_path;	42	op->contr->maplevel = first_map_path;
…		…
207	ob->close_container (); //TODO: client-specific	94	ob->close_container (); //TODO: client-specific
208		95
209	ns->update_look = 0;	96	ns->update_look = 0;
210	ns->look_position = 0;	97	ns->look_position = 0;
211		98
212	clear_los (this);	99	clear_los ();
213		100
214	ns->reset_stats ();	101	ns->reset_stats ();
215		102
216	/* make sure he's a player -- needed because of class change. */	103	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	104	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
219		106
220	ob->carrying = sum_weight (ob);	107	ob->update_weight ();
221	link_player_skills (ob);	108	link_skills ();
222		109
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	110	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		111
225	assign (title, ob->arch->object::name);	112	assign (title, ob->arch->object::name);
226		113
…		…
239	set_dragon_name (ob, abil, skin);	126	set_dragon_name (ob, abil, skin);
240	}	127	}
241		128
242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243		130
244	esrv_new_player (this, ob->weight + ob->carrying);	131	esrv_new_player (this);
245		132
246	ob->update_stats ();	133	ob->update_stats ();
247		134
248	ns->floorbox_update ();	135	ns->floorbox_update ();
249	esrv_send_inventory (ob, ob);	136	esrv_send_inventory (ob, ob);
250	esrv_add_spells (this, 0);	137	esrv_add_spells (this, 0);
251		138
252	activate ();	139	activate ();
253		140
254	send_rules (ob);
255	send_news (ob);
256	display_motd (ob);
257
258	INVOKE_PLAYER (CONNECT, this);	141	INVOKE_PLAYER (CONNECT, this);
259	INVOKE_PLAYER (LOGIN, this);	142	INVOKE_PLAYER (LOGIN, this);
260	}	143	}
261		144
262	void	145	void
…		…
278	ns->reset_stats ();	161	ns->reset_stats ();
279	ns->pl = 0;	162	ns->pl = 0;
280	ns = 0;	163	ns = 0;
281	}	164	}
282		165
283	observe = ob;	166	// this is important for the player scheduler to get the correct refcount
		167	// when ns = 0
		168	observe = viewpoint = ob;
284		169
285	deactivate ();	170	deactivate ();
286	}	171	}
287		172
288	// the need for this function can be explained	173	// the need for this function can be explained
289	// by load_object not returning the object	174	// by load_object not returning the object
290	void	175	void
291	player::set_object (object *op)	176	player::set_object (object *op)
292	{	177	{
293	ob = observe = op;	178	ob = observe = viewpoint = op;
294	ob->contr = this; /* this aren't yet in archetype */	179	ob->contr = this; /* this aren't yet in archetype */
295		180
296	ob->speed = 1.0f;	181	ob->speed = 1.0f;
297	ob->speed_left = 0.5f;	182	ob->speed_left = 0.5f;
298		183
299	ob->direction = 5; /* So player faces south */	184	ob->direction = 5; /* So player faces south */
300		185
301	ob->flag [FLAG_READY_WEAPON] = false;	186	ob->flag [FLAG_READY_WEAPON] = false;
302	ob->flag [FLAG_READY_SKILL] = false;	187	ob->flag [FLAG_READY_SKILL] = false;
303	ob->flag [FLAG_READY_BOW] = false;	188	ob->flag [FLAG_READY_BOW] = false;
304		189
…		…
321	combat_ob = op;	206	combat_ob = op;
322	break;	207	break;
323	}	208	}
324		209
325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	210	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
		211	ob->deactivate (); // change_weapon activates, fix this better
326	}	212	}
327		213
328	void	214	void
329	player::set_observe (object *op)	215	player::set_observe (object *op)
330	{	216	{
331	observe = op ? op : ob;	217	observe = viewpoint = op ? op : ob;
		218	do_los = 1;
		219	}
		220
		221	void
		222	player::set_viewpoint (object *op)
		223	{
		224	viewpoint = op ? op : (object *)observe;
332	do_los = 1;	225	do_los = 1;
333	}	226	}
334		227
335	player::player ()	228	player::player ()
336	{	229	{
…		…
344	savebed_map = first_map_path; /* Init. respawn position */	237	savebed_map = first_map_path; /* Init. respawn position */
345		238
346	gen_sp_armour = 10;	239	gen_sp_armour = 10;
347	bowtype = bow_normal;	240	bowtype = bow_normal;
348	petmode = pet_normal;	241	petmode = pet_normal;
349	listening = 10;
350	usekeys = containers;	242	usekeys = containers;
351	peaceful = 1; /* default peaceful */	243	peaceful = 1; /* default peaceful */
352	do_los = 1;	244	do_los = 1;
353		245
354	weapon_sp = 1.0f;	246	weapon_sp = 1.0f;
…		…
366	{	258	{
367	ob->destroy_inv (false);	259	ob->destroy_inv (false);
368	ob->destroy ();	260	ob->destroy ();
369	}	261	}
370		262
371	ob = observe = 0;	263	ob = observe = viewpoint = 0;
372	}	264	}
373		265
374	player::~player ()	266	player::~player ()
375	{	267	{
376	/* Clear item stack */	268	/* Clear item stack */
…		…
403	* Note: there MUST be at least one player archetype!	295	* Note: there MUST be at least one player archetype!
404	*/	296	*/
405	archetype *	297	archetype *
406	get_player_archetype (archetype *at)	298	get_player_archetype (archetype *at)
407	{	299	{
		300	// archetypes could have been reloaded
		301	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		302
		303	if (!nat)
		304	return at;
		305
408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	306	archvec::iterator i = archetypes.find (nat);
409		307
410	for (;;)	308	for (;;)
411	{	309	{
412	if (++i == archetypes.end ())	310	if (++i == archetypes.end ())
413	i = archetypes.begin ();	311	i = archetypes.begin ();
…		…
631		529
632	return firstdir;	530	return firstdir;
633	}	531	}
634		532
635	void	533	void
636	give_initial_items (object *pl, treasurelist * items)	534	give_initial_items (object *pl, treasurelist *items)
637	{	535	{
638	if (pl->randomitems)	536	if (pl->randomitems)
639	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	537	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
640		538
641	for (object *next, *op = pl->inv; op; op = next)	539	for (object *next, *op = pl->inv; op; op = next)
…		…
651	/* we never give weapons/armour if these cannot be used	549	/* we never give weapons/armour if these cannot be used
652	* by this player due to race restrictions	550	* by this player due to race restrictions
653	*/	551	*/
654	if (pl->type == PLAYER)	552	if (pl->type == PLAYER)
655	{	553	{
656	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	554	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		555	&&
657	(op->type == ARMOUR || op->type == BOOTS ||	556	(op->type == ARMOUR || op->type == BOOTS
658	op->type == CLOAK || op->type == HELMET ||	557	|| op->type == CLOAK || op->type == HELMET
659	op->type == SHIELD || op->type == GLOVES ||	558	|| op->type == SHIELD || op->type == GLOVES
		559	|| op->type == BRACERS || op->type == GIRDLE))
660	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	560	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
661	{	561	{
662	op->destroy ();	562	op->destroy ();
663	continue;	563	continue;
664	}	564	}
665	}	565	}
666		566
667	/* This really needs to be better - we should really give	567	/* Here we remove duplicated skills (as duplicated spell objects have
668	* a substitute spellbook. The problem is that we don't really	568	* _very_ confusing effects for players), which could for instance be
669	* have a good idea what to replace it with (need something like	569	* generated by bad treasurelists. - elmex
670	* a first level treasurelist for each skill.)
671	* remove duplicate skills also
672	*/	570	*/
673	if (op->type == SPELLBOOK || op->type == SKILL)	571	if (op->type == SKILL)
674	{	572	{
675	object *tmp;
676
677	for (tmp = op->below; tmp; tmp = tmp->below)	573	for (object *tmp = op->below; tmp; tmp = tmp->below)
678	if (tmp->type == op->type && tmp->name == op->name)	574	if (tmp->type == op->type && tmp->name == op->name)
679	break;
680
681	if (tmp)
682	{	575	{
683	op->destroy ();	576	op->destroy ();
		577	LOG (llevError,
684	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	578	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
685	continue;	579	break;
686	}	580	}
687		581
688	if (op->nrof > 1)	582	if (op->nrof > 1)
689	op->nrof = 1;	583	op->nrof = 1;
690	}	584	}
691		585
692	if (op->type == SPELLBOOK && op->inv)	586	if (op->type == SPELLBOOK && op->inv)
693	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	587	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
694		588
695	/* Give starting characters identified, uncursed, and undamned	589	/* Give starting characters identified, uncursed, and undamned
696	* items. Just don't identify gold or silver, or it won't be	590	* items. Just don't identify gold or silver, or it won't be
697	* merged properly.	591	* merged properly.
698	*/	592	*/
699	if (need_identify (op))	593	if (need_identify (op))
700	{	594	{
701	SET_FLAG (op, FLAG_IDENTIFIED);	595	SET_FLAG (op, FLAG_IDENTIFIED);
702	CLEAR_FLAG (op, FLAG_CURSED);	596	CLEAR_FLAG (op, FLAG_CURSED);
703	CLEAR_FLAG (op, FLAG_DAMNED);	597	CLEAR_FLAG (op, FLAG_DAMNED);
704	}	598	}
		599
705	if (op->type == SPELL)	600	if (op->type == SPELL)
706	{	601	{
707	op->destroy ();	602	op->destroy ();
708	continue;	603	continue;
709	}	604	}
…		…
711	{	606	{
712	SET_FLAG (op, FLAG_CAN_USE_SKILL);	607	SET_FLAG (op, FLAG_CAN_USE_SKILL);
713	op->stats.exp = 0;	608	op->stats.exp = 0;
714	op->level = 1;	609	op->level = 1;
715	}	610	}
716	/* lock all 'normal items by default */	611	else /* lock all 'normal items by default */
717	else
718	SET_FLAG (op, FLAG_INV_LOCKED);	612	SET_FLAG (op, FLAG_INV_LOCKED);
719	} /* for loop of objects in player inv */	613	} /* for loop of objects in player inv */
720		614
721	/* Need to set up the skill pointers */	615	/* Need to set up the skill pointers */
722	link_player_skills (pl);	616	pl->contr->link_skills ();
723	}	617	}
724		618
725	void	619	void
726	get_party_password (object *op, partylist *party)	620	get_party_password (object *op, partylist *party)
727	{	621	{
…		…
828	static void	722	static void
829	start_info (object *op)	723	start_info (object *op)
830	{	724	{
831	char buf[MAX_BUF];	725	char buf[MAX_BUF];
832		726
833	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	727	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
834	new_draw_info (NDI_UNIQUE, 0, op, buf);	728	new_draw_info (NDI_UNIQUE, 0, op, buf);
835	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
836	//new_draw_info (NDI_UNIQUE, 0, op, " ");
837	}	729	}
838		730
839	/* This function takes the key that is passed, and does the	731	/* This function takes the key that is passed, and does the
840	* appropriate action with it (change race, or other things).	732	* appropriate action with it (change race, or other things).
841	* The function name is for historical reasons - now we have	733	* The function name is for historical reasons - now we have
…		…
844	*/	736	*/
845	void	737	void
846	player::chargen_race_done ()	738	player::chargen_race_done ()
847	{	739	{
848	/* this must before then initial items are given */	740	/* this must before then initial items are given */
849	esrv_new_player (ob->contr, ob->weight + ob->carrying);	741	esrv_new_player (ob->contr);
850		742
851	treasurelist *tl = treasurelist::find ("starting_wealth");	743	treasurelist *tl = treasurelist::find ("starting_wealth");
852	if (tl)	744	if (tl)
853	create_treasure (tl, ob, 0, 0, 0);	745	create_treasure (tl, ob, 0, 0, 0);
854		746
…		…
858	ob->contr->ns->state = ST_PLAYING;	750	ob->contr->ns->state = ST_PLAYING;
859		751
860	if (ob->msg)	752	if (ob->msg)
861	ob->msg = 0;	753	ob->msg = 0;
862		754
863	/* We create this now because some of the unique maps will need it
864	* to save here.
865	*/
866	{
867	char buf[MAX_BUF];
868	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
869	make_path_to_file (buf);
870	}
871
872	start_info (ob);	755	start_info (ob);
873	CLEAR_FLAG (ob, FLAG_WIZ);	756	CLEAR_FLAG (ob, FLAG_WIZ);
874	give_initial_items (ob, ob->randomitems);	757	give_initial_items (ob, ob->randomitems);
875	link_player_skills (ob);
876	esrv_send_inventory (ob, ob);	758	esrv_send_inventory (ob, ob);
877	ob->update_stats ();	759	ob->update_stats ();
878		760
879	/* This moves the player to a different start map, if there	761	/* This moves the player to a different start map, if there
880	* is one for this race	762	* is one for this race
881	*/	763	*/
882	if (*first_map_ext_path)	764	if (*first_map_ext_path)
883	{	765	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
884	object *tmp;
885	char mapname[MAX_BUF];
886
887	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
888	tmp = object::create ();
889	EXIT_PATH (tmp) = mapname;
890	EXIT_X (tmp) = ob->x;
891	EXIT_Y (tmp) = ob->y;
892	ob->enter_exit (tmp); /* we don't really care if it succeeded;
893	* if the map isn't there, then stay on the
894	* default initial map */
895	tmp->destroy ();
896	}
897	else	766	else
898	LOG (llevDebug, "first_map_ext_path not set\n");	767	LOG (llevDebug, "first_map_ext_path not set\n");
899	}	768	}
900		769
901	void	770	void
…		…
945	LOG (llevDebug, "Fleeing player is dead.\n");	814	LOG (llevDebug, "Fleeing player is dead.\n");
946	CLEAR_FLAG (op, FLAG_SCARED);	815	CLEAR_FLAG (op, FLAG_SCARED);
947	return;	816	return;
948	}	817	}
949		818
950	if (op->enemy == NULL)	819	if (!op->enemy)
951	{	820	{
952	LOG (llevDebug, "Fleeing player had no enemy.\n");	821	LOG (llevDebug, "Fleeing player had no enemy.\n");
953	CLEAR_FLAG (op, FLAG_SCARED);	822	CLEAR_FLAG (op, FLAG_SCARED);
954	return;	823	return;
955	}	824	}
956		825
957	/* Seen some crashes here. Since we don't store an
958	* op->enemy_count, it is possible that something destroys the
959	* actual enemy, and the object is recycled.
960	*/
961	if (op->enemy->map == NULL)
962	{
963	CLEAR_FLAG (op, FLAG_SCARED);
964	op->enemy = NULL;
965	return;
966	}
967
968	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	826	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
969	{	827	{
970	op->enemy = NULL;	828	op->enemy = NULL;
971	CLEAR_FLAG (op, FLAG_SCARED);	829	CLEAR_FLAG (op, FLAG_SCARED);
972	return;	830	return;
…		…
975	get_rangevector (op, op->enemy, &rv, 0);	833	get_rangevector (op, op->enemy, &rv, 0);
976		834
977	dir = absdir (4 + rv.direction);	835	dir = absdir (4 + rv.direction);
978	for (diff = 0; diff < 3; diff++)	836	for (diff = 0; diff < 3; diff++)
979	{	837	{
980	int m = 1 - (RANDOM () & 2);	838	int m = 1 - rndm (2) * 2;
981		839
982	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	840	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
983	return;	841	return;
984	}	842	}
985		843
…		…
996	check_pick (object *op)	854	check_pick (object *op)
997	{	855	{
998	object *tmp, *next;	856	object *tmp, *next;
999	int stop = 0;	857	int stop = 0;
1000	int wvratio;	858	int wvratio;
1001	char putstring[128];
1002		859
1003	/* if you're flying, you cna't pick up anything */	860	/* if you're flying, you cna't pick up anything */
1004	if (op->move_type & MOVE_FLYING)	861	if (op->move_type & MOVE_FLYING)
1005	return 1;	862	return 1;
1006		863
…		…
1030		887
1031	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	888	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1032	{	889	{
1033	if (item_matched_string (op, tmp, op->contr->search_str))	890	if (item_matched_string (op, tmp, op->contr->search_str))
1034	CHK_PICK_PICKUP;	891	CHK_PICK_PICKUP;
		892
1035	continue;	893	continue;
1036	}	894	}
1037		895
1038	/* high not bit set? We're using the old autopickup model */	896	/* pickup handling */
		897	if (op->contr->mode & PU_DEBUG)
		898	{
		899	/* some debugging code to figure out item information */
		900	const char *str = tmp->name
		901	? format ("item name: %s item type: %d weight/value: %d",
		902	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		903	: format ("item name: %s item type: %d weight/value: %d",
		904	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		905
		906	new_draw_info (NDI_UNIQUE, 0, op, str);
		907	}
		908
		909	if (op->contr->mode & PU_INHIBIT)
		910	return 1;
		911
		912	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		913	return 1;
		914
		915	/* philosophy:
		916	* It's easy to grab an item type from a pile, as long as it's
		917	* generic. This takes no game-time. For more detailed pickups
		918	* and selections, select-items should be used. This is a
		919	* grab-as-you-run type mode that's really useful for arrows for
		920	* example.
		921	* The drawback: right now it has no frontend, so you need to
		922	* stick the bits you want into a calculator in hex mode and then
		923	* convert to decimal and then 'pickup <#>
		924	*/
		925
		926	/* the first two modes are exclusive: if NOTHING we return, if
		927	* STOP then we stop. All the rest are applied sequentially,
		928	* meaning if any test passes, the item gets picked up. */
		929
		930	/* if mode is set to pick nothing up, return */
		931	if (op->contr->mode == PU_NOTHING)
		932	return 1;
		933
		934	/* if mode is set to stop when encountering objects, return */
		935	/* take STOP before INHIBIT since it doesn't actually pick
		936	* anything up */
		937	if (op->contr->mode & PU_STOP)
		938	return 0;
		939
		940	/* useful for going into stores and not losing your settings... */
		941	/* and for battles wher you don't want to get loaded down while
		942	* fighting */
		943	if (op->contr->mode & PU_INHIBIT)
		944	return 1;
		945
		946	/* prevent us from turning into auto-thieves :) */
		947	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		948	continue;
		949
		950	/* ignore known cursed objects */
		951	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		952	continue;
		953
		954	/* all food and drink if desired */
		955	/* question: don't pick up known-poisonous stuff? */
1039	if (!(op->contr->mode & PU_NEWMODE))	956	if (op->contr->mode & PU_FOOD)
		957	if (tmp->type == FOOD)
1040	{	958	{
1041	switch (op->contr->mode)	959	CHK_PICK_PICKUP;
		960	continue;
		961	}
		962
		963	if (op->contr->mode & PU_DRINK)
		964	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		965	{
		966	CHK_PICK_PICKUP;
		967	continue;
		968	}
		969
		970	if (op->contr->mode & PU_POTION)
		971	if (tmp->type == POTION)
		972	{
		973	CHK_PICK_PICKUP;
		974	continue;
		975	}
		976
		977	/* spellbooks, skillscrolls and normal books/scrolls */
		978	if (op->contr->mode & PU_SPELLBOOK)
		979	if (tmp->type == SPELLBOOK)
		980	{
		981	CHK_PICK_PICKUP;
		982	continue;
		983	}
		984
		985	if (op->contr->mode & PU_SKILLSCROLL)
		986	if (tmp->type == SKILLSCROLL)
		987	{
		988	CHK_PICK_PICKUP;
		989	continue;
		990	}
		991
		992	if (op->contr->mode & PU_READABLES)
		993	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		994	{
		995	CHK_PICK_PICKUP;
		996	continue;
		997	}
		998
		999	/* wands/staves/rods/horns */
		1000	if (op->contr->mode & PU_MAGIC_DEVICE)
		1001	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1002	{
		1003	CHK_PICK_PICKUP;
		1004	continue;
		1005	}
		1006
		1007	/* pick up all magical items */
		1008	if (op->contr->mode & PU_MAGICAL)
		1009	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1010	{
		1011	CHK_PICK_PICKUP;
		1012	continue;
		1013	}
		1014
		1015	if (op->contr->mode & PU_VALUABLES)
		1016	{
		1017	if (tmp->type == MONEY || tmp->type == GEM)
1042	{	1018	{
1043	case 0:
1044	return 1; /* don't pick up */
1045	case 1:
1046	CHK_PICK_PICKUP;	1019	CHK_PICK_PICKUP;
1047	return 1;	1020	continue;
1048	case 2:
1049	CHK_PICK_PICKUP;
1050	return 0;
1051	case 3:
1052	return 0; /* stop before pickup */
1053	case 4:
1054	CHK_PICK_PICKUP;
1055	break;
1056	case 5:
1057	CHK_PICK_PICKUP;
1058	stop = 1;
1059	break;
1060	case 6:
1061	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1062	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1063	CHK_PICK_PICKUP;
1064	break;
1065
1066	case 7:
1067	if (tmp->type == MONEY || tmp->type == GEM)
1068	CHK_PICK_PICKUP;
1069	break;
1070
1071	default:
1072	/* use value density */
1073	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1074	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1075	CHK_PICK_PICKUP;
1076	}	1021	}
1077	}	1022	}
1078	else	1023
1079	{ /* old model */	1024	/* rings & amulets - talismans seems to be typed AMULET */
1080	/* NEW pickup handling */
1081	if (op->contr->mode & PU_DEBUG)	1025	if (op->contr->mode & PU_JEWELS)
		1026	if (tmp->type == RING || tmp->type == AMULET)
1082	{	1027	{
1083	/* some debugging code to figure out item information */	1028	CHK_PICK_PICKUP;
1084	if (tmp->name != NULL)
1085	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1086	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1087	else
1088	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1089	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1090
1091	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1092	}
1093
1094	/* philosophy:
1095	* It's easy to grab an item type from a pile, as long as it's
1096	* generic. This takes no game-time. For more detailed pickups
1097	* and selections, select-items should be used. This is a
1098	* grab-as-you-run type mode that's really useful for arrows for
1099	* example.
1100	* The drawback: right now it has no frontend, so you need to
1101	* stick the bits you want into a calculator in hex mode and then
1102	* convert to decimal and then 'pickup <#>
1103	*/
1104
1105	/* the first two modes are exclusive: if NOTHING we return, if
1106	* STOP then we stop. All the rest are applied sequentially,
1107	* meaning if any test passes, the item gets picked up. */
1108
1109	/* if mode is set to pick nothing up, return */
1110
1111	if (op->contr->mode & PU_NOTHING)
1112	return 1;
1113
1114	/* if mode is set to stop when encountering objects, return */
1115	/* take STOP before INHIBIT since it doesn't actually pick
1116	* anything up */
1117
1118	if (op->contr->mode & PU_STOP)
1119	return 0;
1120
1121	/* useful for going into stores and not losing your settings... */
1122	/* and for battles wher you don't want to get loaded down while
1123	* fighting */
1124	if (op->contr->mode & PU_INHIBIT)
1125	return 1;
1126
1127	/* prevent us from turning into auto-thieves :) */
1128	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1129	continue;	1029	continue;
		1030	}
1130		1031
1131	/* ignore known cursed objects */	1032	/* we don't forget dragon food */
1132	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1033	if (op->contr->mode & PU_FLESH)
		1034	if (tmp->type == FLESH)
		1035	{
		1036	CHK_PICK_PICKUP;
1133	continue;	1037	continue;
		1038	}
1134		1039
1135	/* all food and drink if desired */	1040	/* bows and arrows. Bows are good for selling! */
1136	/* question: don't pick up known-poisonous stuff? */	1041	if (op->contr->mode & PU_BOW)
		1042	if (tmp->type == BOW)
		1043	{
		1044	CHK_PICK_PICKUP;
		1045	continue;
		1046	}
		1047
		1048	if (op->contr->mode & PU_ARROW)
		1049	if (tmp->type == ARROW)
		1050	{
		1051	CHK_PICK_PICKUP;
		1052	continue;
		1053	}
		1054
		1055	/* all kinds of armor etc. */
		1056	if (op->contr->mode & PU_ARMOUR)
		1057	if (tmp->type == ARMOUR)
		1058	{
		1059	CHK_PICK_PICKUP;
		1060	continue;
		1061	}
		1062
		1063	if (op->contr->mode & PU_HELMET)
		1064	if (tmp->type == HELMET)
		1065	{
		1066	CHK_PICK_PICKUP;
		1067	continue;
		1068	}
		1069
		1070	if (op->contr->mode & PU_SHIELD)
		1071	if (tmp->type == SHIELD)
		1072	{
		1073	CHK_PICK_PICKUP;
		1074	continue;
		1075	}
		1076
1137	if (op->contr->mode & PU_FOOD)	1077	if (op->contr->mode & PU_BOOTS)
1138	if (tmp->type == FOOD)	1078	if (tmp->type == BOOTS)
		1079	{
		1080	CHK_PICK_PICKUP;
		1081	continue;
		1082	}
		1083
		1084	if (op->contr->mode & PU_GLOVES)
		1085	if (tmp->type == GLOVES)
		1086	{
		1087	CHK_PICK_PICKUP;
		1088	continue;
		1089	}
		1090
		1091	if (op->contr->mode & PU_CLOAK)
		1092	if (tmp->type == CLOAK)
		1093	{
		1094	CHK_PICK_PICKUP;
		1095	continue;
		1096	}
		1097
		1098	/* hoping to catch throwing daggers here */
		1099	if (op->contr->mode & PU_MISSILEWEAPON)
		1100	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1101	{
		1102	CHK_PICK_PICKUP;
		1103	continue;
		1104	}
		1105
		1106	/* careful: chairs and tables are weapons! */
		1107	if (op->contr->mode & PU_ALLWEAPON)
		1108	{
		1109	if (tmp->type == WEAPON)
		1110	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1139	{	1111	{
1140	CHK_PICK_PICKUP;	1112	CHK_PICK_PICKUP;
1141	continue;	1113	continue;
1142	}	1114	}
		1115	}
1143		1116
		1117	/* misc stuff that's useful */
1144	if (op->contr->mode & PU_DRINK)	1118	if (op->contr->mode & PU_KEY)
1145	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1119	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1146	{	1120	{
1147	CHK_PICK_PICKUP;	1121	CHK_PICK_PICKUP;
1148	continue;	1122	continue;
1149	}	1123	}
1150		1124
		1125	/* any of the last 4 bits set means we use the ratio for value
		1126	* pickups */
1151	if (op->contr->mode & PU_POTION)	1127	if (op->contr->mode & PU_RATIO)
1152	if (tmp->type == POTION)	1128	{
		1129	/* use value density to decide what else to grab */
		1130	/* >=7 was >= op->contr->mode */
		1131	/* >=7 is the old standard setting. Now we take the last 4 bits
1153	{	1132	*/
1154	CHK_PICK_PICKUP;
1155	continue;
1156	}
1157
1158	/* spellbooks, skillscrolls and normal books/scrolls */
1159	if (op->contr->mode & PU_SPELLBOOK)
1160	if (tmp->type == SPELLBOOK)
1161	{
1162	CHK_PICK_PICKUP;
1163	continue;
1164	}
1165
1166	if (op->contr->mode & PU_SKILLSCROLL)
1167	if (tmp->type == SKILLSCROLL)
1168	{
1169	CHK_PICK_PICKUP;
1170	continue;
1171	}
1172
1173	if (op->contr->mode & PU_READABLES)
1174	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1175	{
1176	CHK_PICK_PICKUP;
1177	continue;
1178	}
1179
1180	/* wands/staves/rods/horns */
1181	if (op->contr->mode & PU_MAGIC_DEVICE)
1182	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1183	{
1184	CHK_PICK_PICKUP;
1185	continue;
1186	}
1187
1188	/* pick up all magical items */
1189	if (op->contr->mode & PU_MAGICAL)	1133	wvratio = op->contr->mode & PU_RATIO;
1190	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1134	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1191	{
1192	CHK_PICK_PICKUP;
1193	continue;
1194	}
1195
1196	if (op->contr->mode & PU_VALUABLES)
1197	{	1135	{
1198	if (tmp->type == MONEY || tmp->type == GEM)	1136	#if 0
		1137	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1138	if (tmp->name != NULL)
1199	{	1139	{
1200	CHK_PICK_PICKUP;	1140	fprintf (stderr, "%s", tmp->name);
1201	continue;
1202	}	1141	}
1203	}
1204
1205	/* rings & amulets - talismans seems to be typed AMULET */
1206	if (op->contr->mode & PU_JEWELS)
1207	if (tmp->type == RING || tmp->type == AMULET)
1208	{
1209	CHK_PICK_PICKUP;
1210	continue;
1211	}
1212
1213	/* we don't forget dragon food */
1214	if (op->contr->mode & PU_FLESH)
1215	if (tmp->type == FLESH)
1216	{
1217	CHK_PICK_PICKUP;
1218	continue;
1219	}
1220
1221	/* bows and arrows. Bows are good for selling! */
1222	if (op->contr->mode & PU_BOW)
1223	if (tmp->type == BOW)
1224	{
1225	CHK_PICK_PICKUP;
1226	continue;
1227	}
1228
1229	if (op->contr->mode & PU_ARROW)
1230	if (tmp->type == ARROW)
1231	{
1232	CHK_PICK_PICKUP;
1233	continue;
1234	}
1235
1236	/* all kinds of armor etc. */
1237	if (op->contr->mode & PU_ARMOUR)
1238	if (tmp->type == ARMOUR)
1239	{
1240	CHK_PICK_PICKUP;
1241	continue;
1242	}
1243
1244	if (op->contr->mode & PU_HELMET)
1245	if (tmp->type == HELMET)
1246	{
1247	CHK_PICK_PICKUP;
1248	continue;
1249	}
1250
1251	if (op->contr->mode & PU_SHIELD)
1252	if (tmp->type == SHIELD)
1253	{
1254	CHK_PICK_PICKUP;
1255	continue;
1256	}
1257
1258	if (op->contr->mode & PU_BOOTS)
1259	if (tmp->type == BOOTS)
1260	{
1261	CHK_PICK_PICKUP;
1262	continue;
1263	}
1264
1265	if (op->contr->mode & PU_GLOVES)
1266	if (tmp->type == GLOVES)
1267	{
1268	CHK_PICK_PICKUP;
1269	continue;
1270	}
1271
1272	if (op->contr->mode & PU_CLOAK)
1273	if (tmp->type == CLOAK)
1274	{
1275	CHK_PICK_PICKUP;
1276	continue;
1277	}
1278
1279	/* hoping to catch throwing daggers here */
1280	if (op->contr->mode & PU_MISSILEWEAPON)
1281	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1282	{
1283	CHK_PICK_PICKUP;
1284	continue;
1285	}
1286
1287	/* careful: chairs and tables are weapons! */
1288	if (op->contr->mode & PU_ALLWEAPON)
1289	{
1290	if (tmp->type == WEAPON && tmp->name != NULL)
1291	{
1292	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1293	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1294	{
1295	CHK_PICK_PICKUP;
1296	continue;
1297	}
1298	}
1299
1300	if (tmp->type == WEAPON && tmp->name == NULL)
1301	{
1302	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1303	{
1304	CHK_PICK_PICKUP;
1305	continue;
1306	}
1307	}
1308	}
1309
1310	/* misc stuff that's useful */
1311	if (op->contr->mode & PU_KEY)
1312	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1313	{
1314	CHK_PICK_PICKUP;
1315	continue;
1316	}
1317
1318	/* any of the last 4 bits set means we use the ratio for value
1319	* pickups */
1320	if (op->contr->mode & PU_RATIO)
1321	{
1322	/* use value density to decide what else to grab */
1323	/* >=7 was >= op->contr->mode */
1324	/* >=7 is the old standard setting. Now we take the last 4 bits
1325	* and multiply them by 5, giving 0..15*5== 5..75 */
1326	wvratio = (op->contr->mode & PU_RATIO) * 5;
1327	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1328	{
1329	CHK_PICK_PICKUP;
1330	#if 0
1331	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1332	if (tmp->name != NULL)
1333	{
1334	fprintf (stderr, "%s", tmp->name);
1335	}
1336	else	1142	else
1337	fprintf (stderr, "%s", tmp->arch->archname);	1143	fprintf (stderr, "%s", tmp->arch->archname);
1338	fprintf (stderr, ",%d] = ", tmp->type);	1144	fprintf (stderr, ",%d] = ", tmp->type);
1339	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1145	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1340	#endif	1146	#endif
		1147	CHK_PICK_PICKUP;
1341	continue;	1148	continue;
1342	}
1343	}	1149	}
1344	} /* the new pickup model */	1150	} /* the new pickup model */
1345	}	1151	}
1346		1152
1347	return !stop;	1153	return !stop;
…		…
1353	* found object is returned.	1159	* found object is returned.
1354	*/	1160	*/
1355	object *	1161	object *
1356	find_arrow (object *op, const char *type)	1162	find_arrow (object *op, const char *type)
1357	{	1163	{
1358	object *tmp = 0;
1359
1360	for (op = op->inv; op; op = op->below)	1164	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1361	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1362	tmp = find_arrow (splay (op), type);
1363	else if (op->type == ARROW && op->race == type)	1165	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1364	return splay (op);	1166	return splay (tmp);
1365		1167
		1168	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1169	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1170	if (object *arrow = find_arrow (tmp, type))
		1171	{
		1172	splay (tmp);
		1173	return arrow;
		1174	}
		1175
1366	return tmp;	1176	return 0;
1367	}	1177	}
1368		1178
1369	/*	1179	/*
1370	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1180	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1371	* against the target. A full test is not performed, simply a basic test	1181	* against the target. A full test is not performed, simply a basic test
1372	* of resistances. The archer is making a quick guess at what he sees down	1182	* of resistances. The archer is making a quick guess at what he sees down
1373	* the hall. Failing that it does it's best to pick the highest plus arrow.	1183	* the hall. Failing that it does it's best to pick the highest plus arrow.
1374	*/	1184	*/
1375	object *	1185	object *
1376	find_better_arrow (object *op, object *target, const char *type, int *better)	1186	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1377	{	1187	{
1378	object *tmp = NULL, *arrow, *ntmp;	1188	object *tmp = NULL, *arrow, *ntmp;
1379	int attacknum, attacktype, betterby = 0, i;	1189	int attacknum, attacktype, betterby = 0, i;
1380		1190
1381	if (!type)	1191	if (!type)
…		…
1385	{	1195	{
1386	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1196	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1387	{	1197	{
1388	i = 0;	1198	i = 0;
1389	ntmp = find_better_arrow (arrow, target, type, &i);	1199	ntmp = find_better_arrow (arrow, target, type, &i);
		1200
1390	if (i > betterby)	1201	if (i > betterby)
1391	{	1202	{
1392	tmp = ntmp;	1203	tmp = ntmp;
1393	betterby = i;	1204	betterby = i;
1394	}	1205	}
1395	}	1206	}
1396	else if (arrow->type == ARROW && arrow->race == type)	1207	else if (arrow->type == ARROW && arrow->race == type)
1397	{	1208	{
1398	/* allways prefer assasination/slaying */	1209	/* allways prefer assasination/slaying */
1399	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1210	if (target->race && arrow->slaying.contains (target->race))
1400	{	1211	{
1401	if (arrow->attacktype & AT_DEATH)	1212	if (arrow->attacktype & AT_DEATH)
1402	{	1213	{
1403	*better = 100;	1214	*better = 100;
1404	return arrow;	1215	return arrow;
…		…
1419	{	1230	{
1420	tmp = arrow;	1231	tmp = arrow;
1421	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1232	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1422	}	1233	}
1423	}	1234	}
		1235
1424	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1236	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1425	{	1237	{
1426	tmp = arrow;	1238	tmp = arrow;
1427	betterby = 2 + arrow->magic + arrow->stats.dam;	1239	betterby = 2 + arrow->magic + arrow->stats.dam;
1428	}	1240	}
		1241
1429	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1242	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1430	{	1243	{
1431	tmp = arrow;	1244	tmp = arrow;
1432	betterby = 1 + arrow->magic + arrow->stats.dam;	1245	betterby = 1 + arrow->magic + arrow->stats.dam;
1433	}	1246	}
1434	}	1247	}
1435	}	1248	}
1436	}	1249	}
		1250
1437	if (tmp == NULL && arrow == NULL)	1251	if (tmp == NULL && arrow == NULL)
1438	return find_arrow (op, type);	1252	return find_arrow (op, type);
1439		1253
1440	*better = betterby;	1254	*better = betterby;
1441	return tmp;	1255	return tmp;
…		…
1446	* op = the shooter	1260	* op = the shooter
1447	* type = bow->race	1261	* type = bow->race
1448	* dir = fire direction	1262	* dir = fire direction
1449	*/	1263	*/
1450	object *	1264	object *
1451	pick_arrow_target (object *op, const char *type, int dir)	1265	pick_arrow_target (object *op, shstr_cmp type, int dir)
1452	{	1266	{
1453	object *tmp = NULL;	1267	object *tmp = NULL;
1454	maptile *m;	1268	maptile *m;
1455	int i, mflags, found, number;	1269	int i, mflags, found, number;
1456	sint16 x, y;	1270	sint16 x, y;
…		…
1471	for (i = 0, found = 0; i < 20; i++)	1285	for (i = 0, found = 0; i < 20; i++)
1472	{	1286	{
1473	x += freearr_x[dir];	1287	x += freearr_x[dir];
1474	y += freearr_y[dir];	1288	y += freearr_y[dir];
1475	mflags = get_map_flags (m, &m, x, y, &x, &y);	1289	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1290
1476	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1291	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1477	{	1292	{
1478	tmp = NULL;	1293	tmp = 0;
1479	break;	1294	break;
1480	}	1295	}
1481	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1296	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1482	{	1297	{
1483	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1298	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1484	* perhaps a bad assumption.	1299	* perhaps a bad assumption.
1485	*/	1300	*/
1486	tmp = NULL;	1301	tmp = 0;
1487	break;	1302	break;
1488	}	1303	}
		1304
1489	if (mflags & P_IS_ALIVE)	1305	if (mflags & P_IS_ALIVE)
1490	{
1491	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1306	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1492	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1307	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1493	{
1494	found++;
1495	break;
1496	}
1497	if (found)
1498	break;	1308	break;
1499	}
1500	}	1309	}
1501	if (tmp == NULL)	1310
		1311	if (!tmp)
1502	return find_arrow (op, type);	1312	return find_arrow (op, type);
1503		1313
1504	if (tmp->head)	1314	if (tmp->head)
1505	tmp = tmp->head;	1315	tmp = tmp->head;
1506		1316
…		…
1546	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1356	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1547	return 0;	1357	return 0;
1548	}	1358	}
1549		1359
1550	// optimisation: move object to top so we will find it quickly again	1360	// optimisation: move object to top so we will find it quickly again
1551	if (bow->below)	1361	splay (bow);
1552	{
1553	bow->remove ();
1554	op->insert (bow);
1555	}
1556
1557	}	1362	}
1558		1363
1559	if (!bow->race || !bow->skill)	1364	if (!bow->race || !bow->skill)
1560	{	1365	{
1561	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1366	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1587	}	1392	}
1588		1393
1589	/* this should not happen, but sometimes does */	1394	/* this should not happen, but sometimes does */
1590	if (arrow->nrof == 0)	1395	if (arrow->nrof == 0)
1591	{	1396	{
		1397	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1592	arrow->destroy ();	1398	arrow->destroy ();
1593	return 0;	1399	return 0;
1594	}	1400	}
1595		1401
1596	left = arrow; /* these are arrows left to the player */	1402	left = arrow; /* these are arrows left to the player */
1597	arrow = get_split_ob (arrow, 1);	1403	arrow = arrow->split ();
1598	if (!arrow)	1404	if (!arrow)
1599	{	1405	{
1600	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1406	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1601	return 0;	1407	return 0;
1602	}	1408	}
…		…
1606	arrow->direction = dir;	1412	arrow->direction = dir;
1607		1413
1608	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1414	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1609	arrow->stats.hp = arrow->stats.dam;	1415	arrow->stats.hp = arrow->stats.dam;
1610	arrow->stats.grace = arrow->attacktype;	1416	arrow->stats.grace = arrow->attacktype;
1611		1417	arrow->custom_name = arrow->slaying;
1612	if (arrow->slaying)
1613	arrow->spellarg = strdup (arrow->slaying);
1614		1418
1615	#if 0	1419	#if 0
1616	if (player *pl = op->contr)	1420	if (player *pl = op->contr)
1617	{	1421	{
1618	float speed = pl->weapon_sp;	1422	float speed = pl->weapon_sp;
…		…
1669	op->play_sound (sound_find ("fire_arrow"));	1473	op->play_sound (sound_find ("fire_arrow"));
1670	m->insert (arrow, sx, sy, op);	1474	m->insert (arrow, sx, sy, op);
1671		1475
1672	if (!arrow->destroyed ())	1476	if (!arrow->destroyed ())
1673	move_arrow (arrow);	1477	move_arrow (arrow);
1674
1675	if (op->type == PLAYER)
1676	{
1677	if (left->destroyed ())
1678	esrv_del_item (op->contr, left->count);
1679	else
1680	esrv_send_item (op, left);
1681	}
1682		1478
1683	return 1;	1479	return 1;
1684	}	1480	}
1685		1481
1686	/* Special fire code for players - this takes into	1482	/* Special fire code for players - this takes into
…		…
1691	* hence the function name.	1487	* hence the function name.
1692	*/	1488	*/
1693	int	1489	int
1694	player_fire_bow (object *op, int dir)	1490	player_fire_bow (object *op, int dir)
1695	{	1491	{
1696	int ret = 0, wcmod = 0;	1492	int ret;
1697		1493
1698	if (op->contr->bowtype == bow_bestarrow)	1494	if (op->contr->bowtype == bow_bestarrow)
1699	{	1495	{
1700	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1496	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1701	}	1497	}
1702	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1498	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1703	{	1499	{
1704	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1500	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1705	wcmod = -1;
1706
1707	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1501	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1708	}	1502	}
1709	else if (op->contr->bowtype == bow_threewide)	1503	else if (op->contr->bowtype == bow_threewide)
1710	{	1504	{
1711	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1505	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1712	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1506	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1713	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1507	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1714	}	1508	}
1715	else if (op->contr->bowtype == bow_spreadshot)	1509	else if (op->contr->bowtype == bow_spreadshot)
1716	{	1510	{
1717	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1511	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1718	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1512	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1719	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1513	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1720	}	1514	}
1721	else	1515	else
1722	{	1516	{
…		…
1760	return;	1554	return;
1761	}	1555	}
1762	}	1556	}
1763	else if (item->type == ROD || item->type == HORN)	1557	else if (item->type == ROD || item->type == HORN)
1764	{	1558	{
1765	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1559	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1560
		1561	// using the maximum of the rods charge allows at least one spell cast
		1562	// for a rod or horn, this fixes some broken rods.
		1563	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1766	{	1564	{
1767	op->contr->play_sound (sound_find ("wand_poof"));	1565	op->contr->play_sound (sound_find ("wand_poof"));
1768		1566
1769	if (item->type == ROD)	1567	if (item->type == ROD)
1770	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1568	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1775	}	1573	}
1776	}	1574	}
1777		1575
1778	if (cast_spell (op, item, dir, item->inv, NULL))	1576	if (cast_spell (op, item, dir, item->inv, NULL))
1779	{	1577	{
1780	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1578	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1579
1781	if (item->type == WAND)	1580	if (item->type == WAND)
1782	{	1581	{
1783	if (!(--item->stats.food))	1582	if (!(--item->stats.food))
1784	{	1583	{
1785	object *tmp;	1584	object *tmp;
…		…
1789	CLEAR_FLAG (item, FLAG_ANIMATE);	1588	CLEAR_FLAG (item, FLAG_ANIMATE);
1790	item->face = item->arch->face;	1589	item->face = item->arch->face;
1791	item->set_speed (0);	1590	item->set_speed (0);
1792	}	1591	}
1793		1592
1794	if ((tmp = item->in_player ()))	1593	if (object *pl = item->visible_to ())
1795	esrv_update_item (UPD_ANIM, tmp, item);	1594	esrv_update_item (UPD_ANIM, pl, item);
1796	}	1595	}
1797	}	1596	}
1798	else if (item->type == ROD || item->type == HORN)	1597	else if (item->type == ROD || item->type == HORN)
1799	drain_rod_charge (item);	1598	drain_rod_charge (item);
1800	}	1599	}
…		…
1805	bool	1604	bool
1806	fire (object *op, int dir)	1605	fire (object *op, int dir)
1807	{	1606	{
1808	int spellcost = 0;	1607	int spellcost = 0;
1809		1608
1810	/* check for loss of invisiblity/hide */
1811	if (action_makes_visible (op))
1812	make_visible (op);
1813
1814	player *pl = op->contr;	1609	player *pl = op->contr;
1815		1610
1816	if (pl->golem)	1611	if (pl->golem)
1817	{	1612	{
1818	control_golem (op->contr->golem, dir);	1613	control_golem (op->contr->golem, dir);
…		…
1820	}	1615	}
1821		1616
1822	object *ob = pl->ranged_ob;	1617	object *ob = pl->ranged_ob;
1823		1618
1824	if (!ob)	1619	if (!ob)
1825	return false;
1826
1827	if (!op->change_weapon (ob))
1828	return false;	1620	return false;
1829		1621
1830	if (op->speed_left > 0.f)	1622	if (op->speed_left > 0.f)
1831	--op->speed_left;	1623	--op->speed_left;
1832	else	1624	else
1833	return false;	1625	return false;
1834		1626
		1627	if (!op->change_weapon (ob))
		1628	return false;
		1629
		1630	/* check for loss of invisiblity/hide */
		1631	if (action_makes_visible (op))
		1632	make_visible (op);
		1633
1835	switch (ob->type)	1634	switch (ob->type)
1836	{	1635	{
1837	case BOW:	1636	case BOW:
1838	player_fire_bow (op, dir);	1637	player_fire_bow (op, dir);
1839	break;	1638	break;
1840		1639
1841	case SPELL:	1640	case SPELL:
1842	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1641	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1843	break;	1642	break;
1844		1643
1845	case BUILDER:	1644	case BUILDER:
1846	apply_map_builder (op, dir);	1645	apply_map_builder (op, dir);
1847	break;	1646	break;
…		…
1856	}	1655	}
1857		1656
1858	return true;	1657	return true;
1859	}	1658	}
1860		1659
1861	/* find_key	1660	static object *
1862	* We try to find a key for the door as passed. If we find a key
1863	* and successfully use it, we return the key, otherwise NULL
1864	* This function merges both normal and locked door, since the logic
1865	* for both is the same - just the specific key is different.
1866	* pl is the player,
1867	* inv is the objects inventory to searched
1868	* door is the door we are trying to match against.
1869	* This function can be called recursively to search containers.
1870	*/
1871	object *
1872	find_key (object *pl, object *container, object *door)	1661	find_key_ (object *pl, object *container, object *door)
1873	{	1662	{
1874	object *tmp, *key;	1663	object *tmp, *key;
1875		1664
1876	/* Should not happen, but sanity checking is never bad */	1665	/* Should not happen, but sanity checking is never bad */
1877	if (!container->inv)	1666	if (!container->inv)
…		…
1880	/* First, lets try to find a key in the top level inventory */	1669	/* First, lets try to find a key in the top level inventory */
1881	for (tmp = container->inv; tmp; tmp = tmp->below)	1670	for (tmp = container->inv; tmp; tmp = tmp->below)
1882	{	1671	{
1883	if (door->type == DOOR && tmp->type == KEY)	1672	if (door->type == DOOR && tmp->type == KEY)
1884	break;	1673	break;
		1674
1885	/* For sanity, we should really check door type, but other stuff	1675	/* For sanity, we should really check door type, but other stuff
1886	* (like containers) can be locked with special keys	1676	* (like containers) can be locked with special keys
1887	*/	1677	*/
1888	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1678	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1889	break;	1679	break;
…		…
1895	* a key, return	1685	* a key, return
1896	*/	1686	*/
1897	if (!tmp)	1687	if (!tmp)
1898	{	1688	{
1899	for (tmp = container->inv; tmp; tmp = tmp->below)	1689	for (tmp = container->inv; tmp; tmp = tmp->below)
1900	{
1901	/* No reason to search empty containers */	1690	/* No reason to search empty containers */
1902	if (tmp->type == CONTAINER && tmp->inv)	1691	if (tmp->type == CONTAINER && tmp->inv)
1903	{
1904	if ((key = find_key (pl, tmp, door)))	1692	if ((key = find_key_ (pl, tmp, door)))
1905	return key;	1693	return key;
1906	}
1907	}
1908		1694
1909	if (!tmp)	1695	if (!tmp)
1910	return NULL;	1696	return 0;
1911	}	1697	}
1912		1698
1913	/* We get down here if we have found a key. Now if its in a container,	1699	/* We get down here if we have found a key. Now if its in a container,
1914	* see if we actually want to use it	1700	* see if we actually want to use it
1915	*/	1701	*/
1916	if (pl != container)	1702	if (pl != container)
1917	{	1703	{
1918	/* Only let players use keys in containers */	1704	/* Only let players use keys in containers */
1919	if (!pl->contr)	1705	if (!pl->contr)
1920	return NULL;	1706	return 0;
		1707
1921	/* cases where this fails:	1708	/* cases where this fails:
1922	* If we only search the player inventory, return now since we	1709	* If we only search the player inventory, return now since we
1923	* are not in the players inventory.	1710	* are not in the players inventory.
1924	* If the container is not active, return now since only active	1711	* If the container is not active, return now since only active
1925	* containers can be used.	1712	* containers can be used.
…		…
1929	* inv must have been an container and must have been active.	1716	* inv must have been an container and must have been active.
1930	*	1717	*
1931	* Change the color so that the message doesn't disappear with	1718	* Change the color so that the message doesn't disappear with
1932	* all the others.	1719	* all the others.
1933	*/	1720	*/
1934	if (pl->contr->usekeys == key_inventory ||	1721	if (pl->contr->usekeys == key_inventory
1935	!QUERY_FLAG (container, FLAG_APPLIED) ||	1722	|| !QUERY_FLAG (container, FLAG_APPLIED)
1936	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1723	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1937	{	1724	{
1938	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1725	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1939	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1726	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1940	return NULL;	1727	return NULL;
1941	}	1728	}
1942	}	1729	}
1943		1730
1944	return tmp;	1731	return tmp;
		1732	}
		1733
		1734	/* find_key
		1735	* We try to find a key for the door as passed. If we find a key
		1736	* and successfully use it, we return the key, otherwise NULL
		1737	* This function merges both normal and locked door, since the logic
		1738	* for both is the same - just the specific key is different.
		1739	* pl is the player,
		1740	* inv is the objects inventory to searched
		1741	* door is the door we are trying to match against.
		1742	* This function can be called recursively to search containers.
		1743	*/
		1744	object *
		1745	find_key (object *pl, object *container, object *door)
		1746	{
		1747	if (door->slaying && is_match_expr (door->slaying))
		1748	{
		1749	// for match expressions, we try to find the key by applying the match
		1750	// to the op itself, which is supposed to find the "key", instead
		1751	// of searching through containers ourselves.
		1752
		1753	return match_one (door->slaying, container, door, pl, pl);
		1754	}
		1755	else
		1756	return find_key_ (pl, container, door);
1945	}	1757	}
1946		1758
1947	/* moved door processing out of move_player_attack.	1759	/* moved door processing out of move_player_attack.
1948	* returns 1 if player has opened the door with a key	1760	* returns 1 if player has opened the door with a key
1949	* such that the caller should not do anything more,	1761	* such that the caller should not do anything more,
…		…
1976	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1788	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1977	remove_door2 (door); /* remove door without violence ;-) */	1789	remove_door2 (door); /* remove door without violence ;-) */
1978	}	1790	}
1979		1791
1980	/* Do this after we print the message */	1792	/* Do this after we print the message */
1981	decrease_ob (key); /* Use up one of the keys */	1793	key->decrease (); /* Use up one of the keys */
1982	/* Need to update the weight the container the key was in */
1983	if (container != op)
1984	esrv_update_item (UPD_WEIGHT, op, container);
1985		1794
1986	return 1; /* Nothing more to do below */	1795	return 1; /* Nothing more to do below */
1987	}	1796	}
1988	else if (door->type == LOCKED_DOOR)	1797	else if (door->type == LOCKED_DOOR)
1989	{	1798	{
…		…
2002	* going to try and move (not fire weapons).	1811	* going to try and move (not fire weapons).
2003	*/	1812	*/
2004	bool	1813	bool
2005	move_player_attack (object *op, int dir)	1814	move_player_attack (object *op, int dir)
2006	{	1815	{
		1816	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1817	{
		1818	--op->speed_left;
		1819	return true;
		1820	}
		1821
2007	int on_battleground;	1822	int on_battleground;
2008		1823
2009	sint16 nx = freearr_x[dir] + op->x;	1824	sint16 nx = freearr_x[dir] + op->x;
2010	sint16 ny = freearr_y[dir] + op->y;	1825	sint16 ny = freearr_y[dir] + op->y;
2011		1826
2012	on_battleground = op_on_battleground (op, 0, 0);	1827	on_battleground = op_on_battleground (op, 0, 0);
2013		1828
2014	if (out_of_map (op->map, nx, ny))	1829	if (out_of_map (op->map, nx, ny))
2015	return false;	1830	return false;
2016
2017	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2018	{
2019	--op->speed_left;
2020	return true;
2021	}
2022		1831
2023	/* If braced, or can't move to the square, and it is not out of the	1832	/* 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	1833	* map, attack it. Note order of if statement is important - don't
2025	* want to be calling move_ob if braced, because move_ob will move the	1834	* want to be calling move_ob if braced, because move_ob will move the
2026	* player. This is a pretty nasty hack, because if we could	1835	* player. This is a pretty nasty hack, because if we could
…		…
2086	--op->speed_left;	1895	--op->speed_left;
2087		1896
2088	op->play_sound (sound_find ("push_player"));	1897	op->play_sound (sound_find ("push_player"));
2089	push_ob (mon, dir, op);	1898	push_ob (mon, dir, op);
2090		1899
2091	if (op->contr->tmp_invis || op->hide)	1900	if (action_makes_visible (op))
2092	make_visible (op);	1901	make_visible (op);
2093		1902
2094	return true;	1903	return true;
2095	}	1904	}
2096	else	1905	else
…		…
2118	push_ob (mon, dir, op);	1927	push_ob (mon, dir, op);
2119	}	1928	}
2120	else	1929	else
2121	op->statusmsg ("You withhold your attack");	1930	op->statusmsg ("You withhold your attack");
2122		1931
2123	if (op->contr->tmp_invis || op->hide)	1932	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2124	make_visible (op);	1933	make_visible (op);
2125		1934
2126	return true;	1935	return true;
2127	}	1936	}
2128	}	1937	}
…		…
2170	bool	1979	bool
2171	move_player (object *op, int dir)	1980	move_player (object *op, int dir)
2172	{	1981	{
2173	int pick;	1982	int pick;
2174		1983
2175	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	1984	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2176	return 0;	1985	return 0;
2177		1986
2178	/* Sanity check: make sure dir is valid */	1987	/* Sanity check: make sure dir is valid */
2179	if ((dir < 0) || (dir >= 9))	1988	if ((dir < 0) || (dir >= 9))
2180	{	1989	{
…		…
2186	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	1995	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2187	dir = absdir (dir + rndm (3) + rndm (3) - 2);	1996	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2188		1997
2189	op->facing = dir;	1998	op->facing = dir;
2190		1999
2191	if (op->hide)	2000	if (op->flag [FLAG_HIDDEN])
2192	do_hidden_move (op);	2001	do_hidden_move (op);
2193		2002
2194	bool retval;	2003	bool retval;
2195		2004
2196	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2005	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2268	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2077	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2269	{	2078	{
2270	op->play_sound (sound_find ("ob_evaporate"));	2079	op->play_sound (sound_find ("ob_evaporate"));
2271	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2080	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2272		2081
2273	if (op->contr)
2274	esrv_del_item (op->contr, tmp->count);
2275
2276	tmp->destroy ();	2082	tmp->destroy ();
2277	CLEAR_FLAG (op, FLAG_LIFESAVE);	2083	CLEAR_FLAG (op, FLAG_LIFESAVE);
2278		2084
2279	if (op->stats.hp < 0)	2085	if (op->stats.hp < 0)
2280	op->stats.hp = op->stats.maxhp;	2086	op->stats.hp = op->stats.maxhp;
…		…
2292	return 0;	2098	return 0;
2293	}	2099	}
2294		2100
2295	/* This goes throws the inventory and removes unpaid objects, and puts them	2101	/* This goes throws the inventory and removes unpaid objects, and puts them
2296	* back in the map (location and map determined by values of env). This	2102	* back in the map (location and map determined by values of env). This
2297	* function will descend into containers. op is the object to start the search	2103	* function will descend into containers. op is the object to start the search
2298	* from.	2104	* from.
2299	*/	2105	*/
2300	static void	2106	static void
2301	drop_unpaid_items (object *op, object *env)	2107	drop_unpaid_items (object *op, object *env)
2302	{	2108	{
2303	while (op)	2109	while (op)
2304	{	2110	{
2305	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2111	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2306		2112
2307	if (QUERY_FLAG (op, FLAG_UNPAID))	2113	if (QUERY_FLAG (op, FLAG_UNPAID))
2308	{
2309	if (env->type == PLAYER)
2310	esrv_del_item (env->contr, op->count);
2311
2312	op->insert_at (env);	2114	op->insert_at (env);
2313	}
2314	else if (op->inv)	2115	else if (op->inv)
2315	drop_unpaid_items (op->inv, env);	2116	drop_unpaid_items (op->inv, env);
2316		2117
2317	op = next;	2118	op = next;
2318	}	2119	}
…		…
2330	* Moved from apply.c to player.c - player.c is what	2131	* Moved from apply.c to player.c - player.c is what
2331	* actually uses this function. player.c may not be quite the	2132	* actually uses this function. player.c may not be quite the
2332	* best, a misc file for object actions is probably better,	2133	* best, a misc file for object actions is probably better,
2333	* but there isn't one in the server directory.	2134	* but there isn't one in the server directory.
2334	*/	2135	*/
2335	char *	2136	const char *
2336	gravestone_text (object *op)	2137	gravestone_text (object *op)
2337	{	2138	{
2338	static char buf2[MAX_BUF];	2139	static dynbuf_text buf;
2339	char buf[MAX_BUF];
2340	time_t now = time (NULL);
2341		2140
2342	strcpy (buf2, " R.I.P.\n\n");	2141	buf << "---- R.I.P. ----\n\n"
		2142	<< op->name;
		2143
2343	if (op->type == PLAYER)	2144	if (op->type == PLAYER)
2344	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2145	buf << " the " << op->contr->title;
2345	else
2346	sprintf (buf, "%s\n", &op->name);
2347		2146
2348	strncat (buf2, " ", 20 - strlen (buf) / 2);	2147	buf << "\n\n";
2349	strcat (buf2, buf);	2148
		2149	buf << "who was level ";
		2150	buf << (sint32)op->level << "\n\n" // OO breakdown
		2151	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2152
2350	if (op->type == PLAYER)	2153	if (op->type == PLAYER)
2351	sprintf (buf, "who was in level %d when killed\n", op->level);	2154	buf << "by " << op->contr->killer_name () << ".\n\n";
2352	else
2353	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2354		2155
2355	strncat (buf2, " ", 20 - strlen (buf) / 2);
2356	strcat (buf2, buf);
2357	if (op->type == PLAYER)
2358	{	2156	{
2359	sprintf (buf, "by %s.\n\n", op->contr->killer);	2157	static char buf2[128];
2360	strncat (buf2, " ", 21 - strlen (buf) / 2);	2158	time_t now = time (NULL);
2361	strcat (buf2, buf);
2362	}
2363
2364	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2159	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2365	strncat (buf2, " ", 20 - strlen (buf) / 2);	2160	buf << buf2;
2366	strcat (buf2, buf);	2161	}
2367		2162
2368	return buf2;	2163	return buf;
2369	}	2164	}
2370		2165
2371	void	2166	void
2372	do_some_living (object *op)	2167	do_some_living (object *op)
2373	{	2168	{
…		…
2528	{	2323	{
2529	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2324	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2530		2325
2531	if (over_hp > 0)	2326	if (over_hp > 0)
2532	{	2327	{
2533	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2328	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2534	op->last_heal = 0;	2329	op->last_heal = 0;
2535	}	2330	}
2536	else	2331	else
2537	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2332	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2538	}	2333	}
…		…
2554	op->stats.food--;	2349	op->stats.food--;
2555	}	2350	}
2556		2351
2557	if (op->stats.food < 0 && op->stats.hp >= 0)	2352	if (op->stats.food < 0 && op->stats.hp >= 0)
2558	{	2353	{
2559	object *tmp, *flesh = 0;	2354	object *flesh = 0;
2560		2355
2561	for (tmp = op->inv; tmp; tmp = tmp->below)	2356	for_inv_removable (op, tmp)
2562	{	2357	{
2563	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2358	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2359	continue;
		2360
		2361	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2564	{	2362	{
2565	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2363	op->statusmsg ("You blindly grab for a bite of food. "
2566	{	2364	"H<To prevent you from starving, you ate some random item from your backpack.>");
2567	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2568	manual_apply (op, tmp, 0);	2365	manual_apply (op, tmp, 0);
		2366
2569	if (op->stats.food >= 0 || op->stats.hp < 0)	2367	if (op->stats.food >= 0 || op->stats.hp < 0)
2570	break;	2368	break;
2571	}	2369	}
2572	else if (tmp->type == FLESH)	2370	else if (tmp->type == FLESH)
2573	flesh = tmp;	2371	flesh = tmp;
2574	} /* End if paid for object */	2372	}
2575	} /* end of for loop */
2576		2373
2577	/* If player is still starving, it means they don't have any food, so	2374	/* If player is still starving, it means they don't have any food, so
2578	* eat flesh instead.	2375	* eat flesh instead.
2579	*/	2376	*/
2580	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2377	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2581	{	2378	{
2582	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2379	op->statusmsg ("You blindly grab for a bite of food. "
		2380	"H<To prevent you from starving, you ate some random item from your backpack.>");
2583	manual_apply (op, flesh, 0);	2381	manual_apply (op, flesh, 0);
2584	}	2382	}
		2383
		2384	// If player is still starving, alert him!
		2385	if (op->stats.food < 0)
		2386	op->failmsg ("You are starving! "
		2387	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2585	}	2388	}
2586		2389
2587	if (op->stats.food < 0)	2390	if (op->stats.food < 0)
2588	{	2391	{
2589	op->stats.hp += op->stats.food;	2392	op->stats.hp += op->stats.food;
2590	op->stats.food = 0;	2393	op->stats.food = 0;
		2394
		2395	if (op->stats.hp < 0)
		2396	{
		2397	op->contr->killer = archetype::get ("killer_starvation");
		2398	op->contr->killer->destroy ();
2591	}	2399	}
		2400	}
2592		2401
		2402	/* killer should be set here already */
2593	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2403	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2594	kill_player (op);	2404	kill_player (op);
2595	}	2405	}
2596	}	2406	}
2597		2407
…		…
2602	*/	2412	*/
2603	void	2413	void
2604	kill_player (object *op)	2414	kill_player (object *op)
2605	{	2415	{
2606	int x, y;	2416	int x, y;
2607	char buf[MAX_BUF];
2608	maptile *map; /* this is for resurrection */	2417	maptile *map; /* this is for resurrection */
2609	int will_kill_again;	2418	int will_kill_again;
2610	archetype *at;	2419	archetype *at;
2611	object *tmp;	2420	object *tmp;
2612		2421
2613	if (save_life (op))	2422	if (save_life (op))
2614	return;	2423	return;
		2424
		2425	dynbuf_text deathtab;
		2426
		2427	/* restore player */
		2428	at = archetype::find ("poisoning");
		2429	if (object *tmp = present_arch_in_ob (at, op))
		2430	{
		2431	tmp->destroy ();
		2432	deathtab << "Your body feels cleansed...\r";
		2433	}
		2434
		2435	at = archetype::find ("confusion");
		2436	if (object *tmp = present_arch_in_ob (at, op))
		2437	{
		2438	tmp->destroy ();
		2439	deathtab << "Your mind feels clearer...\r";
		2440	}
		2441
		2442	cure_disease (op, 0, 0); /* remove any disease */
		2443
		2444	max_it (op->stats.hp , op->stats.maxhp);
		2445	max_it (op->stats.sp , op->stats.maxsp);
		2446	max_it (op->stats.grace, op->stats.maxgrace);
		2447
		2448	if (op->stats.food <= 0)
		2449	op->stats.food = 999;
		2450
		2451	// remove all spell effects that are active
		2452	// to avoid long-term effects such as word-of-recall
		2453	for (object *item = op->inv; item; )
		2454	{
		2455	object *next = item->below;
		2456
		2457	if (item->type == SPELL_EFFECT && item->active)
		2458	item->destroy ();
		2459
		2460	item = next;
		2461	}
2615		2462
2616	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2463	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2617	* in cities ONLY!!! It is very important that this doesn't get abused.	2464	* in cities ONLY!!! It is very important that this doesn't get abused.
2618	* Look at op_on_battleground() for more info --AndreasV	2465	* Look at op_on_battleground() for more info --AndreasV
2619	*/	2466	*/
2620	if (op_on_battleground (op, &x, &y))	2467	if (op_on_battleground (op, &x, &y))
2621	{	2468	{
2622	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2469	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2623	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2624
2625	/* restore player */
2626	at = archetype::find ("poisoning");
2627	if (object *tmp = present_arch_in_ob (at, op))
2628	{
2629	tmp->destroy ();
2630	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2631	}
2632
2633	at = archetype::find ("confusion");
2634	if (object *tmp = present_arch_in_ob (at, op))
2635	{
2636	tmp->destroy ();
2637	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2638	}
2639
2640	cure_disease (op, 0, 0); /* remove any disease */
2641	op->stats.hp = op->stats.maxhp;
2642	if (op->stats.food <= 0)
2643	op->stats.food = 999;
2644		2470
2645	/* create a bodypart-trophy to make the winner happy */	2471	/* create a bodypart-trophy to make the winner happy */
2646	if (object *tmp = arch_to_object (archetype::find ("finger")))	2472	if (object *tmp = arch_to_object (archetype::find ("finger")))
2647	{	2473	{
2648	tmp->name = format ("%s's finger" , &op->name);	2474	tmp->name = format ("%s's finger" , &op->name);
2649	tmp->name_pl = format ("%s's fingers", &op->name);	2475	tmp->name_pl = format ("%s's fingers", &op->name);
2650	tmp->msg = format (	2476	tmp->msg = format (
2651	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2477	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2652	&op->name, op->contr->title, (int) (op->level), op->contr->killer	2478	&op->name, op->contr->title,
		2479	(int)op->level,
		2480	op->contr->killer_name ()
2653	);	2481	);
2654	tmp->value = 0, tmp->type = 0;	2482	tmp->value = 0, tmp->type = 0;
2655	tmp->materialname = "organics";	2483	tmp->materialname = "organics";
2656	tmp->insert_at (op, tmp);	2484	tmp->insert_at (op, tmp);
2657	}	2485	}
2658		2486
2659	/* teleport defeated player to new destination */	2487	/* teleport defeated player to new destination */
2660	transfer_ob (op, x, y, 0, NULL);	2488	transfer_ob (op, x, y, 0, NULL);
2661	op->contr->braced = 0;	2489	op->contr->braced = 0;
		2490
		2491	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2662	return;	2492	return;
2663	}	2493	}
2664		2494
		2495	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2496	deathtab << "T<YOU HAVE DIED>\n\n";
		2497
2665	INVOKE_PLAYER (DEATH, op->contr);	2498	INVOKE_PLAYER (DEATH, op->contr);
2666		2499
2667	command_kill_pets (op, 0);	2500	command_kill_pets (op, 0);
2668
2669	if (op->stats.food < 0)
2670	strcpy (op->contr->killer, "starvation");
2671		2501
2672	op->contr->play_sound (sound_find ("player_dies"));	2502	op->contr->play_sound (sound_find ("player_dies"));
2673		2503
2674	/* save the map location for corpse, gravestone */	2504	/* save the map location for corpse, gravestone */
2675	x = op->x;	2505	x = op->x;
…		…
2705		2535
2706	lost_a_stat = 0;	2536	lost_a_stat = 0;
2707		2537
2708	for (z = 0; z < num_stats_lose; z++)	2538	for (z = 0; z < num_stats_lose; z++)
2709	{	2539	{
2710	i = RANDOM () % NUM_STATS;	2540	i = rndm (NUM_STATS);
2711		2541
2712	if (settings.stat_loss_on_death)	2542	if (settings.stat_loss_on_death)
2713	{	2543	{
2714	/* Pick a random stat and take a point off it. Tell the player	2544	/* Pick a random stat and take a point off it. Tell the player
2715	* what he lost.	2545	* what he lost.
…		…
2766	}	2596	}
2767	}	2597	}
2768		2598
2769	if (lose_this_stat)	2599	if (lose_this_stat)
2770	{	2600	{
2771	this_stat = get_attr_value (&(dep->stats), i);	2601	this_stat = get_attr_value (&dep->stats, i);
2772	/* We could try to do something clever like find another	2602	/* We could try to do something clever like find another
2773	* stat to reduce if this fails. But chances are, if	2603	* stat to reduce if this fails. But chances are, if
2774	* stats have been depleted to -50, all are pretty low	2604	* stats have been depleted to -50, all are pretty low
2775	* and should be roughly the same, so it shouldn't make a	2605	* and should be roughly the same, so it shouldn't make a
2776	* difference.	2606	* difference.
…		…
2784	lost_a_stat = 1;	2614	lost_a_stat = 1;
2785	}	2615	}
2786	}	2616	}
2787	}	2617	}
2788	}	2618	}
		2619
2789	/* If no stat lost, tell the player. */	2620	/* If no stat lost, tell the player. */
2790	if (!lost_a_stat)	2621	if (!lost_a_stat)
2791	{	2622	{
2792	/* determine_god() seems to not work sometimes... why is this?	2623	/* determine_god() seems to not work sometimes... why is this?
2793	Should I be using something else? GD */	2624	Should I be using something else? GD */
2794	const char *god = determine_god (op);	2625	shstr_tmp god = determine_god (op);
2795		2626
2796	if (god && (strcmp (god, "none")))	2627	if (god != shstr_none)
2797	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2628	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2798	else	2629	else
2799	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2630	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2800	}	2631	}
2801	#else	2632	#else
2802	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2633	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2803	#endif	2634	#endif
2804		2635
2805	/* Put a gravestone up where the character 'almost' died. List the	2636	/* Put a gravestone up where the character 'almost' died. List the
2806	* exp loss on the stone.	2637	* exp loss on the stone.
2807	*/	2638	*/
2808	tmp = arch_to_object (archetype::find ("gravestone"));	2639	tmp = arch_to_object (archetype::find ("gravestone"));
2809	sprintf (buf, "%s's gravestone", &op->name);	2640	tmp->name = format ("%s's gravestone", &op->name);
2810	tmp->name = buf;	2641	tmp->name_pl = format ("%s's gravestones", &op->name);
2811	sprintf (buf, "%s's gravestones", &op->name);	2642	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2812	tmp->name_pl = buf;	2643	&op->name, op->contr->title, op->contr->killer_name ());
2813	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2814	tmp->msg = buf;
2815	tmp->x = op->x, tmp->y = op->y;	2644	tmp->x = op->x, tmp->y = op->y;
2816	insert_ob_in_map (tmp, op->map, NULL, 0);	2645	insert_ob_in_map (tmp, op->map, NULL, 0);
2817		2646
2818	/**************************************/	2647	/**************************************/
2819	/* */	2648	/* */
2820	/* Subtract the experience points, */	2649	/* Subtract the experience points, */
2821	/* if we died cause of food, give us */
2822	/* food, and reset HP's... */
2823	/* */	2650	/* */
2824	/**************************************/	2651	/**************************************/
2825		2652
2826	/* remove any poisoning and confusion the character may be suffering. */
2827	/* restore player */
2828	at = archetype::find ("poisoning");
2829	tmp = present_arch_in_ob (at, op);
2830
2831	if (tmp)
2832	{
2833	tmp->destroy ();
2834	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2835	}
2836
2837	at = archetype::find ("confusion");
2838	tmp = present_arch_in_ob (at, op);
2839	if (tmp)
2840	{
2841	tmp->destroy ();
2842	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2843	}
2844
2845	cure_disease (op, 0, 0); /* remove any disease */
2846
2847	/*add_exp(op, (op->stats.exp * -0.20)); */	2653	/*add_exp(op, (op->stats.exp * -0.20)); */
2848	apply_death_exp_penalty (op);	2654	apply_death_exp_penalty (op);
2849	if (op->stats.food < 100)
2850	op->stats.food = 900;
2851	op->stats.hp = op->stats.maxhp;
2852	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2853	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2854		2655
2855	/*	2656	/*
2856	* Check to see if the player has any unpaid items. If so, remove them	2657	* Check to see if the player has any unpaid items. If so, remove them
2857	* and put them back in the map.	2658	* and put them back in the map.
2858	*/	2659	*/
…		…
2893	if (will_kill_again & (1 << at))	2694	if (will_kill_again & (1 << at))
2894	force->resist[at] = 100;	2695	force->resist[at] = 100;
2895		2696
2896	insert_ob_in_ob (force, op);	2697	insert_ob_in_ob (force, op);
2897	op->update_stats ();	2698	op->update_stats ();
2898
2899	}	2699	}
2900		2700
2901	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2701	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2902	}	2702	}
2903		2703
2904	void	2704	void
2905	loot_object (object *op)	2705	loot_object (object *op)
2906	{ /* Grab and destroy some treasure */	2706	{ /* Grab and destroy some treasure */
…		…
2923		2723
2924	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2724	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2925	{	2725	{
2926	if (tmp->nrof > 1)	2726	if (tmp->nrof > 1)
2927	{	2727	{
2928	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2728	tmp->decrease (rndm (1, tmp->nrof - 1));
2929	tmp2->destroy ();
2930	insert_ob_in_map (tmp, op->map, NULL, 0);	2729	insert_ob_in_map (tmp, op->map, NULL, 0);
2931	}	2730	}
2932	else	2731	else
2933	tmp->destroy ();	2732	tmp->destroy ();
2934	}	2733	}
…		…
2945	void	2744	void
2946	fix_weight (void)	2745	fix_weight (void)
2947	{	2746	{
2948	for_all_players (pl)	2747	for_all_players (pl)
2949	{	2748	{
2950	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2749	sint32 old = pl->ob->carrying;
2951		2750
2952	if (old == sum)	2751	pl->ob->update_weight ();
2953	continue;	2752
		2753	if (old != pl->ob->carrying)
		2754	{
2954	pl->ob->update_stats ();	2755	pl->ob->update_stats ();
2955	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2756	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2757	}
2956	}	2758	}
2957	}	2759	}
2958		2760
2959	void	2761	void
2960	fix_luck (void)	2762	fix_luck (void)
…		…
3002	}	2804	}
3003		2805
3004	void	2806	void
3005	make_visible (object *op)	2807	make_visible (object *op)
3006	{	2808	{
3007	op->hide = 0;	2809	op->flag [FLAG_HIDDEN] = 0;
3008	op->invisible = 0;	2810	op->invisible = 0;
3009		2811
3010	if (op->type == PLAYER)	2812	if (op->type == PLAYER)
3011	{	2813	{
3012	op->contr->tmp_invis = 0;	2814	op->contr->tmp_invis = 0;
…		…
3037		2839
3038	if (!ob || !ob->map)	2840	if (!ob || !ob->map)
3039	return 0;	2841	return 0;
3040		2842
3041	/* so, on normal lighted maps, its hard to hide */	2843	/* so, on normal lighted maps, its hard to hide */
3042	level = ob->map->darkness - 2;	2844	level = ob->map->darklevel () - 2;
3043		2845
3044	/* this also picks up whether the object is glowing.	2846	/* this also picks up whether the object is glowing.
3045	* If you carry a light on a non-dark map, its not	2847	* If you carry a light on a non-dark map, its not
3046	* as bad as carrying a light on a pitch dark map */	2848	* as bad as carrying a light on a pitch dark map */
3047	if (has_carried_lights (ob))	2849	if (ob->has_carried_lights ())
3048	level = -(10 + (2 * ob->map->darkness));	2850	level = -(10 + (2 * ob->map->darklevel ()));
3049		2851
3050	/* scan through all nearby squares for terrain to hide in */	2852	/* scan through all nearby squares for terrain to hide in */
3051	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2853	for (i = 0, x = ob->x, y = ob->y;
		2854	i <= SIZEOFFREE1;
		2855	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3052	{	2856	{
3053	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2857	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3054	if (mflag & P_OUT_OF_MAP)	2858	if (mflag & P_OUT_OF_MAP)
3055	{
3056	continue;	2859	continue;
3057	}	2860
3058	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2861	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3059	level += 2;	2862	level += 2;
3060	else /* open terrain! */	2863	else /* open terrain! */
3061	level -= 1;	2864	level -= 1;
3062	}	2865	}
…		…
3073	* spot (surrounded by clear terrain in broad daylight). -b.t.	2876	* spot (surrounded by clear terrain in broad daylight). -b.t.
3074	*/	2877	*/
3075	void	2878	void
3076	do_hidden_move (object *op)	2879	do_hidden_move (object *op)
3077	{	2880	{
3078	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2881	int hide = 0;
3079	object *skop;
3080		2882
3081	if (!op || !op->map)	2883	if (!op || !op->map)
3082	return;	2884	return;
3083		2885
3084	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2886	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2887	int num = random_roll (0, 19, op, PREFER_LOW);
3085		2888
3086	/* its *extremely* hard to run and sneak/hide at the same time! */	2889	/* its *extremely* hard to run and sneak/hide at the same time! */
3087	if (op->type == PLAYER && op->contr->run_on)	2890	if (op->type == PLAYER && op->contr->run_on)
3088	if (!skop || num >= skop->level)	2891	if (!skop || num >= skop->level)
3089	{	2892	{
…		…
3099	num -= hide;	2902	num -= hide;
3100		2903
3101	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2904	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3102	{	2905	{
3103	make_visible (op);	2906	make_visible (op);
		2907
3104	if (op->type == PLAYER)	2908	if (op->type == PLAYER)
3105	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2909	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3106	}	2910	}
3107	else if (op->type == PLAYER && skop)	2911	else if (op->type == PLAYER && skop)
3108	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2912	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3198	while (op)	3002	while (op)
3199	{	3003	{
3200	dx = rv.distance_x + op->arch->x;	3004	dx = rv.distance_x + op->arch->x;
3201	dy = rv.distance_y + op->arch->y;	3005	dy = rv.distance_y + op->arch->y;
3202		3006
3203	/* only the viewable area the player sees is updated by LOS	3007	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3204	* code, so we need to restrict ourselves to that range of values
3205	* for any meaningful values.
3206	*/
3207	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3208	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3209	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3210	return 1;	3008	return 1;
3211		3009
3212	op = op->more;	3010	op = op->more;
3213	}	3011	}
3214		3012
3215	return 0;	3013	return 0;
3216	}	3014	}
3217		3015
3218	/* routine for both players and monsters. We call this when	3016	/* routine for both players and monsters. We call this when
3219	* there is a possibility for our action distrubing our hiding	3017	* there is a possibility for our action distrubing our hiding
3220	* place or invisiblity spell. Artefact invisiblity is not	3018	* place or invisiblity spell. Artefact invisiblity causes
3221	* effected by this. If we arent invisible to begin with, we	3019	* "noise" instead. If we arent invisible to begin with, we
3222	* return 0.	3020	* return 0.
3223	*/	3021	*/
3224	int	3022	int
3225	action_makes_visible (object *op)	3023	action_makes_visible (object *op)
3226	{	3024	{
3227	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3025	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3228	{	3026	{
3229	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3027	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3028	{
		3029	// artefact invisibility is permanent, but we still make noise
		3030	// this is important for game-balance.
		3031	if (op->contr)
		3032	op->make_noise ();
		3033
3230	return 0;	3034	return 0;
		3035	}
3231		3036
3232	if (op->contr && op->contr->tmp_invis == 0)	3037	if (op->contr && op->contr->tmp_invis == 0)
3233	return 0;	3038	return 0;
3234		3039
3235	/* If monsters, they should become visible */	3040	/* If monsters, they should become visible */
3236	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3041	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3237	{	3042	{
3238	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3043	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3239	return 1;	3044	return 1;
3240	}	3045	}
3241	}	3046	}
3242		3047
3243	return 0;	3048	return 0;
…		…
3449	else	3254	else
3450	{	3255	{
3451	/* generate misc. treasure */	3256	/* generate misc. treasure */
3452	tmp = arch_to_object (tr->item);	3257	tmp = arch_to_object (tr->item);
3453	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3258	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3454	tmp = insert_ob_in_ob (tmp, who);	3259	who->insert (tmp);
3455	if (who->type == PLAYER)
3456	esrv_send_item (who, tmp);
3457	}	3260	}
3458	}	3261	}
3459		3262
3460	/**	3263	/**
3461	* Unready an object for a player. This function does nothing if the object was	3264	* Unready an object for a player. This function does nothing if the object was
…		…
3473	if (pl->ranged_ob == ob)	3276	if (pl->ranged_ob == ob)
3474	pl->ranged_ob = 0;	3277	pl->ranged_ob = 0;
3475	}	3278	}
3476		3279
3477	sint8	3280	sint8
3478	player::visibility_at (maptile *map, int x, int y) const	3281	player::darkness_at (maptile *map, int x, int y) const
3479	{	3282	{
3480	if (!ns)	3283	if (!ns)
3481	return 0;	3284	return LOS_BLOCKED;
3482		3285
3483	int dx, dy;	3286	int dx, dy;
3484	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3287	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3485	return 0;	3288	return LOS_BLOCKED;
3486		3289
3487	x += dx - ns->current_x + ns->mapx / 2;	3290	x += dx - ns->current_x;
3488	y += dy - ns->current_y + ns->mapy / 2;	3291	y += dy - ns->current_y;
3489		3292
3490	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3491	return 0;
3492
3493	return 100 - blocked_los [x][y];	3293	return blocked_los (x, y);
3494	}	3294	}
3495		3295
3496	void	3296	void
3497	player::infobox (const char *title, const char *msg, int color)	3297	player::infobox (const char *title, const char *msg, int color)
3498	{	3298	{

Diff Legend

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