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.267 by root, Wed Apr 7 18:35:56 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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;
…		…
190	ob->remove ();	76	ob->remove ();
191	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
192	ob->map = 0;	78	ob->map = 0;
193	party = 0;	79	party = 0;
194		80
195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197	players.erase (this);	81	players.erase (this);
198	}	82	}
199		83
200	// connect the player with a specific client	84	// connect the player with a specific client
201	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
210	ob->close_container (); //TODO: client-specific	94	ob->close_container (); //TODO: client-specific
211		95
212	ns->update_look = 0;	96	ns->update_look = 0;
213	ns->look_position = 0;	97	ns->look_position = 0;
214		98
215	clear_los (this);	99	clear_los ();
216		100
217	ns->reset_stats ();	101	ns->reset_stats ();
218		102
219	/* make sure he's a player -- needed because of class change. */	103	/* make sure he's a player -- needed because of class change. */
220	ob->type = PLAYER; // we are paranoid	104	ob->type = PLAYER; // we are paranoid
221	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
222		106
223	ob->update_weight ();	107	ob->update_weight ();
224	link_skills ();	108	link_skills ();
225		109
226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
229		111
230	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
231	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
232	{	114	{
233	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
234		116
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
250		132
251	ns->floorbox_update ();	133	ns->floorbox_update ();
252	esrv_send_inventory (ob, ob);	134	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	135	esrv_add_spells (this, 0);
254		136
		137	ob->flag [FLAG_READY_WEAPON] = false;
		138	ob->flag [FLAG_READY_SKILL] = false;
		139	ob->flag [FLAG_READY_RANGE] = false;
		140	ob->flag [FLAG_READY_BOW] = false;
		141
		142	ob->update_stats (); // we unapplied stuff above
255	activate ();	143	activate ();
256
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260		144
261	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
263	}	147	}
264		148
…		…
281	ns->reset_stats ();	165	ns->reset_stats ();
282	ns->pl = 0;	166	ns->pl = 0;
283	ns = 0;	167	ns = 0;
284	}	168	}
285		169
286	observe = ob;	170	// this is important for the player scheduler to get the correct refcount
		171	// when ns = 0
		172	observe = viewpoint = ob;
287		173
288	deactivate ();	174	deactivate ();
289	}	175	}
		176
		177	//-GPL
290		178
291	// the need for this function can be explained	179	// the need for this function can be explained
292	// by load_object not returning the object	180	// by load_object not returning the object
293	void	181	void
294	player::set_object (object *op)	182	player::set_object (object *op)
295	{	183	{
296	ob = observe = op;	184	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
298		186
299	ob->speed = 1.0f;	187	ob->speed = 1.0f;
300	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
301		189
302	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
303
304	ob->flag [FLAG_READY_WEAPON] = false;
305	ob->flag [FLAG_READY_SKILL] = false;
306	ob->flag [FLAG_READY_BOW] = false;
307
308	for (object *op = ob->inv; op; op = op->below)
309	if (op->flag [FLAG_APPLIED])
310	switch (op->type)
311	{
312	case SKILL:
313	ob->flag [FLAG_APPLIED] = false;
314	break;
315
316	case WAND:
317	case ROD:
318	case HORN:
319	case BOW:
320	ranged_ob = op;
321	break;
322
323	case WEAPON:
324	combat_ob = op;
325	break;
326	}
327
328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329	ob->deactivate (); // change_weapon activates, fix this better
330	}	191	}
331		192
332	void	193	void
333	player::set_observe (object *op)	194	player::set_observe (object *op)
334	{	195	{
335	observe = op ? op : ob;	196	observe = viewpoint = op ? op : ob;
336	do_los = 1;	197	do_los = 1;
337	}	198	}
		199
		200	void
		201	player::set_viewpoint (object *op)
		202	{
		203	viewpoint = op ? op : (object *)observe;
		204	do_los = 1;
		205	}
		206
		207	//+GPL
338		208
339	player::player ()	209	player::player ()
340	{	210	{
341	/* There are some elements we want initialised to non zero value -	211	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	212	* we deal with that below this point.
…		…
366	attachable::do_destroy ();	236	attachable::do_destroy ();
367		237
368	if (ob)	238	if (ob)
369	{	239	{
370	ob->destroy_inv (false);	240	ob->destroy_inv (false);
371	ob->destroy (true);	241	ob->destroy ();
372	}	242	}
373		243
374	ob = observe = 0;	244	ob = observe = viewpoint = 0;
375	}	245	}
376		246
377	player::~player ()	247	player::~player ()
378	{	248	{
379	/* Clear item stack */	249	/* Clear item stack */
380	free (stack_items);	250	free (stack_items);
		251	}
		252
		253	/*
		254	* get_player_archetype() return next player archetype from archetype
		255	* list. Not very efficient routine, but used only creating new players.
		256	* Note: there MUST be at least one player archetype!
		257	*/
		258	static archetype *
		259	get_player_archetype (archetype *at)
		260	{
		261	// archetypes could have been reloaded
		262	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		263
		264	if (!nat)
		265	return at;
		266
		267	archvec::iterator i = archetypes.find (nat);
		268
		269	for (;;)
		270	{
		271	if (++i == archetypes.end ())
		272	i = archetypes.begin ();
		273	else if (*i == at)
		274	cleanup ("not a single player archetype found");
		275
		276	if ((*i)->type == PLAYER)
		277	return *i;
		278	}
381	}	279	}
382		280
383	/* Tries to add player on the connection passed in ns.	281	/* 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	282	* All we can really get in this is some settings like host and display
385	* mode.	283	* mode.
…		…
387	player *	285	player *
388	player::create ()	286	player::create ()
389	{	287	{
390	player *pl = new player;	288	player *pl = new player;
391		289
392	pl->set_object (arch_to_object (get_player_archetype (0)));	290	pl->set_object (get_player_archetype (0)->instance ());
393		291
394	pl->ob->roll_stats ();	292	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	293	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	294	pl->ob->run_away = 25; /* Then we panick... */
397		295
398	set_first_map (pl->ob);	296	set_first_map (pl->ob);
399		297
400	return pl;	298	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	}	299	}
430		300
431	object *	301	object *
432	get_nearest_player (object *mon)	302	get_nearest_player (object *mon)
433	{	303	{
…		…
668	|| op->type == CLOAK || op->type == HELMET	538	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	539	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	540	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	541	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
672	{	542	{
673	op->destroy (true);	543	op->destroy ();
674	continue;	544	continue;
675	}	545	}
676	}	546	}
677		547
678	/* This really needs to be better - we should really give	548	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	549	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	550	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	551	*/
684	if (op->type == SPELLBOOK || op->type == SKILL)	552	if (op->type == SKILL)
685	{	553	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	554	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	555	if (tmp->type == op->type && tmp->name == op->name)
		556	{
		557	op->destroy ();
		558	LOG (llevError,
		559	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
690	break;	560	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	}	561	}
698		562
699	if (op->nrof > 1)	563	if (op->nrof > 1)
700	op->nrof = 1;	564	op->nrof = 1;
701	}	565	}
702		566
…		…
714	CLEAR_FLAG (op, FLAG_DAMNED);	578	CLEAR_FLAG (op, FLAG_DAMNED);
715	}	579	}
716		580
717	if (op->type == SPELL)	581	if (op->type == SPELL)
718	{	582	{
719	op->destroy (true);	583	op->destroy ();
720	continue;	584	continue;
721	}	585	}
722	else if (op->type == SKILL)	586	else if (op->type == SKILL)
723	{	587	{
724	SET_FLAG (op, FLAG_CAN_USE_SKILL);	588	SET_FLAG (op, FLAG_CAN_USE_SKILL);
…		…
748	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	612	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
749	}	613	}
750		614
751	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	615	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
752	static int	616	static int
753	roll_stat (void)	617	roll_stat ()
754	{	618	{
755	int a[4], i, j, k;	619	int a[4], i, j, k;
756		620
757	for (i = 0; i < 4; i++)	621	for (i = 0; i < 4; i++)
758	a[i] = (int) rndm (6) + 1;	622	a[i] = (int) rndm (6) + 1;
…		…
855	player::chargen_race_done ()	719	player::chargen_race_done ()
856	{	720	{
857	/* this must before then initial items are given */	721	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	722	esrv_new_player (ob->contr);
859		723
860	treasurelist *tl = treasurelist::find ("starting_wealth");	724	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	725	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	726	create_treasure (tl, ob, 0, 0, 0);
863		727
864	INVOKE_PLAYER (BIRTH, ob->contr);	728	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);	729	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
918	ob->stats.hp = ob->stats.maxhp;	782	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	783	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	784	ob->stats.grace = 0;
921	}	785	}
922		786
923	void	787	static void
924	flee_player (object *op)	788	flee_player (object *op)
925	{	789	{
926	int dir, diff;	790	int dir, diff;
927	rv_vector rv;	791	rv_vector rv;
928		792
…		…
931	LOG (llevDebug, "Fleeing player is dead.\n");	795	LOG (llevDebug, "Fleeing player is dead.\n");
932	CLEAR_FLAG (op, FLAG_SCARED);	796	CLEAR_FLAG (op, FLAG_SCARED);
933	return;	797	return;
934	}	798	}
935		799
936	if (op->enemy == NULL)	800	if (!op->enemy)
937	{	801	{
938	LOG (llevDebug, "Fleeing player had no enemy.\n");	802	LOG (llevDebug, "Fleeing player had no enemy.\n");
939	CLEAR_FLAG (op, FLAG_SCARED);	803	CLEAR_FLAG (op, FLAG_SCARED);
940	return;	804	return;
941	}	805	}
942		806
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))	807	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
955	{	808	{
956	op->enemy = NULL;	809	op->enemy = NULL;
957	CLEAR_FLAG (op, FLAG_SCARED);	810	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	811	return;
…		…
961	get_rangevector (op, op->enemy, &rv, 0);	814	get_rangevector (op, op->enemy, &rv, 0);
962		815
963	dir = absdir (4 + rv.direction);	816	dir = absdir (4 + rv.direction);
964	for (diff = 0; diff < 3; diff++)	817	for (diff = 0; diff < 3; diff++)
965	{	818	{
966	int m = 1 - (RANDOM () & 2);	819	int m = 1 - rndm (2) * 2;
967		820
968	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	821	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
969	return;	822	return;
970	}	823	}
971		824
972	/* Cornered, get rid of scared */	825	/* Cornered, get rid of scared */
973	CLEAR_FLAG (op, FLAG_SCARED);	826	CLEAR_FLAG (op, FLAG_SCARED);
…		…
982	check_pick (object *op)	835	check_pick (object *op)
983	{	836	{
984	object *tmp, *next;	837	object *tmp, *next;
985	int stop = 0;	838	int stop = 0;
986	int wvratio;	839	int wvratio;
987	char putstring[128];
988		840
989	/* if you're flying, you cna't pick up anything */	841	/* if you're flying, you can't pick up anything */
990	if (op->move_type & MOVE_FLYING)	842	if (op->move_type & MOVE_FLYING)
991	return 1;	843	return 1;
992		844
993	next = op->below;	845	next = op->below;
994		846
995	int cnt = MAX_ITEM_PER_DROP;	847	int cnt = MAX_ITEM_PER_ACTION;
996	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	848	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
997		849
998	/* loop while there are items on the floor that are not marked as	850	/* loop while there are items on the floor that are not marked as
999	* destroyed */	851	* destroyed */
1000	while (next && !next->destroyed ())	852	while (next && !next->destroyed ())
…		…
1016		868
1017	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	869	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1018	{	870	{
1019	if (item_matched_string (op, tmp, op->contr->search_str))	871	if (item_matched_string (op, tmp, op->contr->search_str))
1020	CHK_PICK_PICKUP;	872	CHK_PICK_PICKUP;
		873
1021	continue;	874	continue;
1022	}	875	}
1023		876
1024	/* high not bit set? We're using the old autopickup model */	877	/* pickup handling */
		878	if (op->contr->mode & PU_DEBUG)
		879	{
		880	/* some debugging code to figure out item information */
		881	const char *str = tmp->name
		882	? format ("item name: %s item type: %d weight/value: %d",
		883	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		884	: format ("item name: %s item type: %d weight/value: %d",
		885	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		886
		887	new_draw_info (NDI_UNIQUE, 0, op, str);
		888	}
		889
		890	if (op->contr->mode & PU_INHIBIT)
		891	return 1;
		892
		893	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		894	return 1;
		895
		896	/* philosophy:
		897	* It's easy to grab an item type from a pile, as long as it's
		898	* generic. This takes no game-time. For more detailed pickups
		899	* and selections, select-items should be used. This is a
		900	* grab-as-you-run type mode that's really useful for arrows for
		901	* example.
		902	* The drawback: right now it has no frontend, so you need to
		903	* stick the bits you want into a calculator in hex mode and then
		904	* convert to decimal and then 'pickup <#>
		905	*/
		906
		907	/* the first two modes are exclusive: if NOTHING we return, if
		908	* STOP then we stop. All the rest are applied sequentially,
		909	* meaning if any test passes, the item gets picked up. */
		910
		911	/* if mode is set to pick nothing up, return */
		912	if (op->contr->mode == PU_NOTHING)
		913	return 1;
		914
		915	/* if mode is set to stop when encountering objects, return */
		916	/* take STOP before INHIBIT since it doesn't actually pick
		917	* anything up */
		918	if (op->contr->mode & PU_STOP)
		919	return 0;
		920
		921	/* useful for going into stores and not losing your settings... */
		922	/* and for battles wher you don't want to get loaded down while
		923	* fighting */
		924	if (op->contr->mode & PU_INHIBIT)
		925	return 1;
		926
		927	/* prevent us from turning into auto-thieves :) */
		928	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		929	continue;
		930
		931	/* ignore known cursed objects */
		932	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		933	continue;
		934
		935	/* all food and drink if desired */
		936	/* question: don't pick up known-poisonous stuff? */
1025	if (!(op->contr->mode & PU_NEWMODE))	937	if (op->contr->mode & PU_FOOD)
		938	if (tmp->type == FOOD)
1026	{	939	{
1027	switch (op->contr->mode)	940	CHK_PICK_PICKUP;
		941	continue;
		942	}
		943
		944	if (op->contr->mode & PU_DRINK)
		945	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		946	{
		947	CHK_PICK_PICKUP;
		948	continue;
		949	}
		950
		951	if (op->contr->mode & PU_POTION)
		952	if (tmp->type == POTION)
		953	{
		954	CHK_PICK_PICKUP;
		955	continue;
		956	}
		957
		958	/* spellbooks, skillscrolls and normal books/scrolls */
		959	if (op->contr->mode & PU_SPELLBOOK)
		960	if (tmp->type == SPELLBOOK)
		961	{
		962	CHK_PICK_PICKUP;
		963	continue;
		964	}
		965
		966	if (op->contr->mode & PU_SKILLSCROLL)
		967	if (tmp->type == SKILLSCROLL)
		968	{
		969	CHK_PICK_PICKUP;
		970	continue;
		971	}
		972
		973	if (op->contr->mode & PU_READABLES)
		974	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		975	{
		976	CHK_PICK_PICKUP;
		977	continue;
		978	}
		979
		980	/* wands/staves/rods/horns */
		981	if (op->contr->mode & PU_MAGIC_DEVICE)
		982	if (tmp->type == WAND
		983	|| tmp->type == ROD
		984	|| tmp->type == HORN
		985	|| tmp->type == POWER_CRYSTAL)
		986	{
		987	CHK_PICK_PICKUP;
		988	continue;
		989	}
		990
		991	/* pick up all magical items */
		992	if (op->contr->mode & PU_MAGICAL)
		993	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
		994	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		995	{
		996	CHK_PICK_PICKUP;
		997	continue;
		998	}
		999
		1000	if (op->contr->mode & PU_VALUABLES)
		1001	{
		1002	if (tmp->type == MONEY || tmp->type == GEM)
1028	{	1003	{
1029	case 0:
1030	return 1; /* don't pick up */
1031	case 1:
1032	CHK_PICK_PICKUP;	1004	CHK_PICK_PICKUP;
1033	return 1;	1005	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	}	1006	}
1063	}	1007	}
1064	else	1008
1065	{ /* old model */	1009	/* rings & amulets - talismans seems to be typed AMULET */
1066	/* NEW pickup handling */
1067	if (op->contr->mode & PU_DEBUG)	1010	if (op->contr->mode & PU_JEWELS)
		1011	if (tmp->type == RING
		1012	|| tmp->type == AMULET
		1013	|| tmp->type == GIRDLE
		1014	|| tmp->type == SKILL_TOOL)
1068	{	1015	{
1069	/* some debugging code to figure out item information */	1016	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;	1017	continue;
		1018	}
1116		1019
1117	/* ignore known cursed objects */	1020	/* we don't forget dragon food */
1118	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1021	if (op->contr->mode & PU_FLESH)
		1022	if (tmp->type == FLESH)
		1023	{
		1024	CHK_PICK_PICKUP;
1119	continue;	1025	continue;
		1026	}
1120		1027
1121	/* all food and drink if desired */	1028	/* bows and arrows. Bows are good for selling! */
1122	/* question: don't pick up known-poisonous stuff? */	1029	if (op->contr->mode & PU_BOW)
		1030	if (tmp->type == BOW)
		1031	{
		1032	CHK_PICK_PICKUP;
		1033	continue;
		1034	}
		1035
		1036	if (op->contr->mode & PU_ARROW)
		1037	if (tmp->type == ARROW)
		1038	{
		1039	CHK_PICK_PICKUP;
		1040	continue;
		1041	}
		1042
		1043	/* all kinds of armor etc. */
		1044	if (op->contr->mode & PU_ARMOUR)
		1045	if (tmp->type == ARMOUR)
		1046	{
		1047	CHK_PICK_PICKUP;
		1048	continue;
		1049	}
		1050
		1051	if (op->contr->mode & PU_HELMET)
		1052	if (tmp->type == HELMET)
		1053	{
		1054	CHK_PICK_PICKUP;
		1055	continue;
		1056	}
		1057
		1058	if (op->contr->mode & PU_SHIELD)
		1059	if (tmp->type == SHIELD)
		1060	{
		1061	CHK_PICK_PICKUP;
		1062	continue;
		1063	}
		1064
1123	if (op->contr->mode & PU_FOOD)	1065	if (op->contr->mode & PU_BOOTS)
1124	if (tmp->type == FOOD)	1066	if (tmp->type == BOOTS)
		1067	{
		1068	CHK_PICK_PICKUP;
		1069	continue;
		1070	}
		1071
		1072	if (op->contr->mode & PU_GLOVES)
		1073	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1074	{
		1075	CHK_PICK_PICKUP;
		1076	continue;
		1077	}
		1078
		1079	if (op->contr->mode & PU_CLOAK)
		1080	if (tmp->type == CLOAK)
		1081	{
		1082	CHK_PICK_PICKUP;
		1083	continue;
		1084	}
		1085
		1086	/* hoping to catch throwing daggers here */
		1087	if (op->contr->mode & PU_MISSILEWEAPON)
		1088	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1089	{
		1090	CHK_PICK_PICKUP;
		1091	continue;
		1092	}
		1093
		1094	/* careful: chairs and tables are weapons! */
		1095	if (op->contr->mode & PU_ALLWEAPON)
		1096	{
		1097	if (tmp->type == WEAPON)
		1098	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1125	{	1099	{
1126	CHK_PICK_PICKUP;	1100	CHK_PICK_PICKUP;
1127	continue;	1101	continue;
1128	}	1102	}
		1103	}
1129		1104
		1105	/* misc stuff that's useful */
1130	if (op->contr->mode & PU_DRINK)	1106	if (op->contr->mode & PU_KEY)
1131	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1107	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1132	{	1108	{
1133	CHK_PICK_PICKUP;	1109	CHK_PICK_PICKUP;
1134	continue;	1110	continue;
1135	}	1111	}
1136		1112
		1113	/* any of the last 4 bits set means we use the ratio for value
		1114	* pickups */
1137	if (op->contr->mode & PU_POTION)	1115	if (op->contr->mode & PU_RATIO)
1138	if (tmp->type == POTION)	1116	{
		1117	/* use value density to decide what else to grab */
		1118	/* >=7 was >= op->contr->mode */
		1119	/* >=7 is the old standard setting. Now we take the last 4 bits
1139	{	1120	*/
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)	1121	wvratio = op->contr->mode & PU_RATIO;
1176	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1122	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	{	1123	{
1184	if (tmp->type == MONEY || tmp->type == GEM)	1124	#if 0
		1125	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1126	if (tmp->name != NULL)
1185	{	1127	{
1186	CHK_PICK_PICKUP;	1128	fprintf (stderr, "%s", tmp->name);
1187	continue;
1188	}	1129	}
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	1130	else
1323	fprintf (stderr, "%s", tmp->arch->archname);	1131	fprintf (stderr, "%s", tmp->arch->archname);
1324	fprintf (stderr, ",%d] = ", tmp->type);	1132	fprintf (stderr, ",%d] = ", tmp->type);
1325	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1133	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1326	#endif	1134	#endif
		1135	CHK_PICK_PICKUP;
1327	continue;	1136	continue;
1328	}
1329	}	1137	}
1330	} /* the new pickup model */	1138	} /* the new pickup model */
1331	}	1139	}
1332		1140
1333	return !stop;	1141	return !stop;
		1142	}
		1143
		1144	/* routine for both players and monsters. We call this when
		1145	* there is a possibility for our action distrubing our hiding
		1146	* place or invisiblity spell. Artefact invisiblity causes
		1147	* "noise" instead. If we arent invisible to begin with, we
		1148	* return 0.
		1149	*/
		1150	static int
		1151	action_makes_visible (object *op)
		1152	{
		1153	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1154	{
		1155	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1156	{
		1157	// artefact invisibility is permanent, but we still make noise
		1158	// this is important for game-balance.
		1159	if (op->contr)
		1160	op->make_noise ();
		1161
		1162	return 0;
		1163	}
		1164
		1165	if (op->contr && op->contr->tmp_invis == 0)
		1166	return 0;
		1167
		1168	/* If monsters, they should become visible */
		1169	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1170	{
		1171	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1172	return 1;
		1173	}
		1174	}
		1175
		1176	return 0;
1334	}	1177	}
1335		1178
1336	/*	1179	/*
1337	* Find an arrow in the inventory and after that	1180	* Find an arrow in the inventory and after that
1338	* in the right type container (quiver). Pointer to the	1181	* in the right type container (quiver). Pointer to the
1339	* found object is returned.	1182	* found object is returned.
1340	*/	1183	*/
1341	object *	1184	static object *
1342	find_arrow (object *op, const char *type)	1185	find_arrow (object *op, const char *type)
1343	{	1186	{
1344	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1187	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1345	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1188	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1346	return splay (tmp);	1189	return splay (tmp);
…		…
1360	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1203	* 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	1204	* 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	1205	* 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.	1206	* the hall. Failing that it does it's best to pick the highest plus arrow.
1364	*/	1207	*/
1365	object *	1208	static object *
1366	find_better_arrow (object *op, object *target, const char *type, int *better)	1209	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1367	{	1210	{
1368	object *tmp = NULL, *arrow, *ntmp;	1211	object *tmp = NULL, *arrow, *ntmp;
1369	int attacknum, attacktype, betterby = 0, i;	1212	int attacknum, attacktype, betterby = 0, i;
1370		1213
1371	if (!type)	1214	if (!type)
…		…
1375	{	1218	{
1376	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1219	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1377	{	1220	{
1378	i = 0;	1221	i = 0;
1379	ntmp = find_better_arrow (arrow, target, type, &i);	1222	ntmp = find_better_arrow (arrow, target, type, &i);
		1223
1380	if (i > betterby)	1224	if (i > betterby)
1381	{	1225	{
1382	tmp = ntmp;	1226	tmp = ntmp;
1383	betterby = i;	1227	betterby = i;
1384	}	1228	}
1385	}	1229	}
1386	else if (arrow->type == ARROW && arrow->race == type)	1230	else if (arrow->type == ARROW && arrow->race == type)
1387	{	1231	{
1388	/* allways prefer assasination/slaying */	1232	/* allways prefer assasination/slaying */
1389	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1233	if (target->race && arrow->slaying.contains (target->race))
1390	{	1234	{
1391	if (arrow->attacktype & AT_DEATH)	1235	if (arrow->attacktype & AT_DEATH)
1392	{	1236	{
1393	*better = 100;	1237	*better = 100;
1394	return arrow;	1238	return arrow;
…		…
1409	{	1253	{
1410	tmp = arrow;	1254	tmp = arrow;
1411	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1255	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1412	}	1256	}
1413	}	1257	}
		1258
1414	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1259	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1415	{	1260	{
1416	tmp = arrow;	1261	tmp = arrow;
1417	betterby = 2 + arrow->magic + arrow->stats.dam;	1262	betterby = 2 + arrow->magic + arrow->stats.dam;
1418	}	1263	}
		1264
1419	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1265	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1420	{	1266	{
1421	tmp = arrow;	1267	tmp = arrow;
1422	betterby = 1 + arrow->magic + arrow->stats.dam;	1268	betterby = 1 + arrow->magic + arrow->stats.dam;
1423	}	1269	}
…		…
1436	* find_better_arrow to find a decent arrow to use.	1282	* find_better_arrow to find a decent arrow to use.
1437	* op = the shooter	1283	* op = the shooter
1438	* type = bow->race	1284	* type = bow->race
1439	* dir = fire direction	1285	* dir = fire direction
1440	*/	1286	*/
1441	object *	1287	static object *
1442	pick_arrow_target (object *op, const char *type, int dir)	1288	pick_arrow_target (object *op, shstr_cmp type, int dir)
1443	{	1289	{
1444	object *tmp = NULL;	1290	object *tmp = NULL;
1445	maptile *m;	1291	maptile *m;
1446	int i, mflags, found, number;	1292	int i, mflags, found, number;
1447	sint16 x, y;	1293	sint16 x, y;
…		…
1462	for (i = 0, found = 0; i < 20; i++)	1308	for (i = 0, found = 0; i < 20; i++)
1463	{	1309	{
1464	x += freearr_x[dir];	1310	x += freearr_x[dir];
1465	y += freearr_y[dir];	1311	y += freearr_y[dir];
1466	mflags = get_map_flags (m, &m, x, y, &x, &y);	1312	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1313
1467	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1314	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1468	{	1315	{
1469	tmp = NULL;	1316	tmp = 0;
1470	break;	1317	break;
1471	}	1318	}
1472	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1319	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1473	{	1320	{
1474	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1321	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1475	* perhaps a bad assumption.	1322	* perhaps a bad assumption.
1476	*/	1323	*/
1477	tmp = NULL;	1324	tmp = 0;
1478	break;	1325	break;
1479	}	1326	}
		1327
1480	if (mflags & P_IS_ALIVE)	1328	if (mflags & P_IS_ALIVE)
1481	{
1482	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1329	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1483	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1330	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1484	{
1485	found++;
1486	break;
1487	}
1488	if (found)
1489	break;	1331	break;
1490	}
1491	}	1332	}
1492	if (tmp == NULL)	1333
		1334	if (!tmp)
1493	return find_arrow (op, type);	1335	return find_arrow (op, type);
1494		1336
1495	if (tmp->head)	1337	if (tmp->head)
1496	tmp = tmp->head;	1338	tmp = tmp->head;
1497		1339
…		…
1537	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1379	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1538	return 0;	1380	return 0;
1539	}	1381	}
1540		1382
1541	// optimisation: move object to top so we will find it quickly again	1383	// optimisation: move object to top so we will find it quickly again
1542	if (bow->below)	1384	splay (bow);
1543	{
1544	bow->remove ();
1545	op->insert (bow);
1546	}
1547
1548	}	1385	}
1549		1386
1550	if (!bow->race || !bow->skill)	1387	if (!bow->race || !bow->skill)
1551	{	1388	{
1552	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1389	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1579		1416
1580	/* this should not happen, but sometimes does */	1417	/* this should not happen, but sometimes does */
1581	if (arrow->nrof == 0)	1418	if (arrow->nrof == 0)
1582	{	1419	{
1583	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());	1420	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1584	arrow->destroy (true);	1421	arrow->destroy ();
1585	return 0;	1422	return 0;
1586	}	1423	}
1587		1424
1588	left = arrow; /* these are arrows left to the player */	1425	left = arrow; /* these are arrows left to the player */
1589	arrow = arrow->split ();	1426	arrow = arrow->split ();
…		…
1598	arrow->direction = dir;	1435	arrow->direction = dir;
1599		1436
1600	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1437	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601	arrow->stats.hp = arrow->stats.dam;	1438	arrow->stats.hp = arrow->stats.dam;
1602	arrow->stats.grace = arrow->attacktype;	1439	arrow->stats.grace = arrow->attacktype;
1603		1440	arrow->custom_name = arrow->slaying;
1604	if (arrow->slaying)
1605	arrow->spellarg = strdup (arrow->slaying);
1606		1441
1607	#if 0	1442	#if 0
1608	if (player *pl = op->contr)	1443	if (player *pl = op->contr)
1609	{	1444	{
1610	float speed = pl->weapon_sp;	1445	float speed = pl->weapon_sp;
…		…
1672	* but monsters can't. Putting that code here	1507	* but monsters can't. Putting that code here
1673	* makes the fire_bow code much cleaner.	1508	* makes the fire_bow code much cleaner.
1674	* this function should only be called if 'op' is a player,	1509	* this function should only be called if 'op' is a player,
1675	* hence the function name.	1510	* hence the function name.
1676	*/	1511	*/
1677	int	1512	static int
1678	player_fire_bow (object *op, int dir)	1513	player_fire_bow (object *op, int dir)
1679	{	1514	{
1680	int ret = 0, wcmod = 0;	1515	int ret;
1681		1516
1682	if (op->contr->bowtype == bow_bestarrow)	1517	if (op->contr->bowtype == bow_bestarrow)
1683	{	1518	{
1684	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1519	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1685	}	1520	}
1686	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1521	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1687	{	1522	{
1688	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1523	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);	1524	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1692	}	1525	}
1693	else if (op->contr->bowtype == bow_threewide)	1526	else if (op->contr->bowtype == bow_threewide)
1694	{	1527	{
1695	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1528	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)]);	1529	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)]);	1530	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1698	}	1531	}
1699	else if (op->contr->bowtype == bow_spreadshot)	1532	else if (op->contr->bowtype == bow_spreadshot)
1700	{	1533	{
1701	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1534	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);	1535	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);	1536	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1704	}	1537	}
1705	else	1538	else
1706	{	1539	{
…		…
1712	}	1545	}
1713		1546
1714	/* Fires a misc (wand/rod/horn) object in 'dir'.	1547	/* Fires a misc (wand/rod/horn) object in 'dir'.
1715	* Broken apart from 'fire' to keep it more readable.	1548	* Broken apart from 'fire' to keep it more readable.
1716	*/	1549	*/
1717	void	1550	static void
1718	fire_misc_object (object *op, int dir)	1551	fire_misc_object (object *op, int dir)
1719	{	1552	{
1720	object *item = op->contr->ranged_ob;	1553	object *item = op->contr->ranged_ob;
1721		1554
1722	if (!item)	1555	if (!item)
…		…
1729	{	1562	{
1730	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1563	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1731	return;	1564	return;
1732	}	1565	}
1733		1566
1734	if (!op->change_weapon (item))	1567	if (!op->apply (item))
1735	return;	1568	return;
1736		1569
1737	if (item->type == WAND)	1570	if (item->type == WAND)
1738	{	1571	{
1739	if (item->stats.food <= 0)	1572	if (item->stats.food <= 0)
…		…
1744	return;	1577	return;
1745	}	1578	}
1746	}	1579	}
1747	else if (item->type == ROD || item->type == HORN)	1580	else if (item->type == ROD || item->type == HORN)
1748	{	1581	{
1749	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1582	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1750		1583
1751	// using the maximum of the rods charge allows at least one spell cast	1584	// using the maximum of the rods charge allows at least one spell cast
1752	// for a rod or horn, this fixes some broken rods.	1585	// for a rod or horn, this fixes some broken rods.
1753	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1586	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1754	{	1587	{
1755	op->contr->play_sound (sound_find ("wand_poof"));	1588	op->contr->play_sound (sound_find ("wand_poof"));
1756		1589
1757	if (item->type == ROD)	1590	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));	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1763	}	1596	}
1764	}	1597	}
1765		1598
1766	if (cast_spell (op, item, dir, item->inv, NULL))	1599	if (cast_spell (op, item, dir, item->inv, NULL))
1767	{	1600	{
1768	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1601	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1602
1769	if (item->type == WAND)	1603	if (item->type == WAND)
1770	{	1604	{
1771	if (!(--item->stats.food))	1605	if (!(--item->stats.food))
1772	{	1606	{
1773	object *tmp;	1607	object *tmp;
…		…
1789	}	1623	}
1790		1624
1791	/* Received a fire command for the player - go and do it.	1625	/* Received a fire command for the player - go and do it.
1792	*/	1626	*/
1793	bool	1627	bool
1794	fire (object *op, int dir)	1628	fire (object *who, int dir)
1795	{	1629	{
1796	int spellcost = 0;	1630	int spellcost = 0;
1797		1631
1798	/* check for loss of invisiblity/hide */
1799	if (action_makes_visible (op))
1800	make_visible (op);
1801
1802	player *pl = op->contr;	1632	player *pl = who->contr;
1803		1633
1804	if (pl->golem)	1634	if (pl->golem)
1805	{	1635	{
1806	control_golem (op->contr->golem, dir);	1636	control_golem (who->contr->golem, dir);
1807	return false;	1637	return false;
1808	}	1638	}
1809		1639
1810	object *ob = pl->ranged_ob;	1640	object *ob = pl->ranged_ob;
1811		1641
1812	if (!ob)	1642	if (!ob)
1813	return false;	1643	return false;
1814		1644
1815	if (!op->change_weapon (ob))
1816	return false;
1817
1818	if (op->speed_left > 0.f)	1645	if (who->speed_left > 0.f)
1819	--op->speed_left;	1646	--who->speed_left;
1820	else	1647	else
1821	return false;	1648	return false;
1822		1649
		1650	if (!who->apply (ob))
		1651	return false;
		1652
		1653	/* check for loss of invisiblity/hide */
		1654	if (action_makes_visible (who))
		1655	make_visible (who);
		1656
1823	switch (ob->type)	1657	switch (ob->type)
1824	{	1658	{
1825	case BOW:	1659	case BOW:
1826	player_fire_bow (op, dir);	1660	player_fire_bow (who, dir);
1827	break;	1661	break;
1828		1662
1829	case SPELL:	1663	case SPELL:
1830	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1664	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1831	break;	1665	break;
1832		1666
1833	case BUILDER:	1667	case BUILDER:
1834	apply_map_builder (op, dir);	1668	apply_map_builder (who, dir);
1835	break;	1669	break;
1836		1670
1837	case SKILL:	1671	case SKILL:
1838	do_skill (op, op, ob, dir, 0);	1672	do_skill (who, who, ob, dir, 0);
1839	break;	1673	break;
1840		1674
		1675	case RANGED:
		1676	do_skill (who, ob, who->chosen_skill, dir, 0);
		1677	break;
		1678
1841	default:	1679	default:
1842	fire_misc_object (op, dir);	1680	fire_misc_object (who, dir);
1843	break;	1681	break;
1844	}	1682	}
1845		1683
1846	return true;	1684	return true;
1847	}	1685	}
1848		1686
1849	/* find_key	1687	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)	1688	find_key_ (object *pl, object *container, object *door)
1861	{	1689	{
1862	object *tmp, *key;	1690	object *tmp, *key;
1863		1691
1864	/* Should not happen, but sanity checking is never bad */	1692	/* Should not happen, but sanity checking is never bad */
1865	if (!container->inv)	1693	if (!container->inv)
…		…
1868	/* First, lets try to find a key in the top level inventory */	1696	/* First, lets try to find a key in the top level inventory */
1869	for (tmp = container->inv; tmp; tmp = tmp->below)	1697	for (tmp = container->inv; tmp; tmp = tmp->below)
1870	{	1698	{
1871	if (door->type == DOOR && tmp->type == KEY)	1699	if (door->type == DOOR && tmp->type == KEY)
1872	break;	1700	break;
		1701
1873	/* For sanity, we should really check door type, but other stuff	1702	/* For sanity, we should really check door type, but other stuff
1874	* (like containers) can be locked with special keys	1703	* (like containers) can be locked with special keys
1875	*/	1704	*/
1876	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1705	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1877	break;	1706	break;
…		…
1883	* a key, return	1712	* a key, return
1884	*/	1713	*/
1885	if (!tmp)	1714	if (!tmp)
1886	{	1715	{
1887	for (tmp = container->inv; tmp; tmp = tmp->below)	1716	for (tmp = container->inv; tmp; tmp = tmp->below)
1888	{
1889	/* No reason to search empty containers */	1717	/* No reason to search empty containers */
1890	if (tmp->type == CONTAINER && tmp->inv)	1718	if (tmp->type == CONTAINER && tmp->inv)
1891	{
1892	if ((key = find_key (pl, tmp, door)))	1719	if ((key = find_key_ (pl, tmp, door)))
1893	return key;	1720	return key;
1894	}
1895	}
1896		1721
1897	if (!tmp)	1722	if (!tmp)
1898	return NULL;	1723	return 0;
1899	}	1724	}
1900		1725
1901	/* We get down here if we have found a key. Now if its in a container,	1726	/* 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	1727	* see if we actually want to use it
1903	*/	1728	*/
1904	if (pl != container)	1729	if (pl != container)
1905	{	1730	{
1906	/* Only let players use keys in containers */	1731	/* Only let players use keys in containers */
1907	if (!pl->contr)	1732	if (!pl->contr)
1908	return NULL;	1733	return 0;
		1734
1909	/* cases where this fails:	1735	/* cases where this fails:
1910	* If we only search the player inventory, return now since we	1736	* If we only search the player inventory, return now since we
1911	* are not in the players inventory.	1737	* are not in the players inventory.
1912	* If the container is not active, return now since only active	1738	* If the container is not active, return now since only active
1913	* containers can be used.	1739	* containers can be used.
…		…
1917	* inv must have been an container and must have been active.	1743	* inv must have been an container and must have been active.
1918	*	1744	*
1919	* Change the color so that the message doesn't disappear with	1745	* Change the color so that the message doesn't disappear with
1920	* all the others.	1746	* all the others.
1921	*/	1747	*/
1922	if (pl->contr->usekeys == key_inventory ||	1748	if (pl->contr->usekeys == key_inventory
1923	!QUERY_FLAG (container, FLAG_APPLIED) ||	1749	|| !QUERY_FLAG (container, FLAG_APPLIED)
1924	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1750	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1925	{	1751	{
1926	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1752	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));	1753	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1928	return NULL;	1754	return NULL;
1929	}	1755	}
1930	}	1756	}
1931		1757
1932	return tmp;	1758	return tmp;
		1759	}
		1760
		1761	/* find_key
		1762	* We try to find a key for the door as passed. If we find a key
		1763	* and successfully use it, we return the key, otherwise NULL
		1764	* This function merges both normal and locked door, since the logic
		1765	* for both is the same - just the specific key is different.
		1766	* pl is the player,
		1767	* inv is the objects inventory to searched
		1768	* door is the door we are trying to match against.
		1769	* This function can be called recursively to search containers.
		1770	*/
		1771	object *
		1772	find_key (object *pl, object *container, object *door)
		1773	{
		1774	if (door->slaying && is_match_expr (door->slaying))
		1775	{
		1776	// for match expressions, we try to find the key by applying the match
		1777	// to the op itself, which is supposed to find the "key", instead
		1778	// of searching through containers ourselves.
		1779
		1780	return match_one (door->slaying, container, door, pl, pl);
		1781	}
		1782	else
		1783	return find_key_ (pl, container, door);
1933	}	1784	}
1934		1785
1935	/* moved door processing out of move_player_attack.	1786	/* moved door processing out of move_player_attack.
1936	* returns 1 if player has opened the door with a key	1787	* returns 1 if player has opened the door with a key
1937	* such that the caller should not do anything more,	1788	* such that the caller should not do anything more,
…		…
1987	* going to try and move (not fire weapons).	1838	* going to try and move (not fire weapons).
1988	*/	1839	*/
1989	bool	1840	bool
1990	move_player_attack (object *op, int dir)	1841	move_player_attack (object *op, int dir)
1991	{	1842	{
1992	int on_battleground;	1843	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1844	{
		1845	--op->speed_left;
		1846	return true;
		1847	}
1993		1848
1994	sint16 nx = freearr_x[dir] + op->x;	1849	sint16 nx = freearr_x[dir] + op->x;
1995	sint16 ny = freearr_y[dir] + op->y;	1850	sint16 ny = freearr_y[dir] + op->y;
1996		1851
1997	on_battleground = op_on_battleground (op, 0, 0);
1998
1999	if (out_of_map (op->map, nx, ny))	1852	if (out_of_map (op->map, nx, ny))
2000	return false;	1853	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		1854
2008	/* If braced, or can't move to the square, and it is not out of the	1855	/* 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	1856	* 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	1857	* 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	1858	* player. This is a pretty nasty hack, because if we could
…		…
2071	--op->speed_left;	1918	--op->speed_left;
2072		1919
2073	op->play_sound (sound_find ("push_player"));	1920	op->play_sound (sound_find ("push_player"));
2074	push_ob (mon, dir, op);	1921	push_ob (mon, dir, op);
2075		1922
2076	if (op->contr->tmp_invis || op->hide)	1923	if (action_makes_visible (op))
2077	make_visible (op);	1924	make_visible (op);
2078		1925
2079	return true;	1926	return true;
2080	}	1927	}
2081	else	1928	else
2082	return false;	1929	return false;
2083	}	1930	}
		1931
		1932	bool on_battleground = op_on_battleground (op, 0, 0);
2084		1933
2085	/* in certain circumstances, you shouldn't attack friendly	1934	/* in certain circumstances, you shouldn't attack friendly
2086	* creatures. Note that if you are braced, you can't push	1935	* creatures. Note that if you are braced, you can't push
2087	* someone, but put it inside this loop so that you won't	1936	* someone, but put it inside this loop so that you won't
2088	* attack them either.	1937	* attack them either.
…		…
2103	push_ob (mon, dir, op);	1952	push_ob (mon, dir, op);
2104	}	1953	}
2105	else	1954	else
2106	op->statusmsg ("You withhold your attack");	1955	op->statusmsg ("You withhold your attack");
2107		1956
2108	if (op->contr->tmp_invis || op->hide)	1957	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2109	make_visible (op);	1958	make_visible (op);
2110		1959
2111	return true;	1960	return true;
2112	}	1961	}
2113	}	1962	}
…		…
2153	}	2002	}
2154		2003
2155	bool	2004	bool
2156	move_player (object *op, int dir)	2005	move_player (object *op, int dir)
2157	{	2006	{
2158	int pick;
2159
2160	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2007	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2161	return 0;	2008	return 0;
2162		2009
2163	/* Sanity check: make sure dir is valid */	2010	/* Sanity check: make sure dir is valid */
2164	if ((dir < 0) || (dir >= 9))	2011	if (dir < 0 || dir >= 9)
2165	{	2012	{
2166	LOG (llevError, "move_player: invalid direction %d\n", dir);	2013	LOG (llevError, "move_player: invalid direction %d\n", dir);
2167	return 0;	2014	return 0;
2168	}	2015	}
2169		2016
…		…
2171	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2018	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2172	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2019	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2173		2020
2174	op->facing = dir;	2021	op->facing = dir;
2175		2022
2176	if (op->hide)	2023	if (op->flag [FLAG_HIDDEN])
2177	do_hidden_move (op);	2024	do_hidden_move (op);
2178		2025
2179	bool retval;	2026	bool retval;
		2027	int pick = 0;
2180		2028
2181	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2029	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2182	retval = RESULT_INT (0);	2030	retval = RESULT_INT (0);
2183	else if (op->contr->fire_on)	2031	else if (op->contr->fire_on)
2184	retval = fire (op, dir);	2032	retval = fire (op, dir);
…		…
2241	return move_player (op, op->direction);	2089	return move_player (op, op->direction);
2242		2090
2243	return false;	2091	return false;
2244	}	2092	}
2245		2093
2246	int	2094	static int
2247	save_life (object *op)	2095	save_life (object *op)
2248	{	2096	{
2249	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2097	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2250	return 0;	2098	return 0;
2251		2099
…		…
2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2101	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2254	{	2102	{
2255	op->play_sound (sound_find ("ob_evaporate"));	2103	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));	2104	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2257		2105
2258	tmp->destroy (true);	2106	tmp->destroy ();
2259	CLEAR_FLAG (op, FLAG_LIFESAVE);	2107	CLEAR_FLAG (op, FLAG_LIFESAVE);
2260		2108
2261	if (op->stats.hp < 0)	2109	if (op->stats.hp < 0)
2262	op->stats.hp = op->stats.maxhp;	2110	op->stats.hp = op->stats.maxhp;
2263		2111
2264	if (op->stats.food < 0)	2112	if (op->stats.food < 0)
2265	op->stats.food = 999;	2113	op->stats.food = MAX_FOOD;
2266		2114
2267	op->update_stats ();	2115	op->update_stats ();
2268	return 1;	2116	return 1;
2269	}	2117	}
2270		2118
…		…
2298	void	2146	void
2299	object::drop_unpaid_items ()	2147	object::drop_unpaid_items ()
2300	{	2148	{
2301	if (!flag [FLAG_REMOVED])	2149	if (!flag [FLAG_REMOVED])
2302	::drop_unpaid_items (inv, this);	2150	::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	}	2151	}
2341		2152
2342	void	2153	void
2343	do_some_living (object *op)	2154	do_some_living (object *op)
2344	{	2155	{
…		…
2499	{	2310	{
2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2311	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501		2312
2502	if (over_hp > 0)	2313	if (over_hp > 0)
2503	{	2314	{
2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2315	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505	op->last_heal = 0;	2316	op->last_heal = 0;
2506	}	2317	}
2507	else	2318	else
2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2319	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2509	}	2320	}
…		…
2536		2347
2537	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2348	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2538	{	2349	{
2539	op->statusmsg ("You blindly grab for a bite of food. "	2350	op->statusmsg ("You blindly grab for a bite of food. "
2540	"H<To prevent you from starving, you ate some random item from your backpack.>");	2351	"H<To prevent you from starving, you ate some random item from your backpack.>");
2541	manual_apply (op, tmp, 0);	2352	op->apply (tmp);
2542		2353
2543	if (op->stats.food >= 0 || op->stats.hp < 0)	2354	if (op->stats.food >= 0 || op->stats.hp < 0)
2544	break;	2355	break;
2545	}	2356	}
2546	else if (tmp->type == FLESH)	2357	else if (tmp->type == FLESH)
…		…
2552	*/	2363	*/
2553	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2364	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2554	{	2365	{
2555	op->statusmsg ("You blindly grab for a bite of food. "	2366	op->statusmsg ("You blindly grab for a bite of food. "
2556	"H<To prevent you from starving, you ate some random item from your backpack.>");	2367	"H<To prevent you from starving, you ate some random item from your backpack.>");
2557	manual_apply (op, flesh, 0);	2368	op->apply (flesh);
2558	}	2369	}
2559		2370
2560	// If player is still starving, alert him!	2371	// If player is still starving, alert him!
2561	if (op->stats.food < 0)	2372	if (op->stats.food < 0)
2562	op->failmsg ("You are starving! "	2373	op->failmsg ("You are starving! "
…		…
2569	op->stats.food = 0;	2380	op->stats.food = 0;
2570		2381
2571	if (op->stats.hp < 0)	2382	if (op->stats.hp < 0)
2572	{	2383	{
2573	op->contr->killer = archetype::get ("killer_starvation");	2384	op->contr->killer = archetype::get ("killer_starvation");
2574	op->contr->killer->destroy (true);	2385	op->contr->killer->destroy ();
2575	}	2386	}
2576	}	2387	}
2577		2388
2578	/* killer should be set here already */	2389	/* killer should be set here already */
2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2390	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
…		…
2588	*/	2399	*/
2589	void	2400	void
2590	kill_player (object *op)	2401	kill_player (object *op)
2591	{	2402	{
2592	int x, y;	2403	int x, y;
2593	char buf[MAX_BUF];
2594	maptile *map; /* this is for resurrection */	2404	maptile *map; /* this is for resurrection */
2595	int will_kill_again;	2405	int will_kill_again;
2596	archetype *at;	2406	archetype *at;
2597	object *tmp;	2407	object *tmp;
2598		2408
2599	if (save_life (op))	2409	if (save_life (op))
2600	return;	2410	return;
		2411
		2412	dynbuf_text deathtab;
		2413
		2414	/* restore player */
		2415	at = archetype::find (shstr_poisoning);
		2416	if (object *tmp = present_arch_in_ob (at, op))
		2417	{
		2418	tmp->destroy ();
		2419	deathtab << "Your body feels cleansed...\r";
		2420	}
		2421
		2422	at = archetype::find (shstr_confusion);
		2423	if (object *tmp = present_arch_in_ob (at, op))
		2424	{
		2425	tmp->destroy ();
		2426	deathtab << "Your mind feels clearer...\r";
		2427	}
		2428
		2429	cure_disease (op, 0, 0); /* remove any disease */
		2430
		2431	max_it (op->stats.hp , op->stats.maxhp);
		2432	max_it (op->stats.sp , op->stats.maxsp);
		2433	max_it (op->stats.grace, op->stats.maxgrace);
		2434	max_it (op->stats.food , 200);
		2435
		2436	// remove all spell effects that are active
		2437	// to avoid long-term effects such as word-of-recall
		2438	for (object *item = op->inv; item; )
		2439	{
		2440	object *next = item->below;
		2441
		2442	if (item->type == SPELL_EFFECT && item->active)
		2443	item->destroy ();
		2444
		2445	item = next;
		2446	}
2601		2447
2602	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2448	/* 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.	2449	* in cities ONLY!!! It is very important that this doesn't get abused.
2604	* Look at op_on_battleground() for more info --AndreasV	2450	* Look at op_on_battleground() for more info --AndreasV
2605	*/	2451	*/
2606	if (op_on_battleground (op, &x, &y))	2452	if (op_on_battleground (op, &x, &y))
2607	{	2453	{
2608	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2454	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		2455
2631	/* create a bodypart-trophy to make the winner happy */	2456	/* create a bodypart-trophy to make the winner happy */
2632	if (object *tmp = arch_to_object (archetype::find ("finger")))	2457	object *tmp = archetype::find (shstr_finger)->instance ();
2633	{	2458
2634	tmp->name = format ("%s's finger" , &op->name);	2459	tmp->name = format ("%s's finger" , &op->name);
2635	tmp->name_pl = format ("%s's fingers", &op->name);	2460	tmp->name_pl = format ("%s's fingers", &op->name);
2636	tmp->msg = format (	2461	tmp->msg = format (
2637	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2462	"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,	2463	&op->name, op->contr->title,
2639	(int)op->level,	2464	(int)op->level,
2640	op->contr->killer_name ()	2465	op->contr->killer_name ()
2641	);	2466	);
2642	tmp->value = 0, tmp->type = 0;	2467	tmp->value = 0, tmp->type = 0;
2643	tmp->materialname = "organics";	2468	tmp->material = name_to_material (shstr_organic);
2644	tmp->insert_at (op, tmp);	2469	tmp->insert_at (op, tmp);
2645	}
2646		2470
2647	/* teleport defeated player to new destination */	2471	/* teleport defeated player to new destination */
2648	transfer_ob (op, x, y, 0, NULL);	2472	transfer_ob (op, x, y, 0, NULL);
2649	op->contr->braced = 0;	2473	op->contr->braced = 0;
		2474
		2475	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2650	return;	2476	return;
2651	}	2477	}
		2478
		2479	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2480	deathtab << "T<YOU HAVE DIED>\n\n";
2652		2481
2653	INVOKE_PLAYER (DEATH, op->contr);	2482	INVOKE_PLAYER (DEATH, op->contr);
2654		2483
2655	command_kill_pets (op, 0);	2484	command_kill_pets (op, 0);
2656		2485
…		…
2690		2519
2691	lost_a_stat = 0;	2520	lost_a_stat = 0;
2692		2521
2693	for (z = 0; z < num_stats_lose; z++)	2522	for (z = 0; z < num_stats_lose; z++)
2694	{	2523	{
2695	i = RANDOM () % NUM_STATS;	2524	i = rndm (NUM_STATS);
2696		2525
2697	if (settings.stat_loss_on_death)	2526	if (settings.stat_loss_on_death)
2698	{	2527	{
2699	/* Pick a random stat and take a point off it. Tell the player	2528	/* Pick a random stat and take a point off it. Tell the player
2700	* what he lost.	2529	* what he lost.
…		…
2707	lost_a_stat = 1;	2536	lost_a_stat = 1;
2708	}	2537	}
2709	else	2538	else
2710	{	2539	{
2711	/* deplete a stat */	2540	/* deplete a stat */
2712	archetype *deparch = archetype::find ("depletion");	2541	archetype *deparch = archetype::find (shstr_depletion);
2713	object *dep;	2542	object *dep;
2714		2543
2715	dep = present_arch_in_ob (deparch, op);	2544	dep = present_arch_in_ob (deparch, op);
2716	if (!dep)	2545	if (!dep)
2717	{	2546	{
2718	dep = arch_to_object (deparch);	2547	dep = deparch->instance ();
2719	insert_ob_in_ob (dep, op);	2548	insert_ob_in_ob (dep, op);
2720	}	2549	}
2721	lose_this_stat = 1;	2550	lose_this_stat = 1;
2722	if (settings.balanced_stat_loss)	2551	if (settings.balanced_stat_loss)
2723	{	2552	{
…		…
2751	}	2580	}
2752	}	2581	}
2753		2582
2754	if (lose_this_stat)	2583	if (lose_this_stat)
2755	{	2584	{
2756	this_stat = get_attr_value (&(dep->stats), i);	2585	this_stat = get_attr_value (&dep->stats, i);
2757	/* We could try to do something clever like find another	2586	/* We could try to do something clever like find another
2758	* stat to reduce if this fails. But chances are, if	2587	* stat to reduce if this fails. But chances are, if
2759	* stats have been depleted to -50, all are pretty low	2588	* stats have been depleted to -50, all are pretty low
2760	* and should be roughly the same, so it shouldn't make a	2589	* and should be roughly the same, so it shouldn't make a
2761	* difference.	2590	* difference.
…		…
2775	/* If no stat lost, tell the player. */	2604	/* If no stat lost, tell the player. */
2776	if (!lost_a_stat)	2605	if (!lost_a_stat)
2777	{	2606	{
2778	/* determine_god() seems to not work sometimes... why is this?	2607	/* determine_god() seems to not work sometimes... why is this?
2779	Should I be using something else? GD */	2608	Should I be using something else? GD */
2780	const char *god = determine_god (op);	2609	shstr_tmp god = determine_god (op);
2781		2610
2782	if (god && (strcmp (god, "none")))	2611	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);	2612	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2784	else	2613	else
2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2614	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2786	}	2615	}
2787	#else	2616	#else
2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2617	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2789	#endif	2618	#endif
2790		2619
2791	/* Put a gravestone up where the character 'almost' died. List the	2620	/* Put a gravestone up where the character 'almost' died. List the
2792	* exp loss on the stone.	2621	* exp loss on the stone.
2793	*/	2622	*/
2794	tmp = arch_to_object (archetype::find ("gravestone"));	2623	tmp = archetype::find (shstr_gravestone)->instance ();
2795	tmp->name = format ("%s's gravestone", &op->name);	2624	tmp->name = format ("%s's gravestone", &op->name);
2796	tmp->name_pl = format ("%s's gravestones", &op->name);	2625	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",	2626	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 ());	2627	&op->name, op->contr->title, op->contr->killer_name ());
2799	tmp->x = op->x, tmp->y = op->y;	2628	tmp->x = op->x, tmp->y = op->y;
2800	insert_ob_in_map (tmp, op->map, NULL, 0);	2629	insert_ob_in_map (tmp, op->map, NULL, 0);
2801		2630
2802	/**************************************/	2631	/**************************************/
2803	/* */	2632	/* */
2804	/* Subtract the experience points, */	2633	/* Subtract the experience points, */
2805	/* if we died cause of food, give us */
2806	/* food, and reset HP's... */
2807	/* */	2634	/* */
2808	/**************************************/	2635	/**************************************/
2809		2636
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)); */	2637	/*add_exp(op, (op->stats.exp * -0.20)); */
2844	apply_death_exp_penalty (op);	2638	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		2639
2853	/*	2640	/*
2854	* Check to see if the player has any unpaid items. If so, remove them	2641	* Check to see if the player has any unpaid items. If so, remove them
2855	* and put them back in the map.	2642	* and put them back in the map.
2856	*/	2643	*/
…		…
2893		2680
2894	insert_ob_in_ob (force, op);	2681	insert_ob_in_ob (force, op);
2895	op->update_stats ();	2682	op->update_stats ();
2896	}	2683	}
2897		2684
2898	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2685	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2899	}	2686	}
2900		2687
2901	void	2688	static void
2902	loot_object (object *op)	2689	loot_object (object *op)
2903	{ /* Grab and destroy some treasure */	2690	{ /* Grab and destroy some treasure */
2904	object *tmp, *tmp2, *next;	2691	object *tmp, *tmp2, *next;
2905		2692
2906	op->close_container (); /* close open sack first */	2693	op->close_container (); /* close open sack first */
…		…
2924	{	2711	{
2925	tmp->decrease (rndm (1, tmp->nrof - 1));	2712	tmp->decrease (rndm (1, tmp->nrof - 1));
2926	insert_ob_in_map (tmp, op->map, NULL, 0);	2713	insert_ob_in_map (tmp, op->map, NULL, 0);
2927	}	2714	}
2928	else	2715	else
2929	tmp->destroy (true);	2716	tmp->destroy ();
2930	}	2717	}
2931	else	2718	else
2932	insert_ob_in_map (tmp, op->map, NULL, 0);	2719	insert_ob_in_map (tmp, op->map, NULL, 0);
2933	}	2720	}
2934	}	2721	}
…		…
2937	* fix_weight(): Check recursively the weight of all players, and fix	2724	* fix_weight(): Check recursively the weight of all players, and fix
2938	* what needs to be fixed. Refresh windows and fix speed if anything	2725	* what needs to be fixed. Refresh windows and fix speed if anything
2939	* was changed.	2726	* was changed.
2940	*/	2727	*/
2941	void	2728	void
2942	fix_weight (void)	2729	fix_weight ()
2943	{	2730	{
2944	for_all_players (pl)	2731	for_all_players (pl)
2945	{	2732	{
2946	sint32 old = pl->ob->carrying;	2733	sint32 old = pl->ob->carrying;
2947		2734
…		…
2954	}	2741	}
2955	}	2742	}
2956	}	2743	}
2957		2744
2958	void	2745	void
2959	fix_luck (void)	2746	fix_luck ()
2960	{	2747	{
2961	for_all_players (pl)	2748	for_all_players (pl)
2962	if (!pl->ob->contr->ns->state)	2749	if (!pl->ob->contr->ns->state)
2963	pl->ob->change_luck (0);	2750	pl->ob->change_luck (0);
2964	}	2751	}
…		…
2995	if (op->type == PLAYER)	2782	if (op->type == PLAYER)
2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);	2783	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
2997		2784
2998	cast_spell (op, throw_ob, dir, spob, NULL);	2785	cast_spell (op, throw_ob, dir, spob, NULL);
2999		2786
3000	throw_ob->destroy (true);	2787	throw_ob->destroy ();
3001	}	2788	}
3002		2789
3003	void	2790	void
3004	make_visible (object *op)	2791	make_visible (object *op)
3005	{	2792	{
3006	op->hide = 0;	2793	op->flag [FLAG_HIDDEN] = 0;
3007	op->invisible = 0;	2794	op->invisible = 0;
3008		2795
3009	if (op->type == PLAYER)	2796	if (op->type == PLAYER)
3010	{	2797	{
3011	op->contr->tmp_invis = 0;	2798	op->contr->tmp_invis = 0;
…		…
3036		2823
3037	if (!ob || !ob->map)	2824	if (!ob || !ob->map)
3038	return 0;	2825	return 0;
3039		2826
3040	/* so, on normal lighted maps, its hard to hide */	2827	/* so, on normal lighted maps, its hard to hide */
3041	level = ob->map->darkness - 2;	2828	level = ob->map->darklevel () - 2;
3042		2829
3043	/* this also picks up whether the object is glowing.	2830	/* this also picks up whether the object is glowing.
3044	* If you carry a light on a non-dark map, its not	2831	* If you carry a light on a non-dark map, its not
3045	* as bad as carrying a light on a pitch dark map */	2832	* as bad as carrying a light on a pitch dark map */
3046	if (has_carried_lights (ob))	2833	if (ob->has_carried_lights ())
3047	level = -(10 + (2 * ob->map->darkness));	2834	level = -(10 + (2 * ob->map->darklevel ()));
3048		2835
3049	/* scan through all nearby squares for terrain to hide in */	2836	/* scan through all nearby squares for terrain to hide in */
3050	for (i = 0, x = ob->x, y = ob->y;	2837	for (i = 0, x = ob->x, y = ob->y;
3051	i <= SIZEOFFREE1;	2838	i <= SIZEOFFREE1;
3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2839	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3199	while (op)	2986	while (op)
3200	{	2987	{
3201	dx = rv.distance_x + op->arch->x;	2988	dx = rv.distance_x + op->arch->x;
3202	dy = rv.distance_y + op->arch->y;	2989	dy = rv.distance_y + op->arch->y;
3203		2990
3204	/* only the viewable area the player sees is updated by LOS	2991	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;	2992	return 1;
3212		2993
3213	op = op->more;	2994	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	}	2995	}
3243		2996
3244	return 0;	2997	return 0;
3245	}	2998	}
3246		2999
…		…
3270	&& tmp->name == shstr_battleground	3023	&& tmp->name == shstr_battleground
3271	&& EXIT_X (tmp) && EXIT_Y (tmp))	3024	&& EXIT_X (tmp) && EXIT_Y (tmp))
3272	{	3025	{
3273	/* before we assign the exit, check if this is a teambattle */	3026	/* before we assign the exit, check if this is a teambattle */
3274	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3027	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3275	{
3276	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3028	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3029	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3277	{	3030	{
3278	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3279	{
3280	if (x && y)	3031	if (x && y)
3281	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3032	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3282		3033
3283	return 1;	3034	return 1;
3284	}
3285	}	3035	}
3286	}
3287		3036
3288	if (x && y)	3037	if (x && y)
3289	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3038	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3290		3039
3291	return 1;	3040	return 1;
…		…
3429	else	3178	else
3430	j = 1;	3179	j = 1;
3431	strcat (buf, spellpathnames[i]);	3180	strcat (buf, spellpathnames[i]);
3432	}	3181	}
3433	}	3182	}
		3183
3434	strcat (buf, ".");	3184	strcat (buf, ".");
3435	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3185	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3436	}	3186	}
3437		3187
3438	/* evtl. adding flags: */	3188	/* evtl. adding flags: */
…		…
3448	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3198	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3449	}	3199	}
3450	else	3200	else
3451	{	3201	{
3452	/* generate misc. treasure */	3202	/* generate misc. treasure */
3453	tmp = arch_to_object (tr->item);	3203	tmp = tr->item->instance ();
3454	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3204	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3455	who->insert (tmp);	3205	who->insert (tmp);
3456	}	3206	}
3457	}	3207	}
3458		3208
3459	/**	3209	//-GPL
3460	* Unready an object for a player. This function does nothing if the object was
3461	* not readied.
3462	*/
3463	void
3464	player_unready_range_ob (player *pl, object *ob)
3465	{
3466	if (pl->ob->current_weapon == ob)
3467	pl->ob->current_weapon = 0;
3468
3469	if (pl->combat_ob == ob)
3470	pl->combat_ob = 0;
3471
3472	if (pl->ranged_ob == ob)
3473	pl->ranged_ob = 0;
3474	}
3475		3210
3476	sint8	3211	sint8
3477	player::visibility_at (maptile *map, int x, int y) const	3212	player::darkness_at (maptile *map, int x, int y) const
3478	{	3213	{
3479	if (!ns)	3214	if (!ns)
3480	return 0;	3215	return LOS_BLOCKED;
3481		3216
3482	int dx, dy;	3217	int dx, dy;
3483	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3218	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3484	return 0;	3219	return LOS_BLOCKED;
3485		3220
3486	x += dx - ns->current_x + ns->mapx / 2;	3221	x += dx - ns->current_x;
3487	y += dy - ns->current_y + ns->mapy / 2;	3222	y += dy - ns->current_y;
3488		3223
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];	3224	return blocked_los (x, y);
3493	}	3225	}
3494		3226
3495	void	3227	void
3496	player::infobox (const char *title, const char *msg, int color)	3228	player::infobox (const char *title, const char *msg, int color)
3497	{	3229	{

Diff Legend

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