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.230 by root, Sat Jun 27 08:25:36 2009 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 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.
…		…
364	disconnect ();	233	disconnect ();
365		234
366	attachable::do_destroy ();	235	attachable::do_destroy ();
367		236
368	if (ob)	237	if (ob)
369	{
370	ob->destroy_inv (false);
371	ob->destroy ();	238	ob->destroy ();
372	}
373		239
374	ob = observe = 0;	240	ob = observe = viewpoint = 0;
375	}	241	}
376		242
377	player::~player ()	243	player::~player ()
378	{	244	{
379	/* Clear item stack */	245	/* Clear item stack */
380	free (stack_items);	246	free (stack_items);
		247	}
		248
		249	/*
		250	* get_player_archetype() return next player archetype from archetype
		251	* list. Not very efficient routine, but used only creating new players.
		252	* Note: there MUST be at least one player archetype!
		253	*/
		254	static archetype *
		255	get_player_archetype (archetype *at)
		256	{
		257	// archetypes could have been reloaded
		258	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		259
		260	if (!nat)
		261	return at;
		262
		263	archvec::iterator i = archetypes.find (nat);
		264
		265	for (;;)
		266	{
		267	if (++i == archetypes.end ())
		268	i = archetypes.begin ();
		269	else if (*i == at)
		270	cleanup ("not a single player archetype found");
		271
		272	if ((*i)->type == PLAYER)
		273	return *i;
		274	}
381	}	275	}
382		276
383	/* Tries to add player on the connection passed in ns.	277	/* 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	278	* All we can really get in this is some settings like host and display
385	* mode.	279	* mode.
…		…
387	player *	281	player *
388	player::create ()	282	player::create ()
389	{	283	{
390	player *pl = new player;	284	player *pl = new player;
391		285
392	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
393		287
394	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
397		291
398	set_first_map (pl->ob);	292	set_first_map (pl->ob);
399		293
400	return pl;	294	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	}	295	}
430		296
431	object *	297	object *
432	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
433	{	299	{
…		…
507	*/	373	*/
508	int	374	int
509	path_to_player (object *mon, object *pl, unsigned mindiff)	375	path_to_player (object *mon, object *pl, unsigned mindiff)
510	{	376	{
511	rv_vector rv;	377	rv_vector rv;
512	sint16 x, y;
513	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	378	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
514	maptile *m, *lastmap;
515		379
516	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
517		381
518	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
519	return 0;	383	return 0;
520		384
521	x = mon->x;	385	mapxy pos (mon);
522	y = mon->y;
523	m = mon->map;
524	dir = rv.direction;	386	dir = rv.direction;
525	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	387	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
526	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527		389
528	/* If we can't solve it within the search distance, return now. */	390	/* If we can't solve it within the search distance, return now. */
529	if (diff > max)	391	if (diff > max)
530	return 0;	392	return 0;
531		393
532	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
533	{	395	{
534	lastx = x;	396	mapxy lastpos = pos;
535	lasty = y;
536	lastmap = m;
537	x = lastx + freearr_x[dir];
538	y = lasty + freearr_y[dir];
539		397
540	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
541	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
542		399
543	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
544	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
545	&& (m == mon->map && blocked_link (mon, m, x, y))))	402	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		403	&& blocked_link (mon, pos.m, pos.x, pos.y)))
546	{	404	{
547	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
548	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
549	*/	407	*/
550	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
551	if (rv.direction != dir)	409	if (rv.direction != dir)
552	{	410	{
553	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
554	* the values so it will try again.	412	* the values so it will try again.
555	*/	413	*/
556	x = lastx;
557	y = lasty;
558	m = lastmap;	414	pos = lastpos;
559	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
560	}	416	}
561	else	417	else
562	{	418	{
563	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
570	*/	426	*/
571	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
572	{	428	{
573	if (i == 0)	429	if (i == 0)
574	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
575	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
576	* since the direction that the creature should move in	433	* since the direction that the creature should move in
577	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
578	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
579	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
581	* can't do that, but now finds it can move east, and	438	* can't do that, but now finds it can move east, and
582	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
583	* the last direction the creature has successfully	440	* the last direction the creature has successfully
584	* moved.	441	* moved.
585	*/	442	*/
586
587	x = lastx + freearr_x[absdir (lastdir + i)];
588	y = lasty + freearr_y[absdir (lastdir + i)];
589	m = lastmap;	443	pos = lastpos;
590	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
591	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
592	continue;	447	continue;
593	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
594	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
595	continue;	452	continue;
596	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
597	continue;	455	continue;
598		456
599	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
600	break;	458	break;
601	}	459	}
		460
602	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
603	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
604	*/	463	*/
605	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
606	return 0;	465	return 0;
		466
607	diff--;	467	diff--;
608	lastdir = dir;	468	lastdir = dir;
609	max--;	469	max--;
610	if (!firstdir)	470	if (!firstdir)
611	firstdir = dir + i;	471	firstdir = dir + i;
…		…
615	{	475	{
616	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
617	diff--;	477	diff--;
618	max--;	478	max--;
619	lastdir = dir;	479	lastdir = dir;
		480
620	if (!firstdir)	481	if (!firstdir)
621	firstdir = dir;	482	firstdir = dir;
622	}	483	}
623		484
624	if (diff <= 1)	485	if (diff <= 1)
625	{	486	{
626	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
627	* headed toward player for entire distance.	488	* headed toward player for entire distance.
628	*/	489	*/
629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
630	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
631	}	492	}
632		493
633	if (diff > max)	494	if (diff > max)
634	return 0;	495	return 0;
…		…
652	next = op->below;	513	next = op->below;
653		514
654	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
655	* flag "neutral" set. Sorry but I can't think of a better way	516	* flag "neutral" set. Sorry but I can't think of a better way
656	*/	517	*/
657	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
658	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
659		520
660	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
661	* by this player due to race restrictions	522	* by this player due to race restrictions
662	*/	523	*/
663	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
664	{	525	{
665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	526	if ((!pl->flag [FLAG_USE_ARMOUR]
666	&&	527	&&
667	(op->type == ARMOUR || op->type == BOOTS	528	(op->type == ARMOUR || op->type == BOOTS
668	|| op->type == CLOAK || op->type == HELMET	529	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	530	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	531	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	532	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
672	{	533	{
673	op->destroy ();	534	op->destroy ();
674	continue;	535	continue;
675	}	536	}
676	}	537	}
677		538
678	/* Here we remove duplicated skills (as duplicated spell objects have	539	/* Here we remove duplicated skills (as duplicated spell objects have
679	* _very_ confusing effects for players), which could for instance be	540	* _very_ confusing effects for players), which could for instance be
680	* generated by bad treasurelists. - elmex	541	* generated by multiple treasurelists specifying the same skills.
681	*/	542	*/
682	if (op->type == SKILL)	543	if (op->type == SKILL)
683	{	544	{
684	for (object *tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
685	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
686	{	547	{
687	op->destroy ();	548	op->destroy ();
688	LOG (llevError,
689	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
690	break;	549	break;
691	}	550	}
692		551
693	if (op->nrof > 1)	552	if (op->nrof > 1)
694	op->nrof = 1;	553	op->nrof = 1;
695	}	554	}
696		555
697	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
698	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	557	op->inv->clr_flag (FLAG_STARTEQUIP);
699		558
700	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
701	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
702	* merged properly.	561	* merged properly.
703	*/	562	*/
704	if (need_identify (op))	563	if (op->need_identify ())
705	{	564	{
706	SET_FLAG (op, FLAG_IDENTIFIED);	565	op->set_flag (FLAG_IDENTIFIED);
707	CLEAR_FLAG (op, FLAG_CURSED);	566	op->clr_flag (FLAG_CURSED);
708	CLEAR_FLAG (op, FLAG_DAMNED);	567	op->clr_flag (FLAG_DAMNED);
709	}	568	}
710		569
711	if (op->type == SPELL)	570	if (op->type == SPELL)
712	{	571	{
713	op->destroy ();	572	op->destroy ();
714	continue;	573	continue;
715	}	574	}
716	else if (op->type == SKILL)	575	else if (op->type == SKILL)
717	{	576	{
718	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
719	op->stats.exp = 0;	578	op->stats.exp = 0;
720	op->level = 1;	579	op->level = 1;
721	}	580	}
722	else /* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
723	SET_FLAG (op, FLAG_INV_LOCKED);	582	op->set_flag (FLAG_INV_LOCKED);
724	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
725		584
726	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
727	pl->contr->link_skills ();	586	pl->contr->link_skills ();
728	}	587	}
…		…
742	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	601	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743	}	602	}
744		603
745	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	604	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746	static int	605	static int
747	roll_stat (void)	606	roll_stat ()
748	{	607	{
749	int a[4], i, j, k;	608	int a[4], i, j, k;
750		609
751	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
752	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
753		612
754	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
755	if (a[i] < k)	614	if (a[i] < k)
756	k = a[i], j = i;	615	k = a[i], j = i;
757		616
…		…
849	player::chargen_race_done ()	708	player::chargen_race_done ()
850	{	709	{
851	/* this must before then initial items are given */	710	/* this must before then initial items are given */
852	esrv_new_player (ob->contr);	711	esrv_new_player (ob->contr);
853		712
854	treasurelist *tl = treasurelist::find ("starting_wealth");	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
855	if (tl)	714	if (tl)
856	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
857		716
858	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
859	INVOKE_PLAYER (LOGIN, ob->contr);
860		718
861	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
862		720
863	if (ob->msg)	721	if (ob->msg)
864	ob->msg = 0;	722	ob->msg = 0;
865		723
866	start_info (ob);	724	start_info (ob);
867	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
868	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
869	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
870	ob->update_stats ();	728	ob->update_stats ();
871		729
872	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
…		…
874	*/	732	*/
875	if (*first_map_ext_path)	733	if (*first_map_ext_path)
876	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	734	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
877	else	735	else
878	LOG (llevDebug, "first_map_ext_path not set\n");	736	LOG (llevDebug, "first_map_ext_path not set\n");
		737	}
		738
		739	/*
		740	* Returns true if the given player is a legal class.
		741	* The function to add and remove class-bonuses to the stats doesn't
		742	* check if the stat becomes negative, thus this function
		743	* merely checks that all stats are 1 or more, and returns
		744	* false otherwise.
		745	*/
		746	static int
		747	allowed_class (const object *op)
		748	{
		749	return op->stats.Dex > 0
		750	&& op->stats.Str > 0
		751	&& op->stats.Con > 0
		752	&& op->stats.Int > 0
		753	&& op->stats.Wis > 0
		754	&& op->stats.Pow > 0
		755	&& op->stats.Cha > 0;
879	}	756	}
880		757
881	void	758	void
882	player::chargen_race_next ()	759	player::chargen_race_next ()
883	{	760	{
…		…
912	ob->stats.hp = ob->stats.maxhp;	789	ob->stats.hp = ob->stats.maxhp;
913	ob->stats.sp = ob->stats.maxsp;	790	ob->stats.sp = ob->stats.maxsp;
914	ob->stats.grace = 0;	791	ob->stats.grace = 0;
915	}	792	}
916		793
917	void	794	static void
918	flee_player (object *op)	795	flee_player (object *op)
919	{	796	{
920	int dir, diff;	797	int dir, diff;
921	rv_vector rv;	798	rv_vector rv;
922		799
923	if (op->stats.hp < 0)	800	if (op->stats.hp < 0)
924	{	801	{
925	LOG (llevDebug, "Fleeing player is dead.\n");	802	LOG (llevDebug, "Fleeing player is dead.\n");
926	CLEAR_FLAG (op, FLAG_SCARED);	803	op->clr_flag (FLAG_SCARED);
927	return;	804	return;
928	}	805	}
929		806
930	if (!op->enemy)	807	if (!op->enemy)
931	{	808	{
932	LOG (llevDebug, "Fleeing player had no enemy.\n");	809	LOG (llevDebug, "Fleeing player had no enemy.\n");
933	CLEAR_FLAG (op, FLAG_SCARED);	810	op->clr_flag (FLAG_SCARED);
934	return;	811	return;
935	}	812	}
936		813
937	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	814	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
938	{	815	{
939	op->enemy = NULL;	816	op->enemy = NULL;
940	CLEAR_FLAG (op, FLAG_SCARED);	817	op->clr_flag (FLAG_SCARED);
941	return;	818	return;
942	}	819	}
943		820
944	get_rangevector (op, op->enemy, &rv, 0);	821	get_rangevector (op, op->enemy, &rv, 0);
945		822
946	dir = absdir (4 + rv.direction);	823	dir = absdir (4 + rv.direction);
947	for (diff = 0; diff < 3; diff++)	824	for (diff = 0; diff < 3; diff++)
948	{	825	{
949	int m = 1 - rndm (2) * 2;	826	int m = 1 - rndm (2) * 2;
950		827
951	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	828	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
952	return;	829	return;
953	}	830	}
954		831
955	/* Cornered, get rid of scared */	832	/* Cornered, get rid of scared */
956	CLEAR_FLAG (op, FLAG_SCARED);	833	op->clr_flag (FLAG_SCARED);
957	op->enemy = NULL;	834	op->enemy = NULL;
958	}	835	}
959		836
960	/* check_pick sees if there is stuff to be picked up/picks up stuff.	837	/* 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	838	* It returns 1 if the player should keep on moving, 0 if he should
…		…
966	{	843	{
967	object *tmp, *next;	844	object *tmp, *next;
968	int stop = 0;	845	int stop = 0;
969	int wvratio;	846	int wvratio;
970		847
971	/* if you're flying, you cna't pick up anything */	848	/* if you're flying, you can't pick up anything */
972	if (op->move_type & MOVE_FLYING)	849	if (op->move_type & MOVE_FLYING)
973	return 1;	850	return 1;
974		851
975	next = op->below;	852	next = op->below;
976		853
977	int cnt = MAX_ITEM_PER_DROP;	854	int cnt = MAX_ITEM_PER_ACTION;
978	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	855	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979		856
980	/* loop while there are items on the floor that are not marked as	857	/* loop while there are items on the floor that are not marked as
981	* destroyed */	858	* destroyed */
982	while (next && !next->destroyed ())	859	while (next && !next->destroyed ())
…		…
1008	if (op->contr->mode & PU_DEBUG)	885	if (op->contr->mode & PU_DEBUG)
1009	{	886	{
1010	/* some debugging code to figure out item information */	887	/* some debugging code to figure out item information */
1011	const char *str = tmp->name	888	const char *str = tmp->name
1012	? format ("item name: %s item type: %d weight/value: %d",	889	? 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))))	890	&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",	891	: 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))));	892	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1016		893
1017	new_draw_info (NDI_UNIQUE, 0, op, str);	894	new_draw_info (NDI_UNIQUE, 0, op, str);
1018	}	895	}
1019		896
1020	if (op->contr->mode & PU_INHIBIT)	897	if (op->contr->mode & PU_INHIBIT)
…		…
1053	* fighting */	930	* fighting */
1054	if (op->contr->mode & PU_INHIBIT)	931	if (op->contr->mode & PU_INHIBIT)
1055	return 1;	932	return 1;
1056		933
1057	/* prevent us from turning into auto-thieves :) */	934	/* prevent us from turning into auto-thieves :) */
1058	if (QUERY_FLAG (tmp, FLAG_UNPAID))	935	if (tmp->flag [FLAG_UNPAID])
1059	continue;	936	continue;
1060		937
1061	/* ignore known cursed objects */	938	/* ignore known cursed objects */
1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	939	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
1063	continue;	940	continue;
1064		941
1065	/* all food and drink if desired */	942	/* all food and drink if desired */
1066	/* question: don't pick up known-poisonous stuff? */	943	/* question: don't pick up known-poisonous stuff? */
1067	if (op->contr->mode & PU_FOOD)	944	if (op->contr->mode & PU_FOOD)
…		…
1070	CHK_PICK_PICKUP;	947	CHK_PICK_PICKUP;
1071	continue;	948	continue;
1072	}	949	}
1073		950
1074	if (op->contr->mode & PU_DRINK)	951	if (op->contr->mode & PU_DRINK)
1075	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	952	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
1076	{	953	{
1077	CHK_PICK_PICKUP;	954	CHK_PICK_PICKUP;
1078	continue;	955	continue;
1079	}	956	}
1080		957
…		…
1107	continue;	984	continue;
1108	}	985	}
1109		986
1110	/* wands/staves/rods/horns */	987	/* wands/staves/rods/horns */
1111	if (op->contr->mode & PU_MAGIC_DEVICE)	988	if (op->contr->mode & PU_MAGIC_DEVICE)
1112	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	989	if (tmp->type == WAND
		990	|| tmp->type == ROD
		991	|| tmp->type == HORN
		992	|| tmp->type == POWER_CRYSTAL)
1113	{	993	{
1114	CHK_PICK_PICKUP;	994	CHK_PICK_PICKUP;
1115	continue;	995	continue;
1116	}	996	}
1117		997
1118	/* pick up all magical items */	998	/* pick up all magical items */
1119	if (op->contr->mode & PU_MAGICAL)	999	if (op->contr->mode & PU_MAGICAL)
1120	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1000	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1001	&& !tmp->flag [FLAG_KNOWN_CURSED])
1121	{	1002	{
1122	CHK_PICK_PICKUP;	1003	CHK_PICK_PICKUP;
1123	continue;	1004	continue;
1124	}	1005	}
1125		1006
…		…
1132	}	1013	}
1133	}	1014	}
1134		1015
1135	/* rings & amulets - talismans seems to be typed AMULET */	1016	/* rings & amulets - talismans seems to be typed AMULET */
1136	if (op->contr->mode & PU_JEWELS)	1017	if (op->contr->mode & PU_JEWELS)
1137	if (tmp->type == RING || tmp->type == AMULET)	1018	if (tmp->type == RING
		1019	|| tmp->type == AMULET
		1020	|| tmp->type == GIRDLE
		1021	|| tmp->type == SKILL_TOOL)
1138	{	1022	{
1139	CHK_PICK_PICKUP;	1023	CHK_PICK_PICKUP;
1140	continue;	1024	continue;
1141	}	1025	}
1142		1026
…		…
1191	CHK_PICK_PICKUP;	1075	CHK_PICK_PICKUP;
1192	continue;	1076	continue;
1193	}	1077	}
1194		1078
1195	if (op->contr->mode & PU_GLOVES)	1079	if (op->contr->mode & PU_GLOVES)
1196	if (tmp->type == GLOVES)	1080	if (tmp->type == GLOVES || tmp->type == BRACERS)
1197	{	1081	{
1198	CHK_PICK_PICKUP;	1082	CHK_PICK_PICKUP;
1199	continue;	1083	continue;
1200	}	1084	}
1201		1085
…		…
1206	continue;	1090	continue;
1207	}	1091	}
1208		1092
1209	/* hoping to catch throwing daggers here */	1093	/* hoping to catch throwing daggers here */
1210	if (op->contr->mode & PU_MISSILEWEAPON)	1094	if (op->contr->mode & PU_MISSILEWEAPON)
1211	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1095	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1212	{	1096	{
1213	CHK_PICK_PICKUP;	1097	CHK_PICK_PICKUP;
1214	continue;	1098	continue;
1215	}	1099	}
1216		1100
…		…
1251	fprintf (stderr, "%s", tmp->name);	1135	fprintf (stderr, "%s", tmp->name);
1252	}	1136	}
1253	else	1137	else
1254	fprintf (stderr, "%s", tmp->arch->archname);	1138	fprintf (stderr, "%s", tmp->arch->archname);
1255	fprintf (stderr, ",%d] = ", tmp->type);	1139	fprintf (stderr, ",%d] = ", tmp->type);
1256	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1140	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1257	#endif	1141	#endif
1258	CHK_PICK_PICKUP;	1142	CHK_PICK_PICKUP;
1259	continue;	1143	continue;
1260	}	1144	}
1261	} /* the new pickup model */	1145	} /* the new pickup model */
1262	}	1146	}
1263		1147
1264	return !stop;	1148	return !stop;
1265	}	1149	}
1266		1150
		1151	/* routine for both players and monsters. We call this when
		1152	* there is a possibility for our action distrubing our hiding
		1153	* place or invisiblity spell. Artefact invisiblity causes
		1154	* "noise" instead. If we arent invisible to begin with, we
		1155	* return 0.
		1156	*/
		1157	static int
		1158	action_makes_visible (object *op)
		1159	{
		1160	if (op->invisible && op->flag [FLAG_ALIVE])
		1161	{
		1162	if (op->flag [FLAG_MAKE_INVIS])
		1163	{
		1164	// artefact invisibility is permanent, but we still make noise
		1165	// this is important for game-balance.
		1166	if (op->contr)
		1167	op->make_noise ();
		1168
		1169	return 0;
		1170	}
		1171
		1172	if (op->contr && op->contr->tmp_invis == 0)
		1173	return 0;
		1174
		1175	/* If monsters, they should become visible */
		1176	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1177	{
		1178	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1179	return 1;
		1180	}
		1181	}
		1182
		1183	return 0;
		1184	}
		1185
1267	/*	1186	/*
1268	* Find an arrow in the inventory and after that	1187	* Find an arrow in the inventory and after that
1269	* in the right type container (quiver). Pointer to the	1188	* in the right type container (quiver). Pointer to the
1270	* found object is returned.	1189	* found object is returned.
1271	*/	1190	*/
1272	object *	1191	static object *
1273	find_arrow (object *op, const char *type)	1192	find_arrow (object *op, const char *type)
1274	{	1193	{
1275	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1194	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1276	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1195	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1277	return splay (tmp);	1196	return splay (tmp);
1278		1197
1279	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1198	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1280	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1199	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1281	if (object *arrow = find_arrow (tmp, type))	1200	if (object *arrow = find_arrow (tmp, type))
1282	{	1201	{
1283	splay (tmp);	1202	splay (tmp);
1284	return arrow;	1203	return arrow;
1285	}	1204	}
…		…
1291	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1210	* 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	1211	* 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	1212	* 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.	1213	* the hall. Failing that it does it's best to pick the highest plus arrow.
1295	*/	1214	*/
1296	object *	1215	static object *
1297	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1216	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1298	{	1217	{
1299	object *tmp = NULL, *arrow, *ntmp;	1218	object *tmp = NULL, *arrow, *ntmp;
1300	int attacknum, attacktype, betterby = 0, i;	1219	int attacknum, attacktype, betterby = 0, i;
1301		1220
1302	if (!type)	1221	if (!type)
1303	return NULL;	1222	return NULL;
1304		1223
1305	for (arrow = op->inv; arrow; arrow = arrow->below)	1224	for (arrow = op->inv; arrow; arrow = arrow->below)
1306	{	1225	{
1307	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1226	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1308	{	1227	{
1309	i = 0;	1228	i = 0;
1310	ntmp = find_better_arrow (arrow, target, type, &i);	1229	ntmp = find_better_arrow (arrow, target, type, &i);
1311		1230
1312	if (i > betterby)	1231	if (i > betterby)
…		…
1370	* find_better_arrow to find a decent arrow to use.	1289	* find_better_arrow to find a decent arrow to use.
1371	* op = the shooter	1290	* op = the shooter
1372	* type = bow->race	1291	* type = bow->race
1373	* dir = fire direction	1292	* dir = fire direction
1374	*/	1293	*/
1375	object *	1294	static object *
1376	pick_arrow_target (object *op, shstr_cmp type, int dir)	1295	pick_arrow_target (object *op, shstr_cmp type, int dir)
1377	{	1296	{
1378	object *tmp = NULL;	1297	object *tmp = NULL;
1379	maptile *m;	1298	maptile *m;
1380	int i, mflags, found, number;	1299	int i, mflags, found, number;
…		…
1413	break;	1332	break;
1414	}	1333	}
1415		1334
1416	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1417	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1336	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1418	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1337	if (tmp->flag [FLAG_ALIVE])
1419	break;	1338	break;
1420	}	1339	}
1421		1340
1422	if (!tmp)	1341	if (!tmp)
1423	return find_arrow (op, type);	1342	return find_arrow (op, type);
…		…
1467	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1386	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1468	return 0;	1387	return 0;
1469	}	1388	}
1470		1389
1471	// optimisation: move object to top so we will find it quickly again	1390	// optimisation: move object to top so we will find it quickly again
1472	if (bow->below)	1391	splay (bow);
1473	{
1474	bow->remove ();
1475	op->insert (bow);
1476	}
1477	}	1392	}
1478		1393
1479	if (!bow->race || !bow->skill)	1394	if (!bow->race || !bow->skill)
1480	{	1395	{
1481	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1396	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1488	{	1403	{
1489	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
1490	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1405	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1491	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1406	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1492	else	1407	else
1493	CLEAR_FLAG (op, FLAG_READY_BOW);	1408	op->clr_flag (FLAG_READY_BOW);
1494		1409
1495	return 0;	1410	return 0;
1496	}	1411	}
1497	}	1412	}
1498		1413
…		…
1547	#endif	1462	#endif
1548		1463
1549	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1550		1465
1551	/* update the speed */	1466	/* update the speed */
1552	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1553	+ bow->stats.dam / 7.f;
1554		1467
1555	arrow->set_speed (max (arrow->speed, 2.f));
1556	arrow->speed_left = 0;	1468	arrow->speed_left = 0;
		1469	arrow->set_speed (max (2.f,
		1470	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1471	+ bow->stats.dam / 7.f
		1472	));
1557		1473
1558	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1474	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1559		1475
1560	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1561	{	1477	{
…		…
1582	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1498	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1583		1499
1584	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1500	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1585	arrow->move_type = MOVE_FLY_LOW;	1501	arrow->move_type = MOVE_FLY_LOW;
1586	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1502	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
		1503	arrow->set_flag (FLAG_NO_PICK);
1587		1504
1588	op->play_sound (sound_find ("fire_arrow"));	1505	op->play_sound (sound_find ("fire_arrow"));
1589	m->insert (arrow, sx, sy, op);	1506	m->insert (arrow, sx, sy, op);
1590		1507
1591	if (!arrow->destroyed ())	1508	if (!arrow->destroyed ())
…		…
1599	* but monsters can't. Putting that code here	1516	* but monsters can't. Putting that code here
1600	* makes the fire_bow code much cleaner.	1517	* makes the fire_bow code much cleaner.
1601	* this function should only be called if 'op' is a player,	1518	* this function should only be called if 'op' is a player,
1602	* hence the function name.	1519	* hence the function name.
1603	*/	1520	*/
1604	int	1521	static int
1605	player_fire_bow (object *op, int dir)	1522	player_fire_bow (object *op, int dir)
1606	{	1523	{
1607	int ret;	1524	int ret;
1608		1525
1609	if (op->contr->bowtype == bow_bestarrow)	1526	if (op->contr->bowtype == bow_bestarrow)
…		…
1637	}	1554	}
1638		1555
1639	/* Fires a misc (wand/rod/horn) object in 'dir'.	1556	/* Fires a misc (wand/rod/horn) object in 'dir'.
1640	* Broken apart from 'fire' to keep it more readable.	1557	* Broken apart from 'fire' to keep it more readable.
1641	*/	1558	*/
1642	void	1559	static void
1643	fire_misc_object (object *op, int dir)	1560	fire_misc_object (object *op, int dir)
1644	{	1561	{
1645	object *item = op->contr->ranged_ob;	1562	object *item = op->contr->ranged_ob;
1646		1563
1647	if (!item)	1564	if (!item)
…		…
1654	{	1571	{
1655	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1572	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1656	return;	1573	return;
1657	}	1574	}
1658		1575
1659	if (!op->change_weapon (item))	1576	if (!op->apply (item))
1660	return;	1577	return;
1661		1578
1662	if (item->type == WAND)	1579	if (item->type == WAND)
1663	{	1580	{
1664	if (item->stats.food <= 0)	1581	if (item->stats.food <= 0)
…		…
1669	return;	1586	return;
1670	}	1587	}
1671	}	1588	}
1672	else if (item->type == ROD || item->type == HORN)	1589	else if (item->type == ROD || item->type == HORN)
1673	{	1590	{
1674	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1591	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1675		1592
1676	// using the maximum of the rods charge allows at least one spell cast	1593	// using the maximum of the rods charge allows at least one spell cast
1677	// for a rod or horn, this fixes some broken rods.	1594	// for a rod or horn, this fixes some broken rods.
1678	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1595	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1679	{	1596	{
1680	op->contr->play_sound (sound_find ("wand_poof"));	1597	op->contr->play_sound (sound_find ("wand_poof"));
1681		1598
1682	if (item->type == ROD)	1599	if (item->type == ROD)
1683	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1600	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1694		1611
1695	if (item->type == WAND)	1612	if (item->type == WAND)
1696	{	1613	{
1697	if (!(--item->stats.food))	1614	if (!(--item->stats.food))
1698	{	1615	{
1699	object *tmp;
1700
1701	if (item->arch)	1616	if (item->arch)
1702	{	1617	{
1703	CLEAR_FLAG (item, FLAG_ANIMATE);	1618	item->clr_flag (FLAG_ANIMATE);
1704	item->face = item->arch->face;	1619	item->face = item->arch->face;
1705	item->set_speed (0);	1620	item->set_speed (0);
1706	}	1621	}
1707		1622
1708	if (object *pl = item->visible_to ())	1623	if (object *pl = item->visible_to ())
…		…
1715	}	1630	}
1716		1631
1717	/* Received a fire command for the player - go and do it.	1632	/* Received a fire command for the player - go and do it.
1718	*/	1633	*/
1719	bool	1634	bool
1720	fire (object *op, int dir)	1635	fire (object *who, int dir)
1721	{	1636	{
1722	int spellcost = 0;	1637	int spellcost = 0;
1723		1638
1724	player *pl = op->contr;	1639	player *pl = who->contr;
1725		1640
1726	if (pl->golem)	1641	if (pl->golem)
1727	{	1642	{
1728	control_golem (op->contr->golem, dir);	1643	control_golem (who->contr->golem, dir);
1729	return false;	1644	return false;
1730	}	1645	}
1731		1646
1732	object *ob = pl->ranged_ob;	1647	object *ob = pl->ranged_ob;
1733		1648
1734	if (!ob)	1649	if (!ob)
1735	return false;	1650	return false;
1736		1651
1737	if (op->speed_left > 0.f)	1652	if (who->speed_left > 0.f)
1738	--op->speed_left;	1653	--who->speed_left;
1739	else	1654	else
1740	return false;	1655	return false;
1741		1656
1742	if (!op->change_weapon (ob))	1657	if (!who->apply (ob))
1743	return false;	1658	return false;
1744		1659
1745	/* check for loss of invisiblity/hide */	1660	/* check for loss of invisiblity/hide */
1746	if (action_makes_visible (op))	1661	if (action_makes_visible (who))
1747	make_visible (op);	1662	make_visible (who);
1748		1663
1749	switch (ob->type)	1664	switch (ob->type)
1750	{	1665	{
1751	case BOW:	1666	case BOW:
1752	player_fire_bow (op, dir);	1667	player_fire_bow (who, dir);
1753	break;	1668	break;
1754		1669
1755	case SPELL:	1670	case SPELL:
1756	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1671	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1757	break;	1672	break;
1758		1673
1759	case BUILDER:	1674	case BUILDER:
1760	apply_map_builder (op, dir);	1675	apply_map_builder (who, dir);
1761	break;	1676	break;
1762		1677
1763	case SKILL:	1678	case SKILL:
1764	do_skill (op, op, ob, dir, 0);	1679	do_skill (who, who, ob, dir, 0);
1765	break;	1680	break;
1766		1681
		1682	case RANGED:
		1683	do_skill (who, ob, who->chosen_skill, dir, 0);
		1684	break;
		1685
1767	default:	1686	default:
1768	fire_misc_object (op, dir);	1687	fire_misc_object (who, dir);
1769	break;	1688	break;
1770	}	1689	}
1771		1690
1772	return true;	1691	return true;
1773	}	1692	}
1774		1693
1775	/* find_key	1694	static object *
1776	* We try to find a key for the door as passed. If we find a key
1777	* and successfully use it, we return the key, otherwise NULL
1778	* This function merges both normal and locked door, since the logic
1779	* for both is the same - just the specific key is different.
1780	* pl is the player,
1781	* inv is the objects inventory to searched
1782	* door is the door we are trying to match against.
1783	* This function can be called recursively to search containers.
1784	*/
1785	object *
1786	find_key (object *pl, object *container, object *door)	1695	find_key_ (object *pl, object *container, object *door)
1787	{	1696	{
1788	object *tmp, *key;	1697	object *tmp, *key;
1789		1698
1790	/* Should not happen, but sanity checking is never bad */	1699	/* Should not happen, but sanity checking is never bad */
1791	if (!container->inv)	1700	if (!container->inv)
…		…
1794	/* First, lets try to find a key in the top level inventory */	1703	/* First, lets try to find a key in the top level inventory */
1795	for (tmp = container->inv; tmp; tmp = tmp->below)	1704	for (tmp = container->inv; tmp; tmp = tmp->below)
1796	{	1705	{
1797	if (door->type == DOOR && tmp->type == KEY)	1706	if (door->type == DOOR && tmp->type == KEY)
1798	break;	1707	break;
		1708
1799	/* For sanity, we should really check door type, but other stuff	1709	/* For sanity, we should really check door type, but other stuff
1800	* (like containers) can be locked with special keys	1710	* (like containers) can be locked with special keys
1801	*/	1711	*/
1802	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1712	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1803	break;	1713	break;
…		…
1809	* a key, return	1719	* a key, return
1810	*/	1720	*/
1811	if (!tmp)	1721	if (!tmp)
1812	{	1722	{
1813	for (tmp = container->inv; tmp; tmp = tmp->below)	1723	for (tmp = container->inv; tmp; tmp = tmp->below)
1814	{
1815	/* No reason to search empty containers */	1724	/* No reason to search empty containers */
1816	if (tmp->type == CONTAINER && tmp->inv)	1725	if (tmp->type == CONTAINER && tmp->inv)
1817	{
1818	if ((key = find_key (pl, tmp, door)))	1726	if ((key = find_key_ (pl, tmp, door)))
1819	return key;	1727	return key;
1820	}
1821	}
1822		1728
1823	if (!tmp)	1729	if (!tmp)
1824	return NULL;	1730	return 0;
1825	}	1731	}
1826		1732
1827	/* We get down here if we have found a key. Now if its in a container,	1733	/* We get down here if we have found a key. Now if its in a container,
1828	* see if we actually want to use it	1734	* see if we actually want to use it
1829	*/	1735	*/
1830	if (pl != container)	1736	if (pl != container)
1831	{	1737	{
1832	/* Only let players use keys in containers */	1738	/* Only let players use keys in containers */
1833	if (!pl->contr)	1739	if (!pl->contr)
1834	return NULL;	1740	return 0;
		1741
1835	/* cases where this fails:	1742	/* cases where this fails:
1836	* If we only search the player inventory, return now since we	1743	* If we only search the player inventory, return now since we
1837	* are not in the players inventory.	1744	* are not in the players inventory.
1838	* If the container is not active, return now since only active	1745	* If the container is not active, return now since only active
1839	* containers can be used.	1746	* containers can be used.
…		…
1843	* inv must have been an container and must have been active.	1750	* inv must have been an container and must have been active.
1844	*	1751	*
1845	* Change the color so that the message doesn't disappear with	1752	* Change the color so that the message doesn't disappear with
1846	* all the others.	1753	* all the others.
1847	*/	1754	*/
1848	if (pl->contr->usekeys == key_inventory ||	1755	if (pl->contr->usekeys == key_inventory
1849	!QUERY_FLAG (container, FLAG_APPLIED) ||	1756	|| !container->flag [FLAG_APPLIED]
1850	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1757	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1851	{	1758	{
1852	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1759	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1853	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1760	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1854	return NULL;	1761	return NULL;
1855	}	1762	}
1856	}	1763	}
1857		1764
1858	return tmp;	1765	return tmp;
		1766	}
		1767
		1768	/* find_key
		1769	* We try to find a key for the door as passed. If we find a key
		1770	* and successfully use it, we return the key, otherwise NULL
		1771	* This function merges both normal and locked door, since the logic
		1772	* for both is the same - just the specific key is different.
		1773	* pl is the player,
		1774	* inv is the objects inventory to searched
		1775	* door is the door we are trying to match against.
		1776	* This function can be called recursively to search containers.
		1777	*/
		1778	object *
		1779	find_key (object *pl, object *container, object *door)
		1780	{
		1781	if (door->slaying && is_match_expr (door->slaying))
		1782	{
		1783	// for match expressions, we try to find the key by applying the match
		1784	// to the op itself, which is supposed to find the "key", instead
		1785	// of searching through containers ourselves.
		1786
		1787	return match_one (door->slaying, container, door, pl, pl);
		1788	}
		1789	else
		1790	return find_key_ (pl, container, door);
1859	}	1791	}
1860		1792
1861	/* moved door processing out of move_player_attack.	1793	/* moved door processing out of move_player_attack.
1862	* returns 1 if player has opened the door with a key	1794	* returns 1 if player has opened the door with a key
1863	* such that the caller should not do anything more,	1795	* such that the caller should not do anything more,
…		…
1913	* going to try and move (not fire weapons).	1845	* going to try and move (not fire weapons).
1914	*/	1846	*/
1915	bool	1847	bool
1916	move_player_attack (object *op, int dir)	1848	move_player_attack (object *op, int dir)
1917	{	1849	{
1918	int on_battleground;	1850	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1851	{
		1852	--op->speed_left;
		1853	return true;
		1854	}
1919		1855
1920	sint16 nx = freearr_x[dir] + op->x;	1856	sint16 nx = freearr_x[dir] + op->x;
1921	sint16 ny = freearr_y[dir] + op->y;	1857	sint16 ny = freearr_y[dir] + op->y;
1922		1858
1923	on_battleground = op_on_battleground (op, 0, 0);
1924
1925	if (out_of_map (op->map, nx, ny))	1859	if (out_of_map (op->map, nx, ny))
1926	return false;	1860	return false;
1927
1928	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1929	{
1930	--op->speed_left;
1931	return true;
1932	}
1933		1861
1934	/* If braced, or can't move to the square, and it is not out of the	1862	/* If braced, or can't move to the square, and it is not out of the
1935	* map, attack it. Note order of if statement is important - don't	1863	* map, attack it. Note order of if statement is important - don't
1936	* want to be calling move_ob if braced, because move_ob will move the	1864	* want to be calling move_ob if braced, because move_ob will move the
1937	* player. This is a pretty nasty hack, because if we could	1865	* player. This is a pretty nasty hack, because if we could
…		…
1955	|| mon->flag [FLAG_CAN_ROLL])	1883	|| mon->flag [FLAG_CAN_ROLL])
1956	&& mon != op)	1884	&& mon != op)
1957	break;	1885	break;
1958	}	1886	}
1959		1887
1960	if (!mon) /* This happens anytime the player tries to move */	1888	/* no monster == player tries to move into a wall or so */
1961	return false; /* into a wall */	1889	if (!mon)
		1890	{
		1891	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1892	if (op->move_type & ob->move_block)
		1893	{
		1894	if (ob->move_block == MOVE_ALL)
		1895	move_into_wall (op, ob);
		1896	else
		1897	{
		1898	if (op->contr->ns->bumpmsg)
		1899	{
		1900	op->play_sound (sound_find ("blocked_move"));
		1901
		1902	op->statusmsg (ob->invisible
		1903	? "Something blocks you."
		1904	: format ("Something blocks you from entering the %s.", query_name (ob))
		1905	);
		1906	}
		1907	}
		1908
		1909	break;
		1910	}
		1911
		1912	return false;
		1913	}
1962		1914
1963	mon = mon->head_ ();	1915	mon = mon->head_ ();
1964		1916
1965	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1917	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1966	if (op->contr->weapon_sp_left > 0.f)	1918	if (op->contr->weapon_sp_left > 0.f)
…		…
1984	*/	1936	*/
1985	if (op->type == PLAYER	1937	if (op->type == PLAYER
1986	&& ((mon->owner && mon->owner->contr	1938	&& ((mon->owner && mon->owner->contr
1987	&& same_party (mon->owner->contr->party, op->contr->party))	1939	&& same_party (mon->owner->contr->party, op->contr->party))
1988	|| mon->owner == op)	1940	|| mon->owner == op)
1989	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1941	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1990	{	1942	{
1991	/* If we're braced, we don't want to switch places with it */	1943	/* If we're braced, we don't want to switch places with it */
1992	if (op->contr->braced)	1944	if (op->contr->braced)
1993	return false;	1945	return false;
1994		1946
…		…
2005	return true;	1957	return true;
2006	}	1958	}
2007	else	1959	else
2008	return false;	1960	return false;
2009	}	1961	}
		1962
		1963	bool on_battleground = op_on_battleground (op, 0, 0);
2010		1964
2011	/* in certain circumstances, you shouldn't attack friendly	1965	/* in certain circumstances, you shouldn't attack friendly
2012	* creatures. Note that if you are braced, you can't push	1966	* creatures. Note that if you are braced, you can't push
2013	* someone, but put it inside this loop so that you won't	1967	* someone, but put it inside this loop so that you won't
2014	* attack them either.	1968	* attack them either.
2015	*/	1969	*/
2016	if ((mon->type == PLAYER || mon->enemy != op)	1970	if ((mon->type == PLAYER || mon->enemy != op)
2017	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1971	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2018	&& ((op->contr->peaceful	1972	&& ((op->contr->peaceful
2019	|| (mon->type == PLAYER && mon->contr->peaceful))	1973	|| (mon->type == PLAYER && mon->contr->peaceful))
2020	&& !on_battleground))	1974	&& !on_battleground))
2021	{	1975	{
2022	if (op->speed_left > 0.f)	1976	if (op->speed_left > 0.f)
…		…
2038	}	1992	}
2039	}	1993	}
2040	/* If the object is a boulder or other rollable object, then	1994	/* If the object is a boulder or other rollable object, then
2041	* roll it if not braced. You can't roll it if you are braced.	1995	* roll it if not braced. You can't roll it if you are braced.
2042	*/	1996	*/
2043	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1997	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2044	{	1998	{
2045	if (op->speed_left > 0.f)	1999	if (op->speed_left > 0.f)
2046	{	2000	{
2047	--op->speed_left;	2001	--op->speed_left;
2048		2002
…		…
2057	* Way it works is like this: First, it must have some hit points	2011	* Way it works is like this: First, it must have some hit points
2058	* and be living. Then, it must be one of the following:	2012	* and be living. Then, it must be one of the following:
2059	* 1) Not a player, 2) A player, but of a different party. Note	2013	* 1) Not a player, 2) A player, but of a different party. Note
2060	* that party_number -1 is no party, so attacks can still happen.	2014	* that party_number -1 is no party, so attacks can still happen.
2061	*/	2015	*/
2062	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2016	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2063	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2017	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2064	{	2018	{
2065	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2019	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2066	{	2020	{
2067	--op->contr->weapon_sp_left;	2021	--op->contr->weapon_sp_left;
…		…
2079	}	2033	}
2080		2034
2081	bool	2035	bool
2082	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2083	{	2037	{
2084	int pick;
2085
2086	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2038	if (!op->map || op->map->state != MAP_ACTIVE)
2087	return 0;	2039	return 0;
2088		2040
2089	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2090	if ((dir < 0) || (dir >= 9))	2042	if (dir < 0 || dir > 8)
2091	{	2043	{
2092	LOG (llevError, "move_player: invalid direction %d\n", dir);	2044	LOG (llevError, "move_player: invalid direction %d\n", dir);
2093	return 0;	2045	return 0;
2094	}	2046	}
2095		2047
2096	/* peterm: added following line */	2048	/* peterm: added following line */
2097	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2049	if (op->flag [FLAG_CONFUSED] && dir)
2098	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2050	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2099		2051
2100	op->facing = dir;	2052	op->facing = dir;
2101		2053
2102	if (op->flag [FLAG_HIDDEN])	2054	if (op->flag [FLAG_HIDDEN])
2103	do_hidden_move (op);	2055	do_hidden_move (op);
2104		2056
2105	bool retval;	2057	bool retval;
		2058	int pick = 0;
2106		2059
2107	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2060	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2108	retval = RESULT_INT (0);	2061	retval = RESULT_INT (0);
2109	else if (op->contr->fire_on)	2062	else if (op->contr->fire_on)
2110	retval = fire (op, dir);	2063	retval = fire (op, dir);
…		…
2141	* players.	2094	* players.
2142	*/	2095	*/
2143	bool	2096	bool
2144	handle_newcs_player (object *op)	2097	handle_newcs_player (object *op)
2145	{	2098	{
2146	if (QUERY_FLAG (op, FLAG_SCARED))	2099	if (op->flag [FLAG_SCARED])
2147	{	2100	{
2148	if (op->speed_left > 0.f)	2101	if (op->speed_left > 0.f)
2149	{	2102	{
2150	--op->speed_left;	2103	--op->speed_left;
2151	flee_player (op);	2104	flee_player (op);
…		…
2167	return move_player (op, op->direction);	2120	return move_player (op, op->direction);
2168		2121
2169	return false;	2122	return false;
2170	}	2123	}
2171		2124
2172	int	2125	static int
2173	save_life (object *op)	2126	save_life (object *op)
2174	{	2127	{
2175	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2128	if (!op->flag [FLAG_LIFESAVE])
2176	return 0;	2129	return 0;
2177		2130
2178	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2131	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2179	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2132	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2180	{	2133	{
2181	op->play_sound (sound_find ("ob_evaporate"));	2134	op->play_sound (sound_find ("ob_evaporate"));
2182	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2135	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2183		2136
2184	tmp->destroy ();	2137	tmp->destroy ();
2185	CLEAR_FLAG (op, FLAG_LIFESAVE);	2138	op->clr_flag (FLAG_LIFESAVE);
2186		2139
2187	if (op->stats.hp < 0)	2140	if (op->stats.hp < 0)
2188	op->stats.hp = op->stats.maxhp;	2141	op->stats.hp = op->stats.maxhp;
2189		2142
2190	if (op->stats.food < 0)	2143	if (op->stats.food < 0)
2191	op->stats.food = 999;	2144	op->stats.food = MAX_FOOD;
2192		2145
2193	op->update_stats ();	2146	op->update_stats ();
2194	return 1;	2147	return 1;
2195	}	2148	}
2196		2149
2197	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2150	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2198	CLEAR_FLAG (op, FLAG_LIFESAVE);	2151	op->clr_flag (FLAG_LIFESAVE);
2199	enter_player_savebed (op); /* bring him home. */	2152	enter_player_savebed (op); /* bring him home. */
2200	return 0;	2153	return 0;
2201	}	2154	}
2202		2155
2203	/* This goes throws the inventory and removes unpaid objects, and puts them	2156	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2210	{	2163	{
2211	while (op)	2164	while (op)
2212	{	2165	{
2213	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2166	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2214		2167
2215	if (QUERY_FLAG (op, FLAG_UNPAID))	2168	if (op->flag [FLAG_UNPAID])
2216	op->insert_at (env);	2169	op->insert_at (env);
2217	else if (op->inv)	2170	else if (op->inv)
2218	drop_unpaid_items (op->inv, env);	2171	drop_unpaid_items (op->inv, env);
2219		2172
2220	op = next;	2173	op = next;
…		…
2226	{	2179	{
2227	if (!flag [FLAG_REMOVED])	2180	if (!flag [FLAG_REMOVED])
2228	::drop_unpaid_items (inv, this);	2181	::drop_unpaid_items (inv, this);
2229	}	2182	}
2230		2183
2231	/*
2232	* Returns pointer a static string containing gravestone text
2233	* Moved from apply.c to player.c - player.c is what
2234	* actually uses this function. player.c may not be quite the
2235	* best, a misc file for object actions is probably better,
2236	* but there isn't one in the server directory.
2237	*/
2238	const char *
2239	gravestone_text (object *op)
2240	{
2241	static dynbuf_text buf;
2242
2243	buf << "---- R.I.P. ----\n\n"
2244	<< op->name;
2245
2246	if (op->type == PLAYER)
2247	buf << " the " << op->contr->title;
2248
2249	buf << "\n\n";
2250
2251	buf << "who was level ";
2252	buf << (sint32)op->level << "\n\n" // OO breakdown
2253	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2254
2255	if (op->type == PLAYER)
2256	buf << "by " << op->contr->killer_name () << ".\n\n";
2257
2258	{
2259	static char buf2[128];
2260	time_t now = time (NULL);
2261	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2262	buf << buf2;
2263	}
2264
2265	return buf;
2266	}
2267
2268	void	2184	void
2269	do_some_living (object *op)	2185	do_some_living (object *op)
2270	{	2186	{
2271	int last_food = op->stats.food;	2187	int last_food = op->stats.food;
2272	int gen_hp, gen_sp, gen_grace;	2188	int gen_hp, gen_sp, gen_grace;
2273	int over_hp, over_sp, over_grace;
2274	int i;
2275	int rate_hp = 1200;	2189	int rate_hp = 1200;
2276	int rate_sp = 2500;	2190	int rate_sp = 2500;
2277	int rate_grace = 2000;	2191	int rate_grace = 2000;
2278	const int max_hp = 1;	2192	const int max_hp = 1;
2279	const int max_sp = 1;	2193	const int max_sp = 1;
2280	const int max_grace = 1;	2194	const int max_grace = 1;
2281		2195
		2196	#if 0
2282	if (op->contr->hidden)	2197	if (op->contr->hidden)
2283	{	2198	{
2284	op->invisible = 1000;	2199	op->invisible = 1000;
2285	/* the socket code flashes the player visible/invisible	2200	/* the socket code flashes the player visible/invisible
2286	* depending on the value of invisible, so we need to	2201	* depending on the value of invisible, so we need to
2287	* alternate it here for it to work correctly.	2202	* alternate it here for it to work correctly.
2288	*/	2203	*/
2289	if (pticks & 2)	2204	if (server_tick & 2)
2290	op->invisible--;	2205	op->invisible--;
2291	}	2206	}
		2207	else
		2208	#endif
2292	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2209	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2293	{	2210	{
2294	if (!op->invisible--)	2211	if (!op->invisible--)
2295	{	2212	{
2296	make_visible (op);	2213	make_visible (op);
2297	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2214	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2331	if (--op->last_grace < 0)	2248	if (--op->last_grace < 0)
2332	{	2249	{
2333	if (op->stats.grace < op->stats.maxgrace / 2)	2250	if (op->stats.grace < op->stats.maxgrace / 2)
2334	op->stats.grace++; /* no penalty in food for regaining grace */	2251	op->stats.grace++; /* no penalty in food for regaining grace */
2335		2252
		2253	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2254
2336	if (max_grace > 1)	2255	if (max_grace > 1)
2337	{	2256	{
2338	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2257	int over_grace = temp / rate_grace;
		2258
2339	if (over_grace > 0)	2259	if (over_grace > 0)
2340	{	2260	{
2341	op->stats.sp += over_grace	2261	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2342	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2343	op->last_grace = 0;	2262	op->last_grace = 0;
2344	}	2263	}
2345	else	2264	else
2346	{	2265	op->last_grace = rate_grace / temp;
2347	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2348	}
2349	}	2266	}
2350	else	2267	else
2351	{	2268	op->last_grace = rate_grace / temp;
2352	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2269
2353	}
2354	/* wearing stuff doesn't detract from grace generation. */	2270	/* wearing stuff doesn't detract from grace generation. */
2355	}	2271	}
2356		2272
2357	if (op->stats.food > 0)	2273	if (op->stats.food > 0)
2358	{	2274	{
…		…
2364	if (op->stats.sp < op->stats.maxsp)	2280	if (op->stats.sp < op->stats.maxsp)
2365	{	2281	{
2366	op->stats.sp++;	2282	op->stats.sp++;
2367		2283
2368	/* dms do not consume food */	2284	/* dms do not consume food */
2369	if (!QUERY_FLAG (op, FLAG_WIZ))	2285	if (!op->flag [FLAG_WIZ])
2370	{	2286	{
2371	op->stats.food--;	2287	op->stats.food--;
2372		2288
2373	if (op->contr->digestion < 0)	2289	if (op->contr->digestion < 0)
2374	op->stats.food += op->contr->digestion;	2290	op->stats.food += op->contr->digestion;
…		…
2377	}	2293	}
2378	}	2294	}
2379		2295
2380	if (max_sp > 1)	2296	if (max_sp > 1)
2381	{	2297	{
2382	over_sp = (gen_sp + 10) / rate_sp;	2298	int over_sp = (gen_sp + 10) / rate_sp;
2383	if (over_sp > 0)	2299	if (over_sp > 0)
2384	{	2300	{
2385	if (op->stats.sp < op->stats.maxsp)	2301	if (op->stats.sp < op->stats.maxsp)
2386	{	2302	{
2387	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2303	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2408	if (op->stats.hp < op->stats.maxhp)	2324	if (op->stats.hp < op->stats.maxhp)
2409	{	2325	{
2410	op->stats.hp++;	2326	op->stats.hp++;
2411		2327
2412	/* dms do not consume food */	2328	/* dms do not consume food */
2413	if (!QUERY_FLAG (op, FLAG_WIZ))	2329	if (!op->flag [FLAG_WIZ])
2414	{	2330	{
2415	op->stats.food--;	2331	op->stats.food--;
2416		2332
2417	if (op->contr->digestion < 0)	2333	if (op->contr->digestion < 0)
2418	op->stats.food += op->contr->digestion;	2334	op->stats.food += op->contr->digestion;
2419	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2335	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2420	op->stats.food = last_food;	2336	op->stats.food = last_food;
2421	}	2337	}
2422	}	2338	}
2423		2339
		2340	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2341
2424	if (max_hp > 1)	2342	if (max_hp > 1)
2425	{	2343	{
2426	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2344	int over_hp = temp / rate_hp;
2427		2345
2428	if (over_hp > 0)	2346	if (over_hp > 0)
2429	{	2347	{
2430	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2348	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2431	op->last_heal = 0;	2349	op->last_heal = 0;
2432	}	2350	}
2433	else	2351	else
2434	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2352	op->last_heal = rate_hp / temp;
2435	}	2353	}
2436	else	2354	else
2437	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2355	op->last_heal = rate_hp / temp;
2438	}	2356	}
2439	}	2357	}
2440		2358
2441	/* Digestion */	2359	/* Digestion */
2442	if (--op->last_eat < 0)	2360	if (--op->last_eat < 0)
…		…
2445	penalty = max (0, -op->contr->digestion);	2363	penalty = max (0, -op->contr->digestion);
2446		2364
2447	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2365	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2448		2366
2449	/* dms do not consume food */	2367	/* dms do not consume food */
2450	if (!QUERY_FLAG (op, FLAG_WIZ))	2368	if (!op->flag [FLAG_WIZ])
2451	op->stats.food--;	2369	op->stats.food--;
2452	}	2370	}
2453		2371
2454	if (op->stats.food < 0 && op->stats.hp >= 0)	2372	if (op->stats.food < 0 && op->stats.hp >= 0)
2455	{	2373	{
2456	object *flesh = 0;	2374	object *flesh = 0;
2457		2375
2458	for_inv_removable (op, tmp)	2376	for_inv_removable (op, tmp)
2459	{	2377	{
2460	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2378	if (tmp->flag [FLAG_UNPAID])
2461	continue;	2379	continue;
2462		2380
2463	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2381	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2464	{	2382	{
2465	op->statusmsg ("You blindly grab for a bite of food. "	2383	op->statusmsg ("You blindly grab for a bite of food. "
2466	"H<To prevent you from starving, you ate some random item from your backpack.>");	2384	"H<To prevent you from starving, you ate some random item from your backpack.>");
2467	manual_apply (op, tmp, 0);	2385	op->apply (tmp);
2468		2386
2469	if (op->stats.food >= 0 || op->stats.hp < 0)	2387	if (op->stats.food >= 0 || op->stats.hp < 0)
2470	break;	2388	break;
2471	}	2389	}
2472	else if (tmp->type == FLESH)	2390	else if (tmp->type == FLESH)
…		…
2478	*/	2396	*/
2479	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2397	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2480	{	2398	{
2481	op->statusmsg ("You blindly grab for a bite of food. "	2399	op->statusmsg ("You blindly grab for a bite of food. "
2482	"H<To prevent you from starving, you ate some random item from your backpack.>");	2400	"H<To prevent you from starving, you ate some random item from your backpack.>");
2483	manual_apply (op, flesh, 0);	2401	op->apply (flesh);
2484	}	2402	}
2485		2403
2486	// If player is still starving, alert him!	2404	// If player is still starving, alert him!
2487	if (op->stats.food < 0)	2405	if (op->stats.food < 0)
2488	op->failmsg ("You are starving! "	2406	op->failmsg ("You are starving! "
…		…
2500	op->contr->killer->destroy ();	2418	op->contr->killer->destroy ();
2501	}	2419	}
2502	}	2420	}
2503		2421
2504	/* killer should be set here already */	2422	/* killer should be set here already */
2505	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2423	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2506	kill_player (op);	2424	kill_player (op);
2507	}	2425	}
2508	}	2426	}
2509		2427
2510	/* If the player should die (lack of hp, food, etc), we call this.	2428	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2525	return;	2443	return;
2526		2444
2527	dynbuf_text deathtab;	2445	dynbuf_text deathtab;
2528		2446
2529	/* restore player */	2447	/* restore player */
2530	at = archetype::find ("poisoning");	2448	at = archetype::find (shstr_poisoning);
2531	if (object *tmp = present_arch_in_ob (at, op))	2449	if (object *tmp = present_arch_in_ob (at, op))
2532	{	2450	{
2533	tmp->destroy ();	2451	tmp->destroy ();
2534	deathtab << "Your body feels cleansed...\r";	2452	deathtab << "Your body feels cleansed...\r";
2535	}	2453	}
2536		2454
2537	at = archetype::find ("confusion");	2455	at = archetype::find (shstr_confusion);
2538	if (object *tmp = present_arch_in_ob (at, op))	2456	if (object *tmp = present_arch_in_ob (at, op))
2539	{	2457	{
2540	tmp->destroy ();	2458	tmp->destroy ();
2541	deathtab << "Your mind feels clearer...\r";	2459	deathtab << "Your mind feels clearer...\r";
2542	}	2460	}
…		…
2544	cure_disease (op, 0, 0); /* remove any disease */	2462	cure_disease (op, 0, 0); /* remove any disease */
2545		2463
2546	max_it (op->stats.hp , op->stats.maxhp);	2464	max_it (op->stats.hp , op->stats.maxhp);
2547	max_it (op->stats.sp , op->stats.maxsp);	2465	max_it (op->stats.sp , op->stats.maxsp);
2548	max_it (op->stats.grace, op->stats.maxgrace);	2466	max_it (op->stats.grace, op->stats.maxgrace);
2549
2550	if (op->stats.food <= 0)	2467	max_it (op->stats.food , 200);
2551	op->stats.food = 999;
2552		2468
2553	// remove all spell effects that are active	2469	// remove all spell effects that are active
2554	// to avoid long-term effects such as word-of-recall	2470	// to avoid long-term effects such as word-of-recall
2555	for (object *item = op->inv; item; )	2471	for (object *item = op->inv; item; )
2556	{	2472	{
…		…
2569	if (op_on_battleground (op, &x, &y))	2485	if (op_on_battleground (op, &x, &y))
2570	{	2486	{
2571	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2487	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2572		2488
2573	/* create a bodypart-trophy to make the winner happy */	2489	/* create a bodypart-trophy to make the winner happy */
2574	if (object *tmp = arch_to_object (archetype::find ("finger")))	2490	object *tmp = archetype::find (shstr_finger)->instance ();
2575	{	2491
2576	tmp->name = format ("%s's finger" , &op->name);	2492	tmp->name = format ("%s's finger" , &op->name);
2577	tmp->name_pl = format ("%s's fingers", &op->name);	2493	tmp->name_pl = format ("%s's fingers", &op->name);
2578	tmp->msg = format (	2494	tmp->msg = format (
2579	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2495	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2580	&op->name, op->contr->title,	2496	&op->name, op->contr->title,
2581	(int)op->level,	2497	(int)op->level,
2582	op->contr->killer_name ()	2498	op->contr->killer_name ()
2583	);	2499	);
2584	tmp->value = 0, tmp->type = 0;	2500	tmp->value = 0, tmp->type = 0;
2585	tmp->materialname = "organics";	2501	tmp->material = name_to_material (shstr_organic);
2586	tmp->insert_at (op, tmp);	2502	tmp->insert_at (op, tmp);
2587	}
2588		2503
2589	/* teleport defeated player to new destination */	2504	/* teleport defeated player to new destination */
2590	transfer_ob (op, x, y, 0, NULL);	2505	transfer_ob (op, x, y, 0, NULL);
2591	op->contr->braced = 0;	2506	op->contr->braced = 0;
2592		2507
…		…
2654	lost_a_stat = 1;	2569	lost_a_stat = 1;
2655	}	2570	}
2656	else	2571	else
2657	{	2572	{
2658	/* deplete a stat */	2573	/* deplete a stat */
2659	archetype *deparch = archetype::find ("depletion");	2574	archetype *deparch = archetype::find (shstr_depletion);
2660	object *dep;	2575	object *dep;
2661		2576
2662	dep = present_arch_in_ob (deparch, op);	2577	dep = present_arch_in_ob (deparch, op);
2663	if (!dep)	2578	if (!dep)
2664	{	2579	{
2665	dep = arch_to_object (deparch);	2580	dep = deparch->instance ();
2666	insert_ob_in_ob (dep, op);	2581	insert_ob_in_ob (dep, op);
2667	}	2582	}
2668	lose_this_stat = 1;	2583	lose_this_stat = 1;
2669	if (settings.balanced_stat_loss)	2584	if (settings.balanced_stat_loss)
2670	{	2585	{
…		…
2708	* difference.	2623	* difference.
2709	*/	2624	*/
2710	if (this_stat >= -50)	2625	if (this_stat >= -50)
2711	{	2626	{
2712	change_attr_value (&(dep->stats), i, -1);	2627	change_attr_value (&(dep->stats), i, -1);
2713	SET_FLAG (dep, FLAG_APPLIED);	2628	dep->set_flag (FLAG_APPLIED);
2714	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2629	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2715	op->update_stats ();	2630	op->update_stats ();
2716	lost_a_stat = 1;	2631	lost_a_stat = 1;
2717	}	2632	}
2718	}	2633	}
…		…
2736	#endif	2651	#endif
2737		2652
2738	/* Put a gravestone up where the character 'almost' died. List the	2653	/* Put a gravestone up where the character 'almost' died. List the
2739	* exp loss on the stone.	2654	* exp loss on the stone.
2740	*/	2655	*/
2741	tmp = arch_to_object (archetype::find ("gravestone"));	2656	tmp = archetype::find (shstr_gravestone)->instance ();
2742	tmp->name = format ("%s's gravestone", &op->name);	2657	tmp->name = format ("%s's gravestone", &op->name);
2743	tmp->name_pl = format ("%s's gravestones", &op->name);	2658	tmp->name_pl = format ("%s's gravestones", &op->name);
2744	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2659	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2745	&op->name, op->contr->title, op->contr->killer_name ());	2660	&op->name, op->contr->title, op->contr->killer_name ());
2746	tmp->x = op->x, tmp->y = op->y;	2661	tmp->x = op->x, tmp->y = op->y;
…		…
2785	if (will_kill_again)	2700	if (will_kill_again)
2786	{	2701	{
2787	object *force;	2702	object *force;
2788	int at;	2703	int at;
2789		2704
2790	force = get_archetype (FORCE_NAME);	2705	force = archetype::get (FORCE_NAME);
2791	/* 50 ticks should be enough time for the spell to abate */	2706	/* 50 ticks should be enough time for the spell to abate */
2792	force->speed = 0.1f;
2793	force->speed_left = -5.f;	2707	force->speed_left = -5.f;
2794	SET_FLAG (force, FLAG_APPLIED);	2708	force->set_speed (0.1f);
		2709	force->set_flag (FLAG_APPLIED);
		2710
2795	for (at = 0; at < NROFATTACKS; at++)	2711	for (at = 0; at < NROFATTACKS; at++)
2796	if (will_kill_again & (1 << at))	2712	if (will_kill_again & (1 << at))
2797	force->resist[at] = 100;	2713	force->resist[at] = 100;
2798		2714
2799	insert_ob_in_ob (force, op);	2715	insert_ob_in_ob (force, op);
…		…
2801	}	2717	}
2802		2718
2803	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2719	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2804	}	2720	}
2805		2721
2806	void	2722	static void
2807	loot_object (object *op)	2723	loot_object (object *op)
2808	{ /* Grab and destroy some treasure */	2724	{ /* Grab and destroy some treasure */
2809	object *tmp, *tmp2, *next;	2725	object *tmp, *next;
2810		2726
2811	op->close_container (); /* close open sack first */	2727	op->close_container (); /* close open sack first */
2812		2728
2813	for (tmp = op->inv; tmp; tmp = next)	2729	for (tmp = op->inv; tmp; tmp = next)
2814	{	2730	{
…		…
2821	tmp->x = op->x, tmp->y = op->y;	2737	tmp->x = op->x, tmp->y = op->y;
2822		2738
2823	if (tmp->type == CONTAINER)	2739	if (tmp->type == CONTAINER)
2824	loot_object (tmp); /* empty container to ground */	2740	loot_object (tmp); /* empty container to ground */
2825		2741
2826	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2742	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2827	{	2743	{
2828	if (tmp->nrof > 1)	2744	if (tmp->nrof > 1)
2829	{	2745	{
2830	tmp->decrease (rndm (1, tmp->nrof - 1));	2746	tmp->decrease (rndm (1, tmp->nrof - 1));
2831	insert_ob_in_map (tmp, op->map, NULL, 0);	2747	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2842	* fix_weight(): Check recursively the weight of all players, and fix	2758	* fix_weight(): Check recursively the weight of all players, and fix
2843	* what needs to be fixed. Refresh windows and fix speed if anything	2759	* what needs to be fixed. Refresh windows and fix speed if anything
2844	* was changed.	2760	* was changed.
2845	*/	2761	*/
2846	void	2762	void
2847	fix_weight (void)	2763	fix_weight ()
2848	{	2764	{
2849	for_all_players (pl)	2765	for_all_players (pl)
2850	{	2766	{
2851	sint32 old = pl->ob->carrying;	2767	weight_t old = pl->ob->carrying;
2852		2768
2853	pl->ob->update_weight ();	2769	pl->ob->update_weight ();
2854		2770
2855	if (old != pl->ob->carrying)	2771	if (old != pl->ob->carrying)
2856	{	2772	{
…		…
2859	}	2775	}
2860	}	2776	}
2861	}	2777	}
2862		2778
2863	void	2779	void
2864	fix_luck (void)	2780	fix_luck ()
2865	{	2781	{
2866	for_all_players (pl)	2782	for_all_players (pl)
2867	if (!pl->ob->contr->ns->state)	2783	if (!pl->ob->contr->ns->state)
2868	pl->ob->change_luck (0);	2784	pl->ob->change_luck (0);
2869	}	2785	}
…		…
2921	}	2837	}
2922		2838
2923	int	2839	int
2924	is_true_undead (object *op)	2840	is_true_undead (object *op)
2925	{	2841	{
2926	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2842	if (op->arch->flag [FLAG_UNDEAD])
2927	return 1;	2843	return 1;
2928		2844
2929	return 0;	2845	return 0;
2930	}	2846	}
2931		2847
…		…
3029		2945
3030	if (who->type == PLAYER)	2946	if (who->type == PLAYER)
3031	player = 1;	2947	player = 1;
3032		2948
3033	else	2949	else
3034	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2950	friendly = who->flag [FLAG_FRIENDLY];
3035		2951
3036	/* search adjacent squares */	2952	/* search adjacent squares */
3037	for (i = 1; i < 9; i++)	2953	for (i = 1; i < 9; i++)
3038	{	2954	{
3039	x = who->x + freearr_x[i];	2955	x = who->x + freearr_x[i];
…		…
3048	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2964	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3049	continue;	2965	continue;
3050		2966
3051	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2967	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3052	{	2968	{
3053	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2969	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3054	return 1;	2970	return 1;
3055	else if (tmp->type == PLAYER)	2971	else if (tmp->type == PLAYER)
3056	{
3057	/*don't let a hidden DM prevent you from hiding */
3058	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3059	return 1;	2972	return 1;
3060	}
3061	}	2973	}
3062	}	2974	}
3063	return 0;	2975	return 0;
3064	}	2976	}
3065		2977
3066	/* check the player los field for viewability of the	2978	/* check the player los field for viewability of the
3067	* object op. This function works fine for monsters,	2979	* object op. This function works fine for monsters,
3068	* but we dont worry if the object isnt the top one in	2980	* but we dont worry if the object isnt the top one in
3069	* a pile (say a coin under a table would return "viewable"	2981	* a pile (say a coin under a table would return "viewable"
3070	* by this routine). Another question, should we be	2982	* by this routine). Another question, should we be
3071	* concerned with the direction the player is looking	2983	* concerned with the direction the player is looking
3072	* in? Realistically, most of us can't see stuff behind	2984	* in? Realistically, most of us can't see stuff behind
3073	* our backs...on the other hand, does the "facing" direction	2985	* our backs...on the other hand, does the "facing" direction
3074	* imply the way your head, or body is facing? It's possible	2986	* imply the way your head, or body is facing? It's possible
3075	* for them to differ. Sigh, this fctn could get a bit more complex.	2987	* for them to differ. Sigh, this fctn could get a bit more complex.
3076	* -b.t.	2988	* -b.t.
3077	* This function is now map tiling safe.	2989	* This function is now map tiling safe.
3078	*/	2990	*/
3079	int	2991	int
3080	player_can_view (object *pl, object *op)	2992	player_can_view (object *pl, object *op)
3081	{	2993	{
…		…
3108		3020
3109	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)	3021	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3110	return 1;	3022	return 1;
3111		3023
3112	op = op->more;	3024	op = op->more;
3113	}
3114
3115	return 0;
3116	}
3117
3118	/* routine for both players and monsters. We call this when
3119	* there is a possibility for our action distrubing our hiding
3120	* place or invisiblity spell. Artefact invisiblity causes
3121	* "noise" instead. If we arent invisible to begin with, we
3122	* return 0.
3123	*/
3124	int
3125	action_makes_visible (object *op)
3126	{
3127	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3128	{
3129	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3130	{
3131	// artefact invisibility is permanent, but we still make noise
3132	// this is important for game-balance.
3133	if (op->contr)
3134	op->make_noise ();
3135
3136	return 0;
3137	}
3138
3139	if (op->contr && op->contr->tmp_invis == 0)
3140	return 0;
3141
3142	/* If monsters, they should become visible */
3143	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3144	{
3145	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3146	return 1;
3147	}
3148	}	3025	}
3149		3026
3150	return 0;	3027	return 0;
3151	}	3028	}
3152		3029
…		…
3167	* and the exit-coordinates sp/hp must both be > 0.	3044	* and the exit-coordinates sp/hp must both be > 0.
3168	* => The intention here is to prevent abuse of the battleground-	3045	* => The intention here is to prevent abuse of the battleground-
3169	* feature (like pickable or hidden battleground tiles). */	3046	* feature (like pickable or hidden battleground tiles). */
3170	for (object *tmp = op->below; tmp; tmp = tmp->below)	3047	for (object *tmp = op->below; tmp; tmp = tmp->below)
3171	{	3048	{
3172	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3049	if (tmp->flag [FLAG_IS_FLOOR])
3173	{	3050	{
3174	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3051	if (tmp->flag [FLAG_NO_PICK]
3175	&& tmp->type == BATTLEGROUND	3052	&& tmp->type == BATTLEGROUND
3176	&& tmp->name == shstr_battleground	3053	&& tmp->name == shstr_battleground
3177	&& EXIT_X (tmp) && EXIT_Y (tmp))	3054	&& EXIT_X (tmp) && EXIT_Y (tmp))
3178	{	3055	{
3179	/* before we assign the exit, check if this is a teambattle */	3056	/* before we assign the exit, check if this is a teambattle */
3180	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3057	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3181	{
3182	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3058	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3059	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3183	{	3060	{
3184	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3185	{
3186	if (x && y)	3061	if (x && y)
3187	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3062	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3188		3063
3189	return 1;	3064	return 1;
3190	}
3191	}	3065	}
3192	}
3193		3066
3194	if (x && y)	3067	if (x && y)
3195	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3068	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3196		3069
3197	return 1;	3070	return 1;
…		…
3335	else	3208	else
3336	j = 1;	3209	j = 1;
3337	strcat (buf, spellpathnames[i]);	3210	strcat (buf, spellpathnames[i]);
3338	}	3211	}
3339	}	3212	}
		3213
3340	strcat (buf, ".");	3214	strcat (buf, ".");
3341	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3215	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3342	}	3216	}
3343		3217
3344	/* evtl. adding flags: */	3218	/* evtl. adding flags: */
3345	if (QUERY_FLAG (item, FLAG_XRAYS))	3219	if (item->flag [FLAG_XRAYS])
3346	SET_FLAG (skin, FLAG_XRAYS);	3220	skin->set_flag (FLAG_XRAYS);
3347	if (QUERY_FLAG (item, FLAG_STEALTH))	3221	if (item->flag [FLAG_STEALTH])
3348	SET_FLAG (skin, FLAG_STEALTH);	3222	skin->set_flag (FLAG_STEALTH);
3349	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3223	if (item->flag [FLAG_SEE_IN_DARK])
3350	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3224	skin->set_flag (FLAG_SEE_IN_DARK);
3351		3225
3352	/* print message if there is one */	3226	/* print message if there is one */
3353	if (item->msg != NULL)	3227	if (item->msg != NULL)
3354	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3228	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3355	}	3229	}
3356	else	3230	else
3357	{	3231	{
3358	/* generate misc. treasure */	3232	/* generate misc. treasure */
3359	tmp = arch_to_object (tr->item);	3233	tmp = tr->item->instance ();
3360	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3234	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3361	who->insert (tmp);	3235	who->insert (tmp);
3362	}	3236	}
3363	}	3237	}
3364		3238
3365	/**	3239	//-GPL
3366	* Unready an object for a player. This function does nothing if the object was
3367	* not readied.
3368	*/
3369	void
3370	player_unready_range_ob (player *pl, object *ob)
3371	{
3372	if (pl->ob->current_weapon == ob)
3373	pl->ob->current_weapon = 0;
3374
3375	if (pl->combat_ob == ob)
3376	pl->combat_ob = 0;
3377
3378	if (pl->ranged_ob == ob)
3379	pl->ranged_ob = 0;
3380	}
3381		3240
3382	sint8	3241	sint8
3383	player::darkness_at (maptile *map, int x, int y) const	3242	player::darkness_at (maptile *map, int x, int y) const
3384	{	3243	{
3385	if (!ns)	3244	if (!ns)
…		…
3412	{	3271	{
3413	play_sound (sound_find ("generic_failure"));	3272	play_sound (sound_find ("generic_failure"));
3414	statusmsg (msg, color);	3273	statusmsg (msg, color);
3415	}	3274	}
3416		3275
		3276	void
		3277	object::failmsgf (const char *format, ...)
		3278	{
		3279	if (!contr)
		3280	return;
		3281
		3282	va_list ap;
		3283	va_start (ap, format);
		3284	contr->failmsg (vformat (format, ap));
		3285	va_end (ap);
		3286	}
		3287
		3288	void
		3289	player::failmsgf (const char *format, ...)
		3290	{
		3291	va_list ap;
		3292	va_start (ap, format);
		3293	failmsg (vformat (format, ap));
		3294	va_end (ap);
		3295	}
		3296

Diff Legend

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