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.234 by root, Thu Oct 15 21:40:42 2009 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
…		…
32	#include <algorithm>	33	#include <algorithm>
33	#include <functional>	34	#include <functional>
34		35
35	playervec players;	36	playervec players;
36		37
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. */	38	/* This loads the first map an puts the player on it. */
155	static void	39	static void
156	set_first_map (object *op)	40	set_first_map (object *op)
157	{	41	{
158	op->contr->maplevel = first_map_path;	42	op->contr->maplevel = first_map_path;
…		…
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
…		…
252	esrv_send_inventory (ob, ob);	136	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	137	esrv_add_spells (this, 0);
254		138
255	activate ();	139	activate ();
256		140
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);	141	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	142	INVOKE_PLAYER (LOGIN, this);
263	}	143	}
264		144
265	void	145	void
…		…
366	attachable::do_destroy ();	246	attachable::do_destroy ();
367		247
368	if (ob)	248	if (ob)
369	{	249	{
370	ob->destroy_inv (false);	250	ob->destroy_inv (false);
371	ob->destroy (true);	251	ob->destroy ();
372	}	252	}
373		253
374	ob = observe = 0;	254	ob = observe = 0;
375	}	255	}
376		256
…		…
668	|| op->type == CLOAK || op->type == HELMET	548	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	549	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	550	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	551	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
672	{	552	{
673	op->destroy (true);	553	op->destroy ();
674	continue;	554	continue;
675	}	555	}
676	}	556	}
677		557
678	/* This really needs to be better - we should really give	558	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	559	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	560	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	561	*/
684	if (op->type == SPELLBOOK || op->type == SKILL)	562	if (op->type == SKILL)
685	{	563	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	564	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	565	if (tmp->type == op->type && tmp->name == op->name)
		566	{
		567	op->destroy ();
		568	LOG (llevError,
		569	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
690	break;	570	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	}	571	}
698		572
699	if (op->nrof > 1)	573	if (op->nrof > 1)
700	op->nrof = 1;	574	op->nrof = 1;
701	}	575	}
702		576
…		…
714	CLEAR_FLAG (op, FLAG_DAMNED);	588	CLEAR_FLAG (op, FLAG_DAMNED);
715	}	589	}
716		590
717	if (op->type == SPELL)	591	if (op->type == SPELL)
718	{	592	{
719	op->destroy (true);	593	op->destroy ();
720	continue;	594	continue;
721	}	595	}
722	else if (op->type == SKILL)	596	else if (op->type == SKILL)
723	{	597	{
724	SET_FLAG (op, FLAG_CAN_USE_SKILL);	598	SET_FLAG (op, FLAG_CAN_USE_SKILL);
…		…
931	LOG (llevDebug, "Fleeing player is dead.\n");	805	LOG (llevDebug, "Fleeing player is dead.\n");
932	CLEAR_FLAG (op, FLAG_SCARED);	806	CLEAR_FLAG (op, FLAG_SCARED);
933	return;	807	return;
934	}	808	}
935		809
936	if (op->enemy == NULL)	810	if (!op->enemy)
937	{	811	{
938	LOG (llevDebug, "Fleeing player had no enemy.\n");	812	LOG (llevDebug, "Fleeing player had no enemy.\n");
939	CLEAR_FLAG (op, FLAG_SCARED);	813	CLEAR_FLAG (op, FLAG_SCARED);
940	return;	814	return;
941	}	815	}
942		816
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))	817	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
955	{	818	{
956	op->enemy = NULL;	819	op->enemy = NULL;
957	CLEAR_FLAG (op, FLAG_SCARED);	820	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	821	return;
…		…
961	get_rangevector (op, op->enemy, &rv, 0);	824	get_rangevector (op, op->enemy, &rv, 0);
962		825
963	dir = absdir (4 + rv.direction);	826	dir = absdir (4 + rv.direction);
964	for (diff = 0; diff < 3; diff++)	827	for (diff = 0; diff < 3; diff++)
965	{	828	{
966	int m = 1 - (RANDOM () & 2);	829	int m = 1 - rndm (2) * 2;
967		830
968	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	831	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
969	return;	832	return;
970	}	833	}
971		834
…		…
982	check_pick (object *op)	845	check_pick (object *op)
983	{	846	{
984	object *tmp, *next;	847	object *tmp, *next;
985	int stop = 0;	848	int stop = 0;
986	int wvratio;	849	int wvratio;
987	char putstring[128];
988		850
989	/* if you're flying, you cna't pick up anything */	851	/* if you're flying, you cna't pick up anything */
990	if (op->move_type & MOVE_FLYING)	852	if (op->move_type & MOVE_FLYING)
991	return 1;	853	return 1;
992		854
…		…
1016		878
1017	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	879	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1018	{	880	{
1019	if (item_matched_string (op, tmp, op->contr->search_str))	881	if (item_matched_string (op, tmp, op->contr->search_str))
1020	CHK_PICK_PICKUP;	882	CHK_PICK_PICKUP;
		883
1021	continue;	884	continue;
1022	}	885	}
1023		886
1024	/* high not bit set? We're using the old autopickup model */	887	/* pickup handling */
		888	if (op->contr->mode & PU_DEBUG)
		889	{
		890	/* some debugging code to figure out item information */
		891	const char *str = tmp->name
		892	? format ("item name: %s item type: %d weight/value: %d",
		893	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		894	: format ("item name: %s item type: %d weight/value: %d",
		895	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		896
		897	new_draw_info (NDI_UNIQUE, 0, op, str);
		898	}
		899
		900	if (op->contr->mode & PU_INHIBIT)
		901	return 1;
		902
		903	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		904	return 1;
		905
		906	/* philosophy:
		907	* It's easy to grab an item type from a pile, as long as it's
		908	* generic. This takes no game-time. For more detailed pickups
		909	* and selections, select-items should be used. This is a
		910	* grab-as-you-run type mode that's really useful for arrows for
		911	* example.
		912	* The drawback: right now it has no frontend, so you need to
		913	* stick the bits you want into a calculator in hex mode and then
		914	* convert to decimal and then 'pickup <#>
		915	*/
		916
		917	/* the first two modes are exclusive: if NOTHING we return, if
		918	* STOP then we stop. All the rest are applied sequentially,
		919	* meaning if any test passes, the item gets picked up. */
		920
		921	/* if mode is set to pick nothing up, return */
		922	if (op->contr->mode == PU_NOTHING)
		923	return 1;
		924
		925	/* if mode is set to stop when encountering objects, return */
		926	/* take STOP before INHIBIT since it doesn't actually pick
		927	* anything up */
		928	if (op->contr->mode & PU_STOP)
		929	return 0;
		930
		931	/* useful for going into stores and not losing your settings... */
		932	/* and for battles wher you don't want to get loaded down while
		933	* fighting */
		934	if (op->contr->mode & PU_INHIBIT)
		935	return 1;
		936
		937	/* prevent us from turning into auto-thieves :) */
		938	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		939	continue;
		940
		941	/* ignore known cursed objects */
		942	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		943	continue;
		944
		945	/* all food and drink if desired */
		946	/* question: don't pick up known-poisonous stuff? */
1025	if (!(op->contr->mode & PU_NEWMODE))	947	if (op->contr->mode & PU_FOOD)
		948	if (tmp->type == FOOD)
1026	{	949	{
1027	switch (op->contr->mode)	950	CHK_PICK_PICKUP;
		951	continue;
		952	}
		953
		954	if (op->contr->mode & PU_DRINK)
		955	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		956	{
		957	CHK_PICK_PICKUP;
		958	continue;
		959	}
		960
		961	if (op->contr->mode & PU_POTION)
		962	if (tmp->type == POTION)
		963	{
		964	CHK_PICK_PICKUP;
		965	continue;
		966	}
		967
		968	/* spellbooks, skillscrolls and normal books/scrolls */
		969	if (op->contr->mode & PU_SPELLBOOK)
		970	if (tmp->type == SPELLBOOK)
		971	{
		972	CHK_PICK_PICKUP;
		973	continue;
		974	}
		975
		976	if (op->contr->mode & PU_SKILLSCROLL)
		977	if (tmp->type == SKILLSCROLL)
		978	{
		979	CHK_PICK_PICKUP;
		980	continue;
		981	}
		982
		983	if (op->contr->mode & PU_READABLES)
		984	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		985	{
		986	CHK_PICK_PICKUP;
		987	continue;
		988	}
		989
		990	/* wands/staves/rods/horns */
		991	if (op->contr->mode & PU_MAGIC_DEVICE)
		992	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		993	{
		994	CHK_PICK_PICKUP;
		995	continue;
		996	}
		997
		998	/* pick up all magical items */
		999	if (op->contr->mode & PU_MAGICAL)
		1000	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1001	{
		1002	CHK_PICK_PICKUP;
		1003	continue;
		1004	}
		1005
		1006	if (op->contr->mode & PU_VALUABLES)
		1007	{
		1008	if (tmp->type == MONEY || tmp->type == GEM)
1028	{	1009	{
1029	case 0:
1030	return 1; /* don't pick up */
1031	case 1:
1032	CHK_PICK_PICKUP;	1010	CHK_PICK_PICKUP;
1033	return 1;	1011	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	}	1012	}
1063	}	1013	}
1064	else	1014
1065	{ /* old model */	1015	/* rings & amulets - talismans seems to be typed AMULET */
1066	/* NEW pickup handling */
1067	if (op->contr->mode & PU_DEBUG)	1016	if (op->contr->mode & PU_JEWELS)
		1017	if (tmp->type == RING || tmp->type == AMULET)
1068	{	1018	{
1069	/* some debugging code to figure out item information */	1019	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;	1020	continue;
		1021	}
1116		1022
1117	/* ignore known cursed objects */	1023	/* we don't forget dragon food */
1118	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1024	if (op->contr->mode & PU_FLESH)
		1025	if (tmp->type == FLESH)
		1026	{
		1027	CHK_PICK_PICKUP;
1119	continue;	1028	continue;
		1029	}
1120		1030
1121	/* all food and drink if desired */	1031	/* bows and arrows. Bows are good for selling! */
1122	/* question: don't pick up known-poisonous stuff? */	1032	if (op->contr->mode & PU_BOW)
		1033	if (tmp->type == BOW)
		1034	{
		1035	CHK_PICK_PICKUP;
		1036	continue;
		1037	}
		1038
		1039	if (op->contr->mode & PU_ARROW)
		1040	if (tmp->type == ARROW)
		1041	{
		1042	CHK_PICK_PICKUP;
		1043	continue;
		1044	}
		1045
		1046	/* all kinds of armor etc. */
		1047	if (op->contr->mode & PU_ARMOUR)
		1048	if (tmp->type == ARMOUR)
		1049	{
		1050	CHK_PICK_PICKUP;
		1051	continue;
		1052	}
		1053
		1054	if (op->contr->mode & PU_HELMET)
		1055	if (tmp->type == HELMET)
		1056	{
		1057	CHK_PICK_PICKUP;
		1058	continue;
		1059	}
		1060
		1061	if (op->contr->mode & PU_SHIELD)
		1062	if (tmp->type == SHIELD)
		1063	{
		1064	CHK_PICK_PICKUP;
		1065	continue;
		1066	}
		1067
1123	if (op->contr->mode & PU_FOOD)	1068	if (op->contr->mode & PU_BOOTS)
1124	if (tmp->type == FOOD)	1069	if (tmp->type == BOOTS)
		1070	{
		1071	CHK_PICK_PICKUP;
		1072	continue;
		1073	}
		1074
		1075	if (op->contr->mode & PU_GLOVES)
		1076	if (tmp->type == GLOVES)
		1077	{
		1078	CHK_PICK_PICKUP;
		1079	continue;
		1080	}
		1081
		1082	if (op->contr->mode & PU_CLOAK)
		1083	if (tmp->type == CLOAK)
		1084	{
		1085	CHK_PICK_PICKUP;
		1086	continue;
		1087	}
		1088
		1089	/* hoping to catch throwing daggers here */
		1090	if (op->contr->mode & PU_MISSILEWEAPON)
		1091	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1092	{
		1093	CHK_PICK_PICKUP;
		1094	continue;
		1095	}
		1096
		1097	/* careful: chairs and tables are weapons! */
		1098	if (op->contr->mode & PU_ALLWEAPON)
		1099	{
		1100	if (tmp->type == WEAPON)
		1101	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1125	{	1102	{
1126	CHK_PICK_PICKUP;	1103	CHK_PICK_PICKUP;
1127	continue;	1104	continue;
1128	}	1105	}
		1106	}
1129		1107
		1108	/* misc stuff that's useful */
1130	if (op->contr->mode & PU_DRINK)	1109	if (op->contr->mode & PU_KEY)
1131	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1110	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1132	{	1111	{
1133	CHK_PICK_PICKUP;	1112	CHK_PICK_PICKUP;
1134	continue;	1113	continue;
1135	}	1114	}
1136		1115
		1116	/* any of the last 4 bits set means we use the ratio for value
		1117	* pickups */
1137	if (op->contr->mode & PU_POTION)	1118	if (op->contr->mode & PU_RATIO)
1138	if (tmp->type == POTION)	1119	{
		1120	/* use value density to decide what else to grab */
		1121	/* >=7 was >= op->contr->mode */
		1122	/* >=7 is the old standard setting. Now we take the last 4 bits
1139	{	1123	*/
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)	1124	wvratio = op->contr->mode & PU_RATIO;
1176	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1125	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	{	1126	{
1184	if (tmp->type == MONEY || tmp->type == GEM)	1127	#if 0
		1128	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1129	if (tmp->name != NULL)
1185	{	1130	{
1186	CHK_PICK_PICKUP;	1131	fprintf (stderr, "%s", tmp->name);
1187	continue;
1188	}	1132	}
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	1133	else
1323	fprintf (stderr, "%s", tmp->arch->archname);	1134	fprintf (stderr, "%s", tmp->arch->archname);
1324	fprintf (stderr, ",%d] = ", tmp->type);	1135	fprintf (stderr, ",%d] = ", tmp->type);
1325	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1136	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1326	#endif	1137	#endif
		1138	CHK_PICK_PICKUP;
1327	continue;	1139	continue;
1328	}
1329	}	1140	}
1330	} /* the new pickup model */	1141	} /* the new pickup model */
1331	}	1142	}
1332		1143
1333	return !stop;	1144	return !stop;
…		…
1361	* against the target. A full test is not performed, simply a basic test	1172	* 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	1173	* 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.	1174	* the hall. Failing that it does it's best to pick the highest plus arrow.
1364	*/	1175	*/
1365	object *	1176	object *
1366	find_better_arrow (object *op, object *target, const char *type, int *better)	1177	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1367	{	1178	{
1368	object *tmp = NULL, *arrow, *ntmp;	1179	object *tmp = NULL, *arrow, *ntmp;
1369	int attacknum, attacktype, betterby = 0, i;	1180	int attacknum, attacktype, betterby = 0, i;
1370		1181
1371	if (!type)	1182	if (!type)
…		…
1375	{	1186	{
1376	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1187	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1377	{	1188	{
1378	i = 0;	1189	i = 0;
1379	ntmp = find_better_arrow (arrow, target, type, &i);	1190	ntmp = find_better_arrow (arrow, target, type, &i);
		1191
1380	if (i > betterby)	1192	if (i > betterby)
1381	{	1193	{
1382	tmp = ntmp;	1194	tmp = ntmp;
1383	betterby = i;	1195	betterby = i;
1384	}	1196	}
1385	}	1197	}
1386	else if (arrow->type == ARROW && arrow->race == type)	1198	else if (arrow->type == ARROW && arrow->race == type)
1387	{	1199	{
1388	/* allways prefer assasination/slaying */	1200	/* allways prefer assasination/slaying */
1389	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1201	if (target->race && arrow->slaying.contains (target->race))
1390	{	1202	{
1391	if (arrow->attacktype & AT_DEATH)	1203	if (arrow->attacktype & AT_DEATH)
1392	{	1204	{
1393	*better = 100;	1205	*better = 100;
1394	return arrow;	1206	return arrow;
…		…
1409	{	1221	{
1410	tmp = arrow;	1222	tmp = arrow;
1411	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1223	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1412	}	1224	}
1413	}	1225	}
		1226
1414	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1227	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1415	{	1228	{
1416	tmp = arrow;	1229	tmp = arrow;
1417	betterby = 2 + arrow->magic + arrow->stats.dam;	1230	betterby = 2 + arrow->magic + arrow->stats.dam;
1418	}	1231	}
		1232
1419	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1233	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1420	{	1234	{
1421	tmp = arrow;	1235	tmp = arrow;
1422	betterby = 1 + arrow->magic + arrow->stats.dam;	1236	betterby = 1 + arrow->magic + arrow->stats.dam;
1423	}	1237	}
…		…
1437	* op = the shooter	1251	* op = the shooter
1438	* type = bow->race	1252	* type = bow->race
1439	* dir = fire direction	1253	* dir = fire direction
1440	*/	1254	*/
1441	object *	1255	object *
1442	pick_arrow_target (object *op, const char *type, int dir)	1256	pick_arrow_target (object *op, shstr_cmp type, int dir)
1443	{	1257	{
1444	object *tmp = NULL;	1258	object *tmp = NULL;
1445	maptile *m;	1259	maptile *m;
1446	int i, mflags, found, number;	1260	int i, mflags, found, number;
1447	sint16 x, y;	1261	sint16 x, y;
…		…
1462	for (i = 0, found = 0; i < 20; i++)	1276	for (i = 0, found = 0; i < 20; i++)
1463	{	1277	{
1464	x += freearr_x[dir];	1278	x += freearr_x[dir];
1465	y += freearr_y[dir];	1279	y += freearr_y[dir];
1466	mflags = get_map_flags (m, &m, x, y, &x, &y);	1280	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1281
1467	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1282	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1468	{	1283	{
1469	tmp = NULL;	1284	tmp = 0;
1470	break;	1285	break;
1471	}	1286	}
1472	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1287	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1473	{	1288	{
1474	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1289	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1475	* perhaps a bad assumption.	1290	* perhaps a bad assumption.
1476	*/	1291	*/
1477	tmp = NULL;	1292	tmp = 0;
1478	break;	1293	break;
1479	}	1294	}
		1295
1480	if (mflags & P_IS_ALIVE)	1296	if (mflags & P_IS_ALIVE)
1481	{
1482	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1297	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1483	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1298	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1484	{
1485	found++;
1486	break;
1487	}
1488	if (found)
1489	break;	1299	break;
1490	}
1491	}	1300	}
1492	if (tmp == NULL)	1301
		1302	if (!tmp)
1493	return find_arrow (op, type);	1303	return find_arrow (op, type);
1494		1304
1495	if (tmp->head)	1305	if (tmp->head)
1496	tmp = tmp->head;	1306	tmp = tmp->head;
1497		1307
…		…
1537	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1347	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1538	return 0;	1348	return 0;
1539	}	1349	}
1540		1350
1541	// optimisation: move object to top so we will find it quickly again	1351	// optimisation: move object to top so we will find it quickly again
1542	if (bow->below)	1352	splay (bow);
1543	{
1544	bow->remove ();
1545	op->insert (bow);
1546	}
1547
1548	}	1353	}
1549		1354
1550	if (!bow->race || !bow->skill)	1355	if (!bow->race || !bow->skill)
1551	{	1356	{
1552	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1357	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1579		1384
1580	/* this should not happen, but sometimes does */	1385	/* this should not happen, but sometimes does */
1581	if (arrow->nrof == 0)	1386	if (arrow->nrof == 0)
1582	{	1387	{
1583	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());	1388	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1584	arrow->destroy (true);	1389	arrow->destroy ();
1585	return 0;	1390	return 0;
1586	}	1391	}
1587		1392
1588	left = arrow; /* these are arrows left to the player */	1393	left = arrow; /* these are arrows left to the player */
1589	arrow = arrow->split ();	1394	arrow = arrow->split ();
…		…
1598	arrow->direction = dir;	1403	arrow->direction = dir;
1599		1404
1600	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1405	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601	arrow->stats.hp = arrow->stats.dam;	1406	arrow->stats.hp = arrow->stats.dam;
1602	arrow->stats.grace = arrow->attacktype;	1407	arrow->stats.grace = arrow->attacktype;
1603		1408	arrow->custom_name = arrow->slaying;
1604	if (arrow->slaying)
1605	arrow->spellarg = strdup (arrow->slaying);
1606		1409
1607	#if 0	1410	#if 0
1608	if (player *pl = op->contr)	1411	if (player *pl = op->contr)
1609	{	1412	{
1610	float speed = pl->weapon_sp;	1413	float speed = pl->weapon_sp;
…		…
1675	* hence the function name.	1478	* hence the function name.
1676	*/	1479	*/
1677	int	1480	int
1678	player_fire_bow (object *op, int dir)	1481	player_fire_bow (object *op, int dir)
1679	{	1482	{
1680	int ret = 0, wcmod = 0;	1483	int ret;
1681		1484
1682	if (op->contr->bowtype == bow_bestarrow)	1485	if (op->contr->bowtype == bow_bestarrow)
1683	{	1486	{
1684	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1487	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1685	}	1488	}
1686	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1489	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1687	{	1490	{
1688	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1491	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);	1492	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1692	}	1493	}
1693	else if (op->contr->bowtype == bow_threewide)	1494	else if (op->contr->bowtype == bow_threewide)
1694	{	1495	{
1695	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1496	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)]);	1497	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)]);	1498	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1698	}	1499	}
1699	else if (op->contr->bowtype == bow_spreadshot)	1500	else if (op->contr->bowtype == bow_spreadshot)
1700	{	1501	{
1701	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1502	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);	1503	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);	1504	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1704	}	1505	}
1705	else	1506	else
1706	{	1507	{
…		…
1763	}	1564	}
1764	}	1565	}
1765		1566
1766	if (cast_spell (op, item, dir, item->inv, NULL))	1567	if (cast_spell (op, item, dir, item->inv, NULL))
1767	{	1568	{
1768	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1569	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1570
1769	if (item->type == WAND)	1571	if (item->type == WAND)
1770	{	1572	{
1771	if (!(--item->stats.food))	1573	if (!(--item->stats.food))
1772	{	1574	{
1773	object *tmp;	1575	object *tmp;
…		…
1793	bool	1595	bool
1794	fire (object *op, int dir)	1596	fire (object *op, int dir)
1795	{	1597	{
1796	int spellcost = 0;	1598	int spellcost = 0;
1797		1599
1798	/* check for loss of invisiblity/hide */
1799	if (action_makes_visible (op))
1800	make_visible (op);
1801
1802	player *pl = op->contr;	1600	player *pl = op->contr;
1803		1601
1804	if (pl->golem)	1602	if (pl->golem)
1805	{	1603	{
1806	control_golem (op->contr->golem, dir);	1604	control_golem (op->contr->golem, dir);
…		…
1808	}	1606	}
1809		1607
1810	object *ob = pl->ranged_ob;	1608	object *ob = pl->ranged_ob;
1811		1609
1812	if (!ob)	1610	if (!ob)
1813	return false;
1814
1815	if (!op->change_weapon (ob))
1816	return false;	1611	return false;
1817		1612
1818	if (op->speed_left > 0.f)	1613	if (op->speed_left > 0.f)
1819	--op->speed_left;	1614	--op->speed_left;
1820	else	1615	else
1821	return false;	1616	return false;
1822		1617
		1618	if (!op->change_weapon (ob))
		1619	return false;
		1620
		1621	/* check for loss of invisiblity/hide */
		1622	if (action_makes_visible (op))
		1623	make_visible (op);
		1624
1823	switch (ob->type)	1625	switch (ob->type)
1824	{	1626	{
1825	case BOW:	1627	case BOW:
1826	player_fire_bow (op, dir);	1628	player_fire_bow (op, dir);
1827	break;	1629	break;
1828		1630
1829	case SPELL:	1631	case SPELL:
1830	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1632	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1831	break;	1633	break;
1832		1634
1833	case BUILDER:	1635	case BUILDER:
1834	apply_map_builder (op, dir);	1636	apply_map_builder (op, dir);
1835	break;	1637	break;
…		…
1868	/* First, lets try to find a key in the top level inventory */	1670	/* First, lets try to find a key in the top level inventory */
1869	for (tmp = container->inv; tmp; tmp = tmp->below)	1671	for (tmp = container->inv; tmp; tmp = tmp->below)
1870	{	1672	{
1871	if (door->type == DOOR && tmp->type == KEY)	1673	if (door->type == DOOR && tmp->type == KEY)
1872	break;	1674	break;
		1675
1873	/* For sanity, we should really check door type, but other stuff	1676	/* For sanity, we should really check door type, but other stuff
1874	* (like containers) can be locked with special keys	1677	* (like containers) can be locked with special keys
1875	*/	1678	*/
1876	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1679	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1877	break;	1680	break;
…		…
1883	* a key, return	1686	* a key, return
1884	*/	1687	*/
1885	if (!tmp)	1688	if (!tmp)
1886	{	1689	{
1887	for (tmp = container->inv; tmp; tmp = tmp->below)	1690	for (tmp = container->inv; tmp; tmp = tmp->below)
1888	{
1889	/* No reason to search empty containers */	1691	/* No reason to search empty containers */
1890	if (tmp->type == CONTAINER && tmp->inv)	1692	if (tmp->type == CONTAINER && tmp->inv)
1891	{
1892	if ((key = find_key (pl, tmp, door)))	1693	if ((key = find_key (pl, tmp, door)))
1893	return key;	1694	return key;
1894	}
1895	}
1896		1695
1897	if (!tmp)	1696	if (!tmp)
1898	return NULL;	1697	return 0;
1899	}	1698	}
1900		1699
1901	/* We get down here if we have found a key. Now if its in a container,	1700	/* 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	1701	* see if we actually want to use it
1903	*/	1702	*/
1904	if (pl != container)	1703	if (pl != container)
1905	{	1704	{
1906	/* Only let players use keys in containers */	1705	/* Only let players use keys in containers */
1907	if (!pl->contr)	1706	if (!pl->contr)
1908	return NULL;	1707	return 0;
		1708
1909	/* cases where this fails:	1709	/* cases where this fails:
1910	* If we only search the player inventory, return now since we	1710	* If we only search the player inventory, return now since we
1911	* are not in the players inventory.	1711	* are not in the players inventory.
1912	* If the container is not active, return now since only active	1712	* If the container is not active, return now since only active
1913	* containers can be used.	1713	* containers can be used.
…		…
1919	* Change the color so that the message doesn't disappear with	1719	* Change the color so that the message doesn't disappear with
1920	* all the others.	1720	* all the others.
1921	*/	1721	*/
1922	if (pl->contr->usekeys == key_inventory ||	1722	if (pl->contr->usekeys == key_inventory ||
1923	!QUERY_FLAG (container, FLAG_APPLIED) ||	1723	!QUERY_FLAG (container, FLAG_APPLIED) ||
1924	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1724	(pl->contr->usekeys == keyrings && container->race != shstr_keys))
1925	{	1725	{
1926	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1726	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));	1727	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1928	return NULL;	1728	return NULL;
1929	}	1729	}
…		…
1987	* going to try and move (not fire weapons).	1787	* going to try and move (not fire weapons).
1988	*/	1788	*/
1989	bool	1789	bool
1990	move_player_attack (object *op, int dir)	1790	move_player_attack (object *op, int dir)
1991	{	1791	{
		1792	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1793	{
		1794	--op->speed_left;
		1795	return true;
		1796	}
		1797
1992	int on_battleground;	1798	int on_battleground;
1993		1799
1994	sint16 nx = freearr_x[dir] + op->x;	1800	sint16 nx = freearr_x[dir] + op->x;
1995	sint16 ny = freearr_y[dir] + op->y;	1801	sint16 ny = freearr_y[dir] + op->y;
1996		1802
1997	on_battleground = op_on_battleground (op, 0, 0);	1803	on_battleground = op_on_battleground (op, 0, 0);
1998		1804
1999	if (out_of_map (op->map, nx, ny))	1805	if (out_of_map (op->map, nx, ny))
2000	return false;	1806	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		1807
2008	/* If braced, or can't move to the square, and it is not out of the	1808	/* 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	1809	* 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	1810	* 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	1811	* player. This is a pretty nasty hack, because if we could
…		…
2071	--op->speed_left;	1871	--op->speed_left;
2072		1872
2073	op->play_sound (sound_find ("push_player"));	1873	op->play_sound (sound_find ("push_player"));
2074	push_ob (mon, dir, op);	1874	push_ob (mon, dir, op);
2075		1875
2076	if (op->contr->tmp_invis || op->hide)	1876	if (action_makes_visible (op))
2077	make_visible (op);	1877	make_visible (op);
2078		1878
2079	return true;	1879	return true;
2080	}	1880	}
2081	else	1881	else
…		…
2103	push_ob (mon, dir, op);	1903	push_ob (mon, dir, op);
2104	}	1904	}
2105	else	1905	else
2106	op->statusmsg ("You withhold your attack");	1906	op->statusmsg ("You withhold your attack");
2107		1907
2108	if (op->contr->tmp_invis || op->hide)	1908	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2109	make_visible (op);	1909	make_visible (op);
2110		1910
2111	return true;	1911	return true;
2112	}	1912	}
2113	}	1913	}
…		…
2171	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	1971	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2172	dir = absdir (dir + rndm (3) + rndm (3) - 2);	1972	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2173		1973
2174	op->facing = dir;	1974	op->facing = dir;
2175		1975
2176	if (op->hide)	1976	if (op->flag [FLAG_HIDDEN])
2177	do_hidden_move (op);	1977	do_hidden_move (op);
2178		1978
2179	bool retval;	1979	bool retval;
2180		1980
2181	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	1981	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2053	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2254	{	2054	{
2255	op->play_sound (sound_find ("ob_evaporate"));	2055	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));	2056	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2257		2057
2258	tmp->destroy (true);	2058	tmp->destroy ();
2259	CLEAR_FLAG (op, FLAG_LIFESAVE);	2059	CLEAR_FLAG (op, FLAG_LIFESAVE);
2260		2060
2261	if (op->stats.hp < 0)	2061	if (op->stats.hp < 0)
2262	op->stats.hp = op->stats.maxhp;	2062	op->stats.hp = op->stats.maxhp;
2263		2063
…		…
2499	{	2299	{
2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2300	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501		2301
2502	if (over_hp > 0)	2302	if (over_hp > 0)
2503	{	2303	{
2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2304	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505	op->last_heal = 0;	2305	op->last_heal = 0;
2506	}	2306	}
2507	else	2307	else
2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2308	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2509	}	2309	}
…		…
2569	op->stats.food = 0;	2369	op->stats.food = 0;
2570		2370
2571	if (op->stats.hp < 0)	2371	if (op->stats.hp < 0)
2572	{	2372	{
2573	op->contr->killer = archetype::get ("killer_starvation");	2373	op->contr->killer = archetype::get ("killer_starvation");
2574	op->contr->killer->destroy (true);	2374	op->contr->killer->destroy ();
2575	}	2375	}
2576	}	2376	}
2577		2377
2578	/* killer should be set here already */	2378	/* killer should be set here already */
2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2379	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
…		…
2588	*/	2388	*/
2589	void	2389	void
2590	kill_player (object *op)	2390	kill_player (object *op)
2591	{	2391	{
2592	int x, y;	2392	int x, y;
2593	char buf[MAX_BUF];
2594	maptile *map; /* this is for resurrection */	2393	maptile *map; /* this is for resurrection */
2595	int will_kill_again;	2394	int will_kill_again;
2596	archetype *at;	2395	archetype *at;
2597	object *tmp;	2396	object *tmp;
2598		2397
2599	if (save_life (op))	2398	if (save_life (op))
2600	return;	2399	return;
		2400
		2401	dynbuf_text deathtab;
		2402
		2403	/* restore player */
		2404	at = archetype::find ("poisoning");
		2405	if (object *tmp = present_arch_in_ob (at, op))
		2406	{
		2407	tmp->destroy ();
		2408	deathtab << "Your body feels cleansed...\r";
		2409	}
		2410
		2411	at = archetype::find ("confusion");
		2412	if (object *tmp = present_arch_in_ob (at, op))
		2413	{
		2414	tmp->destroy ();
		2415	deathtab << "Your mind feels clearer...\r";
		2416	}
		2417
		2418	cure_disease (op, 0, 0); /* remove any disease */
		2419
		2420	max_it (op->stats.hp , op->stats.maxhp);
		2421	max_it (op->stats.sp , op->stats.maxsp);
		2422	max_it (op->stats.grace, op->stats.maxgrace);
		2423
		2424	if (op->stats.food <= 0)
		2425	op->stats.food = 999;
		2426
		2427	// remove all spell effects that are active
		2428	// to avoid long-term effects such as word-of-recall
		2429	for (object *item = op->inv; item; )
		2430	{
		2431	object *next = item->below;
		2432
		2433	if (item->type == SPELL_EFFECT && item->active)
		2434	item->destroy ();
		2435
		2436	item = next;
		2437	}
2601		2438
2602	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2439	/* 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.	2440	* in cities ONLY!!! It is very important that this doesn't get abused.
2604	* Look at op_on_battleground() for more info --AndreasV	2441	* Look at op_on_battleground() for more info --AndreasV
2605	*/	2442	*/
2606	if (op_on_battleground (op, &x, &y))	2443	if (op_on_battleground (op, &x, &y))
2607	{	2444	{
2608	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2445	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		2446
2631	/* create a bodypart-trophy to make the winner happy */	2447	/* create a bodypart-trophy to make the winner happy */
2632	if (object *tmp = arch_to_object (archetype::find ("finger")))	2448	if (object *tmp = arch_to_object (archetype::find ("finger")))
2633	{	2449	{
2634	tmp->name = format ("%s's finger" , &op->name);	2450	tmp->name = format ("%s's finger" , &op->name);
…		…
2645	}	2461	}
2646		2462
2647	/* teleport defeated player to new destination */	2463	/* teleport defeated player to new destination */
2648	transfer_ob (op, x, y, 0, NULL);	2464	transfer_ob (op, x, y, 0, NULL);
2649	op->contr->braced = 0;	2465	op->contr->braced = 0;
		2466
		2467	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2650	return;	2468	return;
2651	}	2469	}
		2470
		2471	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2472	deathtab << "T<YOU HAVE DIED>\n\n";
2652		2473
2653	INVOKE_PLAYER (DEATH, op->contr);	2474	INVOKE_PLAYER (DEATH, op->contr);
2654		2475
2655	command_kill_pets (op, 0);	2476	command_kill_pets (op, 0);
2656		2477
…		…
2690		2511
2691	lost_a_stat = 0;	2512	lost_a_stat = 0;
2692		2513
2693	for (z = 0; z < num_stats_lose; z++)	2514	for (z = 0; z < num_stats_lose; z++)
2694	{	2515	{
2695	i = RANDOM () % NUM_STATS;	2516	i = rndm (NUM_STATS);
2696		2517
2697	if (settings.stat_loss_on_death)	2518	if (settings.stat_loss_on_death)
2698	{	2519	{
2699	/* Pick a random stat and take a point off it. Tell the player	2520	/* Pick a random stat and take a point off it. Tell the player
2700	* what he lost.	2521	* what he lost.
…		…
2751	}	2572	}
2752	}	2573	}
2753		2574
2754	if (lose_this_stat)	2575	if (lose_this_stat)
2755	{	2576	{
2756	this_stat = get_attr_value (&(dep->stats), i);	2577	this_stat = get_attr_value (&dep->stats, i);
2757	/* We could try to do something clever like find another	2578	/* We could try to do something clever like find another
2758	* stat to reduce if this fails. But chances are, if	2579	* stat to reduce if this fails. But chances are, if
2759	* stats have been depleted to -50, all are pretty low	2580	* stats have been depleted to -50, all are pretty low
2760	* and should be roughly the same, so it shouldn't make a	2581	* and should be roughly the same, so it shouldn't make a
2761	* difference.	2582	* difference.
…		…
2775	/* If no stat lost, tell the player. */	2596	/* If no stat lost, tell the player. */
2776	if (!lost_a_stat)	2597	if (!lost_a_stat)
2777	{	2598	{
2778	/* determine_god() seems to not work sometimes... why is this?	2599	/* determine_god() seems to not work sometimes... why is this?
2779	Should I be using something else? GD */	2600	Should I be using something else? GD */
2780	const char *god = determine_god (op);	2601	shstr_tmp god = determine_god (op);
2781		2602
2782	if (god && (strcmp (god, "none")))	2603	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);	2604	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2784	else	2605	else
2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2606	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2786	}	2607	}
2787	#else	2608	#else
2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2609	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2789	#endif	2610	#endif
2790		2611
2791	/* Put a gravestone up where the character 'almost' died. List the	2612	/* Put a gravestone up where the character 'almost' died. List the
2792	* exp loss on the stone.	2613	* exp loss on the stone.
2793	*/	2614	*/
…		…
2800	insert_ob_in_map (tmp, op->map, NULL, 0);	2621	insert_ob_in_map (tmp, op->map, NULL, 0);
2801		2622
2802	/**************************************/	2623	/**************************************/
2803	/* */	2624	/* */
2804	/* Subtract the experience points, */	2625	/* Subtract the experience points, */
2805	/* if we died cause of food, give us */
2806	/* food, and reset HP's... */
2807	/* */	2626	/* */
2808	/**************************************/	2627	/**************************************/
2809		2628
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)); */	2629	/*add_exp(op, (op->stats.exp * -0.20)); */
2844	apply_death_exp_penalty (op);	2630	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		2631
2853	/*	2632	/*
2854	* Check to see if the player has any unpaid items. If so, remove them	2633	* Check to see if the player has any unpaid items. If so, remove them
2855	* and put them back in the map.	2634	* and put them back in the map.
2856	*/	2635	*/
…		…
2893		2672
2894	insert_ob_in_ob (force, op);	2673	insert_ob_in_ob (force, op);
2895	op->update_stats ();	2674	op->update_stats ();
2896	}	2675	}
2897		2676
2898	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2899	}	2678	}
2900		2679
2901	void	2680	void
2902	loot_object (object *op)	2681	loot_object (object *op)
2903	{ /* Grab and destroy some treasure */	2682	{ /* Grab and destroy some treasure */
…		…
2924	{	2703	{
2925	tmp->decrease (rndm (1, tmp->nrof - 1));	2704	tmp->decrease (rndm (1, tmp->nrof - 1));
2926	insert_ob_in_map (tmp, op->map, NULL, 0);	2705	insert_ob_in_map (tmp, op->map, NULL, 0);
2927	}	2706	}
2928	else	2707	else
2929	tmp->destroy (true);	2708	tmp->destroy ();
2930	}	2709	}
2931	else	2710	else
2932	insert_ob_in_map (tmp, op->map, NULL, 0);	2711	insert_ob_in_map (tmp, op->map, NULL, 0);
2933	}	2712	}
2934	}	2713	}
…		…
2995	if (op->type == PLAYER)	2774	if (op->type == PLAYER)
2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);	2775	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
2997		2776
2998	cast_spell (op, throw_ob, dir, spob, NULL);	2777	cast_spell (op, throw_ob, dir, spob, NULL);
2999		2778
3000	throw_ob->destroy (true);	2779	throw_ob->destroy ();
3001	}	2780	}
3002		2781
3003	void	2782	void
3004	make_visible (object *op)	2783	make_visible (object *op)
3005	{	2784	{
3006	op->hide = 0;	2785	op->flag [FLAG_HIDDEN] = 0;
3007	op->invisible = 0;	2786	op->invisible = 0;
3008		2787
3009	if (op->type == PLAYER)	2788	if (op->type == PLAYER)
3010	{	2789	{
3011	op->contr->tmp_invis = 0;	2790	op->contr->tmp_invis = 0;
…		…
3036		2815
3037	if (!ob || !ob->map)	2816	if (!ob || !ob->map)
3038	return 0;	2817	return 0;
3039		2818
3040	/* so, on normal lighted maps, its hard to hide */	2819	/* so, on normal lighted maps, its hard to hide */
3041	level = ob->map->darkness - 2;	2820	level = ob->map->darklevel () - 2;
3042		2821
3043	/* this also picks up whether the object is glowing.	2822	/* this also picks up whether the object is glowing.
3044	* If you carry a light on a non-dark map, its not	2823	* If you carry a light on a non-dark map, its not
3045	* as bad as carrying a light on a pitch dark map */	2824	* as bad as carrying a light on a pitch dark map */
3046	if (has_carried_lights (ob))	2825	if (ob->has_carried_lights ())
3047	level = -(10 + (2 * ob->map->darkness));	2826	level = -(10 + (2 * ob->map->darklevel ()));
3048		2827
3049	/* scan through all nearby squares for terrain to hide in */	2828	/* scan through all nearby squares for terrain to hide in */
3050	for (i = 0, x = ob->x, y = ob->y;	2829	for (i = 0, x = ob->x, y = ob->y;
3051	i <= SIZEOFFREE1;	2830	i <= SIZEOFFREE1;
3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2831	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3199	while (op)	2978	while (op)
3200	{	2979	{
3201	dx = rv.distance_x + op->arch->x;	2980	dx = rv.distance_x + op->arch->x;
3202	dy = rv.distance_y + op->arch->y;	2981	dy = rv.distance_y + op->arch->y;
3203		2982
3204	/* only the viewable area the player sees is updated by LOS	2983	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;	2984	return 1;
3212		2985
3213	op = op->more;	2986	op = op->more;
3214	}	2987	}
3215		2988
3216	return 0;	2989	return 0;
3217	}	2990	}
3218		2991
3219	/* routine for both players and monsters. We call this when	2992	/* routine for both players and monsters. We call this when
3220	* there is a possibility for our action distrubing our hiding	2993	* there is a possibility for our action distrubing our hiding
3221	* place or invisiblity spell. Artefact invisiblity is not	2994	* place or invisiblity spell. Artefact invisiblity causes
3222	* effected by this. If we arent invisible to begin with, we	2995	* "noise" instead. If we arent invisible to begin with, we
3223	* return 0.	2996	* return 0.
3224	*/	2997	*/
3225	int	2998	int
3226	action_makes_visible (object *op)	2999	action_makes_visible (object *op)
3227	{	3000	{
3228	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3001	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3229	{	3002	{
3230	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3003	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3004	{
		3005	// artefact invisibility is permanent, but we still make noise
		3006	// this is important for game-balance.
		3007	if (op->contr)
		3008	op->make_noise ();
		3009
3231	return 0;	3010	return 0;
		3011	}
3232		3012
3233	if (op->contr && op->contr->tmp_invis == 0)	3013	if (op->contr && op->contr->tmp_invis == 0)
3234	return 0;	3014	return 0;
3235		3015
3236	/* If monsters, they should become visible */	3016	/* If monsters, they should become visible */
3237	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3017	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3238	{	3018	{
3239	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3019	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3240	return 1;	3020	return 1;
3241	}	3021	}
3242	}	3022	}
3243		3023
3244	return 0;	3024	return 0;
…		…
3472	if (pl->ranged_ob == ob)	3252	if (pl->ranged_ob == ob)
3473	pl->ranged_ob = 0;	3253	pl->ranged_ob = 0;
3474	}	3254	}
3475		3255
3476	sint8	3256	sint8
3477	player::visibility_at (maptile *map, int x, int y) const	3257	player::darkness_at (maptile *map, int x, int y) const
3478	{	3258	{
3479	if (!ns)	3259	if (!ns)
3480	return 0;	3260	return LOS_BLOCKED;
3481		3261
3482	int dx, dy;	3262	int dx, dy;
3483	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3263	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3484	return 0;	3264	return LOS_BLOCKED;
3485		3265
3486	x += dx - ns->current_x + ns->mapx / 2;	3266	x += dx - ns->current_x;
3487	y += dy - ns->current_y + ns->mapy / 2;	3267	y += dy - ns->current_y;
3488		3268
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];	3269	return blocked_los (x, y);
3493	}	3270	}
3494		3271
3495	void	3272	void
3496	player::infobox (const char *title, const char *msg, int color)	3273	player::infobox (const char *title, const char *msg, int color)
3497	{	3274	{

Diff Legend

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