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

Diff Legend

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