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

Diff Legend

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