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.255 by root, Fri Mar 26 00:53:26 2010 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		111
226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
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 (ob->is_dragon ())
232	{	116	{
233	object *tmp, *abil = 0, *skin = 0;	117	object *tmp, *abil = 0, *skin = 0;
234		118
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	119	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	120	if (tmp->type == FORCE)
…		…
250		134
251	ns->floorbox_update ();	135	ns->floorbox_update ();
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 ();
256
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);
263	}
264
265	void
266	player::disconnect ()
267	{
268	if (ob)
269	{
270	ob->close_container (); //TODO: client-specific
271	ob->drop_unpaid_items ();
272	}
273
274	if (ns)
275	{
276	if (active)
277	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
278
279	INVOKE_PLAYER (DISCONNECT, this);
280
281	ns->reset_stats ();
282	ns->pl = 0;
283	ns = 0;
284	}
285
286	observe = ob;
287
288	deactivate ();
289	}
290
291	// the need for this function can be explained
292	// by load_object not returning the object
293	void
294	player::set_object (object *op)
295	{
296	ob = observe = op;
297	ob->contr = this; /* this aren't yet in archetype */
298
299	ob->speed = 1.0f;
300	ob->speed_left = 0.5f;
301
302	ob->direction = 5; /* So player faces south */
303
304	ob->flag [FLAG_READY_WEAPON] = false;	139	ob->flag [FLAG_READY_WEAPON] = false;
305	ob->flag [FLAG_READY_SKILL] = false;	140	ob->flag [FLAG_READY_SKILL] = false;
306	ob->flag [FLAG_READY_BOW] = false;	141	ob->flag [FLAG_READY_BOW] = false;
307		142
308	for (object *op = ob->inv; op; op = op->below)	143	for (object *op = ob->inv; op; op = op->below)
309	if (op->flag [FLAG_APPLIED])	144	if (op->flag [FLAG_APPLIED])
310	switch (op->type)	145	switch (op->type)
311	{	146	{
312	case SKILL:	147	case SKILL:
313	ob->flag [FLAG_APPLIED] = false;	148	op->flag [FLAG_APPLIED] = false;
314	break;	149	break;
315		150
316	case WAND:	151	case WAND:
317	case ROD:	152	case ROD:
318	case HORN:	153	case HORN:
…		…
323	case WEAPON:	158	case WEAPON:
324	combat_ob = op;	159	combat_ob = op;
325	break;	160	break;
326	}	161	}
327		162
		163	ob->current_weapon = 0;
328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	164	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329	ob->deactivate (); // change_weapon activates, fix this better	165	activate (); // change_weapon also activates, but this doesn't hurt
		166
		167	INVOKE_PLAYER (CONNECT, this);
		168	INVOKE_PLAYER (LOGIN, this);
		169	}
		170
		171	void
		172	player::disconnect ()
		173	{
		174	if (ob)
		175	{
		176	ob->close_container (); //TODO: client-specific
		177	ob->drop_unpaid_items ();
		178	}
		179
		180	if (ns)
		181	{
		182	if (active)
		183	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		184
		185	INVOKE_PLAYER (DISCONNECT, this);
		186
		187	ns->reset_stats ();
		188	ns->pl = 0;
		189	ns = 0;
		190	}
		191
		192	// this is important for the player scheduler to get the correct refcount
		193	// when ns = 0
		194	observe = viewpoint = ob;
		195
		196	deactivate ();
		197	}
		198
		199	//-GPL
		200
		201	// the need for this function can be explained
		202	// by load_object not returning the object
		203	void
		204	player::set_object (object *op)
		205	{
		206	ob = observe = viewpoint = op;
		207	ob->contr = this; /* this aren't yet in archetype */
		208
		209	ob->speed = 1.0f;
		210	ob->speed_left = 0.5f;
		211
		212	ob->direction = 5; /* So player faces south */
330	}	213	}
331		214
332	void	215	void
333	player::set_observe (object *op)	216	player::set_observe (object *op)
334	{	217	{
335	observe = op ? op : ob;	218	observe = viewpoint = op ? op : ob;
336	do_los = 1;	219	do_los = 1;
337	}	220	}
		221
		222	void
		223	player::set_viewpoint (object *op)
		224	{
		225	viewpoint = op ? op : (object *)observe;
		226	do_los = 1;
		227	}
		228
		229	//+GPL
338		230
339	player::player ()	231	player::player ()
340	{	232	{
341	/* There are some elements we want initialised to non zero value -	233	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	234	* we deal with that below this point.
…		…
366	attachable::do_destroy ();	258	attachable::do_destroy ();
367		259
368	if (ob)	260	if (ob)
369	{	261	{
370	ob->destroy_inv (false);	262	ob->destroy_inv (false);
371	ob->destroy (true);	263	ob->destroy ();
372	}	264	}
373		265
374	ob = observe = 0;	266	ob = observe = viewpoint = 0;
375	}	267	}
376		268
377	player::~player ()	269	player::~player ()
378	{	270	{
379	/* Clear item stack */	271	/* Clear item stack */
380	free (stack_items);	272	free (stack_items);
		273	}
		274
		275	/*
		276	* get_player_archetype() return next player archetype from archetype
		277	* list. Not very efficient routine, but used only creating new players.
		278	* Note: there MUST be at least one player archetype!
		279	*/
		280	static archetype *
		281	get_player_archetype (archetype *at)
		282	{
		283	// archetypes could have been reloaded
		284	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		285
		286	if (!nat)
		287	return at;
		288
		289	archvec::iterator i = archetypes.find (nat);
		290
		291	for (;;)
		292	{
		293	if (++i == archetypes.end ())
		294	i = archetypes.begin ();
		295	else if (*i == at)
		296	cleanup ("not a single player archetype found");
		297
		298	if ((*i)->type == PLAYER)
		299	return *i;
		300	}
381	}	301	}
382		302
383	/* Tries to add player on the connection passed in ns.	303	/* 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	304	* All we can really get in this is some settings like host and display
385	* mode.	305	* mode.
…		…
387	player *	307	player *
388	player::create ()	308	player::create ()
389	{	309	{
390	player *pl = new player;	310	player *pl = new player;
391		311
392	pl->set_object (arch_to_object (get_player_archetype (0)));	312	pl->set_object (get_player_archetype (0)->instance ());
393		313
394	pl->ob->roll_stats ();	314	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	315	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	316	pl->ob->run_away = 25; /* Then we panick... */
397		317
398	set_first_map (pl->ob);	318	set_first_map (pl->ob);
399		319
400	return pl;	320	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	}	321	}
430		322
431	object *	323	object *
432	get_nearest_player (object *mon)	324	get_nearest_player (object *mon)
433	{	325	{
…		…
668	|| op->type == CLOAK || op->type == HELMET	560	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	561	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	562	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	563	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
672	{	564	{
673	op->destroy (true);	565	op->destroy ();
674	continue;	566	continue;
675	}	567	}
676	}	568	}
677		569
678	/* This really needs to be better - we should really give	570	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	571	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	572	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	573	*/
684	if (op->type == SPELLBOOK || op->type == SKILL)	574	if (op->type == SKILL)
685	{	575	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	576	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	577	if (tmp->type == op->type && tmp->name == op->name)
		578	{
		579	op->destroy ();
		580	LOG (llevError,
		581	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
690	break;	582	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	}	583	}
698		584
699	if (op->nrof > 1)	585	if (op->nrof > 1)
700	op->nrof = 1;	586	op->nrof = 1;
701	}	587	}
702		588
…		…
714	CLEAR_FLAG (op, FLAG_DAMNED);	600	CLEAR_FLAG (op, FLAG_DAMNED);
715	}	601	}
716		602
717	if (op->type == SPELL)	603	if (op->type == SPELL)
718	{	604	{
719	op->destroy (true);	605	op->destroy ();
720	continue;	606	continue;
721	}	607	}
722	else if (op->type == SKILL)	608	else if (op->type == SKILL)
723	{	609	{
724	SET_FLAG (op, FLAG_CAN_USE_SKILL);	610	SET_FLAG (op, FLAG_CAN_USE_SKILL);
…		…
748	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	634	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
749	}	635	}
750		636
751	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	637	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
752	static int	638	static int
753	roll_stat (void)	639	roll_stat ()
754	{	640	{
755	int a[4], i, j, k;	641	int a[4], i, j, k;
756		642
757	for (i = 0; i < 4; i++)	643	for (i = 0; i < 4; i++)
758	a[i] = (int) rndm (6) + 1;	644	a[i] = (int) rndm (6) + 1;
…		…
855	player::chargen_race_done ()	741	player::chargen_race_done ()
856	{	742	{
857	/* this must before then initial items are given */	743	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	744	esrv_new_player (ob->contr);
859		745
860	treasurelist *tl = treasurelist::find ("starting_wealth");	746	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	747	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	748	create_treasure (tl, ob, 0, 0, 0);
863		749
864	INVOKE_PLAYER (BIRTH, ob->contr);	750	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);	751	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
918	ob->stats.hp = ob->stats.maxhp;	804	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	805	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	806	ob->stats.grace = 0;
921	}	807	}
922		808
923	void	809	static void
924	flee_player (object *op)	810	flee_player (object *op)
925	{	811	{
926	int dir, diff;	812	int dir, diff;
927	rv_vector rv;	813	rv_vector rv;
928		814
…		…
931	LOG (llevDebug, "Fleeing player is dead.\n");	817	LOG (llevDebug, "Fleeing player is dead.\n");
932	CLEAR_FLAG (op, FLAG_SCARED);	818	CLEAR_FLAG (op, FLAG_SCARED);
933	return;	819	return;
934	}	820	}
935		821
936	if (op->enemy == NULL)	822	if (!op->enemy)
937	{	823	{
938	LOG (llevDebug, "Fleeing player had no enemy.\n");	824	LOG (llevDebug, "Fleeing player had no enemy.\n");
939	CLEAR_FLAG (op, FLAG_SCARED);	825	CLEAR_FLAG (op, FLAG_SCARED);
940	return;	826	return;
941	}	827	}
942		828
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))	829	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
955	{	830	{
956	op->enemy = NULL;	831	op->enemy = NULL;
957	CLEAR_FLAG (op, FLAG_SCARED);	832	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	833	return;
…		…
961	get_rangevector (op, op->enemy, &rv, 0);	836	get_rangevector (op, op->enemy, &rv, 0);
962		837
963	dir = absdir (4 + rv.direction);	838	dir = absdir (4 + rv.direction);
964	for (diff = 0; diff < 3; diff++)	839	for (diff = 0; diff < 3; diff++)
965	{	840	{
966	int m = 1 - (RANDOM () & 2);	841	int m = 1 - rndm (2) * 2;
967		842
968	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	843	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
969	return;	844	return;
970	}	845	}
971		846
972	/* Cornered, get rid of scared */	847	/* Cornered, get rid of scared */
973	CLEAR_FLAG (op, FLAG_SCARED);	848	CLEAR_FLAG (op, FLAG_SCARED);
…		…
982	check_pick (object *op)	857	check_pick (object *op)
983	{	858	{
984	object *tmp, *next;	859	object *tmp, *next;
985	int stop = 0;	860	int stop = 0;
986	int wvratio;	861	int wvratio;
987	char putstring[128];
988		862
989	/* if you're flying, you cna't pick up anything */	863	/* if you're flying, you cna't pick up anything */
990	if (op->move_type & MOVE_FLYING)	864	if (op->move_type & MOVE_FLYING)
991	return 1;	865	return 1;
992		866
993	next = op->below;	867	next = op->below;
994		868
995	int cnt = MAX_ITEM_PER_DROP;	869	int cnt = MAX_ITEM_PER_ACTION;
996	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	870	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
997		871
998	/* loop while there are items on the floor that are not marked as	872	/* loop while there are items on the floor that are not marked as
999	* destroyed */	873	* destroyed */
1000	while (next && !next->destroyed ())	874	while (next && !next->destroyed ())
…		…
1016		890
1017	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	891	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1018	{	892	{
1019	if (item_matched_string (op, tmp, op->contr->search_str))	893	if (item_matched_string (op, tmp, op->contr->search_str))
1020	CHK_PICK_PICKUP;	894	CHK_PICK_PICKUP;
		895
1021	continue;	896	continue;
1022	}	897	}
1023		898
1024	/* high not bit set? We're using the old autopickup model */	899	/* pickup handling */
		900	if (op->contr->mode & PU_DEBUG)
		901	{
		902	/* some debugging code to figure out item information */
		903	const char *str = tmp->name
		904	? format ("item name: %s item type: %d weight/value: %d",
		905	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		906	: format ("item name: %s item type: %d weight/value: %d",
		907	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		908
		909	new_draw_info (NDI_UNIQUE, 0, op, str);
		910	}
		911
		912	if (op->contr->mode & PU_INHIBIT)
		913	return 1;
		914
		915	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		916	return 1;
		917
		918	/* philosophy:
		919	* It's easy to grab an item type from a pile, as long as it's
		920	* generic. This takes no game-time. For more detailed pickups
		921	* and selections, select-items should be used. This is a
		922	* grab-as-you-run type mode that's really useful for arrows for
		923	* example.
		924	* The drawback: right now it has no frontend, so you need to
		925	* stick the bits you want into a calculator in hex mode and then
		926	* convert to decimal and then 'pickup <#>
		927	*/
		928
		929	/* the first two modes are exclusive: if NOTHING we return, if
		930	* STOP then we stop. All the rest are applied sequentially,
		931	* meaning if any test passes, the item gets picked up. */
		932
		933	/* if mode is set to pick nothing up, return */
		934	if (op->contr->mode == PU_NOTHING)
		935	return 1;
		936
		937	/* if mode is set to stop when encountering objects, return */
		938	/* take STOP before INHIBIT since it doesn't actually pick
		939	* anything up */
		940	if (op->contr->mode & PU_STOP)
		941	return 0;
		942
		943	/* useful for going into stores and not losing your settings... */
		944	/* and for battles wher you don't want to get loaded down while
		945	* fighting */
		946	if (op->contr->mode & PU_INHIBIT)
		947	return 1;
		948
		949	/* prevent us from turning into auto-thieves :) */
		950	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		951	continue;
		952
		953	/* ignore known cursed objects */
		954	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		955	continue;
		956
		957	/* all food and drink if desired */
		958	/* question: don't pick up known-poisonous stuff? */
1025	if (!(op->contr->mode & PU_NEWMODE))	959	if (op->contr->mode & PU_FOOD)
		960	if (tmp->type == FOOD)
1026	{	961	{
1027	switch (op->contr->mode)	962	CHK_PICK_PICKUP;
		963	continue;
		964	}
		965
		966	if (op->contr->mode & PU_DRINK)
		967	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		968	{
		969	CHK_PICK_PICKUP;
		970	continue;
		971	}
		972
		973	if (op->contr->mode & PU_POTION)
		974	if (tmp->type == POTION)
		975	{
		976	CHK_PICK_PICKUP;
		977	continue;
		978	}
		979
		980	/* spellbooks, skillscrolls and normal books/scrolls */
		981	if (op->contr->mode & PU_SPELLBOOK)
		982	if (tmp->type == SPELLBOOK)
		983	{
		984	CHK_PICK_PICKUP;
		985	continue;
		986	}
		987
		988	if (op->contr->mode & PU_SKILLSCROLL)
		989	if (tmp->type == SKILLSCROLL)
		990	{
		991	CHK_PICK_PICKUP;
		992	continue;
		993	}
		994
		995	if (op->contr->mode & PU_READABLES)
		996	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		997	{
		998	CHK_PICK_PICKUP;
		999	continue;
		1000	}
		1001
		1002	/* wands/staves/rods/horns */
		1003	if (op->contr->mode & PU_MAGIC_DEVICE)
		1004	if (tmp->type == WAND
		1005	|| tmp->type == ROD
		1006	|| tmp->type == HORN
		1007	|| tmp->type == POWER_CRYSTAL)
		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)
		1016	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1017	{
		1018	CHK_PICK_PICKUP;
		1019	continue;
		1020	}
		1021
		1022	if (op->contr->mode & PU_VALUABLES)
		1023	{
		1024	if (tmp->type == MONEY || tmp->type == GEM)
1028	{	1025	{
1029	case 0:
1030	return 1; /* don't pick up */
1031	case 1:
1032	CHK_PICK_PICKUP;	1026	CHK_PICK_PICKUP;
1033	return 1;	1027	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	}	1028	}
1063	}	1029	}
1064	else	1030
1065	{ /* old model */	1031	/* rings & amulets - talismans seems to be typed AMULET */
1066	/* NEW pickup handling */
1067	if (op->contr->mode & PU_DEBUG)	1032	if (op->contr->mode & PU_JEWELS)
		1033	if (tmp->type == RING
		1034	|| tmp->type == AMULET
		1035	|| tmp->type == GIRDLE
		1036	|| tmp->type == SKILL_TOOL)
1068	{	1037	{
1069	/* some debugging code to figure out item information */	1038	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;	1039	continue;
		1040	}
1116		1041
1117	/* ignore known cursed objects */	1042	/* we don't forget dragon food */
1118	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1043	if (op->contr->mode & PU_FLESH)
		1044	if (tmp->type == FLESH)
		1045	{
		1046	CHK_PICK_PICKUP;
1119	continue;	1047	continue;
		1048	}
1120		1049
1121	/* all food and drink if desired */	1050	/* bows and arrows. Bows are good for selling! */
1122	/* question: don't pick up known-poisonous stuff? */	1051	if (op->contr->mode & PU_BOW)
		1052	if (tmp->type == BOW)
		1053	{
		1054	CHK_PICK_PICKUP;
		1055	continue;
		1056	}
		1057
		1058	if (op->contr->mode & PU_ARROW)
		1059	if (tmp->type == ARROW)
		1060	{
		1061	CHK_PICK_PICKUP;
		1062	continue;
		1063	}
		1064
		1065	/* all kinds of armor etc. */
		1066	if (op->contr->mode & PU_ARMOUR)
		1067	if (tmp->type == ARMOUR)
		1068	{
		1069	CHK_PICK_PICKUP;
		1070	continue;
		1071	}
		1072
		1073	if (op->contr->mode & PU_HELMET)
		1074	if (tmp->type == HELMET)
		1075	{
		1076	CHK_PICK_PICKUP;
		1077	continue;
		1078	}
		1079
		1080	if (op->contr->mode & PU_SHIELD)
		1081	if (tmp->type == SHIELD)
		1082	{
		1083	CHK_PICK_PICKUP;
		1084	continue;
		1085	}
		1086
1123	if (op->contr->mode & PU_FOOD)	1087	if (op->contr->mode & PU_BOOTS)
1124	if (tmp->type == FOOD)	1088	if (tmp->type == BOOTS)
		1089	{
		1090	CHK_PICK_PICKUP;
		1091	continue;
		1092	}
		1093
		1094	if (op->contr->mode & PU_GLOVES)
		1095	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1096	{
		1097	CHK_PICK_PICKUP;
		1098	continue;
		1099	}
		1100
		1101	if (op->contr->mode & PU_CLOAK)
		1102	if (tmp->type == CLOAK)
		1103	{
		1104	CHK_PICK_PICKUP;
		1105	continue;
		1106	}
		1107
		1108	/* hoping to catch throwing daggers here */
		1109	if (op->contr->mode & PU_MISSILEWEAPON)
		1110	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1111	{
		1112	CHK_PICK_PICKUP;
		1113	continue;
		1114	}
		1115
		1116	/* careful: chairs and tables are weapons! */
		1117	if (op->contr->mode & PU_ALLWEAPON)
		1118	{
		1119	if (tmp->type == WEAPON)
		1120	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1125	{	1121	{
1126	CHK_PICK_PICKUP;	1122	CHK_PICK_PICKUP;
1127	continue;	1123	continue;
1128	}	1124	}
		1125	}
1129		1126
		1127	/* misc stuff that's useful */
1130	if (op->contr->mode & PU_DRINK)	1128	if (op->contr->mode & PU_KEY)
1131	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1129	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1132	{	1130	{
1133	CHK_PICK_PICKUP;	1131	CHK_PICK_PICKUP;
1134	continue;	1132	continue;
1135	}	1133	}
1136		1134
		1135	/* any of the last 4 bits set means we use the ratio for value
		1136	* pickups */
1137	if (op->contr->mode & PU_POTION)	1137	if (op->contr->mode & PU_RATIO)
1138	if (tmp->type == POTION)	1138	{
		1139	/* use value density to decide what else to grab */
		1140	/* >=7 was >= op->contr->mode */
		1141	/* >=7 is the old standard setting. Now we take the last 4 bits
1139	{	1142	*/
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)	1143	wvratio = op->contr->mode & PU_RATIO;
1176	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1144	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	{	1145	{
1184	if (tmp->type == MONEY || tmp->type == GEM)	1146	#if 0
		1147	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1148	if (tmp->name != NULL)
1185	{	1149	{
1186	CHK_PICK_PICKUP;	1150	fprintf (stderr, "%s", tmp->name);
1187	continue;
1188	}	1151	}
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	1152	else
1323	fprintf (stderr, "%s", tmp->arch->archname);	1153	fprintf (stderr, "%s", tmp->arch->archname);
1324	fprintf (stderr, ",%d] = ", tmp->type);	1154	fprintf (stderr, ",%d] = ", tmp->type);
1325	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1155	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1326	#endif	1156	#endif
		1157	CHK_PICK_PICKUP;
1327	continue;	1158	continue;
1328	}
1329	}	1159	}
1330	} /* the new pickup model */	1160	} /* the new pickup model */
1331	}	1161	}
1332		1162
1333	return !stop;	1163	return !stop;
		1164	}
		1165
		1166	/* routine for both players and monsters. We call this when
		1167	* there is a possibility for our action distrubing our hiding
		1168	* place or invisiblity spell. Artefact invisiblity causes
		1169	* "noise" instead. If we arent invisible to begin with, we
		1170	* return 0.
		1171	*/
		1172	static int
		1173	action_makes_visible (object *op)
		1174	{
		1175	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1176	{
		1177	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1178	{
		1179	// artefact invisibility is permanent, but we still make noise
		1180	// this is important for game-balance.
		1181	if (op->contr)
		1182	op->make_noise ();
		1183
		1184	return 0;
		1185	}
		1186
		1187	if (op->contr && op->contr->tmp_invis == 0)
		1188	return 0;
		1189
		1190	/* If monsters, they should become visible */
		1191	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1192	{
		1193	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1194	return 1;
		1195	}
		1196	}
		1197
		1198	return 0;
1334	}	1199	}
1335		1200
1336	/*	1201	/*
1337	* Find an arrow in the inventory and after that	1202	* Find an arrow in the inventory and after that
1338	* in the right type container (quiver). Pointer to the	1203	* in the right type container (quiver). Pointer to the
1339	* found object is returned.	1204	* found object is returned.
1340	*/	1205	*/
1341	object *	1206	static object *
1342	find_arrow (object *op, const char *type)	1207	find_arrow (object *op, const char *type)
1343	{	1208	{
1344	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1209	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1345	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1210	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1346	return splay (tmp);	1211	return splay (tmp);
…		…
1360	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1225	* 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	1226	* 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	1227	* 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.	1228	* the hall. Failing that it does it's best to pick the highest plus arrow.
1364	*/	1229	*/
1365	object *	1230	static object *
1366	find_better_arrow (object *op, object *target, const char *type, int *better)	1231	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1367	{	1232	{
1368	object *tmp = NULL, *arrow, *ntmp;	1233	object *tmp = NULL, *arrow, *ntmp;
1369	int attacknum, attacktype, betterby = 0, i;	1234	int attacknum, attacktype, betterby = 0, i;
1370		1235
1371	if (!type)	1236	if (!type)
…		…
1375	{	1240	{
1376	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1241	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1377	{	1242	{
1378	i = 0;	1243	i = 0;
1379	ntmp = find_better_arrow (arrow, target, type, &i);	1244	ntmp = find_better_arrow (arrow, target, type, &i);
		1245
1380	if (i > betterby)	1246	if (i > betterby)
1381	{	1247	{
1382	tmp = ntmp;	1248	tmp = ntmp;
1383	betterby = i;	1249	betterby = i;
1384	}	1250	}
1385	}	1251	}
1386	else if (arrow->type == ARROW && arrow->race == type)	1252	else if (arrow->type == ARROW && arrow->race == type)
1387	{	1253	{
1388	/* allways prefer assasination/slaying */	1254	/* allways prefer assasination/slaying */
1389	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1255	if (target->race && arrow->slaying.contains (target->race))
1390	{	1256	{
1391	if (arrow->attacktype & AT_DEATH)	1257	if (arrow->attacktype & AT_DEATH)
1392	{	1258	{
1393	*better = 100;	1259	*better = 100;
1394	return arrow;	1260	return arrow;
…		…
1409	{	1275	{
1410	tmp = arrow;	1276	tmp = arrow;
1411	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1277	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1412	}	1278	}
1413	}	1279	}
		1280
1414	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1281	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1415	{	1282	{
1416	tmp = arrow;	1283	tmp = arrow;
1417	betterby = 2 + arrow->magic + arrow->stats.dam;	1284	betterby = 2 + arrow->magic + arrow->stats.dam;
1418	}	1285	}
		1286
1419	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1287	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1420	{	1288	{
1421	tmp = arrow;	1289	tmp = arrow;
1422	betterby = 1 + arrow->magic + arrow->stats.dam;	1290	betterby = 1 + arrow->magic + arrow->stats.dam;
1423	}	1291	}
…		…
1436	* find_better_arrow to find a decent arrow to use.	1304	* find_better_arrow to find a decent arrow to use.
1437	* op = the shooter	1305	* op = the shooter
1438	* type = bow->race	1306	* type = bow->race
1439	* dir = fire direction	1307	* dir = fire direction
1440	*/	1308	*/
1441	object *	1309	static object *
1442	pick_arrow_target (object *op, const char *type, int dir)	1310	pick_arrow_target (object *op, shstr_cmp type, int dir)
1443	{	1311	{
1444	object *tmp = NULL;	1312	object *tmp = NULL;
1445	maptile *m;	1313	maptile *m;
1446	int i, mflags, found, number;	1314	int i, mflags, found, number;
1447	sint16 x, y;	1315	sint16 x, y;
…		…
1462	for (i = 0, found = 0; i < 20; i++)	1330	for (i = 0, found = 0; i < 20; i++)
1463	{	1331	{
1464	x += freearr_x[dir];	1332	x += freearr_x[dir];
1465	y += freearr_y[dir];	1333	y += freearr_y[dir];
1466	mflags = get_map_flags (m, &m, x, y, &x, &y);	1334	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1335
1467	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1336	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1468	{	1337	{
1469	tmp = NULL;	1338	tmp = 0;
1470	break;	1339	break;
1471	}	1340	}
1472	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1341	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1473	{	1342	{
1474	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1343	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1475	* perhaps a bad assumption.	1344	* perhaps a bad assumption.
1476	*/	1345	*/
1477	tmp = NULL;	1346	tmp = 0;
1478	break;	1347	break;
1479	}	1348	}
		1349
1480	if (mflags & P_IS_ALIVE)	1350	if (mflags & P_IS_ALIVE)
1481	{
1482	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1351	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1483	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1352	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1484	{
1485	found++;
1486	break;
1487	}
1488	if (found)
1489	break;	1353	break;
1490	}
1491	}	1354	}
1492	if (tmp == NULL)	1355
		1356	if (!tmp)
1493	return find_arrow (op, type);	1357	return find_arrow (op, type);
1494		1358
1495	if (tmp->head)	1359	if (tmp->head)
1496	tmp = tmp->head;	1360	tmp = tmp->head;
1497		1361
…		…
1537	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1401	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1538	return 0;	1402	return 0;
1539	}	1403	}
1540		1404
1541	// optimisation: move object to top so we will find it quickly again	1405	// optimisation: move object to top so we will find it quickly again
1542	if (bow->below)	1406	splay (bow);
1543	{
1544	bow->remove ();
1545	op->insert (bow);
1546	}
1547
1548	}	1407	}
1549		1408
1550	if (!bow->race || !bow->skill)	1409	if (!bow->race || !bow->skill)
1551	{	1410	{
1552	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1579		1438
1580	/* this should not happen, but sometimes does */	1439	/* this should not happen, but sometimes does */
1581	if (arrow->nrof == 0)	1440	if (arrow->nrof == 0)
1582	{	1441	{
1583	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());	1442	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1584	arrow->destroy (true);	1443	arrow->destroy ();
1585	return 0;	1444	return 0;
1586	}	1445	}
1587		1446
1588	left = arrow; /* these are arrows left to the player */	1447	left = arrow; /* these are arrows left to the player */
1589	arrow = arrow->split ();	1448	arrow = arrow->split ();
…		…
1598	arrow->direction = dir;	1457	arrow->direction = dir;
1599		1458
1600	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1459	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601	arrow->stats.hp = arrow->stats.dam;	1460	arrow->stats.hp = arrow->stats.dam;
1602	arrow->stats.grace = arrow->attacktype;	1461	arrow->stats.grace = arrow->attacktype;
1603		1462	arrow->custom_name = arrow->slaying;
1604	if (arrow->slaying)
1605	arrow->spellarg = strdup (arrow->slaying);
1606		1463
1607	#if 0	1464	#if 0
1608	if (player *pl = op->contr)	1465	if (player *pl = op->contr)
1609	{	1466	{
1610	float speed = pl->weapon_sp;	1467	float speed = pl->weapon_sp;
…		…
1672	* but monsters can't. Putting that code here	1529	* but monsters can't. Putting that code here
1673	* makes the fire_bow code much cleaner.	1530	* makes the fire_bow code much cleaner.
1674	* this function should only be called if 'op' is a player,	1531	* this function should only be called if 'op' is a player,
1675	* hence the function name.	1532	* hence the function name.
1676	*/	1533	*/
1677	int	1534	static int
1678	player_fire_bow (object *op, int dir)	1535	player_fire_bow (object *op, int dir)
1679	{	1536	{
1680	int ret = 0, wcmod = 0;	1537	int ret;
1681		1538
1682	if (op->contr->bowtype == bow_bestarrow)	1539	if (op->contr->bowtype == bow_bestarrow)
1683	{	1540	{
1684	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1541	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1685	}	1542	}
1686	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1543	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1687	{	1544	{
1688	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1545	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);	1546	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1692	}	1547	}
1693	else if (op->contr->bowtype == bow_threewide)	1548	else if (op->contr->bowtype == bow_threewide)
1694	{	1549	{
1695	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);
1696	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1551	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)]);	1552	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1698	}	1553	}
1699	else if (op->contr->bowtype == bow_spreadshot)	1554	else if (op->contr->bowtype == bow_spreadshot)
1700	{	1555	{
1701	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1556	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);	1557	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);	1558	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1704	}	1559	}
1705	else	1560	else
1706	{	1561	{
…		…
1712	}	1567	}
1713		1568
1714	/* Fires a misc (wand/rod/horn) object in 'dir'.	1569	/* Fires a misc (wand/rod/horn) object in 'dir'.
1715	* Broken apart from 'fire' to keep it more readable.	1570	* Broken apart from 'fire' to keep it more readable.
1716	*/	1571	*/
1717	void	1572	static void
1718	fire_misc_object (object *op, int dir)	1573	fire_misc_object (object *op, int dir)
1719	{	1574	{
1720	object *item = op->contr->ranged_ob;	1575	object *item = op->contr->ranged_ob;
1721		1576
1722	if (!item)	1577	if (!item)
…		…
1744	return;	1599	return;
1745	}	1600	}
1746	}	1601	}
1747	else if (item->type == ROD || item->type == HORN)	1602	else if (item->type == ROD || item->type == HORN)
1748	{	1603	{
1749	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1604	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1750		1605
1751	// using the maximum of the rods charge allows at least one spell cast	1606	// using the maximum of the rods charge allows at least one spell cast
1752	// for a rod or horn, this fixes some broken rods.	1607	// for a rod or horn, this fixes some broken rods.
1753	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1608	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1754	{	1609	{
1755	op->contr->play_sound (sound_find ("wand_poof"));	1610	op->contr->play_sound (sound_find ("wand_poof"));
1756		1611
1757	if (item->type == ROD)	1612	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));	1613	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1763	}	1618	}
1764	}	1619	}
1765		1620
1766	if (cast_spell (op, item, dir, item->inv, NULL))	1621	if (cast_spell (op, item, dir, item->inv, NULL))
1767	{	1622	{
1768	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1623	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1624
1769	if (item->type == WAND)	1625	if (item->type == WAND)
1770	{	1626	{
1771	if (!(--item->stats.food))	1627	if (!(--item->stats.food))
1772	{	1628	{
1773	object *tmp;	1629	object *tmp;
…		…
1793	bool	1649	bool
1794	fire (object *op, int dir)	1650	fire (object *op, int dir)
1795	{	1651	{
1796	int spellcost = 0;	1652	int spellcost = 0;
1797		1653
1798	/* check for loss of invisiblity/hide */
1799	if (action_makes_visible (op))
1800	make_visible (op);
1801
1802	player *pl = op->contr;	1654	player *pl = op->contr;
1803		1655
1804	if (pl->golem)	1656	if (pl->golem)
1805	{	1657	{
1806	control_golem (op->contr->golem, dir);	1658	control_golem (op->contr->golem, dir);
…		…
1808	}	1660	}
1809		1661
1810	object *ob = pl->ranged_ob;	1662	object *ob = pl->ranged_ob;
1811		1663
1812	if (!ob)	1664	if (!ob)
1813	return false;
1814
1815	if (!op->change_weapon (ob))
1816	return false;	1665	return false;
1817		1666
1818	if (op->speed_left > 0.f)	1667	if (op->speed_left > 0.f)
1819	--op->speed_left;	1668	--op->speed_left;
1820	else	1669	else
1821	return false;	1670	return false;
1822		1671
		1672	if (!op->change_weapon (ob))
		1673	return false;
		1674
		1675	/* check for loss of invisiblity/hide */
		1676	if (action_makes_visible (op))
		1677	make_visible (op);
		1678
1823	switch (ob->type)	1679	switch (ob->type)
1824	{	1680	{
1825	case BOW:	1681	case BOW:
1826	player_fire_bow (op, dir);	1682	player_fire_bow (op, dir);
1827	break;	1683	break;
1828		1684
1829	case SPELL:	1685	case SPELL:
1830	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1686	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1831	break;	1687	break;
1832		1688
1833	case BUILDER:	1689	case BUILDER:
1834	apply_map_builder (op, dir);	1690	apply_map_builder (op, dir);
1835	break;	1691	break;
…		…
1844	}	1700	}
1845		1701
1846	return true;	1702	return true;
1847	}	1703	}
1848		1704
1849	/* find_key	1705	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)	1706	find_key_ (object *pl, object *container, object *door)
1861	{	1707	{
1862	object *tmp, *key;	1708	object *tmp, *key;
1863		1709
1864	/* Should not happen, but sanity checking is never bad */	1710	/* Should not happen, but sanity checking is never bad */
1865	if (!container->inv)	1711	if (!container->inv)
…		…
1868	/* First, lets try to find a key in the top level inventory */	1714	/* First, lets try to find a key in the top level inventory */
1869	for (tmp = container->inv; tmp; tmp = tmp->below)	1715	for (tmp = container->inv; tmp; tmp = tmp->below)
1870	{	1716	{
1871	if (door->type == DOOR && tmp->type == KEY)	1717	if (door->type == DOOR && tmp->type == KEY)
1872	break;	1718	break;
		1719
1873	/* For sanity, we should really check door type, but other stuff	1720	/* For sanity, we should really check door type, but other stuff
1874	* (like containers) can be locked with special keys	1721	* (like containers) can be locked with special keys
1875	*/	1722	*/
1876	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1723	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1877	break;	1724	break;
…		…
1883	* a key, return	1730	* a key, return
1884	*/	1731	*/
1885	if (!tmp)	1732	if (!tmp)
1886	{	1733	{
1887	for (tmp = container->inv; tmp; tmp = tmp->below)	1734	for (tmp = container->inv; tmp; tmp = tmp->below)
1888	{
1889	/* No reason to search empty containers */	1735	/* No reason to search empty containers */
1890	if (tmp->type == CONTAINER && tmp->inv)	1736	if (tmp->type == CONTAINER && tmp->inv)
1891	{
1892	if ((key = find_key (pl, tmp, door)))	1737	if ((key = find_key_ (pl, tmp, door)))
1893	return key;	1738	return key;
1894	}
1895	}
1896		1739
1897	if (!tmp)	1740	if (!tmp)
1898	return NULL;	1741	return 0;
1899	}	1742	}
1900		1743
1901	/* We get down here if we have found a key. Now if its in a container,	1744	/* 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	1745	* see if we actually want to use it
1903	*/	1746	*/
1904	if (pl != container)	1747	if (pl != container)
1905	{	1748	{
1906	/* Only let players use keys in containers */	1749	/* Only let players use keys in containers */
1907	if (!pl->contr)	1750	if (!pl->contr)
1908	return NULL;	1751	return 0;
		1752
1909	/* cases where this fails:	1753	/* cases where this fails:
1910	* If we only search the player inventory, return now since we	1754	* If we only search the player inventory, return now since we
1911	* are not in the players inventory.	1755	* are not in the players inventory.
1912	* If the container is not active, return now since only active	1756	* If the container is not active, return now since only active
1913	* containers can be used.	1757	* containers can be used.
…		…
1917	* inv must have been an container and must have been active.	1761	* inv must have been an container and must have been active.
1918	*	1762	*
1919	* Change the color so that the message doesn't disappear with	1763	* Change the color so that the message doesn't disappear with
1920	* all the others.	1764	* all the others.
1921	*/	1765	*/
1922	if (pl->contr->usekeys == key_inventory ||	1766	if (pl->contr->usekeys == key_inventory
1923	!QUERY_FLAG (container, FLAG_APPLIED) ||	1767	|| !QUERY_FLAG (container, FLAG_APPLIED)
1924	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1768	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1925	{	1769	{
1926	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1770	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));	1771	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1928	return NULL;	1772	return NULL;
1929	}	1773	}
1930	}	1774	}
1931		1775
1932	return tmp;	1776	return tmp;
		1777	}
		1778
		1779	/* find_key
		1780	* We try to find a key for the door as passed. If we find a key
		1781	* and successfully use it, we return the key, otherwise NULL
		1782	* This function merges both normal and locked door, since the logic
		1783	* for both is the same - just the specific key is different.
		1784	* pl is the player,
		1785	* inv is the objects inventory to searched
		1786	* door is the door we are trying to match against.
		1787	* This function can be called recursively to search containers.
		1788	*/
		1789	object *
		1790	find_key (object *pl, object *container, object *door)
		1791	{
		1792	if (door->slaying && is_match_expr (door->slaying))
		1793	{
		1794	// for match expressions, we try to find the key by applying the match
		1795	// to the op itself, which is supposed to find the "key", instead
		1796	// of searching through containers ourselves.
		1797
		1798	return match_one (door->slaying, container, door, pl, pl);
		1799	}
		1800	else
		1801	return find_key_ (pl, container, door);
1933	}	1802	}
1934		1803
1935	/* moved door processing out of move_player_attack.	1804	/* moved door processing out of move_player_attack.
1936	* returns 1 if player has opened the door with a key	1805	* returns 1 if player has opened the door with a key
1937	* such that the caller should not do anything more,	1806	* such that the caller should not do anything more,
…		…
1987	* going to try and move (not fire weapons).	1856	* going to try and move (not fire weapons).
1988	*/	1857	*/
1989	bool	1858	bool
1990	move_player_attack (object *op, int dir)	1859	move_player_attack (object *op, int dir)
1991	{	1860	{
1992	int on_battleground;	1861	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1862	{
		1863	--op->speed_left;
		1864	return true;
		1865	}
1993		1866
1994	sint16 nx = freearr_x[dir] + op->x;	1867	sint16 nx = freearr_x[dir] + op->x;
1995	sint16 ny = freearr_y[dir] + op->y;	1868	sint16 ny = freearr_y[dir] + op->y;
1996		1869
1997	on_battleground = op_on_battleground (op, 0, 0);
1998
1999	if (out_of_map (op->map, nx, ny))	1870	if (out_of_map (op->map, nx, ny))
2000	return false;	1871	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		1872
2008	/* 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
2009	* 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
2010	* 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
2011	* player. This is a pretty nasty hack, because if we could	1876	* player. This is a pretty nasty hack, because if we could
…		…
2071	--op->speed_left;	1936	--op->speed_left;
2072		1937
2073	op->play_sound (sound_find ("push_player"));	1938	op->play_sound (sound_find ("push_player"));
2074	push_ob (mon, dir, op);	1939	push_ob (mon, dir, op);
2075		1940
2076	if (op->contr->tmp_invis || op->hide)	1941	if (action_makes_visible (op))
2077	make_visible (op);	1942	make_visible (op);
2078		1943
2079	return true;	1944	return true;
2080	}	1945	}
2081	else	1946	else
2082	return false;	1947	return false;
2083	}	1948	}
		1949
		1950	bool on_battleground = op_on_battleground (op, 0, 0);
2084		1951
2085	/* in certain circumstances, you shouldn't attack friendly	1952	/* in certain circumstances, you shouldn't attack friendly
2086	* creatures. Note that if you are braced, you can't push	1953	* creatures. Note that if you are braced, you can't push
2087	* someone, but put it inside this loop so that you won't	1954	* someone, but put it inside this loop so that you won't
2088	* attack them either.	1955	* attack them either.
…		…
2103	push_ob (mon, dir, op);	1970	push_ob (mon, dir, op);
2104	}	1971	}
2105	else	1972	else
2106	op->statusmsg ("You withhold your attack");	1973	op->statusmsg ("You withhold your attack");
2107		1974
2108	if (op->contr->tmp_invis || op->hide)	1975	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2109	make_visible (op);	1976	make_visible (op);
2110		1977
2111	return true;	1978	return true;
2112	}	1979	}
2113	}	1980	}
…		…
2153	}	2020	}
2154		2021
2155	bool	2022	bool
2156	move_player (object *op, int dir)	2023	move_player (object *op, int dir)
2157	{	2024	{
2158	int pick;
2159
2160	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2025	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2161	return 0;	2026	return 0;
2162		2027
2163	/* Sanity check: make sure dir is valid */	2028	/* Sanity check: make sure dir is valid */
2164	if ((dir < 0) || (dir >= 9))	2029	if (dir < 0 || dir >= 9)
2165	{	2030	{
2166	LOG (llevError, "move_player: invalid direction %d\n", dir);	2031	LOG (llevError, "move_player: invalid direction %d\n", dir);
2167	return 0;	2032	return 0;
2168	}	2033	}
2169		2034
…		…
2171	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2036	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2172	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2037	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2173		2038
2174	op->facing = dir;	2039	op->facing = dir;
2175		2040
2176	if (op->hide)	2041	if (op->flag [FLAG_HIDDEN])
2177	do_hidden_move (op);	2042	do_hidden_move (op);
2178		2043
2179	bool retval;	2044	bool retval;
		2045	int pick = 0;
2180		2046
2181	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2047	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2182	retval = RESULT_INT (0);	2048	retval = RESULT_INT (0);
2183	else if (op->contr->fire_on)	2049	else if (op->contr->fire_on)
2184	retval = fire (op, dir);	2050	retval = fire (op, dir);
…		…
2241	return move_player (op, op->direction);	2107	return move_player (op, op->direction);
2242		2108
2243	return false;	2109	return false;
2244	}	2110	}
2245		2111
2246	int	2112	static int
2247	save_life (object *op)	2113	save_life (object *op)
2248	{	2114	{
2249	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2115	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2250	return 0;	2116	return 0;
2251		2117
…		…
2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2119	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2254	{	2120	{
2255	op->play_sound (sound_find ("ob_evaporate"));	2121	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));	2122	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2257		2123
2258	tmp->destroy (true);	2124	tmp->destroy ();
2259	CLEAR_FLAG (op, FLAG_LIFESAVE);	2125	CLEAR_FLAG (op, FLAG_LIFESAVE);
2260		2126
2261	if (op->stats.hp < 0)	2127	if (op->stats.hp < 0)
2262	op->stats.hp = op->stats.maxhp;	2128	op->stats.hp = op->stats.maxhp;
2263		2129
…		…
2298	void	2164	void
2299	object::drop_unpaid_items ()	2165	object::drop_unpaid_items ()
2300	{	2166	{
2301	if (!flag [FLAG_REMOVED])	2167	if (!flag [FLAG_REMOVED])
2302	::drop_unpaid_items (inv, this);	2168	::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	}	2169	}
2341		2170
2342	void	2171	void
2343	do_some_living (object *op)	2172	do_some_living (object *op)
2344	{	2173	{
…		…
2499	{	2328	{
2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2329	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501		2330
2502	if (over_hp > 0)	2331	if (over_hp > 0)
2503	{	2332	{
2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2333	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505	op->last_heal = 0;	2334	op->last_heal = 0;
2506	}	2335	}
2507	else	2336	else
2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2337	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2509	}	2338	}
…		…
2569	op->stats.food = 0;	2398	op->stats.food = 0;
2570		2399
2571	if (op->stats.hp < 0)	2400	if (op->stats.hp < 0)
2572	{	2401	{
2573	op->contr->killer = archetype::get ("killer_starvation");	2402	op->contr->killer = archetype::get ("killer_starvation");
2574	op->contr->killer->destroy (true);	2403	op->contr->killer->destroy ();
2575	}	2404	}
2576	}	2405	}
2577		2406
2578	/* killer should be set here already */	2407	/* killer should be set here already */
2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2408	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
…		…
2588	*/	2417	*/
2589	void	2418	void
2590	kill_player (object *op)	2419	kill_player (object *op)
2591	{	2420	{
2592	int x, y;	2421	int x, y;
2593	char buf[MAX_BUF];
2594	maptile *map; /* this is for resurrection */	2422	maptile *map; /* this is for resurrection */
2595	int will_kill_again;	2423	int will_kill_again;
2596	archetype *at;	2424	archetype *at;
2597	object *tmp;	2425	object *tmp;
2598		2426
2599	if (save_life (op))	2427	if (save_life (op))
2600	return;	2428	return;
		2429
		2430	dynbuf_text deathtab;
		2431
		2432	/* restore player */
		2433	at = archetype::find (shstr_poisoning);
		2434	if (object *tmp = present_arch_in_ob (at, op))
		2435	{
		2436	tmp->destroy ();
		2437	deathtab << "Your body feels cleansed...\r";
		2438	}
		2439
		2440	at = archetype::find (shstr_confusion);
		2441	if (object *tmp = present_arch_in_ob (at, op))
		2442	{
		2443	tmp->destroy ();
		2444	deathtab << "Your mind feels clearer...\r";
		2445	}
		2446
		2447	cure_disease (op, 0, 0); /* remove any disease */
		2448
		2449	max_it (op->stats.hp , op->stats.maxhp);
		2450	max_it (op->stats.sp , op->stats.maxsp);
		2451	max_it (op->stats.grace, op->stats.maxgrace);
		2452
		2453	if (op->stats.food <= 0)
		2454	op->stats.food = 999;
		2455
		2456	// remove all spell effects that are active
		2457	// to avoid long-term effects such as word-of-recall
		2458	for (object *item = op->inv; item; )
		2459	{
		2460	object *next = item->below;
		2461
		2462	if (item->type == SPELL_EFFECT && item->active)
		2463	item->destroy ();
		2464
		2465	item = next;
		2466	}
2601		2467
2602	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2468	/* 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.	2469	* in cities ONLY!!! It is very important that this doesn't get abused.
2604	* Look at op_on_battleground() for more info --AndreasV	2470	* Look at op_on_battleground() for more info --AndreasV
2605	*/	2471	*/
2606	if (op_on_battleground (op, &x, &y))	2472	if (op_on_battleground (op, &x, &y))
2607	{	2473	{
2608	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2474	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		2475
2631	/* create a bodypart-trophy to make the winner happy */	2476	/* create a bodypart-trophy to make the winner happy */
2632	if (object *tmp = arch_to_object (archetype::find ("finger")))	2477	object *tmp = archetype::find (shstr_finger)->instance ();
2633	{	2478
2634	tmp->name = format ("%s's finger" , &op->name);	2479	tmp->name = format ("%s's finger" , &op->name);
2635	tmp->name_pl = format ("%s's fingers", &op->name);	2480	tmp->name_pl = format ("%s's fingers", &op->name);
2636	tmp->msg = format (	2481	tmp->msg = format (
2637	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2482	"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,	2483	&op->name, op->contr->title,
2639	(int)op->level,	2484	(int)op->level,
2640	op->contr->killer_name ()	2485	op->contr->killer_name ()
2641	);	2486	);
2642	tmp->value = 0, tmp->type = 0;	2487	tmp->value = 0, tmp->type = 0;
2643	tmp->materialname = "organics";	2488	tmp->material = name_to_material (shstr_organic);
2644	tmp->insert_at (op, tmp);	2489	tmp->insert_at (op, tmp);
2645	}
2646		2490
2647	/* teleport defeated player to new destination */	2491	/* teleport defeated player to new destination */
2648	transfer_ob (op, x, y, 0, NULL);	2492	transfer_ob (op, x, y, 0, NULL);
2649	op->contr->braced = 0;	2493	op->contr->braced = 0;
		2494
		2495	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2650	return;	2496	return;
2651	}	2497	}
		2498
		2499	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2500	deathtab << "T<YOU HAVE DIED>\n\n";
2652		2501
2653	INVOKE_PLAYER (DEATH, op->contr);	2502	INVOKE_PLAYER (DEATH, op->contr);
2654		2503
2655	command_kill_pets (op, 0);	2504	command_kill_pets (op, 0);
2656		2505
…		…
2690		2539
2691	lost_a_stat = 0;	2540	lost_a_stat = 0;
2692		2541
2693	for (z = 0; z < num_stats_lose; z++)	2542	for (z = 0; z < num_stats_lose; z++)
2694	{	2543	{
2695	i = RANDOM () % NUM_STATS;	2544	i = rndm (NUM_STATS);
2696		2545
2697	if (settings.stat_loss_on_death)	2546	if (settings.stat_loss_on_death)
2698	{	2547	{
2699	/* Pick a random stat and take a point off it. Tell the player	2548	/* Pick a random stat and take a point off it. Tell the player
2700	* what he lost.	2549	* what he lost.
…		…
2707	lost_a_stat = 1;	2556	lost_a_stat = 1;
2708	}	2557	}
2709	else	2558	else
2710	{	2559	{
2711	/* deplete a stat */	2560	/* deplete a stat */
2712	archetype *deparch = archetype::find ("depletion");	2561	archetype *deparch = archetype::find (shstr_depletion);
2713	object *dep;	2562	object *dep;
2714		2563
2715	dep = present_arch_in_ob (deparch, op);	2564	dep = present_arch_in_ob (deparch, op);
2716	if (!dep)	2565	if (!dep)
2717	{	2566	{
2718	dep = arch_to_object (deparch);	2567	dep = deparch->instance ();
2719	insert_ob_in_ob (dep, op);	2568	insert_ob_in_ob (dep, op);
2720	}	2569	}
2721	lose_this_stat = 1;	2570	lose_this_stat = 1;
2722	if (settings.balanced_stat_loss)	2571	if (settings.balanced_stat_loss)
2723	{	2572	{
…		…
2751	}	2600	}
2752	}	2601	}
2753		2602
2754	if (lose_this_stat)	2603	if (lose_this_stat)
2755	{	2604	{
2756	this_stat = get_attr_value (&(dep->stats), i);	2605	this_stat = get_attr_value (&dep->stats, i);
2757	/* We could try to do something clever like find another	2606	/* We could try to do something clever like find another
2758	* stat to reduce if this fails. But chances are, if	2607	* stat to reduce if this fails. But chances are, if
2759	* stats have been depleted to -50, all are pretty low	2608	* stats have been depleted to -50, all are pretty low
2760	* and should be roughly the same, so it shouldn't make a	2609	* and should be roughly the same, so it shouldn't make a
2761	* difference.	2610	* difference.
…		…
2775	/* If no stat lost, tell the player. */	2624	/* If no stat lost, tell the player. */
2776	if (!lost_a_stat)	2625	if (!lost_a_stat)
2777	{	2626	{
2778	/* determine_god() seems to not work sometimes... why is this?	2627	/* determine_god() seems to not work sometimes... why is this?
2779	Should I be using something else? GD */	2628	Should I be using something else? GD */
2780	const char *god = determine_god (op);	2629	shstr_tmp god = determine_god (op);
2781		2630
2782	if (god && (strcmp (god, "none")))	2631	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);	2632	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2784	else	2633	else
2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2634	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2786	}	2635	}
2787	#else	2636	#else
2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2637	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2789	#endif	2638	#endif
2790		2639
2791	/* Put a gravestone up where the character 'almost' died. List the	2640	/* Put a gravestone up where the character 'almost' died. List the
2792	* exp loss on the stone.	2641	* exp loss on the stone.
2793	*/	2642	*/
2794	tmp = arch_to_object (archetype::find ("gravestone"));	2643	tmp = archetype::find (shstr_gravestone)->instance ();
2795	tmp->name = format ("%s's gravestone", &op->name);	2644	tmp->name = format ("%s's gravestone", &op->name);
2796	tmp->name_pl = format ("%s's gravestones", &op->name);	2645	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",	2646	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 ());	2647	&op->name, op->contr->title, op->contr->killer_name ());
2799	tmp->x = op->x, tmp->y = op->y;	2648	tmp->x = op->x, tmp->y = op->y;
2800	insert_ob_in_map (tmp, op->map, NULL, 0);	2649	insert_ob_in_map (tmp, op->map, NULL, 0);
2801		2650
2802	/**************************************/	2651	/**************************************/
2803	/* */	2652	/* */
2804	/* Subtract the experience points, */	2653	/* Subtract the experience points, */
2805	/* if we died cause of food, give us */
2806	/* food, and reset HP's... */
2807	/* */	2654	/* */
2808	/**************************************/	2655	/**************************************/
2809		2656
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)); */	2657	/*add_exp(op, (op->stats.exp * -0.20)); */
2844	apply_death_exp_penalty (op);	2658	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		2659
2853	/*	2660	/*
2854	* Check to see if the player has any unpaid items. If so, remove them	2661	* Check to see if the player has any unpaid items. If so, remove them
2855	* and put them back in the map.	2662	* and put them back in the map.
2856	*/	2663	*/
…		…
2893		2700
2894	insert_ob_in_ob (force, op);	2701	insert_ob_in_ob (force, op);
2895	op->update_stats ();	2702	op->update_stats ();
2896	}	2703	}
2897		2704
2898	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2705	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2899	}	2706	}
2900		2707
2901	void	2708	static void
2902	loot_object (object *op)	2709	loot_object (object *op)
2903	{ /* Grab and destroy some treasure */	2710	{ /* Grab and destroy some treasure */
2904	object *tmp, *tmp2, *next;	2711	object *tmp, *tmp2, *next;
2905		2712
2906	op->close_container (); /* close open sack first */	2713	op->close_container (); /* close open sack first */
…		…
2924	{	2731	{
2925	tmp->decrease (rndm (1, tmp->nrof - 1));	2732	tmp->decrease (rndm (1, tmp->nrof - 1));
2926	insert_ob_in_map (tmp, op->map, NULL, 0);	2733	insert_ob_in_map (tmp, op->map, NULL, 0);
2927	}	2734	}
2928	else	2735	else
2929	tmp->destroy (true);	2736	tmp->destroy ();
2930	}	2737	}
2931	else	2738	else
2932	insert_ob_in_map (tmp, op->map, NULL, 0);	2739	insert_ob_in_map (tmp, op->map, NULL, 0);
2933	}	2740	}
2934	}	2741	}
…		…
2937	* fix_weight(): Check recursively the weight of all players, and fix	2744	* fix_weight(): Check recursively the weight of all players, and fix
2938	* what needs to be fixed. Refresh windows and fix speed if anything	2745	* what needs to be fixed. Refresh windows and fix speed if anything
2939	* was changed.	2746	* was changed.
2940	*/	2747	*/
2941	void	2748	void
2942	fix_weight (void)	2749	fix_weight ()
2943	{	2750	{
2944	for_all_players (pl)	2751	for_all_players (pl)
2945	{	2752	{
2946	sint32 old = pl->ob->carrying;	2753	sint32 old = pl->ob->carrying;
2947		2754
…		…
2954	}	2761	}
2955	}	2762	}
2956	}	2763	}
2957		2764
2958	void	2765	void
2959	fix_luck (void)	2766	fix_luck ()
2960	{	2767	{
2961	for_all_players (pl)	2768	for_all_players (pl)
2962	if (!pl->ob->contr->ns->state)	2769	if (!pl->ob->contr->ns->state)
2963	pl->ob->change_luck (0);	2770	pl->ob->change_luck (0);
2964	}	2771	}
…		…
2995	if (op->type == PLAYER)	2802	if (op->type == PLAYER)
2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);	2803	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
2997		2804
2998	cast_spell (op, throw_ob, dir, spob, NULL);	2805	cast_spell (op, throw_ob, dir, spob, NULL);
2999		2806
3000	throw_ob->destroy (true);	2807	throw_ob->destroy ();
3001	}	2808	}
3002		2809
3003	void	2810	void
3004	make_visible (object *op)	2811	make_visible (object *op)
3005	{	2812	{
3006	op->hide = 0;	2813	op->flag [FLAG_HIDDEN] = 0;
3007	op->invisible = 0;	2814	op->invisible = 0;
3008		2815
3009	if (op->type == PLAYER)	2816	if (op->type == PLAYER)
3010	{	2817	{
3011	op->contr->tmp_invis = 0;	2818	op->contr->tmp_invis = 0;
…		…
3036		2843
3037	if (!ob || !ob->map)	2844	if (!ob || !ob->map)
3038	return 0;	2845	return 0;
3039		2846
3040	/* so, on normal lighted maps, its hard to hide */	2847	/* so, on normal lighted maps, its hard to hide */
3041	level = ob->map->darkness - 2;	2848	level = ob->map->darklevel () - 2;
3042		2849
3043	/* this also picks up whether the object is glowing.	2850	/* this also picks up whether the object is glowing.
3044	* If you carry a light on a non-dark map, its not	2851	* If you carry a light on a non-dark map, its not
3045	* as bad as carrying a light on a pitch dark map */	2852	* as bad as carrying a light on a pitch dark map */
3046	if (has_carried_lights (ob))	2853	if (ob->has_carried_lights ())
3047	level = -(10 + (2 * ob->map->darkness));	2854	level = -(10 + (2 * ob->map->darklevel ()));
3048		2855
3049	/* scan through all nearby squares for terrain to hide in */	2856	/* scan through all nearby squares for terrain to hide in */
3050	for (i = 0, x = ob->x, y = ob->y;	2857	for (i = 0, x = ob->x, y = ob->y;
3051	i <= SIZEOFFREE1;	2858	i <= SIZEOFFREE1;
3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2859	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3199	while (op)	3006	while (op)
3200	{	3007	{
3201	dx = rv.distance_x + op->arch->x;	3008	dx = rv.distance_x + op->arch->x;
3202	dy = rv.distance_y + op->arch->y;	3009	dy = rv.distance_y + op->arch->y;
3203		3010
3204	/* only the viewable area the player sees is updated by LOS	3011	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;	3012	return 1;
3212		3013
3213	op = op->more;	3014	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	}	3015	}
3243		3016
3244	return 0;	3017	return 0;
3245	}	3018	}
3246		3019
…		…
3270	&& tmp->name == shstr_battleground	3043	&& tmp->name == shstr_battleground
3271	&& EXIT_X (tmp) && EXIT_Y (tmp))	3044	&& EXIT_X (tmp) && EXIT_Y (tmp))
3272	{	3045	{
3273	/* before we assign the exit, check if this is a teambattle */	3046	/* before we assign the exit, check if this is a teambattle */
3274	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3047	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3275	{
3276	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3048	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3049	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3277	{	3050	{
3278	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3279	{
3280	if (x && y)	3051	if (x && y)
3281	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3052	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3282		3053
3283	return 1;	3054	return 1;
3284	}
3285	}	3055	}
3286	}
3287		3056
3288	if (x && y)	3057	if (x && y)
3289	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3058	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3290		3059
3291	return 1;	3060	return 1;
…		…
3448	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3217	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3449	}	3218	}
3450	else	3219	else
3451	{	3220	{
3452	/* generate misc. treasure */	3221	/* generate misc. treasure */
3453	tmp = arch_to_object (tr->item);	3222	tmp = tr->item->instance ();
3454	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3223	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3455	who->insert (tmp);	3224	who->insert (tmp);
3456	}	3225	}
3457	}	3226	}
3458		3227
…		…
3471		3240
3472	if (pl->ranged_ob == ob)	3241	if (pl->ranged_ob == ob)
3473	pl->ranged_ob = 0;	3242	pl->ranged_ob = 0;
3474	}	3243	}
3475		3244
		3245	//-GPL
		3246
3476	sint8	3247	sint8
3477	player::visibility_at (maptile *map, int x, int y) const	3248	player::darkness_at (maptile *map, int x, int y) const
3478	{	3249	{
3479	if (!ns)	3250	if (!ns)
3480	return 0;	3251	return LOS_BLOCKED;
3481		3252
3482	int dx, dy;	3253	int dx, dy;
3483	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3254	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3484	return 0;	3255	return LOS_BLOCKED;
3485		3256
3486	x += dx - ns->current_x + ns->mapx / 2;	3257	x += dx - ns->current_x;
3487	y += dy - ns->current_y + ns->mapy / 2;	3258	y += dy - ns->current_y;
3488		3259
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];	3260	return blocked_los (x, y);
3493	}	3261	}
3494		3262
3495	void	3263	void
3496	player::infobox (const char *title, const char *msg, int color)	3264	player::infobox (const char *title, const char *msg, int color)
3497	{	3265	{

Diff Legend

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