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.181 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 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 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, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
129	strcpy (subject, buf + 1);
130	strip_endline (subject);
131	size = 0;
132	news[0] = '\0';
133	}
134	else
135	{
136	if (size + strlen (buf) >= HUGE_BUF)
137	{
138	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
139	break;
140	}
141	strncat (news + size, buf, HUGE_BUF - size);
142	size += strlen (buf);
143	}
144	}
145
146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
148	close_and_delete (fp, comp);
149	}
150
151	/* This loads the first map an puts the player on it. */	38	/* This loads the first map an puts the player on it. */
152	static void	39	static void
153	set_first_map (object *op)	40	set_first_map (object *op)
154	{	41	{
155	op->contr->maplevel = first_map_path;	42	op->contr->maplevel = first_map_path;
…		…
207	ob->close_container (); //TODO: client-specific	94	ob->close_container (); //TODO: client-specific
208		95
209	ns->update_look = 0;	96	ns->update_look = 0;
210	ns->look_position = 0;	97	ns->look_position = 0;
211		98
212	clear_los (this);	99	clear_los ();
213		100
214	ns->reset_stats ();	101	ns->reset_stats ();
215		102
216	/* make sure he's a player -- needed because of class change. */	103	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	104	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
219		106
220	ob->carrying = sum_weight (ob);	107	ob->update_weight ();
221	link_player_skills (ob);	108	link_skills ();
222		109
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	110	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		111
225	assign (title, ob->arch->object::name);	112	assign (title, ob->arch->object::name);
226		113
…		…
239	set_dragon_name (ob, abil, skin);	126	set_dragon_name (ob, abil, skin);
240	}	127	}
241		128
242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243		130
244	esrv_new_player (this, ob->weight + ob->carrying);	131	esrv_new_player (this);
245		132
246	ob->update_stats ();	133	ob->update_stats ();
247		134
248	ns->floorbox_update ();	135	ns->floorbox_update ();
249	esrv_send_inventory (ob, ob);	136	esrv_send_inventory (ob, ob);
250	esrv_add_spells (this, 0);	137	esrv_add_spells (this, 0);
251		138
252	activate ();	139	activate ();
253		140
254	send_rules (ob);
255	send_news (ob);
256	display_motd (ob);
257
258	INVOKE_PLAYER (CONNECT, this);	141	INVOKE_PLAYER (CONNECT, this);
259	INVOKE_PLAYER (LOGIN, this);	142	INVOKE_PLAYER (LOGIN, this);
260	}	143	}
261		144
262	void	145	void
…		…
278	ns->reset_stats ();	161	ns->reset_stats ();
279	ns->pl = 0;	162	ns->pl = 0;
280	ns = 0;	163	ns = 0;
281	}	164	}
282		165
283	observe = ob;	166	// this is important for the player scheduler to get the correct refcount
		167	// when ns = 0
		168	observe = viewpoint = ob;
284		169
285	deactivate ();	170	deactivate ();
286	}	171	}
287		172
288	// the need for this function can be explained	173	// the need for this function can be explained
289	// by load_object not returning the object	174	// by load_object not returning the object
290	void	175	void
291	player::set_object (object *op)	176	player::set_object (object *op)
292	{	177	{
293	ob = observe = op;	178	ob = observe = viewpoint = op;
294	ob->contr = this; /* this aren't yet in archetype */	179	ob->contr = this; /* this aren't yet in archetype */
295		180
296	ob->speed = 1.0f;	181	ob->speed = 1.0f;
297	ob->speed_left = 0.5f;	182	ob->speed_left = 0.5f;
298		183
299	ob->direction = 5; /* So player faces south */	184	ob->direction = 5; /* So player faces south */
300		185
301	ob->flag [FLAG_READY_WEAPON] = false;	186	ob->flag [FLAG_READY_WEAPON] = false;
302	ob->flag [FLAG_READY_SKILL] = false;	187	ob->flag [FLAG_READY_SKILL] = false;
303	ob->flag [FLAG_READY_BOW] = false;	188	ob->flag [FLAG_READY_BOW] = false;
304		189
…		…
321	combat_ob = op;	206	combat_ob = op;
322	break;	207	break;
323	}	208	}
324		209
325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	210	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326	ob->deactivate (); // change_Weapon activates, fix this better	211	ob->deactivate (); // change_weapon activates, fix this better
327	}	212	}
328		213
329	void	214	void
330	player::set_observe (object *op)	215	player::set_observe (object *op)
331	{	216	{
332	observe = op ? op : ob;	217	observe = viewpoint = op ? op : ob;
		218	do_los = 1;
		219	}
		220
		221	void
		222	player::set_viewpoint (object *op)
		223	{
		224	viewpoint = op ? op : (object *)observe;
333	do_los = 1;	225	do_los = 1;
334	}	226	}
335		227
336	player::player ()	228	player::player ()
337	{	229	{
…		…
345	savebed_map = first_map_path; /* Init. respawn position */	237	savebed_map = first_map_path; /* Init. respawn position */
346		238
347	gen_sp_armour = 10;	239	gen_sp_armour = 10;
348	bowtype = bow_normal;	240	bowtype = bow_normal;
349	petmode = pet_normal;	241	petmode = pet_normal;
350	listening = 10;
351	usekeys = containers;	242	usekeys = containers;
352	peaceful = 1; /* default peaceful */	243	peaceful = 1; /* default peaceful */
353	do_los = 1;	244	do_los = 1;
354		245
355	weapon_sp = 1.0f;	246	weapon_sp = 1.0f;
…		…
367	{	258	{
368	ob->destroy_inv (false);	259	ob->destroy_inv (false);
369	ob->destroy ();	260	ob->destroy ();
370	}	261	}
371		262
372	ob = observe = 0;	263	ob = observe = viewpoint = 0;
373	}	264	}
374		265
375	player::~player ()	266	player::~player ()
376	{	267	{
377	/* Clear item stack */	268	/* Clear item stack */
…		…
404	* Note: there MUST be at least one player archetype!	295	* Note: there MUST be at least one player archetype!
405	*/	296	*/
406	archetype *	297	archetype *
407	get_player_archetype (archetype *at)	298	get_player_archetype (archetype *at)
408	{	299	{
		300	// archetypes could have been reloaded
		301	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		302
		303	if (!nat)
		304	return at;
		305
409	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	306	archvec::iterator i = archetypes.find (nat);
410		307
411	for (;;)	308	for (;;)
412	{	309	{
413	if (++i == archetypes.end ())	310	if (++i == archetypes.end ())
414	i = archetypes.begin ();	311	i = archetypes.begin ();
…		…
632		529
633	return firstdir;	530	return firstdir;
634	}	531	}
635		532
636	void	533	void
637	give_initial_items (object *pl, treasurelist * items)	534	give_initial_items (object *pl, treasurelist *items)
638	{	535	{
639	if (pl->randomitems)	536	if (pl->randomitems)
640	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	537	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641		538
642	for (object *next, *op = pl->inv; op; op = next)	539	for (object *next, *op = pl->inv; op; op = next)
…		…
652	/* we never give weapons/armour if these cannot be used	549	/* we never give weapons/armour if these cannot be used
653	* by this player due to race restrictions	550	* by this player due to race restrictions
654	*/	551	*/
655	if (pl->type == PLAYER)	552	if (pl->type == PLAYER)
656	{	553	{
657	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	554	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		555	&&
658	(op->type == ARMOUR || op->type == BOOTS ||	556	(op->type == ARMOUR || op->type == BOOTS
659	op->type == CLOAK || op->type == HELMET ||	557	|| op->type == CLOAK || op->type == HELMET
660	op->type == SHIELD || op->type == GLOVES ||	558	|| op->type == SHIELD || op->type == GLOVES
		559	|| op->type == BRACERS || op->type == GIRDLE))
661	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	560	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
662	{	561	{
663	op->destroy ();	562	op->destroy ();
664	continue;	563	continue;
665	}	564	}
666	}	565	}
667		566
668	/* This really needs to be better - we should really give	567	/* Here we remove duplicated skills (as duplicated spell objects have
669	* a substitute spellbook. The problem is that we don't really	568	* _very_ confusing effects for players), which could for instance be
670	* have a good idea what to replace it with (need something like	569	* generated by bad treasurelists. - elmex
671	* a first level treasurelist for each skill.)
672	* remove duplicate skills also
673	*/	570	*/
674	if (op->type == SPELLBOOK || op->type == SKILL)	571	if (op->type == SKILL)
675	{	572	{
676	object *tmp;
677
678	for (tmp = op->below; tmp; tmp = tmp->below)	573	for (object *tmp = op->below; tmp; tmp = tmp->below)
679	if (tmp->type == op->type && tmp->name == op->name)	574	if (tmp->type == op->type && tmp->name == op->name)
680	break;
681
682	if (tmp)
683	{	575	{
684	op->destroy ();	576	op->destroy ();
		577	LOG (llevError,
685	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	578	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
686	continue;	579	break;
687	}	580	}
688		581
689	if (op->nrof > 1)	582	if (op->nrof > 1)
690	op->nrof = 1;	583	op->nrof = 1;
691	}	584	}
692		585
693	if (op->type == SPELLBOOK && op->inv)	586	if (op->type == SPELLBOOK && op->inv)
694	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	587	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
695		588
696	/* Give starting characters identified, uncursed, and undamned	589	/* Give starting characters identified, uncursed, and undamned
697	* items. Just don't identify gold or silver, or it won't be	590	* items. Just don't identify gold or silver, or it won't be
698	* merged properly.	591	* merged properly.
699	*/	592	*/
700	if (need_identify (op))	593	if (need_identify (op))
701	{	594	{
702	SET_FLAG (op, FLAG_IDENTIFIED);	595	SET_FLAG (op, FLAG_IDENTIFIED);
703	CLEAR_FLAG (op, FLAG_CURSED);	596	CLEAR_FLAG (op, FLAG_CURSED);
704	CLEAR_FLAG (op, FLAG_DAMNED);	597	CLEAR_FLAG (op, FLAG_DAMNED);
705	}	598	}
		599
706	if (op->type == SPELL)	600	if (op->type == SPELL)
707	{	601	{
708	op->destroy ();	602	op->destroy ();
709	continue;	603	continue;
710	}	604	}
…		…
712	{	606	{
713	SET_FLAG (op, FLAG_CAN_USE_SKILL);	607	SET_FLAG (op, FLAG_CAN_USE_SKILL);
714	op->stats.exp = 0;	608	op->stats.exp = 0;
715	op->level = 1;	609	op->level = 1;
716	}	610	}
717	/* lock all 'normal items by default */	611	else /* lock all 'normal items by default */
718	else
719	SET_FLAG (op, FLAG_INV_LOCKED);	612	SET_FLAG (op, FLAG_INV_LOCKED);
720	} /* for loop of objects in player inv */	613	} /* for loop of objects in player inv */
721		614
722	/* Need to set up the skill pointers */	615	/* Need to set up the skill pointers */
723	link_player_skills (pl);	616	pl->contr->link_skills ();
724	}	617	}
725		618
726	void	619	void
727	get_party_password (object *op, partylist *party)	620	get_party_password (object *op, partylist *party)
728	{	621	{
…		…
843	*/	736	*/
844	void	737	void
845	player::chargen_race_done ()	738	player::chargen_race_done ()
846	{	739	{
847	/* this must before then initial items are given */	740	/* this must before then initial items are given */
848	esrv_new_player (ob->contr, ob->weight + ob->carrying);	741	esrv_new_player (ob->contr);
849		742
850	treasurelist *tl = treasurelist::find ("starting_wealth");	743	treasurelist *tl = treasurelist::find ("starting_wealth");
851	if (tl)	744	if (tl)
852	create_treasure (tl, ob, 0, 0, 0);	745	create_treasure (tl, ob, 0, 0, 0);
853		746
…		…
857	ob->contr->ns->state = ST_PLAYING;	750	ob->contr->ns->state = ST_PLAYING;
858		751
859	if (ob->msg)	752	if (ob->msg)
860	ob->msg = 0;	753	ob->msg = 0;
861		754
862	/* We create this now because some of the unique maps will need it
863	* to save here.
864	*/
865	{
866	char buf[MAX_BUF];
867	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
868	make_path_to_file (buf);
869	}
870
871	start_info (ob);	755	start_info (ob);
872	CLEAR_FLAG (ob, FLAG_WIZ);	756	CLEAR_FLAG (ob, FLAG_WIZ);
873	give_initial_items (ob, ob->randomitems);	757	give_initial_items (ob, ob->randomitems);
874	link_player_skills (ob);
875	esrv_send_inventory (ob, ob);	758	esrv_send_inventory (ob, ob);
876	ob->update_stats ();	759	ob->update_stats ();
877		760
878	/* This moves the player to a different start map, if there	761	/* This moves the player to a different start map, if there
879	* is one for this race	762	* is one for this race
880	*/	763	*/
881	if (*first_map_ext_path)	764	if (*first_map_ext_path)
882	{	765	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
883	object *tmp;
884	char mapname[MAX_BUF];
885
886	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
887	tmp = object::create ();
888	EXIT_PATH (tmp) = mapname;
889	EXIT_X (tmp) = ob->x;
890	EXIT_Y (tmp) = ob->y;
891	ob->enter_exit (tmp); /* we don't really care if it succeeded;
892	* if the map isn't there, then stay on the
893	* default initial map */
894	tmp->destroy ();
895	}
896	else	766	else
897	LOG (llevDebug, "first_map_ext_path not set\n");	767	LOG (llevDebug, "first_map_ext_path not set\n");
898	}	768	}
899		769
900	void	770	void
…		…
944	LOG (llevDebug, "Fleeing player is dead.\n");	814	LOG (llevDebug, "Fleeing player is dead.\n");
945	CLEAR_FLAG (op, FLAG_SCARED);	815	CLEAR_FLAG (op, FLAG_SCARED);
946	return;	816	return;
947	}	817	}
948		818
949	if (op->enemy == NULL)	819	if (!op->enemy)
950	{	820	{
951	LOG (llevDebug, "Fleeing player had no enemy.\n");	821	LOG (llevDebug, "Fleeing player had no enemy.\n");
952	CLEAR_FLAG (op, FLAG_SCARED);	822	CLEAR_FLAG (op, FLAG_SCARED);
953	return;	823	return;
954	}	824	}
955		825
956	/* Seen some crashes here. Since we don't store an
957	* op->enemy_count, it is possible that something destroys the
958	* actual enemy, and the object is recycled.
959	*/
960	if (op->enemy->map == NULL)
961	{
962	CLEAR_FLAG (op, FLAG_SCARED);
963	op->enemy = NULL;
964	return;
965	}
966
967	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	826	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
968	{	827	{
969	op->enemy = NULL;	828	op->enemy = NULL;
970	CLEAR_FLAG (op, FLAG_SCARED);	829	CLEAR_FLAG (op, FLAG_SCARED);
971	return;	830	return;
…		…
974	get_rangevector (op, op->enemy, &rv, 0);	833	get_rangevector (op, op->enemy, &rv, 0);
975		834
976	dir = absdir (4 + rv.direction);	835	dir = absdir (4 + rv.direction);
977	for (diff = 0; diff < 3; diff++)	836	for (diff = 0; diff < 3; diff++)
978	{	837	{
979	int m = 1 - (RANDOM () & 2);	838	int m = 1 - rndm (2) * 2;
980		839
981	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	840	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
982	return;	841	return;
983	}	842	}
984		843
…		…
995	check_pick (object *op)	854	check_pick (object *op)
996	{	855	{
997	object *tmp, *next;	856	object *tmp, *next;
998	int stop = 0;	857	int stop = 0;
999	int wvratio;	858	int wvratio;
1000	char putstring[128];
1001		859
1002	/* if you're flying, you cna't pick up anything */	860	/* if you're flying, you cna't pick up anything */
1003	if (op->move_type & MOVE_FLYING)	861	if (op->move_type & MOVE_FLYING)
1004	return 1;	862	return 1;
1005		863
…		…
1029		887
1030	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	888	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1031	{	889	{
1032	if (item_matched_string (op, tmp, op->contr->search_str))	890	if (item_matched_string (op, tmp, op->contr->search_str))
1033	CHK_PICK_PICKUP;	891	CHK_PICK_PICKUP;
		892
1034	continue;	893	continue;
1035	}	894	}
1036		895
1037	/* high not bit set? We're using the old autopickup model */	896	/* pickup handling */
		897	if (op->contr->mode & PU_DEBUG)
		898	{
		899	/* some debugging code to figure out item information */
		900	const char *str = tmp->name
		901	? format ("item name: %s item type: %d weight/value: %d",
		902	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		903	: format ("item name: %s item type: %d weight/value: %d",
		904	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		905
		906	new_draw_info (NDI_UNIQUE, 0, op, str);
		907	}
		908
		909	if (op->contr->mode & PU_INHIBIT)
		910	return 1;
		911
		912	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		913	return 1;
		914
		915	/* philosophy:
		916	* It's easy to grab an item type from a pile, as long as it's
		917	* generic. This takes no game-time. For more detailed pickups
		918	* and selections, select-items should be used. This is a
		919	* grab-as-you-run type mode that's really useful for arrows for
		920	* example.
		921	* The drawback: right now it has no frontend, so you need to
		922	* stick the bits you want into a calculator in hex mode and then
		923	* convert to decimal and then 'pickup <#>
		924	*/
		925
		926	/* the first two modes are exclusive: if NOTHING we return, if
		927	* STOP then we stop. All the rest are applied sequentially,
		928	* meaning if any test passes, the item gets picked up. */
		929
		930	/* if mode is set to pick nothing up, return */
		931	if (op->contr->mode == PU_NOTHING)
		932	return 1;
		933
		934	/* if mode is set to stop when encountering objects, return */
		935	/* take STOP before INHIBIT since it doesn't actually pick
		936	* anything up */
		937	if (op->contr->mode & PU_STOP)
		938	return 0;
		939
		940	/* useful for going into stores and not losing your settings... */
		941	/* and for battles wher you don't want to get loaded down while
		942	* fighting */
		943	if (op->contr->mode & PU_INHIBIT)
		944	return 1;
		945
		946	/* prevent us from turning into auto-thieves :) */
		947	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		948	continue;
		949
		950	/* ignore known cursed objects */
		951	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		952	continue;
		953
		954	/* all food and drink if desired */
		955	/* question: don't pick up known-poisonous stuff? */
1038	if (!(op->contr->mode & PU_NEWMODE))	956	if (op->contr->mode & PU_FOOD)
		957	if (tmp->type == FOOD)
1039	{	958	{
1040	switch (op->contr->mode)	959	CHK_PICK_PICKUP;
		960	continue;
		961	}
		962
		963	if (op->contr->mode & PU_DRINK)
		964	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		965	{
		966	CHK_PICK_PICKUP;
		967	continue;
		968	}
		969
		970	if (op->contr->mode & PU_POTION)
		971	if (tmp->type == POTION)
		972	{
		973	CHK_PICK_PICKUP;
		974	continue;
		975	}
		976
		977	/* spellbooks, skillscrolls and normal books/scrolls */
		978	if (op->contr->mode & PU_SPELLBOOK)
		979	if (tmp->type == SPELLBOOK)
		980	{
		981	CHK_PICK_PICKUP;
		982	continue;
		983	}
		984
		985	if (op->contr->mode & PU_SKILLSCROLL)
		986	if (tmp->type == SKILLSCROLL)
		987	{
		988	CHK_PICK_PICKUP;
		989	continue;
		990	}
		991
		992	if (op->contr->mode & PU_READABLES)
		993	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		994	{
		995	CHK_PICK_PICKUP;
		996	continue;
		997	}
		998
		999	/* wands/staves/rods/horns */
		1000	if (op->contr->mode & PU_MAGIC_DEVICE)
		1001	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1002	{
		1003	CHK_PICK_PICKUP;
		1004	continue;
		1005	}
		1006
		1007	/* pick up all magical items */
		1008	if (op->contr->mode & PU_MAGICAL)
		1009	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1010	{
		1011	CHK_PICK_PICKUP;
		1012	continue;
		1013	}
		1014
		1015	if (op->contr->mode & PU_VALUABLES)
		1016	{
		1017	if (tmp->type == MONEY || tmp->type == GEM)
1041	{	1018	{
1042	case 0:
1043	return 1; /* don't pick up */
1044	case 1:
1045	CHK_PICK_PICKUP;	1019	CHK_PICK_PICKUP;
1046	return 1;	1020	continue;
1047	case 2:
1048	CHK_PICK_PICKUP;
1049	return 0;
1050	case 3:
1051	return 0; /* stop before pickup */
1052	case 4:
1053	CHK_PICK_PICKUP;
1054	break;
1055	case 5:
1056	CHK_PICK_PICKUP;
1057	stop = 1;
1058	break;
1059	case 6:
1060	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1061	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1062	CHK_PICK_PICKUP;
1063	break;
1064
1065	case 7:
1066	if (tmp->type == MONEY || tmp->type == GEM)
1067	CHK_PICK_PICKUP;
1068	break;
1069
1070	default:
1071	/* use value density */
1072	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1073	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1074	CHK_PICK_PICKUP;
1075	}	1021	}
1076	}	1022	}
1077	else	1023
1078	{ /* old model */	1024	/* rings & amulets - talismans seems to be typed AMULET */
1079	/* NEW pickup handling */
1080	if (op->contr->mode & PU_DEBUG)	1025	if (op->contr->mode & PU_JEWELS)
		1026	if (tmp->type == RING || tmp->type == AMULET)
1081	{	1027	{
1082	/* some debugging code to figure out item information */	1028	CHK_PICK_PICKUP;
1083	if (tmp->name != NULL)
1084	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1085	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1086	else
1087	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1088	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1089
1090	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1091	}
1092
1093	/* philosophy:
1094	* It's easy to grab an item type from a pile, as long as it's
1095	* generic. This takes no game-time. For more detailed pickups
1096	* and selections, select-items should be used. This is a
1097	* grab-as-you-run type mode that's really useful for arrows for
1098	* example.
1099	* The drawback: right now it has no frontend, so you need to
1100	* stick the bits you want into a calculator in hex mode and then
1101	* convert to decimal and then 'pickup <#>
1102	*/
1103
1104	/* the first two modes are exclusive: if NOTHING we return, if
1105	* STOP then we stop. All the rest are applied sequentially,
1106	* meaning if any test passes, the item gets picked up. */
1107
1108	/* if mode is set to pick nothing up, return */
1109
1110	if (op->contr->mode & PU_NOTHING)
1111	return 1;
1112
1113	/* if mode is set to stop when encountering objects, return */
1114	/* take STOP before INHIBIT since it doesn't actually pick
1115	* anything up */
1116
1117	if (op->contr->mode & PU_STOP)
1118	return 0;
1119
1120	/* useful for going into stores and not losing your settings... */
1121	/* and for battles wher you don't want to get loaded down while
1122	* fighting */
1123	if (op->contr->mode & PU_INHIBIT)
1124	return 1;
1125
1126	/* prevent us from turning into auto-thieves :) */
1127	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1128	continue;	1029	continue;
		1030	}
1129		1031
1130	/* ignore known cursed objects */	1032	/* we don't forget dragon food */
1131	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1033	if (op->contr->mode & PU_FLESH)
		1034	if (tmp->type == FLESH)
		1035	{
		1036	CHK_PICK_PICKUP;
1132	continue;	1037	continue;
		1038	}
1133		1039
1134	/* all food and drink if desired */	1040	/* bows and arrows. Bows are good for selling! */
1135	/* question: don't pick up known-poisonous stuff? */	1041	if (op->contr->mode & PU_BOW)
		1042	if (tmp->type == BOW)
		1043	{
		1044	CHK_PICK_PICKUP;
		1045	continue;
		1046	}
		1047
		1048	if (op->contr->mode & PU_ARROW)
		1049	if (tmp->type == ARROW)
		1050	{
		1051	CHK_PICK_PICKUP;
		1052	continue;
		1053	}
		1054
		1055	/* all kinds of armor etc. */
		1056	if (op->contr->mode & PU_ARMOUR)
		1057	if (tmp->type == ARMOUR)
		1058	{
		1059	CHK_PICK_PICKUP;
		1060	continue;
		1061	}
		1062
		1063	if (op->contr->mode & PU_HELMET)
		1064	if (tmp->type == HELMET)
		1065	{
		1066	CHK_PICK_PICKUP;
		1067	continue;
		1068	}
		1069
		1070	if (op->contr->mode & PU_SHIELD)
		1071	if (tmp->type == SHIELD)
		1072	{
		1073	CHK_PICK_PICKUP;
		1074	continue;
		1075	}
		1076
1136	if (op->contr->mode & PU_FOOD)	1077	if (op->contr->mode & PU_BOOTS)
1137	if (tmp->type == FOOD)	1078	if (tmp->type == BOOTS)
		1079	{
		1080	CHK_PICK_PICKUP;
		1081	continue;
		1082	}
		1083
		1084	if (op->contr->mode & PU_GLOVES)
		1085	if (tmp->type == GLOVES)
		1086	{
		1087	CHK_PICK_PICKUP;
		1088	continue;
		1089	}
		1090
		1091	if (op->contr->mode & PU_CLOAK)
		1092	if (tmp->type == CLOAK)
		1093	{
		1094	CHK_PICK_PICKUP;
		1095	continue;
		1096	}
		1097
		1098	/* hoping to catch throwing daggers here */
		1099	if (op->contr->mode & PU_MISSILEWEAPON)
		1100	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1101	{
		1102	CHK_PICK_PICKUP;
		1103	continue;
		1104	}
		1105
		1106	/* careful: chairs and tables are weapons! */
		1107	if (op->contr->mode & PU_ALLWEAPON)
		1108	{
		1109	if (tmp->type == WEAPON)
		1110	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1138	{	1111	{
1139	CHK_PICK_PICKUP;	1112	CHK_PICK_PICKUP;
1140	continue;	1113	continue;
1141	}	1114	}
		1115	}
1142		1116
		1117	/* misc stuff that's useful */
1143	if (op->contr->mode & PU_DRINK)	1118	if (op->contr->mode & PU_KEY)
1144	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1119	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1145	{	1120	{
1146	CHK_PICK_PICKUP;	1121	CHK_PICK_PICKUP;
1147	continue;	1122	continue;
1148	}	1123	}
1149		1124
		1125	/* any of the last 4 bits set means we use the ratio for value
		1126	* pickups */
1150	if (op->contr->mode & PU_POTION)	1127	if (op->contr->mode & PU_RATIO)
1151	if (tmp->type == POTION)	1128	{
		1129	/* use value density to decide what else to grab */
		1130	/* >=7 was >= op->contr->mode */
		1131	/* >=7 is the old standard setting. Now we take the last 4 bits
1152	{	1132	*/
1153	CHK_PICK_PICKUP;
1154	continue;
1155	}
1156
1157	/* spellbooks, skillscrolls and normal books/scrolls */
1158	if (op->contr->mode & PU_SPELLBOOK)
1159	if (tmp->type == SPELLBOOK)
1160	{
1161	CHK_PICK_PICKUP;
1162	continue;
1163	}
1164
1165	if (op->contr->mode & PU_SKILLSCROLL)
1166	if (tmp->type == SKILLSCROLL)
1167	{
1168	CHK_PICK_PICKUP;
1169	continue;
1170	}
1171
1172	if (op->contr->mode & PU_READABLES)
1173	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1174	{
1175	CHK_PICK_PICKUP;
1176	continue;
1177	}
1178
1179	/* wands/staves/rods/horns */
1180	if (op->contr->mode & PU_MAGIC_DEVICE)
1181	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1182	{
1183	CHK_PICK_PICKUP;
1184	continue;
1185	}
1186
1187	/* pick up all magical items */
1188	if (op->contr->mode & PU_MAGICAL)	1133	wvratio = op->contr->mode & PU_RATIO;
1189	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1134	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1190	{
1191	CHK_PICK_PICKUP;
1192	continue;
1193	}
1194
1195	if (op->contr->mode & PU_VALUABLES)
1196	{	1135	{
1197	if (tmp->type == MONEY || tmp->type == GEM)	1136	#if 0
		1137	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1138	if (tmp->name != NULL)
1198	{	1139	{
1199	CHK_PICK_PICKUP;	1140	fprintf (stderr, "%s", tmp->name);
1200	continue;
1201	}	1141	}
1202	}
1203
1204	/* rings & amulets - talismans seems to be typed AMULET */
1205	if (op->contr->mode & PU_JEWELS)
1206	if (tmp->type == RING || tmp->type == AMULET)
1207	{
1208	CHK_PICK_PICKUP;
1209	continue;
1210	}
1211
1212	/* we don't forget dragon food */
1213	if (op->contr->mode & PU_FLESH)
1214	if (tmp->type == FLESH)
1215	{
1216	CHK_PICK_PICKUP;
1217	continue;
1218	}
1219
1220	/* bows and arrows. Bows are good for selling! */
1221	if (op->contr->mode & PU_BOW)
1222	if (tmp->type == BOW)
1223	{
1224	CHK_PICK_PICKUP;
1225	continue;
1226	}
1227
1228	if (op->contr->mode & PU_ARROW)
1229	if (tmp->type == ARROW)
1230	{
1231	CHK_PICK_PICKUP;
1232	continue;
1233	}
1234
1235	/* all kinds of armor etc. */
1236	if (op->contr->mode & PU_ARMOUR)
1237	if (tmp->type == ARMOUR)
1238	{
1239	CHK_PICK_PICKUP;
1240	continue;
1241	}
1242
1243	if (op->contr->mode & PU_HELMET)
1244	if (tmp->type == HELMET)
1245	{
1246	CHK_PICK_PICKUP;
1247	continue;
1248	}
1249
1250	if (op->contr->mode & PU_SHIELD)
1251	if (tmp->type == SHIELD)
1252	{
1253	CHK_PICK_PICKUP;
1254	continue;
1255	}
1256
1257	if (op->contr->mode & PU_BOOTS)
1258	if (tmp->type == BOOTS)
1259	{
1260	CHK_PICK_PICKUP;
1261	continue;
1262	}
1263
1264	if (op->contr->mode & PU_GLOVES)
1265	if (tmp->type == GLOVES)
1266	{
1267	CHK_PICK_PICKUP;
1268	continue;
1269	}
1270
1271	if (op->contr->mode & PU_CLOAK)
1272	if (tmp->type == CLOAK)
1273	{
1274	CHK_PICK_PICKUP;
1275	continue;
1276	}
1277
1278	/* hoping to catch throwing daggers here */
1279	if (op->contr->mode & PU_MISSILEWEAPON)
1280	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1281	{
1282	CHK_PICK_PICKUP;
1283	continue;
1284	}
1285
1286	/* careful: chairs and tables are weapons! */
1287	if (op->contr->mode & PU_ALLWEAPON)
1288	{
1289	if (tmp->type == WEAPON && tmp->name != NULL)
1290	{
1291	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1292	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1293	{
1294	CHK_PICK_PICKUP;
1295	continue;
1296	}
1297	}
1298
1299	if (tmp->type == WEAPON && tmp->name == NULL)
1300	{
1301	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1302	{
1303	CHK_PICK_PICKUP;
1304	continue;
1305	}
1306	}
1307	}
1308
1309	/* misc stuff that's useful */
1310	if (op->contr->mode & PU_KEY)
1311	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1312	{
1313	CHK_PICK_PICKUP;
1314	continue;
1315	}
1316
1317	/* any of the last 4 bits set means we use the ratio for value
1318	* pickups */
1319	if (op->contr->mode & PU_RATIO)
1320	{
1321	/* use value density to decide what else to grab */
1322	/* >=7 was >= op->contr->mode */
1323	/* >=7 is the old standard setting. Now we take the last 4 bits
1324	* and multiply them by 5, giving 0..15*5== 5..75 */
1325	wvratio = (op->contr->mode & PU_RATIO) * 5;
1326	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1327	{
1328	CHK_PICK_PICKUP;
1329	#if 0
1330	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1331	if (tmp->name != NULL)
1332	{
1333	fprintf (stderr, "%s", tmp->name);
1334	}
1335	else	1142	else
1336	fprintf (stderr, "%s", tmp->arch->archname);	1143	fprintf (stderr, "%s", tmp->arch->archname);
1337	fprintf (stderr, ",%d] = ", tmp->type);	1144	fprintf (stderr, ",%d] = ", tmp->type);
1338	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1145	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1339	#endif	1146	#endif
		1147	CHK_PICK_PICKUP;
1340	continue;	1148	continue;
1341	}
1342	}	1149	}
1343	} /* the new pickup model */	1150	} /* the new pickup model */
1344	}	1151	}
1345		1152
1346	return !stop;	1153	return !stop;
…		…
1374	* against the target. A full test is not performed, simply a basic test	1181	* against the target. A full test is not performed, simply a basic test
1375	* of resistances. The archer is making a quick guess at what he sees down	1182	* of resistances. The archer is making a quick guess at what he sees down
1376	* the hall. Failing that it does it's best to pick the highest plus arrow.	1183	* the hall. Failing that it does it's best to pick the highest plus arrow.
1377	*/	1184	*/
1378	object *	1185	object *
1379	find_better_arrow (object *op, object *target, const char *type, int *better)	1186	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1380	{	1187	{
1381	object *tmp = NULL, *arrow, *ntmp;	1188	object *tmp = NULL, *arrow, *ntmp;
1382	int attacknum, attacktype, betterby = 0, i;	1189	int attacknum, attacktype, betterby = 0, i;
1383		1190
1384	if (!type)	1191	if (!type)
…		…
1388	{	1195	{
1389	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1196	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1390	{	1197	{
1391	i = 0;	1198	i = 0;
1392	ntmp = find_better_arrow (arrow, target, type, &i);	1199	ntmp = find_better_arrow (arrow, target, type, &i);
		1200
1393	if (i > betterby)	1201	if (i > betterby)
1394	{	1202	{
1395	tmp = ntmp;	1203	tmp = ntmp;
1396	betterby = i;	1204	betterby = i;
1397	}	1205	}
1398	}	1206	}
1399	else if (arrow->type == ARROW && arrow->race == type)	1207	else if (arrow->type == ARROW && arrow->race == type)
1400	{	1208	{
1401	/* allways prefer assasination/slaying */	1209	/* allways prefer assasination/slaying */
1402	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1210	if (target->race && arrow->slaying.contains (target->race))
1403	{	1211	{
1404	if (arrow->attacktype & AT_DEATH)	1212	if (arrow->attacktype & AT_DEATH)
1405	{	1213	{
1406	*better = 100;	1214	*better = 100;
1407	return arrow;	1215	return arrow;
…		…
1422	{	1230	{
1423	tmp = arrow;	1231	tmp = arrow;
1424	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1232	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1425	}	1233	}
1426	}	1234	}
		1235
1427	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1236	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1428	{	1237	{
1429	tmp = arrow;	1238	tmp = arrow;
1430	betterby = 2 + arrow->magic + arrow->stats.dam;	1239	betterby = 2 + arrow->magic + arrow->stats.dam;
1431	}	1240	}
		1241
1432	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1242	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1433	{	1243	{
1434	tmp = arrow;	1244	tmp = arrow;
1435	betterby = 1 + arrow->magic + arrow->stats.dam;	1245	betterby = 1 + arrow->magic + arrow->stats.dam;
1436	}	1246	}
1437	}	1247	}
1438	}	1248	}
1439	}	1249	}
		1250
1440	if (tmp == NULL && arrow == NULL)	1251	if (tmp == NULL && arrow == NULL)
1441	return find_arrow (op, type);	1252	return find_arrow (op, type);
1442		1253
1443	*better = betterby;	1254	*better = betterby;
1444	return tmp;	1255	return tmp;
…		…
1449	* op = the shooter	1260	* op = the shooter
1450	* type = bow->race	1261	* type = bow->race
1451	* dir = fire direction	1262	* dir = fire direction
1452	*/	1263	*/
1453	object *	1264	object *
1454	pick_arrow_target (object *op, const char *type, int dir)	1265	pick_arrow_target (object *op, shstr_cmp type, int dir)
1455	{	1266	{
1456	object *tmp = NULL;	1267	object *tmp = NULL;
1457	maptile *m;	1268	maptile *m;
1458	int i, mflags, found, number;	1269	int i, mflags, found, number;
1459	sint16 x, y;	1270	sint16 x, y;
…		…
1474	for (i = 0, found = 0; i < 20; i++)	1285	for (i = 0, found = 0; i < 20; i++)
1475	{	1286	{
1476	x += freearr_x[dir];	1287	x += freearr_x[dir];
1477	y += freearr_y[dir];	1288	y += freearr_y[dir];
1478	mflags = get_map_flags (m, &m, x, y, &x, &y);	1289	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1290
1479	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1291	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1480	{	1292	{
1481	tmp = NULL;	1293	tmp = 0;
1482	break;	1294	break;
1483	}	1295	}
1484	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1296	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1485	{	1297	{
1486	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1298	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1487	* perhaps a bad assumption.	1299	* perhaps a bad assumption.
1488	*/	1300	*/
1489	tmp = NULL;	1301	tmp = 0;
1490	break;	1302	break;
1491	}	1303	}
		1304
1492	if (mflags & P_IS_ALIVE)	1305	if (mflags & P_IS_ALIVE)
1493	{
1494	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1306	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1495	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1307	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1496	{
1497	found++;
1498	break;
1499	}
1500	if (found)
1501	break;	1308	break;
1502	}
1503	}	1309	}
1504	if (tmp == NULL)	1310
		1311	if (!tmp)
1505	return find_arrow (op, type);	1312	return find_arrow (op, type);
1506		1313
1507	if (tmp->head)	1314	if (tmp->head)
1508	tmp = tmp->head;	1315	tmp = tmp->head;
1509		1316
…		…
1549	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1356	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1550	return 0;	1357	return 0;
1551	}	1358	}
1552		1359
1553	// optimisation: move object to top so we will find it quickly again	1360	// optimisation: move object to top so we will find it quickly again
1554	if (bow->below)	1361	splay (bow);
1555	{
1556	bow->remove ();
1557	op->insert (bow);
1558	}
1559
1560	}	1362	}
1561		1363
1562	if (!bow->race || !bow->skill)	1364	if (!bow->race || !bow->skill)
1563	{	1365	{
1564	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1366	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1590	}	1392	}
1591		1393
1592	/* this should not happen, but sometimes does */	1394	/* this should not happen, but sometimes does */
1593	if (arrow->nrof == 0)	1395	if (arrow->nrof == 0)
1594	{	1396	{
		1397	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1595	arrow->destroy ();	1398	arrow->destroy ();
1596	return 0;	1399	return 0;
1597	}	1400	}
1598		1401
1599	left = arrow; /* these are arrows left to the player */	1402	left = arrow; /* these are arrows left to the player */
1600	arrow = get_split_ob (arrow, 1);	1403	arrow = arrow->split ();
1601	if (!arrow)	1404	if (!arrow)
1602	{	1405	{
1603	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1406	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1604	return 0;	1407	return 0;
1605	}	1408	}
…		…
1609	arrow->direction = dir;	1412	arrow->direction = dir;
1610		1413
1611	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1414	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1612	arrow->stats.hp = arrow->stats.dam;	1415	arrow->stats.hp = arrow->stats.dam;
1613	arrow->stats.grace = arrow->attacktype;	1416	arrow->stats.grace = arrow->attacktype;
1614		1417	arrow->custom_name = arrow->slaying;
1615	if (arrow->slaying)
1616	arrow->spellarg = strdup (arrow->slaying);
1617		1418
1618	#if 0	1419	#if 0
1619	if (player *pl = op->contr)	1420	if (player *pl = op->contr)
1620	{	1421	{
1621	float speed = pl->weapon_sp;	1422	float speed = pl->weapon_sp;
…		…
1672	op->play_sound (sound_find ("fire_arrow"));	1473	op->play_sound (sound_find ("fire_arrow"));
1673	m->insert (arrow, sx, sy, op);	1474	m->insert (arrow, sx, sy, op);
1674		1475
1675	if (!arrow->destroyed ())	1476	if (!arrow->destroyed ())
1676	move_arrow (arrow);	1477	move_arrow (arrow);
1677
1678	if (op->type == PLAYER)
1679	{
1680	if (left->destroyed ())
1681	esrv_del_item (op->contr, left->count);
1682	else
1683	esrv_send_item (op, left);
1684	}
1685		1478
1686	return 1;	1479	return 1;
1687	}	1480	}
1688		1481
1689	/* Special fire code for players - this takes into	1482	/* Special fire code for players - this takes into
…		…
1694	* hence the function name.	1487	* hence the function name.
1695	*/	1488	*/
1696	int	1489	int
1697	player_fire_bow (object *op, int dir)	1490	player_fire_bow (object *op, int dir)
1698	{	1491	{
1699	int ret = 0, wcmod = 0;	1492	int ret;
1700		1493
1701	if (op->contr->bowtype == bow_bestarrow)	1494	if (op->contr->bowtype == bow_bestarrow)
1702	{	1495	{
1703	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1496	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1704	}	1497	}
1705	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1498	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1706	{	1499	{
1707	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1500	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1708	wcmod = -1;
1709
1710	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1501	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1711	}	1502	}
1712	else if (op->contr->bowtype == bow_threewide)	1503	else if (op->contr->bowtype == bow_threewide)
1713	{	1504	{
1714	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1505	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1715	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1506	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1716	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1507	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1717	}	1508	}
1718	else if (op->contr->bowtype == bow_spreadshot)	1509	else if (op->contr->bowtype == bow_spreadshot)
1719	{	1510	{
1720	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1511	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1721	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1512	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1722	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1513	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1723	}	1514	}
1724	else	1515	else
1725	{	1516	{
…		…
1763	return;	1554	return;
1764	}	1555	}
1765	}	1556	}
1766	else if (item->type == ROD || item->type == HORN)	1557	else if (item->type == ROD || item->type == HORN)
1767	{	1558	{
1768	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1559	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1560
		1561	// using the maximum of the rods charge allows at least one spell cast
		1562	// for a rod or horn, this fixes some broken rods.
		1563	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1769	{	1564	{
1770	op->contr->play_sound (sound_find ("wand_poof"));	1565	op->contr->play_sound (sound_find ("wand_poof"));
1771		1566
1772	if (item->type == ROD)	1567	if (item->type == ROD)
1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1568	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1778	}	1573	}
1779	}	1574	}
1780		1575
1781	if (cast_spell (op, item, dir, item->inv, NULL))	1576	if (cast_spell (op, item, dir, item->inv, NULL))
1782	{	1577	{
1783	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1578	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1579
1784	if (item->type == WAND)	1580	if (item->type == WAND)
1785	{	1581	{
1786	if (!(--item->stats.food))	1582	if (!(--item->stats.food))
1787	{	1583	{
1788	object *tmp;	1584	object *tmp;
…		…
1792	CLEAR_FLAG (item, FLAG_ANIMATE);	1588	CLEAR_FLAG (item, FLAG_ANIMATE);
1793	item->face = item->arch->face;	1589	item->face = item->arch->face;
1794	item->set_speed (0);	1590	item->set_speed (0);
1795	}	1591	}
1796		1592
1797	if ((tmp = item->in_player ()))	1593	if (object *pl = item->visible_to ())
1798	esrv_update_item (UPD_ANIM, tmp, item);	1594	esrv_update_item (UPD_ANIM, pl, item);
1799	}	1595	}
1800	}	1596	}
1801	else if (item->type == ROD || item->type == HORN)	1597	else if (item->type == ROD || item->type == HORN)
1802	drain_rod_charge (item);	1598	drain_rod_charge (item);
1803	}	1599	}
…		…
1808	bool	1604	bool
1809	fire (object *op, int dir)	1605	fire (object *op, int dir)
1810	{	1606	{
1811	int spellcost = 0;	1607	int spellcost = 0;
1812		1608
1813	/* check for loss of invisiblity/hide */
1814	if (action_makes_visible (op))
1815	make_visible (op);
1816
1817	player *pl = op->contr;	1609	player *pl = op->contr;
1818		1610
1819	if (pl->golem)	1611	if (pl->golem)
1820	{	1612	{
1821	control_golem (op->contr->golem, dir);	1613	control_golem (op->contr->golem, dir);
…		…
1823	}	1615	}
1824		1616
1825	object *ob = pl->ranged_ob;	1617	object *ob = pl->ranged_ob;
1826		1618
1827	if (!ob)	1619	if (!ob)
1828	return false;
1829
1830	if (!op->change_weapon (ob))
1831	return false;	1620	return false;
1832		1621
1833	if (op->speed_left > 0.f)	1622	if (op->speed_left > 0.f)
1834	--op->speed_left;	1623	--op->speed_left;
1835	else	1624	else
1836	return false;	1625	return false;
1837		1626
		1627	if (!op->change_weapon (ob))
		1628	return false;
		1629
		1630	/* check for loss of invisiblity/hide */
		1631	if (action_makes_visible (op))
		1632	make_visible (op);
		1633
1838	switch (ob->type)	1634	switch (ob->type)
1839	{	1635	{
1840	case BOW:	1636	case BOW:
1841	player_fire_bow (op, dir);	1637	player_fire_bow (op, dir);
1842	break;	1638	break;
1843		1639
1844	case SPELL:	1640	case SPELL:
1845	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1641	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1846	break;	1642	break;
1847		1643
1848	case BUILDER:	1644	case BUILDER:
1849	apply_map_builder (op, dir);	1645	apply_map_builder (op, dir);
1850	break;	1646	break;
…		…
1859	}	1655	}
1860		1656
1861	return true;	1657	return true;
1862	}	1658	}
1863		1659
1864	/* find_key	1660	static object *
1865	* We try to find a key for the door as passed. If we find a key
1866	* and successfully use it, we return the key, otherwise NULL
1867	* This function merges both normal and locked door, since the logic
1868	* for both is the same - just the specific key is different.
1869	* pl is the player,
1870	* inv is the objects inventory to searched
1871	* door is the door we are trying to match against.
1872	* This function can be called recursively to search containers.
1873	*/
1874	object *
1875	find_key (object *pl, object *container, object *door)	1661	find_key_ (object *pl, object *container, object *door)
1876	{	1662	{
1877	object *tmp, *key;	1663	object *tmp, *key;
1878		1664
1879	/* Should not happen, but sanity checking is never bad */	1665	/* Should not happen, but sanity checking is never bad */
1880	if (!container->inv)	1666	if (!container->inv)
…		…
1883	/* First, lets try to find a key in the top level inventory */	1669	/* First, lets try to find a key in the top level inventory */
1884	for (tmp = container->inv; tmp; tmp = tmp->below)	1670	for (tmp = container->inv; tmp; tmp = tmp->below)
1885	{	1671	{
1886	if (door->type == DOOR && tmp->type == KEY)	1672	if (door->type == DOOR && tmp->type == KEY)
1887	break;	1673	break;
		1674
1888	/* For sanity, we should really check door type, but other stuff	1675	/* For sanity, we should really check door type, but other stuff
1889	* (like containers) can be locked with special keys	1676	* (like containers) can be locked with special keys
1890	*/	1677	*/
1891	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1678	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1892	break;	1679	break;
…		…
1898	* a key, return	1685	* a key, return
1899	*/	1686	*/
1900	if (!tmp)	1687	if (!tmp)
1901	{	1688	{
1902	for (tmp = container->inv; tmp; tmp = tmp->below)	1689	for (tmp = container->inv; tmp; tmp = tmp->below)
1903	{
1904	/* No reason to search empty containers */	1690	/* No reason to search empty containers */
1905	if (tmp->type == CONTAINER && tmp->inv)	1691	if (tmp->type == CONTAINER && tmp->inv)
1906	{
1907	if ((key = find_key (pl, tmp, door)))	1692	if ((key = find_key_ (pl, tmp, door)))
1908	return key;	1693	return key;
1909	}
1910	}
1911		1694
1912	if (!tmp)	1695	if (!tmp)
1913	return NULL;	1696	return 0;
1914	}	1697	}
1915		1698
1916	/* We get down here if we have found a key. Now if its in a container,	1699	/* We get down here if we have found a key. Now if its in a container,
1917	* see if we actually want to use it	1700	* see if we actually want to use it
1918	*/	1701	*/
1919	if (pl != container)	1702	if (pl != container)
1920	{	1703	{
1921	/* Only let players use keys in containers */	1704	/* Only let players use keys in containers */
1922	if (!pl->contr)	1705	if (!pl->contr)
1923	return NULL;	1706	return 0;
		1707
1924	/* cases where this fails:	1708	/* cases where this fails:
1925	* If we only search the player inventory, return now since we	1709	* If we only search the player inventory, return now since we
1926	* are not in the players inventory.	1710	* are not in the players inventory.
1927	* If the container is not active, return now since only active	1711	* If the container is not active, return now since only active
1928	* containers can be used.	1712	* containers can be used.
…		…
1932	* inv must have been an container and must have been active.	1716	* inv must have been an container and must have been active.
1933	*	1717	*
1934	* Change the color so that the message doesn't disappear with	1718	* Change the color so that the message doesn't disappear with
1935	* all the others.	1719	* all the others.
1936	*/	1720	*/
1937	if (pl->contr->usekeys == key_inventory ||	1721	if (pl->contr->usekeys == key_inventory
1938	!QUERY_FLAG (container, FLAG_APPLIED) ||	1722	|| !QUERY_FLAG (container, FLAG_APPLIED)
1939	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1723	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1940	{	1724	{
1941	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1725	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1942	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1726	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1943	return NULL;	1727	return NULL;
1944	}	1728	}
1945	}	1729	}
1946		1730
1947	return tmp;	1731	return tmp;
		1732	}
		1733
		1734	/* find_key
		1735	* We try to find a key for the door as passed. If we find a key
		1736	* and successfully use it, we return the key, otherwise NULL
		1737	* This function merges both normal and locked door, since the logic
		1738	* for both is the same - just the specific key is different.
		1739	* pl is the player,
		1740	* inv is the objects inventory to searched
		1741	* door is the door we are trying to match against.
		1742	* This function can be called recursively to search containers.
		1743	*/
		1744	object *
		1745	find_key (object *pl, object *container, object *door)
		1746	{
		1747	if (door->slaying && is_match_expr (door->slaying))
		1748	{
		1749	// for match expressions, we try to find the key by applying the match
		1750	// to the op itself, which is supposed to find the "key", instead
		1751	// of searching through containers ourselves.
		1752
		1753	return match_one (door->slaying, container, door, pl, pl);
		1754	}
		1755	else
		1756	return find_key_ (pl, container, door);
1948	}	1757	}
1949		1758
1950	/* moved door processing out of move_player_attack.	1759	/* moved door processing out of move_player_attack.
1951	* returns 1 if player has opened the door with a key	1760	* returns 1 if player has opened the door with a key
1952	* such that the caller should not do anything more,	1761	* such that the caller should not do anything more,
…		…
1979	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1788	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1980	remove_door2 (door); /* remove door without violence ;-) */	1789	remove_door2 (door); /* remove door without violence ;-) */
1981	}	1790	}
1982		1791
1983	/* Do this after we print the message */	1792	/* Do this after we print the message */
1984	decrease_ob (key); /* Use up one of the keys */	1793	key->decrease (); /* Use up one of the keys */
1985	/* Need to update the weight the container the key was in */
1986	if (container != op)
1987	esrv_update_item (UPD_WEIGHT, op, container);
1988		1794
1989	return 1; /* Nothing more to do below */	1795	return 1; /* Nothing more to do below */
1990	}	1796	}
1991	else if (door->type == LOCKED_DOOR)	1797	else if (door->type == LOCKED_DOOR)
1992	{	1798	{
…		…
2005	* going to try and move (not fire weapons).	1811	* going to try and move (not fire weapons).
2006	*/	1812	*/
2007	bool	1813	bool
2008	move_player_attack (object *op, int dir)	1814	move_player_attack (object *op, int dir)
2009	{	1815	{
		1816	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1817	{
		1818	--op->speed_left;
		1819	return true;
		1820	}
		1821
2010	int on_battleground;	1822	int on_battleground;
2011		1823
2012	sint16 nx = freearr_x[dir] + op->x;	1824	sint16 nx = freearr_x[dir] + op->x;
2013	sint16 ny = freearr_y[dir] + op->y;	1825	sint16 ny = freearr_y[dir] + op->y;
2014		1826
2015	on_battleground = op_on_battleground (op, 0, 0);	1827	on_battleground = op_on_battleground (op, 0, 0);
2016		1828
2017	if (out_of_map (op->map, nx, ny))	1829	if (out_of_map (op->map, nx, ny))
2018	return false;	1830	return false;
2019
2020	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2021	{
2022	--op->speed_left;
2023	return true;
2024	}
2025		1831
2026	/* If braced, or can't move to the square, and it is not out of the	1832	/* If braced, or can't move to the square, and it is not out of the
2027	* map, attack it. Note order of if statement is important - don't	1833	* map, attack it. Note order of if statement is important - don't
2028	* want to be calling move_ob if braced, because move_ob will move the	1834	* want to be calling move_ob if braced, because move_ob will move the
2029	* player. This is a pretty nasty hack, because if we could	1835	* player. This is a pretty nasty hack, because if we could
…		…
2089	--op->speed_left;	1895	--op->speed_left;
2090		1896
2091	op->play_sound (sound_find ("push_player"));	1897	op->play_sound (sound_find ("push_player"));
2092	push_ob (mon, dir, op);	1898	push_ob (mon, dir, op);
2093		1899
2094	if (op->contr->tmp_invis || op->hide)	1900	if (action_makes_visible (op))
2095	make_visible (op);	1901	make_visible (op);
2096		1902
2097	return true;	1903	return true;
2098	}	1904	}
2099	else	1905	else
…		…
2121	push_ob (mon, dir, op);	1927	push_ob (mon, dir, op);
2122	}	1928	}
2123	else	1929	else
2124	op->statusmsg ("You withhold your attack");	1930	op->statusmsg ("You withhold your attack");
2125		1931
2126	if (op->contr->tmp_invis || op->hide)	1932	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2127	make_visible (op);	1933	make_visible (op);
2128		1934
2129	return true;	1935	return true;
2130	}	1936	}
2131	}	1937	}
…		…
2189	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	1995	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2190	dir = absdir (dir + rndm (3) + rndm (3) - 2);	1996	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2191		1997
2192	op->facing = dir;	1998	op->facing = dir;
2193		1999
2194	if (op->hide)	2000	if (op->flag [FLAG_HIDDEN])
2195	do_hidden_move (op);	2001	do_hidden_move (op);
2196		2002
2197	bool retval;	2003	bool retval;
2198		2004
2199	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2005	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2271	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2077	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2272	{	2078	{
2273	op->play_sound (sound_find ("ob_evaporate"));	2079	op->play_sound (sound_find ("ob_evaporate"));
2274	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2080	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2275		2081
2276	if (op->contr)
2277	esrv_del_item (op->contr, tmp->count);
2278
2279	tmp->destroy ();	2082	tmp->destroy ();
2280	CLEAR_FLAG (op, FLAG_LIFESAVE);	2083	CLEAR_FLAG (op, FLAG_LIFESAVE);
2281		2084
2282	if (op->stats.hp < 0)	2085	if (op->stats.hp < 0)
2283	op->stats.hp = op->stats.maxhp;	2086	op->stats.hp = op->stats.maxhp;
…		…
2295	return 0;	2098	return 0;
2296	}	2099	}
2297		2100
2298	/* This goes throws the inventory and removes unpaid objects, and puts them	2101	/* This goes throws the inventory and removes unpaid objects, and puts them
2299	* back in the map (location and map determined by values of env). This	2102	* back in the map (location and map determined by values of env). This
2300	* function will descend into containers. op is the object to start the search	2103	* function will descend into containers. op is the object to start the search
2301	* from.	2104	* from.
2302	*/	2105	*/
2303	static void	2106	static void
2304	drop_unpaid_items (object *op, object *env)	2107	drop_unpaid_items (object *op, object *env)
2305	{	2108	{
2306	while (op)	2109	while (op)
2307	{	2110	{
2308	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2111	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2309		2112
2310	if (QUERY_FLAG (op, FLAG_UNPAID))	2113	if (QUERY_FLAG (op, FLAG_UNPAID))
2311	{
2312	if (env->type == PLAYER)
2313	esrv_del_item (env->contr, op->count);
2314
2315	op->insert_at (env);	2114	op->insert_at (env);
2316	}
2317	else if (op->inv)	2115	else if (op->inv)
2318	drop_unpaid_items (op->inv, env);	2116	drop_unpaid_items (op->inv, env);
2319		2117
2320	op = next;	2118	op = next;
2321	}	2119	}
…		…
2333	* Moved from apply.c to player.c - player.c is what	2131	* Moved from apply.c to player.c - player.c is what
2334	* actually uses this function. player.c may not be quite the	2132	* actually uses this function. player.c may not be quite the
2335	* best, a misc file for object actions is probably better,	2133	* best, a misc file for object actions is probably better,
2336	* but there isn't one in the server directory.	2134	* but there isn't one in the server directory.
2337	*/	2135	*/
2338	char *	2136	const char *
2339	gravestone_text (object *op)	2137	gravestone_text (object *op)
2340	{	2138	{
2341	static char buf2[MAX_BUF];	2139	static dynbuf_text buf;
2342	char buf[MAX_BUF];
2343	time_t now = time (NULL);
2344		2140
2345	strcpy (buf2, " R.I.P.\n\n");	2141	buf << "---- R.I.P. ----\n\n"
		2142	<< op->name;
		2143
2346	if (op->type == PLAYER)	2144	if (op->type == PLAYER)
2347	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2145	buf << " the " << op->contr->title;
2348	else
2349	sprintf (buf, "%s\n", &op->name);
2350		2146
2351	strncat (buf2, " ", 20 - strlen (buf) / 2);	2147	buf << "\n\n";
2352	strcat (buf2, buf);	2148
		2149	buf << "who was level ";
		2150	buf << (sint32)op->level << "\n\n" // OO breakdown
		2151	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2152
2353	if (op->type == PLAYER)	2153	if (op->type == PLAYER)
2354	sprintf (buf, "who was in level %d when killed\n", op->level);	2154	buf << "by " << op->contr->killer_name () << ".\n\n";
2355	else
2356	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2357		2155
2358	strncat (buf2, " ", 20 - strlen (buf) / 2);
2359	strcat (buf2, buf);
2360	if (op->type == PLAYER)
2361	{	2156	{
2362	sprintf (buf, "by %s.\n\n", op->contr->killer);	2157	static char buf2[128];
2363	strncat (buf2, " ", 21 - strlen (buf) / 2);	2158	time_t now = time (NULL);
2364	strcat (buf2, buf);
2365	}
2366
2367	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2159	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2368	strncat (buf2, " ", 20 - strlen (buf) / 2);	2160	buf << buf2;
2369	strcat (buf2, buf);	2161	}
2370		2162
2371	return buf2;	2163	return buf;
2372	}	2164	}
2373		2165
2374	void	2166	void
2375	do_some_living (object *op)	2167	do_some_living (object *op)
2376	{	2168	{
…		…
2531	{	2323	{
2532	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2324	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533		2325
2534	if (over_hp > 0)	2326	if (over_hp > 0)
2535	{	2327	{
2536	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2328	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2537	op->last_heal = 0;	2329	op->last_heal = 0;
2538	}	2330	}
2539	else	2331	else
2540	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2332	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2541	}	2333	}
…		…
2557	op->stats.food--;	2349	op->stats.food--;
2558	}	2350	}
2559		2351
2560	if (op->stats.food < 0 && op->stats.hp >= 0)	2352	if (op->stats.food < 0 && op->stats.hp >= 0)
2561	{	2353	{
2562	object *tmp, *flesh = 0;	2354	object *flesh = 0;
2563		2355
2564	for (tmp = op->inv; tmp; tmp = tmp->below)	2356	for_inv_removable (op, tmp)
2565	{	2357	{
2566	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2358	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2359	continue;
		2360
		2361	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2567	{	2362	{
2568	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2363	op->statusmsg ("You blindly grab for a bite of food. "
2569	{	2364	"H<To prevent you from starving, you ate some random item from your backpack.>");
2570	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2571	manual_apply (op, tmp, 0);	2365	manual_apply (op, tmp, 0);
		2366
2572	if (op->stats.food >= 0 || op->stats.hp < 0)	2367	if (op->stats.food >= 0 || op->stats.hp < 0)
2573	break;	2368	break;
2574	}	2369	}
2575	else if (tmp->type == FLESH)	2370	else if (tmp->type == FLESH)
2576	flesh = tmp;	2371	flesh = tmp;
2577	} /* End if paid for object */	2372	}
2578	} /* end of for loop */
2579		2373
2580	/* If player is still starving, it means they don't have any food, so	2374	/* If player is still starving, it means they don't have any food, so
2581	* eat flesh instead.	2375	* eat flesh instead.
2582	*/	2376	*/
2583	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2377	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2584	{	2378	{
2585	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2379	op->statusmsg ("You blindly grab for a bite of food. "
		2380	"H<To prevent you from starving, you ate some random item from your backpack.>");
2586	manual_apply (op, flesh, 0);	2381	manual_apply (op, flesh, 0);
2587	}	2382	}
		2383
		2384	// If player is still starving, alert him!
		2385	if (op->stats.food < 0)
		2386	op->failmsg ("You are starving! "
		2387	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2588	}	2388	}
2589		2389
2590	if (op->stats.food < 0)	2390	if (op->stats.food < 0)
2591	{	2391	{
2592	op->stats.hp += op->stats.food;	2392	op->stats.hp += op->stats.food;
2593	op->stats.food = 0;	2393	op->stats.food = 0;
		2394
		2395	if (op->stats.hp < 0)
		2396	{
		2397	op->contr->killer = archetype::get ("killer_starvation");
		2398	op->contr->killer->destroy ();
2594	}	2399	}
		2400	}
2595		2401
		2402	/* killer should be set here already */
2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2403	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597	kill_player (op);	2404	kill_player (op);
2598	}	2405	}
2599	}	2406	}
2600		2407
…		…
2605	*/	2412	*/
2606	void	2413	void
2607	kill_player (object *op)	2414	kill_player (object *op)
2608	{	2415	{
2609	int x, y;	2416	int x, y;
2610	char buf[MAX_BUF];
2611	maptile *map; /* this is for resurrection */	2417	maptile *map; /* this is for resurrection */
2612	int will_kill_again;	2418	int will_kill_again;
2613	archetype *at;	2419	archetype *at;
2614	object *tmp;	2420	object *tmp;
2615		2421
2616	if (save_life (op))	2422	if (save_life (op))
2617	return;	2423	return;
		2424
		2425	dynbuf_text deathtab;
		2426
		2427	/* restore player */
		2428	at = archetype::find ("poisoning");
		2429	if (object *tmp = present_arch_in_ob (at, op))
		2430	{
		2431	tmp->destroy ();
		2432	deathtab << "Your body feels cleansed...\r";
		2433	}
		2434
		2435	at = archetype::find ("confusion");
		2436	if (object *tmp = present_arch_in_ob (at, op))
		2437	{
		2438	tmp->destroy ();
		2439	deathtab << "Your mind feels clearer...\r";
		2440	}
		2441
		2442	cure_disease (op, 0, 0); /* remove any disease */
		2443
		2444	max_it (op->stats.hp , op->stats.maxhp);
		2445	max_it (op->stats.sp , op->stats.maxsp);
		2446	max_it (op->stats.grace, op->stats.maxgrace);
		2447
		2448	if (op->stats.food <= 0)
		2449	op->stats.food = 999;
		2450
		2451	// remove all spell effects that are active
		2452	// to avoid long-term effects such as word-of-recall
		2453	for (object *item = op->inv; item; )
		2454	{
		2455	object *next = item->below;
		2456
		2457	if (item->type == SPELL_EFFECT && item->active)
		2458	item->destroy ();
		2459
		2460	item = next;
		2461	}
2618		2462
2619	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2463	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2620	* in cities ONLY!!! It is very important that this doesn't get abused.	2464	* in cities ONLY!!! It is very important that this doesn't get abused.
2621	* Look at op_on_battleground() for more info --AndreasV	2465	* Look at op_on_battleground() for more info --AndreasV
2622	*/	2466	*/
2623	if (op_on_battleground (op, &x, &y))	2467	if (op_on_battleground (op, &x, &y))
2624	{	2468	{
2625	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2469	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2626	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2627
2628	/* restore player */
2629	at = archetype::find ("poisoning");
2630	if (object *tmp = present_arch_in_ob (at, op))
2631	{
2632	tmp->destroy ();
2633	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2634	}
2635
2636	at = archetype::find ("confusion");
2637	if (object *tmp = present_arch_in_ob (at, op))
2638	{
2639	tmp->destroy ();
2640	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2641	}
2642
2643	cure_disease (op, 0, 0); /* remove any disease */
2644	op->stats.hp = op->stats.maxhp;
2645	if (op->stats.food <= 0)
2646	op->stats.food = 999;
2647		2470
2648	/* create a bodypart-trophy to make the winner happy */	2471	/* create a bodypart-trophy to make the winner happy */
2649	if (object *tmp = arch_to_object (archetype::find ("finger")))	2472	if (object *tmp = arch_to_object (archetype::find ("finger")))
2650	{	2473	{
2651	tmp->name = format ("%s's finger" , &op->name);	2474	tmp->name = format ("%s's finger" , &op->name);
2652	tmp->name_pl = format ("%s's fingers", &op->name);	2475	tmp->name_pl = format ("%s's fingers", &op->name);
2653	tmp->msg = format (	2476	tmp->msg = format (
2654	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2477	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2655	&op->name, op->contr->title, (int) (op->level), op->contr->killer	2478	&op->name, op->contr->title,
		2479	(int)op->level,
		2480	op->contr->killer_name ()
2656	);	2481	);
2657	tmp->value = 0, tmp->type = 0;	2482	tmp->value = 0, tmp->type = 0;
2658	tmp->materialname = "organics";	2483	tmp->materialname = "organics";
2659	tmp->insert_at (op, tmp);	2484	tmp->insert_at (op, tmp);
2660	}	2485	}
2661		2486
2662	/* teleport defeated player to new destination */	2487	/* teleport defeated player to new destination */
2663	transfer_ob (op, x, y, 0, NULL);	2488	transfer_ob (op, x, y, 0, NULL);
2664	op->contr->braced = 0;	2489	op->contr->braced = 0;
		2490
		2491	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2665	return;	2492	return;
2666	}	2493	}
2667		2494
		2495	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2496	deathtab << "T<YOU HAVE DIED>\n\n";
		2497
2668	INVOKE_PLAYER (DEATH, op->contr);	2498	INVOKE_PLAYER (DEATH, op->contr);
2669		2499
2670	command_kill_pets (op, 0);	2500	command_kill_pets (op, 0);
2671
2672	if (op->stats.food < 0)
2673	strcpy (op->contr->killer, "starvation");
2674		2501
2675	op->contr->play_sound (sound_find ("player_dies"));	2502	op->contr->play_sound (sound_find ("player_dies"));
2676		2503
2677	/* save the map location for corpse, gravestone */	2504	/* save the map location for corpse, gravestone */
2678	x = op->x;	2505	x = op->x;
…		…
2708		2535
2709	lost_a_stat = 0;	2536	lost_a_stat = 0;
2710		2537
2711	for (z = 0; z < num_stats_lose; z++)	2538	for (z = 0; z < num_stats_lose; z++)
2712	{	2539	{
2713	i = RANDOM () % NUM_STATS;	2540	i = rndm (NUM_STATS);
2714		2541
2715	if (settings.stat_loss_on_death)	2542	if (settings.stat_loss_on_death)
2716	{	2543	{
2717	/* Pick a random stat and take a point off it. Tell the player	2544	/* Pick a random stat and take a point off it. Tell the player
2718	* what he lost.	2545	* what he lost.
…		…
2769	}	2596	}
2770	}	2597	}
2771		2598
2772	if (lose_this_stat)	2599	if (lose_this_stat)
2773	{	2600	{
2774	this_stat = get_attr_value (&(dep->stats), i);	2601	this_stat = get_attr_value (&dep->stats, i);
2775	/* We could try to do something clever like find another	2602	/* We could try to do something clever like find another
2776	* stat to reduce if this fails. But chances are, if	2603	* stat to reduce if this fails. But chances are, if
2777	* stats have been depleted to -50, all are pretty low	2604	* stats have been depleted to -50, all are pretty low
2778	* and should be roughly the same, so it shouldn't make a	2605	* and should be roughly the same, so it shouldn't make a
2779	* difference.	2606	* difference.
…		…
2787	lost_a_stat = 1;	2614	lost_a_stat = 1;
2788	}	2615	}
2789	}	2616	}
2790	}	2617	}
2791	}	2618	}
		2619
2792	/* If no stat lost, tell the player. */	2620	/* If no stat lost, tell the player. */
2793	if (!lost_a_stat)	2621	if (!lost_a_stat)
2794	{	2622	{
2795	/* determine_god() seems to not work sometimes... why is this?	2623	/* determine_god() seems to not work sometimes... why is this?
2796	Should I be using something else? GD */	2624	Should I be using something else? GD */
2797	const char *god = determine_god (op);	2625	shstr_tmp god = determine_god (op);
2798		2626
2799	if (god && (strcmp (god, "none")))	2627	if (god != shstr_none)
2800	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2628	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2801	else	2629	else
2802	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2630	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2803	}	2631	}
2804	#else	2632	#else
2805	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2633	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2806	#endif	2634	#endif
2807		2635
2808	/* Put a gravestone up where the character 'almost' died. List the	2636	/* Put a gravestone up where the character 'almost' died. List the
2809	* exp loss on the stone.	2637	* exp loss on the stone.
2810	*/	2638	*/
2811	tmp = arch_to_object (archetype::find ("gravestone"));	2639	tmp = arch_to_object (archetype::find ("gravestone"));
2812	sprintf (buf, "%s's gravestone", &op->name);	2640	tmp->name = format ("%s's gravestone", &op->name);
2813	tmp->name = buf;	2641	tmp->name_pl = format ("%s's gravestones", &op->name);
2814	sprintf (buf, "%s's gravestones", &op->name);	2642	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2815	tmp->name_pl = buf;	2643	&op->name, op->contr->title, op->contr->killer_name ());
2816	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2817	tmp->msg = buf;
2818	tmp->x = op->x, tmp->y = op->y;	2644	tmp->x = op->x, tmp->y = op->y;
2819	insert_ob_in_map (tmp, op->map, NULL, 0);	2645	insert_ob_in_map (tmp, op->map, NULL, 0);
2820		2646
2821	/**************************************/	2647	/**************************************/
2822	/* */	2648	/* */
2823	/* Subtract the experience points, */	2649	/* Subtract the experience points, */
2824	/* if we died cause of food, give us */
2825	/* food, and reset HP's... */
2826	/* */	2650	/* */
2827	/**************************************/	2651	/**************************************/
2828		2652
2829	/* remove any poisoning and confusion the character may be suffering. */
2830	/* restore player */
2831	at = archetype::find ("poisoning");
2832	tmp = present_arch_in_ob (at, op);
2833
2834	if (tmp)
2835	{
2836	tmp->destroy ();
2837	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2838	}
2839
2840	at = archetype::find ("confusion");
2841	tmp = present_arch_in_ob (at, op);
2842	if (tmp)
2843	{
2844	tmp->destroy ();
2845	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2846	}
2847
2848	cure_disease (op, 0, 0); /* remove any disease */
2849
2850	/*add_exp(op, (op->stats.exp * -0.20)); */	2653	/*add_exp(op, (op->stats.exp * -0.20)); */
2851	apply_death_exp_penalty (op);	2654	apply_death_exp_penalty (op);
2852	if (op->stats.food < 100)
2853	op->stats.food = 900;
2854	op->stats.hp = op->stats.maxhp;
2855	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2856	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2857		2655
2858	/*	2656	/*
2859	* Check to see if the player has any unpaid items. If so, remove them	2657	* Check to see if the player has any unpaid items. If so, remove them
2860	* and put them back in the map.	2658	* and put them back in the map.
2861	*/	2659	*/
…		…
2896	if (will_kill_again & (1 << at))	2694	if (will_kill_again & (1 << at))
2897	force->resist[at] = 100;	2695	force->resist[at] = 100;
2898		2696
2899	insert_ob_in_ob (force, op);	2697	insert_ob_in_ob (force, op);
2900	op->update_stats ();	2698	op->update_stats ();
2901
2902	}	2699	}
2903		2700
2904	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2701	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2905	}	2702	}
2906		2703
2907	void	2704	void
2908	loot_object (object *op)	2705	loot_object (object *op)
2909	{ /* Grab and destroy some treasure */	2706	{ /* Grab and destroy some treasure */
…		…
2926		2723
2927	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2724	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2928	{	2725	{
2929	if (tmp->nrof > 1)	2726	if (tmp->nrof > 1)
2930	{	2727	{
2931	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2728	tmp->decrease (rndm (1, tmp->nrof - 1));
2932	tmp2->destroy ();
2933	insert_ob_in_map (tmp, op->map, NULL, 0);	2729	insert_ob_in_map (tmp, op->map, NULL, 0);
2934	}	2730	}
2935	else	2731	else
2936	tmp->destroy ();	2732	tmp->destroy ();
2937	}	2733	}
…		…
2948	void	2744	void
2949	fix_weight (void)	2745	fix_weight (void)
2950	{	2746	{
2951	for_all_players (pl)	2747	for_all_players (pl)
2952	{	2748	{
2953	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2749	sint32 old = pl->ob->carrying;
2954		2750
2955	if (old == sum)	2751	pl->ob->update_weight ();
2956	continue;	2752
		2753	if (old != pl->ob->carrying)
		2754	{
2957	pl->ob->update_stats ();	2755	pl->ob->update_stats ();
2958	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2756	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2757	}
2959	}	2758	}
2960	}	2759	}
2961		2760
2962	void	2761	void
2963	fix_luck (void)	2762	fix_luck (void)
…		…
3005	}	2804	}
3006		2805
3007	void	2806	void
3008	make_visible (object *op)	2807	make_visible (object *op)
3009	{	2808	{
3010	op->hide = 0;	2809	op->flag [FLAG_HIDDEN] = 0;
3011	op->invisible = 0;	2810	op->invisible = 0;
3012		2811
3013	if (op->type == PLAYER)	2812	if (op->type == PLAYER)
3014	{	2813	{
3015	op->contr->tmp_invis = 0;	2814	op->contr->tmp_invis = 0;
…		…
3040		2839
3041	if (!ob || !ob->map)	2840	if (!ob || !ob->map)
3042	return 0;	2841	return 0;
3043		2842
3044	/* so, on normal lighted maps, its hard to hide */	2843	/* so, on normal lighted maps, its hard to hide */
3045	level = ob->map->darkness - 2;	2844	level = ob->map->darklevel () - 2;
3046		2845
3047	/* this also picks up whether the object is glowing.	2846	/* this also picks up whether the object is glowing.
3048	* If you carry a light on a non-dark map, its not	2847	* If you carry a light on a non-dark map, its not
3049	* as bad as carrying a light on a pitch dark map */	2848	* as bad as carrying a light on a pitch dark map */
3050	if (has_carried_lights (ob))	2849	if (ob->has_carried_lights ())
3051	level = -(10 + (2 * ob->map->darkness));	2850	level = -(10 + (2 * ob->map->darklevel ()));
3052		2851
3053	/* scan through all nearby squares for terrain to hide in */	2852	/* scan through all nearby squares for terrain to hide in */
3054	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2853	for (i = 0, x = ob->x, y = ob->y;
		2854	i <= SIZEOFFREE1;
		2855	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3055	{	2856	{
3056	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2857	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3057	if (mflag & P_OUT_OF_MAP)	2858	if (mflag & P_OUT_OF_MAP)
3058	{
3059	continue;	2859	continue;
3060	}	2860
3061	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2861	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3062	level += 2;	2862	level += 2;
3063	else /* open terrain! */	2863	else /* open terrain! */
3064	level -= 1;	2864	level -= 1;
3065	}	2865	}
…		…
3076	* spot (surrounded by clear terrain in broad daylight). -b.t.	2876	* spot (surrounded by clear terrain in broad daylight). -b.t.
3077	*/	2877	*/
3078	void	2878	void
3079	do_hidden_move (object *op)	2879	do_hidden_move (object *op)
3080	{	2880	{
3081	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2881	int hide = 0;
3082	object *skop;
3083		2882
3084	if (!op || !op->map)	2883	if (!op || !op->map)
3085	return;	2884	return;
3086		2885
3087	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2886	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2887	int num = random_roll (0, 19, op, PREFER_LOW);
3088		2888
3089	/* its *extremely* hard to run and sneak/hide at the same time! */	2889	/* its *extremely* hard to run and sneak/hide at the same time! */
3090	if (op->type == PLAYER && op->contr->run_on)	2890	if (op->type == PLAYER && op->contr->run_on)
3091	if (!skop || num >= skop->level)	2891	if (!skop || num >= skop->level)
3092	{	2892	{
…		…
3102	num -= hide;	2902	num -= hide;
3103		2903
3104	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2904	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3105	{	2905	{
3106	make_visible (op);	2906	make_visible (op);
		2907
3107	if (op->type == PLAYER)	2908	if (op->type == PLAYER)
3108	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2909	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3109	}	2910	}
3110	else if (op->type == PLAYER && skop)	2911	else if (op->type == PLAYER && skop)
3111	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2912	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3201	while (op)	3002	while (op)
3202	{	3003	{
3203	dx = rv.distance_x + op->arch->x;	3004	dx = rv.distance_x + op->arch->x;
3204	dy = rv.distance_y + op->arch->y;	3005	dy = rv.distance_y + op->arch->y;
3205		3006
3206	/* only the viewable area the player sees is updated by LOS	3007	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3207	* code, so we need to restrict ourselves to that range of values
3208	* for any meaningful values.
3209	*/
3210	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3211	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3212	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3213	return 1;	3008	return 1;
3214		3009
3215	op = op->more;	3010	op = op->more;
3216	}	3011	}
3217		3012
3218	return 0;	3013	return 0;
3219	}	3014	}
3220		3015
3221	/* routine for both players and monsters. We call this when	3016	/* routine for both players and monsters. We call this when
3222	* there is a possibility for our action distrubing our hiding	3017	* there is a possibility for our action distrubing our hiding
3223	* place or invisiblity spell. Artefact invisiblity is not	3018	* place or invisiblity spell. Artefact invisiblity causes
3224	* effected by this. If we arent invisible to begin with, we	3019	* "noise" instead. If we arent invisible to begin with, we
3225	* return 0.	3020	* return 0.
3226	*/	3021	*/
3227	int	3022	int
3228	action_makes_visible (object *op)	3023	action_makes_visible (object *op)
3229	{	3024	{
3230	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3025	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3231	{	3026	{
3232	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3027	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3028	{
		3029	// artefact invisibility is permanent, but we still make noise
		3030	// this is important for game-balance.
		3031	if (op->contr)
		3032	op->make_noise ();
		3033
3233	return 0;	3034	return 0;
		3035	}
3234		3036
3235	if (op->contr && op->contr->tmp_invis == 0)	3037	if (op->contr && op->contr->tmp_invis == 0)
3236	return 0;	3038	return 0;
3237		3039
3238	/* If monsters, they should become visible */	3040	/* If monsters, they should become visible */
3239	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3041	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3240	{	3042	{
3241	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3043	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3242	return 1;	3044	return 1;
3243	}	3045	}
3244	}	3046	}
3245		3047
3246	return 0;	3048	return 0;
…		…
3452	else	3254	else
3453	{	3255	{
3454	/* generate misc. treasure */	3256	/* generate misc. treasure */
3455	tmp = arch_to_object (tr->item);	3257	tmp = arch_to_object (tr->item);
3456	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3258	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3457	tmp = insert_ob_in_ob (tmp, who);	3259	who->insert (tmp);
3458	if (who->type == PLAYER)
3459	esrv_send_item (who, tmp);
3460	}	3260	}
3461	}	3261	}
3462		3262
3463	/**	3263	/**
3464	* Unready an object for a player. This function does nothing if the object was	3264	* Unready an object for a player. This function does nothing if the object was
…		…
3476	if (pl->ranged_ob == ob)	3276	if (pl->ranged_ob == ob)
3477	pl->ranged_ob = 0;	3277	pl->ranged_ob = 0;
3478	}	3278	}
3479		3279
3480	sint8	3280	sint8
3481	player::visibility_at (maptile *map, int x, int y) const	3281	player::darkness_at (maptile *map, int x, int y) const
3482	{	3282	{
3483	if (!ns)	3283	if (!ns)
3484	return 0;	3284	return LOS_BLOCKED;
3485		3285
3486	int dx, dy;	3286	int dx, dy;
3487	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3287	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3488	return 0;	3288	return LOS_BLOCKED;
3489		3289
3490	x += dx - ns->current_x + ns->mapx / 2;	3290	x += dx - ns->current_x;
3491	y += dy - ns->current_y + ns->mapy / 2;	3291	y += dy - ns->current_y;
3492		3292
3493	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3494	return 0;
3495
3496	return 100 - blocked_los [x][y];	3293	return blocked_los (x, y);
3497	}	3294	}
3498		3295
3499	void	3296	void
3500	player::infobox (const char *title, const char *msg, int color)	3297	player::infobox (const char *title, const char *msg, int color)
3501	{	3298	{

Diff Legend

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