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.94 by root, Mon Jan 8 14:29:05 2007 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 UTC

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

Diff Legend

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