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

Diff Legend

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