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

Diff Legend

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