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

Diff Legend

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