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

Diff Legend

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