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.232 by root, Sat Oct 3 20:11:12 2009 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify	9	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	10	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	20	* and the GNU General Public License along with this program. If not, see
		21	* <http://www.gnu.org/licenses/>.
20	*	22	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	24	*/
		25
		26	//+GPL
		27
		28	#include <algorithm>
		29	#include <functional>
23		30
24	#include <global.h>	31	#include <global.h>
25	#include <sproto.h>	32	#include <sproto.h>
26	#include <sounds.h>	33	#include <sounds.h>
27	#include <living.h>	34	#include <living.h>
28	#include <object.h>	35	#include <object.h>
29	#include <spells.h>	36	#include <spells.h>
30	#include <skills.h>	37	#include <skills.h>
31		38
32	#include <algorithm>
33	#include <functional>
34
35	playervec players;	39	playervec players;
36
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
130	subject, news); /*send previously read news */
131
132	strcpy (subject, buf + 1);
133	strip_endline (subject);
134	size = 0;
135	news[0] = '\0';
136	}
137	else
138	{
139	if (size + strlen (buf) >= HUGE_BUF)
140	{
141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142	break;
143	}
144	strncat (news + size, buf, HUGE_BUF - size);
145	size += strlen (buf);
146	}
147	}
148
149	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151	close_and_delete (fp, comp);
152	}
153		40
154	/* This loads the first map an puts the player on it. */	41	/* This loads the first map an puts the player on it. */
155	static void	42	static void
156	set_first_map (object *op)	43	set_first_map (object *op)
157	{	44	{
…		…
168		55
169	players.insert (this);	56	players.insert (this);
170	ob->remove ();	57	ob->remove ();
171	ob->map = 0;	58	ob->map = 0;
172	ob->activate_recursive ();	59	ob->activate_recursive ();
173	CLEAR_FLAG (ob, FLAG_FRIENDLY);	60	ob->clr_flag (FLAG_FRIENDLY);
174	add_friendly_object (ob);	61	add_friendly_object (ob);
175	}	62	}
176		63
177	void	64	void
178	player::deactivate ()	65	player::deactivate ()
…		…
190	ob->remove ();	77	ob->remove ();
191	ob->enemy = 0; // sometimes keeps an extra refcount on itself	78	ob->enemy = 0; // sometimes keeps an extra refcount on itself
192	ob->map = 0;	79	ob->map = 0;
193	party = 0;	80	party = 0;
194		81
195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197	players.erase (this);	82	players.erase (this);
198	}	83	}
199		84
200	// connect the player with a specific client	85	// connect the player with a specific client
201	// also changes, rationalises, and fixes some incorrect settings	86	// also changes, rationalises, and fixes some incorrect settings
…		…
221	ob->race = ob->arch->race;	106	ob->race = ob->arch->race;
222		107
223	ob->update_weight ();	108	ob->update_weight ();
224	link_skills ();	109	link_skills ();
225		110
226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228	assign (title, ob->arch->object::name);	111	assign (title, ob->arch->object::name);
229		112
230	/* if it's a dragon player, set the correct title here */	113	/* if it's a dragon player, set the correct title here */
231	if (is_dragon_pl (ob))	114	if (ob->is_dragon ())
232	{	115	{
233	object *tmp, *abil = 0, *skin = 0;	116	object *tmp, *abil = 0, *skin = 0;
234		117
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	118	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	119	if (tmp->type == FORCE)
…		…
244		127
245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	128	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246		129
247	esrv_new_player (this);	130	esrv_new_player (this);
248		131
		132	ob->flag [FLAG_READY_WEAPON] = false;
		133	ob->flag [FLAG_READY_SKILL] = false;
		134	ob->flag [FLAG_READY_RANGE] = false;
		135	ob->flag [FLAG_READY_BOW] = false;
		136
249	ob->update_stats ();	137	ob->update_stats ();
250		138
251	ns->floorbox_update ();	139	ns->floorbox_update ();
252	esrv_send_inventory (ob, ob);	140	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	141	esrv_add_spells (this, 0);
254		142
255	activate ();	143	activate ();
256		144
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
263	}	147	}
264		148
265	void	149	void
…		…
281	ns->reset_stats ();	165	ns->reset_stats ();
282	ns->pl = 0;	166	ns->pl = 0;
283	ns = 0;	167	ns = 0;
284	}	168	}
285		169
286	observe = ob;	170	// this is important for the player scheduler to get the correct refcount
		171	// when ns = 0
		172	observe = viewpoint = ob;
287		173
288	deactivate ();	174	deactivate ();
289	}	175	}
		176
		177	//-GPL
290		178
291	// the need for this function can be explained	179	// the need for this function can be explained
292	// by load_object not returning the object	180	// by load_object not returning the object
293	void	181	void
294	player::set_object (object *op)	182	player::set_object (object *op)
295	{	183	{
296	ob = observe = op;	184	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
298		186
299	ob->speed = 1.0f;	187	ob->speed = 1.0f; // object still inactive, keep it that way
300	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
301		189
302	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
303
304	ob->flag [FLAG_READY_WEAPON] = false;
305	ob->flag [FLAG_READY_SKILL] = false;
306	ob->flag [FLAG_READY_BOW] = false;
307
308	for (object *op = ob->inv; op; op = op->below)
309	if (op->flag [FLAG_APPLIED])
310	switch (op->type)
311	{
312	case SKILL:
313	ob->flag [FLAG_APPLIED] = false;
314	break;
315
316	case WAND:
317	case ROD:
318	case HORN:
319	case BOW:
320	ranged_ob = op;
321	break;
322
323	case WEAPON:
324	combat_ob = op;
325	break;
326	}
327
328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329	ob->deactivate (); // change_weapon activates, fix this better
330	}	191	}
331		192
332	void	193	void
333	player::set_observe (object *op)	194	player::set_observe (object *op)
334	{	195	{
335	observe = op ? op : ob;	196	observe = viewpoint = op ? op : ob;
336	do_los = 1;	197	do_los = 1;
337	}	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
338		208
339	player::player ()	209	player::player ()
340	{	210	{
341	/* There are some elements we want initialised to non zero value -	211	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	212	* we deal with that below this point.
…		…
365		235
366	attachable::do_destroy ();	236	attachable::do_destroy ();
367		237
368	if (ob)	238	if (ob)
369	{	239	{
370	ob->destroy_inv (false);	240	// potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault.
		241	// temporarily backed out patchset 4025 to see if THIS change causes crashes
		242	//ob->contr = 0;
371	ob->destroy ();	243	ob->destroy ();
372	}	244	}
373		245
374	ob = observe = 0;	246	ob = observe = viewpoint = 0;
375	}	247	}
376		248
377	player::~player ()	249	player::~player ()
378	{	250	{
379	/* Clear item stack */	251	/* Clear item stack */
380	free (stack_items);	252	free (stack_items);
		253	}
		254
		255	/*
		256	* get_player_archetype() return next player archetype from archetype
		257	* list. Not very efficient routine, but used only creating new players.
		258	* Note: there MUST be at least one player archetype!
		259	*/
		260	static archetype *
		261	get_player_archetype (archetype *at)
		262	{
		263	// archetypes could have been reloaded
		264	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		265
		266	if (!nat)
		267	return at;
		268
		269	archvec::iterator i = archetypes.find (nat);
		270
		271	for (;;)
		272	{
		273	if (++i == archetypes.end ())
		274	i = archetypes.begin ();
		275	else if (*i == at)
		276	cleanup ("not a single player archetype found");
		277
		278	if ((*i)->type == PLAYER)
		279	return *i;
		280	}
381	}	281	}
382		282
383	/* Tries to add player on the connection passed in ns.	283	/* Tries to add player on the connection passed in ns.
384	* All we can really get in this is some settings like host and display	284	* All we can really get in this is some settings like host and display
385	* mode.	285	* mode.
…		…
387	player *	287	player *
388	player::create ()	288	player::create ()
389	{	289	{
390	player *pl = new player;	290	player *pl = new player;
391		291
392	pl->set_object (arch_to_object (get_player_archetype (0)));	292	pl->set_object (get_player_archetype (0)->instance ());
393		293
394	pl->ob->roll_stats ();	294	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	295	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	296	pl->ob->run_away = 25; /* Then we panick... */
397		297
398	set_first_map (pl->ob);	298	set_first_map (pl->ob);
399		299
400	return pl;	300	return pl;
401	}
402
403	/*
404	* get_player_archetype() return next player archetype from archetype
405	* list. Not very efficient routine, but used only creating new players.
406	* Note: there MUST be at least one player archetype!
407	*/
408	archetype *
409	get_player_archetype (archetype *at)
410	{
411	// archetypes could have been reloaded
412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414	if (!nat)
415	return at;
416
417	archvec::iterator i = archetypes.find (nat);
418
419	for (;;)
420	{
421	if (++i == archetypes.end ())
422	i = archetypes.begin ();
423	else if (*i == at)
424	cleanup ("not a single player archetype found");
425
426	if ((*i)->type == PLAYER)
427	return *i;
428	}
429	}	301	}
430		302
431	object *	303	object *
432	get_nearest_player (object *mon)	304	get_nearest_player (object *mon)
433	{	305	{
…		…
461	#endif	333	#endif
462	return op;	334	return op;
463	}	335	}
464		336
465	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	337	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
466	* result in a monster paths backtracking. It basically determines how large a	338	* result in a monster paths backtracking. It basically determines how large a
467	* detour a monster will take from the direction path when looking	339	* detour a monster will take from the direction path when looking
468	* for a path to the player. The values are in the amount of direction	340	* for a path to the player. The values are in the amount of direction
469	* the deviation is	341	* the deviation is
470	*/	342	*/
471	#define DETOUR_AMOUNT 2	343	#define DETOUR_AMOUNT 2
…		…
507	*/	379	*/
508	int	380	int
509	path_to_player (object *mon, object *pl, unsigned mindiff)	381	path_to_player (object *mon, object *pl, unsigned mindiff)
510	{	382	{
511	rv_vector rv;	383	rv_vector rv;
512	sint16 x, y;
513	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	384	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
514	maptile *m, *lastmap;
515		385
516	get_rangevector (mon, pl, &rv, 0);	386	get_rangevector (mon, pl, &rv, 0);
517		387
518	if (rv.distance < mindiff)	388	if (rv.distance < mindiff)
519	return 0;	389	return 0;
520		390
521	x = mon->x;	391	mapxy pos (mon);
522	y = mon->y;
523	m = mon->map;
524	dir = rv.direction;	392	dir = rv.direction;
525	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	393	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
526	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	394	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527		395
528	/* If we can't solve it within the search distance, return now. */	396	/* If we can't solve it within the search distance, return now. */
529	if (diff > max)	397	if (diff > max)
530	return 0;	398	return 0;
531		399
532	while (diff > 1 && max > 0)	400	while (diff > 1 && max > 0)
533	{	401	{
534	lastx = x;	402	mapxy lastpos = pos;
535	lasty = y;
536	lastmap = m;
537	x = lastx + freearr_x[dir];
538	y = lasty + freearr_y[dir];
539		403
540	mflags = get_map_flags (m, &m, x, y, &x, &y);	404	pos.move (dir);
541	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
542		405
543	/* Space is blocked - try changing direction a little */	406	/* Space is blocked - try changing direction a little */
544	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	407	if (!pos.normalise ()
545	&& (m == mon->map && blocked_link (mon, m, x, y))))	408	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		409	&& blocked_link (mon, pos.m, pos.x, pos.y)))
546	{	410	{
547	/* recalculate direction from last good location. Possible	411	/* recalculate direction from last good location. Possible
548	* we were not traversing ideal location before.	412	* we were not traversing ideal location before.
549	*/	413	*/
550	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	414	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
551	if (rv.direction != dir)	415	if (rv.direction != dir)
552	{	416	{
553	/* OK - says direction should be different - lets reset the	417	/* OK - says direction should be different - lets reset the
554	* the values so it will try again.	418	* the values so it will try again.
555	*/	419	*/
556	x = lastx;
557	y = lasty;
558	m = lastmap;	420	pos = lastpos;
559	dir = firstdir = rv.direction;	421	dir = firstdir = rv.direction;
560	}	422	}
561	else	423	else
562	{	424	{
563	/* direct path is blocked - try taking a side step to	425	/* direct path is blocked - try taking a side step to
564	* either the left or right.	426	* either the left or right.
565	* Note increase the values in the loop below to be	427	* Note increase the values in the loop below to be
566	* more than -1/1 respectively will mean the monster takes	428	* more than -1/1 respectively will mean the monster takes
567	* bigger detour. Have to be careful about these values getting	429	* bigger detour. Have to be careful about these values getting
568	* too big (3 or maybe 4 or higher) as the monster may just try	430	* too big (3 or maybe 4 or higher) as the monster may just try
569	* stepping back and forth	431	* stepping back and forth
570	*/	432	*/
571	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	433	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
572	{	434	{
573	if (i == 0)	435	if (i == 0)
574	continue; /* already did this, so skip it */	436	continue; /* already did this, so skip it */
		437
575	/* Use lastdir here - otherwise,	438	/* Use lastdir here - otherwise,
576	* since the direction that the creature should move in	439	* since the direction that the creature should move in
577	* may change, you could get infinite loops.	440	* may change, you could get infinite loops.
578	* ie, player is northwest, but monster can only	441	* ie, player is northwest, but monster can only
579	* move west, so it does that. It goes some distance,	442	* move west, so it does that. It goes some distance,
…		…
581	* can't do that, but now finds it can move east, and	444	* can't do that, but now finds it can move east, and
582	* gets back to its original point. lastdir contains	445	* gets back to its original point. lastdir contains
583	* the last direction the creature has successfully	446	* the last direction the creature has successfully
584	* moved.	447	* moved.
585	*/	448	*/
586
587	x = lastx + freearr_x[absdir (lastdir + i)];
588	y = lasty + freearr_y[absdir (lastdir + i)];
589	m = lastmap;	449	pos = lastpos;
590	mflags = get_map_flags (m, &m, x, y, &x, &y);	450	pos.move (absdir (lastdir + i));
591	if (mflags & P_OUT_OF_MAP)	451
		452	if (!pos.normalise ())
592	continue;	453	continue;
593	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	454
594	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	455	mapspace &ms = *pos;
		456
		457	if (ms.flags () & P_BLOCKSVIEW)
595	continue;	458	continue;
596	if (mflags & P_BLOCKSVIEW)	459
		460	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
597	continue;	461	continue;
598		462
599	if (m == mon->map && blocked_link (mon, m, x, y))	463	if (blocked_link (mon, pos.m, pos.x, pos.y))
600	break;	464	break;
601	}	465	}
		466
602	/* go through entire loop without finding a valid	467	/* go through entire loop without finding a valid
603	* sidestep to take - thus, no valid path.	468	* sidestep to take - thus, no valid path.
604	*/	469	*/
605	if (i == (DETOUR_AMOUNT + 1))	470	if (i == DETOUR_AMOUNT + 1)
606	return 0;	471	return 0;
		472
607	diff--;	473	diff--;
608	lastdir = dir;	474	lastdir = dir;
609	max--;	475	max--;
610	if (!firstdir)	476	if (!firstdir)
611	firstdir = dir + i;	477	firstdir = dir + i;
…		…
615	{	481	{
616	/* we moved towards creature, so diff is less */	482	/* we moved towards creature, so diff is less */
617	diff--;	483	diff--;
618	max--;	484	max--;
619	lastdir = dir;	485	lastdir = dir;
		486
620	if (!firstdir)	487	if (!firstdir)
621	firstdir = dir;	488	firstdir = dir;
622	}	489	}
623		490
624	if (diff <= 1)	491	if (diff <= 1)
625	{	492	{
626	/* Recalculate diff (distance) because we may not have actually	493	/* Recalculate diff (distance) because we may not have actually
627	* headed toward player for entire distance.	494	* headed toward player for entire distance.
628	*/	495	*/
629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	496	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
630	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
631	}	498	}
632		499
633	if (diff > max)	500	if (diff > max)
634	return 0;	501	return 0;
…		…
650	for (object *next, *op = pl->inv; op; op = next)	517	for (object *next, *op = pl->inv; op; op = next)
651	{	518	{
652	next = op->below;	519	next = op->below;
653		520
654	/* Forces get applied per default, unless they have the	521	/* Forces get applied per default, unless they have the
655	* flag "neutral" set. Sorry but I can't think of a better way	522	* flag "neutral" set. Sorry but I can't think of a better way
656	*/	523	*/
657	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	524	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
658	SET_FLAG (op, FLAG_APPLIED);	525	op->set_flag (FLAG_APPLIED);
659		526
660	/* we never give weapons/armour if these cannot be used	527	/* we never give weapons/armour if these cannot be used
661	* by this player due to race restrictions	528	* by this player due to race restrictions
662	*/	529	*/
663	if (pl->type == PLAYER)	530	if (pl->type == PLAYER)
664	{	531	{
665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	532	if ((!pl->flag [FLAG_USE_ARMOUR]
666	&&	533	&&
667	(op->type == ARMOUR || op->type == BOOTS	534	(op->type == ARMOUR || op->type == BOOTS
668	|| op->type == CLOAK || op->type == HELMET	535	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	536	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	537	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	538	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
672	{	539	{
673	op->destroy ();	540	op->destroy ();
674	continue;	541	continue;
675	}	542	}
676	}	543	}
677		544
678	/* Here we remove duplicated skills (as duplicated spell objects have	545	/* Here we remove duplicated skills (as duplicated spell objects have
679	* _very_ confusing effects for players), which could for instance be	546	* _very_ confusing effects for players), which could for instance be
680	* generated by bad treasurelists. - elmex	547	* generated by multiple treasurelists specifying the same skills.
681	*/	548	*/
682	if (op->type == SKILL)	549	if (op->type == SKILL)
683	{	550	{
684	for (object *tmp = op->below; tmp; tmp = tmp->below)	551	for (object *tmp = op->below; tmp; tmp = tmp->below)
685	if (tmp->type == op->type && tmp->name == op->name)	552	if (tmp->type == op->type && tmp->name == op->name)
686	{	553	{
687	op->destroy ();	554	op->destroy ();
688	LOG (llevError,
689	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
690	break;	555	break;
691	}	556	}
692		557
693	if (op->nrof > 1)	558	if (op->nrof > 1)
694	op->nrof = 1;	559	op->nrof = 1;
695	}	560	}
696		561
697	if (op->type == SPELLBOOK && op->inv)	562	if (op->type == SPELLBOOK && op->inv)
698	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	563	op->inv->clr_flag (FLAG_STARTEQUIP);
699		564
700	/* Give starting characters identified, uncursed, and undamned	565	/* Give starting characters identified, uncursed, and undamned
701	* items. Just don't identify gold or silver, or it won't be	566	* items. Just don't identify gold or silver, or it won't be
702	* merged properly.	567	* merged properly.
703	*/	568	*/
704	if (need_identify (op))	569	if (op->need_identify ())
705	{	570	{
706	SET_FLAG (op, FLAG_IDENTIFIED);	571	op->set_flag (FLAG_IDENTIFIED);
707	CLEAR_FLAG (op, FLAG_CURSED);	572	op->clr_flag (FLAG_CURSED);
708	CLEAR_FLAG (op, FLAG_DAMNED);	573	op->clr_flag (FLAG_DAMNED);
709	}	574	}
710		575
711	if (op->type == SPELL)	576	if (op->type == SPELL)
712	{	577	{
713	op->destroy ();	578	op->destroy ();
714	continue;	579	continue;
715	}	580	}
716	else if (op->type == SKILL)	581	else if (op->type == SKILL)
717	{	582	{
718	SET_FLAG (op, FLAG_CAN_USE_SKILL);	583	op->set_flag (FLAG_CAN_USE_SKILL);
719	op->stats.exp = 0;	584	op->stats.exp = 0;
720	op->level = 1;	585	op->level = 1;
721	}	586	}
722	else /* lock all 'normal items by default */	587	else /* lock all 'normal items by default */
723	SET_FLAG (op, FLAG_INV_LOCKED);	588	op->set_flag (FLAG_INV_LOCKED);
724	} /* for loop of objects in player inv */	589	} /* for loop of objects in player inv */
725		590
726	/* Need to set up the skill pointers */	591	/* Need to set up the skill pointers */
727	pl->contr->link_skills ();	592	pl->contr->link_skills ();
728	}	593	}
…		…
742	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	607	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743	}	608	}
744		609
745	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	610	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746	static int	611	static int
747	roll_stat (void)	612	roll_stat ()
748	{	613	{
749	int a[4], i, j, k;	614	int a[4], i, j, k;
750		615
751	for (i = 0; i < 4; i++)	616	for (i = 0; i < 4; i++)
752	a[i] = (int) rndm (6) + 1;	617	a[i] = rndm (1, 6);
753		618
754	for (i = 0, j = 0, k = 7; i < 4; i++)	619	for (i = 0, j = 0, k = 7; i < 4; i++)
755	if (a[i] < k)	620	if (a[i] < k)
756	k = a[i], j = i;	621	k = a[i], j = i;
757		622
…		…
849	player::chargen_race_done ()	714	player::chargen_race_done ()
850	{	715	{
851	/* this must before then initial items are given */	716	/* this must before then initial items are given */
852	esrv_new_player (ob->contr);	717	esrv_new_player (ob->contr);
853		718
854	treasurelist *tl = treasurelist::find ("starting_wealth");	719	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
855	if (tl)	720	if (tl)
856	create_treasure (tl, ob, 0, 0, 0);	721	create_treasure (tl, ob, 0, 0, 0);
857		722
858	INVOKE_PLAYER (BIRTH, ob->contr);	723	INVOKE_PLAYER (BIRTH, ob->contr);
859	INVOKE_PLAYER (LOGIN, ob->contr);
860		724
861	ob->contr->ns->state = ST_PLAYING;	725	ob->contr->ns->state = ST_PLAYING;
862		726
863	if (ob->msg)	727	if (ob->msg)
864	ob->msg = 0;	728	ob->msg = 0;
865		729
866	start_info (ob);	730	start_info (ob);
867	CLEAR_FLAG (ob, FLAG_WIZ);	731	ob->clr_flag (FLAG_WIZ);
868	give_initial_items (ob, ob->randomitems);	732	give_initial_items (ob, ob->randomitems);
869	esrv_send_inventory (ob, ob);	733	esrv_send_inventory (ob, ob);
870	ob->update_stats ();	734	ob->update_stats ();
871		735
872	/* This moves the player to a different start map, if there	736	/* This moves the player to a different start map, if there
…		…
874	*/	738	*/
875	if (*first_map_ext_path)	739	if (*first_map_ext_path)
876	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	740	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
877	else	741	else
878	LOG (llevDebug, "first_map_ext_path not set\n");	742	LOG (llevDebug, "first_map_ext_path not set\n");
		743	}
		744
		745	/*
		746	* Returns true if the given player is a legal class.
		747	* The function to add and remove class-bonuses to the stats doesn't
		748	* check if the stat becomes negative, thus this function
		749	* merely checks that all stats are 1 or more, and returns
		750	* false otherwise.
		751	*/
		752	static int
		753	allowed_class (const object *op)
		754	{
		755	return op->stats.Dex > 0
		756	&& op->stats.Str > 0
		757	&& op->stats.Con > 0
		758	&& op->stats.Int > 0
		759	&& op->stats.Wis > 0
		760	&& op->stats.Pow > 0
		761	&& op->stats.Cha > 0;
879	}	762	}
880		763
881	void	764	void
882	player::chargen_race_next ()	765	player::chargen_race_next ()
883	{	766	{
…		…
912	ob->stats.hp = ob->stats.maxhp;	795	ob->stats.hp = ob->stats.maxhp;
913	ob->stats.sp = ob->stats.maxsp;	796	ob->stats.sp = ob->stats.maxsp;
914	ob->stats.grace = 0;	797	ob->stats.grace = 0;
915	}	798	}
916		799
917	void	800	static void
918	flee_player (object *op)	801	flee_player (object *op)
919	{	802	{
920	int dir, diff;	803	int dir, diff;
921	rv_vector rv;	804	rv_vector rv;
922		805
923	if (op->stats.hp < 0)	806	if (op->stats.hp < 0)
924	{	807	{
925	LOG (llevDebug, "Fleeing player is dead.\n");	808	LOG (llevDebug, "Fleeing player is dead.\n");
926	CLEAR_FLAG (op, FLAG_SCARED);	809	op->clr_flag (FLAG_SCARED);
927	return;	810	return;
928	}	811	}
929		812
930	if (!op->enemy)	813	if (!op->enemy)
931	{	814	{
932	LOG (llevDebug, "Fleeing player had no enemy.\n");	815	LOG (llevDebug, "Fleeing player had no enemy.\n");
933	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
934	return;	817	return;
935	}	818	}
936		819
937	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	820	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
938	{	821	{
939	op->enemy = NULL;	822	op->enemy = NULL;
940	CLEAR_FLAG (op, FLAG_SCARED);	823	op->clr_flag (FLAG_SCARED);
941	return;	824	return;
942	}	825	}
943		826
944	get_rangevector (op, op->enemy, &rv, 0);	827	get_rangevector (op, op->enemy, &rv, 0);
945		828
946	dir = absdir (4 + rv.direction);	829	dir = absdir (4 + rv.direction);
947	for (diff = 0; diff < 3; diff++)	830	for (diff = 0; diff < 3; diff++)
948	{	831	{
949	int m = 1 - rndm (2) * 2;	832	int m = 1 - rndm (2) * 2;
950		833
951	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	834	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
952	return;	835	return;
953	}	836	}
954		837
955	/* Cornered, get rid of scared */	838	/* Cornered, get rid of scared */
956	CLEAR_FLAG (op, FLAG_SCARED);	839	op->clr_flag (FLAG_SCARED);
957	op->enemy = NULL;	840	op->enemy = NULL;
958	}	841	}
959		842
960	/* check_pick sees if there is stuff to be picked up/picks up stuff.	843	/* check_pick sees if there is stuff to be picked up/picks up stuff.
961	* It returns 1 if the player should keep on moving, 0 if he should	844	* It returns 1 if the player should keep on moving, 0 if he should
…		…
966	{	849	{
967	object *tmp, *next;	850	object *tmp, *next;
968	int stop = 0;	851	int stop = 0;
969	int wvratio;	852	int wvratio;
970		853
971	/* if you're flying, you cna't pick up anything */	854	/* if you're flying, you can't pick up anything */
972	if (op->move_type & MOVE_FLYING)	855	if (op->move_type & MOVE_FLYING)
973	return 1;	856	return 1;
974		857
975	next = op->below;	858	next = op->below;
976		859
977	int cnt = MAX_ITEM_PER_DROP;	860	int cnt = MAX_ITEM_PER_ACTION;
978	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	861	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979		862
980	/* loop while there are items on the floor that are not marked as	863	/* loop while there are items on the floor that are not marked as
981	* destroyed */	864	* destroyed */
982	while (next && !next->destroyed ())	865	while (next && !next->destroyed ())
…		…
1008	if (op->contr->mode & PU_DEBUG)	891	if (op->contr->mode & PU_DEBUG)
1009	{	892	{
1010	/* some debugging code to figure out item information */	893	/* some debugging code to figure out item information */
1011	const char *str = tmp->name	894	const char *str = tmp->name
1012	? format ("item name: %s item type: %d weight/value: %d",	895	? format ("item name: %s item type: %d weight/value: %d",
1013	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	896	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1014	: format ("item name: %s item type: %d weight/value: %d",	897	: format ("item name: %s item type: %d weight/value: %d",
1015	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	898	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1016		899
1017	new_draw_info (NDI_UNIQUE, 0, op, str);	900	new_draw_info (NDI_UNIQUE, 0, op, str);
1018	}	901	}
1019		902
1020	if (op->contr->mode & PU_INHIBIT)	903	if (op->contr->mode & PU_INHIBIT)
…		…
1053	* fighting */	936	* fighting */
1054	if (op->contr->mode & PU_INHIBIT)	937	if (op->contr->mode & PU_INHIBIT)
1055	return 1;	938	return 1;
1056		939
1057	/* prevent us from turning into auto-thieves :) */	940	/* prevent us from turning into auto-thieves :) */
1058	if (QUERY_FLAG (tmp, FLAG_UNPAID))	941	if (tmp->flag [FLAG_UNPAID])
1059	continue;	942	continue;
1060		943
1061	/* ignore known cursed objects */	944	/* ignore known cursed objects */
1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	945	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
1063	continue;	946	continue;
1064		947
1065	/* all food and drink if desired */	948	/* all food and drink if desired */
1066	/* question: don't pick up known-poisonous stuff? */	949	/* question: don't pick up known-poisonous stuff? */
1067	if (op->contr->mode & PU_FOOD)	950	if (op->contr->mode & PU_FOOD)
…		…
1070	CHK_PICK_PICKUP;	953	CHK_PICK_PICKUP;
1071	continue;	954	continue;
1072	}	955	}
1073		956
1074	if (op->contr->mode & PU_DRINK)	957	if (op->contr->mode & PU_DRINK)
1075	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	958	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
1076	{	959	{
1077	CHK_PICK_PICKUP;	960	CHK_PICK_PICKUP;
1078	continue;	961	continue;
1079	}	962	}
1080		963
…		…
1107	continue;	990	continue;
1108	}	991	}
1109		992
1110	/* wands/staves/rods/horns */	993	/* wands/staves/rods/horns */
1111	if (op->contr->mode & PU_MAGIC_DEVICE)	994	if (op->contr->mode & PU_MAGIC_DEVICE)
1112	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	995	if (tmp->type == WAND
		996	|| tmp->type == ROD
		997	|| tmp->type == HORN
		998	|| tmp->type == POWER_CRYSTAL)
1113	{	999	{
1114	CHK_PICK_PICKUP;	1000	CHK_PICK_PICKUP;
1115	continue;	1001	continue;
1116	}	1002	}
1117		1003
1118	/* pick up all magical items */	1004	/* pick up all magical items */
1119	if (op->contr->mode & PU_MAGICAL)	1005	if (op->contr->mode & PU_MAGICAL)
1120	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1006	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1007	&& !tmp->flag [FLAG_KNOWN_CURSED])
1121	{	1008	{
1122	CHK_PICK_PICKUP;	1009	CHK_PICK_PICKUP;
1123	continue;	1010	continue;
1124	}	1011	}
1125		1012
…		…
1132	}	1019	}
1133	}	1020	}
1134		1021
1135	/* rings & amulets - talismans seems to be typed AMULET */	1022	/* rings & amulets - talismans seems to be typed AMULET */
1136	if (op->contr->mode & PU_JEWELS)	1023	if (op->contr->mode & PU_JEWELS)
1137	if (tmp->type == RING || tmp->type == AMULET)	1024	if (tmp->type == RING
		1025	|| tmp->type == AMULET
		1026	|| tmp->type == GIRDLE
		1027	|| tmp->type == SKILL_TOOL)
1138	{	1028	{
1139	CHK_PICK_PICKUP;	1029	CHK_PICK_PICKUP;
1140	continue;	1030	continue;
1141	}	1031	}
1142		1032
…		…
1191	CHK_PICK_PICKUP;	1081	CHK_PICK_PICKUP;
1192	continue;	1082	continue;
1193	}	1083	}
1194		1084
1195	if (op->contr->mode & PU_GLOVES)	1085	if (op->contr->mode & PU_GLOVES)
1196	if (tmp->type == GLOVES)	1086	if (tmp->type == GLOVES || tmp->type == BRACERS)
1197	{	1087	{
1198	CHK_PICK_PICKUP;	1088	CHK_PICK_PICKUP;
1199	continue;	1089	continue;
1200	}	1090	}
1201		1091
…		…
1206	continue;	1096	continue;
1207	}	1097	}
1208		1098
1209	/* hoping to catch throwing daggers here */	1099	/* hoping to catch throwing daggers here */
1210	if (op->contr->mode & PU_MISSILEWEAPON)	1100	if (op->contr->mode & PU_MISSILEWEAPON)
1211	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1101	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1212	{	1102	{
1213	CHK_PICK_PICKUP;	1103	CHK_PICK_PICKUP;
1214	continue;	1104	continue;
1215	}	1105	}
1216		1106
…		…
1251	fprintf (stderr, "%s", tmp->name);	1141	fprintf (stderr, "%s", tmp->name);
1252	}	1142	}
1253	else	1143	else
1254	fprintf (stderr, "%s", tmp->arch->archname);	1144	fprintf (stderr, "%s", tmp->arch->archname);
1255	fprintf (stderr, ",%d] = ", tmp->type);	1145	fprintf (stderr, ",%d] = ", tmp->type);
1256	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1146	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1257	#endif	1147	#endif
1258	CHK_PICK_PICKUP;	1148	CHK_PICK_PICKUP;
1259	continue;	1149	continue;
1260	}	1150	}
1261	} /* the new pickup model */	1151	} /* the new pickup model */
1262	}	1152	}
1263		1153
1264	return !stop;	1154	return !stop;
1265	}	1155	}
1266		1156
		1157	/* routine for both players and monsters. We call this when
		1158	* there is a possibility for our action distrubing our hiding
		1159	* place or invisiblity spell. Artefact invisiblity causes
		1160	* "noise" instead. If we arent invisible to begin with, we
		1161	* return 0.
		1162	*/
		1163	static int
		1164	action_makes_visible (object *op)
		1165	{
		1166	if (op->invisible && op->flag [FLAG_ALIVE])
		1167	{
		1168	if (op->flag [FLAG_MAKE_INVIS])
		1169	{
		1170	// artefact invisibility is permanent, but we still make noise
		1171	// this is important for game-balance.
		1172	if (op->contr)
		1173	op->make_noise ();
		1174
		1175	return 0;
		1176	}
		1177
		1178	if (op->contr && op->contr->tmp_invis == 0)
		1179	return 0;
		1180
		1181	/* If monsters, they should become visible */
		1182	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1183	{
		1184	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1185	return 1;
		1186	}
		1187	}
		1188
		1189	return 0;
		1190	}
		1191
1267	/*	1192	/*
1268	* Find an arrow in the inventory and after that	1193	* Find an arrow in the inventory and after that
1269	* in the right type container (quiver). Pointer to the	1194	* in the right type container (quiver). Pointer to the
1270	* found object is returned.	1195	* found object is returned.
1271	*/	1196	*/
1272	object *	1197	static object *
1273	find_arrow (object *op, const char *type)	1198	find_arrow (object *op, const char *type)
1274	{	1199	{
1275	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1200	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1276	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1201	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1277	return splay (tmp);	1202	return splay (tmp);
1278		1203
1279	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1204	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1280	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1205	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1281	if (object *arrow = find_arrow (tmp, type))	1206	if (object *arrow = find_arrow (tmp, type))
1282	{	1207	{
1283	splay (tmp);	1208	splay (tmp);
1284	return arrow;	1209	return arrow;
1285	}	1210	}
…		…
1291	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1216	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1292	* against the target. A full test is not performed, simply a basic test	1217	* against the target. A full test is not performed, simply a basic test
1293	* of resistances. The archer is making a quick guess at what he sees down	1218	* of resistances. The archer is making a quick guess at what he sees down
1294	* the hall. Failing that it does it's best to pick the highest plus arrow.	1219	* the hall. Failing that it does it's best to pick the highest plus arrow.
1295	*/	1220	*/
1296	object *	1221	static object *
1297	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1222	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1298	{	1223	{
1299	object *tmp = NULL, *arrow, *ntmp;	1224	object *tmp = NULL, *arrow, *ntmp;
1300	int attacknum, attacktype, betterby = 0, i;	1225	int attacknum, attacktype, betterby = 0, i;
1301		1226
1302	if (!type)	1227	if (!type)
1303	return NULL;	1228	return NULL;
1304		1229
1305	for (arrow = op->inv; arrow; arrow = arrow->below)	1230	for (arrow = op->inv; arrow; arrow = arrow->below)
1306	{	1231	{
1307	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1232	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1308	{	1233	{
1309	i = 0;	1234	i = 0;
1310	ntmp = find_better_arrow (arrow, target, type, &i);	1235	ntmp = find_better_arrow (arrow, target, type, &i);
1311		1236
1312	if (i > betterby)	1237	if (i > betterby)
…		…
1370	* find_better_arrow to find a decent arrow to use.	1295	* find_better_arrow to find a decent arrow to use.
1371	* op = the shooter	1296	* op = the shooter
1372	* type = bow->race	1297	* type = bow->race
1373	* dir = fire direction	1298	* dir = fire direction
1374	*/	1299	*/
1375	object *	1300	static object *
1376	pick_arrow_target (object *op, shstr_cmp type, int dir)	1301	pick_arrow_target (object *op, shstr_cmp type, int dir)
1377	{	1302	{
1378	object *tmp = NULL;	1303	object *tmp = NULL;
1379	maptile *m;	1304	maptile *m;
1380	int i, mflags, found, number;	1305	int i, mflags, found, number;
…		…
1393	y = op->y;	1318	y = op->y;
1394		1319
1395	/* find the first target */	1320	/* find the first target */
1396	for (i = 0, found = 0; i < 20; i++)	1321	for (i = 0, found = 0; i < 20; i++)
1397	{	1322	{
1398	x += freearr_x[dir];	1323	x += DIRX (dir);
1399	y += freearr_y[dir];	1324	y += DIRY (dir);
1400	mflags = get_map_flags (m, &m, x, y, &x, &y);	1325	mflags = get_map_flags (m, &m, x, y, &x, &y);
1401		1326
1402	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1327	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1403	{	1328	{
1404	tmp = 0;	1329	tmp = 0;
…		…
1413	break;	1338	break;
1414	}	1339	}
1415		1340
1416	if (mflags & P_IS_ALIVE)	1341	if (mflags & P_IS_ALIVE)
1417	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1342	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1418	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1343	if (tmp->flag [FLAG_ALIVE])
1419	break;	1344	break;
1420	}	1345	}
1421		1346
1422	if (!tmp)	1347	if (!tmp)
1423	return find_arrow (op, type);	1348	return find_arrow (op, type);
…		…
1427		1352
1428	return find_better_arrow (op, tmp, type, &i);	1353	return find_better_arrow (op, tmp, type, &i);
1429	}	1354	}
1430		1355
1431	/*	1356	/*
1432	* Creature fires a bow - op can be monster or player. Returns	1357	* Creature fires a bow - op can be monster or player. Returns
1433	* 1 if bow was actually fired, 0 otherwise.	1358	* 1 if bow was actually fired, 0 otherwise.
1434	* op is the object firing the bow.	1359	* op is the object firing the bow.
1435	* part is for multipart creatures - the part firing the bow.	1360	* part is for multipart creatures - the part firing the bow.
1436	* dir is the direction of fire.	1361	* dir is the direction of fire.
1437	* wc_mod is any special modifier to give (used in special player fire modes)	1362	* wc_mod is any special modifier to give (used in special player fire modes)
…		…
1484	{	1409	{
1485	if (op->type == PLAYER)	1410	if (op->type == PLAYER)
1486	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1487	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1412	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1488	else	1413	else
1489	CLEAR_FLAG (op, FLAG_READY_BOW);	1414	op->clr_flag (FLAG_READY_BOW);
1490		1415
1491	return 0;	1416	return 0;
1492	}	1417	}
1493	}	1418	}
1494		1419
…		…
1543	#endif	1468	#endif
1544		1469
1545	SET_ANIMATION (arrow, arrow->direction);	1470	SET_ANIMATION (arrow, arrow->direction);
1546		1471
1547	/* update the speed */	1472	/* update the speed */
1548	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1549	+ bow->stats.dam / 7.f;
1550		1473
1551	arrow->set_speed (max (arrow->speed, 2.f));
1552	arrow->speed_left = 0;	1474	arrow->speed_left = 0;
		1475	arrow->set_speed (max (2.f,
		1476	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1477	+ bow->stats.dam / 7.f
		1478	));
1553		1479
1554	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1480	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1555		1481
1556	if (op->type == PLAYER)	1482	if (op->type == PLAYER)
1557	{	1483	{
…		…
1578	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1504	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1579		1505
1580	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1506	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1581	arrow->move_type = MOVE_FLY_LOW;	1507	arrow->move_type = MOVE_FLY_LOW;
1582	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1508	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
		1509	arrow->set_flag (FLAG_NO_PICK);
1583		1510
1584	op->play_sound (sound_find ("fire_arrow"));	1511	op->play_sound (sound_find ("fire_arrow"));
1585	m->insert (arrow, sx, sy, op);	1512	m->insert (arrow, sx, sy, op);
1586		1513
1587	if (!arrow->destroyed ())	1514	if (!arrow->destroyed ())
…		…
1595	* but monsters can't. Putting that code here	1522	* but monsters can't. Putting that code here
1596	* makes the fire_bow code much cleaner.	1523	* makes the fire_bow code much cleaner.
1597	* this function should only be called if 'op' is a player,	1524	* this function should only be called if 'op' is a player,
1598	* hence the function name.	1525	* hence the function name.
1599	*/	1526	*/
1600	int	1527	static int
1601	player_fire_bow (object *op, int dir)	1528	player_fire_bow (object *op, int dir)
1602	{	1529	{
1603	int ret;	1530	int ret;
1604		1531
1605	if (op->contr->bowtype == bow_bestarrow)	1532	if (op->contr->bowtype == bow_bestarrow)
…		…
1612	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1539	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1613	}	1540	}
1614	else if (op->contr->bowtype == bow_threewide)	1541	else if (op->contr->bowtype == bow_threewide)
1615	{	1542	{
1616	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1543	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1617	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1544	ret |= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir + 2)), op->y + DIRY (absdir (dir + 2)));
1618	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1545	ret |= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir - 2)), op->y + DIRY (absdir (dir - 2)));
1619	}	1546	}
1620	else if (op->contr->bowtype == bow_spreadshot)	1547	else if (op->contr->bowtype == bow_spreadshot)
1621	{	1548	{
1622	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1549	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1623	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1550	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
…		…
1633	}	1560	}
1634		1561
1635	/* Fires a misc (wand/rod/horn) object in 'dir'.	1562	/* Fires a misc (wand/rod/horn) object in 'dir'.
1636	* Broken apart from 'fire' to keep it more readable.	1563	* Broken apart from 'fire' to keep it more readable.
1637	*/	1564	*/
1638	void	1565	static void
1639	fire_misc_object (object *op, int dir)	1566	fire_misc_object (object *op, int dir)
1640	{	1567	{
1641	object *item = op->contr->ranged_ob;	1568	object *item = op->contr->ranged_ob;
1642		1569
1643	if (!item)	1570	if (!item)
…		…
1650	{	1577	{
1651	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1578	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1652	return;	1579	return;
1653	}	1580	}
1654		1581
1655	if (!op->change_weapon (item))	1582	if (!op->apply (item))
1656	return;	1583	return;
1657		1584
1658	if (item->type == WAND)	1585	if (item->type == WAND)
1659	{	1586	{
1660	if (item->stats.food <= 0)	1587	if (item->stats.food <= 0)
…		…
1665	return;	1592	return;
1666	}	1593	}
1667	}	1594	}
1668	else if (item->type == ROD || item->type == HORN)	1595	else if (item->type == ROD || item->type == HORN)
1669	{	1596	{
1670	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1597	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1671		1598
1672	// using the maximum of the rods charge allows at least one spell cast	1599	// using the maximum of the rods charge allows at least one spell cast
1673	// for a rod or horn, this fixes some broken rods.	1600	// for a rod or horn, this fixes some broken rods.
1674	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1601	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1675	{	1602	{
1676	op->contr->play_sound (sound_find ("wand_poof"));	1603	op->contr->play_sound (sound_find ("wand_poof"));
1677		1604
1678	if (item->type == ROD)	1605	if (item->type == ROD)
1679	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1606	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1690		1617
1691	if (item->type == WAND)	1618	if (item->type == WAND)
1692	{	1619	{
1693	if (!(--item->stats.food))	1620	if (!(--item->stats.food))
1694	{	1621	{
1695	object *tmp;
1696
1697	if (item->arch)	1622	if (item->arch)
1698	{	1623	{
1699	CLEAR_FLAG (item, FLAG_ANIMATE);	1624	item->clr_flag (FLAG_ANIMATE);
1700	item->face = item->arch->face;	1625	item->face = item->arch->face;
1701	item->set_speed (0);	1626	item->set_speed (0);
1702	}	1627	}
1703		1628
1704	if (object *pl = item->visible_to ())	1629	if (object *pl = item->visible_to ())
…		…
1711	}	1636	}
1712		1637
1713	/* Received a fire command for the player - go and do it.	1638	/* Received a fire command for the player - go and do it.
1714	*/	1639	*/
1715	bool	1640	bool
1716	fire (object *op, int dir)	1641	fire (object *who, int dir)
1717	{	1642	{
1718	int spellcost = 0;	1643	int spellcost = 0;
1719		1644
1720	player *pl = op->contr;	1645	player *pl = who->contr;
1721		1646
1722	if (pl->golem)	1647	if (pl->golem)
1723	{	1648	{
1724	control_golem (op->contr->golem, dir);	1649	control_golem (who->contr->golem, dir);
1725	return false;	1650	return false;
1726	}	1651	}
1727		1652
1728	object *ob = pl->ranged_ob;	1653	object *ob = pl->ranged_ob;
1729		1654
1730	if (!ob)	1655	if (!ob)
1731	return false;	1656	return false;
1732		1657
1733	if (op->speed_left > 0.f)	1658	if (who->speed_left > 0.f)
1734	--op->speed_left;	1659	--who->speed_left;
1735	else	1660	else
1736	return false;	1661	return false;
1737		1662
1738	if (!op->change_weapon (ob))	1663	if (!who->apply (ob))
1739	return false;	1664	return false;
1740		1665
1741	/* check for loss of invisiblity/hide */	1666	/* check for loss of invisiblity/hide */
1742	if (action_makes_visible (op))	1667	if (action_makes_visible (who))
1743	make_visible (op);	1668	make_visible (who);
1744		1669
1745	switch (ob->type)	1670	switch (ob->type)
1746	{	1671	{
1747	case BOW:	1672	case BOW:
1748	player_fire_bow (op, dir);	1673	player_fire_bow (who, dir);
1749	break;	1674	break;
1750		1675
1751	case SPELL:	1676	case SPELL:
1752	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1677	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1753	break;	1678	break;
1754		1679
1755	case BUILDER:	1680	case BUILDER:
1756	apply_map_builder (op, dir);	1681	apply_map_builder (who, dir);
1757	break;	1682	break;
1758		1683
1759	case SKILL:	1684	case SKILL:
1760	do_skill (op, op, ob, dir, 0);	1685	do_skill (who, who, ob, dir, 0);
1761	break;	1686	break;
1762		1687
		1688	case RANGED:
		1689	do_skill (who, ob, who->chosen_skill, dir, 0);
		1690	break;
		1691
1763	default:	1692	default:
1764	fire_misc_object (op, dir);	1693	fire_misc_object (who, dir);
1765	break;	1694	break;
1766	}	1695	}
1767		1696
1768	return true;	1697	return true;
1769	}	1698	}
1770		1699
1771	/* find_key	1700	static object *
1772	* We try to find a key for the door as passed. If we find a key
1773	* and successfully use it, we return the key, otherwise NULL
1774	* This function merges both normal and locked door, since the logic
1775	* for both is the same - just the specific key is different.
1776	* pl is the player,
1777	* inv is the objects inventory to searched
1778	* door is the door we are trying to match against.
1779	* This function can be called recursively to search containers.
1780	*/
1781	object *
1782	find_key (object *pl, object *container, object *door)	1701	find_key_ (object *pl, object *container, object *door)
1783	{	1702	{
1784	object *tmp, *key;	1703	object *tmp, *key;
1785		1704
1786	/* Should not happen, but sanity checking is never bad */	1705	/* Should not happen, but sanity checking is never bad */
1787	if (!container->inv)	1706	if (!container->inv)
…		…
1791	for (tmp = container->inv; tmp; tmp = tmp->below)	1710	for (tmp = container->inv; tmp; tmp = tmp->below)
1792	{	1711	{
1793	if (door->type == DOOR && tmp->type == KEY)	1712	if (door->type == DOOR && tmp->type == KEY)
1794	break;	1713	break;
1795		1714
1796	/* For sanity, we should really check door type, but other stuff	1715	/* For sanity, we should really check door type, but other stuff
1797	* (like containers) can be locked with special keys	1716	* (like containers) can be locked with special keys
1798	*/	1717	*/
1799	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1718	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1800	break;	1719	break;
1801	}	1720	}
…		…
1808	if (!tmp)	1727	if (!tmp)
1809	{	1728	{
1810	for (tmp = container->inv; tmp; tmp = tmp->below)	1729	for (tmp = container->inv; tmp; tmp = tmp->below)
1811	/* No reason to search empty containers */	1730	/* No reason to search empty containers */
1812	if (tmp->type == CONTAINER && tmp->inv)	1731	if (tmp->type == CONTAINER && tmp->inv)
1813	if ((key = find_key (pl, tmp, door)))	1732	if ((key = find_key_ (pl, tmp, door)))
1814	return key;	1733	return key;
1815		1734
1816	if (!tmp)	1735	if (!tmp)
1817	return 0;	1736	return 0;
1818	}	1737	}
…		…
1837	* inv must have been an container and must have been active.	1756	* inv must have been an container and must have been active.
1838	*	1757	*
1839	* Change the color so that the message doesn't disappear with	1758	* Change the color so that the message doesn't disappear with
1840	* all the others.	1759	* all the others.
1841	*/	1760	*/
1842	if (pl->contr->usekeys == key_inventory ||	1761	if (pl->contr->usekeys == key_inventory
1843	!QUERY_FLAG (container, FLAG_APPLIED) ||	1762	|| !container->flag [FLAG_APPLIED]
1844	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1763	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1845	{	1764	{
1846	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1765	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1847	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1766	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1848	return NULL;	1767	return NULL;
1849	}	1768	}
1850	}	1769	}
1851		1770
1852	return tmp;	1771	return tmp;
		1772	}
		1773
		1774	/* find_key
		1775	* We try to find a key for the door as passed. If we find a key
		1776	* and successfully use it, we return the key, otherwise NULL
		1777	* This function merges both normal and locked door, since the logic
		1778	* for both is the same - just the specific key is different.
		1779	* pl is the player,
		1780	* inv is the objects inventory to searched
		1781	* door is the door we are trying to match against.
		1782	* This function can be called recursively to search containers.
		1783	*/
		1784	object *
		1785	find_key (object *pl, object *container, object *door)
		1786	{
		1787	if (door->slaying && is_match_expr (door->slaying))
		1788	{
		1789	// for match expressions, we try to find the key by applying the match
		1790	// to the op itself, which is supposed to find the "key", instead
		1791	// of searching through containers ourselves.
		1792
		1793	return match_one (door->slaying, container, door, pl, pl);
		1794	}
		1795	else
		1796	return find_key_ (pl, container, door);
1853	}	1797	}
1854		1798
1855	/* moved door processing out of move_player_attack.	1799	/* moved door processing out of move_player_attack.
1856	* returns 1 if player has opened the door with a key	1800	* returns 1 if player has opened the door with a key
1857	* such that the caller should not do anything more,	1801	* such that the caller should not do anything more,
…		…
1907	* going to try and move (not fire weapons).	1851	* going to try and move (not fire weapons).
1908	*/	1852	*/
1909	bool	1853	bool
1910	move_player_attack (object *op, int dir)	1854	move_player_attack (object *op, int dir)
1911	{	1855	{
1912	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1856	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1913	{	1857	{
1914	--op->speed_left;	1858	--op->speed_left;
1915	return true;	1859	return true;
1916	}	1860	}
1917		1861
1918	int on_battleground;	1862	sint16 nx = DIRX (dir) + op->x;
1919		1863	sint16 ny = DIRY (dir) + op->y;
1920	sint16 nx = freearr_x[dir] + op->x;
1921	sint16 ny = freearr_y[dir] + op->y;
1922
1923	on_battleground = op_on_battleground (op, 0, 0);
1924		1864
1925	if (out_of_map (op->map, nx, ny))	1865	if (out_of_map (op->map, nx, ny))
1926	return false;	1866	return false;
1927		1867
1928	/* If braced, or can't move to the square, and it is not out of the	1868	/* If braced, or can't move to the square, and it is not out of the
…		…
1949	|| mon->flag [FLAG_CAN_ROLL])	1889	|| mon->flag [FLAG_CAN_ROLL])
1950	&& mon != op)	1890	&& mon != op)
1951	break;	1891	break;
1952	}	1892	}
1953		1893
1954	if (!mon) /* This happens anytime the player tries to move */	1894	/* no monster == player tries to move into a wall or so */
1955	return false; /* into a wall */	1895	if (!mon)
		1896	{
		1897	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1898	if (op->move_type & ob->move_block)
		1899	{
		1900	if (ob->move_block == MOVE_ALL)
		1901	move_into_wall (op, ob);
		1902	else
		1903	{
		1904	if (op->contr->ns->bumpmsg)
		1905	{
		1906	op->play_sound (sound_find ("blocked_move"));
		1907
		1908	op->statusmsg (ob->invisible
		1909	? "Something blocks you."
		1910	: format ("Something blocks you from entering the %s.", query_name (ob))
		1911	);
		1912	}
		1913	}
		1914
		1915	break;
		1916	}
		1917
		1918	return false;
		1919	}
1956		1920
1957	mon = mon->head_ ();	1921	mon = mon->head_ ();
1958		1922
1959	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1923	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1960	if (op->contr->weapon_sp_left > 0.f)	1924	if (op->contr->weapon_sp_left > 0.f)
…		…
1978	*/	1942	*/
1979	if (op->type == PLAYER	1943	if (op->type == PLAYER
1980	&& ((mon->owner && mon->owner->contr	1944	&& ((mon->owner && mon->owner->contr
1981	&& same_party (mon->owner->contr->party, op->contr->party))	1945	&& same_party (mon->owner->contr->party, op->contr->party))
1982	|| mon->owner == op)	1946	|| mon->owner == op)
1983	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1947	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1984	{	1948	{
1985	/* If we're braced, we don't want to switch places with it */	1949	/* If we're braced, we don't want to switch places with it */
1986	if (op->contr->braced)	1950	if (op->contr->braced)
1987	return false;	1951	return false;
1988		1952
…		…
1999	return true;	1963	return true;
2000	}	1964	}
2001	else	1965	else
2002	return false;	1966	return false;
2003	}	1967	}
		1968
		1969	bool on_battleground = op_on_battleground (op, 0, 0);
2004		1970
2005	/* in certain circumstances, you shouldn't attack friendly	1971	/* in certain circumstances, you shouldn't attack friendly
2006	* creatures. Note that if you are braced, you can't push	1972	* creatures. Note that if you are braced, you can't push
2007	* someone, but put it inside this loop so that you won't	1973	* someone, but put it inside this loop so that you won't
2008	* attack them either.	1974	* attack them either.
2009	*/	1975	*/
2010	if ((mon->type == PLAYER || mon->enemy != op)	1976	if ((mon->type == PLAYER || mon->enemy != op)
2011	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1977	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2012	&& ((op->contr->peaceful	1978	&& ((op->contr->peaceful
2013	|| (mon->type == PLAYER && mon->contr->peaceful))	1979	|| (mon->type == PLAYER && mon->contr->peaceful))
2014	&& !on_battleground))	1980	&& !on_battleground))
2015	{	1981	{
2016	if (op->speed_left > 0.f)	1982	if (op->speed_left > 0.f)
…		…
2032	}	1998	}
2033	}	1999	}
2034	/* If the object is a boulder or other rollable object, then	2000	/* If the object is a boulder or other rollable object, then
2035	* roll it if not braced. You can't roll it if you are braced.	2001	* roll it if not braced. You can't roll it if you are braced.
2036	*/	2002	*/
2037	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2003	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2038	{	2004	{
2039	if (op->speed_left > 0.f)	2005	if (op->speed_left > 0.f)
2040	{	2006	{
2041	--op->speed_left;	2007	--op->speed_left;
2042		2008
…		…
2051	* Way it works is like this: First, it must have some hit points	2017	* Way it works is like this: First, it must have some hit points
2052	* and be living. Then, it must be one of the following:	2018	* and be living. Then, it must be one of the following:
2053	* 1) Not a player, 2) A player, but of a different party. Note	2019	* 1) Not a player, 2) A player, but of a different party. Note
2054	* that party_number -1 is no party, so attacks can still happen.	2020	* that party_number -1 is no party, so attacks can still happen.
2055	*/	2021	*/
2056	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2022	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2057	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2023	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2058	{	2024	{
2059	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2025	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2060	{	2026	{
2061	--op->contr->weapon_sp_left;	2027	--op->contr->weapon_sp_left;
…		…
2073	}	2039	}
2074		2040
2075	bool	2041	bool
2076	move_player (object *op, int dir)	2042	move_player (object *op, int dir)
2077	{	2043	{
2078	int pick;
2079
2080	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2044	if (!op->map || op->map->state != MAP_ACTIVE)
2081	return 0;	2045	return 0;
2082		2046
2083	/* Sanity check: make sure dir is valid */	2047	/* Sanity check: make sure dir is valid */
2084	if ((dir < 0) || (dir >= 9))	2048	if (dir < 0 || dir > 8)
2085	{	2049	{
2086	LOG (llevError, "move_player: invalid direction %d\n", dir);	2050	LOG (llevError, "move_player: invalid direction %d\n", dir);
2087	return 0;	2051	return 0;
2088	}	2052	}
2089		2053
2090	/* peterm: added following line */	2054	/* peterm: added following line */
2091	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2055	if (op->flag [FLAG_CONFUSED] && dir)
2092	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2056	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2093		2057
2094	op->facing = dir;	2058	op->facing = dir;
2095		2059
2096	if (op->flag [FLAG_HIDDEN])	2060	if (op->flag [FLAG_HIDDEN])
2097	do_hidden_move (op);	2061	do_hidden_move (op);
2098		2062
2099	bool retval;	2063	bool retval;
		2064	int pick = 0;
2100		2065
2101	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2066	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2102	retval = RESULT_INT (0);	2067	retval = RESULT_INT (0);
2103	else if (op->contr->fire_on)	2068	else if (op->contr->fire_on)
2104	retval = fire (op, dir);	2069	retval = fire (op, dir);
…		…
2135	* players.	2100	* players.
2136	*/	2101	*/
2137	bool	2102	bool
2138	handle_newcs_player (object *op)	2103	handle_newcs_player (object *op)
2139	{	2104	{
2140	if (QUERY_FLAG (op, FLAG_SCARED))	2105	if (op->flag [FLAG_SCARED])
2141	{	2106	{
2142	if (op->speed_left > 0.f)	2107	if (op->speed_left > 0.f)
2143	{	2108	{
2144	--op->speed_left;	2109	--op->speed_left;
2145	flee_player (op);	2110	flee_player (op);
…		…
2161	return move_player (op, op->direction);	2126	return move_player (op, op->direction);
2162		2127
2163	return false;	2128	return false;
2164	}	2129	}
2165		2130
2166	int	2131	static int
2167	save_life (object *op)	2132	save_life (object *op)
2168	{	2133	{
2169	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2134	if (!op->flag [FLAG_LIFESAVE])
2170	return 0;	2135	return 0;
2171		2136
2172	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2137	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2173	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2138	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2174	{	2139	{
2175	op->play_sound (sound_find ("ob_evaporate"));	2140	op->play_sound (sound_find ("ob_evaporate"));
2176	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2141	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2177		2142
2178	tmp->destroy ();	2143	tmp->destroy ();
2179	CLEAR_FLAG (op, FLAG_LIFESAVE);	2144	op->clr_flag (FLAG_LIFESAVE);
2180		2145
2181	if (op->stats.hp < 0)	2146	if (op->stats.hp < 0)
2182	op->stats.hp = op->stats.maxhp;	2147	op->stats.hp = op->stats.maxhp;
2183		2148
2184	if (op->stats.food < 0)	2149	if (op->stats.food < 0)
2185	op->stats.food = 999;	2150	op->stats.food = MAX_FOOD;
2186		2151
2187	op->update_stats ();	2152	op->update_stats ();
2188	return 1;	2153	return 1;
2189	}	2154	}
2190		2155
2191	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2156	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2192	CLEAR_FLAG (op, FLAG_LIFESAVE);	2157	op->clr_flag (FLAG_LIFESAVE);
2193	enter_player_savebed (op); /* bring him home. */	2158	enter_player_savebed (op); /* bring him home. */
2194	return 0;	2159	return 0;
2195	}	2160	}
2196		2161
2197	/* This goes throws the inventory and removes unpaid objects, and puts them	2162	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2204	{	2169	{
2205	while (op)	2170	while (op)
2206	{	2171	{
2207	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2172	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2208		2173
2209	if (QUERY_FLAG (op, FLAG_UNPAID))	2174	if (op->flag [FLAG_UNPAID])
2210	op->insert_at (env);	2175	op->insert_at (env);
2211	else if (op->inv)	2176	else if (op->inv)
2212	drop_unpaid_items (op->inv, env);	2177	drop_unpaid_items (op->inv, env);
2213		2178
2214	op = next;	2179	op = next;
…		…
2220	{	2185	{
2221	if (!flag [FLAG_REMOVED])	2186	if (!flag [FLAG_REMOVED])
2222	::drop_unpaid_items (inv, this);	2187	::drop_unpaid_items (inv, this);
2223	}	2188	}
2224		2189
2225	/*
2226	* Returns pointer a static string containing gravestone text
2227	* Moved from apply.c to player.c - player.c is what
2228	* actually uses this function. player.c may not be quite the
2229	* best, a misc file for object actions is probably better,
2230	* but there isn't one in the server directory.
2231	*/
2232	const char *
2233	gravestone_text (object *op)
2234	{
2235	static dynbuf_text buf;
2236
2237	buf << "---- R.I.P. ----\n\n"
2238	<< op->name;
2239
2240	if (op->type == PLAYER)
2241	buf << " the " << op->contr->title;
2242
2243	buf << "\n\n";
2244
2245	buf << "who was level ";
2246	buf << (sint32)op->level << "\n\n" // OO breakdown
2247	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2248
2249	if (op->type == PLAYER)
2250	buf << "by " << op->contr->killer_name () << ".\n\n";
2251
2252	{
2253	static char buf2[128];
2254	time_t now = time (NULL);
2255	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2256	buf << buf2;
2257	}
2258
2259	return buf;
2260	}
2261
2262	void	2190	void
2263	do_some_living (object *op)	2191	do_some_living (object *op)
2264	{	2192	{
2265	int last_food = op->stats.food;	2193	int last_food = op->stats.food;
2266	int gen_hp, gen_sp, gen_grace;	2194	int gen_hp, gen_sp, gen_grace;
2267	int over_hp, over_sp, over_grace;
2268	int i;
2269	int rate_hp = 1200;	2195	int rate_hp = 1200;
2270	int rate_sp = 2500;	2196	int rate_sp = 2500;
2271	int rate_grace = 2000;	2197	int rate_grace = 2000;
2272	const int max_hp = 1;	2198	const int max_hp = 1;
2273	const int max_sp = 1;	2199	const int max_sp = 1;
2274	const int max_grace = 1;	2200	const int max_grace = 1;
2275		2201
		2202	#if 0
2276	if (op->contr->hidden)	2203	if (op->contr->hidden)
2277	{	2204	{
2278	op->invisible = 1000;	2205	op->invisible = 1000;
2279	/* the socket code flashes the player visible/invisible	2206	/* the socket code flashes the player visible/invisible
2280	* depending on the value of invisible, so we need to	2207	* depending on the value of invisible, so we need to
2281	* alternate it here for it to work correctly.	2208	* alternate it here for it to work correctly.
2282	*/	2209	*/
2283	if (pticks & 2)	2210	if (server_tick & 2)
2284	op->invisible--;	2211	op->invisible--;
2285	}	2212	}
		2213	else
		2214	#endif
2286	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2215	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2287	{	2216	{
2288	if (!op->invisible--)	2217	if (!op->invisible--)
2289	{	2218	{
2290	make_visible (op);	2219	make_visible (op);
2291	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2220	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2325	if (--op->last_grace < 0)	2254	if (--op->last_grace < 0)
2326	{	2255	{
2327	if (op->stats.grace < op->stats.maxgrace / 2)	2256	if (op->stats.grace < op->stats.maxgrace / 2)
2328	op->stats.grace++; /* no penalty in food for regaining grace */	2257	op->stats.grace++; /* no penalty in food for regaining grace */
2329		2258
		2259	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2260
2330	if (max_grace > 1)	2261	if (max_grace > 1)
2331	{	2262	{
2332	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2263	int over_grace = temp / rate_grace;
		2264
2333	if (over_grace > 0)	2265	if (over_grace > 0)
2334	{	2266	{
2335	op->stats.sp += over_grace	2267	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2336	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2337	op->last_grace = 0;	2268	op->last_grace = 0;
2338	}	2269	}
2339	else	2270	else
2340	{	2271	op->last_grace = rate_grace / temp;
2341	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2342	}
2343	}	2272	}
2344	else	2273	else
2345	{	2274	op->last_grace = rate_grace / temp;
2346	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2275
2347	}
2348	/* wearing stuff doesn't detract from grace generation. */	2276	/* wearing stuff doesn't detract from grace generation. */
2349	}	2277	}
2350		2278
2351	if (op->stats.food > 0)	2279	if (op->stats.food > 0)
2352	{	2280	{
…		…
2358	if (op->stats.sp < op->stats.maxsp)	2286	if (op->stats.sp < op->stats.maxsp)
2359	{	2287	{
2360	op->stats.sp++;	2288	op->stats.sp++;
2361		2289
2362	/* dms do not consume food */	2290	/* dms do not consume food */
2363	if (!QUERY_FLAG (op, FLAG_WIZ))	2291	if (!op->flag [FLAG_WIZ])
2364	{	2292	{
2365	op->stats.food--;	2293	op->stats.food--;
2366		2294
2367	if (op->contr->digestion < 0)	2295	if (op->contr->digestion < 0)
2368	op->stats.food += op->contr->digestion;	2296	op->stats.food += op->contr->digestion;
…		…
2371	}	2299	}
2372	}	2300	}
2373		2301
2374	if (max_sp > 1)	2302	if (max_sp > 1)
2375	{	2303	{
2376	over_sp = (gen_sp + 10) / rate_sp;	2304	int over_sp = (gen_sp + 10) / rate_sp;
2377	if (over_sp > 0)	2305	if (over_sp > 0)
2378	{	2306	{
2379	if (op->stats.sp < op->stats.maxsp)	2307	if (op->stats.sp < op->stats.maxsp)
2380	{	2308	{
2381	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2309	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2402	if (op->stats.hp < op->stats.maxhp)	2330	if (op->stats.hp < op->stats.maxhp)
2403	{	2331	{
2404	op->stats.hp++;	2332	op->stats.hp++;
2405		2333
2406	/* dms do not consume food */	2334	/* dms do not consume food */
2407	if (!QUERY_FLAG (op, FLAG_WIZ))	2335	if (!op->flag [FLAG_WIZ])
2408	{	2336	{
2409	op->stats.food--;	2337	op->stats.food--;
2410		2338
2411	if (op->contr->digestion < 0)	2339	if (op->contr->digestion < 0)
2412	op->stats.food += op->contr->digestion;	2340	op->stats.food += op->contr->digestion;
2413	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2341	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2414	op->stats.food = last_food;	2342	op->stats.food = last_food;
2415	}	2343	}
2416	}	2344	}
2417		2345
		2346	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2347
2418	if (max_hp > 1)	2348	if (max_hp > 1)
2419	{	2349	{
2420	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2350	int over_hp = temp / rate_hp;
2421		2351
2422	if (over_hp > 0)	2352	if (over_hp > 0)
2423	{	2353	{
2424	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2354	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2425	op->last_heal = 0;	2355	op->last_heal = 0;
2426	}	2356	}
2427	else	2357	else
2428	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2358	op->last_heal = rate_hp / temp;
2429	}	2359	}
2430	else	2360	else
2431	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2361	op->last_heal = rate_hp / temp;
2432	}	2362	}
2433	}	2363	}
2434		2364
2435	/* Digestion */	2365	/* Digestion */
2436	if (--op->last_eat < 0)	2366	if (--op->last_eat < 0)
…		…
2439	penalty = max (0, -op->contr->digestion);	2369	penalty = max (0, -op->contr->digestion);
2440		2370
2441	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2371	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2442		2372
2443	/* dms do not consume food */	2373	/* dms do not consume food */
2444	if (!QUERY_FLAG (op, FLAG_WIZ))	2374	if (!op->flag [FLAG_WIZ])
2445	op->stats.food--;	2375	op->stats.food--;
2446	}	2376	}
2447		2377
2448	if (op->stats.food < 0 && op->stats.hp >= 0)	2378	if (op->stats.food < 0 && op->stats.hp >= 0)
2449	{	2379	{
2450	object *flesh = 0;	2380	object *flesh = 0;
2451		2381
2452	for_inv_removable (op, tmp)	2382	for_inv_removable (op, tmp)
2453	{	2383	{
2454	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2384	if (tmp->flag [FLAG_UNPAID])
2455	continue;	2385	continue;
2456		2386
2457	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2387	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2458	{	2388	{
2459	op->statusmsg ("You blindly grab for a bite of food. "	2389	op->statusmsg ("You blindly grab for a bite of food. "
2460	"H<To prevent you from starving, you ate some random item from your backpack.>");	2390	"H<To prevent you from starving, you ate some random item from your backpack.>");
2461	manual_apply (op, tmp, 0);	2391	op->apply (tmp);
2462		2392
2463	if (op->stats.food >= 0 || op->stats.hp < 0)	2393	if (op->stats.food >= 0 || op->stats.hp < 0)
2464	break;	2394	break;
2465	}	2395	}
2466	else if (tmp->type == FLESH)	2396	else if (tmp->type == FLESH)
…		…
2472	*/	2402	*/
2473	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2403	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2474	{	2404	{
2475	op->statusmsg ("You blindly grab for a bite of food. "	2405	op->statusmsg ("You blindly grab for a bite of food. "
2476	"H<To prevent you from starving, you ate some random item from your backpack.>");	2406	"H<To prevent you from starving, you ate some random item from your backpack.>");
2477	manual_apply (op, flesh, 0);	2407	op->apply (flesh);
2478	}	2408	}
2479		2409
2480	// If player is still starving, alert him!	2410	// If player is still starving, alert him!
2481	if (op->stats.food < 0)	2411	if (op->stats.food < 0)
2482	op->failmsg ("You are starving! "	2412	op->failmsg ("You are starving! "
…		…
2494	op->contr->killer->destroy ();	2424	op->contr->killer->destroy ();
2495	}	2425	}
2496	}	2426	}
2497		2427
2498	/* killer should be set here already */	2428	/* killer should be set here already */
2499	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2429	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2500	kill_player (op);	2430	kill_player (op);
2501	}	2431	}
2502	}	2432	}
2503		2433
2504	/* If the player should die (lack of hp, food, etc), we call this.	2434	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2519	return;	2449	return;
2520		2450
2521	dynbuf_text deathtab;	2451	dynbuf_text deathtab;
2522		2452
2523	/* restore player */	2453	/* restore player */
2524	at = archetype::find ("poisoning");	2454	at = archetype::find (shstr_poisoning);
2525	if (object *tmp = present_arch_in_ob (at, op))	2455	if (object *tmp = present_arch_in_ob (at, op))
2526	{	2456	{
2527	tmp->destroy ();	2457	tmp->destroy ();
2528	deathtab << "Your body feels cleansed...\r";	2458	deathtab << "Your body feels cleansed...\r";
2529	}	2459	}
2530		2460
2531	at = archetype::find ("confusion");	2461	at = archetype::find (shstr_confusion);
2532	if (object *tmp = present_arch_in_ob (at, op))	2462	if (object *tmp = present_arch_in_ob (at, op))
2533	{	2463	{
2534	tmp->destroy ();	2464	tmp->destroy ();
2535	deathtab << "Your mind feels clearer...\r";	2465	deathtab << "Your mind feels clearer...\r";
2536	}	2466	}
…		…
2538	cure_disease (op, 0, 0); /* remove any disease */	2468	cure_disease (op, 0, 0); /* remove any disease */
2539		2469
2540	max_it (op->stats.hp , op->stats.maxhp);	2470	max_it (op->stats.hp , op->stats.maxhp);
2541	max_it (op->stats.sp , op->stats.maxsp);	2471	max_it (op->stats.sp , op->stats.maxsp);
2542	max_it (op->stats.grace, op->stats.maxgrace);	2472	max_it (op->stats.grace, op->stats.maxgrace);
2543
2544	if (op->stats.food <= 0)	2473	max_it (op->stats.food , 200);
2545	op->stats.food = 999;
2546		2474
2547	// remove all spell effects that are active	2475	// remove all spell effects that are active
2548	// to avoid long-term effects such as word-of-recall	2476	// to avoid long-term effects such as word-of-recall
2549	for (object *item = op->inv; item; )	2477	for (object *item = op->inv; item; )
2550	{	2478	{
…		…
2563	if (op_on_battleground (op, &x, &y))	2491	if (op_on_battleground (op, &x, &y))
2564	{	2492	{
2565	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2493	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2566		2494
2567	/* create a bodypart-trophy to make the winner happy */	2495	/* create a bodypart-trophy to make the winner happy */
2568	if (object *tmp = arch_to_object (archetype::find ("finger")))	2496	object *tmp = archetype::find (shstr_finger)->instance ();
2569	{	2497
2570	tmp->name = format ("%s's finger" , &op->name);	2498	tmp->name = format ("%s's finger" , &op->name);
2571	tmp->name_pl = format ("%s's fingers", &op->name);	2499	tmp->name_pl = format ("%s's fingers", &op->name);
2572	tmp->msg = format (	2500	tmp->msg = format (
2573	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2501	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2574	&op->name, op->contr->title,	2502	&op->name, op->contr->title,
2575	(int)op->level,	2503	(int)op->level,
2576	op->contr->killer_name ()	2504	op->contr->killer_name ()
2577	);	2505	);
2578	tmp->value = 0, tmp->type = 0;	2506	tmp->value = 0, tmp->type = 0;
2579	tmp->materialname = "organics";	2507	tmp->material = name_to_material (shstr_organic);
2580	tmp->insert_at (op, tmp);	2508	tmp->insert_at (op, tmp);
2581	}
2582		2509
2583	/* teleport defeated player to new destination */	2510	/* teleport defeated player to new destination */
2584	transfer_ob (op, x, y, 0, NULL);	2511	transfer_ob (op, x, y, 0, NULL);
2585	op->contr->braced = 0;	2512	op->contr->braced = 0;
2586		2513
…		…
2648	lost_a_stat = 1;	2575	lost_a_stat = 1;
2649	}	2576	}
2650	else	2577	else
2651	{	2578	{
2652	/* deplete a stat */	2579	/* deplete a stat */
2653	archetype *deparch = archetype::find ("depletion");	2580	archetype *deparch = archetype::find (shstr_depletion);
2654	object *dep;	2581	object *dep;
2655		2582
2656	dep = present_arch_in_ob (deparch, op);	2583	dep = present_arch_in_ob (deparch, op);
2657	if (!dep)	2584	if (!dep)
2658	{	2585	{
2659	dep = arch_to_object (deparch);	2586	dep = deparch->instance ();
2660	insert_ob_in_ob (dep, op);	2587	insert_ob_in_ob (dep, op);
2661	}	2588	}
2662	lose_this_stat = 1;	2589	lose_this_stat = 1;
2663	if (settings.balanced_stat_loss)	2590	if (settings.balanced_stat_loss)
2664	{	2591	{
…		…
2676		2603
2677	/* There is a maximum depletion total per level. */	2604	/* There is a maximum depletion total per level. */
2678	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)	2605	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
2679	{	2606	{
2680	lose_this_stat = 0;	2607	lose_this_stat = 0;
2681	/* Take loss chance vs keep chance to see if we	2608	/* Take loss chance vs keep chance to see if we
2682	retain the stat. */	2609	retain the stat. */
2683	}	2610	}
2684	else	2611	else
2685	{	2612	{
2686	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)	2613	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
…		…
2702	* difference.	2629	* difference.
2703	*/	2630	*/
2704	if (this_stat >= -50)	2631	if (this_stat >= -50)
2705	{	2632	{
2706	change_attr_value (&(dep->stats), i, -1);	2633	change_attr_value (&(dep->stats), i, -1);
2707	SET_FLAG (dep, FLAG_APPLIED);	2634	dep->set_flag (FLAG_APPLIED);
2708	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2635	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2709	op->update_stats ();	2636	op->update_stats ();
2710	lost_a_stat = 1;	2637	lost_a_stat = 1;
2711	}	2638	}
2712	}	2639	}
…		…
2730	#endif	2657	#endif
2731		2658
2732	/* Put a gravestone up where the character 'almost' died. List the	2659	/* Put a gravestone up where the character 'almost' died. List the
2733	* exp loss on the stone.	2660	* exp loss on the stone.
2734	*/	2661	*/
2735	tmp = arch_to_object (archetype::find ("gravestone"));	2662	tmp = archetype::find (shstr_gravestone)->instance ();
2736	tmp->name = format ("%s's gravestone", &op->name);	2663	tmp->name = format ("%s's gravestone", &op->name);
2737	tmp->name_pl = format ("%s's gravestones", &op->name);	2664	tmp->name_pl = format ("%s's gravestones", &op->name);
2738	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2665	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2739	&op->name, op->contr->title, op->contr->killer_name ());	2666	&op->name, op->contr->title, op->contr->killer_name ());
2740	tmp->x = op->x, tmp->y = op->y;	2667	tmp->x = op->x, tmp->y = op->y;
…		…
2779	if (will_kill_again)	2706	if (will_kill_again)
2780	{	2707	{
2781	object *force;	2708	object *force;
2782	int at;	2709	int at;
2783		2710
2784	force = get_archetype (FORCE_NAME);	2711	force = archetype::get (FORCE_NAME);
2785	/* 50 ticks should be enough time for the spell to abate */	2712	/* 50 ticks should be enough time for the spell to abate */
2786	force->speed = 0.1f;
2787	force->speed_left = -5.f;	2713	force->speed_left = -5.f;
2788	SET_FLAG (force, FLAG_APPLIED);	2714	force->set_speed (0.1f);
		2715	force->set_flag (FLAG_APPLIED);
		2716
2789	for (at = 0; at < NROFATTACKS; at++)	2717	for (at = 0; at < NROFATTACKS; at++)
2790	if (will_kill_again & (1 << at))	2718	if (will_kill_again & (1 << at))
2791	force->resist[at] = 100;	2719	force->resist[at] = 100;
2792		2720
2793	insert_ob_in_ob (force, op);	2721	insert_ob_in_ob (force, op);
…		…
2795	}	2723	}
2796		2724
2797	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2725	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2798	}	2726	}
2799		2727
2800	void	2728	static void
2801	loot_object (object *op)	2729	loot_object (object *op)
2802	{ /* Grab and destroy some treasure */	2730	{ /* Grab and destroy some treasure */
2803	object *tmp, *tmp2, *next;	2731	object *tmp, *next;
2804		2732
2805	op->close_container (); /* close open sack first */	2733	op->close_container (); /* close open sack first */
2806		2734
2807	for (tmp = op->inv; tmp; tmp = next)	2735	for (tmp = op->inv; tmp; tmp = next)
2808	{	2736	{
…		…
2815	tmp->x = op->x, tmp->y = op->y;	2743	tmp->x = op->x, tmp->y = op->y;
2816		2744
2817	if (tmp->type == CONTAINER)	2745	if (tmp->type == CONTAINER)
2818	loot_object (tmp); /* empty container to ground */	2746	loot_object (tmp); /* empty container to ground */
2819		2747
2820	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2748	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2821	{	2749	{
2822	if (tmp->nrof > 1)	2750	if (tmp->nrof > 1)
2823	{	2751	{
2824	tmp->decrease (rndm (1, tmp->nrof - 1));	2752	tmp->decrease (rndm (1, tmp->nrof - 1));
2825	insert_ob_in_map (tmp, op->map, NULL, 0);	2753	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2836	* fix_weight(): Check recursively the weight of all players, and fix	2764	* fix_weight(): Check recursively the weight of all players, and fix
2837	* what needs to be fixed. Refresh windows and fix speed if anything	2765	* what needs to be fixed. Refresh windows and fix speed if anything
2838	* was changed.	2766	* was changed.
2839	*/	2767	*/
2840	void	2768	void
2841	fix_weight (void)	2769	fix_weight ()
2842	{	2770	{
2843	for_all_players (pl)	2771	for_all_players (pl)
2844	{	2772	{
2845	sint32 old = pl->ob->carrying;	2773	weight_t old = pl->ob->carrying;
2846		2774
2847	pl->ob->update_weight ();	2775	pl->ob->update_weight ();
2848		2776
2849	if (old != pl->ob->carrying)	2777	if (old != pl->ob->carrying)
2850	{	2778	{
…		…
2853	}	2781	}
2854	}	2782	}
2855	}	2783	}
2856		2784
2857	void	2785	void
2858	fix_luck (void)	2786	fix_luck ()
2859	{	2787	{
2860	for_all_players (pl)	2788	for_all_players (pl)
2861	if (!pl->ob->contr->ns->state)	2789	if (!pl->ob->contr->ns->state)
2862	pl->ob->change_luck (0);	2790	pl->ob->change_luck (0);
2863	}	2791	}
…		…
2915	}	2843	}
2916		2844
2917	int	2845	int
2918	is_true_undead (object *op)	2846	is_true_undead (object *op)
2919	{	2847	{
2920	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2848	if (op->arch->flag [FLAG_UNDEAD])
2921	return 1;	2849	return 1;
2922		2850
2923	return 0;	2851	return 0;
2924	}	2852	}
2925		2853
…		…
2946	level = -(10 + (2 * ob->map->darklevel ()));	2874	level = -(10 + (2 * ob->map->darklevel ()));
2947		2875
2948	/* scan through all nearby squares for terrain to hide in */	2876	/* scan through all nearby squares for terrain to hide in */
2949	for (i = 0, x = ob->x, y = ob->y;	2877	for (i = 0, x = ob->x, y = ob->y;
2950	i <= SIZEOFFREE1;	2878	i <= SIZEOFFREE1;
2951	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2879	i++, x = ob->x + DIRX (i), y = ob->y + DIRY (i))
2952	{	2880	{
2953	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2881	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
2954	if (mflag & P_OUT_OF_MAP)	2882	if (mflag & P_OUT_OF_MAP)
2955	continue;	2883	continue;
2956		2884
…		…
3023		2951
3024	if (who->type == PLAYER)	2952	if (who->type == PLAYER)
3025	player = 1;	2953	player = 1;
3026		2954
3027	else	2955	else
3028	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2956	friendly = who->flag [FLAG_FRIENDLY];
3029		2957
3030	/* search adjacent squares */	2958	/* search adjacent squares */
3031	for (i = 1; i < 9; i++)	2959	for (i = 1; i < 9; i++)
3032	{	2960	{
3033	x = who->x + freearr_x[i];	2961	x = who->x + DIRX (i);
3034	y = who->y + freearr_y[i];	2962	y = who->y + DIRY (i);
3035	m = who->map;	2963	m = who->map;
3036	mflags = get_map_flags (m, &m, x, y, &x, &y);	2964	mflags = get_map_flags (m, &m, x, y, &x, &y);
3037	/* space must be blocked if there is a monster. If not	2965	/* space must be blocked if there is a monster. If not
3038	* blocked, don't need to check this space.	2966	* blocked, don't need to check this space.
3039	*/	2967	*/
…		…
3042	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2970	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3043	continue;	2971	continue;
3044		2972
3045	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2973	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3046	{	2974	{
3047	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2975	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3048	return 1;	2976	return 1;
3049	else if (tmp->type == PLAYER)	2977	else if (tmp->type == PLAYER)
3050	{
3051	/*don't let a hidden DM prevent you from hiding */
3052	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3053	return 1;	2978	return 1;
3054	}
3055	}	2979	}
3056	}	2980	}
3057	return 0;	2981	return 0;
3058	}	2982	}
3059		2983
3060	/* check the player los field for viewability of the	2984	/* check the player los field for viewability of the
3061	* object op. This function works fine for monsters,	2985	* object op. This function works fine for monsters,
3062	* but we dont worry if the object isnt the top one in	2986	* but we dont worry if the object isnt the top one in
3063	* a pile (say a coin under a table would return "viewable"	2987	* a pile (say a coin under a table would return "viewable"
3064	* by this routine). Another question, should we be	2988	* by this routine). Another question, should we be
3065	* concerned with the direction the player is looking	2989	* concerned with the direction the player is looking
3066	* in? Realistically, most of us can't see stuff behind	2990	* in? Realistically, most of us can't see stuff behind
3067	* our backs...on the other hand, does the "facing" direction	2991	* our backs...on the other hand, does the "facing" direction
3068	* imply the way your head, or body is facing? It's possible	2992	* imply the way your head, or body is facing? It's possible
3069	* for them to differ. Sigh, this fctn could get a bit more complex.	2993	* for them to differ. Sigh, this fctn could get a bit more complex.
3070	* -b.t.	2994	* -b.t.
3071	* This function is now map tiling safe.	2995	* This function is now map tiling safe.
3072	*/	2996	*/
3073	int	2997	int
3074	player_can_view (object *pl, object *op)	2998	player_can_view (object *pl, object *op)
3075	{	2999	{
…		…
3089		3013
3090	get_rangevector (pl, op, &rv, 0x1);	3014	get_rangevector (pl, op, &rv, 0x1);
3091		3015
3092	/* starting with the 'head' part, lets loop	3016	/* starting with the 'head' part, lets loop
3093	* through the object and find if it has any	3017	* through the object and find if it has any
3094	* part that is in the los array but isn't on	3018	* part that is in the los array but isn't on
3095	* a blocked los square.	3019	* a blocked los square.
3096	* we use the archetype to figure out offsets.	3020	* we use the archetype to figure out offsets.
3097	*/	3021	*/
3098	while (op)	3022	while (op)
3099	{	3023	{
…		…
3102		3026
3103	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)	3027	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3104	return 1;	3028	return 1;
3105		3029
3106	op = op->more;	3030	op = op->more;
3107	}
3108
3109	return 0;
3110	}
3111
3112	/* routine for both players and monsters. We call this when
3113	* there is a possibility for our action distrubing our hiding
3114	* place or invisiblity spell. Artefact invisiblity causes
3115	* "noise" instead. If we arent invisible to begin with, we
3116	* return 0.
3117	*/
3118	int
3119	action_makes_visible (object *op)
3120	{
3121	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3122	{
3123	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3124	{
3125	// artefact invisibility is permanent, but we still make noise
3126	// this is important for game-balance.
3127	if (op->contr)
3128	op->make_noise ();
3129
3130	return 0;
3131	}
3132
3133	if (op->contr && op->contr->tmp_invis == 0)
3134	return 0;
3135
3136	/* If monsters, they should become visible */
3137	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3138	{
3139	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3140	return 1;
3141	}
3142	}	3031	}
3143		3032
3144	return 0;	3033	return 0;
3145	}	3034	}
3146		3035
…		…
3161	* and the exit-coordinates sp/hp must both be > 0.	3050	* and the exit-coordinates sp/hp must both be > 0.
3162	* => The intention here is to prevent abuse of the battleground-	3051	* => The intention here is to prevent abuse of the battleground-
3163	* feature (like pickable or hidden battleground tiles). */	3052	* feature (like pickable or hidden battleground tiles). */
3164	for (object *tmp = op->below; tmp; tmp = tmp->below)	3053	for (object *tmp = op->below; tmp; tmp = tmp->below)
3165	{	3054	{
3166	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3055	if (tmp->flag [FLAG_IS_FLOOR])
3167	{	3056	{
3168	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3057	if (tmp->flag [FLAG_NO_PICK]
3169	&& tmp->type == BATTLEGROUND	3058	&& tmp->type == BATTLEGROUND
3170	&& tmp->name == shstr_battleground	3059	&& tmp->name == shstr_battleground
3171	&& EXIT_X (tmp) && EXIT_Y (tmp))	3060	&& EXIT_X (tmp) && EXIT_Y (tmp))
3172	{	3061	{
3173	/* before we assign the exit, check if this is a teambattle */	3062	/* before we assign the exit, check if this is a teambattle */
3174	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3063	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3175	{
3176	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3064	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3065	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3177	{	3066	{
3178	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3179	{
3180	if (x && y)	3067	if (x && y)
3181	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3068	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3182		3069
3183	return 1;	3070	return 1;
3184	}
3185	}	3071	}
3186	}
3187		3072
3188	if (x && y)	3073	if (x && y)
3189	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3074	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3190		3075
3191	return 1;	3076	return 1;
…		…
3329	else	3214	else
3330	j = 1;	3215	j = 1;
3331	strcat (buf, spellpathnames[i]);	3216	strcat (buf, spellpathnames[i]);
3332	}	3217	}
3333	}	3218	}
		3219
3334	strcat (buf, ".");	3220	strcat (buf, ".");
3335	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3221	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3336	}	3222	}
3337		3223
3338	/* evtl. adding flags: */	3224	/* evtl. adding flags: */
3339	if (QUERY_FLAG (item, FLAG_XRAYS))	3225	if (item->flag [FLAG_XRAYS])
3340	SET_FLAG (skin, FLAG_XRAYS);	3226	skin->set_flag (FLAG_XRAYS);
3341	if (QUERY_FLAG (item, FLAG_STEALTH))	3227	if (item->flag [FLAG_STEALTH])
3342	SET_FLAG (skin, FLAG_STEALTH);	3228	skin->set_flag (FLAG_STEALTH);
3343	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3229	if (item->flag [FLAG_SEE_IN_DARK])
3344	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3230	skin->set_flag (FLAG_SEE_IN_DARK);
3345		3231
3346	/* print message if there is one */	3232	/* print message if there is one */
3347	if (item->msg != NULL)	3233	if (item->msg != NULL)
3348	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3234	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3349	}	3235	}
3350	else	3236	else
3351	{	3237	{
3352	/* generate misc. treasure */	3238	/* generate misc. treasure */
3353	tmp = arch_to_object (tr->item);	3239	tmp = tr->item->instance ();
3354	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3240	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3355	who->insert (tmp);	3241	who->insert (tmp);
3356	}	3242	}
3357	}	3243	}
3358		3244
3359	/**	3245	//-GPL
3360	* Unready an object for a player. This function does nothing if the object was
3361	* not readied.
3362	*/
3363	void
3364	player_unready_range_ob (player *pl, object *ob)
3365	{
3366	if (pl->ob->current_weapon == ob)
3367	pl->ob->current_weapon = 0;
3368
3369	if (pl->combat_ob == ob)
3370	pl->combat_ob = 0;
3371
3372	if (pl->ranged_ob == ob)
3373	pl->ranged_ob = 0;
3374	}
3375		3246
3376	sint8	3247	sint8
3377	player::darkness_at (maptile *map, int x, int y) const	3248	player::darkness_at (maptile *map, int x, int y) const
3378	{	3249	{
3379	if (!ns)	3250	if (!ns)
…		…
3406	{	3277	{
3407	play_sound (sound_find ("generic_failure"));	3278	play_sound (sound_find ("generic_failure"));
3408	statusmsg (msg, color);	3279	statusmsg (msg, color);
3409	}	3280	}
3410		3281
		3282	void
		3283	object::failmsgf (const char *format, ...)
		3284	{
		3285	if (!contr)
		3286	return;
		3287
		3288	va_list ap;
		3289	va_start (ap, format);
		3290	contr->failmsg (vformat (format, ap));
		3291	va_end (ap);
		3292	}
		3293
		3294	void
		3295	player::failmsgf (const char *format, ...)
		3296	{
		3297	va_list ap;
		3298	va_start (ap, format);
		3299	failmsg (vformat (format, ap));
		3300	va_end (ap);
		3301	}
		3302

Diff Legend

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