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.142 by root, Fri May 18 19:46:22 2007 UTC vs.
Revision 1.254 by root, Fri Mar 26 00:05:45 2010 UTC

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

Diff Legend

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