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

Diff Legend

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