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

Diff Legend

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