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

Diff Legend

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