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

Diff Legend

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