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

Diff Legend

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