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.115 by root, Fri Apr 27 02:43:04 2007 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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