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.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.297 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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