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.64 by root, Tue Dec 26 03:35:59 2006 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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