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.62 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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

Diff Legend

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