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.179 by root, Sun Jan 13 13:20:43 2008 UTC vs.
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC

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

Diff Legend

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