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.233 by root, Mon Oct 12 14:00:59 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* 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 Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* 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>
23	*/	23	*/
		24
		25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
24		29
25	#include <global.h>	30	#include <global.h>
26	#include <sproto.h>	31	#include <sproto.h>
27	#include <sounds.h>	32	#include <sounds.h>
28	#include <living.h>	33	#include <living.h>
29	#include <object.h>	34	#include <object.h>
30	#include <spells.h>	35	#include <spells.h>
31	#include <skills.h>	36	#include <skills.h>
32		37
33	#include <algorithm>
34	#include <functional>
35
36	playervec players;	38	playervec players;
37
38	void
39	display_motd (const object *op)
40	{
41	char buf[MAX_BUF];
42	char motd[HUGE_BUF];
43	FILE *fp;
44	int comp;
45	int size;
46
47	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49	return;
50
51	motd[0] = '\0';
52	size = 0;
53
54	while (fgets (buf, MAX_BUF, fp))
55	{
56	if (*buf == '#')
57	continue;
58
59	strncat (motd + size, buf, HUGE_BUF - size);
60	size += strlen (buf);
61	}
62
63	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64	close_and_delete (fp, comp);
65	}
66
67	void
68	send_rules (const object *op)
69	{
70	char buf[MAX_BUF];
71	char rules[HUGE_BUF];
72	FILE *fp;
73	int comp;
74	int size;
75
76	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78	return;
79
80	rules[0] = '\0';
81	size = 0;
82
83	while (fgets (buf, MAX_BUF, fp))
84	{
85	if (*buf == '#')
86	continue;
87
88	if (size + strlen (buf) >= HUGE_BUF)
89	{
90	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91	break;
92	}
93
94	strncat (rules + size, buf, HUGE_BUF - size);
95	size += strlen (buf);
96	}
97
98	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99	close_and_delete (fp, comp);
100	}
101
102	void
103	send_news (const object *op)
104	{
105	char buf[MAX_BUF];
106	char news[HUGE_BUF];
107	char subject[MAX_BUF];
108	FILE *fp;
109	int comp;
110	int size;
111
112	sprintf (buf, "%s/%s", settings.confdir, settings.news);
113	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114	return;
115
116	news[0] = '\0';
117	subject[0] = '\0';
118	size = 0;
119
120	while (fgets (buf, MAX_BUF, fp))
121	{
122	if (*buf == '#')
123	continue;
124
125	if (*buf == '%')
126	{ /* send one news */
127	if (size > 0)
128	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
129	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
130	"INFORMATION: %s\n%s", (char *)"%s\n%s",
131	subject, news); /*send previously read news */
132
133	strcpy (subject, buf + 1);
134	strip_endline (subject);
135	size = 0;
136	news[0] = '\0';
137	}
138	else
139	{
140	if (size + strlen (buf) >= HUGE_BUF)
141	{
142	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
143	break;
144	}
145	strncat (news + size, buf, HUGE_BUF - size);
146	size += strlen (buf);
147	}
148	}
149
150	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
151	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
152	close_and_delete (fp, comp);
153	}
154		39
155	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
156	static void	41	static void
157	set_first_map (object *op)	42	set_first_map (object *op)
158	{	43	{
…		…
169		54
170	players.insert (this);	55	players.insert (this);
171	ob->remove ();	56	ob->remove ();
172	ob->map = 0;	57	ob->map = 0;
173	ob->activate_recursive ();	58	ob->activate_recursive ();
174	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
175	add_friendly_object (ob);	60	add_friendly_object (ob);
176	}	61	}
177		62
178	void	63	void
179	player::deactivate ()	64	player::deactivate ()
…		…
191	ob->remove ();	76	ob->remove ();
192	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
193	ob->map = 0;	78	ob->map = 0;
194	party = 0;	79	party = 0;
195		80
196	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
197
198	players.erase (this);	81	players.erase (this);
199	}	82	}
200		83
201	// connect the player with a specific client	84	// connect the player with a specific client
202	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
222	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
223		106
224	ob->update_weight ();	107	ob->update_weight ();
225	link_skills ();	108	link_skills ();
226		109
227	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
228
229	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
230		111
231	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
232	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
233	{	114	{
234	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
235		116
236	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
237	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
245		126
246	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
247		128
248	esrv_new_player (this);	129	esrv_new_player (this);
249		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
250	ob->update_stats ();	136	ob->update_stats ();
251		137
252	ns->floorbox_update ();	138	ns->floorbox_update ();
253	esrv_send_inventory (ob, ob);	139	esrv_send_inventory (ob, ob);
254	esrv_add_spells (this, 0);	140	esrv_add_spells (this, 0);
255		141
256	activate ();	142	activate ();
257		143
258	send_rules (ob);
259	send_news (ob);
260	display_motd (ob);
261
262	INVOKE_PLAYER (CONNECT, this);	144	INVOKE_PLAYER (CONNECT, this);
263	INVOKE_PLAYER (LOGIN, this);	145	INVOKE_PLAYER (LOGIN, this);
264	}	146	}
265		147
266	void	148	void
…		…
282	ns->reset_stats ();	164	ns->reset_stats ();
283	ns->pl = 0;	165	ns->pl = 0;
284	ns = 0;	166	ns = 0;
285	}	167	}
286		168
287	observe = ob;	169	// this is important for the player scheduler to get the correct refcount
		170	// when ns = 0
		171	observe = viewpoint = ob;
288		172
289	deactivate ();	173	deactivate ();
290	}	174	}
		175
		176	//-GPL
291		177
292	// the need for this function can be explained	178	// the need for this function can be explained
293	// by load_object not returning the object	179	// by load_object not returning the object
294	void	180	void
295	player::set_object (object *op)	181	player::set_object (object *op)
296	{	182	{
297	ob = observe = op;	183	ob = observe = viewpoint = op;
298	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
299		185
300	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
301	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
302		188
303	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
304
305	ob->flag [FLAG_READY_WEAPON] = false;
306	ob->flag [FLAG_READY_SKILL] = false;
307	ob->flag [FLAG_READY_BOW] = false;
308
309	for (object *op = ob->inv; op; op = op->below)
310	if (op->flag [FLAG_APPLIED])
311	switch (op->type)
312	{
313	case SKILL:
314	ob->flag [FLAG_APPLIED] = false;
315	break;
316
317	case WAND:
318	case ROD:
319	case HORN:
320	case BOW:
321	ranged_ob = op;
322	break;
323
324	case WEAPON:
325	combat_ob = op;
326	break;
327	}
328
329	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
330	ob->deactivate (); // change_weapon activates, fix this better
331	}	190	}
332		191
333	void	192	void
334	player::set_observe (object *op)	193	player::set_observe (object *op)
335	{	194	{
336	observe = op ? op : ob;	195	observe = viewpoint = op ? op : ob;
337	do_los = 1;	196	do_los = 1;
338	}	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
339		207
340	player::player ()	208	player::player ()
341	{	209	{
342	/* There are some elements we want initialised to non zero value -	210	/* There are some elements we want initialised to non zero value -
343	* we deal with that below this point.	211	* we deal with that below this point.
…		…
365	disconnect ();	233	disconnect ();
366		234
367	attachable::do_destroy ();	235	attachable::do_destroy ();
368		236
369	if (ob)	237	if (ob)
370	{
371	ob->destroy_inv (false);
372	ob->destroy ();	238	ob->destroy ();
373	}
374		239
375	ob = observe = 0;	240	ob = observe = viewpoint = 0;
376	}	241	}
377		242
378	player::~player ()	243	player::~player ()
379	{	244	{
380	/* Clear item stack */	245	/* Clear item stack */
381	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	}
382	}	275	}
383		276
384	/* Tries to add player on the connection passed in ns.	277	/* Tries to add player on the connection passed in ns.
385	* 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
386	* mode.	279	* mode.
…		…
388	player *	281	player *
389	player::create ()	282	player::create ()
390	{	283	{
391	player *pl = new player;	284	player *pl = new player;
392		285
393	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
394		287
395	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
396	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
397	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
398		291
399	set_first_map (pl->ob);	292	set_first_map (pl->ob);
400		293
401	return pl;	294	return pl;
402	}
403
404	/*
405	* get_player_archetype() return next player archetype from archetype
406	* list. Not very efficient routine, but used only creating new players.
407	* Note: there MUST be at least one player archetype!
408	*/
409	archetype *
410	get_player_archetype (archetype *at)
411	{
412	// archetypes could have been reloaded
413	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
414
415	if (!nat)
416	return at;
417
418	archvec::iterator i = archetypes.find (nat);
419
420	for (;;)
421	{
422	if (++i == archetypes.end ())
423	i = archetypes.begin ();
424	else if (*i == at)
425	cleanup ("not a single player archetype found");
426
427	if ((*i)->type == PLAYER)
428	return *i;
429	}
430	}	295	}
431		296
432	object *	297	object *
433	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
434	{	299	{
…		…
508	*/	373	*/
509	int	374	int
510	path_to_player (object *mon, object *pl, unsigned mindiff)	375	path_to_player (object *mon, object *pl, unsigned mindiff)
511	{	376	{
512	rv_vector rv;	377	rv_vector rv;
513	sint16 x, y;
514	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;
515	maptile *m, *lastmap;
516		379
517	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
518		381
519	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
520	return 0;	383	return 0;
521		384
522	x = mon->x;	385	mapxy pos (mon);
523	y = mon->y;
524	m = mon->map;
525	dir = rv.direction;	386	dir = rv.direction;
526	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 */
527	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
528		389
529	/* 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. */
530	if (diff > max)	391	if (diff > max)
531	return 0;	392	return 0;
532		393
533	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
534	{	395	{
535	lastx = x;	396	mapxy lastpos = pos;
536	lasty = y;
537	lastmap = m;
538	x = lastx + freearr_x[dir];
539	y = lasty + freearr_y[dir];
540		397
541	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
542	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
543		399
544	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
545	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
546	&& (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)))
547	{	404	{
548	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
549	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
550	*/	407	*/
551	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
552	if (rv.direction != dir)	409	if (rv.direction != dir)
553	{	410	{
554	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
555	* the values so it will try again.	412	* the values so it will try again.
556	*/	413	*/
557	x = lastx;
558	y = lasty;
559	m = lastmap;	414	pos = lastpos;
560	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
561	}	416	}
562	else	417	else
563	{	418	{
564	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
571	*/	426	*/
572	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
573	{	428	{
574	if (i == 0)	429	if (i == 0)
575	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
576	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
577	* since the direction that the creature should move in	433	* since the direction that the creature should move in
578	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
579	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
580	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
582	* 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
583	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
584	* the last direction the creature has successfully	440	* the last direction the creature has successfully
585	* moved.	441	* moved.
586	*/	442	*/
587
588	x = lastx + freearr_x[absdir (lastdir + i)];
589	y = lasty + freearr_y[absdir (lastdir + i)];
590	m = lastmap;	443	pos = lastpos;
591	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
592	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
593	continue;	447	continue;
594	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
595	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
596	continue;	452	continue;
597	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
598	continue;	455	continue;
599		456
600	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
601	break;	458	break;
602	}	459	}
		460
603	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
604	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
605	*/	463	*/
606	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
607	return 0;	465	return 0;
		466
608	diff--;	467	diff--;
609	lastdir = dir;	468	lastdir = dir;
610	max--;	469	max--;
611	if (!firstdir)	470	if (!firstdir)
612	firstdir = dir + i;	471	firstdir = dir + i;
…		…
616	{	475	{
617	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
618	diff--;	477	diff--;
619	max--;	478	max--;
620	lastdir = dir;	479	lastdir = dir;
		480
621	if (!firstdir)	481	if (!firstdir)
622	firstdir = dir;	482	firstdir = dir;
623	}	483	}
624		484
625	if (diff <= 1)	485	if (diff <= 1)
626	{	486	{
627	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
628	* headed toward player for entire distance.	488	* headed toward player for entire distance.
629	*/	489	*/
630	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
631	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
632	}	492	}
633		493
634	if (diff > max)	494	if (diff > max)
635	return 0;	495	return 0;
…		…
653	next = op->below;	513	next = op->below;
654		514
655	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
656	* 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
657	*/	517	*/
658	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
659	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
660		520
661	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
662	* by this player due to race restrictions	522	* by this player due to race restrictions
663	*/	523	*/
664	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
665	{	525	{
666	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	526	if ((!pl->flag [FLAG_USE_ARMOUR]
667	&&	527	&&
668	(op->type == ARMOUR || op->type == BOOTS	528	(op->type == ARMOUR || op->type == BOOTS
669	|| op->type == CLOAK || op->type == HELMET	529	|| op->type == CLOAK || op->type == HELMET
670	|| op->type == SHIELD || op->type == GLOVES	530	|| op->type == SHIELD || op->type == GLOVES
671	|| op->type == BRACERS || op->type == GIRDLE))	531	|| op->type == BRACERS || op->type == GIRDLE))
672	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	532	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
673	{	533	{
674	op->destroy ();	534	op->destroy ();
675	continue;	535	continue;
676	}	536	}
677	}	537	}
678		538
679	/* Here we remove duplicated skills (as duplicated spell objects have	539	/* Here we remove duplicated skills (as duplicated spell objects have
680	* _very_ confusing effects for players), which could for instance be	540	* _very_ confusing effects for players), which could for instance be
681	* generated by bad treasurelists. - elmex	541	* generated by multiple treasurelists specifying the same skills.
682	*/	542	*/
683	if (op->type == SKILL)	543	if (op->type == SKILL)
684	{	544	{
685	for (object *tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
686	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
687	{	547	{
688	op->destroy ();	548	op->destroy ();
689	LOG (llevError,
690	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
691	break;	549	break;
692	}	550	}
693		551
694	if (op->nrof > 1)	552	if (op->nrof > 1)
695	op->nrof = 1;	553	op->nrof = 1;
696	}	554	}
697		555
698	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
699	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	557	op->inv->clr_flag (FLAG_STARTEQUIP);
700		558
701	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
702	* 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
703	* merged properly.	561	* merged properly.
704	*/	562	*/
705	if (need_identify (op))	563	if (op->need_identify ())
706	{	564	{
707	SET_FLAG (op, FLAG_IDENTIFIED);	565	op->set_flag (FLAG_IDENTIFIED);
708	CLEAR_FLAG (op, FLAG_CURSED);	566	op->clr_flag (FLAG_CURSED);
709	CLEAR_FLAG (op, FLAG_DAMNED);	567	op->clr_flag (FLAG_DAMNED);
710	}	568	}
711		569
712	if (op->type == SPELL)	570	if (op->type == SPELL)
713	{	571	{
714	op->destroy ();	572	op->destroy ();
715	continue;	573	continue;
716	}	574	}
717	else if (op->type == SKILL)	575	else if (op->type == SKILL)
718	{	576	{
719	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
720	op->stats.exp = 0;	578	op->stats.exp = 0;
721	op->level = 1;	579	op->level = 1;
722	}	580	}
723	else /* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
724	SET_FLAG (op, FLAG_INV_LOCKED);	582	op->set_flag (FLAG_INV_LOCKED);
725	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
726		584
727	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
728	pl->contr->link_skills ();	586	pl->contr->link_skills ();
729	}	587	}
…		…
743	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:");
744	}	602	}
745		603
746	/* 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. */
747	static int	605	static int
748	roll_stat (void)	606	roll_stat ()
749	{	607	{
750	int a[4], i, j, k;	608	int a[4], i, j, k;
751		609
752	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
753	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
754		612
755	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
756	if (a[i] < k)	614	if (a[i] < k)
757	k = a[i], j = i;	615	k = a[i], j = i;
758		616
…		…
850	player::chargen_race_done ()	708	player::chargen_race_done ()
851	{	709	{
852	/* this must before then initial items are given */	710	/* this must before then initial items are given */
853	esrv_new_player (ob->contr);	711	esrv_new_player (ob->contr);
854		712
855	treasurelist *tl = treasurelist::find ("starting_wealth");	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
856	if (tl)	714	if (tl)
857	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
858		716
859	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
860	INVOKE_PLAYER (LOGIN, ob->contr);
861		718
862	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
863		720
864	if (ob->msg)	721	if (ob->msg)
865	ob->msg = 0;	722	ob->msg = 0;
866		723
867	start_info (ob);	724	start_info (ob);
868	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
869	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
870	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
871	ob->update_stats ();	728	ob->update_stats ();
872		729
873	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
…		…
875	*/	732	*/
876	if (*first_map_ext_path)	733	if (*first_map_ext_path)
877	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);
878	else	735	else
879	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;
880	}	756	}
881		757
882	void	758	void
883	player::chargen_race_next ()	759	player::chargen_race_next ()
884	{	760	{
…		…
913	ob->stats.hp = ob->stats.maxhp;	789	ob->stats.hp = ob->stats.maxhp;
914	ob->stats.sp = ob->stats.maxsp;	790	ob->stats.sp = ob->stats.maxsp;
915	ob->stats.grace = 0;	791	ob->stats.grace = 0;
916	}	792	}
917		793
918	void	794	static void
919	flee_player (object *op)	795	flee_player (object *op)
920	{	796	{
921	int dir, diff;	797	int dir, diff;
922	rv_vector rv;	798	rv_vector rv;
923		799
924	if (op->stats.hp < 0)	800	if (op->stats.hp < 0)
925	{	801	{
926	LOG (llevDebug, "Fleeing player is dead.\n");	802	LOG (llevDebug, "Fleeing player is dead.\n");
927	CLEAR_FLAG (op, FLAG_SCARED);	803	op->clr_flag (FLAG_SCARED);
928	return;	804	return;
929	}	805	}
930		806
931	if (!op->enemy)	807	if (!op->enemy)
932	{	808	{
933	LOG (llevDebug, "Fleeing player had no enemy.\n");	809	LOG (llevDebug, "Fleeing player had no enemy.\n");
934	CLEAR_FLAG (op, FLAG_SCARED);	810	op->clr_flag (FLAG_SCARED);
935	return;	811	return;
936	}	812	}
937		813
938	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))
939	{	815	{
940	op->enemy = NULL;	816	op->enemy = NULL;
941	CLEAR_FLAG (op, FLAG_SCARED);	817	op->clr_flag (FLAG_SCARED);
942	return;	818	return;
943	}	819	}
944		820
945	get_rangevector (op, op->enemy, &rv, 0);	821	get_rangevector (op, op->enemy, &rv, 0);
946		822
947	dir = absdir (4 + rv.direction);	823	dir = absdir (4 + rv.direction);
948	for (diff = 0; diff < 3; diff++)	824	for (diff = 0; diff < 3; diff++)
949	{	825	{
950	int m = 1 - rndm (2) * 2;	826	int m = 1 - rndm (2) * 2;
951		827
952	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))))
953	return;	829	return;
954	}	830	}
955		831
956	/* Cornered, get rid of scared */	832	/* Cornered, get rid of scared */
957	CLEAR_FLAG (op, FLAG_SCARED);	833	op->clr_flag (FLAG_SCARED);
958	op->enemy = NULL;	834	op->enemy = NULL;
959	}	835	}
960		836
961	/* 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.
962	* 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
…		…
967	{	843	{
968	object *tmp, *next;	844	object *tmp, *next;
969	int stop = 0;	845	int stop = 0;
970	int wvratio;	846	int wvratio;
971		847
972	/* if you're flying, you cna't pick up anything */	848	/* if you're flying, you can't pick up anything */
973	if (op->move_type & MOVE_FLYING)	849	if (op->move_type & MOVE_FLYING)
974	return 1;	850	return 1;
975		851
976	next = op->below;	852	next = op->below;
977		853
978	int cnt = MAX_ITEM_PER_DROP;	854	int cnt = MAX_ITEM_PER_ACTION;
979	#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)
980		856
981	/* 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
982	* destroyed */	858	* destroyed */
983	while (next && !next->destroyed ())	859	while (next && !next->destroyed ())
…		…
1009	if (op->contr->mode & PU_DEBUG)	885	if (op->contr->mode & PU_DEBUG)
1010	{	886	{
1011	/* some debugging code to figure out item information */	887	/* some debugging code to figure out item information */
1012	const char *str = tmp->name	888	const char *str = tmp->name
1013	? format ("item name: %s item type: %d weight/value: %d",	889	? format ("item name: %s item type: %d weight/value: %d",
1014	&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))))
1015	: format ("item name: %s item type: %d weight/value: %d",	891	: format ("item name: %s item type: %d weight/value: %d",
1016	&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))));
1017		893
1018	new_draw_info (NDI_UNIQUE, 0, op, str);	894	new_draw_info (NDI_UNIQUE, 0, op, str);
1019	}	895	}
1020		896
1021	if (op->contr->mode & PU_INHIBIT)	897	if (op->contr->mode & PU_INHIBIT)
…		…
1054	* fighting */	930	* fighting */
1055	if (op->contr->mode & PU_INHIBIT)	931	if (op->contr->mode & PU_INHIBIT)
1056	return 1;	932	return 1;
1057		933
1058	/* prevent us from turning into auto-thieves :) */	934	/* prevent us from turning into auto-thieves :) */
1059	if (QUERY_FLAG (tmp, FLAG_UNPAID))	935	if (tmp->flag [FLAG_UNPAID])
1060	continue;	936	continue;
1061		937
1062	/* ignore known cursed objects */	938	/* ignore known cursed objects */
1063	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)
1064	continue;	940	continue;
1065		941
1066	/* all food and drink if desired */	942	/* all food and drink if desired */
1067	/* question: don't pick up known-poisonous stuff? */	943	/* question: don't pick up known-poisonous stuff? */
1068	if (op->contr->mode & PU_FOOD)	944	if (op->contr->mode & PU_FOOD)
…		…
1071	CHK_PICK_PICKUP;	947	CHK_PICK_PICKUP;
1072	continue;	948	continue;
1073	}	949	}
1074		950
1075	if (op->contr->mode & PU_DRINK)	951	if (op->contr->mode & PU_DRINK)
1076	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]))
1077	{	953	{
1078	CHK_PICK_PICKUP;	954	CHK_PICK_PICKUP;
1079	continue;	955	continue;
1080	}	956	}
1081		957
…		…
1108	continue;	984	continue;
1109	}	985	}
1110		986
1111	/* wands/staves/rods/horns */	987	/* wands/staves/rods/horns */
1112	if (op->contr->mode & PU_MAGIC_DEVICE)	988	if (op->contr->mode & PU_MAGIC_DEVICE)
1113	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)
1114	{	993	{
1115	CHK_PICK_PICKUP;	994	CHK_PICK_PICKUP;
1116	continue;	995	continue;
1117	}	996	}
1118		997
1119	/* pick up all magical items */	998	/* pick up all magical items */
1120	if (op->contr->mode & PU_MAGICAL)	999	if (op->contr->mode & PU_MAGICAL)
1121	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])
1122	{	1002	{
1123	CHK_PICK_PICKUP;	1003	CHK_PICK_PICKUP;
1124	continue;	1004	continue;
1125	}	1005	}
1126		1006
…		…
1133	}	1013	}
1134	}	1014	}
1135		1015
1136	/* rings & amulets - talismans seems to be typed AMULET */	1016	/* rings & amulets - talismans seems to be typed AMULET */
1137	if (op->contr->mode & PU_JEWELS)	1017	if (op->contr->mode & PU_JEWELS)
1138	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)
1139	{	1022	{
1140	CHK_PICK_PICKUP;	1023	CHK_PICK_PICKUP;
1141	continue;	1024	continue;
1142	}	1025	}
1143		1026
…		…
1192	CHK_PICK_PICKUP;	1075	CHK_PICK_PICKUP;
1193	continue;	1076	continue;
1194	}	1077	}
1195		1078
1196	if (op->contr->mode & PU_GLOVES)	1079	if (op->contr->mode & PU_GLOVES)
1197	if (tmp->type == GLOVES)	1080	if (tmp->type == GLOVES || tmp->type == BRACERS)
1198	{	1081	{
1199	CHK_PICK_PICKUP;	1082	CHK_PICK_PICKUP;
1200	continue;	1083	continue;
1201	}	1084	}
1202		1085
…		…
1207	continue;	1090	continue;
1208	}	1091	}
1209		1092
1210	/* hoping to catch throwing daggers here */	1093	/* hoping to catch throwing daggers here */
1211	if (op->contr->mode & PU_MISSILEWEAPON)	1094	if (op->contr->mode & PU_MISSILEWEAPON)
1212	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1095	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1213	{	1096	{
1214	CHK_PICK_PICKUP;	1097	CHK_PICK_PICKUP;
1215	continue;	1098	continue;
1216	}	1099	}
1217		1100
…		…
1252	fprintf (stderr, "%s", tmp->name);	1135	fprintf (stderr, "%s", tmp->name);
1253	}	1136	}
1254	else	1137	else
1255	fprintf (stderr, "%s", tmp->arch->archname);	1138	fprintf (stderr, "%s", tmp->arch->archname);
1256	fprintf (stderr, ",%d] = ", tmp->type);	1139	fprintf (stderr, ",%d] = ", tmp->type);
1257	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))));
1258	#endif	1141	#endif
1259	CHK_PICK_PICKUP;	1142	CHK_PICK_PICKUP;
1260	continue;	1143	continue;
1261	}	1144	}
1262	} /* the new pickup model */	1145	} /* the new pickup model */
1263	}	1146	}
1264		1147
1265	return !stop;	1148	return !stop;
1266	}	1149	}
1267		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
1268	/*	1186	/*
1269	* Find an arrow in the inventory and after that	1187	* Find an arrow in the inventory and after that
1270	* in the right type container (quiver). Pointer to the	1188	* in the right type container (quiver). Pointer to the
1271	* found object is returned.	1189	* found object is returned.
1272	*/	1190	*/
1273	object *	1191	static object *
1274	find_arrow (object *op, const char *type)	1192	find_arrow (object *op, const char *type)
1275	{	1193	{
1276	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1194	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1277	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1195	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1278	return splay (tmp);	1196	return splay (tmp);
1279		1197
1280	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1198	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1281	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))
1282	if (object *arrow = find_arrow (tmp, type))	1200	if (object *arrow = find_arrow (tmp, type))
1283	{	1201	{
1284	splay (tmp);	1202	splay (tmp);
1285	return arrow;	1203	return arrow;
1286	}	1204	}
…		…
1292	* 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
1293	* 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
1294	* 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
1295	* 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.
1296	*/	1214	*/
1297	object *	1215	static object *
1298	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)
1299	{	1217	{
1300	object *tmp = NULL, *arrow, *ntmp;	1218	object *tmp = NULL, *arrow, *ntmp;
1301	int attacknum, attacktype, betterby = 0, i;	1219	int attacknum, attacktype, betterby = 0, i;
1302		1220
1303	if (!type)	1221	if (!type)
1304	return NULL;	1222	return NULL;
1305		1223
1306	for (arrow = op->inv; arrow; arrow = arrow->below)	1224	for (arrow = op->inv; arrow; arrow = arrow->below)
1307	{	1225	{
1308	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1226	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1309	{	1227	{
1310	i = 0;	1228	i = 0;
1311	ntmp = find_better_arrow (arrow, target, type, &i);	1229	ntmp = find_better_arrow (arrow, target, type, &i);
1312		1230
1313	if (i > betterby)	1231	if (i > betterby)
…		…
1371	* find_better_arrow to find a decent arrow to use.	1289	* find_better_arrow to find a decent arrow to use.
1372	* op = the shooter	1290	* op = the shooter
1373	* type = bow->race	1291	* type = bow->race
1374	* dir = fire direction	1292	* dir = fire direction
1375	*/	1293	*/
1376	object *	1294	static object *
1377	pick_arrow_target (object *op, shstr_cmp type, int dir)	1295	pick_arrow_target (object *op, shstr_cmp type, int dir)
1378	{	1296	{
1379	object *tmp = NULL;	1297	object *tmp = NULL;
1380	maptile *m;	1298	maptile *m;
1381	int i, mflags, found, number;	1299	int i, mflags, found, number;
…		…
1414	break;	1332	break;
1415	}	1333	}
1416		1334
1417	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1418	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)
1419	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1337	if (tmp->flag [FLAG_ALIVE])
1420	break;	1338	break;
1421	}	1339	}
1422		1340
1423	if (!tmp)	1341	if (!tmp)
1424	return find_arrow (op, type);	1342	return find_arrow (op, type);
…		…
1485	{	1403	{
1486	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
1487	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);
1488	/* 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 */
1489	else	1407	else
1490	CLEAR_FLAG (op, FLAG_READY_BOW);	1408	op->clr_flag (FLAG_READY_BOW);
1491		1409
1492	return 0;	1410	return 0;
1493	}	1411	}
1494	}	1412	}
1495		1413
…		…
1544	#endif	1462	#endif
1545		1463
1546	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1547		1465
1548	/* update the speed */	1466	/* update the speed */
1549	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1550	+ bow->stats.dam / 7.f;
1551		1467
1552	arrow->set_speed (max (arrow->speed, 2.f));
1553	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	));
1554		1473
1555	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;
1556		1475
1557	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1558	{	1477	{
…		…
1579	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);
1580		1499
1581	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1500	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1582	arrow->move_type = MOVE_FLY_LOW;	1501	arrow->move_type = MOVE_FLY_LOW;
1583	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1502	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
		1503	arrow->set_flag (FLAG_NO_PICK);
1584		1504
1585	op->play_sound (sound_find ("fire_arrow"));	1505	op->play_sound (sound_find ("fire_arrow"));
1586	m->insert (arrow, sx, sy, op);	1506	m->insert (arrow, sx, sy, op);
1587		1507
1588	if (!arrow->destroyed ())	1508	if (!arrow->destroyed ())
…		…
1596	* but monsters can't. Putting that code here	1516	* but monsters can't. Putting that code here
1597	* makes the fire_bow code much cleaner.	1517	* makes the fire_bow code much cleaner.
1598	* this function should only be called if 'op' is a player,	1518	* this function should only be called if 'op' is a player,
1599	* hence the function name.	1519	* hence the function name.
1600	*/	1520	*/
1601	int	1521	static int
1602	player_fire_bow (object *op, int dir)	1522	player_fire_bow (object *op, int dir)
1603	{	1523	{
1604	int ret;	1524	int ret;
1605		1525
1606	if (op->contr->bowtype == bow_bestarrow)	1526	if (op->contr->bowtype == bow_bestarrow)
…		…
1634	}	1554	}
1635		1555
1636	/* Fires a misc (wand/rod/horn) object in 'dir'.	1556	/* Fires a misc (wand/rod/horn) object in 'dir'.
1637	* Broken apart from 'fire' to keep it more readable.	1557	* Broken apart from 'fire' to keep it more readable.
1638	*/	1558	*/
1639	void	1559	static void
1640	fire_misc_object (object *op, int dir)	1560	fire_misc_object (object *op, int dir)
1641	{	1561	{
1642	object *item = op->contr->ranged_ob;	1562	object *item = op->contr->ranged_ob;
1643		1563
1644	if (!item)	1564	if (!item)
…		…
1651	{	1571	{
1652	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1572	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1653	return;	1573	return;
1654	}	1574	}
1655		1575
1656	if (!op->change_weapon (item))	1576	if (!op->apply (item))
1657	return;	1577	return;
1658		1578
1659	if (item->type == WAND)	1579	if (item->type == WAND)
1660	{	1580	{
1661	if (item->stats.food <= 0)	1581	if (item->stats.food <= 0)
…		…
1666	return;	1586	return;
1667	}	1587	}
1668	}	1588	}
1669	else if (item->type == ROD || item->type == HORN)	1589	else if (item->type == ROD || item->type == HORN)
1670	{	1590	{
1671	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);
1672		1592
1673	// 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
1674	// for a rod or horn, this fixes some broken rods.	1594	// for a rod or horn, this fixes some broken rods.
1675	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1595	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1676	{	1596	{
1677	op->contr->play_sound (sound_find ("wand_poof"));	1597	op->contr->play_sound (sound_find ("wand_poof"));
1678		1598
1679	if (item->type == ROD)	1599	if (item->type == ROD)
1680	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));
…		…
1691		1611
1692	if (item->type == WAND)	1612	if (item->type == WAND)
1693	{	1613	{
1694	if (!(--item->stats.food))	1614	if (!(--item->stats.food))
1695	{	1615	{
1696	object *tmp;
1697
1698	if (item->arch)	1616	if (item->arch)
1699	{	1617	{
1700	CLEAR_FLAG (item, FLAG_ANIMATE);	1618	item->clr_flag (FLAG_ANIMATE);
1701	item->face = item->arch->face;	1619	item->face = item->arch->face;
1702	item->set_speed (0);	1620	item->set_speed (0);
1703	}	1621	}
1704		1622
1705	if (object *pl = item->visible_to ())	1623	if (object *pl = item->visible_to ())
…		…
1712	}	1630	}
1713		1631
1714	/* Received a fire command for the player - go and do it.	1632	/* Received a fire command for the player - go and do it.
1715	*/	1633	*/
1716	bool	1634	bool
1717	fire (object *op, int dir)	1635	fire (object *who, int dir)
1718	{	1636	{
1719	int spellcost = 0;	1637	int spellcost = 0;
1720		1638
1721	player *pl = op->contr;	1639	player *pl = who->contr;
1722		1640
1723	if (pl->golem)	1641	if (pl->golem)
1724	{	1642	{
1725	control_golem (op->contr->golem, dir);	1643	control_golem (who->contr->golem, dir);
1726	return false;	1644	return false;
1727	}	1645	}
1728		1646
1729	object *ob = pl->ranged_ob;	1647	object *ob = pl->ranged_ob;
1730		1648
1731	if (!ob)	1649	if (!ob)
1732	return false;	1650	return false;
1733		1651
1734	if (op->speed_left > 0.f)	1652	if (who->speed_left > 0.f)
1735	--op->speed_left;	1653	--who->speed_left;
1736	else	1654	else
1737	return false;	1655	return false;
1738		1656
1739	if (!op->change_weapon (ob))	1657	if (!who->apply (ob))
1740	return false;	1658	return false;
1741		1659
1742	/* check for loss of invisiblity/hide */	1660	/* check for loss of invisiblity/hide */
1743	if (action_makes_visible (op))	1661	if (action_makes_visible (who))
1744	make_visible (op);	1662	make_visible (who);
1745		1663
1746	switch (ob->type)	1664	switch (ob->type)
1747	{	1665	{
1748	case BOW:	1666	case BOW:
1749	player_fire_bow (op, dir);	1667	player_fire_bow (who, dir);
1750	break;	1668	break;
1751		1669
1752	case SPELL:	1670	case SPELL:
1753	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);
1754	break;	1672	break;
1755		1673
1756	case BUILDER:	1674	case BUILDER:
1757	apply_map_builder (op, dir);	1675	apply_map_builder (who, dir);
1758	break;	1676	break;
1759		1677
1760	case SKILL:	1678	case SKILL:
1761	do_skill (op, op, ob, dir, 0);	1679	do_skill (who, who, ob, dir, 0);
1762	break;	1680	break;
1763		1681
		1682	case RANGED:
		1683	do_skill (who, ob, who->chosen_skill, dir, 0);
		1684	break;
		1685
1764	default:	1686	default:
1765	fire_misc_object (op, dir);	1687	fire_misc_object (who, dir);
1766	break;	1688	break;
1767	}	1689	}
1768		1690
1769	return true;	1691	return true;
1770	}	1692	}
1771		1693
1772	/* find_key	1694	static object *
1773	* We try to find a key for the door as passed. If we find a key
1774	* and successfully use it, we return the key, otherwise NULL
1775	* This function merges both normal and locked door, since the logic
1776	* for both is the same - just the specific key is different.
1777	* pl is the player,
1778	* inv is the objects inventory to searched
1779	* door is the door we are trying to match against.
1780	* This function can be called recursively to search containers.
1781	*/
1782	object *
1783	find_key (object *pl, object *container, object *door)	1695	find_key_ (object *pl, object *container, object *door)
1784	{	1696	{
1785	object *tmp, *key;	1697	object *tmp, *key;
1786		1698
1787	/* Should not happen, but sanity checking is never bad */	1699	/* Should not happen, but sanity checking is never bad */
1788	if (!container->inv)	1700	if (!container->inv)
…		…
1809	if (!tmp)	1721	if (!tmp)
1810	{	1722	{
1811	for (tmp = container->inv; tmp; tmp = tmp->below)	1723	for (tmp = container->inv; tmp; tmp = tmp->below)
1812	/* No reason to search empty containers */	1724	/* No reason to search empty containers */
1813	if (tmp->type == CONTAINER && tmp->inv)	1725	if (tmp->type == CONTAINER && tmp->inv)
1814	if ((key = find_key (pl, tmp, door)))	1726	if ((key = find_key_ (pl, tmp, door)))
1815	return key;	1727	return key;
1816		1728
1817	if (!tmp)	1729	if (!tmp)
1818	return 0;	1730	return 0;
1819	}	1731	}
…		…
1838	* inv must have been an container and must have been active.	1750	* inv must have been an container and must have been active.
1839	*	1751	*
1840	* Change the color so that the message doesn't disappear with	1752	* Change the color so that the message doesn't disappear with
1841	* all the others.	1753	* all the others.
1842	*/	1754	*/
1843	if (pl->contr->usekeys == key_inventory ||	1755	if (pl->contr->usekeys == key_inventory
1844	!QUERY_FLAG (container, FLAG_APPLIED) ||	1756	|| !container->flag [FLAG_APPLIED]
1845	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1757	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1846	{	1758	{
1847	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1759	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1848	"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));
1849	return NULL;	1761	return NULL;
1850	}	1762	}
1851	}	1763	}
1852		1764
1853	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);
1854	}	1791	}
1855		1792
1856	/* moved door processing out of move_player_attack.	1793	/* moved door processing out of move_player_attack.
1857	* returns 1 if player has opened the door with a key	1794	* returns 1 if player has opened the door with a key
1858	* such that the caller should not do anything more,	1795	* such that the caller should not do anything more,
…		…
1908	* going to try and move (not fire weapons).	1845	* going to try and move (not fire weapons).
1909	*/	1846	*/
1910	bool	1847	bool
1911	move_player_attack (object *op, int dir)	1848	move_player_attack (object *op, int dir)
1912	{	1849	{
1913	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1850	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1914	{	1851	{
1915	--op->speed_left;	1852	--op->speed_left;
1916	return true;	1853	return true;
1917	}	1854	}
1918		1855
1919	int on_battleground;
1920
1921	sint16 nx = freearr_x[dir] + op->x;	1856	sint16 nx = freearr_x[dir] + op->x;
1922	sint16 ny = freearr_y[dir] + op->y;	1857	sint16 ny = freearr_y[dir] + op->y;
1923
1924	on_battleground = op_on_battleground (op, 0, 0);
1925		1858
1926	if (out_of_map (op->map, nx, ny))	1859	if (out_of_map (op->map, nx, ny))
1927	return false;	1860	return false;
1928		1861
1929	/* 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
…		…
1950	|| mon->flag [FLAG_CAN_ROLL])	1883	|| mon->flag [FLAG_CAN_ROLL])
1951	&& mon != op)	1884	&& mon != op)
1952	break;	1885	break;
1953	}	1886	}
1954		1887
1955	if (!mon) /* This happens anytime the player tries to move */	1888	/* no monster == player tries to move into a wall or so */
1956	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	}
1957		1914
1958	mon = mon->head_ ();	1915	mon = mon->head_ ();
1959		1916
1960	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))
1961	if (op->contr->weapon_sp_left > 0.f)	1918	if (op->contr->weapon_sp_left > 0.f)
…		…
1979	*/	1936	*/
1980	if (op->type == PLAYER	1937	if (op->type == PLAYER
1981	&& ((mon->owner && mon->owner->contr	1938	&& ((mon->owner && mon->owner->contr
1982	&& same_party (mon->owner->contr->party, op->contr->party))	1939	&& same_party (mon->owner->contr->party, op->contr->party))
1983	|| mon->owner == op)	1940	|| mon->owner == op)
1984	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1941	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1985	{	1942	{
1986	/* 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 */
1987	if (op->contr->braced)	1944	if (op->contr->braced)
1988	return false;	1945	return false;
1989		1946
…		…
2000	return true;	1957	return true;
2001	}	1958	}
2002	else	1959	else
2003	return false;	1960	return false;
2004	}	1961	}
		1962
		1963	bool on_battleground = op_on_battleground (op, 0, 0);
2005		1964
2006	/* in certain circumstances, you shouldn't attack friendly	1965	/* in certain circumstances, you shouldn't attack friendly
2007	* creatures. Note that if you are braced, you can't push	1966	* creatures. Note that if you are braced, you can't push
2008	* 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
2009	* attack them either.	1968	* attack them either.
2010	*/	1969	*/
2011	if ((mon->type == PLAYER || mon->enemy != op)	1970	if ((mon->type == PLAYER || mon->enemy != op)
2012	&& (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])
2013	&& ((op->contr->peaceful	1972	&& ((op->contr->peaceful
2014	|| (mon->type == PLAYER && mon->contr->peaceful))	1973	|| (mon->type == PLAYER && mon->contr->peaceful))
2015	&& !on_battleground))	1974	&& !on_battleground))
2016	{	1975	{
2017	if (op->speed_left > 0.f)	1976	if (op->speed_left > 0.f)
…		…
2033	}	1992	}
2034	}	1993	}
2035	/* If the object is a boulder or other rollable object, then	1994	/* If the object is a boulder or other rollable object, then
2036	* 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.
2037	*/	1996	*/
2038	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1997	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2039	{	1998	{
2040	if (op->speed_left > 0.f)	1999	if (op->speed_left > 0.f)
2041	{	2000	{
2042	--op->speed_left;	2001	--op->speed_left;
2043		2002
…		…
2052	* 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
2053	* and be living. Then, it must be one of the following:	2012	* and be living. Then, it must be one of the following:
2054	* 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
2055	* 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.
2056	*/	2015	*/
2057	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2016	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2058	((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)))
2059	{	2018	{
2060	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])
2061	{	2020	{
2062	--op->contr->weapon_sp_left;	2021	--op->contr->weapon_sp_left;
…		…
2074	}	2033	}
2075		2034
2076	bool	2035	bool
2077	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2078	{	2037	{
2079	int pick;
2080
2081	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2038	if (!op->map || op->map->state != MAP_ACTIVE)
2082	return 0;	2039	return 0;
2083		2040
2084	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2085	if ((dir < 0) || (dir >= 9))	2042	if (dir < 0 || dir > 8)
2086	{	2043	{
2087	LOG (llevError, "move_player: invalid direction %d\n", dir);	2044	LOG (llevError, "move_player: invalid direction %d\n", dir);
2088	return 0;	2045	return 0;
2089	}	2046	}
2090		2047
2091	/* peterm: added following line */	2048	/* peterm: added following line */
2092	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2049	if (op->flag [FLAG_CONFUSED] && dir)
2093	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2050	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2094		2051
2095	op->facing = dir;	2052	op->facing = dir;
2096		2053
2097	if (op->flag [FLAG_HIDDEN])	2054	if (op->flag [FLAG_HIDDEN])
2098	do_hidden_move (op);	2055	do_hidden_move (op);
2099		2056
2100	bool retval;	2057	bool retval;
		2058	int pick = 0;
2101		2059
2102	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2060	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2103	retval = RESULT_INT (0);	2061	retval = RESULT_INT (0);
2104	else if (op->contr->fire_on)	2062	else if (op->contr->fire_on)
2105	retval = fire (op, dir);	2063	retval = fire (op, dir);
…		…
2136	* players.	2094	* players.
2137	*/	2095	*/
2138	bool	2096	bool
2139	handle_newcs_player (object *op)	2097	handle_newcs_player (object *op)
2140	{	2098	{
2141	if (QUERY_FLAG (op, FLAG_SCARED))	2099	if (op->flag [FLAG_SCARED])
2142	{	2100	{
2143	if (op->speed_left > 0.f)	2101	if (op->speed_left > 0.f)
2144	{	2102	{
2145	--op->speed_left;	2103	--op->speed_left;
2146	flee_player (op);	2104	flee_player (op);
…		…
2162	return move_player (op, op->direction);	2120	return move_player (op, op->direction);
2163		2121
2164	return false;	2122	return false;
2165	}	2123	}
2166		2124
2167	int	2125	static int
2168	save_life (object *op)	2126	save_life (object *op)
2169	{	2127	{
2170	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2128	if (!op->flag [FLAG_LIFESAVE])
2171	return 0;	2129	return 0;
2172		2130
2173	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2131	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2174	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2132	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2175	{	2133	{
2176	op->play_sound (sound_find ("ob_evaporate"));	2134	op->play_sound (sound_find ("ob_evaporate"));
2177	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));
2178		2136
2179	tmp->destroy ();	2137	tmp->destroy ();
2180	CLEAR_FLAG (op, FLAG_LIFESAVE);	2138	op->clr_flag (FLAG_LIFESAVE);
2181		2139
2182	if (op->stats.hp < 0)	2140	if (op->stats.hp < 0)
2183	op->stats.hp = op->stats.maxhp;	2141	op->stats.hp = op->stats.maxhp;
2184		2142
2185	if (op->stats.food < 0)	2143	if (op->stats.food < 0)
2186	op->stats.food = 999;	2144	op->stats.food = MAX_FOOD;
2187		2145
2188	op->update_stats ();	2146	op->update_stats ();
2189	return 1;	2147	return 1;
2190	}	2148	}
2191		2149
2192	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2150	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2193	CLEAR_FLAG (op, FLAG_LIFESAVE);	2151	op->clr_flag (FLAG_LIFESAVE);
2194	enter_player_savebed (op); /* bring him home. */	2152	enter_player_savebed (op); /* bring him home. */
2195	return 0;	2153	return 0;
2196	}	2154	}
2197		2155
2198	/* 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
…		…
2205	{	2163	{
2206	while (op)	2164	while (op)
2207	{	2165	{
2208	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' */
2209		2167
2210	if (QUERY_FLAG (op, FLAG_UNPAID))	2168	if (op->flag [FLAG_UNPAID])
2211	op->insert_at (env);	2169	op->insert_at (env);
2212	else if (op->inv)	2170	else if (op->inv)
2213	drop_unpaid_items (op->inv, env);	2171	drop_unpaid_items (op->inv, env);
2214		2172
2215	op = next;	2173	op = next;
…		…
2221	{	2179	{
2222	if (!flag [FLAG_REMOVED])	2180	if (!flag [FLAG_REMOVED])
2223	::drop_unpaid_items (inv, this);	2181	::drop_unpaid_items (inv, this);
2224	}	2182	}
2225		2183
2226	/*
2227	* Returns pointer a static string containing gravestone text
2228	* Moved from apply.c to player.c - player.c is what
2229	* actually uses this function. player.c may not be quite the
2230	* best, a misc file for object actions is probably better,
2231	* but there isn't one in the server directory.
2232	*/
2233	const char *
2234	gravestone_text (object *op)
2235	{
2236	static dynbuf_text buf;
2237
2238	buf << "---- R.I.P. ----\n\n"
2239	<< op->name;
2240
2241	if (op->type == PLAYER)
2242	buf << " the " << op->contr->title;
2243
2244	buf << "\n\n";
2245
2246	buf << "who was level ";
2247	buf << (sint32)op->level << "\n\n" // OO breakdown
2248	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2249
2250	if (op->type == PLAYER)
2251	buf << "by " << op->contr->killer_name () << ".\n\n";
2252
2253	{
2254	static char buf2[128];
2255	time_t now = time (NULL);
2256	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2257	buf << buf2;
2258	}
2259
2260	return buf;
2261	}
2262
2263	void	2184	void
2264	do_some_living (object *op)	2185	do_some_living (object *op)
2265	{	2186	{
2266	int last_food = op->stats.food;	2187	int last_food = op->stats.food;
2267	int gen_hp, gen_sp, gen_grace;	2188	int gen_hp, gen_sp, gen_grace;
2268	int over_hp, over_sp, over_grace;
2269	int i;
2270	int rate_hp = 1200;	2189	int rate_hp = 1200;
2271	int rate_sp = 2500;	2190	int rate_sp = 2500;
2272	int rate_grace = 2000;	2191	int rate_grace = 2000;
2273	const int max_hp = 1;	2192	const int max_hp = 1;
2274	const int max_sp = 1;	2193	const int max_sp = 1;
2275	const int max_grace = 1;	2194	const int max_grace = 1;
2276		2195
		2196	#if 0
2277	if (op->contr->hidden)	2197	if (op->contr->hidden)
2278	{	2198	{
2279	op->invisible = 1000;	2199	op->invisible = 1000;
2280	/* the socket code flashes the player visible/invisible	2200	/* the socket code flashes the player visible/invisible
2281	* depending on the value of invisible, so we need to	2201	* depending on the value of invisible, so we need to
2282	* alternate it here for it to work correctly.	2202	* alternate it here for it to work correctly.
2283	*/	2203	*/
2284	if (pticks & 2)	2204	if (server_tick & 2)
2285	op->invisible--;	2205	op->invisible--;
2286	}	2206	}
		2207	else
		2208	#endif
2287	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2209	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2288	{	2210	{
2289	if (!op->invisible--)	2211	if (!op->invisible--)
2290	{	2212	{
2291	make_visible (op);	2213	make_visible (op);
2292	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.");
…		…
2326	if (--op->last_grace < 0)	2248	if (--op->last_grace < 0)
2327	{	2249	{
2328	if (op->stats.grace < op->stats.maxgrace / 2)	2250	if (op->stats.grace < op->stats.maxgrace / 2)
2329	op->stats.grace++; /* no penalty in food for regaining grace */	2251	op->stats.grace++; /* no penalty in food for regaining grace */
2330		2252
		2253	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2254
2331	if (max_grace > 1)	2255	if (max_grace > 1)
2332	{	2256	{
2333	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2257	int over_grace = temp / rate_grace;
		2258
2334	if (over_grace > 0)	2259	if (over_grace > 0)
2335	{	2260	{
2336	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;
2337	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2338	op->last_grace = 0;	2262	op->last_grace = 0;
2339	}	2263	}
2340	else	2264	else
2341	{	2265	op->last_grace = rate_grace / temp;
2342	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2343	}
2344	}	2266	}
2345	else	2267	else
2346	{	2268	op->last_grace = rate_grace / temp;
2347	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2269
2348	}
2349	/* wearing stuff doesn't detract from grace generation. */	2270	/* wearing stuff doesn't detract from grace generation. */
2350	}	2271	}
2351		2272
2352	if (op->stats.food > 0)	2273	if (op->stats.food > 0)
2353	{	2274	{
…		…
2359	if (op->stats.sp < op->stats.maxsp)	2280	if (op->stats.sp < op->stats.maxsp)
2360	{	2281	{
2361	op->stats.sp++;	2282	op->stats.sp++;
2362		2283
2363	/* dms do not consume food */	2284	/* dms do not consume food */
2364	if (!QUERY_FLAG (op, FLAG_WIZ))	2285	if (!op->flag [FLAG_WIZ])
2365	{	2286	{
2366	op->stats.food--;	2287	op->stats.food--;
2367		2288
2368	if (op->contr->digestion < 0)	2289	if (op->contr->digestion < 0)
2369	op->stats.food += op->contr->digestion;	2290	op->stats.food += op->contr->digestion;
…		…
2372	}	2293	}
2373	}	2294	}
2374		2295
2375	if (max_sp > 1)	2296	if (max_sp > 1)
2376	{	2297	{
2377	over_sp = (gen_sp + 10) / rate_sp;	2298	int over_sp = (gen_sp + 10) / rate_sp;
2378	if (over_sp > 0)	2299	if (over_sp > 0)
2379	{	2300	{
2380	if (op->stats.sp < op->stats.maxsp)	2301	if (op->stats.sp < op->stats.maxsp)
2381	{	2302	{
2382	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2303	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2403	if (op->stats.hp < op->stats.maxhp)	2324	if (op->stats.hp < op->stats.maxhp)
2404	{	2325	{
2405	op->stats.hp++;	2326	op->stats.hp++;
2406		2327
2407	/* dms do not consume food */	2328	/* dms do not consume food */
2408	if (!QUERY_FLAG (op, FLAG_WIZ))	2329	if (!op->flag [FLAG_WIZ])
2409	{	2330	{
2410	op->stats.food--;	2331	op->stats.food--;
2411		2332
2412	if (op->contr->digestion < 0)	2333	if (op->contr->digestion < 0)
2413	op->stats.food += op->contr->digestion;	2334	op->stats.food += op->contr->digestion;
2414	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))
2415	op->stats.food = last_food;	2336	op->stats.food = last_food;
2416	}	2337	}
2417	}	2338	}
2418		2339
		2340	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2341
2419	if (max_hp > 1)	2342	if (max_hp > 1)
2420	{	2343	{
2421	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2344	int over_hp = temp / rate_hp;
2422		2345
2423	if (over_hp > 0)	2346	if (over_hp > 0)
2424	{	2347	{
2425	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;
2426	op->last_heal = 0;	2349	op->last_heal = 0;
2427	}	2350	}
2428	else	2351	else
2429	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2352	op->last_heal = rate_hp / temp;
2430	}	2353	}
2431	else	2354	else
2432	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2355	op->last_heal = rate_hp / temp;
2433	}	2356	}
2434	}	2357	}
2435		2358
2436	/* Digestion */	2359	/* Digestion */
2437	if (--op->last_eat < 0)	2360	if (--op->last_eat < 0)
…		…
2440	penalty = max (0, -op->contr->digestion);	2363	penalty = max (0, -op->contr->digestion);
2441		2364
2442	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);
2443		2366
2444	/* dms do not consume food */	2367	/* dms do not consume food */
2445	if (!QUERY_FLAG (op, FLAG_WIZ))	2368	if (!op->flag [FLAG_WIZ])
2446	op->stats.food--;	2369	op->stats.food--;
2447	}	2370	}
2448		2371
2449	if (op->stats.food < 0 && op->stats.hp >= 0)	2372	if (op->stats.food < 0 && op->stats.hp >= 0)
2450	{	2373	{
2451	object *flesh = 0;	2374	object *flesh = 0;
2452		2375
2453	for_inv_removable (op, tmp)	2376	for_inv_removable (op, tmp)
2454	{	2377	{
2455	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2378	if (tmp->flag [FLAG_UNPAID])
2456	continue;	2379	continue;
2457		2380
2458	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2381	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2459	{	2382	{
2460	op->statusmsg ("You blindly grab for a bite of food. "	2383	op->statusmsg ("You blindly grab for a bite of food. "
2461	"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.>");
2462	manual_apply (op, tmp, 0);	2385	op->apply (tmp);
2463		2386
2464	if (op->stats.food >= 0 || op->stats.hp < 0)	2387	if (op->stats.food >= 0 || op->stats.hp < 0)
2465	break;	2388	break;
2466	}	2389	}
2467	else if (tmp->type == FLESH)	2390	else if (tmp->type == FLESH)
…		…
2473	*/	2396	*/
2474	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2397	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2475	{	2398	{
2476	op->statusmsg ("You blindly grab for a bite of food. "	2399	op->statusmsg ("You blindly grab for a bite of food. "
2477	"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.>");
2478	manual_apply (op, flesh, 0);	2401	op->apply (flesh);
2479	}	2402	}
2480		2403
2481	// If player is still starving, alert him!	2404	// If player is still starving, alert him!
2482	if (op->stats.food < 0)	2405	if (op->stats.food < 0)
2483	op->failmsg ("You are starving! "	2406	op->failmsg ("You are starving! "
…		…
2495	op->contr->killer->destroy ();	2418	op->contr->killer->destroy ();
2496	}	2419	}
2497	}	2420	}
2498		2421
2499	/* killer should be set here already */	2422	/* killer should be set here already */
2500	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2423	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2501	kill_player (op);	2424	kill_player (op);
2502	}	2425	}
2503	}	2426	}
2504		2427
2505	/* 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.
…		…
2520	return;	2443	return;
2521		2444
2522	dynbuf_text deathtab;	2445	dynbuf_text deathtab;
2523		2446
2524	/* restore player */	2447	/* restore player */
2525	at = archetype::find ("poisoning");	2448	at = archetype::find (shstr_poisoning);
2526	if (object *tmp = present_arch_in_ob (at, op))	2449	if (object *tmp = present_arch_in_ob (at, op))
2527	{	2450	{
2528	tmp->destroy ();	2451	tmp->destroy ();
2529	deathtab << "Your body feels cleansed...\r";	2452	deathtab << "Your body feels cleansed...\r";
2530	}	2453	}
2531		2454
2532	at = archetype::find ("confusion");	2455	at = archetype::find (shstr_confusion);
2533	if (object *tmp = present_arch_in_ob (at, op))	2456	if (object *tmp = present_arch_in_ob (at, op))
2534	{	2457	{
2535	tmp->destroy ();	2458	tmp->destroy ();
2536	deathtab << "Your mind feels clearer...\r";	2459	deathtab << "Your mind feels clearer...\r";
2537	}	2460	}
…		…
2539	cure_disease (op, 0, 0); /* remove any disease */	2462	cure_disease (op, 0, 0); /* remove any disease */
2540		2463
2541	max_it (op->stats.hp , op->stats.maxhp);	2464	max_it (op->stats.hp , op->stats.maxhp);
2542	max_it (op->stats.sp , op->stats.maxsp);	2465	max_it (op->stats.sp , op->stats.maxsp);
2543	max_it (op->stats.grace, op->stats.maxgrace);	2466	max_it (op->stats.grace, op->stats.maxgrace);
2544
2545	if (op->stats.food <= 0)	2467	max_it (op->stats.food , 200);
2546	op->stats.food = 999;
2547		2468
2548	// remove all spell effects that are active	2469	// remove all spell effects that are active
2549	// to avoid long-term effects such as word-of-recall	2470	// to avoid long-term effects such as word-of-recall
2550	for (object *item = op->inv; item; )	2471	for (object *item = op->inv; item; )
2551	{	2472	{
…		…
2564	if (op_on_battleground (op, &x, &y))	2485	if (op_on_battleground (op, &x, &y))
2565	{	2486	{
2566	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";
2567		2488
2568	/* create a bodypart-trophy to make the winner happy */	2489	/* create a bodypart-trophy to make the winner happy */
2569	if (object *tmp = arch_to_object (archetype::find ("finger")))	2490	object *tmp = archetype::find (shstr_finger)->instance ();
2570	{	2491
2571	tmp->name = format ("%s's finger" , &op->name);	2492	tmp->name = format ("%s's finger" , &op->name);
2572	tmp->name_pl = format ("%s's fingers", &op->name);	2493	tmp->name_pl = format ("%s's fingers", &op->name);
2573	tmp->msg = format (	2494	tmp->msg = format (
2574	"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",
2575	&op->name, op->contr->title,	2496	&op->name, op->contr->title,
2576	(int)op->level,	2497	(int)op->level,
2577	op->contr->killer_name ()	2498	op->contr->killer_name ()
2578	);	2499	);
2579	tmp->value = 0, tmp->type = 0;	2500	tmp->value = 0, tmp->type = 0;
2580	tmp->materialname = "organics";	2501	tmp->material = name_to_material (shstr_organic);
2581	tmp->insert_at (op, tmp);	2502	tmp->insert_at (op, tmp);
2582	}
2583		2503
2584	/* teleport defeated player to new destination */	2504	/* teleport defeated player to new destination */
2585	transfer_ob (op, x, y, 0, NULL);	2505	transfer_ob (op, x, y, 0, NULL);
2586	op->contr->braced = 0;	2506	op->contr->braced = 0;
2587		2507
…		…
2649	lost_a_stat = 1;	2569	lost_a_stat = 1;
2650	}	2570	}
2651	else	2571	else
2652	{	2572	{
2653	/* deplete a stat */	2573	/* deplete a stat */
2654	archetype *deparch = archetype::find ("depletion");	2574	archetype *deparch = archetype::find (shstr_depletion);
2655	object *dep;	2575	object *dep;
2656		2576
2657	dep = present_arch_in_ob (deparch, op);	2577	dep = present_arch_in_ob (deparch, op);
2658	if (!dep)	2578	if (!dep)
2659	{	2579	{
2660	dep = arch_to_object (deparch);	2580	dep = deparch->instance ();
2661	insert_ob_in_ob (dep, op);	2581	insert_ob_in_ob (dep, op);
2662	}	2582	}
2663	lose_this_stat = 1;	2583	lose_this_stat = 1;
2664	if (settings.balanced_stat_loss)	2584	if (settings.balanced_stat_loss)
2665	{	2585	{
…		…
2703	* difference.	2623	* difference.
2704	*/	2624	*/
2705	if (this_stat >= -50)	2625	if (this_stat >= -50)
2706	{	2626	{
2707	change_attr_value (&(dep->stats), i, -1);	2627	change_attr_value (&(dep->stats), i, -1);
2708	SET_FLAG (dep, FLAG_APPLIED);	2628	dep->set_flag (FLAG_APPLIED);
2709	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2629	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2710	op->update_stats ();	2630	op->update_stats ();
2711	lost_a_stat = 1;	2631	lost_a_stat = 1;
2712	}	2632	}
2713	}	2633	}
…		…
2731	#endif	2651	#endif
2732		2652
2733	/* Put a gravestone up where the character 'almost' died. List the	2653	/* Put a gravestone up where the character 'almost' died. List the
2734	* exp loss on the stone.	2654	* exp loss on the stone.
2735	*/	2655	*/
2736	tmp = arch_to_object (archetype::find ("gravestone"));	2656	tmp = archetype::find (shstr_gravestone)->instance ();
2737	tmp->name = format ("%s's gravestone", &op->name);	2657	tmp->name = format ("%s's gravestone", &op->name);
2738	tmp->name_pl = format ("%s's gravestones", &op->name);	2658	tmp->name_pl = format ("%s's gravestones", &op->name);
2739	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",
2740	&op->name, op->contr->title, op->contr->killer_name ());	2660	&op->name, op->contr->title, op->contr->killer_name ());
2741	tmp->x = op->x, tmp->y = op->y;	2661	tmp->x = op->x, tmp->y = op->y;
…		…
2780	if (will_kill_again)	2700	if (will_kill_again)
2781	{	2701	{
2782	object *force;	2702	object *force;
2783	int at;	2703	int at;
2784		2704
2785	force = get_archetype (FORCE_NAME);	2705	force = archetype::get (FORCE_NAME);
2786	/* 50 ticks should be enough time for the spell to abate */	2706	/* 50 ticks should be enough time for the spell to abate */
2787	force->speed = 0.1f;
2788	force->speed_left = -5.f;	2707	force->speed_left = -5.f;
2789	SET_FLAG (force, FLAG_APPLIED);	2708	force->set_speed (0.1f);
		2709	force->set_flag (FLAG_APPLIED);
		2710
2790	for (at = 0; at < NROFATTACKS; at++)	2711	for (at = 0; at < NROFATTACKS; at++)
2791	if (will_kill_again & (1 << at))	2712	if (will_kill_again & (1 << at))
2792	force->resist[at] = 100;	2713	force->resist[at] = 100;
2793		2714
2794	insert_ob_in_ob (force, op);	2715	insert_ob_in_ob (force, op);
…		…
2796	}	2717	}
2797		2718
2798	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2719	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2799	}	2720	}
2800		2721
2801	void	2722	static void
2802	loot_object (object *op)	2723	loot_object (object *op)
2803	{ /* Grab and destroy some treasure */	2724	{ /* Grab and destroy some treasure */
2804	object *tmp, *tmp2, *next;	2725	object *tmp, *next;
2805		2726
2806	op->close_container (); /* close open sack first */	2727	op->close_container (); /* close open sack first */
2807		2728
2808	for (tmp = op->inv; tmp; tmp = next)	2729	for (tmp = op->inv; tmp; tmp = next)
2809	{	2730	{
…		…
2816	tmp->x = op->x, tmp->y = op->y;	2737	tmp->x = op->x, tmp->y = op->y;
2817		2738
2818	if (tmp->type == CONTAINER)	2739	if (tmp->type == CONTAINER)
2819	loot_object (tmp); /* empty container to ground */	2740	loot_object (tmp); /* empty container to ground */
2820		2741
2821	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))))
2822	{	2743	{
2823	if (tmp->nrof > 1)	2744	if (tmp->nrof > 1)
2824	{	2745	{
2825	tmp->decrease (rndm (1, tmp->nrof - 1));	2746	tmp->decrease (rndm (1, tmp->nrof - 1));
2826	insert_ob_in_map (tmp, op->map, NULL, 0);	2747	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2837	* fix_weight(): Check recursively the weight of all players, and fix	2758	* fix_weight(): Check recursively the weight of all players, and fix
2838	* 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
2839	* was changed.	2760	* was changed.
2840	*/	2761	*/
2841	void	2762	void
2842	fix_weight (void)	2763	fix_weight ()
2843	{	2764	{
2844	for_all_players (pl)	2765	for_all_players (pl)
2845	{	2766	{
2846	sint32 old = pl->ob->carrying;	2767	weight_t old = pl->ob->carrying;
2847		2768
2848	pl->ob->update_weight ();	2769	pl->ob->update_weight ();
2849		2770
2850	if (old != pl->ob->carrying)	2771	if (old != pl->ob->carrying)
2851	{	2772	{
…		…
2854	}	2775	}
2855	}	2776	}
2856	}	2777	}
2857		2778
2858	void	2779	void
2859	fix_luck (void)	2780	fix_luck ()
2860	{	2781	{
2861	for_all_players (pl)	2782	for_all_players (pl)
2862	if (!pl->ob->contr->ns->state)	2783	if (!pl->ob->contr->ns->state)
2863	pl->ob->change_luck (0);	2784	pl->ob->change_luck (0);
2864	}	2785	}
…		…
2916	}	2837	}
2917		2838
2918	int	2839	int
2919	is_true_undead (object *op)	2840	is_true_undead (object *op)
2920	{	2841	{
2921	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2842	if (op->arch->flag [FLAG_UNDEAD])
2922	return 1;	2843	return 1;
2923		2844
2924	return 0;	2845	return 0;
2925	}	2846	}
2926		2847
…		…
3024		2945
3025	if (who->type == PLAYER)	2946	if (who->type == PLAYER)
3026	player = 1;	2947	player = 1;
3027		2948
3028	else	2949	else
3029	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2950	friendly = who->flag [FLAG_FRIENDLY];
3030		2951
3031	/* search adjacent squares */	2952	/* search adjacent squares */
3032	for (i = 1; i < 9; i++)	2953	for (i = 1; i < 9; i++)
3033	{	2954	{
3034	x = who->x + freearr_x[i];	2955	x = who->x + freearr_x[i];
…		…
3043	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)))
3044	continue;	2965	continue;
3045		2966
3046	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)
3047	{	2968	{
3048	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])
3049	return 1;	2970	return 1;
3050	else if (tmp->type == PLAYER)	2971	else if (tmp->type == PLAYER)
3051	{
3052	/*don't let a hidden DM prevent you from hiding */
3053	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3054	return 1;	2972	return 1;
3055	}
3056	}	2973	}
3057	}	2974	}
3058	return 0;	2975	return 0;
3059	}	2976	}
3060		2977
3061	/* check the player los field for viewability of the	2978	/* check the player los field for viewability of the
3062	* object op. This function works fine for monsters,	2979	* object op. This function works fine for monsters,
3063	* 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
3064	* a pile (say a coin under a table would return "viewable"	2981	* a pile (say a coin under a table would return "viewable"
3065	* by this routine). Another question, should we be	2982	* by this routine). Another question, should we be
3066	* concerned with the direction the player is looking	2983	* concerned with the direction the player is looking
3067	* in? Realistically, most of us can't see stuff behind	2984	* in? Realistically, most of us can't see stuff behind
3068	* our backs...on the other hand, does the "facing" direction	2985	* our backs...on the other hand, does the "facing" direction
3069	* 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
3070	* 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.
3071	* -b.t.	2988	* -b.t.
3072	* This function is now map tiling safe.	2989	* This function is now map tiling safe.
3073	*/	2990	*/
3074	int	2991	int
3075	player_can_view (object *pl, object *op)	2992	player_can_view (object *pl, object *op)
3076	{	2993	{
…		…
3103		3020
3104	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)	3021	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3105	return 1;	3022	return 1;
3106		3023
3107	op = op->more;	3024	op = op->more;
3108	}
3109
3110	return 0;
3111	}
3112
3113	/* routine for both players and monsters. We call this when
3114	* there is a possibility for our action distrubing our hiding
3115	* place or invisiblity spell. Artefact invisiblity causes
3116	* "noise" instead. If we arent invisible to begin with, we
3117	* return 0.
3118	*/
3119	int
3120	action_makes_visible (object *op)
3121	{
3122	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3123	{
3124	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3125	{
3126	// artefact invisibility is permanent, but we still make noise
3127	// this is important for game-balance.
3128	if (op->contr)
3129	op->make_noise ();
3130
3131	return 0;
3132	}
3133
3134	if (op->contr && op->contr->tmp_invis == 0)
3135	return 0;
3136
3137	/* If monsters, they should become visible */
3138	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3139	{
3140	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3141	return 1;
3142	}
3143	}	3025	}
3144		3026
3145	return 0;	3027	return 0;
3146	}	3028	}
3147		3029
…		…
3162	* and the exit-coordinates sp/hp must both be > 0.	3044	* and the exit-coordinates sp/hp must both be > 0.
3163	* => The intention here is to prevent abuse of the battleground-	3045	* => The intention here is to prevent abuse of the battleground-
3164	* feature (like pickable or hidden battleground tiles). */	3046	* feature (like pickable or hidden battleground tiles). */
3165	for (object *tmp = op->below; tmp; tmp = tmp->below)	3047	for (object *tmp = op->below; tmp; tmp = tmp->below)
3166	{	3048	{
3167	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3049	if (tmp->flag [FLAG_IS_FLOOR])
3168	{	3050	{
3169	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3051	if (tmp->flag [FLAG_NO_PICK]
3170	&& tmp->type == BATTLEGROUND	3052	&& tmp->type == BATTLEGROUND
3171	&& tmp->name == shstr_battleground	3053	&& tmp->name == shstr_battleground
3172	&& EXIT_X (tmp) && EXIT_Y (tmp))	3054	&& EXIT_X (tmp) && EXIT_Y (tmp))
3173	{	3055	{
3174	/* before we assign the exit, check if this is a teambattle */	3056	/* before we assign the exit, check if this is a teambattle */
3175	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))
3176	{
3177	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)
3178	{	3060	{
3179	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3180	{
3181	if (x && y)	3061	if (x && y)
3182	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3062	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3183		3063
3184	return 1;	3064	return 1;
3185	}
3186	}	3065	}
3187	}
3188		3066
3189	if (x && y)	3067	if (x && y)
3190	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3068	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3191		3069
3192	return 1;	3070	return 1;
…		…
3330	else	3208	else
3331	j = 1;	3209	j = 1;
3332	strcat (buf, spellpathnames[i]);	3210	strcat (buf, spellpathnames[i]);
3333	}	3211	}
3334	}	3212	}
		3213
3335	strcat (buf, ".");	3214	strcat (buf, ".");
3336	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3215	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3337	}	3216	}
3338		3217
3339	/* evtl. adding flags: */	3218	/* evtl. adding flags: */
3340	if (QUERY_FLAG (item, FLAG_XRAYS))	3219	if (item->flag [FLAG_XRAYS])
3341	SET_FLAG (skin, FLAG_XRAYS);	3220	skin->set_flag (FLAG_XRAYS);
3342	if (QUERY_FLAG (item, FLAG_STEALTH))	3221	if (item->flag [FLAG_STEALTH])
3343	SET_FLAG (skin, FLAG_STEALTH);	3222	skin->set_flag (FLAG_STEALTH);
3344	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3223	if (item->flag [FLAG_SEE_IN_DARK])
3345	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3224	skin->set_flag (FLAG_SEE_IN_DARK);
3346		3225
3347	/* print message if there is one */	3226	/* print message if there is one */
3348	if (item->msg != NULL)	3227	if (item->msg != NULL)
3349	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3228	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3350	}	3229	}
3351	else	3230	else
3352	{	3231	{
3353	/* generate misc. treasure */	3232	/* generate misc. treasure */
3354	tmp = arch_to_object (tr->item);	3233	tmp = tr->item->instance ();
3355	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));
3356	who->insert (tmp);	3235	who->insert (tmp);
3357	}	3236	}
3358	}	3237	}
3359		3238
3360	/**	3239	//-GPL
3361	* Unready an object for a player. This function does nothing if the object was
3362	* not readied.
3363	*/
3364	void
3365	player_unready_range_ob (player *pl, object *ob)
3366	{
3367	if (pl->ob->current_weapon == ob)
3368	pl->ob->current_weapon = 0;
3369
3370	if (pl->combat_ob == ob)
3371	pl->combat_ob = 0;
3372
3373	if (pl->ranged_ob == ob)
3374	pl->ranged_ob = 0;
3375	}
3376		3240
3377	sint8	3241	sint8
3378	player::darkness_at (maptile *map, int x, int y) const	3242	player::darkness_at (maptile *map, int x, int y) const
3379	{	3243	{
3380	if (!ns)	3244	if (!ns)
…		…
3407	{	3271	{
3408	play_sound (sound_find ("generic_failure"));	3272	play_sound (sound_find ("generic_failure"));
3409	statusmsg (msg, color);	3273	statusmsg (msg, color);
3410	}	3274	}
3411		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