ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.232 by root, Sat Oct 3 20:11:12 2009 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
23		29
24	#include <global.h>	30	#include <global.h>
25	#include <sproto.h>	31	#include <sproto.h>
26	#include <sounds.h>	32	#include <sounds.h>
27	#include <living.h>	33	#include <living.h>
28	#include <object.h>	34	#include <object.h>
29	#include <spells.h>	35	#include <spells.h>
30	#include <skills.h>	36	#include <skills.h>
31		37
32	#include <algorithm>
33	#include <functional>
34
35	playervec players;	38	playervec players;
36
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
130	subject, news); /*send previously read news */
131
132	strcpy (subject, buf + 1);
133	strip_endline (subject);
134	size = 0;
135	news[0] = '\0';
136	}
137	else
138	{
139	if (size + strlen (buf) >= HUGE_BUF)
140	{
141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142	break;
143	}
144	strncat (news + size, buf, HUGE_BUF - size);
145	size += strlen (buf);
146	}
147	}
148
149	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151	close_and_delete (fp, comp);
152	}
153		39
154	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
155	static void	41	static void
156	set_first_map (object *op)	42	set_first_map (object *op)
157	{	43	{
…		…
168		54
169	players.insert (this);	55	players.insert (this);
170	ob->remove ();	56	ob->remove ();
171	ob->map = 0;	57	ob->map = 0;
172	ob->activate_recursive ();	58	ob->activate_recursive ();
173	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
174	add_friendly_object (ob);	60	add_friendly_object (ob);
175	}	61	}
176		62
177	void	63	void
178	player::deactivate ()	64	player::deactivate ()
…		…
190	ob->remove ();	76	ob->remove ();
191	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
192	ob->map = 0;	78	ob->map = 0;
193	party = 0;	79	party = 0;
194		80
195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
196
197	players.erase (this);	81	players.erase (this);
198	}	82	}
199		83
200	// connect the player with a specific client	84	// connect the player with a specific client
201	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
221	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
222		106
223	ob->update_weight ();	107	ob->update_weight ();
224	link_skills ();	108	link_skills ();
225		109
226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
229		111
230	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
231	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
232	{	114	{
233	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
234		116
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
244		126
245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246		128
247	esrv_new_player (this);	129	esrv_new_player (this);
248		130
		131	ob->flag [FLAG_READY_WEAPON] = false;
		132	ob->flag [FLAG_READY_SKILL] = false;
		133	ob->flag [FLAG_READY_RANGE] = false;
		134	ob->flag [FLAG_READY_BOW] = false;
		135
249	ob->update_stats ();	136	ob->update_stats ();
250		137
251	ns->floorbox_update ();	138	ns->floorbox_update ();
252	esrv_send_inventory (ob, ob);	139	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	140	esrv_add_spells (this, 0);
254		141
255	activate ();	142	activate ();
256		143
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);	144	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	145	INVOKE_PLAYER (LOGIN, this);
263	}	146	}
264		147
265	void	148	void
…		…
281	ns->reset_stats ();	164	ns->reset_stats ();
282	ns->pl = 0;	165	ns->pl = 0;
283	ns = 0;	166	ns = 0;
284	}	167	}
285		168
286	observe = ob;	169	// this is important for the player scheduler to get the correct refcount
		170	// when ns = 0
		171	observe = viewpoint = ob;
287		172
288	deactivate ();	173	deactivate ();
289	}	174	}
		175
		176	//-GPL
290		177
291	// the need for this function can be explained	178	// the need for this function can be explained
292	// by load_object not returning the object	179	// by load_object not returning the object
293	void	180	void
294	player::set_object (object *op)	181	player::set_object (object *op)
295	{	182	{
296	ob = observe = op;	183	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
298		185
299	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
300	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
301		188
302	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
303
304	ob->flag [FLAG_READY_WEAPON] = false;
305	ob->flag [FLAG_READY_SKILL] = false;
306	ob->flag [FLAG_READY_BOW] = false;
307
308	for (object *op = ob->inv; op; op = op->below)
309	if (op->flag [FLAG_APPLIED])
310	switch (op->type)
311	{
312	case SKILL:
313	ob->flag [FLAG_APPLIED] = false;
314	break;
315
316	case WAND:
317	case ROD:
318	case HORN:
319	case BOW:
320	ranged_ob = op;
321	break;
322
323	case WEAPON:
324	combat_ob = op;
325	break;
326	}
327
328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329	ob->deactivate (); // change_weapon activates, fix this better
330	}	190	}
331		191
332	void	192	void
333	player::set_observe (object *op)	193	player::set_observe (object *op)
334	{	194	{
335	observe = op ? op : ob;	195	observe = viewpoint = op ? op : ob;
336	do_los = 1;	196	do_los = 1;
337	}	197	}
		198
		199	void
		200	player::set_viewpoint (object *op)
		201	{
		202	viewpoint = op ? op : (object *)observe;
		203	do_los = 1;
		204	}
		205
		206	//+GPL
338		207
339	player::player ()	208	player::player ()
340	{	209	{
341	/* There are some elements we want initialised to non zero value -	210	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	211	* we deal with that below this point.
…		…
364	disconnect ();	233	disconnect ();
365		234
366	attachable::do_destroy ();	235	attachable::do_destroy ();
367		236
368	if (ob)	237	if (ob)
369	{
370	ob->destroy_inv (false);
371	ob->destroy ();	238	ob->destroy ();
372	}
373		239
374	ob = observe = 0;	240	ob = observe = viewpoint = 0;
375	}	241	}
376		242
377	player::~player ()	243	player::~player ()
378	{	244	{
379	/* Clear item stack */	245	/* Clear item stack */
380	free (stack_items);	246	free (stack_items);
		247	}
		248
		249	/*
		250	* get_player_archetype() return next player archetype from archetype
		251	* list. Not very efficient routine, but used only creating new players.
		252	* Note: there MUST be at least one player archetype!
		253	*/
		254	static archetype *
		255	get_player_archetype (archetype *at)
		256	{
		257	// archetypes could have been reloaded
		258	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		259
		260	if (!nat)
		261	return at;
		262
		263	archvec::iterator i = archetypes.find (nat);
		264
		265	for (;;)
		266	{
		267	if (++i == archetypes.end ())
		268	i = archetypes.begin ();
		269	else if (*i == at)
		270	cleanup ("not a single player archetype found");
		271
		272	if ((*i)->type == PLAYER)
		273	return *i;
		274	}
381	}	275	}
382		276
383	/* Tries to add player on the connection passed in ns.	277	/* Tries to add player on the connection passed in ns.
384	* All we can really get in this is some settings like host and display	278	* All we can really get in this is some settings like host and display
385	* mode.	279	* mode.
…		…
387	player *	281	player *
388	player::create ()	282	player::create ()
389	{	283	{
390	player *pl = new player;	284	player *pl = new player;
391		285
392	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
393		287
394	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
395	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
396	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
397		291
398	set_first_map (pl->ob);	292	set_first_map (pl->ob);
399		293
400	return pl;	294	return pl;
401	}
402
403	/*
404	* get_player_archetype() return next player archetype from archetype
405	* list. Not very efficient routine, but used only creating new players.
406	* Note: there MUST be at least one player archetype!
407	*/
408	archetype *
409	get_player_archetype (archetype *at)
410	{
411	// archetypes could have been reloaded
412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414	if (!nat)
415	return at;
416
417	archvec::iterator i = archetypes.find (nat);
418
419	for (;;)
420	{
421	if (++i == archetypes.end ())
422	i = archetypes.begin ();
423	else if (*i == at)
424	cleanup ("not a single player archetype found");
425
426	if ((*i)->type == PLAYER)
427	return *i;
428	}
429	}	295	}
430		296
431	object *	297	object *
432	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
433	{	299	{
…		…
507	*/	373	*/
508	int	374	int
509	path_to_player (object *mon, object *pl, unsigned mindiff)	375	path_to_player (object *mon, object *pl, unsigned mindiff)
510	{	376	{
511	rv_vector rv;	377	rv_vector rv;
512	sint16 x, y;
513	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	378	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
514	maptile *m, *lastmap;
515		379
516	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
517		381
518	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
519	return 0;	383	return 0;
520		384
521	x = mon->x;	385	mapxy pos (mon);
522	y = mon->y;
523	m = mon->map;
524	dir = rv.direction;	386	dir = rv.direction;
525	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	387	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
526	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527		389
528	/* If we can't solve it within the search distance, return now. */	390	/* If we can't solve it within the search distance, return now. */
529	if (diff > max)	391	if (diff > max)
530	return 0;	392	return 0;
531		393
532	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
533	{	395	{
534	lastx = x;	396	mapxy lastpos = pos;
535	lasty = y;
536	lastmap = m;
537	x = lastx + freearr_x[dir];
538	y = lasty + freearr_y[dir];
539		397
540	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
541	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
542		399
543	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
544	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
545	&& (m == mon->map && blocked_link (mon, m, x, y))))	402	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		403	&& blocked_link (mon, pos.m, pos.x, pos.y)))
546	{	404	{
547	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
548	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
549	*/	407	*/
550	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
551	if (rv.direction != dir)	409	if (rv.direction != dir)
552	{	410	{
553	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
554	* the values so it will try again.	412	* the values so it will try again.
555	*/	413	*/
556	x = lastx;
557	y = lasty;
558	m = lastmap;	414	pos = lastpos;
559	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
560	}	416	}
561	else	417	else
562	{	418	{
563	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
570	*/	426	*/
571	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
572	{	428	{
573	if (i == 0)	429	if (i == 0)
574	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
575	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
576	* since the direction that the creature should move in	433	* since the direction that the creature should move in
577	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
578	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
579	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
581	* can't do that, but now finds it can move east, and	438	* can't do that, but now finds it can move east, and
582	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
583	* the last direction the creature has successfully	440	* the last direction the creature has successfully
584	* moved.	441	* moved.
585	*/	442	*/
586
587	x = lastx + freearr_x[absdir (lastdir + i)];
588	y = lasty + freearr_y[absdir (lastdir + i)];
589	m = lastmap;	443	pos = lastpos;
590	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
591	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
592	continue;	447	continue;
593	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
594	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
595	continue;	452	continue;
596	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
597	continue;	455	continue;
598		456
599	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
600	break;	458	break;
601	}	459	}
		460
602	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
603	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
604	*/	463	*/
605	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
606	return 0;	465	return 0;
		466
607	diff--;	467	diff--;
608	lastdir = dir;	468	lastdir = dir;
609	max--;	469	max--;
610	if (!firstdir)	470	if (!firstdir)
611	firstdir = dir + i;	471	firstdir = dir + i;
…		…
615	{	475	{
616	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
617	diff--;	477	diff--;
618	max--;	478	max--;
619	lastdir = dir;	479	lastdir = dir;
		480
620	if (!firstdir)	481	if (!firstdir)
621	firstdir = dir;	482	firstdir = dir;
622	}	483	}
623		484
624	if (diff <= 1)	485	if (diff <= 1)
625	{	486	{
626	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
627	* headed toward player for entire distance.	488	* headed toward player for entire distance.
628	*/	489	*/
629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
630	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
631	}	492	}
632		493
633	if (diff > max)	494	if (diff > max)
634	return 0;	495	return 0;
…		…
652	next = op->below;	513	next = op->below;
653		514
654	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
655	* flag "neutral" set. Sorry but I can't think of a better way	516	* flag "neutral" set. Sorry but I can't think of a better way
656	*/	517	*/
657	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
658	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
659		520
660	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
661	* by this player due to race restrictions	522	* by this player due to race restrictions
662	*/	523	*/
663	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
664	{	525	{
665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	526	if ((!pl->flag [FLAG_USE_ARMOUR]
666	&&	527	&&
667	(op->type == ARMOUR || op->type == BOOTS	528	(op->type == ARMOUR || op->type == BOOTS
668	|| op->type == CLOAK || op->type == HELMET	529	|| op->type == CLOAK || op->type == HELMET
669	|| op->type == SHIELD || op->type == GLOVES	530	|| op->type == SHIELD || op->type == GLOVES
670	|| op->type == BRACERS || op->type == GIRDLE))	531	|| op->type == BRACERS || op->type == GIRDLE))
671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	532	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
672	{	533	{
673	op->destroy ();	534	op->destroy ();
674	continue;	535	continue;
675	}	536	}
676	}	537	}
…		…
693	if (op->nrof > 1)	554	if (op->nrof > 1)
694	op->nrof = 1;	555	op->nrof = 1;
695	}	556	}
696		557
697	if (op->type == SPELLBOOK && op->inv)	558	if (op->type == SPELLBOOK && op->inv)
698	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	559	op->inv->clr_flag (FLAG_STARTEQUIP);
699		560
700	/* Give starting characters identified, uncursed, and undamned	561	/* Give starting characters identified, uncursed, and undamned
701	* items. Just don't identify gold or silver, or it won't be	562	* items. Just don't identify gold or silver, or it won't be
702	* merged properly.	563	* merged properly.
703	*/	564	*/
704	if (need_identify (op))	565	if (op->need_identify ())
705	{	566	{
706	SET_FLAG (op, FLAG_IDENTIFIED);	567	op->set_flag (FLAG_IDENTIFIED);
707	CLEAR_FLAG (op, FLAG_CURSED);	568	op->clr_flag (FLAG_CURSED);
708	CLEAR_FLAG (op, FLAG_DAMNED);	569	op->clr_flag (FLAG_DAMNED);
709	}	570	}
710		571
711	if (op->type == SPELL)	572	if (op->type == SPELL)
712	{	573	{
713	op->destroy ();	574	op->destroy ();
714	continue;	575	continue;
715	}	576	}
716	else if (op->type == SKILL)	577	else if (op->type == SKILL)
717	{	578	{
718	SET_FLAG (op, FLAG_CAN_USE_SKILL);	579	op->set_flag (FLAG_CAN_USE_SKILL);
719	op->stats.exp = 0;	580	op->stats.exp = 0;
720	op->level = 1;	581	op->level = 1;
721	}	582	}
722	else /* lock all 'normal items by default */	583	else /* lock all 'normal items by default */
723	SET_FLAG (op, FLAG_INV_LOCKED);	584	op->set_flag (FLAG_INV_LOCKED);
724	} /* for loop of objects in player inv */	585	} /* for loop of objects in player inv */
725		586
726	/* Need to set up the skill pointers */	587	/* Need to set up the skill pointers */
727	pl->contr->link_skills ();	588	pl->contr->link_skills ();
728	}	589	}
…		…
742	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	603	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743	}	604	}
744		605
745	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	606	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746	static int	607	static int
747	roll_stat (void)	608	roll_stat ()
748	{	609	{
749	int a[4], i, j, k;	610	int a[4], i, j, k;
750		611
751	for (i = 0; i < 4; i++)	612	for (i = 0; i < 4; i++)
752	a[i] = (int) rndm (6) + 1;	613	a[i] = rndm (1, 6);
753		614
754	for (i = 0, j = 0, k = 7; i < 4; i++)	615	for (i = 0, j = 0, k = 7; i < 4; i++)
755	if (a[i] < k)	616	if (a[i] < k)
756	k = a[i], j = i;	617	k = a[i], j = i;
757		618
…		…
849	player::chargen_race_done ()	710	player::chargen_race_done ()
850	{	711	{
851	/* this must before then initial items are given */	712	/* this must before then initial items are given */
852	esrv_new_player (ob->contr);	713	esrv_new_player (ob->contr);
853		714
854	treasurelist *tl = treasurelist::find ("starting_wealth");	715	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
855	if (tl)	716	if (tl)
856	create_treasure (tl, ob, 0, 0, 0);	717	create_treasure (tl, ob, 0, 0, 0);
857		718
858	INVOKE_PLAYER (BIRTH, ob->contr);	719	INVOKE_PLAYER (BIRTH, ob->contr);
859	INVOKE_PLAYER (LOGIN, ob->contr);
860		720
861	ob->contr->ns->state = ST_PLAYING;	721	ob->contr->ns->state = ST_PLAYING;
862		722
863	if (ob->msg)	723	if (ob->msg)
864	ob->msg = 0;	724	ob->msg = 0;
865		725
866	start_info (ob);	726	start_info (ob);
867	CLEAR_FLAG (ob, FLAG_WIZ);	727	ob->clr_flag (FLAG_WIZ);
868	give_initial_items (ob, ob->randomitems);	728	give_initial_items (ob, ob->randomitems);
869	esrv_send_inventory (ob, ob);	729	esrv_send_inventory (ob, ob);
870	ob->update_stats ();	730	ob->update_stats ();
871		731
872	/* This moves the player to a different start map, if there	732	/* This moves the player to a different start map, if there
…		…
912	ob->stats.hp = ob->stats.maxhp;	772	ob->stats.hp = ob->stats.maxhp;
913	ob->stats.sp = ob->stats.maxsp;	773	ob->stats.sp = ob->stats.maxsp;
914	ob->stats.grace = 0;	774	ob->stats.grace = 0;
915	}	775	}
916		776
917	void	777	static void
918	flee_player (object *op)	778	flee_player (object *op)
919	{	779	{
920	int dir, diff;	780	int dir, diff;
921	rv_vector rv;	781	rv_vector rv;
922		782
923	if (op->stats.hp < 0)	783	if (op->stats.hp < 0)
924	{	784	{
925	LOG (llevDebug, "Fleeing player is dead.\n");	785	LOG (llevDebug, "Fleeing player is dead.\n");
926	CLEAR_FLAG (op, FLAG_SCARED);	786	op->clr_flag (FLAG_SCARED);
927	return;	787	return;
928	}	788	}
929		789
930	if (!op->enemy)	790	if (!op->enemy)
931	{	791	{
932	LOG (llevDebug, "Fleeing player had no enemy.\n");	792	LOG (llevDebug, "Fleeing player had no enemy.\n");
933	CLEAR_FLAG (op, FLAG_SCARED);	793	op->clr_flag (FLAG_SCARED);
934	return;	794	return;
935	}	795	}
936		796
937	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	797	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
938	{	798	{
939	op->enemy = NULL;	799	op->enemy = NULL;
940	CLEAR_FLAG (op, FLAG_SCARED);	800	op->clr_flag (FLAG_SCARED);
941	return;	801	return;
942	}	802	}
943		803
944	get_rangevector (op, op->enemy, &rv, 0);	804	get_rangevector (op, op->enemy, &rv, 0);
945		805
946	dir = absdir (4 + rv.direction);	806	dir = absdir (4 + rv.direction);
947	for (diff = 0; diff < 3; diff++)	807	for (diff = 0; diff < 3; diff++)
948	{	808	{
949	int m = 1 - rndm (2) * 2;	809	int m = 1 - rndm (2) * 2;
950		810
951	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	811	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
952	return;	812	return;
953	}	813	}
954		814
955	/* Cornered, get rid of scared */	815	/* Cornered, get rid of scared */
956	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
957	op->enemy = NULL;	817	op->enemy = NULL;
958	}	818	}
959		819
960	/* check_pick sees if there is stuff to be picked up/picks up stuff.	820	/* check_pick sees if there is stuff to be picked up/picks up stuff.
961	* It returns 1 if the player should keep on moving, 0 if he should	821	* It returns 1 if the player should keep on moving, 0 if he should
…		…
966	{	826	{
967	object *tmp, *next;	827	object *tmp, *next;
968	int stop = 0;	828	int stop = 0;
969	int wvratio;	829	int wvratio;
970		830
971	/* if you're flying, you cna't pick up anything */	831	/* if you're flying, you can't pick up anything */
972	if (op->move_type & MOVE_FLYING)	832	if (op->move_type & MOVE_FLYING)
973	return 1;	833	return 1;
974		834
975	next = op->below;	835	next = op->below;
976		836
977	int cnt = MAX_ITEM_PER_DROP;	837	int cnt = MAX_ITEM_PER_ACTION;
978	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	838	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979		839
980	/* loop while there are items on the floor that are not marked as	840	/* loop while there are items on the floor that are not marked as
981	* destroyed */	841	* destroyed */
982	while (next && !next->destroyed ())	842	while (next && !next->destroyed ())
…		…
1008	if (op->contr->mode & PU_DEBUG)	868	if (op->contr->mode & PU_DEBUG)
1009	{	869	{
1010	/* some debugging code to figure out item information */	870	/* some debugging code to figure out item information */
1011	const char *str = tmp->name	871	const char *str = tmp->name
1012	? format ("item name: %s item type: %d weight/value: %d",	872	? format ("item name: %s item type: %d weight/value: %d",
1013	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	873	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1014	: format ("item name: %s item type: %d weight/value: %d",	874	: format ("item name: %s item type: %d weight/value: %d",
1015	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	875	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1016		876
1017	new_draw_info (NDI_UNIQUE, 0, op, str);	877	new_draw_info (NDI_UNIQUE, 0, op, str);
1018	}	878	}
1019		879
1020	if (op->contr->mode & PU_INHIBIT)	880	if (op->contr->mode & PU_INHIBIT)
…		…
1053	* fighting */	913	* fighting */
1054	if (op->contr->mode & PU_INHIBIT)	914	if (op->contr->mode & PU_INHIBIT)
1055	return 1;	915	return 1;
1056		916
1057	/* prevent us from turning into auto-thieves :) */	917	/* prevent us from turning into auto-thieves :) */
1058	if (QUERY_FLAG (tmp, FLAG_UNPAID))	918	if (tmp->flag [FLAG_UNPAID])
1059	continue;	919	continue;
1060		920
1061	/* ignore known cursed objects */	921	/* ignore known cursed objects */
1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	922	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
1063	continue;	923	continue;
1064		924
1065	/* all food and drink if desired */	925	/* all food and drink if desired */
1066	/* question: don't pick up known-poisonous stuff? */	926	/* question: don't pick up known-poisonous stuff? */
1067	if (op->contr->mode & PU_FOOD)	927	if (op->contr->mode & PU_FOOD)
…		…
1070	CHK_PICK_PICKUP;	930	CHK_PICK_PICKUP;
1071	continue;	931	continue;
1072	}	932	}
1073		933
1074	if (op->contr->mode & PU_DRINK)	934	if (op->contr->mode & PU_DRINK)
1075	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	935	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
1076	{	936	{
1077	CHK_PICK_PICKUP;	937	CHK_PICK_PICKUP;
1078	continue;	938	continue;
1079	}	939	}
1080		940
…		…
1107	continue;	967	continue;
1108	}	968	}
1109		969
1110	/* wands/staves/rods/horns */	970	/* wands/staves/rods/horns */
1111	if (op->contr->mode & PU_MAGIC_DEVICE)	971	if (op->contr->mode & PU_MAGIC_DEVICE)
1112	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	972	if (tmp->type == WAND
		973	|| tmp->type == ROD
		974	|| tmp->type == HORN
		975	|| tmp->type == POWER_CRYSTAL)
1113	{	976	{
1114	CHK_PICK_PICKUP;	977	CHK_PICK_PICKUP;
1115	continue;	978	continue;
1116	}	979	}
1117		980
1118	/* pick up all magical items */	981	/* pick up all magical items */
1119	if (op->contr->mode & PU_MAGICAL)	982	if (op->contr->mode & PU_MAGICAL)
1120	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	983	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		984	&& !tmp->flag [FLAG_KNOWN_CURSED])
1121	{	985	{
1122	CHK_PICK_PICKUP;	986	CHK_PICK_PICKUP;
1123	continue;	987	continue;
1124	}	988	}
1125		989
…		…
1132	}	996	}
1133	}	997	}
1134		998
1135	/* rings & amulets - talismans seems to be typed AMULET */	999	/* rings & amulets - talismans seems to be typed AMULET */
1136	if (op->contr->mode & PU_JEWELS)	1000	if (op->contr->mode & PU_JEWELS)
1137	if (tmp->type == RING || tmp->type == AMULET)	1001	if (tmp->type == RING
		1002	|| tmp->type == AMULET
		1003	|| tmp->type == GIRDLE
		1004	|| tmp->type == SKILL_TOOL)
1138	{	1005	{
1139	CHK_PICK_PICKUP;	1006	CHK_PICK_PICKUP;
1140	continue;	1007	continue;
1141	}	1008	}
1142		1009
…		…
1191	CHK_PICK_PICKUP;	1058	CHK_PICK_PICKUP;
1192	continue;	1059	continue;
1193	}	1060	}
1194		1061
1195	if (op->contr->mode & PU_GLOVES)	1062	if (op->contr->mode & PU_GLOVES)
1196	if (tmp->type == GLOVES)	1063	if (tmp->type == GLOVES || tmp->type == BRACERS)
1197	{	1064	{
1198	CHK_PICK_PICKUP;	1065	CHK_PICK_PICKUP;
1199	continue;	1066	continue;
1200	}	1067	}
1201		1068
…		…
1206	continue;	1073	continue;
1207	}	1074	}
1208		1075
1209	/* hoping to catch throwing daggers here */	1076	/* hoping to catch throwing daggers here */
1210	if (op->contr->mode & PU_MISSILEWEAPON)	1077	if (op->contr->mode & PU_MISSILEWEAPON)
1211	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1078	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1212	{	1079	{
1213	CHK_PICK_PICKUP;	1080	CHK_PICK_PICKUP;
1214	continue;	1081	continue;
1215	}	1082	}
1216		1083
…		…
1251	fprintf (stderr, "%s", tmp->name);	1118	fprintf (stderr, "%s", tmp->name);
1252	}	1119	}
1253	else	1120	else
1254	fprintf (stderr, "%s", tmp->arch->archname);	1121	fprintf (stderr, "%s", tmp->arch->archname);
1255	fprintf (stderr, ",%d] = ", tmp->type);	1122	fprintf (stderr, ",%d] = ", tmp->type);
1256	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1123	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1257	#endif	1124	#endif
1258	CHK_PICK_PICKUP;	1125	CHK_PICK_PICKUP;
1259	continue;	1126	continue;
1260	}	1127	}
1261	} /* the new pickup model */	1128	} /* the new pickup model */
1262	}	1129	}
1263		1130
1264	return !stop;	1131	return !stop;
1265	}	1132	}
1266		1133
		1134	/* routine for both players and monsters. We call this when
		1135	* there is a possibility for our action distrubing our hiding
		1136	* place or invisiblity spell. Artefact invisiblity causes
		1137	* "noise" instead. If we arent invisible to begin with, we
		1138	* return 0.
		1139	*/
		1140	static int
		1141	action_makes_visible (object *op)
		1142	{
		1143	if (op->invisible && op->flag [FLAG_ALIVE])
		1144	{
		1145	if (op->flag [FLAG_MAKE_INVIS])
		1146	{
		1147	// artefact invisibility is permanent, but we still make noise
		1148	// this is important for game-balance.
		1149	if (op->contr)
		1150	op->make_noise ();
		1151
		1152	return 0;
		1153	}
		1154
		1155	if (op->contr && op->contr->tmp_invis == 0)
		1156	return 0;
		1157
		1158	/* If monsters, they should become visible */
		1159	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1160	{
		1161	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1162	return 1;
		1163	}
		1164	}
		1165
		1166	return 0;
		1167	}
		1168
1267	/*	1169	/*
1268	* Find an arrow in the inventory and after that	1170	* Find an arrow in the inventory and after that
1269	* in the right type container (quiver). Pointer to the	1171	* in the right type container (quiver). Pointer to the
1270	* found object is returned.	1172	* found object is returned.
1271	*/	1173	*/
1272	object *	1174	static object *
1273	find_arrow (object *op, const char *type)	1175	find_arrow (object *op, const char *type)
1274	{	1176	{
1275	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1177	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1276	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1178	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1277	return splay (tmp);	1179	return splay (tmp);
1278		1180
1279	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1181	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1280	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1182	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1281	if (object *arrow = find_arrow (tmp, type))	1183	if (object *arrow = find_arrow (tmp, type))
1282	{	1184	{
1283	splay (tmp);	1185	splay (tmp);
1284	return arrow;	1186	return arrow;
1285	}	1187	}
…		…
1291	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1193	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1292	* against the target. A full test is not performed, simply a basic test	1194	* against the target. A full test is not performed, simply a basic test
1293	* of resistances. The archer is making a quick guess at what he sees down	1195	* of resistances. The archer is making a quick guess at what he sees down
1294	* the hall. Failing that it does it's best to pick the highest plus arrow.	1196	* the hall. Failing that it does it's best to pick the highest plus arrow.
1295	*/	1197	*/
1296	object *	1198	static object *
1297	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1199	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1298	{	1200	{
1299	object *tmp = NULL, *arrow, *ntmp;	1201	object *tmp = NULL, *arrow, *ntmp;
1300	int attacknum, attacktype, betterby = 0, i;	1202	int attacknum, attacktype, betterby = 0, i;
1301		1203
1302	if (!type)	1204	if (!type)
1303	return NULL;	1205	return NULL;
1304		1206
1305	for (arrow = op->inv; arrow; arrow = arrow->below)	1207	for (arrow = op->inv; arrow; arrow = arrow->below)
1306	{	1208	{
1307	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1209	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1308	{	1210	{
1309	i = 0;	1211	i = 0;
1310	ntmp = find_better_arrow (arrow, target, type, &i);	1212	ntmp = find_better_arrow (arrow, target, type, &i);
1311		1213
1312	if (i > betterby)	1214	if (i > betterby)
…		…
1370	* find_better_arrow to find a decent arrow to use.	1272	* find_better_arrow to find a decent arrow to use.
1371	* op = the shooter	1273	* op = the shooter
1372	* type = bow->race	1274	* type = bow->race
1373	* dir = fire direction	1275	* dir = fire direction
1374	*/	1276	*/
1375	object *	1277	static object *
1376	pick_arrow_target (object *op, shstr_cmp type, int dir)	1278	pick_arrow_target (object *op, shstr_cmp type, int dir)
1377	{	1279	{
1378	object *tmp = NULL;	1280	object *tmp = NULL;
1379	maptile *m;	1281	maptile *m;
1380	int i, mflags, found, number;	1282	int i, mflags, found, number;
…		…
1413	break;	1315	break;
1414	}	1316	}
1415		1317
1416	if (mflags & P_IS_ALIVE)	1318	if (mflags & P_IS_ALIVE)
1417	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1319	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1418	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1320	if (tmp->flag [FLAG_ALIVE])
1419	break;	1321	break;
1420	}	1322	}
1421		1323
1422	if (!tmp)	1324	if (!tmp)
1423	return find_arrow (op, type);	1325	return find_arrow (op, type);
…		…
1484	{	1386	{
1485	if (op->type == PLAYER)	1387	if (op->type == PLAYER)
1486	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1388	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1487	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1389	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1488	else	1390	else
1489	CLEAR_FLAG (op, FLAG_READY_BOW);	1391	op->clr_flag (FLAG_READY_BOW);
1490		1392
1491	return 0;	1393	return 0;
1492	}	1394	}
1493	}	1395	}
1494		1396
…		…
1543	#endif	1445	#endif
1544		1446
1545	SET_ANIMATION (arrow, arrow->direction);	1447	SET_ANIMATION (arrow, arrow->direction);
1546		1448
1547	/* update the speed */	1449	/* update the speed */
1548	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1549	+ bow->stats.dam / 7.f;
1550		1450
1551	arrow->set_speed (max (arrow->speed, 2.f));
1552	arrow->speed_left = 0;	1451	arrow->speed_left = 0;
		1452	arrow->set_speed (max (2.f,
		1453	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1454	+ bow->stats.dam / 7.f
		1455	));
1553		1456
1554	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1457	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1555		1458
1556	if (op->type == PLAYER)	1459	if (op->type == PLAYER)
1557	{	1460	{
…		…
1595	* but monsters can't. Putting that code here	1498	* but monsters can't. Putting that code here
1596	* makes the fire_bow code much cleaner.	1499	* makes the fire_bow code much cleaner.
1597	* this function should only be called if 'op' is a player,	1500	* this function should only be called if 'op' is a player,
1598	* hence the function name.	1501	* hence the function name.
1599	*/	1502	*/
1600	int	1503	static int
1601	player_fire_bow (object *op, int dir)	1504	player_fire_bow (object *op, int dir)
1602	{	1505	{
1603	int ret;	1506	int ret;
1604		1507
1605	if (op->contr->bowtype == bow_bestarrow)	1508	if (op->contr->bowtype == bow_bestarrow)
…		…
1633	}	1536	}
1634		1537
1635	/* Fires a misc (wand/rod/horn) object in 'dir'.	1538	/* Fires a misc (wand/rod/horn) object in 'dir'.
1636	* Broken apart from 'fire' to keep it more readable.	1539	* Broken apart from 'fire' to keep it more readable.
1637	*/	1540	*/
1638	void	1541	static void
1639	fire_misc_object (object *op, int dir)	1542	fire_misc_object (object *op, int dir)
1640	{	1543	{
1641	object *item = op->contr->ranged_ob;	1544	object *item = op->contr->ranged_ob;
1642		1545
1643	if (!item)	1546	if (!item)
…		…
1650	{	1553	{
1651	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1554	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1652	return;	1555	return;
1653	}	1556	}
1654		1557
1655	if (!op->change_weapon (item))	1558	if (!op->apply (item))
1656	return;	1559	return;
1657		1560
1658	if (item->type == WAND)	1561	if (item->type == WAND)
1659	{	1562	{
1660	if (item->stats.food <= 0)	1563	if (item->stats.food <= 0)
…		…
1665	return;	1568	return;
1666	}	1569	}
1667	}	1570	}
1668	else if (item->type == ROD || item->type == HORN)	1571	else if (item->type == ROD || item->type == HORN)
1669	{	1572	{
1670	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1573	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1671		1574
1672	// using the maximum of the rods charge allows at least one spell cast	1575	// using the maximum of the rods charge allows at least one spell cast
1673	// for a rod or horn, this fixes some broken rods.	1576	// for a rod or horn, this fixes some broken rods.
1674	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1577	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1675	{	1578	{
1676	op->contr->play_sound (sound_find ("wand_poof"));	1579	op->contr->play_sound (sound_find ("wand_poof"));
1677		1580
1678	if (item->type == ROD)	1581	if (item->type == ROD)
1679	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1582	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1694	{	1597	{
1695	object *tmp;	1598	object *tmp;
1696		1599
1697	if (item->arch)	1600	if (item->arch)
1698	{	1601	{
1699	CLEAR_FLAG (item, FLAG_ANIMATE);	1602	item->clr_flag (FLAG_ANIMATE);
1700	item->face = item->arch->face;	1603	item->face = item->arch->face;
1701	item->set_speed (0);	1604	item->set_speed (0);
1702	}	1605	}
1703		1606
1704	if (object *pl = item->visible_to ())	1607	if (object *pl = item->visible_to ())
…		…
1711	}	1614	}
1712		1615
1713	/* Received a fire command for the player - go and do it.	1616	/* Received a fire command for the player - go and do it.
1714	*/	1617	*/
1715	bool	1618	bool
1716	fire (object *op, int dir)	1619	fire (object *who, int dir)
1717	{	1620	{
1718	int spellcost = 0;	1621	int spellcost = 0;
1719		1622
1720	player *pl = op->contr;	1623	player *pl = who->contr;
1721		1624
1722	if (pl->golem)	1625	if (pl->golem)
1723	{	1626	{
1724	control_golem (op->contr->golem, dir);	1627	control_golem (who->contr->golem, dir);
1725	return false;	1628	return false;
1726	}	1629	}
1727		1630
1728	object *ob = pl->ranged_ob;	1631	object *ob = pl->ranged_ob;
1729		1632
1730	if (!ob)	1633	if (!ob)
1731	return false;	1634	return false;
1732		1635
1733	if (op->speed_left > 0.f)	1636	if (who->speed_left > 0.f)
1734	--op->speed_left;	1637	--who->speed_left;
1735	else	1638	else
1736	return false;	1639	return false;
1737		1640
1738	if (!op->change_weapon (ob))	1641	if (!who->apply (ob))
1739	return false;	1642	return false;
1740		1643
1741	/* check for loss of invisiblity/hide */	1644	/* check for loss of invisiblity/hide */
1742	if (action_makes_visible (op))	1645	if (action_makes_visible (who))
1743	make_visible (op);	1646	make_visible (who);
1744		1647
1745	switch (ob->type)	1648	switch (ob->type)
1746	{	1649	{
1747	case BOW:	1650	case BOW:
1748	player_fire_bow (op, dir);	1651	player_fire_bow (who, dir);
1749	break;	1652	break;
1750		1653
1751	case SPELL:	1654	case SPELL:
1752	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1655	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1753	break;	1656	break;
1754		1657
1755	case BUILDER:	1658	case BUILDER:
1756	apply_map_builder (op, dir);	1659	apply_map_builder (who, dir);
1757	break;	1660	break;
1758		1661
1759	case SKILL:	1662	case SKILL:
1760	do_skill (op, op, ob, dir, 0);	1663	do_skill (who, who, ob, dir, 0);
1761	break;	1664	break;
1762		1665
		1666	case RANGED:
		1667	do_skill (who, ob, who->chosen_skill, dir, 0);
		1668	break;
		1669
1763	default:	1670	default:
1764	fire_misc_object (op, dir);	1671	fire_misc_object (who, dir);
1765	break;	1672	break;
1766	}	1673	}
1767		1674
1768	return true;	1675	return true;
1769	}	1676	}
1770		1677
1771	/* find_key	1678	static object *
1772	* We try to find a key for the door as passed. If we find a key
1773	* and successfully use it, we return the key, otherwise NULL
1774	* This function merges both normal and locked door, since the logic
1775	* for both is the same - just the specific key is different.
1776	* pl is the player,
1777	* inv is the objects inventory to searched
1778	* door is the door we are trying to match against.
1779	* This function can be called recursively to search containers.
1780	*/
1781	object *
1782	find_key (object *pl, object *container, object *door)	1679	find_key_ (object *pl, object *container, object *door)
1783	{	1680	{
1784	object *tmp, *key;	1681	object *tmp, *key;
1785		1682
1786	/* Should not happen, but sanity checking is never bad */	1683	/* Should not happen, but sanity checking is never bad */
1787	if (!container->inv)	1684	if (!container->inv)
…		…
1808	if (!tmp)	1705	if (!tmp)
1809	{	1706	{
1810	for (tmp = container->inv; tmp; tmp = tmp->below)	1707	for (tmp = container->inv; tmp; tmp = tmp->below)
1811	/* No reason to search empty containers */	1708	/* No reason to search empty containers */
1812	if (tmp->type == CONTAINER && tmp->inv)	1709	if (tmp->type == CONTAINER && tmp->inv)
1813	if ((key = find_key (pl, tmp, door)))	1710	if ((key = find_key_ (pl, tmp, door)))
1814	return key;	1711	return key;
1815		1712
1816	if (!tmp)	1713	if (!tmp)
1817	return 0;	1714	return 0;
1818	}	1715	}
…		…
1837	* inv must have been an container and must have been active.	1734	* inv must have been an container and must have been active.
1838	*	1735	*
1839	* Change the color so that the message doesn't disappear with	1736	* Change the color so that the message doesn't disappear with
1840	* all the others.	1737	* all the others.
1841	*/	1738	*/
1842	if (pl->contr->usekeys == key_inventory ||	1739	if (pl->contr->usekeys == key_inventory
1843	!QUERY_FLAG (container, FLAG_APPLIED) ||	1740	|| !container->flag [FLAG_APPLIED]
1844	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1741	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1845	{	1742	{
1846	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1743	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1847	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1744	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1848	return NULL;	1745	return NULL;
1849	}	1746	}
1850	}	1747	}
1851		1748
1852	return tmp;	1749	return tmp;
		1750	}
		1751
		1752	/* find_key
		1753	* We try to find a key for the door as passed. If we find a key
		1754	* and successfully use it, we return the key, otherwise NULL
		1755	* This function merges both normal and locked door, since the logic
		1756	* for both is the same - just the specific key is different.
		1757	* pl is the player,
		1758	* inv is the objects inventory to searched
		1759	* door is the door we are trying to match against.
		1760	* This function can be called recursively to search containers.
		1761	*/
		1762	object *
		1763	find_key (object *pl, object *container, object *door)
		1764	{
		1765	if (door->slaying && is_match_expr (door->slaying))
		1766	{
		1767	// for match expressions, we try to find the key by applying the match
		1768	// to the op itself, which is supposed to find the "key", instead
		1769	// of searching through containers ourselves.
		1770
		1771	return match_one (door->slaying, container, door, pl, pl);
		1772	}
		1773	else
		1774	return find_key_ (pl, container, door);
1853	}	1775	}
1854		1776
1855	/* moved door processing out of move_player_attack.	1777	/* moved door processing out of move_player_attack.
1856	* returns 1 if player has opened the door with a key	1778	* returns 1 if player has opened the door with a key
1857	* such that the caller should not do anything more,	1779	* such that the caller should not do anything more,
…		…
1907	* going to try and move (not fire weapons).	1829	* going to try and move (not fire weapons).
1908	*/	1830	*/
1909	bool	1831	bool
1910	move_player_attack (object *op, int dir)	1832	move_player_attack (object *op, int dir)
1911	{	1833	{
1912	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1834	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1913	{	1835	{
1914	--op->speed_left;	1836	--op->speed_left;
1915	return true;	1837	return true;
1916	}	1838	}
1917		1839
1918	int on_battleground;
1919
1920	sint16 nx = freearr_x[dir] + op->x;	1840	sint16 nx = freearr_x[dir] + op->x;
1921	sint16 ny = freearr_y[dir] + op->y;	1841	sint16 ny = freearr_y[dir] + op->y;
1922
1923	on_battleground = op_on_battleground (op, 0, 0);
1924		1842
1925	if (out_of_map (op->map, nx, ny))	1843	if (out_of_map (op->map, nx, ny))
1926	return false;	1844	return false;
1927		1845
1928	/* If braced, or can't move to the square, and it is not out of the	1846	/* If braced, or can't move to the square, and it is not out of the
…		…
1949	|| mon->flag [FLAG_CAN_ROLL])	1867	|| mon->flag [FLAG_CAN_ROLL])
1950	&& mon != op)	1868	&& mon != op)
1951	break;	1869	break;
1952	}	1870	}
1953		1871
1954	if (!mon) /* This happens anytime the player tries to move */	1872	/* no monster == player tries to move into a wall or so */
1955	return false; /* into a wall */	1873	if (!mon)
		1874	{
		1875	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1876	if (op->move_type & ob->move_block)
		1877	{
		1878	if (ob->move_block == MOVE_ALL)
		1879	move_into_wall (op, ob);
		1880	else
		1881	{
		1882	if (op->contr->ns->bumpmsg)
		1883	{
		1884	op->play_sound (sound_find ("blocked_move"));
		1885
		1886	op->statusmsg (ob->invisible
		1887	? "Something blocks you."
		1888	: format ("Something blocks you from entering the %s.", query_name (ob))
		1889	);
		1890	}
		1891	}
		1892
		1893	break;
		1894	}
		1895
		1896	return false;
		1897	}
1956		1898
1957	mon = mon->head_ ();	1899	mon = mon->head_ ();
1958		1900
1959	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1901	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1960	if (op->contr->weapon_sp_left > 0.f)	1902	if (op->contr->weapon_sp_left > 0.f)
…		…
1978	*/	1920	*/
1979	if (op->type == PLAYER	1921	if (op->type == PLAYER
1980	&& ((mon->owner && mon->owner->contr	1922	&& ((mon->owner && mon->owner->contr
1981	&& same_party (mon->owner->contr->party, op->contr->party))	1923	&& same_party (mon->owner->contr->party, op->contr->party))
1982	|| mon->owner == op)	1924	|| mon->owner == op)
1983	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1925	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1984	{	1926	{
1985	/* If we're braced, we don't want to switch places with it */	1927	/* If we're braced, we don't want to switch places with it */
1986	if (op->contr->braced)	1928	if (op->contr->braced)
1987	return false;	1929	return false;
1988		1930
…		…
1999	return true;	1941	return true;
2000	}	1942	}
2001	else	1943	else
2002	return false;	1944	return false;
2003	}	1945	}
		1946
		1947	bool on_battleground = op_on_battleground (op, 0, 0);
2004		1948
2005	/* in certain circumstances, you shouldn't attack friendly	1949	/* in certain circumstances, you shouldn't attack friendly
2006	* creatures. Note that if you are braced, you can't push	1950	* creatures. Note that if you are braced, you can't push
2007	* someone, but put it inside this loop so that you won't	1951	* someone, but put it inside this loop so that you won't
2008	* attack them either.	1952	* attack them either.
2009	*/	1953	*/
2010	if ((mon->type == PLAYER || mon->enemy != op)	1954	if ((mon->type == PLAYER || mon->enemy != op)
2011	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1955	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2012	&& ((op->contr->peaceful	1956	&& ((op->contr->peaceful
2013	|| (mon->type == PLAYER && mon->contr->peaceful))	1957	|| (mon->type == PLAYER && mon->contr->peaceful))
2014	&& !on_battleground))	1958	&& !on_battleground))
2015	{	1959	{
2016	if (op->speed_left > 0.f)	1960	if (op->speed_left > 0.f)
…		…
2032	}	1976	}
2033	}	1977	}
2034	/* If the object is a boulder or other rollable object, then	1978	/* If the object is a boulder or other rollable object, then
2035	* roll it if not braced. You can't roll it if you are braced.	1979	* roll it if not braced. You can't roll it if you are braced.
2036	*/	1980	*/
2037	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1981	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2038	{	1982	{
2039	if (op->speed_left > 0.f)	1983	if (op->speed_left > 0.f)
2040	{	1984	{
2041	--op->speed_left;	1985	--op->speed_left;
2042		1986
…		…
2051	* Way it works is like this: First, it must have some hit points	1995	* Way it works is like this: First, it must have some hit points
2052	* and be living. Then, it must be one of the following:	1996	* and be living. Then, it must be one of the following:
2053	* 1) Not a player, 2) A player, but of a different party. Note	1997	* 1) Not a player, 2) A player, but of a different party. Note
2054	* that party_number -1 is no party, so attacks can still happen.	1998	* that party_number -1 is no party, so attacks can still happen.
2055	*/	1999	*/
2056	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2000	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2057	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2001	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2058	{	2002	{
2059	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2003	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2060	{	2004	{
2061	--op->contr->weapon_sp_left;	2005	--op->contr->weapon_sp_left;
…		…
2073	}	2017	}
2074		2018
2075	bool	2019	bool
2076	move_player (object *op, int dir)	2020	move_player (object *op, int dir)
2077	{	2021	{
2078	int pick;
2079
2080	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2022	if (!op->map || op->map->state != MAP_ACTIVE)
2081	return 0;	2023	return 0;
2082		2024
2083	/* Sanity check: make sure dir is valid */	2025	/* Sanity check: make sure dir is valid */
2084	if ((dir < 0) || (dir >= 9))	2026	if (dir < 0 || dir > 8)
2085	{	2027	{
2086	LOG (llevError, "move_player: invalid direction %d\n", dir);	2028	LOG (llevError, "move_player: invalid direction %d\n", dir);
2087	return 0;	2029	return 0;
2088	}	2030	}
2089		2031
2090	/* peterm: added following line */	2032	/* peterm: added following line */
2091	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2033	if (op->flag [FLAG_CONFUSED] && dir)
2092	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2034	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2093		2035
2094	op->facing = dir;	2036	op->facing = dir;
2095		2037
2096	if (op->flag [FLAG_HIDDEN])	2038	if (op->flag [FLAG_HIDDEN])
2097	do_hidden_move (op);	2039	do_hidden_move (op);
2098		2040
2099	bool retval;	2041	bool retval;
		2042	int pick = 0;
2100		2043
2101	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2044	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2102	retval = RESULT_INT (0);	2045	retval = RESULT_INT (0);
2103	else if (op->contr->fire_on)	2046	else if (op->contr->fire_on)
2104	retval = fire (op, dir);	2047	retval = fire (op, dir);
…		…
2135	* players.	2078	* players.
2136	*/	2079	*/
2137	bool	2080	bool
2138	handle_newcs_player (object *op)	2081	handle_newcs_player (object *op)
2139	{	2082	{
2140	if (QUERY_FLAG (op, FLAG_SCARED))	2083	if (op->flag [FLAG_SCARED])
2141	{	2084	{
2142	if (op->speed_left > 0.f)	2085	if (op->speed_left > 0.f)
2143	{	2086	{
2144	--op->speed_left;	2087	--op->speed_left;
2145	flee_player (op);	2088	flee_player (op);
…		…
2161	return move_player (op, op->direction);	2104	return move_player (op, op->direction);
2162		2105
2163	return false;	2106	return false;
2164	}	2107	}
2165		2108
2166	int	2109	static int
2167	save_life (object *op)	2110	save_life (object *op)
2168	{	2111	{
2169	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2112	if (!op->flag [FLAG_LIFESAVE])
2170	return 0;	2113	return 0;
2171		2114
2172	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2115	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2173	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2116	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2174	{	2117	{
2175	op->play_sound (sound_find ("ob_evaporate"));	2118	op->play_sound (sound_find ("ob_evaporate"));
2176	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2119	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2177		2120
2178	tmp->destroy ();	2121	tmp->destroy ();
2179	CLEAR_FLAG (op, FLAG_LIFESAVE);	2122	op->clr_flag (FLAG_LIFESAVE);
2180		2123
2181	if (op->stats.hp < 0)	2124	if (op->stats.hp < 0)
2182	op->stats.hp = op->stats.maxhp;	2125	op->stats.hp = op->stats.maxhp;
2183		2126
2184	if (op->stats.food < 0)	2127	if (op->stats.food < 0)
2185	op->stats.food = 999;	2128	op->stats.food = MAX_FOOD;
2186		2129
2187	op->update_stats ();	2130	op->update_stats ();
2188	return 1;	2131	return 1;
2189	}	2132	}
2190		2133
2191	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2134	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2192	CLEAR_FLAG (op, FLAG_LIFESAVE);	2135	op->clr_flag (FLAG_LIFESAVE);
2193	enter_player_savebed (op); /* bring him home. */	2136	enter_player_savebed (op); /* bring him home. */
2194	return 0;	2137	return 0;
2195	}	2138	}
2196		2139
2197	/* This goes throws the inventory and removes unpaid objects, and puts them	2140	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2204	{	2147	{
2205	while (op)	2148	while (op)
2206	{	2149	{
2207	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2150	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2208		2151
2209	if (QUERY_FLAG (op, FLAG_UNPAID))	2152	if (op->flag [FLAG_UNPAID])
2210	op->insert_at (env);	2153	op->insert_at (env);
2211	else if (op->inv)	2154	else if (op->inv)
2212	drop_unpaid_items (op->inv, env);	2155	drop_unpaid_items (op->inv, env);
2213		2156
2214	op = next;	2157	op = next;
…		…
2220	{	2163	{
2221	if (!flag [FLAG_REMOVED])	2164	if (!flag [FLAG_REMOVED])
2222	::drop_unpaid_items (inv, this);	2165	::drop_unpaid_items (inv, this);
2223	}	2166	}
2224		2167
2225	/*
2226	* Returns pointer a static string containing gravestone text
2227	* Moved from apply.c to player.c - player.c is what
2228	* actually uses this function. player.c may not be quite the
2229	* best, a misc file for object actions is probably better,
2230	* but there isn't one in the server directory.
2231	*/
2232	const char *
2233	gravestone_text (object *op)
2234	{
2235	static dynbuf_text buf;
2236
2237	buf << "---- R.I.P. ----\n\n"
2238	<< op->name;
2239
2240	if (op->type == PLAYER)
2241	buf << " the " << op->contr->title;
2242
2243	buf << "\n\n";
2244
2245	buf << "who was level ";
2246	buf << (sint32)op->level << "\n\n" // OO breakdown
2247	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2248
2249	if (op->type == PLAYER)
2250	buf << "by " << op->contr->killer_name () << ".\n\n";
2251
2252	{
2253	static char buf2[128];
2254	time_t now = time (NULL);
2255	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2256	buf << buf2;
2257	}
2258
2259	return buf;
2260	}
2261
2262	void	2168	void
2263	do_some_living (object *op)	2169	do_some_living (object *op)
2264	{	2170	{
2265	int last_food = op->stats.food;	2171	int last_food = op->stats.food;
2266	int gen_hp, gen_sp, gen_grace;	2172	int gen_hp, gen_sp, gen_grace;
2267	int over_hp, over_sp, over_grace;
2268	int i;	2173	int i;
2269	int rate_hp = 1200;	2174	int rate_hp = 1200;
2270	int rate_sp = 2500;	2175	int rate_sp = 2500;
2271	int rate_grace = 2000;	2176	int rate_grace = 2000;
2272	const int max_hp = 1;	2177	const int max_hp = 1;
…		…
2278	op->invisible = 1000;	2183	op->invisible = 1000;
2279	/* the socket code flashes the player visible/invisible	2184	/* the socket code flashes the player visible/invisible
2280	* depending on the value of invisible, so we need to	2185	* depending on the value of invisible, so we need to
2281	* alternate it here for it to work correctly.	2186	* alternate it here for it to work correctly.
2282	*/	2187	*/
2283	if (pticks & 2)	2188	if (server_tick & 2)
2284	op->invisible--;	2189	op->invisible--;
2285	}	2190	}
2286	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2191	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2287	{	2192	{
2288	if (!op->invisible--)	2193	if (!op->invisible--)
2289	{	2194	{
2290	make_visible (op);	2195	make_visible (op);
2291	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2196	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2325	if (--op->last_grace < 0)	2230	if (--op->last_grace < 0)
2326	{	2231	{
2327	if (op->stats.grace < op->stats.maxgrace / 2)	2232	if (op->stats.grace < op->stats.maxgrace / 2)
2328	op->stats.grace++; /* no penalty in food for regaining grace */	2233	op->stats.grace++; /* no penalty in food for regaining grace */
2329		2234
		2235	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2236
2330	if (max_grace > 1)	2237	if (max_grace > 1)
2331	{	2238	{
2332	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2239	int over_grace = temp / rate_grace;
		2240
2333	if (over_grace > 0)	2241	if (over_grace > 0)
2334	{	2242	{
2335	op->stats.sp += over_grace	2243	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2336	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2337	op->last_grace = 0;	2244	op->last_grace = 0;
2338	}	2245	}
2339	else	2246	else
2340	{	2247	op->last_grace = rate_grace / temp;
2341	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2342	}
2343	}	2248	}
2344	else	2249	else
2345	{	2250	op->last_grace = rate_grace / temp;
2346	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2251
2347	}
2348	/* wearing stuff doesn't detract from grace generation. */	2252	/* wearing stuff doesn't detract from grace generation. */
2349	}	2253	}
2350		2254
2351	if (op->stats.food > 0)	2255	if (op->stats.food > 0)
2352	{	2256	{
…		…
2358	if (op->stats.sp < op->stats.maxsp)	2262	if (op->stats.sp < op->stats.maxsp)
2359	{	2263	{
2360	op->stats.sp++;	2264	op->stats.sp++;
2361		2265
2362	/* dms do not consume food */	2266	/* dms do not consume food */
2363	if (!QUERY_FLAG (op, FLAG_WIZ))	2267	if (!op->flag [FLAG_WIZ])
2364	{	2268	{
2365	op->stats.food--;	2269	op->stats.food--;
2366		2270
2367	if (op->contr->digestion < 0)	2271	if (op->contr->digestion < 0)
2368	op->stats.food += op->contr->digestion;	2272	op->stats.food += op->contr->digestion;
…		…
2371	}	2275	}
2372	}	2276	}
2373		2277
2374	if (max_sp > 1)	2278	if (max_sp > 1)
2375	{	2279	{
2376	over_sp = (gen_sp + 10) / rate_sp;	2280	int over_sp = (gen_sp + 10) / rate_sp;
2377	if (over_sp > 0)	2281	if (over_sp > 0)
2378	{	2282	{
2379	if (op->stats.sp < op->stats.maxsp)	2283	if (op->stats.sp < op->stats.maxsp)
2380	{	2284	{
2381	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2285	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2402	if (op->stats.hp < op->stats.maxhp)	2306	if (op->stats.hp < op->stats.maxhp)
2403	{	2307	{
2404	op->stats.hp++;	2308	op->stats.hp++;
2405		2309
2406	/* dms do not consume food */	2310	/* dms do not consume food */
2407	if (!QUERY_FLAG (op, FLAG_WIZ))	2311	if (!op->flag [FLAG_WIZ])
2408	{	2312	{
2409	op->stats.food--;	2313	op->stats.food--;
2410		2314
2411	if (op->contr->digestion < 0)	2315	if (op->contr->digestion < 0)
2412	op->stats.food += op->contr->digestion;	2316	op->stats.food += op->contr->digestion;
2413	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2317	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2414	op->stats.food = last_food;	2318	op->stats.food = last_food;
2415	}	2319	}
2416	}	2320	}
2417		2321
		2322	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2323
2418	if (max_hp > 1)	2324	if (max_hp > 1)
2419	{	2325	{
2420	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2326	int over_hp = temp / rate_hp;
2421		2327
2422	if (over_hp > 0)	2328	if (over_hp > 0)
2423	{	2329	{
2424	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2330	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2425	op->last_heal = 0;	2331	op->last_heal = 0;
2426	}	2332	}
2427	else	2333	else
2428	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2334	op->last_heal = rate_hp / temp;
2429	}	2335	}
2430	else	2336	else
2431	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2337	op->last_heal = rate_hp / temp;
2432	}	2338	}
2433	}	2339	}
2434		2340
2435	/* Digestion */	2341	/* Digestion */
2436	if (--op->last_eat < 0)	2342	if (--op->last_eat < 0)
…		…
2439	penalty = max (0, -op->contr->digestion);	2345	penalty = max (0, -op->contr->digestion);
2440		2346
2441	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2347	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2442		2348
2443	/* dms do not consume food */	2349	/* dms do not consume food */
2444	if (!QUERY_FLAG (op, FLAG_WIZ))	2350	if (!op->flag [FLAG_WIZ])
2445	op->stats.food--;	2351	op->stats.food--;
2446	}	2352	}
2447		2353
2448	if (op->stats.food < 0 && op->stats.hp >= 0)	2354	if (op->stats.food < 0 && op->stats.hp >= 0)
2449	{	2355	{
2450	object *flesh = 0;	2356	object *flesh = 0;
2451		2357
2452	for_inv_removable (op, tmp)	2358	for_inv_removable (op, tmp)
2453	{	2359	{
2454	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2360	if (tmp->flag [FLAG_UNPAID])
2455	continue;	2361	continue;
2456		2362
2457	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2363	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2458	{	2364	{
2459	op->statusmsg ("You blindly grab for a bite of food. "	2365	op->statusmsg ("You blindly grab for a bite of food. "
2460	"H<To prevent you from starving, you ate some random item from your backpack.>");	2366	"H<To prevent you from starving, you ate some random item from your backpack.>");
2461	manual_apply (op, tmp, 0);	2367	op->apply (tmp);
2462		2368
2463	if (op->stats.food >= 0 || op->stats.hp < 0)	2369	if (op->stats.food >= 0 || op->stats.hp < 0)
2464	break;	2370	break;
2465	}	2371	}
2466	else if (tmp->type == FLESH)	2372	else if (tmp->type == FLESH)
…		…
2472	*/	2378	*/
2473	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2379	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2474	{	2380	{
2475	op->statusmsg ("You blindly grab for a bite of food. "	2381	op->statusmsg ("You blindly grab for a bite of food. "
2476	"H<To prevent you from starving, you ate some random item from your backpack.>");	2382	"H<To prevent you from starving, you ate some random item from your backpack.>");
2477	manual_apply (op, flesh, 0);	2383	op->apply (flesh);
2478	}	2384	}
2479		2385
2480	// If player is still starving, alert him!	2386	// If player is still starving, alert him!
2481	if (op->stats.food < 0)	2387	if (op->stats.food < 0)
2482	op->failmsg ("You are starving! "	2388	op->failmsg ("You are starving! "
…		…
2494	op->contr->killer->destroy ();	2400	op->contr->killer->destroy ();
2495	}	2401	}
2496	}	2402	}
2497		2403
2498	/* killer should be set here already */	2404	/* killer should be set here already */
2499	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2405	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2500	kill_player (op);	2406	kill_player (op);
2501	}	2407	}
2502	}	2408	}
2503		2409
2504	/* If the player should die (lack of hp, food, etc), we call this.	2410	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2519	return;	2425	return;
2520		2426
2521	dynbuf_text deathtab;	2427	dynbuf_text deathtab;
2522		2428
2523	/* restore player */	2429	/* restore player */
2524	at = archetype::find ("poisoning");	2430	at = archetype::find (shstr_poisoning);
2525	if (object *tmp = present_arch_in_ob (at, op))	2431	if (object *tmp = present_arch_in_ob (at, op))
2526	{	2432	{
2527	tmp->destroy ();	2433	tmp->destroy ();
2528	deathtab << "Your body feels cleansed...\r";	2434	deathtab << "Your body feels cleansed...\r";
2529	}	2435	}
2530		2436
2531	at = archetype::find ("confusion");	2437	at = archetype::find (shstr_confusion);
2532	if (object *tmp = present_arch_in_ob (at, op))	2438	if (object *tmp = present_arch_in_ob (at, op))
2533	{	2439	{
2534	tmp->destroy ();	2440	tmp->destroy ();
2535	deathtab << "Your mind feels clearer...\r";	2441	deathtab << "Your mind feels clearer...\r";
2536	}	2442	}
…		…
2538	cure_disease (op, 0, 0); /* remove any disease */	2444	cure_disease (op, 0, 0); /* remove any disease */
2539		2445
2540	max_it (op->stats.hp , op->stats.maxhp);	2446	max_it (op->stats.hp , op->stats.maxhp);
2541	max_it (op->stats.sp , op->stats.maxsp);	2447	max_it (op->stats.sp , op->stats.maxsp);
2542	max_it (op->stats.grace, op->stats.maxgrace);	2448	max_it (op->stats.grace, op->stats.maxgrace);
2543
2544	if (op->stats.food <= 0)	2449	max_it (op->stats.food , 200);
2545	op->stats.food = 999;
2546		2450
2547	// remove all spell effects that are active	2451	// remove all spell effects that are active
2548	// to avoid long-term effects such as word-of-recall	2452	// to avoid long-term effects such as word-of-recall
2549	for (object *item = op->inv; item; )	2453	for (object *item = op->inv; item; )
2550	{	2454	{
…		…
2563	if (op_on_battleground (op, &x, &y))	2467	if (op_on_battleground (op, &x, &y))
2564	{	2468	{
2565	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2469	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2566		2470
2567	/* create a bodypart-trophy to make the winner happy */	2471	/* create a bodypart-trophy to make the winner happy */
2568	if (object *tmp = arch_to_object (archetype::find ("finger")))	2472	object *tmp = archetype::find (shstr_finger)->instance ();
2569	{	2473
2570	tmp->name = format ("%s's finger" , &op->name);	2474	tmp->name = format ("%s's finger" , &op->name);
2571	tmp->name_pl = format ("%s's fingers", &op->name);	2475	tmp->name_pl = format ("%s's fingers", &op->name);
2572	tmp->msg = format (	2476	tmp->msg = format (
2573	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2477	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2574	&op->name, op->contr->title,	2478	&op->name, op->contr->title,
2575	(int)op->level,	2479	(int)op->level,
2576	op->contr->killer_name ()	2480	op->contr->killer_name ()
2577	);	2481	);
2578	tmp->value = 0, tmp->type = 0;	2482	tmp->value = 0, tmp->type = 0;
2579	tmp->materialname = "organics";	2483	tmp->material = name_to_material (shstr_organic);
2580	tmp->insert_at (op, tmp);	2484	tmp->insert_at (op, tmp);
2581	}
2582		2485
2583	/* teleport defeated player to new destination */	2486	/* teleport defeated player to new destination */
2584	transfer_ob (op, x, y, 0, NULL);	2487	transfer_ob (op, x, y, 0, NULL);
2585	op->contr->braced = 0;	2488	op->contr->braced = 0;
2586		2489
…		…
2648	lost_a_stat = 1;	2551	lost_a_stat = 1;
2649	}	2552	}
2650	else	2553	else
2651	{	2554	{
2652	/* deplete a stat */	2555	/* deplete a stat */
2653	archetype *deparch = archetype::find ("depletion");	2556	archetype *deparch = archetype::find (shstr_depletion);
2654	object *dep;	2557	object *dep;
2655		2558
2656	dep = present_arch_in_ob (deparch, op);	2559	dep = present_arch_in_ob (deparch, op);
2657	if (!dep)	2560	if (!dep)
2658	{	2561	{
2659	dep = arch_to_object (deparch);	2562	dep = deparch->instance ();
2660	insert_ob_in_ob (dep, op);	2563	insert_ob_in_ob (dep, op);
2661	}	2564	}
2662	lose_this_stat = 1;	2565	lose_this_stat = 1;
2663	if (settings.balanced_stat_loss)	2566	if (settings.balanced_stat_loss)
2664	{	2567	{
…		…
2702	* difference.	2605	* difference.
2703	*/	2606	*/
2704	if (this_stat >= -50)	2607	if (this_stat >= -50)
2705	{	2608	{
2706	change_attr_value (&(dep->stats), i, -1);	2609	change_attr_value (&(dep->stats), i, -1);
2707	SET_FLAG (dep, FLAG_APPLIED);	2610	dep->set_flag (FLAG_APPLIED);
2708	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2611	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2709	op->update_stats ();	2612	op->update_stats ();
2710	lost_a_stat = 1;	2613	lost_a_stat = 1;
2711	}	2614	}
2712	}	2615	}
…		…
2730	#endif	2633	#endif
2731		2634
2732	/* Put a gravestone up where the character 'almost' died. List the	2635	/* Put a gravestone up where the character 'almost' died. List the
2733	* exp loss on the stone.	2636	* exp loss on the stone.
2734	*/	2637	*/
2735	tmp = arch_to_object (archetype::find ("gravestone"));	2638	tmp = archetype::find (shstr_gravestone)->instance ();
2736	tmp->name = format ("%s's gravestone", &op->name);	2639	tmp->name = format ("%s's gravestone", &op->name);
2737	tmp->name_pl = format ("%s's gravestones", &op->name);	2640	tmp->name_pl = format ("%s's gravestones", &op->name);
2738	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2641	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2739	&op->name, op->contr->title, op->contr->killer_name ());	2642	&op->name, op->contr->title, op->contr->killer_name ());
2740	tmp->x = op->x, tmp->y = op->y;	2643	tmp->x = op->x, tmp->y = op->y;
…		…
2779	if (will_kill_again)	2682	if (will_kill_again)
2780	{	2683	{
2781	object *force;	2684	object *force;
2782	int at;	2685	int at;
2783		2686
2784	force = get_archetype (FORCE_NAME);	2687	force = archetype::get (FORCE_NAME);
2785	/* 50 ticks should be enough time for the spell to abate */	2688	/* 50 ticks should be enough time for the spell to abate */
2786	force->speed = 0.1f;
2787	force->speed_left = -5.f;	2689	force->speed_left = -5.f;
2788	SET_FLAG (force, FLAG_APPLIED);	2690	force->set_speed (0.1f);
		2691	force->set_flag (FLAG_APPLIED);
		2692
2789	for (at = 0; at < NROFATTACKS; at++)	2693	for (at = 0; at < NROFATTACKS; at++)
2790	if (will_kill_again & (1 << at))	2694	if (will_kill_again & (1 << at))
2791	force->resist[at] = 100;	2695	force->resist[at] = 100;
2792		2696
2793	insert_ob_in_ob (force, op);	2697	insert_ob_in_ob (force, op);
…		…
2795	}	2699	}
2796		2700
2797	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2701	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2798	}	2702	}
2799		2703
2800	void	2704	static void
2801	loot_object (object *op)	2705	loot_object (object *op)
2802	{ /* Grab and destroy some treasure */	2706	{ /* Grab and destroy some treasure */
2803	object *tmp, *tmp2, *next;	2707	object *tmp, *tmp2, *next;
2804		2708
2805	op->close_container (); /* close open sack first */	2709	op->close_container (); /* close open sack first */
…		…
2815	tmp->x = op->x, tmp->y = op->y;	2719	tmp->x = op->x, tmp->y = op->y;
2816		2720
2817	if (tmp->type == CONTAINER)	2721	if (tmp->type == CONTAINER)
2818	loot_object (tmp); /* empty container to ground */	2722	loot_object (tmp); /* empty container to ground */
2819		2723
2820	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2724	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2821	{	2725	{
2822	if (tmp->nrof > 1)	2726	if (tmp->nrof > 1)
2823	{	2727	{
2824	tmp->decrease (rndm (1, tmp->nrof - 1));	2728	tmp->decrease (rndm (1, tmp->nrof - 1));
2825	insert_ob_in_map (tmp, op->map, NULL, 0);	2729	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2836	* fix_weight(): Check recursively the weight of all players, and fix	2740	* fix_weight(): Check recursively the weight of all players, and fix
2837	* what needs to be fixed. Refresh windows and fix speed if anything	2741	* what needs to be fixed. Refresh windows and fix speed if anything
2838	* was changed.	2742	* was changed.
2839	*/	2743	*/
2840	void	2744	void
2841	fix_weight (void)	2745	fix_weight ()
2842	{	2746	{
2843	for_all_players (pl)	2747	for_all_players (pl)
2844	{	2748	{
2845	sint32 old = pl->ob->carrying;	2749	sint32 old = pl->ob->carrying;
2846		2750
…		…
2853	}	2757	}
2854	}	2758	}
2855	}	2759	}
2856		2760
2857	void	2761	void
2858	fix_luck (void)	2762	fix_luck ()
2859	{	2763	{
2860	for_all_players (pl)	2764	for_all_players (pl)
2861	if (!pl->ob->contr->ns->state)	2765	if (!pl->ob->contr->ns->state)
2862	pl->ob->change_luck (0);	2766	pl->ob->change_luck (0);
2863	}	2767	}
…		…
2915	}	2819	}
2916		2820
2917	int	2821	int
2918	is_true_undead (object *op)	2822	is_true_undead (object *op)
2919	{	2823	{
2920	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2824	if (op->arch->flag [FLAG_UNDEAD])
2921	return 1;	2825	return 1;
2922		2826
2923	return 0;	2827	return 0;
2924	}	2828	}
2925		2829
…		…
3023		2927
3024	if (who->type == PLAYER)	2928	if (who->type == PLAYER)
3025	player = 1;	2929	player = 1;
3026		2930
3027	else	2931	else
3028	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2932	friendly = who->flag [FLAG_FRIENDLY];
3029		2933
3030	/* search adjacent squares */	2934	/* search adjacent squares */
3031	for (i = 1; i < 9; i++)	2935	for (i = 1; i < 9; i++)
3032	{	2936	{
3033	x = who->x + freearr_x[i];	2937	x = who->x + freearr_x[i];
…		…
3042	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2946	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3043	continue;	2947	continue;
3044		2948
3045	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2949	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3046	{	2950	{
3047	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2951	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3048	return 1;	2952	return 1;
3049	else if (tmp->type == PLAYER)	2953	else if (tmp->type == PLAYER)
3050	{	2954	{
3051	/*don't let a hidden DM prevent you from hiding */	2955	/*don't let a hidden DM prevent you from hiding */
3052	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	2956	if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
3053	return 1;	2957	return 1;
3054	}	2958	}
3055	}	2959	}
3056	}	2960	}
3057	return 0;	2961	return 0;
…		…
3107	}	3011	}
3108		3012
3109	return 0;	3013	return 0;
3110	}	3014	}
3111		3015
3112	/* routine for both players and monsters. We call this when
3113	* there is a possibility for our action distrubing our hiding
3114	* place or invisiblity spell. Artefact invisiblity causes
3115	* "noise" instead. If we arent invisible to begin with, we
3116	* return 0.
3117	*/
3118	int
3119	action_makes_visible (object *op)
3120	{
3121	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3122	{
3123	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3124	{
3125	// artefact invisibility is permanent, but we still make noise
3126	// this is important for game-balance.
3127	if (op->contr)
3128	op->make_noise ();
3129
3130	return 0;
3131	}
3132
3133	if (op->contr && op->contr->tmp_invis == 0)
3134	return 0;
3135
3136	/* If monsters, they should become visible */
3137	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3138	{
3139	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3140	return 1;
3141	}
3142	}
3143
3144	return 0;
3145	}
3146
3147	/* op_on_battleground - checks if the given object op (usually	3016	/* op_on_battleground - checks if the given object op (usually
3148	* a player) is standing on a valid battleground-tile,	3017	* a player) is standing on a valid battleground-tile,
3149	* function returns TRUE/FALSE. If true x, y returns the battleground	3018	* function returns TRUE/FALSE. If true x, y returns the battleground
3150	* -exit-coord. (and if x, y not NULL)	3019	* -exit-coord. (and if x, y not NULL)
3151	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	3020	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
…		…
3161	* and the exit-coordinates sp/hp must both be > 0.	3030	* and the exit-coordinates sp/hp must both be > 0.
3162	* => The intention here is to prevent abuse of the battleground-	3031	* => The intention here is to prevent abuse of the battleground-
3163	* feature (like pickable or hidden battleground tiles). */	3032	* feature (like pickable or hidden battleground tiles). */
3164	for (object *tmp = op->below; tmp; tmp = tmp->below)	3033	for (object *tmp = op->below; tmp; tmp = tmp->below)
3165	{	3034	{
3166	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3035	if (tmp->flag [FLAG_IS_FLOOR])
3167	{	3036	{
3168	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3037	if (tmp->flag [FLAG_NO_PICK]
3169	&& tmp->type == BATTLEGROUND	3038	&& tmp->type == BATTLEGROUND
3170	&& tmp->name == shstr_battleground	3039	&& tmp->name == shstr_battleground
3171	&& EXIT_X (tmp) && EXIT_Y (tmp))	3040	&& EXIT_X (tmp) && EXIT_Y (tmp))
3172	{	3041	{
3173	/* before we assign the exit, check if this is a teambattle */	3042	/* before we assign the exit, check if this is a teambattle */
3174	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3043	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3175	{
3176	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3044	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3045	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3177	{	3046	{
3178	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3179	{
3180	if (x && y)	3047	if (x && y)
3181	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3048	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3182		3049
3183	return 1;	3050	return 1;
3184	}
3185	}	3051	}
3186	}
3187		3052
3188	if (x && y)	3053	if (x && y)
3189	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3054	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3190		3055
3191	return 1;	3056	return 1;
…		…
3329	else	3194	else
3330	j = 1;	3195	j = 1;
3331	strcat (buf, spellpathnames[i]);	3196	strcat (buf, spellpathnames[i]);
3332	}	3197	}
3333	}	3198	}
		3199
3334	strcat (buf, ".");	3200	strcat (buf, ".");
3335	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3201	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3336	}	3202	}
3337		3203
3338	/* evtl. adding flags: */	3204	/* evtl. adding flags: */
3339	if (QUERY_FLAG (item, FLAG_XRAYS))	3205	if (item->flag [FLAG_XRAYS])
3340	SET_FLAG (skin, FLAG_XRAYS);	3206	skin->set_flag (FLAG_XRAYS);
3341	if (QUERY_FLAG (item, FLAG_STEALTH))	3207	if (item->flag [FLAG_STEALTH])
3342	SET_FLAG (skin, FLAG_STEALTH);	3208	skin->set_flag (FLAG_STEALTH);
3343	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3209	if (item->flag [FLAG_SEE_IN_DARK])
3344	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3210	skin->set_flag (FLAG_SEE_IN_DARK);
3345		3211
3346	/* print message if there is one */	3212	/* print message if there is one */
3347	if (item->msg != NULL)	3213	if (item->msg != NULL)
3348	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3214	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3349	}	3215	}
3350	else	3216	else
3351	{	3217	{
3352	/* generate misc. treasure */	3218	/* generate misc. treasure */
3353	tmp = arch_to_object (tr->item);	3219	tmp = tr->item->instance ();
3354	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3220	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3355	who->insert (tmp);	3221	who->insert (tmp);
3356	}	3222	}
3357	}	3223	}
3358		3224
3359	/**	3225	//-GPL
3360	* Unready an object for a player. This function does nothing if the object was
3361	* not readied.
3362	*/
3363	void
3364	player_unready_range_ob (player *pl, object *ob)
3365	{
3366	if (pl->ob->current_weapon == ob)
3367	pl->ob->current_weapon = 0;
3368
3369	if (pl->combat_ob == ob)
3370	pl->combat_ob = 0;
3371
3372	if (pl->ranged_ob == ob)
3373	pl->ranged_ob = 0;
3374	}
3375		3226
3376	sint8	3227	sint8
3377	player::darkness_at (maptile *map, int x, int y) const	3228	player::darkness_at (maptile *map, int x, int y) const
3378	{	3229	{
3379	if (!ns)	3230	if (!ns)
…		…
3406	{	3257	{
3407	play_sound (sound_find ("generic_failure"));	3258	play_sound (sound_find ("generic_failure"));
3408	statusmsg (msg, color);	3259	statusmsg (msg, color);
3409	}	3260	}
3410		3261
		3262	void
		3263	object::failmsgf (const char *format, ...)
		3264	{
		3265	if (!contr)
		3266	return;
		3267
		3268	va_list ap;
		3269	va_start (ap, format);
		3270	contr->failmsg (vformat (format, ap));
		3271	va_end (ap);
		3272	}
		3273
		3274	void
		3275	player::failmsgf (const char *format, ...)
		3276	{
		3277	va_list ap;
		3278	va_start (ap, format);
		3279	failmsg (vformat (format, ap));
		3280	va_end (ap);
		3281	}
		3282

Diff Legend

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