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.121 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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