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.61 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

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

Diff Legend

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