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.150 by root, Sun Jun 10 03:11:17 2007 UTC vs.
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* under the terms of the GNU General Public License as published by the Free	9	* the terms of the Affero GNU General Public License as published by the
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the Affero GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* and the GNU General Public License along with this program. If not, see
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
		24
		25	//+GPL
24		26
25	#include <global.h>	27	#include <global.h>
26	#include <sproto.h>	28	#include <sproto.h>
27	#include <sounds.h>	29	#include <sounds.h>
28	#include <living.h>	30	#include <living.h>
…		…
33	#include <algorithm>	35	#include <algorithm>
34	#include <functional>	36	#include <functional>
35		37
36	playervec players;	38	playervec players;
37		39
38	void
39	display_motd (const object *op)
40	{
41	char buf[MAX_BUF];
42	char motd[HUGE_BUF];
43	FILE *fp;
44	int comp;
45	int size;
46
47	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49	return;
50
51	motd[0] = '\0';
52	size = 0;
53
54	while (fgets (buf, MAX_BUF, fp))
55	{
56	if (*buf == '#')
57	continue;
58
59	strncat (motd + size, buf, HUGE_BUF - size);
60	size += strlen (buf);
61	}
62
63	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64	close_and_delete (fp, comp);
65	}
66
67	void
68	send_rules (const object *op)
69	{
70	char buf[MAX_BUF];
71	char rules[HUGE_BUF];
72	FILE *fp;
73	int comp;
74	int size;
75
76	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78	return;
79
80	rules[0] = '\0';
81	size = 0;
82
83	while (fgets (buf, MAX_BUF, fp))
84	{
85	if (*buf == '#')
86	continue;
87
88	if (size + strlen (buf) >= HUGE_BUF)
89	{
90	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91	break;
92	}
93
94	strncat (rules + size, buf, HUGE_BUF - size);
95	size += strlen (buf);
96	}
97
98	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99	close_and_delete (fp, comp);
100	}
101
102	void
103	send_news (const object *op)
104	{
105	char buf[MAX_BUF];
106	char news[HUGE_BUF];
107	char subject[MAX_BUF];
108	FILE *fp;
109	int comp;
110	int size;
111
112	sprintf (buf, "%s/%s", settings.confdir, settings.news);
113	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114	return;
115
116	news[0] = '\0';
117	subject[0] = '\0';
118	size = 0;
119
120	while (fgets (buf, MAX_BUF, fp))
121	{
122	if (*buf == '#')
123	continue;
124
125	if (*buf == '%')
126	{ /* send one news */
127	if (size > 0)
128	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 */
129
130	strcpy (subject, buf + 1);
131	strip_endline (subject);
132	size = 0;
133	news[0] = '\0';
134	}
135	else
136	{
137	if (size + strlen (buf) >= HUGE_BUF)
138	{
139	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
140	break;
141	}
142	strncat (news + size, buf, HUGE_BUF - size);
143	size += strlen (buf);
144	}
145	}
146
147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);
150	}
151
152	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
153	static void	41	static void
154	set_first_map (object *op)	42	set_first_map (object *op)
155	{	43	{
156	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
184		72
185	if (ob->map)	73	if (ob->map)
186	maplevel = ob->map->path;	74	maplevel = ob->map->path;
187		75
188	ob->remove ();	76	ob->remove ();
		77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
189	ob->map = 0;	78	ob->map = 0;
190	party = 0;	79	party = 0;
191		80
192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	81	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193		82
…		…
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
232	shstr_cmp dragon_ability_force ("dragon_ability_force");
233	shstr_cmp dragon_skin_force ("dragon_skin_force");
234		118
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	119	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	120	if (tmp->type == FORCE)
237	if (tmp->arch->archname == dragon_ability_force)	121	if (tmp->arch->archname == shstr_dragon_ability_force)
238	abil = tmp;	122	abil = tmp;
239	else if (tmp->arch->archname == dragon_skin_force)	123	else if (tmp->arch->archname == shstr_dragon_skin_force)
240	skin = tmp;	124	skin = tmp;
241		125
242	set_dragon_name (ob, abil, skin);	126	set_dragon_name (ob, abil, skin);
243	}	127	}
244		128
245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246		130
247	esrv_new_player (this, ob->weight + ob->carrying);	131	esrv_new_player (this);
		132
		133	ob->update_stats ();
		134
		135	ns->floorbox_update ();
		136	esrv_send_inventory (ob, ob);
		137	esrv_add_spells (this, 0);
248		138
249	ob->flag [FLAG_READY_WEAPON] = false;	139	ob->flag [FLAG_READY_WEAPON] = false;
250	ob->flag [FLAG_READY_SKILL] = false;	140	ob->flag [FLAG_READY_SKILL] = false;
		141	ob->flag [FLAG_READY_RANGE] = false;
251	ob->flag [FLAG_READY_BOW] = false;	142	ob->flag [FLAG_READY_BOW] = false;
252		143
253	for (object *op = ob->inv; op; op = op->below)	144	for (object *op = ob->inv; op; op = op->below)
254	if (op->flag [FLAG_APPLIED])	145	if (op->flag [FLAG_APPLIED])
255	switch (op->type)	146	switch (op->type)
256	{	147	{
257	case SKILL:	148	case SKILL:
258	ob->flag [FLAG_APPLIED] = false;	149	op->flag [FLAG_APPLIED] = false;
259	break;	150	break;
260		151
261	case WAND:	152	case WAND:
262	case ROD:	153	case ROD:
263	case HORN:	154	case HORN:
…		…
268	case WEAPON:	159	case WEAPON:
269	combat_ob = op;	160	combat_ob = op;
270	break;	161	break;
271	}	162	}
272		163
		164	ob->current_weapon = 0;
273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	165	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274	ob->update_stats ();	166	activate (); // change_weapon also activates, but this doesn't hurt
275
276	ns->floorbox_update ();
277	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);
279
280	activate ();
281
282	send_rules (ob);
283	send_news (ob);
284	display_motd (ob);
285		167
286	INVOKE_PLAYER (CONNECT, this);	168	INVOKE_PLAYER (CONNECT, this);
287	INVOKE_PLAYER (LOGIN, this);	169	INVOKE_PLAYER (LOGIN, this);
288	}	170	}
289		171
290	void	172	void
291	player::disconnect ()	173	player::disconnect ()
292	{	174	{
		175	if (ob)
		176	{
		177	ob->close_container (); //TODO: client-specific
		178	ob->drop_unpaid_items ();
		179	}
		180
293	if (ns)	181	if (ns)
294	{	182	{
295	if (active)	183	if (active)
296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	184	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297		185
…		…
300	ns->reset_stats ();	188	ns->reset_stats ();
301	ns->pl = 0;	189	ns->pl = 0;
302	ns = 0;	190	ns = 0;
303	}	191	}
304		192
305	if (ob)	193	// this is important for the player scheduler to get the correct refcount
306	ob->close_container (); //TODO: client-specific	194	// when ns = 0
307		195	observe = viewpoint = ob;
308	observe = ob;
309		196
310	deactivate ();	197	deactivate ();
311	}	198	}
		199
		200	//-GPL
312		201
313	// the need for this function can be explained	202	// the need for this function can be explained
314	// by load_object not returning the object	203	// by load_object not returning the object
315	void	204	void
316	player::set_object (object *op)	205	player::set_object (object *op)
317	{	206	{
318	ob = observe = op;	207	ob = observe = viewpoint = op;
319	ob->contr = this; /* this aren't yet in archetype */	208	ob->contr = this; /* this aren't yet in archetype */
320		209
321	ob->speed = 1.0f;	210	ob->speed = 1.0f;
322	ob->speed_left = 0.5f;	211	ob->speed_left = 0.5f;
323		212
324	ob->direction = 5; /* So player faces south */	213	ob->direction = 5; /* So player faces south */
325	}	214	}
326		215
327	void	216	void
328	player::set_observe (object *op)	217	player::set_observe (object *op)
329	{	218	{
330	observe = op ? op : ob;	219	observe = viewpoint = op ? op : ob;
331	do_los = 1;	220	do_los = 1;
332	}	221	}
		222
		223	void
		224	player::set_viewpoint (object *op)
		225	{
		226	viewpoint = op ? op : (object *)observe;
		227	do_los = 1;
		228	}
		229
		230	//+GPL
333		231
334	player::player ()	232	player::player ()
335	{	233	{
336	/* There are some elements we want initialised to non zero value -	234	/* There are some elements we want initialised to non zero value -
337	* we deal with that below this point.	235	* we deal with that below this point.
…		…
343	savebed_map = first_map_path; /* Init. respawn position */	241	savebed_map = first_map_path; /* Init. respawn position */
344		242
345	gen_sp_armour = 10;	243	gen_sp_armour = 10;
346	bowtype = bow_normal;	244	bowtype = bow_normal;
347	petmode = pet_normal;	245	petmode = pet_normal;
348	listening = 10;
349	usekeys = containers;	246	usekeys = containers;
350	peaceful = 1; /* default peaceful */	247	peaceful = 1; /* default peaceful */
351	do_los = 1;	248	do_los = 1;
352		249
353	weapon_sp = 1.0f;	250	weapon_sp = 1.0f;
…		…
364	if (ob)	261	if (ob)
365	{	262	{
366	ob->destroy_inv (false);	263	ob->destroy_inv (false);
367	ob->destroy ();	264	ob->destroy ();
368	}	265	}
		266
		267	ob = observe = viewpoint = 0;
369	}	268	}
370		269
371	player::~player ()	270	player::~player ()
372	{	271	{
373	/* Clear item stack */	272	/* Clear item stack */
374	free (stack_items);	273	free (stack_items);
		274	}
		275
		276	/*
		277	* get_player_archetype() return next player archetype from archetype
		278	* list. Not very efficient routine, but used only creating new players.
		279	* Note: there MUST be at least one player archetype!
		280	*/
		281	static archetype *
		282	get_player_archetype (archetype *at)
		283	{
		284	// archetypes could have been reloaded
		285	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		286
		287	if (!nat)
		288	return at;
		289
		290	archvec::iterator i = archetypes.find (nat);
		291
		292	for (;;)
		293	{
		294	if (++i == archetypes.end ())
		295	i = archetypes.begin ();
		296	else if (*i == at)
		297	cleanup ("not a single player archetype found");
		298
		299	if ((*i)->type == PLAYER)
		300	return *i;
		301	}
375	}	302	}
376		303
377	/* Tries to add player on the connection passed in ns.	304	/* Tries to add player on the connection passed in ns.
378	* All we can really get in this is some settings like host and display	305	* All we can really get in this is some settings like host and display
379	* mode.	306	* mode.
…		…
381	player *	308	player *
382	player::create ()	309	player::create ()
383	{	310	{
384	player *pl = new player;	311	player *pl = new player;
385		312
386	pl->set_object (arch_to_object (get_player_archetype (0)));	313	pl->set_object (get_player_archetype (0)->instance ());
387		314
388	pl->ob->roll_stats ();	315	pl->ob->roll_stats ();
389	pl->ob->stats.wc = 2;	316	pl->ob->stats.wc = 2;
390	pl->ob->run_away = 25; /* Then we panick... */	317	pl->ob->run_away = 25; /* Then we panick... */
391		318
392	set_first_map (pl->ob);	319	set_first_map (pl->ob);
393		320
394	return pl;	321	return pl;
395	}
396
397	/*
398	* get_player_archetype() return next player archetype from archetype
399	* list. Not very efficient routine, but used only creating new players.
400	* Note: there MUST be at least one player archetype!
401	*/
402	archetype *
403	get_player_archetype (archetype *at)
404	{
405	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
406
407	for (;;)
408	{
409	if (++i == archetypes.end ())
410	i = archetypes.begin ();
411	else if (*i == at)
412	cleanup ("not a single player archetype found");
413
414	if ((*i)->type == PLAYER)
415	return *i;
416	}
417	}	322	}
418		323
419	object *	324	object *
420	get_nearest_player (object *mon)	325	get_nearest_player (object *mon)
421	{	326	{
…		…
424	unsigned lastdist;	329	unsigned lastdist;
425	rv_vector rv;	330	rv_vector rv;
426		331
427	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	332	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
428	{	333	{
429	/* We should not find free objects on this friendly list, but it
430	* does periodically happen. Given that, lets deal with it.
431	* While unlikely, it is possible the next object on the friendly
432	* list is also free, so encapsulate this in a while loop.
433	*/
434	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
435	{
436	object *tmp = ol->ob;
437
438	/* Can't do much more other than log the fact, because the object
439	* itself will have been cleared.
440	*/
441	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
442	tmp->debug_desc ());
443	ol = ol->next;
444	remove_friendly_object (tmp);
445	if (!ol)
446	return op;
447	}
448
449	/* Remove special check for player from this. First, it looks to cause
450	* some crashes (ol->ob->contr not set properly?), but secondly, a more
451	* complicated method of state checking would be needed in any case -
452	* as it was, a clever player could type quit, and the function would
453	* skip them over while waiting for confirmation. Remove
454	* on_same_map check, as can_detect_enemy also does this
455	*/
456	if (!can_detect_enemy (mon, ol->ob, &rv))	334	if (!can_detect_enemy (mon, ol->ob, &rv))
457	continue;	335	continue;
458		336
459	if (lastdist > rv.distance)	337	if (lastdist > rv.distance)
460	{	338	{
…		…
655		533
656	return firstdir;	534	return firstdir;
657	}	535	}
658		536
659	void	537	void
660	give_initial_items (object *pl, treasurelist * items)	538	give_initial_items (object *pl, treasurelist *items)
661	{	539	{
662	object *op, *next = NULL;
663
664	if (pl->randomitems != NULL)	540	if (pl->randomitems)
665	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	541	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
666		542
667	for (op = pl->inv; op; op = next)	543	for (object *next, *op = pl->inv; op; op = next)
668	{	544	{
669	next = op->below;	545	next = op->below;
670		546
671	/* Forces get applied per default, unless they have the	547	/* Forces get applied per default, unless they have the
672	* flag "neutral" set. Sorry but I can't think of a better way	548	* flag "neutral" set. Sorry but I can't think of a better way
…		…
677	/* we never give weapons/armour if these cannot be used	553	/* we never give weapons/armour if these cannot be used
678	* by this player due to race restrictions	554	* by this player due to race restrictions
679	*/	555	*/
680	if (pl->type == PLAYER)	556	if (pl->type == PLAYER)
681	{	557	{
682	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	558	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		559	&&
683	(op->type == ARMOUR || op->type == BOOTS ||	560	(op->type == ARMOUR || op->type == BOOTS
684	op->type == CLOAK || op->type == HELMET ||	561	|| op->type == CLOAK || op->type == HELMET
685	op->type == SHIELD || op->type == GLOVES ||	562	|| op->type == SHIELD || op->type == GLOVES
		563	|| op->type == BRACERS || op->type == GIRDLE))
686	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	564	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
687	{	565	{
688	op->destroy ();	566	op->destroy ();
689	continue;	567	continue;
690	}	568	}
691	}	569	}
692		570
693	/* This really needs to be better - we should really give	571	/* Here we remove duplicated skills (as duplicated spell objects have
694	* a substitute spellbook. The problem is that we don't really	572	* _very_ confusing effects for players), which could for instance be
695	* have a good idea what to replace it with (need something like	573	* generated by bad treasurelists. - elmex
696	* a first level treasurelist for each skill.)
697	* remove duplicate skills also
698	*/	574	*/
699	if (op->type == SPELLBOOK || op->type == SKILL)	575	if (op->type == SKILL)
700	{	576	{
701	object *tmp;
702
703	for (tmp = op->below; tmp; tmp = tmp->below)	577	for (object *tmp = op->below; tmp; tmp = tmp->below)
704	if (tmp->type == op->type && tmp->name == op->name)	578	if (tmp->type == op->type && tmp->name == op->name)
705	break;
706
707	if (tmp)
708	{	579	{
709	op->destroy ();	580	op->destroy ();
		581	LOG (llevError,
710	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	582	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
711	continue;	583	break;
712	}	584	}
713		585
714	if (op->nrof > 1)	586	if (op->nrof > 1)
715	op->nrof = 1;	587	op->nrof = 1;
716	}	588	}
717		589
718	if (op->type == SPELLBOOK && op->inv)	590	if (op->type == SPELLBOOK && op->inv)
719	{
720	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	591	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
721	}
722		592
723	/* Give starting characters identified, uncursed, and undamned	593	/* Give starting characters identified, uncursed, and undamned
724	* items. Just don't identify gold or silver, or it won't be	594	* items. Just don't identify gold or silver, or it won't be
725	* merged properly.	595	* merged properly.
726	*/	596	*/
727	if (need_identify (op))	597	if (need_identify (op))
728	{	598	{
729	SET_FLAG (op, FLAG_IDENTIFIED);	599	SET_FLAG (op, FLAG_IDENTIFIED);
730	CLEAR_FLAG (op, FLAG_CURSED);	600	CLEAR_FLAG (op, FLAG_CURSED);
731	CLEAR_FLAG (op, FLAG_DAMNED);	601	CLEAR_FLAG (op, FLAG_DAMNED);
732	}	602	}
		603
733	if (op->type == SPELL)	604	if (op->type == SPELL)
734	{	605	{
735	op->destroy ();	606	op->destroy ();
736	continue;	607	continue;
737	}	608	}
…		…
739	{	610	{
740	SET_FLAG (op, FLAG_CAN_USE_SKILL);	611	SET_FLAG (op, FLAG_CAN_USE_SKILL);
741	op->stats.exp = 0;	612	op->stats.exp = 0;
742	op->level = 1;	613	op->level = 1;
743	}	614	}
744	/* lock all 'normal items by default */	615	else /* lock all 'normal items by default */
745	else
746	SET_FLAG (op, FLAG_INV_LOCKED);	616	SET_FLAG (op, FLAG_INV_LOCKED);
747	} /* for loop of objects in player inv */	617	} /* for loop of objects in player inv */
748		618
749	/* Need to set up the skill pointers */	619	/* Need to set up the skill pointers */
750	link_player_skills (pl);	620	pl->contr->link_skills ();
751	}	621	}
752		622
753	void	623	void
754	get_party_password (object *op, partylist *party)	624	get_party_password (object *op, partylist *party)
755	{	625	{
…		…
765	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	635	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
766	}	636	}
767		637
768	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	638	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
769	static int	639	static int
770	roll_stat (void)	640	roll_stat ()
771	{	641	{
772	int a[4], i, j, k;	642	int a[4], i, j, k;
773		643
774	for (i = 0; i < 4; i++)	644	for (i = 0; i < 4; i++)
775	a[i] = (int) rndm (6) + 1;	645	a[i] = (int) rndm (6) + 1;
…		…
856	static void	726	static void
857	start_info (object *op)	727	start_info (object *op)
858	{	728	{
859	char buf[MAX_BUF];	729	char buf[MAX_BUF];
860		730
861	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	731	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
862	new_draw_info (NDI_UNIQUE, 0, op, buf);	732	new_draw_info (NDI_UNIQUE, 0, op, buf);
863	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
864	//new_draw_info (NDI_UNIQUE, 0, op, " ");
865	}	733	}
866		734
867	/* This function takes the key that is passed, and does the	735	/* This function takes the key that is passed, and does the
868	* appropriate action with it (change race, or other things).	736	* appropriate action with it (change race, or other things).
869	* The function name is for historical reasons - now we have	737	* The function name is for historical reasons - now we have
…		…
872	*/	740	*/
873	void	741	void
874	player::chargen_race_done ()	742	player::chargen_race_done ()
875	{	743	{
876	/* this must before then initial items are given */	744	/* this must before then initial items are given */
877	esrv_new_player (ob->contr, ob->weight + ob->carrying);	745	esrv_new_player (ob->contr);
878		746
879	treasurelist *tl = treasurelist::find ("starting_wealth");	747	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
880	if (tl)	748	if (tl)
881	create_treasure (tl, ob, 0, 0, 0);	749	create_treasure (tl, ob, 0, 0, 0);
882		750
883	INVOKE_PLAYER (BIRTH, ob->contr);	751	INVOKE_PLAYER (BIRTH, ob->contr);
884	INVOKE_PLAYER (LOGIN, ob->contr);	752	INVOKE_PLAYER (LOGIN, ob->contr);
885		753
886	ob->contr->ns->state = ST_PLAYING;	754	ob->contr->ns->state = ST_PLAYING;
887		755
888	if (ob->msg)	756	if (ob->msg)
889	ob->msg = 0;	757	ob->msg = 0;
890
891	/* We create this now because some of the unique maps will need it
892	* to save here.
893	*/
894	{
895	char buf[MAX_BUF];
896	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
897	make_path_to_file (buf);
898	}
899		758
900	start_info (ob);	759	start_info (ob);
901	CLEAR_FLAG (ob, FLAG_WIZ);	760	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (ob, ob->randomitems);	761	give_initial_items (ob, ob->randomitems);
903	link_player_skills (ob);
904	esrv_send_inventory (ob, ob);	762	esrv_send_inventory (ob, ob);
905	ob->update_stats ();	763	ob->update_stats ();
906		764
907	/* This moves the player to a different start map, if there	765	/* This moves the player to a different start map, if there
908	* is one for this race	766	* is one for this race
909	*/	767	*/
910	if (*first_map_ext_path)	768	if (*first_map_ext_path)
911	{	769	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
912	object *tmp;
913	char mapname[MAX_BUF];
914
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = ob->y;
920	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the
922	* default initial map */
923	tmp->destroy ();
924	}
925	else	770	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	771	LOG (llevDebug, "first_map_ext_path not set\n");
927	}	772	}
928		773
929	void	774	void
…		…
960	ob->stats.hp = ob->stats.maxhp;	805	ob->stats.hp = ob->stats.maxhp;
961	ob->stats.sp = ob->stats.maxsp;	806	ob->stats.sp = ob->stats.maxsp;
962	ob->stats.grace = 0;	807	ob->stats.grace = 0;
963	}	808	}
964		809
965	void	810	static void
966	flee_player (object *op)	811	flee_player (object *op)
967	{	812	{
968	int dir, diff;	813	int dir, diff;
969	rv_vector rv;	814	rv_vector rv;
970		815
…		…
973	LOG (llevDebug, "Fleeing player is dead.\n");	818	LOG (llevDebug, "Fleeing player is dead.\n");
974	CLEAR_FLAG (op, FLAG_SCARED);	819	CLEAR_FLAG (op, FLAG_SCARED);
975	return;	820	return;
976	}	821	}
977		822
978	if (op->enemy == NULL)	823	if (!op->enemy)
979	{	824	{
980	LOG (llevDebug, "Fleeing player had no enemy.\n");	825	LOG (llevDebug, "Fleeing player had no enemy.\n");
981	CLEAR_FLAG (op, FLAG_SCARED);	826	CLEAR_FLAG (op, FLAG_SCARED);
982	return;	827	return;
983	}	828	}
984		829
985	/* Seen some crashes here. Since we don't store an
986	* op->enemy_count, it is possible that something destroys the
987	* actual enemy, and the object is recycled.
988	*/
989	if (op->enemy->map == NULL)
990	{
991	CLEAR_FLAG (op, FLAG_SCARED);
992	op->enemy = NULL;
993	return;
994	}
995
996	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	830	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
997	{	831	{
998	op->enemy = NULL;	832	op->enemy = NULL;
999	CLEAR_FLAG (op, FLAG_SCARED);	833	CLEAR_FLAG (op, FLAG_SCARED);
1000	return;	834	return;
…		…
1003	get_rangevector (op, op->enemy, &rv, 0);	837	get_rangevector (op, op->enemy, &rv, 0);
1004		838
1005	dir = absdir (4 + rv.direction);	839	dir = absdir (4 + rv.direction);
1006	for (diff = 0; diff < 3; diff++)	840	for (diff = 0; diff < 3; diff++)
1007	{	841	{
1008	int m = 1 - (RANDOM () & 2);	842	int m = 1 - rndm (2) * 2;
1009		843
1010	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	844	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1011	return;	845	return;
1012	}	846	}
1013		847
1014	/* Cornered, get rid of scared */	848	/* Cornered, get rid of scared */
1015	CLEAR_FLAG (op, FLAG_SCARED);	849	CLEAR_FLAG (op, FLAG_SCARED);
…		…
1024	check_pick (object *op)	858	check_pick (object *op)
1025	{	859	{
1026	object *tmp, *next;	860	object *tmp, *next;
1027	int stop = 0;	861	int stop = 0;
1028	int wvratio;	862	int wvratio;
1029	char putstring[128];
1030		863
1031	/* if you're flying, you cna't pick up anything */	864	/* if you're flying, you can't pick up anything */
1032	if (op->move_type & MOVE_FLYING)	865	if (op->move_type & MOVE_FLYING)
1033	return 1;	866	return 1;
1034		867
1035	next = op->below;	868	next = op->below;
		869
		870	int cnt = MAX_ITEM_PER_ACTION;
		871	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1036		872
1037	/* loop while there are items on the floor that are not marked as	873	/* loop while there are items on the floor that are not marked as
1038	* destroyed */	874	* destroyed */
1039	while (next && !next->destroyed ())	875	while (next && !next->destroyed ())
1040	{	876	{
1041	tmp = next;	877	tmp = next;
1042	next = tmp->below;	878	next = tmp->below;
1043		879
		880	if (cnt <= 0)
		881	{
		882	op->failmsg ("Couldn't pickup all items at once.");
		883	return 0;
		884	}
		885
1044	if (op->destroyed ())	886	if (op->destroyed ())
1045	return 0;	887	return 0;
1046		888
1047	if (!can_pick (op, tmp))	889	if (!can_pick (op, tmp))
1048	continue;	890	continue;
1049		891
1050	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	892	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1051	{	893	{
1052	if (item_matched_string (op, tmp, op->contr->search_str))	894	if (item_matched_string (op, tmp, op->contr->search_str))
1053	pick_up (op, tmp);	895	CHK_PICK_PICKUP;
		896
1054	continue;	897	continue;
1055	}	898	}
1056		899
1057	/* high not bit set? We're using the old autopickup model */	900	/* pickup handling */
		901	if (op->contr->mode & PU_DEBUG)
		902	{
		903	/* some debugging code to figure out item information */
		904	const char *str = tmp->name
		905	? format ("item name: %s item type: %d weight/value: %d",
		906	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		907	: format ("item name: %s item type: %d weight/value: %d",
		908	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		909
		910	new_draw_info (NDI_UNIQUE, 0, op, str);
		911	}
		912
		913	if (op->contr->mode & PU_INHIBIT)
		914	return 1;
		915
		916	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		917	return 1;
		918
		919	/* philosophy:
		920	* It's easy to grab an item type from a pile, as long as it's
		921	* generic. This takes no game-time. For more detailed pickups
		922	* and selections, select-items should be used. This is a
		923	* grab-as-you-run type mode that's really useful for arrows for
		924	* example.
		925	* The drawback: right now it has no frontend, so you need to
		926	* stick the bits you want into a calculator in hex mode and then
		927	* convert to decimal and then 'pickup <#>
		928	*/
		929
		930	/* the first two modes are exclusive: if NOTHING we return, if
		931	* STOP then we stop. All the rest are applied sequentially,
		932	* meaning if any test passes, the item gets picked up. */
		933
		934	/* if mode is set to pick nothing up, return */
		935	if (op->contr->mode == PU_NOTHING)
		936	return 1;
		937
		938	/* if mode is set to stop when encountering objects, return */
		939	/* take STOP before INHIBIT since it doesn't actually pick
		940	* anything up */
		941	if (op->contr->mode & PU_STOP)
		942	return 0;
		943
		944	/* useful for going into stores and not losing your settings... */
		945	/* and for battles wher you don't want to get loaded down while
		946	* fighting */
		947	if (op->contr->mode & PU_INHIBIT)
		948	return 1;
		949
		950	/* prevent us from turning into auto-thieves :) */
		951	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		952	continue;
		953
		954	/* ignore known cursed objects */
		955	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		956	continue;
		957
		958	/* all food and drink if desired */
		959	/* question: don't pick up known-poisonous stuff? */
1058	if (!(op->contr->mode & PU_NEWMODE))	960	if (op->contr->mode & PU_FOOD)
		961	if (tmp->type == FOOD)
1059	{	962	{
1060	switch (op->contr->mode)	963	CHK_PICK_PICKUP;
		964	continue;
		965	}
		966
		967	if (op->contr->mode & PU_DRINK)
		968	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		969	{
		970	CHK_PICK_PICKUP;
		971	continue;
		972	}
		973
		974	if (op->contr->mode & PU_POTION)
		975	if (tmp->type == POTION)
		976	{
		977	CHK_PICK_PICKUP;
		978	continue;
		979	}
		980
		981	/* spellbooks, skillscrolls and normal books/scrolls */
		982	if (op->contr->mode & PU_SPELLBOOK)
		983	if (tmp->type == SPELLBOOK)
		984	{
		985	CHK_PICK_PICKUP;
		986	continue;
		987	}
		988
		989	if (op->contr->mode & PU_SKILLSCROLL)
		990	if (tmp->type == SKILLSCROLL)
		991	{
		992	CHK_PICK_PICKUP;
		993	continue;
		994	}
		995
		996	if (op->contr->mode & PU_READABLES)
		997	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		998	{
		999	CHK_PICK_PICKUP;
		1000	continue;
		1001	}
		1002
		1003	/* wands/staves/rods/horns */
		1004	if (op->contr->mode & PU_MAGIC_DEVICE)
		1005	if (tmp->type == WAND
		1006	|| tmp->type == ROD
		1007	|| tmp->type == HORN
		1008	|| tmp->type == POWER_CRYSTAL)
		1009	{
		1010	CHK_PICK_PICKUP;
		1011	continue;
		1012	}
		1013
		1014	/* pick up all magical items */
		1015	if (op->contr->mode & PU_MAGICAL)
		1016	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
		1017	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1018	{
		1019	CHK_PICK_PICKUP;
		1020	continue;
		1021	}
		1022
		1023	if (op->contr->mode & PU_VALUABLES)
		1024	{
		1025	if (tmp->type == MONEY || tmp->type == GEM)
1061	{	1026	{
1062	case 0:	1027	CHK_PICK_PICKUP;
1063	return 1; /* don't pick up */	1028	continue;
1064	case 1:
1065	pick_up (op, tmp);
1066	return 1;
1067	case 2:
1068	pick_up (op, tmp);
1069	return 0;
1070	case 3:
1071	return 0; /* stop before pickup */
1072	case 4:
1073	pick_up (op, tmp);
1074	break;
1075	case 5:
1076	pick_up (op, tmp);
1077	stop = 1;
1078	break;
1079	case 6:
1080	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1081	pick_up (op, tmp);
1082	break;
1083
1084	case 7:
1085	if (tmp->type == MONEY || tmp->type == GEM)
1086	pick_up (op, tmp);
1087	break;
1088
1089	default:
1090	/* use value density */
1091	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1092	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1093	pick_up (op, tmp);
1094	}	1029	}
1095	}	1030	}
1096	else	1031
1097	{ /* old model */	1032	/* rings & amulets - talismans seems to be typed AMULET */
1098	/* NEW pickup handling */
1099	if (op->contr->mode & PU_DEBUG)	1033	if (op->contr->mode & PU_JEWELS)
		1034	if (tmp->type == RING
		1035	|| tmp->type == AMULET
		1036	|| tmp->type == GIRDLE
		1037	|| tmp->type == SKILL_TOOL)
1100	{	1038	{
1101	/* some debugging code to figure out item information */	1039	CHK_PICK_PICKUP;
1102	if (tmp->name != NULL)
1103	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1104	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1105	else
1106	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1107	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1108
1109	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1110	}
1111
1112	/* philosophy:
1113	* It's easy to grab an item type from a pile, as long as it's
1114	* generic. This takes no game-time. For more detailed pickups
1115	* and selections, select-items should be used. This is a
1116	* grab-as-you-run type mode that's really useful for arrows for
1117	* example.
1118	* The drawback: right now it has no frontend, so you need to
1119	* stick the bits you want into a calculator in hex mode and then
1120	* convert to decimal and then 'pickup <#>
1121	*/
1122
1123	/* the first two modes are exclusive: if NOTHING we return, if
1124	* STOP then we stop. All the rest are applied sequentially,
1125	* meaning if any test passes, the item gets picked up. */
1126
1127	/* if mode is set to pick nothing up, return */
1128
1129	if (op->contr->mode & PU_NOTHING)
1130	return 1;
1131
1132	/* if mode is set to stop when encountering objects, return */
1133	/* take STOP before INHIBIT since it doesn't actually pick
1134	* anything up */
1135
1136	if (op->contr->mode & PU_STOP)
1137	return 0;
1138
1139	/* useful for going into stores and not losing your settings... */
1140	/* and for battles wher you don't want to get loaded down while
1141	* fighting */
1142	if (op->contr->mode & PU_INHIBIT)
1143	return 1;
1144
1145	/* prevent us from turning into auto-thieves :) */
1146	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1147	continue;	1040	continue;
		1041	}
1148		1042
1149	/* ignore known cursed objects */	1043	/* we don't forget dragon food */
1150	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1044	if (op->contr->mode & PU_FLESH)
		1045	if (tmp->type == FLESH)
		1046	{
		1047	CHK_PICK_PICKUP;
1151	continue;	1048	continue;
		1049	}
1152		1050
1153	/* all food and drink if desired */	1051	/* bows and arrows. Bows are good for selling! */
1154	/* question: don't pick up known-poisonous stuff? */	1052	if (op->contr->mode & PU_BOW)
		1053	if (tmp->type == BOW)
		1054	{
		1055	CHK_PICK_PICKUP;
		1056	continue;
		1057	}
		1058
		1059	if (op->contr->mode & PU_ARROW)
		1060	if (tmp->type == ARROW)
		1061	{
		1062	CHK_PICK_PICKUP;
		1063	continue;
		1064	}
		1065
		1066	/* all kinds of armor etc. */
		1067	if (op->contr->mode & PU_ARMOUR)
		1068	if (tmp->type == ARMOUR)
		1069	{
		1070	CHK_PICK_PICKUP;
		1071	continue;
		1072	}
		1073
		1074	if (op->contr->mode & PU_HELMET)
		1075	if (tmp->type == HELMET)
		1076	{
		1077	CHK_PICK_PICKUP;
		1078	continue;
		1079	}
		1080
		1081	if (op->contr->mode & PU_SHIELD)
		1082	if (tmp->type == SHIELD)
		1083	{
		1084	CHK_PICK_PICKUP;
		1085	continue;
		1086	}
		1087
1155	if (op->contr->mode & PU_FOOD)	1088	if (op->contr->mode & PU_BOOTS)
1156	if (tmp->type == FOOD)	1089	if (tmp->type == BOOTS)
		1090	{
		1091	CHK_PICK_PICKUP;
		1092	continue;
		1093	}
		1094
		1095	if (op->contr->mode & PU_GLOVES)
		1096	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1097	{
		1098	CHK_PICK_PICKUP;
		1099	continue;
		1100	}
		1101
		1102	if (op->contr->mode & PU_CLOAK)
		1103	if (tmp->type == CLOAK)
		1104	{
		1105	CHK_PICK_PICKUP;
		1106	continue;
		1107	}
		1108
		1109	/* hoping to catch throwing daggers here */
		1110	if (op->contr->mode & PU_MISSILEWEAPON)
		1111	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1112	{
		1113	CHK_PICK_PICKUP;
		1114	continue;
		1115	}
		1116
		1117	/* careful: chairs and tables are weapons! */
		1118	if (op->contr->mode & PU_ALLWEAPON)
		1119	{
		1120	if (tmp->type == WEAPON)
		1121	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1157	{	1122	{
1158	pick_up (op, tmp);	1123	CHK_PICK_PICKUP;
1159	continue;	1124	continue;
1160	}	1125	}
		1126	}
1161		1127
		1128	/* misc stuff that's useful */
1162	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_KEY)
1163	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1130	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1164	{	1131	{
1165	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1166	continue;	1133	continue;
1167	}	1134	}
1168		1135
		1136	/* any of the last 4 bits set means we use the ratio for value
		1137	* pickups */
1169	if (op->contr->mode & PU_POTION)	1138	if (op->contr->mode & PU_RATIO)
1170	if (tmp->type == POTION)	1139	{
		1140	/* use value density to decide what else to grab */
		1141	/* >=7 was >= op->contr->mode */
		1142	/* >=7 is the old standard setting. Now we take the last 4 bits
1171	{	1143	*/
1172	pick_up (op, tmp);
1173	continue;
1174	}
1175
1176	/* spellbooks, skillscrolls and normal books/scrolls */
1177	if (op->contr->mode & PU_SPELLBOOK)
1178	if (tmp->type == SPELLBOOK)
1179	{
1180	pick_up (op, tmp);
1181	continue;
1182	}
1183
1184	if (op->contr->mode & PU_SKILLSCROLL)
1185	if (tmp->type == SKILLSCROLL)
1186	{
1187	pick_up (op, tmp);
1188	continue;
1189	}
1190
1191	if (op->contr->mode & PU_READABLES)
1192	if (tmp->type == BOOK || tmp->type == SCROLL)
1193	{
1194	pick_up (op, tmp);
1195	continue;
1196	}
1197
1198	/* wands/staves/rods/horns */
1199	if (op->contr->mode & PU_MAGIC_DEVICE)
1200	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1201	{
1202	pick_up (op, tmp);
1203	continue;
1204	}
1205
1206	/* pick up all magical items */
1207	if (op->contr->mode & PU_MAGICAL)	1144	wvratio = op->contr->mode & PU_RATIO;
1208	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1145	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1209	{
1210	pick_up (op, tmp);
1211	continue;
1212	}
1213
1214	if (op->contr->mode & PU_VALUABLES)
1215	{	1146	{
1216	if (tmp->type == MONEY || tmp->type == GEM)	1147	#if 0
		1148	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1149	if (tmp->name != NULL)
1217	{	1150	{
1218	pick_up (op, tmp);	1151	fprintf (stderr, "%s", tmp->name);
1219	continue;
1220	}	1152	}
1221	}
1222
1223	/* rings & amulets - talismans seems to be typed AMULET */
1224	if (op->contr->mode & PU_JEWELS)
1225	if (tmp->type == RING || tmp->type == AMULET)
1226	{
1227	pick_up (op, tmp);
1228	continue;
1229	}
1230
1231	/* we don't forget dragon food */
1232	if (op->contr->mode & PU_FLESH)
1233	if (tmp->type == FLESH)
1234	{
1235	pick_up (op, tmp);
1236	continue;
1237	}
1238
1239	/* bows and arrows. Bows are good for selling! */
1240	if (op->contr->mode & PU_BOW)
1241	if (tmp->type == BOW)
1242	{
1243	pick_up (op, tmp);
1244	continue;
1245	}
1246
1247	if (op->contr->mode & PU_ARROW)
1248	if (tmp->type == ARROW)
1249	{
1250	pick_up (op, tmp);
1251	continue;
1252	}
1253
1254	/* all kinds of armor etc. */
1255	if (op->contr->mode & PU_ARMOUR)
1256	if (tmp->type == ARMOUR)
1257	{
1258	pick_up (op, tmp);
1259	continue;
1260	}
1261
1262	if (op->contr->mode & PU_HELMET)
1263	if (tmp->type == HELMET)
1264	{
1265	pick_up (op, tmp);
1266	continue;
1267	}
1268
1269	if (op->contr->mode & PU_SHIELD)
1270	if (tmp->type == SHIELD)
1271	{
1272	pick_up (op, tmp);
1273	continue;
1274	}
1275
1276	if (op->contr->mode & PU_BOOTS)
1277	if (tmp->type == BOOTS)
1278	{
1279	pick_up (op, tmp);
1280	continue;
1281	}
1282
1283	if (op->contr->mode & PU_GLOVES)
1284	if (tmp->type == GLOVES)
1285	{
1286	pick_up (op, tmp);
1287	continue;
1288	}
1289
1290	if (op->contr->mode & PU_CLOAK)
1291	if (tmp->type == CLOAK)
1292	{
1293	pick_up (op, tmp);
1294	continue;
1295	}
1296
1297	/* hoping to catch throwing daggers here */
1298	if (op->contr->mode & PU_MISSILEWEAPON)
1299	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1300	{
1301	pick_up (op, tmp);
1302	continue;
1303	}
1304
1305	/* careful: chairs and tables are weapons! */
1306	if (op->contr->mode & PU_ALLWEAPON)
1307	{
1308	if (tmp->type == WEAPON && tmp->name != NULL)
1309	{
1310	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1311	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1312	{
1313	pick_up (op, tmp);
1314	continue;
1315	}
1316	}
1317
1318	if (tmp->type == WEAPON && tmp->name == NULL)
1319	{
1320	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1321	{
1322	pick_up (op, tmp);
1323	continue;
1324	}
1325	}
1326	}
1327
1328	/* misc stuff that's useful */
1329	if (op->contr->mode & PU_KEY)
1330	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1331	{
1332	pick_up (op, tmp);
1333	continue;
1334	}
1335
1336	/* any of the last 4 bits set means we use the ratio for value
1337	* pickups */
1338	if (op->contr->mode & PU_RATIO)
1339	{
1340	/* use value density to decide what else to grab */
1341	/* >=7 was >= op->contr->mode */
1342	/* >=7 is the old standard setting. Now we take the last 4 bits
1343	* and multiply them by 5, giving 0..15*5== 5..75 */
1344	wvratio = (op->contr->mode & PU_RATIO) * 5;
1345	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1346	{
1347	pick_up (op, tmp);
1348	#if 0
1349	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1350	if (tmp->name != NULL)
1351	{
1352	fprintf (stderr, "%s", tmp->name);
1353	}
1354	else	1153	else
1355	fprintf (stderr, "%s", tmp->arch->archname);	1154	fprintf (stderr, "%s", tmp->arch->archname);
1356	fprintf (stderr, ",%d] = ", tmp->type);	1155	fprintf (stderr, ",%d] = ", tmp->type);
1357	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1156	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1358	#endif	1157	#endif
		1158	CHK_PICK_PICKUP;
1359	continue;	1159	continue;
1360	}
1361	}	1160	}
1362	} /* the new pickup model */	1161	} /* the new pickup model */
1363	}	1162	}
1364		1163
1365	return !stop;	1164	return !stop;
		1165	}
		1166
		1167	/* routine for both players and monsters. We call this when
		1168	* there is a possibility for our action distrubing our hiding
		1169	* place or invisiblity spell. Artefact invisiblity causes
		1170	* "noise" instead. If we arent invisible to begin with, we
		1171	* return 0.
		1172	*/
		1173	static int
		1174	action_makes_visible (object *op)
		1175	{
		1176	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1177	{
		1178	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1179	{
		1180	// artefact invisibility is permanent, but we still make noise
		1181	// this is important for game-balance.
		1182	if (op->contr)
		1183	op->make_noise ();
		1184
		1185	return 0;
		1186	}
		1187
		1188	if (op->contr && op->contr->tmp_invis == 0)
		1189	return 0;
		1190
		1191	/* If monsters, they should become visible */
		1192	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1193	{
		1194	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1195	return 1;
		1196	}
		1197	}
		1198
		1199	return 0;
1366	}	1200	}
1367		1201
1368	/*	1202	/*
1369	* Find an arrow in the inventory and after that	1203	* Find an arrow in the inventory and after that
1370	* in the right type container (quiver). Pointer to the	1204	* in the right type container (quiver). Pointer to the
1371	* found object is returned.	1205	* found object is returned.
1372	*/	1206	*/
1373	object *	1207	static object *
1374	find_arrow (object *op, const char *type)	1208	find_arrow (object *op, const char *type)
1375	{	1209	{
1376	object *tmp = 0;
1377
1378	for (op = op->inv; op; op = op->below)	1210	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1379	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1380	tmp = find_arrow (op, type);
1381	else if (op->type == ARROW && op->race == type)	1211	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1212	return splay (tmp);
		1213
		1214	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1215	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1216	if (object *arrow = find_arrow (tmp, type))
		1217	{
		1218	splay (tmp);
1382	return op;	1219	return arrow;
		1220	}
1383		1221
1384	return tmp;	1222	return 0;
1385	}	1223	}
1386		1224
1387	/*	1225	/*
1388	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1226	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1389	* against the target. A full test is not performed, simply a basic test	1227	* against the target. A full test is not performed, simply a basic test
1390	* of resistances. The archer is making a quick guess at what he sees down	1228	* of resistances. The archer is making a quick guess at what he sees down
1391	* the hall. Failing that it does it's best to pick the highest plus arrow.	1229	* the hall. Failing that it does it's best to pick the highest plus arrow.
1392	*/	1230	*/
1393	object *	1231	static object *
1394	find_better_arrow (object *op, object *target, const char *type, int *better)	1232	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1395	{	1233	{
1396	object *tmp = NULL, *arrow, *ntmp;	1234	object *tmp = NULL, *arrow, *ntmp;
1397	int attacknum, attacktype, betterby = 0, i;	1235	int attacknum, attacktype, betterby = 0, i;
1398		1236
1399	if (!type)	1237	if (!type)
…		…
1403	{	1241	{
1404	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1242	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1405	{	1243	{
1406	i = 0;	1244	i = 0;
1407	ntmp = find_better_arrow (arrow, target, type, &i);	1245	ntmp = find_better_arrow (arrow, target, type, &i);
		1246
1408	if (i > betterby)	1247	if (i > betterby)
1409	{	1248	{
1410	tmp = ntmp;	1249	tmp = ntmp;
1411	betterby = i;	1250	betterby = i;
1412	}	1251	}
1413	}	1252	}
1414	else if (arrow->type == ARROW && arrow->race == type)	1253	else if (arrow->type == ARROW && arrow->race == type)
1415	{	1254	{
1416	/* allways prefer assasination/slaying */	1255	/* allways prefer assasination/slaying */
1417	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1256	if (target->race && arrow->slaying.contains (target->race))
1418	{	1257	{
1419	if (arrow->attacktype & AT_DEATH)	1258	if (arrow->attacktype & AT_DEATH)
1420	{	1259	{
1421	*better = 100;	1260	*better = 100;
1422	return arrow;	1261	return arrow;
…		…
1437	{	1276	{
1438	tmp = arrow;	1277	tmp = arrow;
1439	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1278	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1440	}	1279	}
1441	}	1280	}
		1281
1442	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1282	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1443	{	1283	{
1444	tmp = arrow;	1284	tmp = arrow;
1445	betterby = 2 + arrow->magic + arrow->stats.dam;	1285	betterby = 2 + arrow->magic + arrow->stats.dam;
1446	}	1286	}
		1287
1447	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1288	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1448	{	1289	{
1449	tmp = arrow;	1290	tmp = arrow;
1450	betterby = 1 + arrow->magic + arrow->stats.dam;	1291	betterby = 1 + arrow->magic + arrow->stats.dam;
1451	}	1292	}
1452	}	1293	}
1453	}	1294	}
1454	}	1295	}
		1296
1455	if (tmp == NULL && arrow == NULL)	1297	if (tmp == NULL && arrow == NULL)
1456	return find_arrow (op, type);	1298	return find_arrow (op, type);
1457		1299
1458	*better = betterby;	1300	*better = betterby;
1459	return tmp;	1301	return tmp;
…		…
1463	* find_better_arrow to find a decent arrow to use.	1305	* find_better_arrow to find a decent arrow to use.
1464	* op = the shooter	1306	* op = the shooter
1465	* type = bow->race	1307	* type = bow->race
1466	* dir = fire direction	1308	* dir = fire direction
1467	*/	1309	*/
1468	object *	1310	static object *
1469	pick_arrow_target (object *op, const char *type, int dir)	1311	pick_arrow_target (object *op, shstr_cmp type, int dir)
1470	{	1312	{
1471	object *tmp = NULL;	1313	object *tmp = NULL;
1472	maptile *m;	1314	maptile *m;
1473	int i, mflags, found, number;	1315	int i, mflags, found, number;
1474	sint16 x, y;	1316	sint16 x, y;
…		…
1489	for (i = 0, found = 0; i < 20; i++)	1331	for (i = 0, found = 0; i < 20; i++)
1490	{	1332	{
1491	x += freearr_x[dir];	1333	x += freearr_x[dir];
1492	y += freearr_y[dir];	1334	y += freearr_y[dir];
1493	mflags = get_map_flags (m, &m, x, y, &x, &y);	1335	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1336
1494	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1337	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1495	{	1338	{
1496	tmp = NULL;	1339	tmp = 0;
1497	break;	1340	break;
1498	}	1341	}
1499	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1342	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1500	{	1343	{
1501	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1344	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1502	* perhaps a bad assumption.	1345	* perhaps a bad assumption.
1503	*/	1346	*/
1504	tmp = NULL;	1347	tmp = 0;
1505	break;	1348	break;
1506	}	1349	}
		1350
1507	if (mflags & P_IS_ALIVE)	1351	if (mflags & P_IS_ALIVE)
1508	{
1509	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1352	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1510	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1353	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1511	{
1512	found++;
1513	break;
1514	}
1515	if (found)
1516	break;	1354	break;
1517	}
1518	}	1355	}
1519	if (tmp == NULL)	1356
		1357	if (!tmp)
1520	return find_arrow (op, type);	1358	return find_arrow (op, type);
1521		1359
1522	if (tmp->head)	1360	if (tmp->head)
1523	tmp = tmp->head;	1361	tmp = tmp->head;
1524		1362
…		…
1564	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1402	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1565	return 0;	1403	return 0;
1566	}	1404	}
1567		1405
1568	// optimisation: move object to top so we will find it quickly again	1406	// optimisation: move object to top so we will find it quickly again
1569	if (bow->below)	1407	splay (bow);
1570	{
1571	bow->remove ();
1572	op->insert (bow);
1573	}
1574
1575	}	1408	}
1576		1409
1577	if (!bow->race || !bow->skill)	1410	if (!bow->race || !bow->skill)
1578	{	1411	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1412	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1605	}	1438	}
1606		1439
1607	/* this should not happen, but sometimes does */	1440	/* this should not happen, but sometimes does */
1608	if (arrow->nrof == 0)	1441	if (arrow->nrof == 0)
1609	{	1442	{
		1443	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1610	arrow->destroy ();	1444	arrow->destroy ();
1611	return 0;	1445	return 0;
1612	}	1446	}
1613		1447
1614	left = arrow; /* these are arrows left to the player */	1448	left = arrow; /* these are arrows left to the player */
1615	arrow = get_split_ob (arrow, 1);	1449	arrow = arrow->split ();
1616	if (!arrow)	1450	if (!arrow)
1617	{	1451	{
1618	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1452	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1619	return 0;	1453	return 0;
1620	}	1454	}
…		…
1624	arrow->direction = dir;	1458	arrow->direction = dir;
1625		1459
1626	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1460	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1627	arrow->stats.hp = arrow->stats.dam;	1461	arrow->stats.hp = arrow->stats.dam;
1628	arrow->stats.grace = arrow->attacktype;	1462	arrow->stats.grace = arrow->attacktype;
1629		1463	arrow->custom_name = arrow->slaying;
1630	if (arrow->slaying)
1631	arrow->spellarg = strdup (arrow->slaying);
1632		1464
1633	#if 0	1465	#if 0
1634	if (player *pl = op->contr)	1466	if (player *pl = op->contr)
1635	{	1467	{
1636	float speed = pl->weapon_sp;	1468	float speed = pl->weapon_sp;
…		…
1682		1514
1683	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1515	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1684	arrow->move_type = MOVE_FLY_LOW;	1516	arrow->move_type = MOVE_FLY_LOW;
1685	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1517	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1686		1518
1687	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1519	op->play_sound (sound_find ("fire_arrow"));
1688	m->insert (arrow, sx, sy, op);	1520	m->insert (arrow, sx, sy, op);
1689		1521
1690	if (!arrow->destroyed ())	1522	if (!arrow->destroyed ())
1691	move_arrow (arrow);	1523	move_arrow (arrow);
1692
1693	if (op->type == PLAYER)
1694	{
1695	if (left->destroyed ())
1696	esrv_del_item (op->contr, left->count);
1697	else
1698	esrv_send_item (op, left);
1699	}
1700		1524
1701	return 1;	1525	return 1;
1702	}	1526	}
1703		1527
1704	/* Special fire code for players - this takes into	1528	/* Special fire code for players - this takes into
…		…
1706	* but monsters can't. Putting that code here	1530	* but monsters can't. Putting that code here
1707	* makes the fire_bow code much cleaner.	1531	* makes the fire_bow code much cleaner.
1708	* this function should only be called if 'op' is a player,	1532	* this function should only be called if 'op' is a player,
1709	* hence the function name.	1533	* hence the function name.
1710	*/	1534	*/
1711	int	1535	static int
1712	player_fire_bow (object *op, int dir)	1536	player_fire_bow (object *op, int dir)
1713	{	1537	{
1714	int ret = 0, wcmod = 0;	1538	int ret;
1715		1539
1716	if (op->contr->bowtype == bow_bestarrow)	1540	if (op->contr->bowtype == bow_bestarrow)
1717	{	1541	{
1718	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1542	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1719	}	1543	}
1720	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1544	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1721	{	1545	{
1722	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1546	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1723	wcmod = -1;
1724
1725	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1547	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1726	}	1548	}
1727	else if (op->contr->bowtype == bow_threewide)	1549	else if (op->contr->bowtype == bow_threewide)
1728	{	1550	{
1729	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1551	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1730	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)]);
1731	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1553	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1732	}	1554	}
1733	else if (op->contr->bowtype == bow_spreadshot)	1555	else if (op->contr->bowtype == bow_spreadshot)
1734	{	1556	{
1735	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1557	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1736	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);
1737	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1559	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1738	}	1560	}
1739	else	1561	else
1740	{	1562	{
…		…
1746	}	1568	}
1747		1569
1748	/* Fires a misc (wand/rod/horn) object in 'dir'.	1570	/* Fires a misc (wand/rod/horn) object in 'dir'.
1749	* Broken apart from 'fire' to keep it more readable.	1571	* Broken apart from 'fire' to keep it more readable.
1750	*/	1572	*/
1751	void	1573	static void
1752	fire_misc_object (object *op, int dir)	1574	fire_misc_object (object *op, int dir)
1753	{	1575	{
1754	object *item = op->contr->ranged_ob;	1576	object *item = op->contr->ranged_ob;
1755		1577
1756	if (!item)	1578	if (!item)
…		…
1770		1592
1771	if (item->type == WAND)	1593	if (item->type == WAND)
1772	{	1594	{
1773	if (item->stats.food <= 0)	1595	if (item->stats.food <= 0)
1774	{	1596	{
1775	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1597	op->contr->play_sound (sound_find ("wand_poof"));
1776	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1598	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1777		1599
1778	return;	1600	return;
1779	}	1601	}
1780	}	1602	}
1781	else if (item->type == ROD || item->type == HORN)	1603	else if (item->type == ROD || item->type == HORN)
1782	{	1604	{
1783	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1605	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
		1606
		1607	// using the maximum of the rods charge allows at least one spell cast
		1608	// for a rod or horn, this fixes some broken rods.
		1609	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1784	{	1610	{
1785	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1611	op->contr->play_sound (sound_find ("wand_poof"));
1786		1612
1787	if (item->type == ROD)	1613	if (item->type == ROD)
1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1614	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1789	else	1615	else
1790	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1616	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1793	}	1619	}
1794	}	1620	}
1795		1621
1796	if (cast_spell (op, item, dir, item->inv, NULL))	1622	if (cast_spell (op, item, dir, item->inv, NULL))
1797	{	1623	{
1798	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1624	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1625
1799	if (item->type == WAND)	1626	if (item->type == WAND)
1800	{	1627	{
1801	if (!(--item->stats.food))	1628	if (!(--item->stats.food))
1802	{	1629	{
1803	object *tmp;	1630	object *tmp;
…		…
1807	CLEAR_FLAG (item, FLAG_ANIMATE);	1634	CLEAR_FLAG (item, FLAG_ANIMATE);
1808	item->face = item->arch->face;	1635	item->face = item->arch->face;
1809	item->set_speed (0);	1636	item->set_speed (0);
1810	}	1637	}
1811		1638
1812	if ((tmp = item->in_player ()))	1639	if (object *pl = item->visible_to ())
1813	esrv_update_item (UPD_ANIM, tmp, item);	1640	esrv_update_item (UPD_ANIM, pl, item);
1814	}	1641	}
1815	}	1642	}
1816	else if (item->type == ROD || item->type == HORN)	1643	else if (item->type == ROD || item->type == HORN)
1817	drain_rod_charge (item);	1644	drain_rod_charge (item);
1818	}	1645	}
…		…
1823	bool	1650	bool
1824	fire (object *op, int dir)	1651	fire (object *op, int dir)
1825	{	1652	{
1826	int spellcost = 0;	1653	int spellcost = 0;
1827		1654
1828	/* check for loss of invisiblity/hide */
1829	if (action_makes_visible (op))
1830	make_visible (op);
1831
1832	player *pl = op->contr;	1655	player *pl = op->contr;
1833		1656
1834	if (pl->golem)	1657	if (pl->golem)
1835	{	1658	{
1836	control_golem (op->contr->golem, dir);	1659	control_golem (op->contr->golem, dir);
…		…
1838	}	1661	}
1839		1662
1840	object *ob = pl->ranged_ob;	1663	object *ob = pl->ranged_ob;
1841		1664
1842	if (!ob)	1665	if (!ob)
1843	return false;
1844
1845	if (!op->change_weapon (ob))
1846	return false;	1666	return false;
1847		1667
1848	if (op->speed_left > 0.f)	1668	if (op->speed_left > 0.f)
1849	--op->speed_left;	1669	--op->speed_left;
1850	else	1670	else
1851	return false;	1671	return false;
1852		1672
		1673	if (!op->change_weapon (ob))
		1674	return false;
		1675
		1676	/* check for loss of invisiblity/hide */
		1677	if (action_makes_visible (op))
		1678	make_visible (op);
		1679
1853	switch (ob->type)	1680	switch (ob->type)
1854	{	1681	{
1855	case BOW:	1682	case BOW:
1856	player_fire_bow (op, dir);	1683	player_fire_bow (op, dir);
1857	break;	1684	break;
1858		1685
1859	case SPELL:	1686	case SPELL:
1860	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1687	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1861	break;	1688	break;
1862		1689
1863	case BUILDER:	1690	case BUILDER:
1864	apply_map_builder (op, dir);	1691	apply_map_builder (op, dir);
1865	break;	1692	break;
1866		1693
1867	case SKILL:	1694	case SKILL:
1868	do_skill (op, op, ob, dir, 0);	1695	do_skill (op, op, ob, dir, 0);
1869	break;	1696	break;
1870		1697
		1698	case SKILL_TOOL:
		1699	// change_weapon ensures that chosen_skill is uptodate
		1700	do_skill (op, op, op->chosen_skill, dir, 0);
		1701	break;
		1702
1871	default:	1703	default:
1872	fire_misc_object (op, dir);	1704	fire_misc_object (op, dir);
1873	break;	1705	break;
1874	}	1706	}
1875		1707
1876	return true;	1708	return true;
1877	}	1709	}
1878		1710
1879	/* find_key	1711	static object *
1880	* We try to find a key for the door as passed. If we find a key
1881	* and successfully use it, we return the key, otherwise NULL
1882	* This function merges both normal and locked door, since the logic
1883	* for both is the same - just the specific key is different.
1884	* pl is the player,
1885	* inv is the objects inventory to searched
1886	* door is the door we are trying to match against.
1887	* This function can be called recursively to search containers.
1888	*/
1889	object *
1890	find_key (object *pl, object *container, object *door)	1712	find_key_ (object *pl, object *container, object *door)
1891	{	1713	{
1892	object *tmp, *key;	1714	object *tmp, *key;
1893		1715
1894	/* Should not happen, but sanity checking is never bad */	1716	/* Should not happen, but sanity checking is never bad */
1895	if (!container->inv)	1717	if (!container->inv)
…		…
1898	/* First, lets try to find a key in the top level inventory */	1720	/* First, lets try to find a key in the top level inventory */
1899	for (tmp = container->inv; tmp; tmp = tmp->below)	1721	for (tmp = container->inv; tmp; tmp = tmp->below)
1900	{	1722	{
1901	if (door->type == DOOR && tmp->type == KEY)	1723	if (door->type == DOOR && tmp->type == KEY)
1902	break;	1724	break;
		1725
1903	/* For sanity, we should really check door type, but other stuff	1726	/* For sanity, we should really check door type, but other stuff
1904	* (like containers) can be locked with special keys	1727	* (like containers) can be locked with special keys
1905	*/	1728	*/
1906	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1729	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1907	break;	1730	break;
…		…
1913	* a key, return	1736	* a key, return
1914	*/	1737	*/
1915	if (!tmp)	1738	if (!tmp)
1916	{	1739	{
1917	for (tmp = container->inv; tmp; tmp = tmp->below)	1740	for (tmp = container->inv; tmp; tmp = tmp->below)
1918	{
1919	/* No reason to search empty containers */	1741	/* No reason to search empty containers */
1920	if (tmp->type == CONTAINER && tmp->inv)	1742	if (tmp->type == CONTAINER && tmp->inv)
1921	{
1922	if ((key = find_key (pl, tmp, door)))	1743	if ((key = find_key_ (pl, tmp, door)))
1923	return key;	1744	return key;
1924	}
1925	}
1926		1745
1927	if (!tmp)	1746	if (!tmp)
1928	return NULL;	1747	return 0;
1929	}	1748	}
1930		1749
1931	/* We get down here if we have found a key. Now if its in a container,	1750	/* We get down here if we have found a key. Now if its in a container,
1932	* see if we actually want to use it	1751	* see if we actually want to use it
1933	*/	1752	*/
1934	if (pl != container)	1753	if (pl != container)
1935	{	1754	{
1936	/* Only let players use keys in containers */	1755	/* Only let players use keys in containers */
1937	if (!pl->contr)	1756	if (!pl->contr)
1938	return NULL;	1757	return 0;
		1758
1939	/* cases where this fails:	1759	/* cases where this fails:
1940	* If we only search the player inventory, return now since we	1760	* If we only search the player inventory, return now since we
1941	* are not in the players inventory.	1761	* are not in the players inventory.
1942	* If the container is not active, return now since only active	1762	* If the container is not active, return now since only active
1943	* containers can be used.	1763	* containers can be used.
…		…
1947	* inv must have been an container and must have been active.	1767	* inv must have been an container and must have been active.
1948	*	1768	*
1949	* Change the color so that the message doesn't disappear with	1769	* Change the color so that the message doesn't disappear with
1950	* all the others.	1770	* all the others.
1951	*/	1771	*/
1952	if (pl->contr->usekeys == key_inventory ||	1772	if (pl->contr->usekeys == key_inventory
1953	!QUERY_FLAG (container, FLAG_APPLIED) ||	1773	|| !QUERY_FLAG (container, FLAG_APPLIED)
1954	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1774	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1955	{	1775	{
1956	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1776	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1957	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1777	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1958	return NULL;	1778	return NULL;
1959	}	1779	}
1960	}	1780	}
1961		1781
1962	return tmp;	1782	return tmp;
		1783	}
		1784
		1785	/* find_key
		1786	* We try to find a key for the door as passed. If we find a key
		1787	* and successfully use it, we return the key, otherwise NULL
		1788	* This function merges both normal and locked door, since the logic
		1789	* for both is the same - just the specific key is different.
		1790	* pl is the player,
		1791	* inv is the objects inventory to searched
		1792	* door is the door we are trying to match against.
		1793	* This function can be called recursively to search containers.
		1794	*/
		1795	object *
		1796	find_key (object *pl, object *container, object *door)
		1797	{
		1798	if (door->slaying && is_match_expr (door->slaying))
		1799	{
		1800	// for match expressions, we try to find the key by applying the match
		1801	// to the op itself, which is supposed to find the "key", instead
		1802	// of searching through containers ourselves.
		1803
		1804	return match_one (door->slaying, container, door, pl, pl);
		1805	}
		1806	else
		1807	return find_key_ (pl, container, door);
1963	}	1808	}
1964		1809
1965	/* moved door processing out of move_player_attack.	1810	/* moved door processing out of move_player_attack.
1966	* returns 1 if player has opened the door with a key	1811	* returns 1 if player has opened the door with a key
1967	* such that the caller should not do anything more,	1812	* such that the caller should not do anything more,
…		…
1979	/* If we found a key, do some extra work */	1824	/* If we found a key, do some extra work */
1980	if (key)	1825	if (key)
1981	{	1826	{
1982	object *container = key->env;	1827	object *container = key->env;
1983		1828
1984	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1985
1986	if (action_makes_visible (op))	1829	if (action_makes_visible (op))
1987	make_visible (op);	1830	make_visible (op);
1988		1831
1989	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1832	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1990	spring_trap (door->inv, op);	1833	spring_trap (door->inv, op);
1991		1834
1992	if (door->type == DOOR)	1835	if (door->type == DOOR)
1993	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1836	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1994	else if (door->type == LOCKED_DOOR)	1837	else if (door->type == LOCKED_DOOR)
1995	{	1838	{
1996	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1839	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1997	remove_door2 (door); /* remove door without violence ;-) */	1840	remove_door2 (door); /* remove door without violence ;-) */
1998	}	1841	}
1999		1842
2000	/* Do this after we print the message */	1843	/* Do this after we print the message */
2001	decrease_ob (key); /* Use up one of the keys */	1844	key->decrease (); /* Use up one of the keys */
2002	/* Need to update the weight the container the key was in */
2003	if (container != op)
2004	esrv_update_item (UPD_WEIGHT, op, container);
2005		1845
2006	return 1; /* Nothing more to do below */	1846	return 1; /* Nothing more to do below */
2007	}	1847	}
2008	else if (door->type == LOCKED_DOOR)	1848	else if (door->type == LOCKED_DOOR)
2009	{	1849	{
2010	/* Might as well return now - no other way to open this */	1850	/* Might as well return now - no other way to open this */
2011	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1851	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2012	return 1;	1852	return 1;
2013	}	1853	}
2014		1854
2015	return 0;	1855	return 0;
2016	}	1856	}
…		…
2022	* going to try and move (not fire weapons).	1862	* going to try and move (not fire weapons).
2023	*/	1863	*/
2024	bool	1864	bool
2025	move_player_attack (object *op, int dir)	1865	move_player_attack (object *op, int dir)
2026	{	1866	{
2027	int on_battleground;	1867	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1868	{
		1869	--op->speed_left;
		1870	return true;
		1871	}
2028		1872
2029	sint16 nx = freearr_x[dir] + op->x;	1873	sint16 nx = freearr_x[dir] + op->x;
2030	sint16 ny = freearr_y[dir] + op->y;	1874	sint16 ny = freearr_y[dir] + op->y;
2031		1875
2032	on_battleground = op_on_battleground (op, 0, 0);
2033
2034	if (out_of_map (op->map, nx, ny))	1876	if (out_of_map (op->map, nx, ny))
2035	return false;	1877	return false;
2036
2037	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2038	{
2039	--op->speed_left;
2040	return true;
2041	}
2042		1878
2043	/* If braced, or can't move to the square, and it is not out of the	1879	/* If braced, or can't move to the square, and it is not out of the
2044	* map, attack it. Note order of if statement is important - don't	1880	* map, attack it. Note order of if statement is important - don't
2045	* want to be calling move_ob if braced, because move_ob will move the	1881	* want to be calling move_ob if braced, because move_ob will move the
2046	* player. This is a pretty nasty hack, because if we could	1882	* player. This is a pretty nasty hack, because if we could
…		…
2103		1939
2104	if (op->speed_left > 0.f)	1940	if (op->speed_left > 0.f)
2105	{	1941	{
2106	--op->speed_left;	1942	--op->speed_left;
2107		1943
2108	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1944	op->play_sound (sound_find ("push_player"));
2109	push_ob (mon, dir, op);	1945	push_ob (mon, dir, op);
2110		1946
2111	if (op->contr->tmp_invis || op->hide)	1947	if (action_makes_visible (op))
2112	make_visible (op);	1948	make_visible (op);
2113		1949
2114	return true;	1950	return true;
2115	}	1951	}
2116	else	1952	else
2117	return false;	1953	return false;
2118	}	1954	}
		1955
		1956	bool on_battleground = op_on_battleground (op, 0, 0);
2119		1957
2120	/* in certain circumstances, you shouldn't attack friendly	1958	/* in certain circumstances, you shouldn't attack friendly
2121	* creatures. Note that if you are braced, you can't push	1959	* creatures. Note that if you are braced, you can't push
2122	* someone, but put it inside this loop so that you won't	1960	* someone, but put it inside this loop so that you won't
2123	* attack them either.	1961	* attack them either.
…		…
2132	{	1970	{
2133	--op->speed_left;	1971	--op->speed_left;
2134		1972
2135	if (!op->contr->braced)	1973	if (!op->contr->braced)
2136	{	1974	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1975	op->play_sound (sound_find ("push_player"));
2138	push_ob (mon, dir, op);	1976	push_ob (mon, dir, op);
2139	}	1977	}
2140	else	1978	else
2141	new_draw_info (0, 0, op, "You withhold your attack");	1979	op->statusmsg ("You withhold your attack");
2142		1980
2143	if (op->contr->tmp_invis || op->hide)	1981	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2144	make_visible (op);	1982	make_visible (op);
2145		1983
2146	return true;	1984	return true;
2147	}	1985	}
2148	}	1986	}
…		…
2188	}	2026	}
2189		2027
2190	bool	2028	bool
2191	move_player (object *op, int dir)	2029	move_player (object *op, int dir)
2192	{	2030	{
2193	int pick;
2194
2195	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2031	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2196	return 0;	2032	return 0;
2197		2033
2198	/* Sanity check: make sure dir is valid */	2034	/* Sanity check: make sure dir is valid */
2199	if ((dir < 0) || (dir >= 9))	2035	if (dir < 0 || dir >= 9)
2200	{	2036	{
2201	LOG (llevError, "move_player: invalid direction %d\n", dir);	2037	LOG (llevError, "move_player: invalid direction %d\n", dir);
2202	return 0;	2038	return 0;
2203	}	2039	}
2204		2040
…		…
2206	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2042	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2207	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2043	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2208		2044
2209	op->facing = dir;	2045	op->facing = dir;
2210		2046
2211	if (op->hide)	2047	if (op->flag [FLAG_HIDDEN])
2212	do_hidden_move (op);	2048	do_hidden_move (op);
2213		2049
2214	bool retval;	2050	bool retval;
		2051	int pick = 0;
2215		2052
2216	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2053	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2217	retval = RESULT_INT (0);	2054	retval = RESULT_INT (0);
2218	else if (op->contr->fire_on)	2055	else if (op->contr->fire_on)
2219	retval = fire (op, dir);	2056	retval = fire (op, dir);
…		…
2276	return move_player (op, op->direction);	2113	return move_player (op, op->direction);
2277		2114
2278	return false;	2115	return false;
2279	}	2116	}
2280		2117
2281	int	2118	static int
2282	save_life (object *op)	2119	save_life (object *op)
2283	{	2120	{
2284	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2121	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2285	return 0;	2122	return 0;
2286		2123
2287	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2124	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2288	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2125	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2289	{	2126	{
2290	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2127	op->play_sound (sound_find ("ob_evaporate"));
2291	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2128	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2292
2293	if (op->contr)
2294	esrv_del_item (op->contr, tmp->count);
2295		2129
2296	tmp->destroy ();	2130	tmp->destroy ();
2297	CLEAR_FLAG (op, FLAG_LIFESAVE);	2131	CLEAR_FLAG (op, FLAG_LIFESAVE);
2298		2132
2299	if (op->stats.hp < 0)	2133	if (op->stats.hp < 0)
…		…
2312	return 0;	2146	return 0;
2313	}	2147	}
2314		2148
2315	/* This goes throws the inventory and removes unpaid objects, and puts them	2149	/* This goes throws the inventory and removes unpaid objects, and puts them
2316	* back in the map (location and map determined by values of env). This	2150	* back in the map (location and map determined by values of env). This
2317	* function will descend into containers. op is the object to start the search	2151	* function will descend into containers. op is the object to start the search
2318	* from.	2152	* from.
2319	*/	2153	*/
		2154	static void
		2155	drop_unpaid_items (object *op, object *env)
		2156	{
		2157	while (op)
		2158	{
		2159	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2160
		2161	if (QUERY_FLAG (op, FLAG_UNPAID))
		2162	op->insert_at (env);
		2163	else if (op->inv)
		2164	drop_unpaid_items (op->inv, env);
		2165
		2166	op = next;
		2167	}
		2168	}
		2169
2320	void	2170	void
2321	remove_unpaid_objects (object *op, object *env)	2171	object::drop_unpaid_items ()
2322	{	2172	{
2323	while (op)	2173	if (!flag [FLAG_REMOVED])
2324	{	2174	::drop_unpaid_items (inv, this);
2325	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2326
2327	if (QUERY_FLAG (op, FLAG_UNPAID))
2328	{
2329	if (env->type == PLAYER)
2330	esrv_del_item (env->contr, op->count);
2331
2332	op->insert_at (env);
2333	}
2334	else if (op->inv)
2335	remove_unpaid_objects (op->inv, env);
2336
2337	op = next;
2338	}
2339	}
2340
2341	/*
2342	* Returns pointer a static string containing gravestone text
2343	* Moved from apply.c to player.c - player.c is what
2344	* actually uses this function. player.c may not be quite the
2345	* best, a misc file for object actions is probably better,
2346	* but there isn't one in the server directory.
2347	*/
2348	char *
2349	gravestone_text (object *op)
2350	{
2351	static char buf2[MAX_BUF];
2352	char buf[MAX_BUF];
2353	time_t now = time (NULL);
2354
2355	strcpy (buf2, " R.I.P.\n\n");
2356	if (op->type == PLAYER)
2357	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2358	else
2359	sprintf (buf, "%s\n", &op->name);
2360
2361	strncat (buf2, " ", 20 - strlen (buf) / 2);
2362	strcat (buf2, buf);
2363	if (op->type == PLAYER)
2364	sprintf (buf, "who was in level %d when killed\n", op->level);
2365	else
2366	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2367
2368	strncat (buf2, " ", 20 - strlen (buf) / 2);
2369	strcat (buf2, buf);
2370	if (op->type == PLAYER)
2371	{
2372	sprintf (buf, "by %s.\n\n", op->contr->killer);
2373	strncat (buf2, " ", 21 - strlen (buf) / 2);
2374	strcat (buf2, buf);
2375	}
2376
2377	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2378	strncat (buf2, " ", 20 - strlen (buf) / 2);
2379	strcat (buf2, buf);
2380
2381	return buf2;
2382	}	2175	}
2383		2176
2384	void	2177	void
2385	do_some_living (object *op)	2178	do_some_living (object *op)
2386	{	2179	{
…		…
2438	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2231	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2439	else	2232	else
2440	{	2233	{
2441	gen_grace = op->stats.maxgrace;	2234	gen_grace = op->stats.maxgrace;
2442	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2235	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2443	}
2444
2445	/* Regenerate Spell Points */
2446	if (!op->contr->golem && --op->last_sp < 0)
2447	{
2448	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2449	if (op->stats.sp < op->stats.maxsp)
2450	{
2451	op->stats.sp++;
2452	/* dms do not consume food */
2453	if (!QUERY_FLAG (op, FLAG_WIZ))
2454	{
2455	op->stats.food--;
2456	if (op->contr->digestion < 0)
2457	op->stats.food += op->contr->digestion;
2458	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2459	op->stats.food = last_food;
2460	}
2461	}
2462
2463	if (max_sp > 1)
2464	{
2465	over_sp = (gen_sp + 10) / rate_sp;
2466	if (over_sp > 0)
2467	{
2468	if (op->stats.sp < op->stats.maxsp)
2469	{
2470	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2471
2472	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2473	op->stats.sp--;
2474
2475	if (op->stats.sp > op->stats.maxsp)
2476	op->stats.sp = op->stats.maxsp;
2477	}
2478	op->last_sp = 0;
2479	}
2480	else
2481	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2482	}
2483	else
2484	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2485	}	2236	}
2486		2237
2487	/* Regenerate Grace */	2238	/* Regenerate Grace */
2488	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2239	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2489	if (--op->last_grace < 0)	2240	if (--op->last_grace < 0)
…		…
2510	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2261	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2511	}	2262	}
2512	/* wearing stuff doesn't detract from grace generation. */	2263	/* wearing stuff doesn't detract from grace generation. */
2513	}	2264	}
2514		2265
		2266	if (op->stats.food > 0)
		2267	{
2515	/* Regenerate Hit Points */	2268	/* Regenerate Spell Points */
2516	if (--op->last_heal < 0)	2269	if (!op->contr->golem && --op->last_sp < 0)
2517	{
2518	if (op->stats.hp < op->stats.maxhp)
2519	{	2270	{
2520	op->stats.hp++;	2271	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2521	/* dms do not consume food */	2272
2522	if (!QUERY_FLAG (op, FLAG_WIZ))	2273	if (op->stats.sp < op->stats.maxsp)
2523	{	2274	{
		2275	op->stats.sp++;
		2276
		2277	/* dms do not consume food */
		2278	if (!QUERY_FLAG (op, FLAG_WIZ))
		2279	{
2524	op->stats.food--;	2280	op->stats.food--;
		2281
2525	if (op->contr->digestion < 0)	2282	if (op->contr->digestion < 0)
2526	op->stats.food += op->contr->digestion;	2283	op->stats.food += op->contr->digestion;
2527	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2284	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2528	op->stats.food = last_food;	2285	op->stats.food = last_food;
		2286	}
2529	}	2287	}
2530	}
2531		2288
2532	if (max_hp > 1)	2289	if (max_sp > 1)
2533	{
2534	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2535	if (over_hp > 0)
2536	{	2290	{
2537	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2291	over_sp = (gen_sp + 10) / rate_sp;
		2292	if (over_sp > 0)
		2293	{
		2294	if (op->stats.sp < op->stats.maxsp)
		2295	{
		2296	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2297
		2298	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2299	op->stats.sp--;
		2300
		2301	if (op->stats.sp > op->stats.maxsp)
		2302	op->stats.sp = op->stats.maxsp;
		2303	}
		2304
2538	op->last_heal = 0;	2305	op->last_sp = 0;
		2306	}
		2307	else
		2308	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2539	}	2309	}
2540	else	2310	else
		2311	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2312	}
		2313
		2314	/* Regenerate Hit Points */
		2315	if (--op->last_heal < 0)
		2316	{
		2317	if (op->stats.hp < op->stats.maxhp)
2541	{	2318	{
2542	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2319	op->stats.hp++;
		2320
		2321	/* dms do not consume food */
		2322	if (!QUERY_FLAG (op, FLAG_WIZ))
		2323	{
		2324	op->stats.food--;
		2325
		2326	if (op->contr->digestion < 0)
		2327	op->stats.food += op->contr->digestion;
		2328	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2329	op->stats.food = last_food;
		2330	}
2543	}	2331	}
		2332
		2333	if (max_hp > 1)
		2334	{
		2335	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2336
		2337	if (over_hp > 0)
		2338	{
		2339	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2340	op->last_heal = 0;
		2341	}
		2342	else
		2343	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2544	}	2344	}
2545	else	2345	else
2546	{
2547	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2346	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2548	}	2347	}
2549	}	2348	}
2550		2349
2551	/* Digestion */	2350	/* Digestion */
2552	if (--op->last_eat < 0)	2351	if (--op->last_eat < 0)
2553	{	2352	{
2554	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2353	int bonus = max (0, op->contr->digestion),
		2354	penalty = max (0, -op->contr->digestion);
2555		2355
2556	if (op->contr->gen_hp > 0)
2557	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2356	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2558	else
2559	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2560		2357
2561	/* dms do not consume food */	2358	/* dms do not consume food */
2562	if (!QUERY_FLAG (op, FLAG_WIZ))	2359	if (!QUERY_FLAG (op, FLAG_WIZ))
2563	op->stats.food--;	2360	op->stats.food--;
2564	}	2361	}
2565		2362
2566	if (op->stats.food < 0 && op->stats.hp >= 0)	2363	if (op->stats.food < 0 && op->stats.hp >= 0)
2567	{	2364	{
2568	object *tmp, *flesh = 0;	2365	object *flesh = 0;
2569		2366
2570	for (tmp = op->inv; tmp; tmp = tmp->below)	2367	for_inv_removable (op, tmp)
2571	{	2368	{
2572	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2369	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2370	continue;
		2371
		2372	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2573	{	2373	{
2574	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2374	op->statusmsg ("You blindly grab for a bite of food. "
2575	{	2375	"H<To prevent you from starving, you ate some random item from your backpack.>");
2576	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2577	manual_apply (op, tmp, 0);	2376	manual_apply (op, tmp, 0);
		2377
2578	if (op->stats.food >= 0 || op->stats.hp < 0)	2378	if (op->stats.food >= 0 || op->stats.hp < 0)
2579	break;	2379	break;
2580	}	2380	}
2581	else if (tmp->type == FLESH)	2381	else if (tmp->type == FLESH)
2582	flesh = tmp;	2382	flesh = tmp;
2583	} /* End if paid for object */	2383	}
2584	} /* end of for loop */
2585		2384
2586	/* If player is still starving, it means they don't have any food, so	2385	/* If player is still starving, it means they don't have any food, so
2587	* eat flesh instead.	2386	* eat flesh instead.
2588	*/	2387	*/
2589	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2388	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2590	{	2389	{
2591	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2390	op->statusmsg ("You blindly grab for a bite of food. "
		2391	"H<To prevent you from starving, you ate some random item from your backpack.>");
2592	manual_apply (op, flesh, 0);	2392	manual_apply (op, flesh, 0);
2593	}	2393	}
		2394
		2395	// If player is still starving, alert him!
		2396	if (op->stats.food < 0)
		2397	op->failmsg ("You are starving! "
		2398	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2399	}
		2400
		2401	if (op->stats.food < 0)
2594	}	2402	{
		2403	op->stats.hp += op->stats.food;
		2404	op->stats.food = 0;
2595		2405
2596	while (op->stats.food < 0 && op->stats.hp >= 0)	2406	if (op->stats.hp < 0)
2597	op->stats.food++, op->stats.hp--;	2407	{
		2408	op->contr->killer = archetype::get ("killer_starvation");
		2409	op->contr->killer->destroy ();
		2410	}
		2411	}
2598		2412
		2413	/* killer should be set here already */
2599	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2414	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2600	kill_player (op);	2415	kill_player (op);
2601	}	2416	}
2602	}	2417	}
2603		2418
…		…
2607	* file.	2422	* file.
2608	*/	2423	*/
2609	void	2424	void
2610	kill_player (object *op)	2425	kill_player (object *op)
2611	{	2426	{
2612	char buf[MAX_BUF];
2613	int x, y;	2427	int x, y;
2614
2615	//int i;
2616	maptile *map; /* this is for resurrection */	2428	maptile *map; /* this is for resurrection */
2617
2618	/* int z;
2619	int num_stats_lose;
2620	int lost_a_stat;
2621	int lose_this_stat;
2622	int this_stat; */
2623	int will_kill_again;	2429	int will_kill_again;
2624	archetype *at;	2430	archetype *at;
2625	object *tmp;	2431	object *tmp;
2626		2432
2627	if (save_life (op))	2433	if (save_life (op))
2628	return;	2434	return;
2629		2435
		2436	dynbuf_text deathtab;
		2437
		2438	/* restore player */
		2439	at = archetype::find (shstr_poisoning);
		2440	if (object *tmp = present_arch_in_ob (at, op))
		2441	{
		2442	tmp->destroy ();
		2443	deathtab << "Your body feels cleansed...\r";
		2444	}
		2445
		2446	at = archetype::find (shstr_confusion);
		2447	if (object *tmp = present_arch_in_ob (at, op))
		2448	{
		2449	tmp->destroy ();
		2450	deathtab << "Your mind feels clearer...\r";
		2451	}
		2452
		2453	cure_disease (op, 0, 0); /* remove any disease */
		2454
		2455	max_it (op->stats.hp , op->stats.maxhp);
		2456	max_it (op->stats.sp , op->stats.maxsp);
		2457	max_it (op->stats.grace, op->stats.maxgrace);
		2458
		2459	if (op->stats.food <= 0)
		2460	op->stats.food = 999;
		2461
		2462	// remove all spell effects that are active
		2463	// to avoid long-term effects such as word-of-recall
		2464	for (object *item = op->inv; item; )
		2465	{
		2466	object *next = item->below;
		2467
		2468	if (item->type == SPELL_EFFECT && item->active)
		2469	item->destroy ();
		2470
		2471	item = next;
		2472	}
2630		2473
2631	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2474	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2632	* in cities ONLY!!! It is very important that this doesn't get abused.	2475	* in cities ONLY!!! It is very important that this doesn't get abused.
2633	* Look at op_on_battleground() for more info --AndreasV	2476	* Look at op_on_battleground() for more info --AndreasV
2634	*/	2477	*/
2635	if (op_on_battleground (op, &x, &y))	2478	if (op_on_battleground (op, &x, &y))
2636	{	2479	{
2637	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2480	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2638	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2639
2640	/* restore player */
2641	at = archetype::find ("poisoning");
2642	if (object *tmp = present_arch_in_ob (at, op))
2643	{
2644	tmp->destroy ();
2645	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2646	}
2647
2648	at = archetype::find ("confusion");
2649	if (object *tmp = present_arch_in_ob (at, op))
2650	{
2651	tmp->destroy ();
2652	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2653	}
2654
2655	cure_disease (op, 0); /* remove any disease */
2656	op->stats.hp = op->stats.maxhp;
2657	if (op->stats.food <= 0)
2658	op->stats.food = 999;
2659		2481
2660	/* create a bodypart-trophy to make the winner happy */	2482	/* create a bodypart-trophy to make the winner happy */
2661	if (object *tmp = arch_to_object (archetype::find ("finger")))	2483	object *tmp = archetype::find (shstr_finger)->instance ();
2662	{	2484
2663	sprintf (buf, "%s's finger", &op->name);	2485	tmp->name = format ("%s's finger" , &op->name);
2664	tmp->name = buf;	2486	tmp->name_pl = format ("%s's fingers", &op->name);
2665	sprintf (buf, " This finger has been cut off %s\n"	2487	tmp->msg = format (
2666	" the %s, when he was defeated at\n level %d by %s.\n",	2488	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2667	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2489	&op->name, op->contr->title,
2668	tmp->msg = buf;	2490	(int)op->level,
		2491	op->contr->killer_name ()
		2492	);
2669	tmp->value = 0, tmp->type = 0;	2493	tmp->value = 0, tmp->type = 0;
2670	tmp->materialname = "organics";	2494	tmp->material = name_to_material (shstr_organic);
2671	tmp->insert_at (op, tmp);	2495	tmp->insert_at (op, tmp);
2672	}
2673		2496
2674	/* teleport defeated player to new destination */	2497	/* teleport defeated player to new destination */
2675	transfer_ob (op, x, y, 0, NULL);	2498	transfer_ob (op, x, y, 0, NULL);
2676	op->contr->braced = 0;	2499	op->contr->braced = 0;
		2500
		2501	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2677	return;	2502	return;
2678	}	2503	}
2679		2504
		2505	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2506	deathtab << "T<YOU HAVE DIED>\n\n";
		2507
2680	INVOKE_PLAYER (DEATH, op->contr);	2508	INVOKE_PLAYER (DEATH, op->contr);
2681		2509
2682	command_kill_pets (op, 0);	2510	command_kill_pets (op, 0);
2683		2511
2684	if (op->stats.food < 0)	2512	op->contr->play_sound (sound_find ("player_dies"));
2685	{
2686	sprintf (buf, "%s starved to death.", &op->name);
2687	strcpy (op->contr->killer, "starvation");
2688	}
2689	else
2690	sprintf (buf, "%s died.", &op->name);
2691
2692	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2693		2513
2694	/* save the map location for corpse, gravestone */	2514	/* save the map location for corpse, gravestone */
2695	x = op->x;	2515	x = op->x;
2696	y = op->y;	2516	y = op->y;
2697	map = op->map;	2517	map = op->map;
…		…
2725		2545
2726	lost_a_stat = 0;	2546	lost_a_stat = 0;
2727		2547
2728	for (z = 0; z < num_stats_lose; z++)	2548	for (z = 0; z < num_stats_lose; z++)
2729	{	2549	{
2730	i = RANDOM () % NUM_STATS;	2550	i = rndm (NUM_STATS);
2731		2551
2732	if (settings.stat_loss_on_death)	2552	if (settings.stat_loss_on_death)
2733	{	2553	{
2734	/* Pick a random stat and take a point off it. Tell the player	2554	/* Pick a random stat and take a point off it. Tell the player
2735	* what he lost.	2555	* what he lost.
…		…
2742	lost_a_stat = 1;	2562	lost_a_stat = 1;
2743	}	2563	}
2744	else	2564	else
2745	{	2565	{
2746	/* deplete a stat */	2566	/* deplete a stat */
2747	archetype *deparch = archetype::find ("depletion");	2567	archetype *deparch = archetype::find (shstr_depletion);
2748	object *dep;	2568	object *dep;
2749		2569
2750	dep = present_arch_in_ob (deparch, op);	2570	dep = present_arch_in_ob (deparch, op);
2751	if (!dep)	2571	if (!dep)
2752	{	2572	{
2753	dep = arch_to_object (deparch);	2573	dep = deparch->instance ();
2754	insert_ob_in_ob (dep, op);	2574	insert_ob_in_ob (dep, op);
2755	}	2575	}
2756	lose_this_stat = 1;	2576	lose_this_stat = 1;
2757	if (settings.balanced_stat_loss)	2577	if (settings.balanced_stat_loss)
2758	{	2578	{
…		…
2786	}	2606	}
2787	}	2607	}
2788		2608
2789	if (lose_this_stat)	2609	if (lose_this_stat)
2790	{	2610	{
2791	this_stat = get_attr_value (&(dep->stats), i);	2611	this_stat = get_attr_value (&dep->stats, i);
2792	/* We could try to do something clever like find another	2612	/* We could try to do something clever like find another
2793	* stat to reduce if this fails. But chances are, if	2613	* stat to reduce if this fails. But chances are, if
2794	* stats have been depleted to -50, all are pretty low	2614	* stats have been depleted to -50, all are pretty low
2795	* and should be roughly the same, so it shouldn't make a	2615	* and should be roughly the same, so it shouldn't make a
2796	* difference.	2616	* difference.
…		…
2804	lost_a_stat = 1;	2624	lost_a_stat = 1;
2805	}	2625	}
2806	}	2626	}
2807	}	2627	}
2808	}	2628	}
		2629
2809	/* If no stat lost, tell the player. */	2630	/* If no stat lost, tell the player. */
2810	if (!lost_a_stat)	2631	if (!lost_a_stat)
2811	{	2632	{
2812	/* determine_god() seems to not work sometimes... why is this?	2633	/* determine_god() seems to not work sometimes... why is this?
2813	Should I be using something else? GD */	2634	Should I be using something else? GD */
2814	const char *god = determine_god (op);	2635	shstr_tmp god = determine_god (op);
2815		2636
2816	if (god && (strcmp (god, "none")))	2637	if (god != shstr_none)
2817	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2638	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2818	else	2639	else
2819	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2640	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2820	}	2641	}
2821	#else	2642	#else
2822	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2643	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2823	#endif	2644	#endif
2824		2645
2825	/* Put a gravestone up where the character 'almost' died. List the	2646	/* Put a gravestone up where the character 'almost' died. List the
2826	* exp loss on the stone.	2647	* exp loss on the stone.
2827	*/	2648	*/
2828	tmp = arch_to_object (archetype::find ("gravestone"));	2649	tmp = archetype::find (shstr_gravestone)->instance ();
2829	sprintf (buf, "%s's gravestone", &op->name);	2650	tmp->name = format ("%s's gravestone", &op->name);
2830	tmp->name = buf;	2651	tmp->name_pl = format ("%s's gravestones", &op->name);
2831	sprintf (buf, "%s's gravestones", &op->name);	2652	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2832	tmp->name_pl = buf;	2653	&op->name, op->contr->title, op->contr->killer_name ());
2833	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);
2834	tmp->msg = buf;
2835	tmp->x = op->x, tmp->y = op->y;	2654	tmp->x = op->x, tmp->y = op->y;
2836	insert_ob_in_map (tmp, op->map, NULL, 0);	2655	insert_ob_in_map (tmp, op->map, NULL, 0);
2837		2656
2838	/**************************************/	2657	/**************************************/
2839	/* */	2658	/* */
2840	/* Subtract the experience points, */	2659	/* Subtract the experience points, */
2841	/* if we died cause of food, give us */
2842	/* food, and reset HP's... */
2843	/* */	2660	/* */
2844	/**************************************/	2661	/**************************************/
2845		2662
2846	/* remove any poisoning and confusion the character may be suffering. */
2847	/* restore player */
2848	at = archetype::find ("poisoning");
2849	tmp = present_arch_in_ob (at, op);
2850
2851	if (tmp)
2852	{
2853	tmp->destroy ();
2854	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2855	}
2856
2857	at = archetype::find ("confusion");
2858	tmp = present_arch_in_ob (at, op);
2859	if (tmp)
2860	{
2861	tmp->destroy ();
2862	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2863	}
2864
2865	cure_disease (op, 0); /* remove any disease */
2866
2867	/*add_exp(op, (op->stats.exp * -0.20)); */	2663	/*add_exp(op, (op->stats.exp * -0.20)); */
2868	apply_death_exp_penalty (op);	2664	apply_death_exp_penalty (op);
2869	if (op->stats.food < 100)
2870	op->stats.food = 900;
2871	op->stats.hp = op->stats.maxhp;
2872	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2873	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2874		2665
2875	/*	2666	/*
2876	* Check to see if the player has any unpaid items. If so, remove them	2667	* Check to see if the player has any unpaid items. If so, remove them
2877	* and put them back in the map.	2668	* and put them back in the map.
2878	*/	2669	*/
2879	remove_unpaid_objects (op->inv, op);	2670	op->drop_unpaid_items ();
2880		2671
2881	/****************************************/	2672	/****************************************/
2882	/* */	2673	/* */
2883	/* Move player to his current respawn- */	2674	/* Move player to his current respawn- */
2884	/* position (usually last savebed) */	2675	/* position (usually last savebed) */
…		…
2913	if (will_kill_again & (1 << at))	2704	if (will_kill_again & (1 << at))
2914	force->resist[at] = 100;	2705	force->resist[at] = 100;
2915		2706
2916	insert_ob_in_ob (force, op);	2707	insert_ob_in_ob (force, op);
2917	op->update_stats ();	2708	op->update_stats ();
2918
2919	}	2709	}
2920		2710
2921	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2711	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2922	}	2712	}
2923		2713
2924	void	2714	static void
2925	loot_object (object *op)	2715	loot_object (object *op)
2926	{ /* Grab and destroy some treasure */	2716	{ /* Grab and destroy some treasure */
2927	object *tmp, *tmp2, *next;	2717	object *tmp, *tmp2, *next;
2928		2718
2929	op->close_container (); /* close open sack first */	2719	op->close_container (); /* close open sack first */
…		…
2943		2733
2944	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2734	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2945	{	2735	{
2946	if (tmp->nrof > 1)	2736	if (tmp->nrof > 1)
2947	{	2737	{
2948	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2738	tmp->decrease (rndm (1, tmp->nrof - 1));
2949	tmp2->destroy ();
2950	insert_ob_in_map (tmp, op->map, NULL, 0);	2739	insert_ob_in_map (tmp, op->map, NULL, 0);
2951	}	2740	}
2952	else	2741	else
2953	tmp->destroy ();	2742	tmp->destroy ();
2954	}	2743	}
…		…
2961	* fix_weight(): Check recursively the weight of all players, and fix	2750	* fix_weight(): Check recursively the weight of all players, and fix
2962	* what needs to be fixed. Refresh windows and fix speed if anything	2751	* what needs to be fixed. Refresh windows and fix speed if anything
2963	* was changed.	2752	* was changed.
2964	*/	2753	*/
2965	void	2754	void
2966	fix_weight (void)	2755	fix_weight ()
2967	{	2756	{
2968	for_all_players (pl)	2757	for_all_players (pl)
2969	{	2758	{
2970	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2759	sint32 old = pl->ob->carrying;
2971		2760
2972	if (old == sum)	2761	pl->ob->update_weight ();
2973	continue;	2762
		2763	if (old != pl->ob->carrying)
		2764	{
2974	pl->ob->update_stats ();	2765	pl->ob->update_stats ();
2975	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2766	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2767	}
2976	}	2768	}
2977	}	2769	}
2978		2770
2979	void	2771	void
2980	fix_luck (void)	2772	fix_luck ()
2981	{	2773	{
2982	for_all_players (pl)	2774	for_all_players (pl)
2983	if (!pl->ob->contr->ns->state)	2775	if (!pl->ob->contr->ns->state)
2984	pl->ob->change_luck (0);	2776	pl->ob->change_luck (0);
2985	}	2777	}
…		…
3022	}	2814	}
3023		2815
3024	void	2816	void
3025	make_visible (object *op)	2817	make_visible (object *op)
3026	{	2818	{
3027	op->hide = 0;	2819	op->flag [FLAG_HIDDEN] = 0;
3028	op->invisible = 0;	2820	op->invisible = 0;
		2821
3029	if (op->type == PLAYER)	2822	if (op->type == PLAYER)
3030	{	2823	{
3031	op->contr->tmp_invis = 0;	2824	op->contr->tmp_invis = 0;
3032	op->contr->invis_race = 0;	2825	op->contr->invis_race = 0;
3033	}	2826	}
…		…
3046		2839
3047	/* look at the surrounding terrain to determine	2840	/* look at the surrounding terrain to determine
3048	* the hideability of this object. Positive levels	2841	* the hideability of this object. Positive levels
3049	* indicate greater hideability.	2842	* indicate greater hideability.
3050	*/	2843	*/
3051
3052	int	2844	int
3053	hideability (object *ob)	2845	hideability (object *ob)
3054	{	2846	{
3055	int i, level = 0, mflag;	2847	int i, level = 0, mflag;
3056	sint16 x, y;	2848	sint16 x, y;
3057		2849
3058	if (!ob || !ob->map)	2850	if (!ob || !ob->map)
3059	return 0;	2851	return 0;
3060		2852
3061	/* so, on normal lighted maps, its hard to hide */	2853	/* so, on normal lighted maps, its hard to hide */
3062	level = ob->map->darkness - 2;	2854	level = ob->map->darklevel () - 2;
3063		2855
3064	/* this also picks up whether the object is glowing.	2856	/* this also picks up whether the object is glowing.
3065	* If you carry a light on a non-dark map, its not	2857	* If you carry a light on a non-dark map, its not
3066	* as bad as carrying a light on a pitch dark map */	2858	* as bad as carrying a light on a pitch dark map */
3067	if (has_carried_lights (ob))	2859	if (ob->has_carried_lights ())
3068	level = -(10 + (2 * ob->map->darkness));	2860	level = -(10 + (2 * ob->map->darklevel ()));
3069		2861
3070	/* scan through all nearby squares for terrain to hide in */	2862	/* scan through all nearby squares for terrain to hide in */
3071	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2863	for (i = 0, x = ob->x, y = ob->y;
		2864	i <= SIZEOFFREE1;
		2865	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3072	{	2866	{
3073	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2867	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3074	if (mflag & P_OUT_OF_MAP)	2868	if (mflag & P_OUT_OF_MAP)
3075	{
3076	continue;	2869	continue;
3077	}	2870
3078	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2871	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3079	level += 2;	2872	level += 2;
3080	else /* open terrain! */	2873	else /* open terrain! */
3081	level -= 1;	2874	level -= 1;
3082	}	2875	}
…		…
3093	* spot (surrounded by clear terrain in broad daylight). -b.t.	2886	* spot (surrounded by clear terrain in broad daylight). -b.t.
3094	*/	2887	*/
3095	void	2888	void
3096	do_hidden_move (object *op)	2889	do_hidden_move (object *op)
3097	{	2890	{
3098	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2891	int hide = 0;
3099	object *skop;
3100		2892
3101	if (!op || !op->map)	2893	if (!op || !op->map)
3102	return;	2894	return;
3103		2895
3104	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2896	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2897	int num = random_roll (0, 19, op, PREFER_LOW);
3105		2898
3106	/* its *extremely* hard to run and sneak/hide at the same time! */	2899	/* its *extremely* hard to run and sneak/hide at the same time! */
3107	if (op->type == PLAYER && op->contr->run_on)	2900	if (op->type == PLAYER && op->contr->run_on)
3108	if (!skop || num >= skop->level)	2901	if (!skop || num >= skop->level)
3109	{	2902	{
…		…
3119	num -= hide;	2912	num -= hide;
3120		2913
3121	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2914	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3122	{	2915	{
3123	make_visible (op);	2916	make_visible (op);
		2917
3124	if (op->type == PLAYER)	2918	if (op->type == PLAYER)
3125	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2919	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3126	}	2920	}
3127	else if (op->type == PLAYER && skop)	2921	else if (op->type == PLAYER && skop)
3128	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2922	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3181	* object op. This function works fine for monsters,	2975	* object op. This function works fine for monsters,
3182	* but we dont worry if the object isnt the top one in	2976	* but we dont worry if the object isnt the top one in
3183	* a pile (say a coin under a table would return "viewable"	2977	* a pile (say a coin under a table would return "viewable"
3184	* by this routine). Another question, should we be	2978	* by this routine). Another question, should we be
3185	* concerned with the direction the player is looking	2979	* concerned with the direction the player is looking
3186	* in? Realistically, most of use cant see stuff behind	2980	* in? Realistically, most of us can't see stuff behind
3187	* our backs...on the other hand, does the "facing" direction	2981	* our backs...on the other hand, does the "facing" direction
3188	* imply the way your head, or body is facing? Its possible	2982	* imply the way your head, or body is facing? It's possible
3189	* for them to differ. Sigh, this fctn could get a bit more complex.	2983	* for them to differ. Sigh, this fctn could get a bit more complex.
3190	* -b.t.	2984	* -b.t.
3191	* This function is now map tiling safe.	2985	* This function is now map tiling safe.
3192	*/	2986	*/
3193
3194	int	2987	int
3195	player_can_view (object *pl, object *op)	2988	player_can_view (object *pl, object *op)
3196	{	2989	{
3197	rv_vector rv;	2990	rv_vector rv;
3198	int dx, dy;	2991	int dx, dy;
…		…
3210		3003
3211	get_rangevector (pl, op, &rv, 0x1);	3004	get_rangevector (pl, op, &rv, 0x1);
3212		3005
3213	/* starting with the 'head' part, lets loop	3006	/* starting with the 'head' part, lets loop
3214	* through the object and find if it has any	3007	* through the object and find if it has any
3215	* part that is in the los array but isnt on	3008	* part that is in the los array but isn't on
3216	* a blocked los square.	3009	* a blocked los square.
3217	* we use the archetype to figure out offsets.	3010	* we use the archetype to figure out offsets.
3218	*/	3011	*/
3219	while (op)	3012	while (op)
3220	{	3013	{
3221	dx = rv.distance_x + op->arch->x;	3014	dx = rv.distance_x + op->arch->x;
3222	dy = rv.distance_y + op->arch->y;	3015	dy = rv.distance_y + op->arch->y;
3223		3016
3224	/* only the viewable area the player sees is updated by LOS	3017	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3225	* code, so we need to restrict ourselves to that range of values
3226	* for any meaningful values.
3227	*/
3228	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3229	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3230	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3231	return 1;	3018	return 1;
		3019
3232	op = op->more;	3020	op = op->more;
3233	}	3021	}
3234	return 0;
3235	}
3236		3022
3237	/* routine for both players and monsters. We call this when
3238	* there is a possibility for our action distrubing our hiding
3239	* place or invisiblity spell. Artefact invisiblity is not
3240	* effected by this. If we arent invisible to begin with, we
3241	* return 0.
3242	*/
3243	int
3244	action_makes_visible (object *op)
3245	{
3246
3247	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3248	{
3249	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3250	return 0;
3251
3252	if (op->contr && op->contr->tmp_invis == 0)
3253	return 0;
3254
3255	/* If monsters, they should become visible */
3256	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3257	{
3258	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3259	return 1;
3260	}
3261	}
3262	return 0;	3023	return 0;
3263	}	3024	}
3264		3025
3265	/* op_on_battleground - checks if the given object op (usually	3026	/* op_on_battleground - checks if the given object op (usually
3266	* a player) is standing on a valid battleground-tile,	3027	* a player) is standing on a valid battleground-tile,
…		…
3271	* Default is to do the same as before, so only people wanting to have different points need worry about this	3032	* Default is to do the same as before, so only people wanting to have different points need worry about this
3272	*/	3033	*/
3273	int	3034	int
3274	op_on_battleground (object *op, int *x, int *y)	3035	op_on_battleground (object *op, int *x, int *y)
3275	{	3036	{
3276	object *tmp;
3277
3278	/* A battleground-tile needs the following attributes to be valid:	3037	/* A battleground-tile needs the following attributes to be valid:
3279	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3038	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3280	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3039	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3281	* and the exit-coordinates sp/hp must both be > 0.	3040	* and the exit-coordinates sp/hp must both be > 0.
3282	* => The intention here is to prevent abuse of the battleground-	3041	* => The intention here is to prevent abuse of the battleground-
3283	* feature (like pickable or hidden battleground tiles). */	3042	* feature (like pickable or hidden battleground tiles). */
3284	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3043	for (object *tmp = op->below; tmp; tmp = tmp->below)
3285	{	3044	{
3286	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3045	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3287	{	3046	{
3288	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3047	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3289	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3048	&& tmp->type == BATTLEGROUND
		3049	&& tmp->name == shstr_battleground
		3050	&& EXIT_X (tmp) && EXIT_Y (tmp))
3290	{	3051	{
3291	/*before we assign the exit, check if this is a teambattle */	3052	/* before we assign the exit, check if this is a teambattle */
3292	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3053	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3293	{
3294	object *invtmp;
3295
3296	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3054	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3055	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3297	{	3056	{
3298	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3299	{
3300	if (x != NULL && y != NULL)	3057	if (x && y)
3301	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3058	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3059
3302	return 1;	3060	return 1;
3303	}
3304	}	3061	}
3305	}	3062
3306	if (x != NULL && y != NULL)	3063	if (x && y)
3307	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3064	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3065
3308	return 1;	3066	return 1;
3309	}	3067	}
3310	}	3068	}
3311	}	3069	}
		3070
3312	/* If we got here, did not find a battleground */	3071	/* If we got here, did not find a battleground */
3313	return 0;	3072	return 0;
3314	}	3073	}
3315		3074
3316	/*	3075	/*
…		…
3332	char buf[MAX_BUF]; /* tmp. string buffer */	3091	char buf[MAX_BUF]; /* tmp. string buffer */
3333	int i = 0, j = 0;	3092	int i = 0, j = 0;
3334		3093
3335	/* get the appropriate treasurelist */	3094	/* get the appropriate treasurelist */
3336	if (atnr == ATNR_FIRE)	3095	if (atnr == ATNR_FIRE)
3337	trlist = treasurelist::find ("dragon_ability_fire");	3096	trlist = treasurelist::find (shstr_dragon_ability_fire);
3338	else if (atnr == ATNR_COLD)	3097	else if (atnr == ATNR_COLD)
3339	trlist = treasurelist::find ("dragon_ability_cold");	3098	trlist = treasurelist::find (shstr_dragon_ability_cold);
3340	else if (atnr == ATNR_ELECTRICITY)	3099	else if (atnr == ATNR_ELECTRICITY)
3341	trlist = treasurelist::find ("dragon_ability_elec");	3100	trlist = treasurelist::find (shstr_dragon_ability_elec);
3342	else if (atnr == ATNR_POISON)	3101	else if (atnr == ATNR_POISON)
3343	trlist = treasurelist::find ("dragon_ability_poison");	3102	trlist = treasurelist::find (shstr_dragon_ability_poison);
3344		3103
3345	if (trlist == NULL || who->type != PLAYER)	3104	if (trlist == NULL || who->type != PLAYER)
3346	return;	3105	return;
3347		3106
3348	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3107	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3421	{	3180	{
3422	/* forces in the treasurelist can alter the player's stats */	3181	/* forces in the treasurelist can alter the player's stats */
3423	object *skin;	3182	object *skin;
3424		3183
3425	/* first get the dragon skin force */	3184	/* first get the dragon skin force */
3426	shstr_cmp dragon_skin_force ("dragon_skin_force");
3427	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)	3185	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3428	;	3186	;
3429		3187
3430	if (!skin)	3188	if (!skin)
3431	return;	3189	return;
3432		3190
…		…
3465	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3223	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3466	}	3224	}
3467	else	3225	else
3468	{	3226	{
3469	/* generate misc. treasure */	3227	/* generate misc. treasure */
3470	tmp = arch_to_object (tr->item);	3228	tmp = tr->item->instance ();
3471	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3229	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3472	tmp = insert_ob_in_ob (tmp, who);	3230	who->insert (tmp);
3473	if (who->type == PLAYER)
3474	esrv_send_item (who, tmp);
3475	}	3231	}
3476	}	3232	}
3477		3233
3478	/**	3234	/**
3479	* Unready an object for a player. This function does nothing if the object was	3235	* Unready an object for a player. This function does nothing if the object was
…		…
3481	*/	3237	*/
3482	void	3238	void
3483	player_unready_range_ob (player *pl, object *ob)	3239	player_unready_range_ob (player *pl, object *ob)
3484	{	3240	{
3485	if (pl->ob->current_weapon == ob)	3241	if (pl->ob->current_weapon == ob)
3486	pl->ob->current_weapon = 0;	3242	pl->ob->change_weapon (0);
3487		3243
3488	if (pl->combat_ob == ob)	3244	if (pl->combat_ob == ob)
3489	pl->combat_ob = 0;	3245	pl->combat_ob = 0;
3490		3246
3491	if (pl->ranged_ob == ob)	3247	if (pl->ranged_ob == ob)
3492	pl->ranged_ob = 0;	3248	pl->ranged_ob = 0;
3493	}	3249	}
3494		3250
		3251	//-GPL
		3252
3495	sint8	3253	sint8
3496	player::visibility_at (maptile *map, int x, int y) const	3254	player::darkness_at (maptile *map, int x, int y) const
3497	{	3255	{
3498	if (!ns)	3256	if (!ns)
3499	return 0;	3257	return LOS_BLOCKED;
3500		3258
3501	int dx, dy;	3259	int dx, dy;
3502	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3260	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3503	return 0;	3261	return LOS_BLOCKED;
3504		3262
3505	x += dx - ns->current_x + ns->mapx / 2;	3263	x += dx - ns->current_x;
3506	y += dy - ns->current_y + ns->mapy / 2;	3264	y += dy - ns->current_y;
3507		3265
3508	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3509	return 0;
3510
3511	return 100 - blocked_los [x][y];	3266	return blocked_los (x, y);
3512	}	3267	}
		3268
		3269	void
		3270	player::infobox (const char *title, const char *msg, int color)
		3271	{
		3272	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3273	}
		3274
		3275	void
		3276	player::statusmsg (const char *msg, int color)
		3277	{
		3278	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3279	}
		3280
		3281	void
		3282	player::failmsg (const char *msg, int color)
		3283	{
		3284	play_sound (sound_find ("generic_failure"));
		3285	statusmsg (msg, color);
		3286	}
		3287

Diff Legend

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