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.198 by root, Sat May 17 00:17:02 2008 UTC vs.
Revision 1.244 by root, Sun Nov 8 20:55:40 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,2008 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	*/
		24
		25	//+GPL
23		26
24	#include <global.h>	27	#include <global.h>
25	#include <sproto.h>	28	#include <sproto.h>
26	#include <sounds.h>	29	#include <sounds.h>
27	#include <living.h>	30	#include <living.h>
…		…
32	#include <algorithm>	35	#include <algorithm>
33	#include <functional>	36	#include <functional>
34		37
35	playervec players;	38	playervec players;
36		39
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. */	40	/* This loads the first map an puts the player on it. */
152	static void	41	static void
153	set_first_map (object *op)	42	set_first_map (object *op)
154	{	43	{
155	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
207	ob->close_container (); //TODO: client-specific	96	ob->close_container (); //TODO: client-specific
208		97
209	ns->update_look = 0;	98	ns->update_look = 0;
210	ns->look_position = 0;	99	ns->look_position = 0;
211		100
212	clear_los (this);	101	clear_los ();
213		102
214	ns->reset_stats ();	103	ns->reset_stats ();
215		104
216	/* make sure he's a player -- needed because of class change. */	105	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	106	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	107	ob->race = ob->arch->race;
219		108
220	ob->update_weight ();	109	ob->update_weight ();
221	link_player_skills (ob);	110	link_skills ();
222		111
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	112	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		113
225	assign (title, ob->arch->object::name);	114	assign (title, ob->arch->object::name);
226		115
…		…
249	esrv_send_inventory (ob, ob);	138	esrv_send_inventory (ob, ob);
250	esrv_add_spells (this, 0);	139	esrv_add_spells (this, 0);
251		140
252	activate ();	141	activate ();
253		142
254	send_rules (ob);
255	send_news (ob);
256	display_motd (ob);
257
258	INVOKE_PLAYER (CONNECT, this);	143	INVOKE_PLAYER (CONNECT, this);
259	INVOKE_PLAYER (LOGIN, this);	144	INVOKE_PLAYER (LOGIN, this);
260	}	145	}
261		146
262	void	147	void
…		…
278	ns->reset_stats ();	163	ns->reset_stats ();
279	ns->pl = 0;	164	ns->pl = 0;
280	ns = 0;	165	ns = 0;
281	}	166	}
282		167
283	observe = ob;	168	// this is important for the player scheduler to get the correct refcount
		169	// when ns = 0
		170	observe = viewpoint = ob;
284		171
285	deactivate ();	172	deactivate ();
286	}	173	}
		174
		175	//-GPL
287		176
288	// the need for this function can be explained	177	// the need for this function can be explained
289	// by load_object not returning the object	178	// by load_object not returning the object
290	void	179	void
291	player::set_object (object *op)	180	player::set_object (object *op)
292	{	181	{
293	ob = observe = op;	182	ob = observe = viewpoint = op;
294	ob->contr = this; /* this aren't yet in archetype */	183	ob->contr = this; /* this aren't yet in archetype */
295		184
296	ob->speed = 1.0f;	185	ob->speed = 1.0f;
297	ob->speed_left = 0.5f;	186	ob->speed_left = 0.5f;
298		187
…		…
327	}	216	}
328		217
329	void	218	void
330	player::set_observe (object *op)	219	player::set_observe (object *op)
331	{	220	{
332	observe = op ? op : ob;	221	observe = viewpoint = op ? op : ob;
333	do_los = 1;	222	do_los = 1;
334	}	223	}
		224
		225	void
		226	player::set_viewpoint (object *op)
		227	{
		228	viewpoint = op ? op : (object *)observe;
		229	do_los = 1;
		230	}
		231
		232	//+GPL
335		233
336	player::player ()	234	player::player ()
337	{	235	{
338	/* There are some elements we want initialised to non zero value -	236	/* There are some elements we want initialised to non zero value -
339	* we deal with that below this point.	237	* we deal with that below this point.
…		…
345	savebed_map = first_map_path; /* Init. respawn position */	243	savebed_map = first_map_path; /* Init. respawn position */
346		244
347	gen_sp_armour = 10;	245	gen_sp_armour = 10;
348	bowtype = bow_normal;	246	bowtype = bow_normal;
349	petmode = pet_normal;	247	petmode = pet_normal;
350	listening = 10;
351	usekeys = containers;	248	usekeys = containers;
352	peaceful = 1; /* default peaceful */	249	peaceful = 1; /* default peaceful */
353	do_los = 1;	250	do_los = 1;
354		251
355	weapon_sp = 1.0f;	252	weapon_sp = 1.0f;
…		…
367	{	264	{
368	ob->destroy_inv (false);	265	ob->destroy_inv (false);
369	ob->destroy ();	266	ob->destroy ();
370	}	267	}
371		268
372	ob = observe = 0;	269	ob = observe = viewpoint = 0;
373	}	270	}
374		271
375	player::~player ()	272	player::~player ()
376	{	273	{
377	/* Clear item stack */	274	/* Clear item stack */
378	free (stack_items);	275	free (stack_items);
		276	}
		277
		278	/*
		279	* get_player_archetype() return next player archetype from archetype
		280	* list. Not very efficient routine, but used only creating new players.
		281	* Note: there MUST be at least one player archetype!
		282	*/
		283	static archetype *
		284	get_player_archetype (archetype *at)
		285	{
		286	// archetypes could have been reloaded
		287	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		288
		289	if (!nat)
		290	return at;
		291
		292	archvec::iterator i = archetypes.find (nat);
		293
		294	for (;;)
		295	{
		296	if (++i == archetypes.end ())
		297	i = archetypes.begin ();
		298	else if (*i == at)
		299	cleanup ("not a single player archetype found");
		300
		301	if ((*i)->type == PLAYER)
		302	return *i;
		303	}
379	}	304	}
380		305
381	/* Tries to add player on the connection passed in ns.	306	/* Tries to add player on the connection passed in ns.
382	* All we can really get in this is some settings like host and display	307	* All we can really get in this is some settings like host and display
383	* mode.	308	* mode.
…		…
394	pl->ob->run_away = 25; /* Then we panick... */	319	pl->ob->run_away = 25; /* Then we panick... */
395		320
396	set_first_map (pl->ob);	321	set_first_map (pl->ob);
397		322
398	return pl;	323	return pl;
399	}
400
401	/*
402	* get_player_archetype() return next player archetype from archetype
403	* list. Not very efficient routine, but used only creating new players.
404	* Note: there MUST be at least one player archetype!
405	*/
406	archetype *
407	get_player_archetype (archetype *at)
408	{
409	// archetypes could have been reloaded
410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412	if (!nat)
413	return at;
414
415	archvec::iterator i = archetypes.find (nat);
416
417	for (;;)
418	{
419	if (++i == archetypes.end ())
420	i = archetypes.begin ();
421	else if (*i == at)
422	cleanup ("not a single player archetype found");
423
424	if ((*i)->type == PLAYER)
425	return *i;
426	}
427	}	324	}
428		325
429	object *	326	object *
430	get_nearest_player (object *mon)	327	get_nearest_player (object *mon)
431	{	328	{
…		…
671	op->destroy ();	568	op->destroy ();
672	continue;	569	continue;
673	}	570	}
674	}	571	}
675		572
676	/* This really needs to be better - we should really give	573	/* Here we remove duplicated skills (as duplicated spell objects have
677	* a substitute spellbook. The problem is that we don't really	574	* _very_ confusing effects for players), which could for instance be
678	* have a good idea what to replace it with (need something like	575	* generated by bad treasurelists. - elmex
679	* a first level treasurelist for each skill.)
680	* remove duplicate skills also
681	*/	576	*/
682	if (op->type == SPELLBOOK || op->type == SKILL)	577	if (op->type == SKILL)
683	{	578	{
684	object *tmp;
685
686	for (tmp = op->below; tmp; tmp = tmp->below)	579	for (object *tmp = op->below; tmp; tmp = tmp->below)
687	if (tmp->type == op->type && tmp->name == op->name)	580	if (tmp->type == op->type && tmp->name == op->name)
688	break;
689
690	if (tmp)
691	{	581	{
692	op->destroy ();	582	op->destroy ();
		583	LOG (llevError,
693	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	584	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
694	continue;	585	break;
695	}	586	}
696		587
697	if (op->nrof > 1)	588	if (op->nrof > 1)
698	op->nrof = 1;	589	op->nrof = 1;
699	}	590	}
700		591
…		…
726	else /* lock all 'normal items by default */	617	else /* lock all 'normal items by default */
727	SET_FLAG (op, FLAG_INV_LOCKED);	618	SET_FLAG (op, FLAG_INV_LOCKED);
728	} /* for loop of objects in player inv */	619	} /* for loop of objects in player inv */
729		620
730	/* Need to set up the skill pointers */	621	/* Need to set up the skill pointers */
731	link_player_skills (pl);	622	pl->contr->link_skills ();
732	}	623	}
733		624
734	void	625	void
735	get_party_password (object *op, partylist *party)	626	get_party_password (object *op, partylist *party)
736	{	627	{
…		…
853	player::chargen_race_done ()	744	player::chargen_race_done ()
854	{	745	{
855	/* this must before then initial items are given */	746	/* this must before then initial items are given */
856	esrv_new_player (ob->contr);	747	esrv_new_player (ob->contr);
857		748
858	treasurelist *tl = treasurelist::find ("starting_wealth");	749	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
859	if (tl)	750	if (tl)
860	create_treasure (tl, ob, 0, 0, 0);	751	create_treasure (tl, ob, 0, 0, 0);
861		752
862	INVOKE_PLAYER (BIRTH, ob->contr);	753	INVOKE_PLAYER (BIRTH, ob->contr);
863	INVOKE_PLAYER (LOGIN, ob->contr);	754	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
868	ob->msg = 0;	759	ob->msg = 0;
869		760
870	start_info (ob);	761	start_info (ob);
871	CLEAR_FLAG (ob, FLAG_WIZ);	762	CLEAR_FLAG (ob, FLAG_WIZ);
872	give_initial_items (ob, ob->randomitems);	763	give_initial_items (ob, ob->randomitems);
873	link_player_skills (ob);
874	esrv_send_inventory (ob, ob);	764	esrv_send_inventory (ob, ob);
875	ob->update_stats ();	765	ob->update_stats ();
876		766
877	/* This moves the player to a different start map, if there	767	/* This moves the player to a different start map, if there
878	* is one for this race	768	* is one for this race
…		…
917	ob->stats.hp = ob->stats.maxhp;	807	ob->stats.hp = ob->stats.maxhp;
918	ob->stats.sp = ob->stats.maxsp;	808	ob->stats.sp = ob->stats.maxsp;
919	ob->stats.grace = 0;	809	ob->stats.grace = 0;
920	}	810	}
921		811
922	void	812	static void
923	flee_player (object *op)	813	flee_player (object *op)
924	{	814	{
925	int dir, diff;	815	int dir, diff;
926	rv_vector rv;	816	rv_vector rv;
927		817
…		…
930	LOG (llevDebug, "Fleeing player is dead.\n");	820	LOG (llevDebug, "Fleeing player is dead.\n");
931	CLEAR_FLAG (op, FLAG_SCARED);	821	CLEAR_FLAG (op, FLAG_SCARED);
932	return;	822	return;
933	}	823	}
934		824
935	if (op->enemy == NULL)	825	if (!op->enemy)
936	{	826	{
937	LOG (llevDebug, "Fleeing player had no enemy.\n");	827	LOG (llevDebug, "Fleeing player had no enemy.\n");
938	CLEAR_FLAG (op, FLAG_SCARED);	828	CLEAR_FLAG (op, FLAG_SCARED);
939	return;	829	return;
940	}	830	}
941		831
942	/* Seen some crashes here. Since we don't store an
943	* op->enemy_count, it is possible that something destroys the
944	* actual enemy, and the object is recycled.
945	*/
946	if (op->enemy->map == NULL)
947	{
948	CLEAR_FLAG (op, FLAG_SCARED);
949	op->enemy = NULL;
950	return;
951	}
952
953	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	832	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
954	{	833	{
955	op->enemy = NULL;	834	op->enemy = NULL;
956	CLEAR_FLAG (op, FLAG_SCARED);	835	CLEAR_FLAG (op, FLAG_SCARED);
957	return;	836	return;
…		…
960	get_rangevector (op, op->enemy, &rv, 0);	839	get_rangevector (op, op->enemy, &rv, 0);
961		840
962	dir = absdir (4 + rv.direction);	841	dir = absdir (4 + rv.direction);
963	for (diff = 0; diff < 3; diff++)	842	for (diff = 0; diff < 3; diff++)
964	{	843	{
965	int m = 1 - (RANDOM () & 2);	844	int m = 1 - rndm (2) * 2;
966		845
967	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	846	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
968	return;	847	return;
969	}	848	}
970		849
…		…
981	check_pick (object *op)	860	check_pick (object *op)
982	{	861	{
983	object *tmp, *next;	862	object *tmp, *next;
984	int stop = 0;	863	int stop = 0;
985	int wvratio;	864	int wvratio;
986	char putstring[128];
987		865
988	/* if you're flying, you cna't pick up anything */	866	/* if you're flying, you cna't pick up anything */
989	if (op->move_type & MOVE_FLYING)	867	if (op->move_type & MOVE_FLYING)
990	return 1;	868	return 1;
991		869
992	next = op->below;	870	next = op->below;
993		871
994	int cnt = MAX_ITEM_PER_DROP;	872	int cnt = MAX_ITEM_PER_ACTION;
995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	873	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
996		874
997	/* loop while there are items on the floor that are not marked as	875	/* loop while there are items on the floor that are not marked as
998	* destroyed */	876	* destroyed */
999	while (next && !next->destroyed ())	877	while (next && !next->destroyed ())
…		…
1015		893
1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	894	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1017	{	895	{
1018	if (item_matched_string (op, tmp, op->contr->search_str))	896	if (item_matched_string (op, tmp, op->contr->search_str))
1019	CHK_PICK_PICKUP;	897	CHK_PICK_PICKUP;
		898
1020	continue;	899	continue;
1021	}	900	}
1022		901
1023	/* high not bit set? We're using the old autopickup model */	902	/* pickup handling */
		903	if (op->contr->mode & PU_DEBUG)
		904	{
		905	/* some debugging code to figure out item information */
		906	const char *str = tmp->name
		907	? format ("item name: %s item type: %d weight/value: %d",
		908	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		909	: format ("item name: %s item type: %d weight/value: %d",
		910	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		911
		912	new_draw_info (NDI_UNIQUE, 0, op, str);
		913	}
		914
		915	if (op->contr->mode & PU_INHIBIT)
		916	return 1;
		917
		918	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		919	return 1;
		920
		921	/* philosophy:
		922	* It's easy to grab an item type from a pile, as long as it's
		923	* generic. This takes no game-time. For more detailed pickups
		924	* and selections, select-items should be used. This is a
		925	* grab-as-you-run type mode that's really useful for arrows for
		926	* example.
		927	* The drawback: right now it has no frontend, so you need to
		928	* stick the bits you want into a calculator in hex mode and then
		929	* convert to decimal and then 'pickup <#>
		930	*/
		931
		932	/* the first two modes are exclusive: if NOTHING we return, if
		933	* STOP then we stop. All the rest are applied sequentially,
		934	* meaning if any test passes, the item gets picked up. */
		935
		936	/* if mode is set to pick nothing up, return */
		937	if (op->contr->mode == PU_NOTHING)
		938	return 1;
		939
		940	/* if mode is set to stop when encountering objects, return */
		941	/* take STOP before INHIBIT since it doesn't actually pick
		942	* anything up */
		943	if (op->contr->mode & PU_STOP)
		944	return 0;
		945
		946	/* useful for going into stores and not losing your settings... */
		947	/* and for battles wher you don't want to get loaded down while
		948	* fighting */
		949	if (op->contr->mode & PU_INHIBIT)
		950	return 1;
		951
		952	/* prevent us from turning into auto-thieves :) */
		953	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		954	continue;
		955
		956	/* ignore known cursed objects */
		957	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		958	continue;
		959
		960	/* all food and drink if desired */
		961	/* question: don't pick up known-poisonous stuff? */
1024	if (!(op->contr->mode & PU_NEWMODE))	962	if (op->contr->mode & PU_FOOD)
		963	if (tmp->type == FOOD)
1025	{	964	{
1026	switch (op->contr->mode)	965	CHK_PICK_PICKUP;
		966	continue;
		967	}
		968
		969	if (op->contr->mode & PU_DRINK)
		970	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		971	{
		972	CHK_PICK_PICKUP;
		973	continue;
		974	}
		975
		976	if (op->contr->mode & PU_POTION)
		977	if (tmp->type == POTION)
		978	{
		979	CHK_PICK_PICKUP;
		980	continue;
		981	}
		982
		983	/* spellbooks, skillscrolls and normal books/scrolls */
		984	if (op->contr->mode & PU_SPELLBOOK)
		985	if (tmp->type == SPELLBOOK)
		986	{
		987	CHK_PICK_PICKUP;
		988	continue;
		989	}
		990
		991	if (op->contr->mode & PU_SKILLSCROLL)
		992	if (tmp->type == SKILLSCROLL)
		993	{
		994	CHK_PICK_PICKUP;
		995	continue;
		996	}
		997
		998	if (op->contr->mode & PU_READABLES)
		999	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		1000	{
		1001	CHK_PICK_PICKUP;
		1002	continue;
		1003	}
		1004
		1005	/* wands/staves/rods/horns */
		1006	if (op->contr->mode & PU_MAGIC_DEVICE)
		1007	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1008	{
		1009	CHK_PICK_PICKUP;
		1010	continue;
		1011	}
		1012
		1013	/* pick up all magical items */
		1014	if (op->contr->mode & PU_MAGICAL)
		1015	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1016	{
		1017	CHK_PICK_PICKUP;
		1018	continue;
		1019	}
		1020
		1021	if (op->contr->mode & PU_VALUABLES)
		1022	{
		1023	if (tmp->type == MONEY || tmp->type == GEM)
1027	{	1024	{
1028	case 0:
1029	return 1; /* don't pick up */
1030	case 1:
1031	CHK_PICK_PICKUP;	1025	CHK_PICK_PICKUP;
1032	return 1;	1026	continue;
1033	case 2:
1034	CHK_PICK_PICKUP;
1035	return 0;
1036	case 3:
1037	return 0; /* stop before pickup */
1038	case 4:
1039	CHK_PICK_PICKUP;
1040	break;
1041	case 5:
1042	CHK_PICK_PICKUP;
1043	stop = 1;
1044	break;
1045	case 6:
1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1048	CHK_PICK_PICKUP;
1049	break;
1050
1051	case 7:
1052	if (tmp->type == MONEY || tmp->type == GEM)
1053	CHK_PICK_PICKUP;
1054	break;
1055
1056	default:
1057	/* use value density */
1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1059	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1060	CHK_PICK_PICKUP;
1061	}	1027	}
1062	}	1028	}
1063	else	1029
1064	{ /* old model */	1030	/* rings & amulets - talismans seems to be typed AMULET */
1065	/* NEW pickup handling */
1066	if (op->contr->mode & PU_DEBUG)	1031	if (op->contr->mode & PU_JEWELS)
		1032	if (tmp->type == RING || tmp->type == AMULET)
1067	{	1033	{
1068	/* some debugging code to figure out item information */	1034	CHK_PICK_PICKUP;
1069	if (tmp->name != NULL)
1070	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1071	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1072	else
1073	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1074	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1075
1076	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1077	}
1078
1079	/* philosophy:
1080	* It's easy to grab an item type from a pile, as long as it's
1081	* generic. This takes no game-time. For more detailed pickups
1082	* and selections, select-items should be used. This is a
1083	* grab-as-you-run type mode that's really useful for arrows for
1084	* example.
1085	* The drawback: right now it has no frontend, so you need to
1086	* stick the bits you want into a calculator in hex mode and then
1087	* convert to decimal and then 'pickup <#>
1088	*/
1089
1090	/* the first two modes are exclusive: if NOTHING we return, if
1091	* STOP then we stop. All the rest are applied sequentially,
1092	* meaning if any test passes, the item gets picked up. */
1093
1094	/* if mode is set to pick nothing up, return */
1095
1096	if (op->contr->mode & PU_NOTHING)
1097	return 1;
1098
1099	/* if mode is set to stop when encountering objects, return */
1100	/* take STOP before INHIBIT since it doesn't actually pick
1101	* anything up */
1102
1103	if (op->contr->mode & PU_STOP)
1104	return 0;
1105
1106	/* useful for going into stores and not losing your settings... */
1107	/* and for battles wher you don't want to get loaded down while
1108	* fighting */
1109	if (op->contr->mode & PU_INHIBIT)
1110	return 1;
1111
1112	/* prevent us from turning into auto-thieves :) */
1113	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1114	continue;	1035	continue;
		1036	}
1115		1037
1116	/* ignore known cursed objects */	1038	/* we don't forget dragon food */
1117	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1039	if (op->contr->mode & PU_FLESH)
		1040	if (tmp->type == FLESH)
		1041	{
		1042	CHK_PICK_PICKUP;
1118	continue;	1043	continue;
		1044	}
1119		1045
1120	/* all food and drink if desired */	1046	/* bows and arrows. Bows are good for selling! */
1121	/* question: don't pick up known-poisonous stuff? */	1047	if (op->contr->mode & PU_BOW)
		1048	if (tmp->type == BOW)
		1049	{
		1050	CHK_PICK_PICKUP;
		1051	continue;
		1052	}
		1053
		1054	if (op->contr->mode & PU_ARROW)
		1055	if (tmp->type == ARROW)
		1056	{
		1057	CHK_PICK_PICKUP;
		1058	continue;
		1059	}
		1060
		1061	/* all kinds of armor etc. */
		1062	if (op->contr->mode & PU_ARMOUR)
		1063	if (tmp->type == ARMOUR)
		1064	{
		1065	CHK_PICK_PICKUP;
		1066	continue;
		1067	}
		1068
		1069	if (op->contr->mode & PU_HELMET)
		1070	if (tmp->type == HELMET)
		1071	{
		1072	CHK_PICK_PICKUP;
		1073	continue;
		1074	}
		1075
		1076	if (op->contr->mode & PU_SHIELD)
		1077	if (tmp->type == SHIELD)
		1078	{
		1079	CHK_PICK_PICKUP;
		1080	continue;
		1081	}
		1082
1122	if (op->contr->mode & PU_FOOD)	1083	if (op->contr->mode & PU_BOOTS)
1123	if (tmp->type == FOOD)	1084	if (tmp->type == BOOTS)
		1085	{
		1086	CHK_PICK_PICKUP;
		1087	continue;
		1088	}
		1089
		1090	if (op->contr->mode & PU_GLOVES)
		1091	if (tmp->type == GLOVES)
		1092	{
		1093	CHK_PICK_PICKUP;
		1094	continue;
		1095	}
		1096
		1097	if (op->contr->mode & PU_CLOAK)
		1098	if (tmp->type == CLOAK)
		1099	{
		1100	CHK_PICK_PICKUP;
		1101	continue;
		1102	}
		1103
		1104	/* hoping to catch throwing daggers here */
		1105	if (op->contr->mode & PU_MISSILEWEAPON)
		1106	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1107	{
		1108	CHK_PICK_PICKUP;
		1109	continue;
		1110	}
		1111
		1112	/* careful: chairs and tables are weapons! */
		1113	if (op->contr->mode & PU_ALLWEAPON)
		1114	{
		1115	if (tmp->type == WEAPON)
		1116	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1124	{	1117	{
1125	CHK_PICK_PICKUP;	1118	CHK_PICK_PICKUP;
1126	continue;	1119	continue;
1127	}	1120	}
		1121	}
1128		1122
		1123	/* misc stuff that's useful */
1129	if (op->contr->mode & PU_DRINK)	1124	if (op->contr->mode & PU_KEY)
1130	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1125	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1131	{	1126	{
1132	CHK_PICK_PICKUP;	1127	CHK_PICK_PICKUP;
1133	continue;	1128	continue;
1134	}	1129	}
1135		1130
		1131	/* any of the last 4 bits set means we use the ratio for value
		1132	* pickups */
1136	if (op->contr->mode & PU_POTION)	1133	if (op->contr->mode & PU_RATIO)
1137	if (tmp->type == POTION)	1134	{
		1135	/* use value density to decide what else to grab */
		1136	/* >=7 was >= op->contr->mode */
		1137	/* >=7 is the old standard setting. Now we take the last 4 bits
1138	{	1138	*/
1139	CHK_PICK_PICKUP;
1140	continue;
1141	}
1142
1143	/* spellbooks, skillscrolls and normal books/scrolls */
1144	if (op->contr->mode & PU_SPELLBOOK)
1145	if (tmp->type == SPELLBOOK)
1146	{
1147	CHK_PICK_PICKUP;
1148	continue;
1149	}
1150
1151	if (op->contr->mode & PU_SKILLSCROLL)
1152	if (tmp->type == SKILLSCROLL)
1153	{
1154	CHK_PICK_PICKUP;
1155	continue;
1156	}
1157
1158	if (op->contr->mode & PU_READABLES)
1159	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1160	{
1161	CHK_PICK_PICKUP;
1162	continue;
1163	}
1164
1165	/* wands/staves/rods/horns */
1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1167	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1168	{
1169	CHK_PICK_PICKUP;
1170	continue;
1171	}
1172
1173	/* pick up all magical items */
1174	if (op->contr->mode & PU_MAGICAL)	1139	wvratio = op->contr->mode & PU_RATIO;
1175	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1140	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1176	{
1177	CHK_PICK_PICKUP;
1178	continue;
1179	}
1180
1181	if (op->contr->mode & PU_VALUABLES)
1182	{	1141	{
1183	if (tmp->type == MONEY || tmp->type == GEM)	1142	#if 0
		1143	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1144	if (tmp->name != NULL)
1184	{	1145	{
1185	CHK_PICK_PICKUP;	1146	fprintf (stderr, "%s", tmp->name);
1186	continue;
1187	}	1147	}
1188	}
1189
1190	/* rings & amulets - talismans seems to be typed AMULET */
1191	if (op->contr->mode & PU_JEWELS)
1192	if (tmp->type == RING || tmp->type == AMULET)
1193	{
1194	CHK_PICK_PICKUP;
1195	continue;
1196	}
1197
1198	/* we don't forget dragon food */
1199	if (op->contr->mode & PU_FLESH)
1200	if (tmp->type == FLESH)
1201	{
1202	CHK_PICK_PICKUP;
1203	continue;
1204	}
1205
1206	/* bows and arrows. Bows are good for selling! */
1207	if (op->contr->mode & PU_BOW)
1208	if (tmp->type == BOW)
1209	{
1210	CHK_PICK_PICKUP;
1211	continue;
1212	}
1213
1214	if (op->contr->mode & PU_ARROW)
1215	if (tmp->type == ARROW)
1216	{
1217	CHK_PICK_PICKUP;
1218	continue;
1219	}
1220
1221	/* all kinds of armor etc. */
1222	if (op->contr->mode & PU_ARMOUR)
1223	if (tmp->type == ARMOUR)
1224	{
1225	CHK_PICK_PICKUP;
1226	continue;
1227	}
1228
1229	if (op->contr->mode & PU_HELMET)
1230	if (tmp->type == HELMET)
1231	{
1232	CHK_PICK_PICKUP;
1233	continue;
1234	}
1235
1236	if (op->contr->mode & PU_SHIELD)
1237	if (tmp->type == SHIELD)
1238	{
1239	CHK_PICK_PICKUP;
1240	continue;
1241	}
1242
1243	if (op->contr->mode & PU_BOOTS)
1244	if (tmp->type == BOOTS)
1245	{
1246	CHK_PICK_PICKUP;
1247	continue;
1248	}
1249
1250	if (op->contr->mode & PU_GLOVES)
1251	if (tmp->type == GLOVES)
1252	{
1253	CHK_PICK_PICKUP;
1254	continue;
1255	}
1256
1257	if (op->contr->mode & PU_CLOAK)
1258	if (tmp->type == CLOAK)
1259	{
1260	CHK_PICK_PICKUP;
1261	continue;
1262	}
1263
1264	/* hoping to catch throwing daggers here */
1265	if (op->contr->mode & PU_MISSILEWEAPON)
1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1267	{
1268	CHK_PICK_PICKUP;
1269	continue;
1270	}
1271
1272	/* careful: chairs and tables are weapons! */
1273	if (op->contr->mode & PU_ALLWEAPON)
1274	{
1275	if (tmp->type == WEAPON && tmp->name != NULL)
1276	{
1277	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1279	{
1280	CHK_PICK_PICKUP;
1281	continue;
1282	}
1283	}
1284
1285	if (tmp->type == WEAPON && tmp->name == NULL)
1286	{
1287	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1288	{
1289	CHK_PICK_PICKUP;
1290	continue;
1291	}
1292	}
1293	}
1294
1295	/* misc stuff that's useful */
1296	if (op->contr->mode & PU_KEY)
1297	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1298	{
1299	CHK_PICK_PICKUP;
1300	continue;
1301	}
1302
1303	/* any of the last 4 bits set means we use the ratio for value
1304	* pickups */
1305	if (op->contr->mode & PU_RATIO)
1306	{
1307	/* use value density to decide what else to grab */
1308	/* >=7 was >= op->contr->mode */
1309	/* >=7 is the old standard setting. Now we take the last 4 bits
1310	* and multiply them by 5, giving 0..15*5== 5..75 */
1311	wvratio = (op->contr->mode & PU_RATIO) * 5;
1312	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1313	{
1314	CHK_PICK_PICKUP;
1315	#if 0
1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1317	if (tmp->name != NULL)
1318	{
1319	fprintf (stderr, "%s", tmp->name);
1320	}
1321	else	1148	else
1322	fprintf (stderr, "%s", tmp->arch->archname);	1149	fprintf (stderr, "%s", tmp->arch->archname);
1323	fprintf (stderr, ",%d] = ", tmp->type);	1150	fprintf (stderr, ",%d] = ", tmp->type);
1324	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1151	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1325	#endif	1152	#endif
		1153	CHK_PICK_PICKUP;
1326	continue;	1154	continue;
1327	}
1328	}	1155	}
1329	} /* the new pickup model */	1156	} /* the new pickup model */
1330	}	1157	}
1331		1158
1332	return !stop;	1159	return !stop;
		1160	}
		1161
		1162	/* routine for both players and monsters. We call this when
		1163	* there is a possibility for our action distrubing our hiding
		1164	* place or invisiblity spell. Artefact invisiblity causes
		1165	* "noise" instead. If we arent invisible to begin with, we
		1166	* return 0.
		1167	*/
		1168	static int
		1169	action_makes_visible (object *op)
		1170	{
		1171	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1172	{
		1173	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1174	{
		1175	// artefact invisibility is permanent, but we still make noise
		1176	// this is important for game-balance.
		1177	if (op->contr)
		1178	op->make_noise ();
		1179
		1180	return 0;
		1181	}
		1182
		1183	if (op->contr && op->contr->tmp_invis == 0)
		1184	return 0;
		1185
		1186	/* If monsters, they should become visible */
		1187	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1188	{
		1189	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1190	return 1;
		1191	}
		1192	}
		1193
		1194	return 0;
1333	}	1195	}
1334		1196
1335	/*	1197	/*
1336	* Find an arrow in the inventory and after that	1198	* Find an arrow in the inventory and after that
1337	* in the right type container (quiver). Pointer to the	1199	* in the right type container (quiver). Pointer to the
1338	* found object is returned.	1200	* found object is returned.
1339	*/	1201	*/
1340	object *	1202	static object *
1341	find_arrow (object *op, const char *type)	1203	find_arrow (object *op, const char *type)
1342	{	1204	{
1343	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1205	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1344	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1206	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1345	return splay (tmp);	1207	return splay (tmp);
…		…
1359	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1221	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1360	* against the target. A full test is not performed, simply a basic test	1222	* against the target. A full test is not performed, simply a basic test
1361	* of resistances. The archer is making a quick guess at what he sees down	1223	* of resistances. The archer is making a quick guess at what he sees down
1362	* the hall. Failing that it does it's best to pick the highest plus arrow.	1224	* the hall. Failing that it does it's best to pick the highest plus arrow.
1363	*/	1225	*/
1364	object *	1226	static object *
1365	find_better_arrow (object *op, object *target, const char *type, int *better)	1227	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1366	{	1228	{
1367	object *tmp = NULL, *arrow, *ntmp;	1229	object *tmp = NULL, *arrow, *ntmp;
1368	int attacknum, attacktype, betterby = 0, i;	1230	int attacknum, attacktype, betterby = 0, i;
1369		1231
1370	if (!type)	1232	if (!type)
…		…
1374	{	1236	{
1375	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1237	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1376	{	1238	{
1377	i = 0;	1239	i = 0;
1378	ntmp = find_better_arrow (arrow, target, type, &i);	1240	ntmp = find_better_arrow (arrow, target, type, &i);
		1241
1379	if (i > betterby)	1242	if (i > betterby)
1380	{	1243	{
1381	tmp = ntmp;	1244	tmp = ntmp;
1382	betterby = i;	1245	betterby = i;
1383	}	1246	}
1384	}	1247	}
1385	else if (arrow->type == ARROW && arrow->race == type)	1248	else if (arrow->type == ARROW && arrow->race == type)
1386	{	1249	{
1387	/* allways prefer assasination/slaying */	1250	/* allways prefer assasination/slaying */
1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1251	if (target->race && arrow->slaying.contains (target->race))
1389	{	1252	{
1390	if (arrow->attacktype & AT_DEATH)	1253	if (arrow->attacktype & AT_DEATH)
1391	{	1254	{
1392	*better = 100;	1255	*better = 100;
1393	return arrow;	1256	return arrow;
…		…
1408	{	1271	{
1409	tmp = arrow;	1272	tmp = arrow;
1410	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1273	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1411	}	1274	}
1412	}	1275	}
		1276
1413	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1277	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1414	{	1278	{
1415	tmp = arrow;	1279	tmp = arrow;
1416	betterby = 2 + arrow->magic + arrow->stats.dam;	1280	betterby = 2 + arrow->magic + arrow->stats.dam;
1417	}	1281	}
		1282
1418	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1283	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1419	{	1284	{
1420	tmp = arrow;	1285	tmp = arrow;
1421	betterby = 1 + arrow->magic + arrow->stats.dam;	1286	betterby = 1 + arrow->magic + arrow->stats.dam;
1422	}	1287	}
…		…
1435	* find_better_arrow to find a decent arrow to use.	1300	* find_better_arrow to find a decent arrow to use.
1436	* op = the shooter	1301	* op = the shooter
1437	* type = bow->race	1302	* type = bow->race
1438	* dir = fire direction	1303	* dir = fire direction
1439	*/	1304	*/
1440	object *	1305	static object *
1441	pick_arrow_target (object *op, const char *type, int dir)	1306	pick_arrow_target (object *op, shstr_cmp type, int dir)
1442	{	1307	{
1443	object *tmp = NULL;	1308	object *tmp = NULL;
1444	maptile *m;	1309	maptile *m;
1445	int i, mflags, found, number;	1310	int i, mflags, found, number;
1446	sint16 x, y;	1311	sint16 x, y;
…		…
1461	for (i = 0, found = 0; i < 20; i++)	1326	for (i = 0, found = 0; i < 20; i++)
1462	{	1327	{
1463	x += freearr_x[dir];	1328	x += freearr_x[dir];
1464	y += freearr_y[dir];	1329	y += freearr_y[dir];
1465	mflags = get_map_flags (m, &m, x, y, &x, &y);	1330	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1331
1466	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1332	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1467	{	1333	{
1468	tmp = NULL;	1334	tmp = 0;
1469	break;	1335	break;
1470	}	1336	}
1471	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1337	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1472	{	1338	{
1473	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1339	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1474	* perhaps a bad assumption.	1340	* perhaps a bad assumption.
1475	*/	1341	*/
1476	tmp = NULL;	1342	tmp = 0;
1477	break;	1343	break;
1478	}	1344	}
		1345
1479	if (mflags & P_IS_ALIVE)	1346	if (mflags & P_IS_ALIVE)
1480	{
1481	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1482	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1348	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1483	{
1484	found++;
1485	break;
1486	}
1487	if (found)
1488	break;	1349	break;
1489	}
1490	}	1350	}
1491	if (tmp == NULL)	1351
		1352	if (!tmp)
1492	return find_arrow (op, type);	1353	return find_arrow (op, type);
1493		1354
1494	if (tmp->head)	1355	if (tmp->head)
1495	tmp = tmp->head;	1356	tmp = tmp->head;
1496		1357
…		…
1536	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1397	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1537	return 0;	1398	return 0;
1538	}	1399	}
1539		1400
1540	// optimisation: move object to top so we will find it quickly again	1401	// optimisation: move object to top so we will find it quickly again
1541	if (bow->below)	1402	splay (bow);
1542	{
1543	bow->remove ();
1544	op->insert (bow);
1545	}
1546
1547	}	1403	}
1548		1404
1549	if (!bow->race || !bow->skill)	1405	if (!bow->race || !bow->skill)
1550	{	1406	{
1551	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1407	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1577	}	1433	}
1578		1434
1579	/* this should not happen, but sometimes does */	1435	/* this should not happen, but sometimes does */
1580	if (arrow->nrof == 0)	1436	if (arrow->nrof == 0)
1581	{	1437	{
		1438	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1582	arrow->destroy ();	1439	arrow->destroy ();
1583	return 0;	1440	return 0;
1584	}	1441	}
1585		1442
1586	left = arrow; /* these are arrows left to the player */	1443	left = arrow; /* these are arrows left to the player */
…		…
1596	arrow->direction = dir;	1453	arrow->direction = dir;
1597		1454
1598	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1455	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1599	arrow->stats.hp = arrow->stats.dam;	1456	arrow->stats.hp = arrow->stats.dam;
1600	arrow->stats.grace = arrow->attacktype;	1457	arrow->stats.grace = arrow->attacktype;
1601		1458	arrow->custom_name = arrow->slaying;
1602	if (arrow->slaying)
1603	arrow->spellarg = strdup (arrow->slaying);
1604		1459
1605	#if 0	1460	#if 0
1606	if (player *pl = op->contr)	1461	if (player *pl = op->contr)
1607	{	1462	{
1608	float speed = pl->weapon_sp;	1463	float speed = pl->weapon_sp;
…		…
1670	* but monsters can't. Putting that code here	1525	* but monsters can't. Putting that code here
1671	* makes the fire_bow code much cleaner.	1526	* makes the fire_bow code much cleaner.
1672	* this function should only be called if 'op' is a player,	1527	* this function should only be called if 'op' is a player,
1673	* hence the function name.	1528	* hence the function name.
1674	*/	1529	*/
1675	int	1530	static int
1676	player_fire_bow (object *op, int dir)	1531	player_fire_bow (object *op, int dir)
1677	{	1532	{
1678	int ret = 0, wcmod = 0;	1533	int ret;
1679		1534
1680	if (op->contr->bowtype == bow_bestarrow)	1535	if (op->contr->bowtype == bow_bestarrow)
1681	{	1536	{
1682	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1537	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1683	}	1538	}
1684	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1539	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1685	{	1540	{
1686	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1541	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1687	wcmod = -1;
1688
1689	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1542	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1690	}	1543	}
1691	else if (op->contr->bowtype == bow_threewide)	1544	else if (op->contr->bowtype == bow_threewide)
1692	{	1545	{
1693	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1546	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1694	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1547	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1695	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1548	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1696	}	1549	}
1697	else if (op->contr->bowtype == bow_spreadshot)	1550	else if (op->contr->bowtype == bow_spreadshot)
1698	{	1551	{
1699	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1552	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1700	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1553	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1701	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1554	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1702	}	1555	}
1703	else	1556	else
1704	{	1557	{
…		…
1710	}	1563	}
1711		1564
1712	/* Fires a misc (wand/rod/horn) object in 'dir'.	1565	/* Fires a misc (wand/rod/horn) object in 'dir'.
1713	* Broken apart from 'fire' to keep it more readable.	1566	* Broken apart from 'fire' to keep it more readable.
1714	*/	1567	*/
1715	void	1568	static void
1716	fire_misc_object (object *op, int dir)	1569	fire_misc_object (object *op, int dir)
1717	{	1570	{
1718	object *item = op->contr->ranged_ob;	1571	object *item = op->contr->ranged_ob;
1719		1572
1720	if (!item)	1573	if (!item)
…		…
1742	return;	1595	return;
1743	}	1596	}
1744	}	1597	}
1745	else if (item->type == ROD || item->type == HORN)	1598	else if (item->type == ROD || item->type == HORN)
1746	{	1599	{
1747	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1600	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1748		1601
1749	// using the maximum of the rods charge allows at least one spell cast	1602	// using the maximum of the rods charge allows at least one spell cast
1750	// for a rod or horn, this fixes some broken rods.	1603	// for a rod or horn, this fixes some broken rods.
1751	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1604	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1752	{	1605	{
1753	op->contr->play_sound (sound_find ("wand_poof"));	1606	op->contr->play_sound (sound_find ("wand_poof"));
1754		1607
1755	if (item->type == ROD)	1608	if (item->type == ROD)
1756	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1609	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1761	}	1614	}
1762	}	1615	}
1763		1616
1764	if (cast_spell (op, item, dir, item->inv, NULL))	1617	if (cast_spell (op, item, dir, item->inv, NULL))
1765	{	1618	{
1766	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1619	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1620
1767	if (item->type == WAND)	1621	if (item->type == WAND)
1768	{	1622	{
1769	if (!(--item->stats.food))	1623	if (!(--item->stats.food))
1770	{	1624	{
1771	object *tmp;	1625	object *tmp;
…		…
1791	bool	1645	bool
1792	fire (object *op, int dir)	1646	fire (object *op, int dir)
1793	{	1647	{
1794	int spellcost = 0;	1648	int spellcost = 0;
1795		1649
1796	/* check for loss of invisiblity/hide */
1797	if (action_makes_visible (op))
1798	make_visible (op);
1799
1800	player *pl = op->contr;	1650	player *pl = op->contr;
1801		1651
1802	if (pl->golem)	1652	if (pl->golem)
1803	{	1653	{
1804	control_golem (op->contr->golem, dir);	1654	control_golem (op->contr->golem, dir);
…		…
1806	}	1656	}
1807		1657
1808	object *ob = pl->ranged_ob;	1658	object *ob = pl->ranged_ob;
1809		1659
1810	if (!ob)	1660	if (!ob)
1811	return false;
1812
1813	if (!op->change_weapon (ob))
1814	return false;	1661	return false;
1815		1662
1816	if (op->speed_left > 0.f)	1663	if (op->speed_left > 0.f)
1817	--op->speed_left;	1664	--op->speed_left;
1818	else	1665	else
1819	return false;	1666	return false;
1820		1667
		1668	if (!op->change_weapon (ob))
		1669	return false;
		1670
		1671	/* check for loss of invisiblity/hide */
		1672	if (action_makes_visible (op))
		1673	make_visible (op);
		1674
1821	switch (ob->type)	1675	switch (ob->type)
1822	{	1676	{
1823	case BOW:	1677	case BOW:
1824	player_fire_bow (op, dir);	1678	player_fire_bow (op, dir);
1825	break;	1679	break;
1826		1680
1827	case SPELL:	1681	case SPELL:
1828	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1682	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1829	break;	1683	break;
1830		1684
1831	case BUILDER:	1685	case BUILDER:
1832	apply_map_builder (op, dir);	1686	apply_map_builder (op, dir);
1833	break;	1687	break;
…		…
1842	}	1696	}
1843		1697
1844	return true;	1698	return true;
1845	}	1699	}
1846		1700
1847	/* find_key	1701	static object *
1848	* We try to find a key for the door as passed. If we find a key
1849	* and successfully use it, we return the key, otherwise NULL
1850	* This function merges both normal and locked door, since the logic
1851	* for both is the same - just the specific key is different.
1852	* pl is the player,
1853	* inv is the objects inventory to searched
1854	* door is the door we are trying to match against.
1855	* This function can be called recursively to search containers.
1856	*/
1857	object *
1858	find_key (object *pl, object *container, object *door)	1702	find_key_ (object *pl, object *container, object *door)
1859	{	1703	{
1860	object *tmp, *key;	1704	object *tmp, *key;
1861		1705
1862	/* Should not happen, but sanity checking is never bad */	1706	/* Should not happen, but sanity checking is never bad */
1863	if (!container->inv)	1707	if (!container->inv)
…		…
1866	/* First, lets try to find a key in the top level inventory */	1710	/* First, lets try to find a key in the top level inventory */
1867	for (tmp = container->inv; tmp; tmp = tmp->below)	1711	for (tmp = container->inv; tmp; tmp = tmp->below)
1868	{	1712	{
1869	if (door->type == DOOR && tmp->type == KEY)	1713	if (door->type == DOOR && tmp->type == KEY)
1870	break;	1714	break;
		1715
1871	/* For sanity, we should really check door type, but other stuff	1716	/* For sanity, we should really check door type, but other stuff
1872	* (like containers) can be locked with special keys	1717	* (like containers) can be locked with special keys
1873	*/	1718	*/
1874	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1719	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1875	break;	1720	break;
…		…
1881	* a key, return	1726	* a key, return
1882	*/	1727	*/
1883	if (!tmp)	1728	if (!tmp)
1884	{	1729	{
1885	for (tmp = container->inv; tmp; tmp = tmp->below)	1730	for (tmp = container->inv; tmp; tmp = tmp->below)
1886	{
1887	/* No reason to search empty containers */	1731	/* No reason to search empty containers */
1888	if (tmp->type == CONTAINER && tmp->inv)	1732	if (tmp->type == CONTAINER && tmp->inv)
1889	{
1890	if ((key = find_key (pl, tmp, door)))	1733	if ((key = find_key_ (pl, tmp, door)))
1891	return key;	1734	return key;
1892	}
1893	}
1894		1735
1895	if (!tmp)	1736	if (!tmp)
1896	return NULL;	1737	return 0;
1897	}	1738	}
1898		1739
1899	/* We get down here if we have found a key. Now if its in a container,	1740	/* We get down here if we have found a key. Now if its in a container,
1900	* see if we actually want to use it	1741	* see if we actually want to use it
1901	*/	1742	*/
1902	if (pl != container)	1743	if (pl != container)
1903	{	1744	{
1904	/* Only let players use keys in containers */	1745	/* Only let players use keys in containers */
1905	if (!pl->contr)	1746	if (!pl->contr)
1906	return NULL;	1747	return 0;
		1748
1907	/* cases where this fails:	1749	/* cases where this fails:
1908	* If we only search the player inventory, return now since we	1750	* If we only search the player inventory, return now since we
1909	* are not in the players inventory.	1751	* are not in the players inventory.
1910	* If the container is not active, return now since only active	1752	* If the container is not active, return now since only active
1911	* containers can be used.	1753	* containers can be used.
…		…
1915	* inv must have been an container and must have been active.	1757	* inv must have been an container and must have been active.
1916	*	1758	*
1917	* Change the color so that the message doesn't disappear with	1759	* Change the color so that the message doesn't disappear with
1918	* all the others.	1760	* all the others.
1919	*/	1761	*/
1920	if (pl->contr->usekeys == key_inventory ||	1762	if (pl->contr->usekeys == key_inventory
1921	!QUERY_FLAG (container, FLAG_APPLIED) ||	1763	|| !QUERY_FLAG (container, FLAG_APPLIED)
1922	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1764	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1923	{	1765	{
1924	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1766	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1925	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1767	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1926	return NULL;	1768	return NULL;
1927	}	1769	}
1928	}	1770	}
1929		1771
1930	return tmp;	1772	return tmp;
		1773	}
		1774
		1775	/* find_key
		1776	* We try to find a key for the door as passed. If we find a key
		1777	* and successfully use it, we return the key, otherwise NULL
		1778	* This function merges both normal and locked door, since the logic
		1779	* for both is the same - just the specific key is different.
		1780	* pl is the player,
		1781	* inv is the objects inventory to searched
		1782	* door is the door we are trying to match against.
		1783	* This function can be called recursively to search containers.
		1784	*/
		1785	object *
		1786	find_key (object *pl, object *container, object *door)
		1787	{
		1788	if (door->slaying && is_match_expr (door->slaying))
		1789	{
		1790	// for match expressions, we try to find the key by applying the match
		1791	// to the op itself, which is supposed to find the "key", instead
		1792	// of searching through containers ourselves.
		1793
		1794	return match_one (door->slaying, container, door, pl, pl);
		1795	}
		1796	else
		1797	return find_key_ (pl, container, door);
1931	}	1798	}
1932		1799
1933	/* moved door processing out of move_player_attack.	1800	/* moved door processing out of move_player_attack.
1934	* returns 1 if player has opened the door with a key	1801	* returns 1 if player has opened the door with a key
1935	* such that the caller should not do anything more,	1802	* such that the caller should not do anything more,
…		…
1985	* going to try and move (not fire weapons).	1852	* going to try and move (not fire weapons).
1986	*/	1853	*/
1987	bool	1854	bool
1988	move_player_attack (object *op, int dir)	1855	move_player_attack (object *op, int dir)
1989	{	1856	{
		1857	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1858	{
		1859	--op->speed_left;
		1860	return true;
		1861	}
		1862
1990	int on_battleground;	1863	int on_battleground;
1991		1864
1992	sint16 nx = freearr_x[dir] + op->x;	1865	sint16 nx = freearr_x[dir] + op->x;
1993	sint16 ny = freearr_y[dir] + op->y;	1866	sint16 ny = freearr_y[dir] + op->y;
1994		1867
1995	on_battleground = op_on_battleground (op, 0, 0);	1868	on_battleground = op_on_battleground (op, 0, 0);
1996		1869
1997	if (out_of_map (op->map, nx, ny))	1870	if (out_of_map (op->map, nx, ny))
1998	return false;	1871	return false;
1999
2000	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2001	{
2002	--op->speed_left;
2003	return true;
2004	}
2005		1872
2006	/* If braced, or can't move to the square, and it is not out of the	1873	/* If braced, or can't move to the square, and it is not out of the
2007	* map, attack it. Note order of if statement is important - don't	1874	* map, attack it. Note order of if statement is important - don't
2008	* want to be calling move_ob if braced, because move_ob will move the	1875	* want to be calling move_ob if braced, because move_ob will move the
2009	* player. This is a pretty nasty hack, because if we could	1876	* player. This is a pretty nasty hack, because if we could
…		…
2069	--op->speed_left;	1936	--op->speed_left;
2070		1937
2071	op->play_sound (sound_find ("push_player"));	1938	op->play_sound (sound_find ("push_player"));
2072	push_ob (mon, dir, op);	1939	push_ob (mon, dir, op);
2073		1940
2074	if (op->contr->tmp_invis || op->hide)	1941	if (action_makes_visible (op))
2075	make_visible (op);	1942	make_visible (op);
2076		1943
2077	return true;	1944	return true;
2078	}	1945	}
2079	else	1946	else
…		…
2101	push_ob (mon, dir, op);	1968	push_ob (mon, dir, op);
2102	}	1969	}
2103	else	1970	else
2104	op->statusmsg ("You withhold your attack");	1971	op->statusmsg ("You withhold your attack");
2105		1972
2106	if (op->contr->tmp_invis || op->hide)	1973	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2107	make_visible (op);	1974	make_visible (op);
2108		1975
2109	return true;	1976	return true;
2110	}	1977	}
2111	}	1978	}
…		…
2151	}	2018	}
2152		2019
2153	bool	2020	bool
2154	move_player (object *op, int dir)	2021	move_player (object *op, int dir)
2155	{	2022	{
2156	int pick;
2157
2158	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2023	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2159	return 0;	2024	return 0;
2160		2025
2161	/* Sanity check: make sure dir is valid */	2026	/* Sanity check: make sure dir is valid */
2162	if ((dir < 0) || (dir >= 9))	2027	if ((dir < 0) || (dir >= 9))
…		…
2169	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2034	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2170	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2035	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2171		2036
2172	op->facing = dir;	2037	op->facing = dir;
2173		2038
2174	if (op->hide)	2039	if (op->flag [FLAG_HIDDEN])
2175	do_hidden_move (op);	2040	do_hidden_move (op);
2176		2041
2177	bool retval;	2042	bool retval;
		2043	int pick = 0;
2178		2044
2179	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2045	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2180	retval = RESULT_INT (0);	2046	retval = RESULT_INT (0);
2181	else if (op->contr->fire_on)	2047	else if (op->contr->fire_on)
2182	retval = fire (op, dir);	2048	retval = fire (op, dir);
…		…
2239	return move_player (op, op->direction);	2105	return move_player (op, op->direction);
2240		2106
2241	return false;	2107	return false;
2242	}	2108	}
2243		2109
2244	int	2110	static int
2245	save_life (object *op)	2111	save_life (object *op)
2246	{	2112	{
2247	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2113	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2248	return 0;	2114	return 0;
2249		2115
…		…
2296	void	2162	void
2297	object::drop_unpaid_items ()	2163	object::drop_unpaid_items ()
2298	{	2164	{
2299	if (!flag [FLAG_REMOVED])	2165	if (!flag [FLAG_REMOVED])
2300	::drop_unpaid_items (inv, this);	2166	::drop_unpaid_items (inv, this);
2301	}
2302
2303	/*
2304	* Returns pointer a static string containing gravestone text
2305	* Moved from apply.c to player.c - player.c is what
2306	* actually uses this function. player.c may not be quite the
2307	* best, a misc file for object actions is probably better,
2308	* but there isn't one in the server directory.
2309	*/
2310	const char *
2311	gravestone_text (object *op)
2312	{
2313	static dynbuf_text buf;
2314
2315	buf << "---- R.I.P. ----\n\n";
2316	op->name;
2317
2318	if (op->type == PLAYER)
2319	buf << " the " << op->contr->title;
2320
2321	buf << "\n\n";
2322
2323	buf << "who was level ";
2324	buf << (sint32)op->level << "\n\n" // OO breakdown
2325	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2326
2327	if (op->type == PLAYER)
2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2329
2330	{
2331	static char buf2[128];
2332	time_t now = time (NULL);
2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2334	buf << buf2;
2335	}
2336
2337	return buf;
2338	}	2167	}
2339		2168
2340	void	2169	void
2341	do_some_living (object *op)	2170	do_some_living (object *op)
2342	{	2171	{
…		…
2497	{	2326	{
2498	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2327	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2499		2328
2500	if (over_hp > 0)	2329	if (over_hp > 0)
2501	{	2330	{
2502	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2331	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2503	op->last_heal = 0;	2332	op->last_heal = 0;
2504	}	2333	}
2505	else	2334	else
2506	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2335	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2507	}	2336	}
…		…
2563		2392
2564	if (op->stats.food < 0)	2393	if (op->stats.food < 0)
2565	{	2394	{
2566	op->stats.hp += op->stats.food;	2395	op->stats.hp += op->stats.food;
2567	op->stats.food = 0;	2396	op->stats.food = 0;
		2397
		2398	if (op->stats.hp < 0)
		2399	{
		2400	op->contr->killer = archetype::get ("killer_starvation");
		2401	op->contr->killer->destroy ();
2568	}	2402	}
		2403	}
2569		2404
		2405	/* killer should be set here already */
2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2406	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2571	kill_player (op);	2407	kill_player (op);
2572	}	2408	}
2573	}	2409	}
2574		2410
…		…
2579	*/	2415	*/
2580	void	2416	void
2581	kill_player (object *op)	2417	kill_player (object *op)
2582	{	2418	{
2583	int x, y;	2419	int x, y;
2584	char buf[MAX_BUF];
2585	maptile *map; /* this is for resurrection */	2420	maptile *map; /* this is for resurrection */
2586	int will_kill_again;	2421	int will_kill_again;
2587	archetype *at;	2422	archetype *at;
2588	object *tmp;	2423	object *tmp;
2589		2424
2590	if (save_life (op))	2425	if (save_life (op))
2591	return;	2426	return;
		2427
		2428	dynbuf_text deathtab;
		2429
		2430	/* restore player */
		2431	at = archetype::find (shstr_poisoning);
		2432	if (object *tmp = present_arch_in_ob (at, op))
		2433	{
		2434	tmp->destroy ();
		2435	deathtab << "Your body feels cleansed...\r";
		2436	}
		2437
		2438	at = archetype::find (shstr_confusion);
		2439	if (object *tmp = present_arch_in_ob (at, op))
		2440	{
		2441	tmp->destroy ();
		2442	deathtab << "Your mind feels clearer...\r";
		2443	}
		2444
		2445	cure_disease (op, 0, 0); /* remove any disease */
		2446
		2447	max_it (op->stats.hp , op->stats.maxhp);
		2448	max_it (op->stats.sp , op->stats.maxsp);
		2449	max_it (op->stats.grace, op->stats.maxgrace);
		2450
		2451	if (op->stats.food <= 0)
		2452	op->stats.food = 999;
		2453
		2454	// remove all spell effects that are active
		2455	// to avoid long-term effects such as word-of-recall
		2456	for (object *item = op->inv; item; )
		2457	{
		2458	object *next = item->below;
		2459
		2460	if (item->type == SPELL_EFFECT && item->active)
		2461	item->destroy ();
		2462
		2463	item = next;
		2464	}
2592		2465
2593	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2466	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2594	* in cities ONLY!!! It is very important that this doesn't get abused.	2467	* in cities ONLY!!! It is very important that this doesn't get abused.
2595	* Look at op_on_battleground() for more info --AndreasV	2468	* Look at op_on_battleground() for more info --AndreasV
2596	*/	2469	*/
2597	if (op_on_battleground (op, &x, &y))	2470	if (op_on_battleground (op, &x, &y))
2598	{	2471	{
2599	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2472	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2600	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2601
2602	/* restore player */
2603	at = archetype::find ("poisoning");
2604	if (object *tmp = present_arch_in_ob (at, op))
2605	{
2606	tmp->destroy ();
2607	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2608	}
2609
2610	at = archetype::find ("confusion");
2611	if (object *tmp = present_arch_in_ob (at, op))
2612	{
2613	tmp->destroy ();
2614	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2615	}
2616
2617	cure_disease (op, 0, 0); /* remove any disease */
2618	op->stats.hp = op->stats.maxhp;
2619	if (op->stats.food <= 0)
2620	op->stats.food = 999;
2621		2473
2622	/* create a bodypart-trophy to make the winner happy */	2474	/* create a bodypart-trophy to make the winner happy */
2623	if (object *tmp = arch_to_object (archetype::find ("finger")))	2475	if (object *tmp = arch_to_object (archetype::find (shstr_finger)))
2624	{	2476	{
2625	tmp->name = format ("%s's finger" , &op->name);	2477	tmp->name = format ("%s's finger" , &op->name);
2626	tmp->name_pl = format ("%s's fingers", &op->name);	2478	tmp->name_pl = format ("%s's fingers", &op->name);
2627	tmp->msg = format (	2479	tmp->msg = format (
2628	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2480	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
…		…
2636	}	2488	}
2637		2489
2638	/* teleport defeated player to new destination */	2490	/* teleport defeated player to new destination */
2639	transfer_ob (op, x, y, 0, NULL);	2491	transfer_ob (op, x, y, 0, NULL);
2640	op->contr->braced = 0;	2492	op->contr->braced = 0;
		2493
		2494	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2641	return;	2495	return;
2642	}	2496	}
2643		2497
		2498	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2499	deathtab << "T<YOU HAVE DIED>\n\n";
		2500
2644	INVOKE_PLAYER (DEATH, op->contr);	2501	INVOKE_PLAYER (DEATH, op->contr);
2645		2502
2646	command_kill_pets (op, 0);	2503	command_kill_pets (op, 0);
2647
2648	if (op->stats.food < 0)
2649	{
2650	op->contr->killer = archetype::get ("killer_starvation");
2651	op->contr->killer->destroy ();
2652	}
2653		2504
2654	op->contr->play_sound (sound_find ("player_dies"));	2505	op->contr->play_sound (sound_find ("player_dies"));
2655		2506
2656	/* save the map location for corpse, gravestone */	2507	/* save the map location for corpse, gravestone */
2657	x = op->x;	2508	x = op->x;
…		…
2687		2538
2688	lost_a_stat = 0;	2539	lost_a_stat = 0;
2689		2540
2690	for (z = 0; z < num_stats_lose; z++)	2541	for (z = 0; z < num_stats_lose; z++)
2691	{	2542	{
2692	i = RANDOM () % NUM_STATS;	2543	i = rndm (NUM_STATS);
2693		2544
2694	if (settings.stat_loss_on_death)	2545	if (settings.stat_loss_on_death)
2695	{	2546	{
2696	/* Pick a random stat and take a point off it. Tell the player	2547	/* Pick a random stat and take a point off it. Tell the player
2697	* what he lost.	2548	* what he lost.
…		…
2704	lost_a_stat = 1;	2555	lost_a_stat = 1;
2705	}	2556	}
2706	else	2557	else
2707	{	2558	{
2708	/* deplete a stat */	2559	/* deplete a stat */
2709	archetype *deparch = archetype::find ("depletion");	2560	archetype *deparch = archetype::find (shstr_depletion);
2710	object *dep;	2561	object *dep;
2711		2562
2712	dep = present_arch_in_ob (deparch, op);	2563	dep = present_arch_in_ob (deparch, op);
2713	if (!dep)	2564	if (!dep)
2714	{	2565	{
…		…
2748	}	2599	}
2749	}	2600	}
2750		2601
2751	if (lose_this_stat)	2602	if (lose_this_stat)
2752	{	2603	{
2753	this_stat = get_attr_value (&(dep->stats), i);	2604	this_stat = get_attr_value (&dep->stats, i);
2754	/* We could try to do something clever like find another	2605	/* We could try to do something clever like find another
2755	* stat to reduce if this fails. But chances are, if	2606	* stat to reduce if this fails. But chances are, if
2756	* stats have been depleted to -50, all are pretty low	2607	* stats have been depleted to -50, all are pretty low
2757	* and should be roughly the same, so it shouldn't make a	2608	* and should be roughly the same, so it shouldn't make a
2758	* difference.	2609	* difference.
…		…
2772	/* If no stat lost, tell the player. */	2623	/* If no stat lost, tell the player. */
2773	if (!lost_a_stat)	2624	if (!lost_a_stat)
2774	{	2625	{
2775	/* determine_god() seems to not work sometimes... why is this?	2626	/* determine_god() seems to not work sometimes... why is this?
2776	Should I be using something else? GD */	2627	Should I be using something else? GD */
2777	const char *god = determine_god (op);	2628	shstr_tmp god = determine_god (op);
2778		2629
2779	if (god && (strcmp (god, "none")))	2630	if (god != shstr_none)
2780	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2631	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2781	else	2632	else
2782	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2633	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2783	}	2634	}
2784	#else	2635	#else
2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2636	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2786	#endif	2637	#endif
2787		2638
2788	/* Put a gravestone up where the character 'almost' died. List the	2639	/* Put a gravestone up where the character 'almost' died. List the
2789	* exp loss on the stone.	2640	* exp loss on the stone.
2790	*/	2641	*/
2791	tmp = arch_to_object (archetype::find ("gravestone"));	2642	tmp = arch_to_object (archetype::find (shstr_gravestone));
2792	tmp->name = format ("%s's gravestone", &op->name);	2643	tmp->name = format ("%s's gravestone", &op->name);
2793	tmp->name_pl = format ("%s's gravestones", &op->name);	2644	tmp->name_pl = format ("%s's gravestones", &op->name);
2794	tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());	2645	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
		2646	&op->name, op->contr->title, op->contr->killer_name ());
2795	tmp->x = op->x, tmp->y = op->y;	2647	tmp->x = op->x, tmp->y = op->y;
2796	insert_ob_in_map (tmp, op->map, NULL, 0);	2648	insert_ob_in_map (tmp, op->map, NULL, 0);
2797		2649
2798	/**************************************/	2650	/**************************************/
2799	/* */	2651	/* */
2800	/* Subtract the experience points, */	2652	/* Subtract the experience points, */
2801	/* if we died cause of food, give us */
2802	/* food, and reset HP's... */
2803	/* */	2653	/* */
2804	/**************************************/	2654	/**************************************/
2805		2655
2806	/* remove any poisoning and confusion the character may be suffering. */
2807	/* restore player */
2808	at = archetype::find ("poisoning");
2809	tmp = present_arch_in_ob (at, op);
2810
2811	if (tmp)
2812	{
2813	tmp->destroy ();
2814	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2815	}
2816
2817	at = archetype::find ("confusion");
2818	tmp = present_arch_in_ob (at, op);
2819	if (tmp)
2820	{
2821	tmp->destroy ();
2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2823	}
2824
2825	cure_disease (op, 0, 0); /* remove any disease */
2826
2827	// remove all spell effects that are active
2828	// to avoid long-term effects such as word-of-recall
2829	for (object *item = op->inv; item; )
2830	{
2831	object *next = item->below;
2832
2833	if (item->type == SPELL_EFFECT && item->active)
2834	item->destroy ();
2835
2836	item = next;
2837	}
2838
2839	/*add_exp(op, (op->stats.exp * -0.20)); */	2656	/*add_exp(op, (op->stats.exp * -0.20)); */
2840	apply_death_exp_penalty (op);	2657	apply_death_exp_penalty (op);
2841
2842	if (op->stats.food < 100)
2843	op->stats.food = 900;
2844
2845	op->stats.hp = op->stats.maxhp;
2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2848		2658
2849	/*	2659	/*
2850	* Check to see if the player has any unpaid items. If so, remove them	2660	* Check to see if the player has any unpaid items. If so, remove them
2851	* and put them back in the map.	2661	* and put them back in the map.
2852	*/	2662	*/
…		…
2887	if (will_kill_again & (1 << at))	2697	if (will_kill_again & (1 << at))
2888	force->resist[at] = 100;	2698	force->resist[at] = 100;
2889		2699
2890	insert_ob_in_ob (force, op);	2700	insert_ob_in_ob (force, op);
2891	op->update_stats ();	2701	op->update_stats ();
2892
2893	}	2702	}
2894		2703
2895	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2704	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2896	}	2705	}
2897		2706
2898	void	2707	static void
2899	loot_object (object *op)	2708	loot_object (object *op)
2900	{ /* Grab and destroy some treasure */	2709	{ /* Grab and destroy some treasure */
2901	object *tmp, *tmp2, *next;	2710	object *tmp, *tmp2, *next;
2902		2711
2903	op->close_container (); /* close open sack first */	2712	op->close_container (); /* close open sack first */
…		…
2998	}	2807	}
2999		2808
3000	void	2809	void
3001	make_visible (object *op)	2810	make_visible (object *op)
3002	{	2811	{
3003	op->hide = 0;	2812	op->flag [FLAG_HIDDEN] = 0;
3004	op->invisible = 0;	2813	op->invisible = 0;
3005		2814
3006	if (op->type == PLAYER)	2815	if (op->type == PLAYER)
3007	{	2816	{
3008	op->contr->tmp_invis = 0;	2817	op->contr->tmp_invis = 0;
…		…
3033		2842
3034	if (!ob || !ob->map)	2843	if (!ob || !ob->map)
3035	return 0;	2844	return 0;
3036		2845
3037	/* so, on normal lighted maps, its hard to hide */	2846	/* so, on normal lighted maps, its hard to hide */
3038	level = ob->map->darkness - 2;	2847	level = ob->map->darklevel () - 2;
3039		2848
3040	/* this also picks up whether the object is glowing.	2849	/* this also picks up whether the object is glowing.
3041	* If you carry a light on a non-dark map, its not	2850	* If you carry a light on a non-dark map, its not
3042	* as bad as carrying a light on a pitch dark map */	2851	* as bad as carrying a light on a pitch dark map */
3043	if (has_carried_lights (ob))	2852	if (ob->has_carried_lights ())
3044	level = -(10 + (2 * ob->map->darkness));	2853	level = -(10 + (2 * ob->map->darklevel ()));
3045		2854
3046	/* scan through all nearby squares for terrain to hide in */	2855	/* scan through all nearby squares for terrain to hide in */
3047	for (i = 0, x = ob->x, y = ob->y;	2856	for (i = 0, x = ob->x, y = ob->y;
3048	i <= SIZEOFFREE1;	2857	i <= SIZEOFFREE1;
3049	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2858	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3196	while (op)	3005	while (op)
3197	{	3006	{
3198	dx = rv.distance_x + op->arch->x;	3007	dx = rv.distance_x + op->arch->x;
3199	dy = rv.distance_y + op->arch->y;	3008	dy = rv.distance_y + op->arch->y;
3200		3009
3201	/* only the viewable area the player sees is updated by LOS	3010	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3202	* code, so we need to restrict ourselves to that range of values
3203	* for any meaningful values.
3204	*/
3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3207	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3208	return 1;	3011	return 1;
3209		3012
3210	op = op->more;	3013	op = op->more;
3211	}
3212
3213	return 0;
3214	}
3215
3216	/* routine for both players and monsters. We call this when
3217	* there is a possibility for our action distrubing our hiding
3218	* place or invisiblity spell. Artefact invisiblity is not
3219	* effected by this. If we arent invisible to begin with, we
3220	* return 0.
3221	*/
3222	int
3223	action_makes_visible (object *op)
3224	{
3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3226	{
3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3228	return 0;
3229
3230	if (op->contr && op->contr->tmp_invis == 0)
3231	return 0;
3232
3233	/* If monsters, they should become visible */
3234	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3235	{
3236	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3237	return 1;
3238	}
3239	}	3014	}
3240		3015
3241	return 0;	3016	return 0;
3242	}	3017	}
3243		3018
…		…
3468		3243
3469	if (pl->ranged_ob == ob)	3244	if (pl->ranged_ob == ob)
3470	pl->ranged_ob = 0;	3245	pl->ranged_ob = 0;
3471	}	3246	}
3472		3247
		3248	//-GPL
		3249
3473	sint8	3250	sint8
3474	player::visibility_at (maptile *map, int x, int y) const	3251	player::darkness_at (maptile *map, int x, int y) const
3475	{	3252	{
3476	if (!ns)	3253	if (!ns)
3477	return 0;	3254	return LOS_BLOCKED;
3478		3255
3479	int dx, dy;	3256	int dx, dy;
3480	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3257	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3481	return 0;	3258	return LOS_BLOCKED;
3482		3259
3483	x += dx - ns->current_x + ns->mapx / 2;	3260	x += dx - ns->current_x;
3484	y += dy - ns->current_y + ns->mapy / 2;	3261	y += dy - ns->current_y;
3485		3262
3486	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3487	return 0;
3488
3489	return 100 - blocked_los [x][y];	3263	return blocked_los (x, y);
3490	}	3264	}
3491		3265
3492	void	3266	void
3493	player::infobox (const char *title, const char *msg, int color)	3267	player::infobox (const char *title, const char *msg, int color)
3494	{	3268	{

Diff Legend

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