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.155 by root, Sat Jul 21 15:04:36 2007 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

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

Diff Legend

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