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

Diff Legend

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