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

Diff Legend

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