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.218 by root, Sun Dec 28 10:05:42 2008 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 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 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
23		26
24	#include <global.h>	27	#include <global.h>
25	#include <sproto.h>	28	#include <sproto.h>
26	#include <sounds.h>	29	#include <sounds.h>
27	#include <living.h>	30	#include <living.h>
…		…
32	#include <algorithm>	35	#include <algorithm>
33	#include <functional>	36	#include <functional>
34		37
35	playervec players;	38	playervec players;
36		39
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
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	{
158	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
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->set_speed (1.0f);
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	}
677		538
678	/* This really needs to be better - we should really give	539	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	540	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	541	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	542	*/
684	if (op->type == SPELLBOOK || op->type == SKILL)	543	if (op->type == SKILL)
685	{	544	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
690	break;
691
692	if (tmp)
693	{	547	{
694	op->destroy ();	548	op->destroy ();
		549	LOG (llevError,
695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	550	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
696	continue;	551	break;
697	}	552	}
698		553
699	if (op->nrof > 1)	554	if (op->nrof > 1)
700	op->nrof = 1;	555	op->nrof = 1;
701	}	556	}
702		557
703	if (op->type == SPELLBOOK && op->inv)	558	if (op->type == SPELLBOOK && op->inv)
704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	559	op->inv->clr_flag (FLAG_STARTEQUIP);
705		560
706	/* Give starting characters identified, uncursed, and undamned	561	/* Give starting characters identified, uncursed, and undamned
707	* 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
708	* merged properly.	563	* merged properly.
709	*/	564	*/
710	if (need_identify (op))	565	if (op->need_identify ())
711	{	566	{
712	SET_FLAG (op, FLAG_IDENTIFIED);	567	op->set_flag (FLAG_IDENTIFIED);
713	CLEAR_FLAG (op, FLAG_CURSED);	568	op->clr_flag (FLAG_CURSED);
714	CLEAR_FLAG (op, FLAG_DAMNED);	569	op->clr_flag (FLAG_DAMNED);
715	}	570	}
716		571
717	if (op->type == SPELL)	572	if (op->type == SPELL)
718	{	573	{
719	op->destroy ();	574	op->destroy ();
720	continue;	575	continue;
721	}	576	}
722	else if (op->type == SKILL)	577	else if (op->type == SKILL)
723	{	578	{
724	SET_FLAG (op, FLAG_CAN_USE_SKILL);	579	op->set_flag (FLAG_CAN_USE_SKILL);
725	op->stats.exp = 0;	580	op->stats.exp = 0;
726	op->level = 1;	581	op->level = 1;
727	}	582	}
728	else /* lock all 'normal items by default */	583	else /* lock all 'normal items by default */
729	SET_FLAG (op, FLAG_INV_LOCKED);	584	op->set_flag (FLAG_INV_LOCKED);
730	} /* for loop of objects in player inv */	585	} /* for loop of objects in player inv */
731		586
732	/* Need to set up the skill pointers */	587	/* Need to set up the skill pointers */
733	pl->contr->link_skills ();	588	pl->contr->link_skills ();
734	}	589	}
…		…
748	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:");
749	}	604	}
750		605
751	/* 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. */
752	static int	607	static int
753	roll_stat (void)	608	roll_stat ()
754	{	609	{
755	int a[4], i, j, k;	610	int a[4], i, j, k;
756		611
757	for (i = 0; i < 4; i++)	612	for (i = 0; i < 4; i++)
758	a[i] = (int) rndm (6) + 1;	613	a[i] = rndm (1, 6);
759		614
760	for (i = 0, j = 0, k = 7; i < 4; i++)	615	for (i = 0, j = 0, k = 7; i < 4; i++)
761	if (a[i] < k)	616	if (a[i] < k)
762	k = a[i], j = i;	617	k = a[i], j = i;
763		618
…		…
855	player::chargen_race_done ()	710	player::chargen_race_done ()
856	{	711	{
857	/* this must before then initial items are given */	712	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	713	esrv_new_player (ob->contr);
859		714
860	treasurelist *tl = treasurelist::find ("starting_wealth");	715	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	716	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	717	create_treasure (tl, ob, 0, 0, 0);
863		718
864	INVOKE_PLAYER (BIRTH, ob->contr);	719	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);
866		720
867	ob->contr->ns->state = ST_PLAYING;	721	ob->contr->ns->state = ST_PLAYING;
868		722
869	if (ob->msg)	723	if (ob->msg)
870	ob->msg = 0;	724	ob->msg = 0;
871		725
872	start_info (ob);	726	start_info (ob);
873	CLEAR_FLAG (ob, FLAG_WIZ);	727	ob->clr_flag (FLAG_WIZ);
874	give_initial_items (ob, ob->randomitems);	728	give_initial_items (ob, ob->randomitems);
875	esrv_send_inventory (ob, ob);	729	esrv_send_inventory (ob, ob);
876	ob->update_stats ();	730	ob->update_stats ();
877		731
878	/* This moves the player to a different start map, if there	732	/* This moves the player to a different start map, if there
…		…
918	ob->stats.hp = ob->stats.maxhp;	772	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	773	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	774	ob->stats.grace = 0;
921	}	775	}
922		776
923	void	777	static void
924	flee_player (object *op)	778	flee_player (object *op)
925	{	779	{
926	int dir, diff;	780	int dir, diff;
927	rv_vector rv;	781	rv_vector rv;
928		782
929	if (op->stats.hp < 0)	783	if (op->stats.hp < 0)
930	{	784	{
931	LOG (llevDebug, "Fleeing player is dead.\n");	785	LOG (llevDebug, "Fleeing player is dead.\n");
932	CLEAR_FLAG (op, FLAG_SCARED);	786	op->clr_flag (FLAG_SCARED);
933	return;	787	return;
934	}	788	}
935		789
936	if (!op->enemy)	790	if (!op->enemy)
937	{	791	{
938	LOG (llevDebug, "Fleeing player had no enemy.\n");	792	LOG (llevDebug, "Fleeing player had no enemy.\n");
939	CLEAR_FLAG (op, FLAG_SCARED);	793	op->clr_flag (FLAG_SCARED);
940	return;	794	return;
941	}	795	}
942		796
943	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))
944	{	798	{
945	op->enemy = NULL;	799	op->enemy = NULL;
946	CLEAR_FLAG (op, FLAG_SCARED);	800	op->clr_flag (FLAG_SCARED);
947	return;	801	return;
948	}	802	}
949		803
950	get_rangevector (op, op->enemy, &rv, 0);	804	get_rangevector (op, op->enemy, &rv, 0);
951		805
952	dir = absdir (4 + rv.direction);	806	dir = absdir (4 + rv.direction);
953	for (diff = 0; diff < 3; diff++)	807	for (diff = 0; diff < 3; diff++)
954	{	808	{
955	int m = 1 - rndm (2) * 2;	809	int m = 1 - rndm (2) * 2;
956		810
957	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))))
958	return;	812	return;
959	}	813	}
960		814
961	/* Cornered, get rid of scared */	815	/* Cornered, get rid of scared */
962	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
963	op->enemy = NULL;	817	op->enemy = NULL;
964	}	818	}
965		819
966	/* 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.
967	* 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
…		…
972	{	826	{
973	object *tmp, *next;	827	object *tmp, *next;
974	int stop = 0;	828	int stop = 0;
975	int wvratio;	829	int wvratio;
976		830
977	/* if you're flying, you cna't pick up anything */	831	/* if you're flying, you can't pick up anything */
978	if (op->move_type & MOVE_FLYING)	832	if (op->move_type & MOVE_FLYING)
979	return 1;	833	return 1;
980		834
981	next = op->below;	835	next = op->below;
982		836
983	int cnt = MAX_ITEM_PER_DROP;	837	int cnt = MAX_ITEM_PER_ACTION;
984	#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)
985		839
986	/* 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
987	* destroyed */	841	* destroyed */
988	while (next && !next->destroyed ())	842	while (next && !next->destroyed ())
…		…
1008	CHK_PICK_PICKUP;	862	CHK_PICK_PICKUP;
1009		863
1010	continue;	864	continue;
1011	}	865	}
1012		866
1013	/* high not bit set? We're using the old autopickup model */	867	/* pickup handling */
		868	if (op->contr->mode & PU_DEBUG)
		869	{
		870	/* some debugging code to figure out item information */
		871	const char *str = tmp->name
		872	? format ("item name: %s item type: %d weight/value: %d",
		873	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		874	: format ("item name: %s item type: %d weight/value: %d",
		875	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		876
		877	new_draw_info (NDI_UNIQUE, 0, op, str);
		878	}
		879
		880	if (op->contr->mode & PU_INHIBIT)
		881	return 1;
		882
		883	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		884	return 1;
		885
		886	/* philosophy:
		887	* It's easy to grab an item type from a pile, as long as it's
		888	* generic. This takes no game-time. For more detailed pickups
		889	* and selections, select-items should be used. This is a
		890	* grab-as-you-run type mode that's really useful for arrows for
		891	* example.
		892	* The drawback: right now it has no frontend, so you need to
		893	* stick the bits you want into a calculator in hex mode and then
		894	* convert to decimal and then 'pickup <#>
		895	*/
		896
		897	/* the first two modes are exclusive: if NOTHING we return, if
		898	* STOP then we stop. All the rest are applied sequentially,
		899	* meaning if any test passes, the item gets picked up. */
		900
		901	/* if mode is set to pick nothing up, return */
		902	if (op->contr->mode == PU_NOTHING)
		903	return 1;
		904
		905	/* if mode is set to stop when encountering objects, return */
		906	/* take STOP before INHIBIT since it doesn't actually pick
		907	* anything up */
		908	if (op->contr->mode & PU_STOP)
		909	return 0;
		910
		911	/* useful for going into stores and not losing your settings... */
		912	/* and for battles wher you don't want to get loaded down while
		913	* fighting */
		914	if (op->contr->mode & PU_INHIBIT)
		915	return 1;
		916
		917	/* prevent us from turning into auto-thieves :) */
		918	if (tmp->flag [FLAG_UNPAID])
		919	continue;
		920
		921	/* ignore known cursed objects */
		922	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
		923	continue;
		924
		925	/* all food and drink if desired */
		926	/* question: don't pick up known-poisonous stuff? */
1014	if (!(op->contr->mode & PU_NEWMODE))	927	if (op->contr->mode & PU_FOOD)
		928	if (tmp->type == FOOD)
1015	{	929	{
1016	switch (op->contr->mode)	930	CHK_PICK_PICKUP;
		931	continue;
		932	}
		933
		934	if (op->contr->mode & PU_DRINK)
		935	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
		936	{
		937	CHK_PICK_PICKUP;
		938	continue;
		939	}
		940
		941	if (op->contr->mode & PU_POTION)
		942	if (tmp->type == POTION)
		943	{
		944	CHK_PICK_PICKUP;
		945	continue;
		946	}
		947
		948	/* spellbooks, skillscrolls and normal books/scrolls */
		949	if (op->contr->mode & PU_SPELLBOOK)
		950	if (tmp->type == SPELLBOOK)
		951	{
		952	CHK_PICK_PICKUP;
		953	continue;
		954	}
		955
		956	if (op->contr->mode & PU_SKILLSCROLL)
		957	if (tmp->type == SKILLSCROLL)
		958	{
		959	CHK_PICK_PICKUP;
		960	continue;
		961	}
		962
		963	if (op->contr->mode & PU_READABLES)
		964	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		965	{
		966	CHK_PICK_PICKUP;
		967	continue;
		968	}
		969
		970	/* wands/staves/rods/horns */
		971	if (op->contr->mode & PU_MAGIC_DEVICE)
		972	if (tmp->type == WAND
		973	|| tmp->type == ROD
		974	|| tmp->type == HORN
		975	|| tmp->type == POWER_CRYSTAL)
		976	{
		977	CHK_PICK_PICKUP;
		978	continue;
		979	}
		980
		981	/* pick up all magical items */
		982	if (op->contr->mode & PU_MAGICAL)
		983	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		984	&& !tmp->flag [FLAG_KNOWN_CURSED])
		985	{
		986	CHK_PICK_PICKUP;
		987	continue;
		988	}
		989
		990	if (op->contr->mode & PU_VALUABLES)
		991	{
		992	if (tmp->type == MONEY || tmp->type == GEM)
1017	{	993	{
1018	case 0:
1019	return 1; /* don't pick up */
1020	case 1:
1021	CHK_PICK_PICKUP;	994	CHK_PICK_PICKUP;
1022	return 1;	995	continue;
1023	case 2:
1024	CHK_PICK_PICKUP;
1025	return 0;
1026	case 3:
1027	return 0; /* stop before pickup */
1028	case 4:
1029	CHK_PICK_PICKUP;
1030	break;
1031	case 5:
1032	CHK_PICK_PICKUP;
1033	stop = 1;
1034	break;
1035	case 6:
1036	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1037	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1038	CHK_PICK_PICKUP;
1039	break;
1040
1041	case 7:
1042	if (tmp->type == MONEY || tmp->type == GEM)
1043	CHK_PICK_PICKUP;
1044	break;
1045
1046	default:
1047	/* use value density */
1048	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1049	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1050	CHK_PICK_PICKUP;
1051	}	996	}
1052	}	997	}
1053	else	998
1054	{ /* old model */	999	/* rings & amulets - talismans seems to be typed AMULET */
1055	/* NEW pickup handling */
1056	if (op->contr->mode & PU_DEBUG)	1000	if (op->contr->mode & PU_JEWELS)
		1001	if (tmp->type == RING
		1002	|| tmp->type == AMULET
		1003	|| tmp->type == GIRDLE
		1004	|| tmp->type == SKILL_TOOL)
1057	{	1005	{
1058	/* some debugging code to figure out item information */	1006	CHK_PICK_PICKUP;
1059	const char *str = tmp->name
1060	? format ("item name: %s item type: %d weight/value: %d",
1061	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1062	: format ("item name: %s item type: %d weight/value: %d",
1063	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1064
1065	new_draw_info (NDI_UNIQUE, 0, op, str);
1066	}
1067
1068	/* philosophy:
1069	* It's easy to grab an item type from a pile, as long as it's
1070	* generic. This takes no game-time. For more detailed pickups
1071	* and selections, select-items should be used. This is a
1072	* grab-as-you-run type mode that's really useful for arrows for
1073	* example.
1074	* The drawback: right now it has no frontend, so you need to
1075	* stick the bits you want into a calculator in hex mode and then
1076	* convert to decimal and then 'pickup <#>
1077	*/
1078
1079	/* the first two modes are exclusive: if NOTHING we return, if
1080	* STOP then we stop. All the rest are applied sequentially,
1081	* meaning if any test passes, the item gets picked up. */
1082
1083	/* if mode is set to pick nothing up, return */
1084
1085	if (op->contr->mode & PU_NOTHING)
1086	return 1;
1087
1088	/* if mode is set to stop when encountering objects, return */
1089	/* take STOP before INHIBIT since it doesn't actually pick
1090	* anything up */
1091
1092	if (op->contr->mode & PU_STOP)
1093	return 0;
1094
1095	/* useful for going into stores and not losing your settings... */
1096	/* and for battles wher you don't want to get loaded down while
1097	* fighting */
1098	if (op->contr->mode & PU_INHIBIT)
1099	return 1;
1100
1101	/* prevent us from turning into auto-thieves :) */
1102	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1103	continue;	1007	continue;
		1008	}
1104		1009
1105	/* ignore known cursed objects */	1010	/* we don't forget dragon food */
1106	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1011	if (op->contr->mode & PU_FLESH)
		1012	if (tmp->type == FLESH)
		1013	{
		1014	CHK_PICK_PICKUP;
1107	continue;	1015	continue;
		1016	}
1108		1017
1109	/* all food and drink if desired */	1018	/* bows and arrows. Bows are good for selling! */
1110	/* question: don't pick up known-poisonous stuff? */	1019	if (op->contr->mode & PU_BOW)
		1020	if (tmp->type == BOW)
		1021	{
		1022	CHK_PICK_PICKUP;
		1023	continue;
		1024	}
		1025
		1026	if (op->contr->mode & PU_ARROW)
		1027	if (tmp->type == ARROW)
		1028	{
		1029	CHK_PICK_PICKUP;
		1030	continue;
		1031	}
		1032
		1033	/* all kinds of armor etc. */
		1034	if (op->contr->mode & PU_ARMOUR)
		1035	if (tmp->type == ARMOUR)
		1036	{
		1037	CHK_PICK_PICKUP;
		1038	continue;
		1039	}
		1040
		1041	if (op->contr->mode & PU_HELMET)
		1042	if (tmp->type == HELMET)
		1043	{
		1044	CHK_PICK_PICKUP;
		1045	continue;
		1046	}
		1047
		1048	if (op->contr->mode & PU_SHIELD)
		1049	if (tmp->type == SHIELD)
		1050	{
		1051	CHK_PICK_PICKUP;
		1052	continue;
		1053	}
		1054
1111	if (op->contr->mode & PU_FOOD)	1055	if (op->contr->mode & PU_BOOTS)
1112	if (tmp->type == FOOD)	1056	if (tmp->type == BOOTS)
		1057	{
		1058	CHK_PICK_PICKUP;
		1059	continue;
		1060	}
		1061
		1062	if (op->contr->mode & PU_GLOVES)
		1063	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1064	{
		1065	CHK_PICK_PICKUP;
		1066	continue;
		1067	}
		1068
		1069	if (op->contr->mode & PU_CLOAK)
		1070	if (tmp->type == CLOAK)
		1071	{
		1072	CHK_PICK_PICKUP;
		1073	continue;
		1074	}
		1075
		1076	/* hoping to catch throwing daggers here */
		1077	if (op->contr->mode & PU_MISSILEWEAPON)
		1078	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
		1079	{
		1080	CHK_PICK_PICKUP;
		1081	continue;
		1082	}
		1083
		1084	/* careful: chairs and tables are weapons! */
		1085	if (op->contr->mode & PU_ALLWEAPON)
		1086	{
		1087	if (tmp->type == WEAPON)
		1088	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1113	{	1089	{
1114	CHK_PICK_PICKUP;	1090	CHK_PICK_PICKUP;
1115	continue;	1091	continue;
1116	}	1092	}
		1093	}
1117		1094
		1095	/* misc stuff that's useful */
1118	if (op->contr->mode & PU_DRINK)	1096	if (op->contr->mode & PU_KEY)
1119	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1097	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1120	{	1098	{
1121	CHK_PICK_PICKUP;	1099	CHK_PICK_PICKUP;
1122	continue;	1100	continue;
1123	}	1101	}
1124		1102
		1103	/* any of the last 4 bits set means we use the ratio for value
		1104	* pickups */
1125	if (op->contr->mode & PU_POTION)	1105	if (op->contr->mode & PU_RATIO)
1126	if (tmp->type == POTION)	1106	{
		1107	/* use value density to decide what else to grab */
		1108	/* >=7 was >= op->contr->mode */
		1109	/* >=7 is the old standard setting. Now we take the last 4 bits
1127	{	1110	*/
1128	CHK_PICK_PICKUP;
1129	continue;
1130	}
1131
1132	/* spellbooks, skillscrolls and normal books/scrolls */
1133	if (op->contr->mode & PU_SPELLBOOK)
1134	if (tmp->type == SPELLBOOK)
1135	{
1136	CHK_PICK_PICKUP;
1137	continue;
1138	}
1139
1140	if (op->contr->mode & PU_SKILLSCROLL)
1141	if (tmp->type == SKILLSCROLL)
1142	{
1143	CHK_PICK_PICKUP;
1144	continue;
1145	}
1146
1147	if (op->contr->mode & PU_READABLES)
1148	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1149	{
1150	CHK_PICK_PICKUP;
1151	continue;
1152	}
1153
1154	/* wands/staves/rods/horns */
1155	if (op->contr->mode & PU_MAGIC_DEVICE)
1156	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1157	{
1158	CHK_PICK_PICKUP;
1159	continue;
1160	}
1161
1162	/* pick up all magical items */
1163	if (op->contr->mode & PU_MAGICAL)	1111	wvratio = op->contr->mode & PU_RATIO;
1164	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1112	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1165	{
1166	CHK_PICK_PICKUP;
1167	continue;
1168	}
1169
1170	if (op->contr->mode & PU_VALUABLES)
1171	{	1113	{
1172	if (tmp->type == MONEY || tmp->type == GEM)	1114	#if 0
		1115	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1116	if (tmp->name != NULL)
1173	{	1117	{
1174	CHK_PICK_PICKUP;	1118	fprintf (stderr, "%s", tmp->name);
1175	continue;
1176	}	1119	}
1177	}
1178
1179	/* rings & amulets - talismans seems to be typed AMULET */
1180	if (op->contr->mode & PU_JEWELS)
1181	if (tmp->type == RING || tmp->type == AMULET)
1182	{
1183	CHK_PICK_PICKUP;
1184	continue;
1185	}
1186
1187	/* we don't forget dragon food */
1188	if (op->contr->mode & PU_FLESH)
1189	if (tmp->type == FLESH)
1190	{
1191	CHK_PICK_PICKUP;
1192	continue;
1193	}
1194
1195	/* bows and arrows. Bows are good for selling! */
1196	if (op->contr->mode & PU_BOW)
1197	if (tmp->type == BOW)
1198	{
1199	CHK_PICK_PICKUP;
1200	continue;
1201	}
1202
1203	if (op->contr->mode & PU_ARROW)
1204	if (tmp->type == ARROW)
1205	{
1206	CHK_PICK_PICKUP;
1207	continue;
1208	}
1209
1210	/* all kinds of armor etc. */
1211	if (op->contr->mode & PU_ARMOUR)
1212	if (tmp->type == ARMOUR)
1213	{
1214	CHK_PICK_PICKUP;
1215	continue;
1216	}
1217
1218	if (op->contr->mode & PU_HELMET)
1219	if (tmp->type == HELMET)
1220	{
1221	CHK_PICK_PICKUP;
1222	continue;
1223	}
1224
1225	if (op->contr->mode & PU_SHIELD)
1226	if (tmp->type == SHIELD)
1227	{
1228	CHK_PICK_PICKUP;
1229	continue;
1230	}
1231
1232	if (op->contr->mode & PU_BOOTS)
1233	if (tmp->type == BOOTS)
1234	{
1235	CHK_PICK_PICKUP;
1236	continue;
1237	}
1238
1239	if (op->contr->mode & PU_GLOVES)
1240	if (tmp->type == GLOVES)
1241	{
1242	CHK_PICK_PICKUP;
1243	continue;
1244	}
1245
1246	if (op->contr->mode & PU_CLOAK)
1247	if (tmp->type == CLOAK)
1248	{
1249	CHK_PICK_PICKUP;
1250	continue;
1251	}
1252
1253	/* hoping to catch throwing daggers here */
1254	if (op->contr->mode & PU_MISSILEWEAPON)
1255	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1256	{
1257	CHK_PICK_PICKUP;
1258	continue;
1259	}
1260
1261	/* careful: chairs and tables are weapons! */
1262	if (op->contr->mode & PU_ALLWEAPON)
1263	{
1264	if (tmp->type == WEAPON && tmp->name != NULL)
1265	{
1266	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1267	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1268	{
1269	CHK_PICK_PICKUP;
1270	continue;
1271	}
1272	}
1273
1274	if (tmp->type == WEAPON && tmp->name == NULL)
1275	{
1276	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1277	{
1278	CHK_PICK_PICKUP;
1279	continue;
1280	}
1281	}
1282	}
1283
1284	/* misc stuff that's useful */
1285	if (op->contr->mode & PU_KEY)
1286	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1287	{
1288	CHK_PICK_PICKUP;
1289	continue;
1290	}
1291
1292	/* any of the last 4 bits set means we use the ratio for value
1293	* pickups */
1294	if (op->contr->mode & PU_RATIO)
1295	{
1296	/* use value density to decide what else to grab */
1297	/* >=7 was >= op->contr->mode */
1298	/* >=7 is the old standard setting. Now we take the last 4 bits
1299	*/
1300	wvratio = op->contr->mode & PU_RATIO;
1301	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1302	{
1303	CHK_PICK_PICKUP;
1304	#if 0
1305	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1306	if (tmp->name != NULL)
1307	{
1308	fprintf (stderr, "%s", tmp->name);
1309	}
1310	else	1120	else
1311	fprintf (stderr, "%s", tmp->arch->archname);	1121	fprintf (stderr, "%s", tmp->arch->archname);
1312	fprintf (stderr, ",%d] = ", tmp->type);	1122	fprintf (stderr, ",%d] = ", tmp->type);
1313	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))));
1314	#endif	1124	#endif
		1125	CHK_PICK_PICKUP;
1315	continue;	1126	continue;
1316	}
1317	}	1127	}
1318	} /* the new pickup model */	1128	} /* the new pickup model */
1319	}	1129	}
1320		1130
1321	return !stop;	1131	return !stop;
		1132	}
		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;
1322	}	1167	}
1323		1168
1324	/*	1169	/*
1325	* Find an arrow in the inventory and after that	1170	* Find an arrow in the inventory and after that
1326	* in the right type container (quiver). Pointer to the	1171	* in the right type container (quiver). Pointer to the
1327	* found object is returned.	1172	* found object is returned.
1328	*/	1173	*/
1329	object *	1174	static object *
1330	find_arrow (object *op, const char *type)	1175	find_arrow (object *op, const char *type)
1331	{	1176	{
1332	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1177	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1333	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1178	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1334	return splay (tmp);	1179	return splay (tmp);
1335		1180
1336	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1181	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1337	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))
1338	if (object *arrow = find_arrow (tmp, type))	1183	if (object *arrow = find_arrow (tmp, type))
1339	{	1184	{
1340	splay (tmp);	1185	splay (tmp);
1341	return arrow;	1186	return arrow;
1342	}	1187	}
…		…
1348	* 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
1349	* 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
1350	* 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
1351	* 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.
1352	*/	1197	*/
1353	object *	1198	static object *
1354	find_better_arrow (object *op, object *target, const char *type, int *better)	1199	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1355	{	1200	{
1356	object *tmp = NULL, *arrow, *ntmp;	1201	object *tmp = NULL, *arrow, *ntmp;
1357	int attacknum, attacktype, betterby = 0, i;	1202	int attacknum, attacktype, betterby = 0, i;
1358		1203
1359	if (!type)	1204	if (!type)
1360	return NULL;	1205	return NULL;
1361		1206
1362	for (arrow = op->inv; arrow; arrow = arrow->below)	1207	for (arrow = op->inv; arrow; arrow = arrow->below)
1363	{	1208	{
1364	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1209	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1365	{	1210	{
1366	i = 0;	1211	i = 0;
1367	ntmp = find_better_arrow (arrow, target, type, &i);	1212	ntmp = find_better_arrow (arrow, target, type, &i);
		1213
1368	if (i > betterby)	1214	if (i > betterby)
1369	{	1215	{
1370	tmp = ntmp;	1216	tmp = ntmp;
1371	betterby = i;	1217	betterby = i;
1372	}	1218	}
1373	}	1219	}
1374	else if (arrow->type == ARROW && arrow->race == type)	1220	else if (arrow->type == ARROW && arrow->race == type)
1375	{	1221	{
1376	/* allways prefer assasination/slaying */	1222	/* allways prefer assasination/slaying */
1377	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1223	if (target->race && arrow->slaying.contains (target->race))
1378	{	1224	{
1379	if (arrow->attacktype & AT_DEATH)	1225	if (arrow->attacktype & AT_DEATH)
1380	{	1226	{
1381	*better = 100;	1227	*better = 100;
1382	return arrow;	1228	return arrow;
…		…
1397	{	1243	{
1398	tmp = arrow;	1244	tmp = arrow;
1399	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1245	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1400	}	1246	}
1401	}	1247	}
		1248
1402	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1249	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1403	{	1250	{
1404	tmp = arrow;	1251	tmp = arrow;
1405	betterby = 2 + arrow->magic + arrow->stats.dam;	1252	betterby = 2 + arrow->magic + arrow->stats.dam;
1406	}	1253	}
		1254
1407	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1255	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1408	{	1256	{
1409	tmp = arrow;	1257	tmp = arrow;
1410	betterby = 1 + arrow->magic + arrow->stats.dam;	1258	betterby = 1 + arrow->magic + arrow->stats.dam;
1411	}	1259	}
…		…
1424	* find_better_arrow to find a decent arrow to use.	1272	* find_better_arrow to find a decent arrow to use.
1425	* op = the shooter	1273	* op = the shooter
1426	* type = bow->race	1274	* type = bow->race
1427	* dir = fire direction	1275	* dir = fire direction
1428	*/	1276	*/
1429	object *	1277	static object *
1430	pick_arrow_target (object *op, const char *type, int dir)	1278	pick_arrow_target (object *op, shstr_cmp type, int dir)
1431	{	1279	{
1432	object *tmp = NULL;	1280	object *tmp = NULL;
1433	maptile *m;	1281	maptile *m;
1434	int i, mflags, found, number;	1282	int i, mflags, found, number;
1435	sint16 x, y;	1283	sint16 x, y;
…		…
1467	break;	1315	break;
1468	}	1316	}
1469		1317
1470	if (mflags & P_IS_ALIVE)	1318	if (mflags & P_IS_ALIVE)
1471	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)
1472	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1320	if (tmp->flag [FLAG_ALIVE])
1473	break;	1321	break;
1474	}	1322	}
1475		1323
1476	if (!tmp)	1324	if (!tmp)
1477	return find_arrow (op, type);	1325	return find_arrow (op, type);
…		…
1521	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1369	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1522	return 0;	1370	return 0;
1523	}	1371	}
1524		1372
1525	// optimisation: move object to top so we will find it quickly again	1373	// optimisation: move object to top so we will find it quickly again
1526	if (bow->below)	1374	splay (bow);
1527	{
1528	bow->remove ();
1529	op->insert (bow);
1530	}
1531	}	1375	}
1532		1376
1533	if (!bow->race || !bow->skill)	1377	if (!bow->race || !bow->skill)
1534	{	1378	{
1535	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1379	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1542	{	1386	{
1543	if (op->type == PLAYER)	1387	if (op->type == PLAYER)
1544	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);
1545	/* 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 */
1546	else	1390	else
1547	CLEAR_FLAG (op, FLAG_READY_BOW);	1391	op->clr_flag (FLAG_READY_BOW);
1548		1392
1549	return 0;	1393	return 0;
1550	}	1394	}
1551	}	1395	}
1552		1396
…		…
1581	arrow->direction = dir;	1425	arrow->direction = dir;
1582		1426
1583	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1427	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1584	arrow->stats.hp = arrow->stats.dam;	1428	arrow->stats.hp = arrow->stats.dam;
1585	arrow->stats.grace = arrow->attacktype;	1429	arrow->stats.grace = arrow->attacktype;
1586		1430	arrow->custom_name = arrow->slaying;
1587	if (arrow->slaying)
1588	arrow->spellarg = strdup (arrow->slaying);
1589		1431
1590	#if 0	1432	#if 0
1591	if (player *pl = op->contr)	1433	if (player *pl = op->contr)
1592	{	1434	{
1593	float speed = pl->weapon_sp;	1435	float speed = pl->weapon_sp;
…		…
1603	#endif	1445	#endif
1604		1446
1605	SET_ANIMATION (arrow, arrow->direction);	1447	SET_ANIMATION (arrow, arrow->direction);
1606		1448
1607	/* update the speed */	1449	/* update the speed */
1608	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1609	+ bow->stats.dam / 7.f;
1610		1450
1611	arrow->set_speed (max (arrow->speed, 2.f));
1612	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	));
1613		1456
1614	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;
1615		1458
1616	if (op->type == PLAYER)	1459	if (op->type == PLAYER)
1617	{	1460	{
…		…
1655	* but monsters can't. Putting that code here	1498	* but monsters can't. Putting that code here
1656	* makes the fire_bow code much cleaner.	1499	* makes the fire_bow code much cleaner.
1657	* this function should only be called if 'op' is a player,	1500	* this function should only be called if 'op' is a player,
1658	* hence the function name.	1501	* hence the function name.
1659	*/	1502	*/
1660	int	1503	static int
1661	player_fire_bow (object *op, int dir)	1504	player_fire_bow (object *op, int dir)
1662	{	1505	{
1663	int ret;	1506	int ret;
1664		1507
1665	if (op->contr->bowtype == bow_bestarrow)	1508	if (op->contr->bowtype == bow_bestarrow)
…		…
1693	}	1536	}
1694		1537
1695	/* Fires a misc (wand/rod/horn) object in 'dir'.	1538	/* Fires a misc (wand/rod/horn) object in 'dir'.
1696	* Broken apart from 'fire' to keep it more readable.	1539	* Broken apart from 'fire' to keep it more readable.
1697	*/	1540	*/
1698	void	1541	static void
1699	fire_misc_object (object *op, int dir)	1542	fire_misc_object (object *op, int dir)
1700	{	1543	{
1701	object *item = op->contr->ranged_ob;	1544	object *item = op->contr->ranged_ob;
1702		1545
1703	if (!item)	1546	if (!item)
…		…
1710	{	1553	{
1711	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1554	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1712	return;	1555	return;
1713	}	1556	}
1714		1557
1715	if (!op->change_weapon (item))	1558	if (!op->apply (item))
1716	return;	1559	return;
1717		1560
1718	if (item->type == WAND)	1561	if (item->type == WAND)
1719	{	1562	{
1720	if (item->stats.food <= 0)	1563	if (item->stats.food <= 0)
…		…
1725	return;	1568	return;
1726	}	1569	}
1727	}	1570	}
1728	else if (item->type == ROD || item->type == HORN)	1571	else if (item->type == ROD || item->type == HORN)
1729	{	1572	{
1730	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);
1731		1574
1732	// 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
1733	// for a rod or horn, this fixes some broken rods.	1576	// for a rod or horn, this fixes some broken rods.
1734	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1577	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1735	{	1578	{
1736	op->contr->play_sound (sound_find ("wand_poof"));	1579	op->contr->play_sound (sound_find ("wand_poof"));
1737		1580
1738	if (item->type == ROD)	1581	if (item->type == ROD)
1739	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));
…		…
1754	{	1597	{
1755	object *tmp;	1598	object *tmp;
1756		1599
1757	if (item->arch)	1600	if (item->arch)
1758	{	1601	{
1759	CLEAR_FLAG (item, FLAG_ANIMATE);	1602	item->clr_flag (FLAG_ANIMATE);
1760	item->face = item->arch->face;	1603	item->face = item->arch->face;
1761	item->set_speed (0);	1604	item->set_speed (0);
1762	}	1605	}
1763		1606
1764	if (object *pl = item->visible_to ())	1607	if (object *pl = item->visible_to ())
…		…
1771	}	1614	}
1772		1615
1773	/* Received a fire command for the player - go and do it.	1616	/* Received a fire command for the player - go and do it.
1774	*/	1617	*/
1775	bool	1618	bool
1776	fire (object *op, int dir)	1619	fire (object *who, int dir)
1777	{	1620	{
1778	int spellcost = 0;	1621	int spellcost = 0;
1779		1622
1780	player *pl = op->contr;	1623	player *pl = who->contr;
1781		1624
1782	if (pl->golem)	1625	if (pl->golem)
1783	{	1626	{
1784	control_golem (op->contr->golem, dir);	1627	control_golem (who->contr->golem, dir);
1785	return false;	1628	return false;
1786	}	1629	}
1787		1630
1788	object *ob = pl->ranged_ob;	1631	object *ob = pl->ranged_ob;
1789		1632
1790	if (!ob)	1633	if (!ob)
1791	return false;	1634	return false;
1792		1635
1793	if (op->speed_left > 0.f)	1636	if (who->speed_left > 0.f)
1794	--op->speed_left;	1637	--who->speed_left;
1795	else	1638	else
1796	return false;	1639	return false;
1797		1640
1798	if (!op->change_weapon (ob))	1641	if (!who->apply (ob))
1799	return false;	1642	return false;
1800		1643
1801	/* check for loss of invisiblity/hide */	1644	/* check for loss of invisiblity/hide */
1802	if (action_makes_visible (op))	1645	if (action_makes_visible (who))
1803	make_visible (op);	1646	make_visible (who);
1804		1647
1805	switch (ob->type)	1648	switch (ob->type)
1806	{	1649	{
1807	case BOW:	1650	case BOW:
1808	player_fire_bow (op, dir);	1651	player_fire_bow (who, dir);
1809	break;	1652	break;
1810		1653
1811	case SPELL:	1654	case SPELL:
1812	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1655	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1813	break;	1656	break;
1814		1657
1815	case BUILDER:	1658	case BUILDER:
1816	apply_map_builder (op, dir);	1659	apply_map_builder (who, dir);
1817	break;	1660	break;
1818		1661
1819	case SKILL:	1662	case SKILL:
1820	do_skill (op, op, ob, dir, 0);	1663	do_skill (who, who, ob, dir, 0);
1821	break;	1664	break;
1822		1665
		1666	case RANGED:
		1667	do_skill (who, ob, who->chosen_skill, dir, 0);
		1668	break;
		1669
1823	default:	1670	default:
1824	fire_misc_object (op, dir);	1671	fire_misc_object (who, dir);
1825	break;	1672	break;
1826	}	1673	}
1827		1674
1828	return true;	1675	return true;
1829	}	1676	}
1830		1677
1831	/* find_key	1678	static object *
1832	* We try to find a key for the door as passed. If we find a key
1833	* and successfully use it, we return the key, otherwise NULL
1834	* This function merges both normal and locked door, since the logic
1835	* for both is the same - just the specific key is different.
1836	* pl is the player,
1837	* inv is the objects inventory to searched
1838	* door is the door we are trying to match against.
1839	* This function can be called recursively to search containers.
1840	*/
1841	object *
1842	find_key (object *pl, object *container, object *door)	1679	find_key_ (object *pl, object *container, object *door)
1843	{	1680	{
1844	object *tmp, *key;	1681	object *tmp, *key;
1845		1682
1846	/* Should not happen, but sanity checking is never bad */	1683	/* Should not happen, but sanity checking is never bad */
1847	if (!container->inv)	1684	if (!container->inv)
…		…
1850	/* First, lets try to find a key in the top level inventory */	1687	/* First, lets try to find a key in the top level inventory */
1851	for (tmp = container->inv; tmp; tmp = tmp->below)	1688	for (tmp = container->inv; tmp; tmp = tmp->below)
1852	{	1689	{
1853	if (door->type == DOOR && tmp->type == KEY)	1690	if (door->type == DOOR && tmp->type == KEY)
1854	break;	1691	break;
		1692
1855	/* For sanity, we should really check door type, but other stuff	1693	/* For sanity, we should really check door type, but other stuff
1856	* (like containers) can be locked with special keys	1694	* (like containers) can be locked with special keys
1857	*/	1695	*/
1858	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1696	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1859	break;	1697	break;
…		…
1865	* a key, return	1703	* a key, return
1866	*/	1704	*/
1867	if (!tmp)	1705	if (!tmp)
1868	{	1706	{
1869	for (tmp = container->inv; tmp; tmp = tmp->below)	1707	for (tmp = container->inv; tmp; tmp = tmp->below)
1870	{
1871	/* No reason to search empty containers */	1708	/* No reason to search empty containers */
1872	if (tmp->type == CONTAINER && tmp->inv)	1709	if (tmp->type == CONTAINER && tmp->inv)
1873	{
1874	if ((key = find_key (pl, tmp, door)))	1710	if ((key = find_key_ (pl, tmp, door)))
1875	return key;	1711	return key;
1876	}
1877	}
1878		1712
1879	if (!tmp)	1713	if (!tmp)
1880	return NULL;	1714	return 0;
1881	}	1715	}
1882		1716
1883	/* We get down here if we have found a key. Now if its in a container,	1717	/* We get down here if we have found a key. Now if its in a container,
1884	* see if we actually want to use it	1718	* see if we actually want to use it
1885	*/	1719	*/
1886	if (pl != container)	1720	if (pl != container)
1887	{	1721	{
1888	/* Only let players use keys in containers */	1722	/* Only let players use keys in containers */
1889	if (!pl->contr)	1723	if (!pl->contr)
1890	return NULL;	1724	return 0;
		1725
1891	/* cases where this fails:	1726	/* cases where this fails:
1892	* If we only search the player inventory, return now since we	1727	* If we only search the player inventory, return now since we
1893	* are not in the players inventory.	1728	* are not in the players inventory.
1894	* If the container is not active, return now since only active	1729	* If the container is not active, return now since only active
1895	* containers can be used.	1730	* containers can be used.
…		…
1899	* inv must have been an container and must have been active.	1734	* inv must have been an container and must have been active.
1900	*	1735	*
1901	* Change the color so that the message doesn't disappear with	1736	* Change the color so that the message doesn't disappear with
1902	* all the others.	1737	* all the others.
1903	*/	1738	*/
1904	if (pl->contr->usekeys == key_inventory ||	1739	if (pl->contr->usekeys == key_inventory
1905	!QUERY_FLAG (container, FLAG_APPLIED) ||	1740	|| !container->flag [FLAG_APPLIED]
1906	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1741	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1907	{	1742	{
1908	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1743	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1909	"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));
1910	return NULL;	1745	return NULL;
1911	}	1746	}
1912	}	1747	}
1913		1748
1914	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);
1915	}	1775	}
1916		1776
1917	/* moved door processing out of move_player_attack.	1777	/* moved door processing out of move_player_attack.
1918	* returns 1 if player has opened the door with a key	1778	* returns 1 if player has opened the door with a key
1919	* such that the caller should not do anything more,	1779	* such that the caller should not do anything more,
…		…
1969	* going to try and move (not fire weapons).	1829	* going to try and move (not fire weapons).
1970	*/	1830	*/
1971	bool	1831	bool
1972	move_player_attack (object *op, int dir)	1832	move_player_attack (object *op, int dir)
1973	{	1833	{
1974	int on_battleground;	1834	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1835	{
		1836	--op->speed_left;
		1837	return true;
		1838	}
1975		1839
1976	sint16 nx = freearr_x[dir] + op->x;	1840	sint16 nx = freearr_x[dir] + op->x;
1977	sint16 ny = freearr_y[dir] + op->y;	1841	sint16 ny = freearr_y[dir] + op->y;
1978		1842
1979	on_battleground = op_on_battleground (op, 0, 0);
1980
1981	if (out_of_map (op->map, nx, ny))	1843	if (out_of_map (op->map, nx, ny))
1982	return false;	1844	return false;
1983
1984	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1985	{
1986	--op->speed_left;
1987	return true;
1988	}
1989		1845
1990	/* 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
1991	* map, attack it. Note order of if statement is important - don't	1847	* map, attack it. Note order of if statement is important - don't
1992	* want to be calling move_ob if braced, because move_ob will move the	1848	* want to be calling move_ob if braced, because move_ob will move the
1993	* player. This is a pretty nasty hack, because if we could	1849	* player. This is a pretty nasty hack, because if we could
…		…
2040	*/	1896	*/
2041	if (op->type == PLAYER	1897	if (op->type == PLAYER
2042	&& ((mon->owner && mon->owner->contr	1898	&& ((mon->owner && mon->owner->contr
2043	&& same_party (mon->owner->contr->party, op->contr->party))	1899	&& same_party (mon->owner->contr->party, op->contr->party))
2044	|| mon->owner == op)	1900	|| mon->owner == op)
2045	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1901	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
2046	{	1902	{
2047	/* If we're braced, we don't want to switch places with it */	1903	/* If we're braced, we don't want to switch places with it */
2048	if (op->contr->braced)	1904	if (op->contr->braced)
2049	return false;	1905	return false;
2050		1906
…		…
2061	return true;	1917	return true;
2062	}	1918	}
2063	else	1919	else
2064	return false;	1920	return false;
2065	}	1921	}
		1922
		1923	bool on_battleground = op_on_battleground (op, 0, 0);
2066		1924
2067	/* in certain circumstances, you shouldn't attack friendly	1925	/* in certain circumstances, you shouldn't attack friendly
2068	* creatures. Note that if you are braced, you can't push	1926	* creatures. Note that if you are braced, you can't push
2069	* someone, but put it inside this loop so that you won't	1927	* someone, but put it inside this loop so that you won't
2070	* attack them either.	1928	* attack them either.
2071	*/	1929	*/
2072	if ((mon->type == PLAYER || mon->enemy != op)	1930	if ((mon->type == PLAYER || mon->enemy != op)
2073	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1931	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2074	&& ((op->contr->peaceful	1932	&& ((op->contr->peaceful
2075	|| (mon->type == PLAYER && mon->contr->peaceful))	1933	|| (mon->type == PLAYER && mon->contr->peaceful))
2076	&& !on_battleground))	1934	&& !on_battleground))
2077	{	1935	{
2078	if (op->speed_left > 0.f)	1936	if (op->speed_left > 0.f)
…		…
2094	}	1952	}
2095	}	1953	}
2096	/* If the object is a boulder or other rollable object, then	1954	/* If the object is a boulder or other rollable object, then
2097	* roll it if not braced. You can't roll it if you are braced.	1955	* roll it if not braced. You can't roll it if you are braced.
2098	*/	1956	*/
2099	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1957	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2100	{	1958	{
2101	if (op->speed_left > 0.f)	1959	if (op->speed_left > 0.f)
2102	{	1960	{
2103	--op->speed_left;	1961	--op->speed_left;
2104		1962
…		…
2113	* Way it works is like this: First, it must have some hit points	1971	* Way it works is like this: First, it must have some hit points
2114	* and be living. Then, it must be one of the following:	1972	* and be living. Then, it must be one of the following:
2115	* 1) Not a player, 2) A player, but of a different party. Note	1973	* 1) Not a player, 2) A player, but of a different party. Note
2116	* that party_number -1 is no party, so attacks can still happen.	1974	* that party_number -1 is no party, so attacks can still happen.
2117	*/	1975	*/
2118	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	1976	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2119	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	1977	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2120	{	1978	{
2121	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	1979	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2122	{	1980	{
2123	--op->contr->weapon_sp_left;	1981	--op->contr->weapon_sp_left;
…		…
2135	}	1993	}
2136		1994
2137	bool	1995	bool
2138	move_player (object *op, int dir)	1996	move_player (object *op, int dir)
2139	{	1997	{
2140	int pick;
2141
2142	if (!op->map || op->map->in_memory != MAP_ACTIVE)	1998	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2143	return 0;	1999	return 0;
2144		2000
2145	/* Sanity check: make sure dir is valid */	2001	/* Sanity check: make sure dir is valid */
2146	if ((dir < 0) || (dir >= 9))	2002	if (dir < 0 || dir > 8)
2147	{	2003	{
2148	LOG (llevError, "move_player: invalid direction %d\n", dir);	2004	LOG (llevError, "move_player: invalid direction %d\n", dir);
2149	return 0;	2005	return 0;
2150	}	2006	}
2151		2007
2152	/* peterm: added following line */	2008	/* peterm: added following line */
2153	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2009	if (op->flag [FLAG_CONFUSED] && dir)
2154	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2010	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2155		2011
2156	op->facing = dir;	2012	op->facing = dir;
2157		2013
2158	if (op->flag [FLAG_HIDDEN])	2014	if (op->flag [FLAG_HIDDEN])
2159	do_hidden_move (op);	2015	do_hidden_move (op);
2160		2016
2161	bool retval;	2017	bool retval;
		2018	int pick = 0;
2162		2019
2163	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2020	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2164	retval = RESULT_INT (0);	2021	retval = RESULT_INT (0);
2165	else if (op->contr->fire_on)	2022	else if (op->contr->fire_on)
2166	retval = fire (op, dir);	2023	retval = fire (op, dir);
…		…
2197	* players.	2054	* players.
2198	*/	2055	*/
2199	bool	2056	bool
2200	handle_newcs_player (object *op)	2057	handle_newcs_player (object *op)
2201	{	2058	{
2202	if (QUERY_FLAG (op, FLAG_SCARED))	2059	if (op->flag [FLAG_SCARED])
2203	{	2060	{
2204	if (op->speed_left > 0.f)	2061	if (op->speed_left > 0.f)
2205	{	2062	{
2206	--op->speed_left;	2063	--op->speed_left;
2207	flee_player (op);	2064	flee_player (op);
…		…
2223	return move_player (op, op->direction);	2080	return move_player (op, op->direction);
2224		2081
2225	return false;	2082	return false;
2226	}	2083	}
2227		2084
2228	int	2085	static int
2229	save_life (object *op)	2086	save_life (object *op)
2230	{	2087	{
2231	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2088	if (!op->flag [FLAG_LIFESAVE])
2232	return 0;	2089	return 0;
2233		2090
2234	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2091	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2235	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2092	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2236	{	2093	{
2237	op->play_sound (sound_find ("ob_evaporate"));	2094	op->play_sound (sound_find ("ob_evaporate"));
2238	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2095	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2239		2096
2240	tmp->destroy ();	2097	tmp->destroy ();
2241	CLEAR_FLAG (op, FLAG_LIFESAVE);	2098	op->clr_flag (FLAG_LIFESAVE);
2242		2099
2243	if (op->stats.hp < 0)	2100	if (op->stats.hp < 0)
2244	op->stats.hp = op->stats.maxhp;	2101	op->stats.hp = op->stats.maxhp;
2245		2102
2246	if (op->stats.food < 0)	2103	if (op->stats.food < 0)
2247	op->stats.food = 999;	2104	op->stats.food = MAX_FOOD;
2248		2105
2249	op->update_stats ();	2106	op->update_stats ();
2250	return 1;	2107	return 1;
2251	}	2108	}
2252		2109
2253	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2110	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2254	CLEAR_FLAG (op, FLAG_LIFESAVE);	2111	op->clr_flag (FLAG_LIFESAVE);
2255	enter_player_savebed (op); /* bring him home. */	2112	enter_player_savebed (op); /* bring him home. */
2256	return 0;	2113	return 0;
2257	}	2114	}
2258		2115
2259	/* This goes throws the inventory and removes unpaid objects, and puts them	2116	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2266	{	2123	{
2267	while (op)	2124	while (op)
2268	{	2125	{
2269	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2126	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2270		2127
2271	if (QUERY_FLAG (op, FLAG_UNPAID))	2128	if (op->flag [FLAG_UNPAID])
2272	op->insert_at (env);	2129	op->insert_at (env);
2273	else if (op->inv)	2130	else if (op->inv)
2274	drop_unpaid_items (op->inv, env);	2131	drop_unpaid_items (op->inv, env);
2275		2132
2276	op = next;	2133	op = next;
…		…
2282	{	2139	{
2283	if (!flag [FLAG_REMOVED])	2140	if (!flag [FLAG_REMOVED])
2284	::drop_unpaid_items (inv, this);	2141	::drop_unpaid_items (inv, this);
2285	}	2142	}
2286		2143
2287	/*
2288	* Returns pointer a static string containing gravestone text
2289	* Moved from apply.c to player.c - player.c is what
2290	* actually uses this function. player.c may not be quite the
2291	* best, a misc file for object actions is probably better,
2292	* but there isn't one in the server directory.
2293	*/
2294	const char *
2295	gravestone_text (object *op)
2296	{
2297	static dynbuf_text buf;
2298
2299	buf << "---- R.I.P. ----\n\n"
2300	<< op->name;
2301
2302	if (op->type == PLAYER)
2303	buf << " the " << op->contr->title;
2304
2305	buf << "\n\n";
2306
2307	buf << "who was level ";
2308	buf << (sint32)op->level << "\n\n" // OO breakdown
2309	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2310
2311	if (op->type == PLAYER)
2312	buf << "by " << op->contr->killer_name () << ".\n\n";
2313
2314	{
2315	static char buf2[128];
2316	time_t now = time (NULL);
2317	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2318	buf << buf2;
2319	}
2320
2321	return buf;
2322	}
2323
2324	void	2144	void
2325	do_some_living (object *op)	2145	do_some_living (object *op)
2326	{	2146	{
2327	int last_food = op->stats.food;	2147	int last_food = op->stats.food;
2328	int gen_hp, gen_sp, gen_grace;	2148	int gen_hp, gen_sp, gen_grace;
2329	int over_hp, over_sp, over_grace;
2330	int i;	2149	int i;
2331	int rate_hp = 1200;	2150	int rate_hp = 1200;
2332	int rate_sp = 2500;	2151	int rate_sp = 2500;
2333	int rate_grace = 2000;	2152	int rate_grace = 2000;
2334	const int max_hp = 1;	2153	const int max_hp = 1;
…		…
2343	* alternate it here for it to work correctly.	2162	* alternate it here for it to work correctly.
2344	*/	2163	*/
2345	if (pticks & 2)	2164	if (pticks & 2)
2346	op->invisible--;	2165	op->invisible--;
2347	}	2166	}
2348	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2167	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2349	{	2168	{
2350	if (!op->invisible--)	2169	if (!op->invisible--)
2351	{	2170	{
2352	make_visible (op);	2171	make_visible (op);
2353	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2172	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2387	if (--op->last_grace < 0)	2206	if (--op->last_grace < 0)
2388	{	2207	{
2389	if (op->stats.grace < op->stats.maxgrace / 2)	2208	if (op->stats.grace < op->stats.maxgrace / 2)
2390	op->stats.grace++; /* no penalty in food for regaining grace */	2209	op->stats.grace++; /* no penalty in food for regaining grace */
2391		2210
		2211	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2212
2392	if (max_grace > 1)	2213	if (max_grace > 1)
2393	{	2214	{
2394	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2215	int over_grace = temp / rate_grace;
		2216
2395	if (over_grace > 0)	2217	if (over_grace > 0)
2396	{	2218	{
2397	op->stats.sp += over_grace	2219	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2398	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2399	op->last_grace = 0;	2220	op->last_grace = 0;
2400	}	2221	}
2401	else	2222	else
2402	{	2223	op->last_grace = rate_grace / temp;
2403	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2404	}
2405	}	2224	}
2406	else	2225	else
2407	{	2226	op->last_grace = rate_grace / temp;
2408	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2227
2409	}
2410	/* wearing stuff doesn't detract from grace generation. */	2228	/* wearing stuff doesn't detract from grace generation. */
2411	}	2229	}
2412		2230
2413	if (op->stats.food > 0)	2231	if (op->stats.food > 0)
2414	{	2232	{
…		…
2420	if (op->stats.sp < op->stats.maxsp)	2238	if (op->stats.sp < op->stats.maxsp)
2421	{	2239	{
2422	op->stats.sp++;	2240	op->stats.sp++;
2423		2241
2424	/* dms do not consume food */	2242	/* dms do not consume food */
2425	if (!QUERY_FLAG (op, FLAG_WIZ))	2243	if (!op->flag [FLAG_WIZ])
2426	{	2244	{
2427	op->stats.food--;	2245	op->stats.food--;
2428		2246
2429	if (op->contr->digestion < 0)	2247	if (op->contr->digestion < 0)
2430	op->stats.food += op->contr->digestion;	2248	op->stats.food += op->contr->digestion;
…		…
2433	}	2251	}
2434	}	2252	}
2435		2253
2436	if (max_sp > 1)	2254	if (max_sp > 1)
2437	{	2255	{
2438	over_sp = (gen_sp + 10) / rate_sp;	2256	int over_sp = (gen_sp + 10) / rate_sp;
2439	if (over_sp > 0)	2257	if (over_sp > 0)
2440	{	2258	{
2441	if (op->stats.sp < op->stats.maxsp)	2259	if (op->stats.sp < op->stats.maxsp)
2442	{	2260	{
2443	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2261	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2464	if (op->stats.hp < op->stats.maxhp)	2282	if (op->stats.hp < op->stats.maxhp)
2465	{	2283	{
2466	op->stats.hp++;	2284	op->stats.hp++;
2467		2285
2468	/* dms do not consume food */	2286	/* dms do not consume food */
2469	if (!QUERY_FLAG (op, FLAG_WIZ))	2287	if (!op->flag [FLAG_WIZ])
2470	{	2288	{
2471	op->stats.food--;	2289	op->stats.food--;
2472		2290
2473	if (op->contr->digestion < 0)	2291	if (op->contr->digestion < 0)
2474	op->stats.food += op->contr->digestion;	2292	op->stats.food += op->contr->digestion;
2475	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2293	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2476	op->stats.food = last_food;	2294	op->stats.food = last_food;
2477	}	2295	}
2478	}	2296	}
2479		2297
		2298	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2299
2480	if (max_hp > 1)	2300	if (max_hp > 1)
2481	{	2301	{
2482	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2302	int over_hp = temp / rate_hp;
2483		2303
2484	if (over_hp > 0)	2304	if (over_hp > 0)
2485	{	2305	{
2486	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2306	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2487	op->last_heal = 0;	2307	op->last_heal = 0;
2488	}	2308	}
2489	else	2309	else
2490	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2310	op->last_heal = rate_hp / temp;
2491	}	2311	}
2492	else	2312	else
2493	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2313	op->last_heal = rate_hp / temp;
2494	}	2314	}
2495	}	2315	}
2496		2316
2497	/* Digestion */	2317	/* Digestion */
2498	if (--op->last_eat < 0)	2318	if (--op->last_eat < 0)
…		…
2501	penalty = max (0, -op->contr->digestion);	2321	penalty = max (0, -op->contr->digestion);
2502		2322
2503	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2323	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2504		2324
2505	/* dms do not consume food */	2325	/* dms do not consume food */
2506	if (!QUERY_FLAG (op, FLAG_WIZ))	2326	if (!op->flag [FLAG_WIZ])
2507	op->stats.food--;	2327	op->stats.food--;
2508	}	2328	}
2509		2329
2510	if (op->stats.food < 0 && op->stats.hp >= 0)	2330	if (op->stats.food < 0 && op->stats.hp >= 0)
2511	{	2331	{
2512	object *flesh = 0;	2332	object *flesh = 0;
2513		2333
2514	for_inv_removable (op, tmp)	2334	for_inv_removable (op, tmp)
2515	{	2335	{
2516	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2336	if (tmp->flag [FLAG_UNPAID])
2517	continue;	2337	continue;
2518		2338
2519	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2339	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2520	{	2340	{
2521	op->statusmsg ("You blindly grab for a bite of food. "	2341	op->statusmsg ("You blindly grab for a bite of food. "
2522	"H<To prevent you from starving, you ate some random item from your backpack.>");	2342	"H<To prevent you from starving, you ate some random item from your backpack.>");
2523	manual_apply (op, tmp, 0);	2343	op->apply (tmp);
2524		2344
2525	if (op->stats.food >= 0 || op->stats.hp < 0)	2345	if (op->stats.food >= 0 || op->stats.hp < 0)
2526	break;	2346	break;
2527	}	2347	}
2528	else if (tmp->type == FLESH)	2348	else if (tmp->type == FLESH)
…		…
2534	*/	2354	*/
2535	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2355	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2536	{	2356	{
2537	op->statusmsg ("You blindly grab for a bite of food. "	2357	op->statusmsg ("You blindly grab for a bite of food. "
2538	"H<To prevent you from starving, you ate some random item from your backpack.>");	2358	"H<To prevent you from starving, you ate some random item from your backpack.>");
2539	manual_apply (op, flesh, 0);	2359	op->apply (flesh);
2540	}	2360	}
2541		2361
2542	// If player is still starving, alert him!	2362	// If player is still starving, alert him!
2543	if (op->stats.food < 0)	2363	if (op->stats.food < 0)
2544	op->failmsg ("You are starving! "	2364	op->failmsg ("You are starving! "
…		…
2556	op->contr->killer->destroy ();	2376	op->contr->killer->destroy ();
2557	}	2377	}
2558	}	2378	}
2559		2379
2560	/* killer should be set here already */	2380	/* killer should be set here already */
2561	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2381	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2562	kill_player (op);	2382	kill_player (op);
2563	}	2383	}
2564	}	2384	}
2565		2385
2566	/* If the player should die (lack of hp, food, etc), we call this.	2386	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2570	*/	2390	*/
2571	void	2391	void
2572	kill_player (object *op)	2392	kill_player (object *op)
2573	{	2393	{
2574	int x, y;	2394	int x, y;
2575	char buf[MAX_BUF];
2576	maptile *map; /* this is for resurrection */	2395	maptile *map; /* this is for resurrection */
2577	int will_kill_again;	2396	int will_kill_again;
2578	archetype *at;	2397	archetype *at;
2579	object *tmp;	2398	object *tmp;
2580		2399
2581	if (save_life (op))	2400	if (save_life (op))
2582	return;	2401	return;
		2402
		2403	dynbuf_text deathtab;
		2404
		2405	/* restore player */
		2406	at = archetype::find (shstr_poisoning);
		2407	if (object *tmp = present_arch_in_ob (at, op))
		2408	{
		2409	tmp->destroy ();
		2410	deathtab << "Your body feels cleansed...\r";
		2411	}
		2412
		2413	at = archetype::find (shstr_confusion);
		2414	if (object *tmp = present_arch_in_ob (at, op))
		2415	{
		2416	tmp->destroy ();
		2417	deathtab << "Your mind feels clearer...\r";
		2418	}
		2419
		2420	cure_disease (op, 0, 0); /* remove any disease */
		2421
		2422	max_it (op->stats.hp , op->stats.maxhp);
		2423	max_it (op->stats.sp , op->stats.maxsp);
		2424	max_it (op->stats.grace, op->stats.maxgrace);
		2425	max_it (op->stats.food , 200);
		2426
		2427	// remove all spell effects that are active
		2428	// to avoid long-term effects such as word-of-recall
		2429	for (object *item = op->inv; item; )
		2430	{
		2431	object *next = item->below;
		2432
		2433	if (item->type == SPELL_EFFECT && item->active)
		2434	item->destroy ();
		2435
		2436	item = next;
		2437	}
2583		2438
2584	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2439	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2585	* in cities ONLY!!! It is very important that this doesn't get abused.	2440	* in cities ONLY!!! It is very important that this doesn't get abused.
2586	* Look at op_on_battleground() for more info --AndreasV	2441	* Look at op_on_battleground() for more info --AndreasV
2587	*/	2442	*/
2588	if (op_on_battleground (op, &x, &y))	2443	if (op_on_battleground (op, &x, &y))
2589	{	2444	{
2590	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2445	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2591	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2592
2593	/* restore player */
2594	at = archetype::find ("poisoning");
2595	if (object *tmp = present_arch_in_ob (at, op))
2596	{
2597	tmp->destroy ();
2598	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2599	}
2600
2601	at = archetype::find ("confusion");
2602	if (object *tmp = present_arch_in_ob (at, op))
2603	{
2604	tmp->destroy ();
2605	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2606	}
2607
2608	cure_disease (op, 0, 0); /* remove any disease */
2609	op->stats.hp = op->stats.maxhp;
2610	if (op->stats.food <= 0)
2611	op->stats.food = 999;
2612		2446
2613	/* create a bodypart-trophy to make the winner happy */	2447	/* create a bodypart-trophy to make the winner happy */
2614	if (object *tmp = arch_to_object (archetype::find ("finger")))	2448	object *tmp = archetype::find (shstr_finger)->instance ();
2615	{	2449
2616	tmp->name = format ("%s's finger" , &op->name);	2450	tmp->name = format ("%s's finger" , &op->name);
2617	tmp->name_pl = format ("%s's fingers", &op->name);	2451	tmp->name_pl = format ("%s's fingers", &op->name);
2618	tmp->msg = format (	2452	tmp->msg = format (
2619	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2453	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2620	&op->name, op->contr->title,	2454	&op->name, op->contr->title,
2621	(int)op->level,	2455	(int)op->level,
2622	op->contr->killer_name ()	2456	op->contr->killer_name ()
2623	);	2457	);
2624	tmp->value = 0, tmp->type = 0;	2458	tmp->value = 0, tmp->type = 0;
2625	tmp->materialname = "organics";	2459	tmp->material = name_to_material (shstr_organic);
2626	tmp->insert_at (op, tmp);	2460	tmp->insert_at (op, tmp);
2627	}
2628		2461
2629	/* teleport defeated player to new destination */	2462	/* teleport defeated player to new destination */
2630	transfer_ob (op, x, y, 0, NULL);	2463	transfer_ob (op, x, y, 0, NULL);
2631	op->contr->braced = 0;	2464	op->contr->braced = 0;
		2465
		2466	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2632	return;	2467	return;
2633	}	2468	}
		2469
		2470	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2471	deathtab << "T<YOU HAVE DIED>\n\n";
2634		2472
2635	INVOKE_PLAYER (DEATH, op->contr);	2473	INVOKE_PLAYER (DEATH, op->contr);
2636		2474
2637	command_kill_pets (op, 0);	2475	command_kill_pets (op, 0);
2638		2476
…		…
2689	lost_a_stat = 1;	2527	lost_a_stat = 1;
2690	}	2528	}
2691	else	2529	else
2692	{	2530	{
2693	/* deplete a stat */	2531	/* deplete a stat */
2694	archetype *deparch = archetype::find ("depletion");	2532	archetype *deparch = archetype::find (shstr_depletion);
2695	object *dep;	2533	object *dep;
2696		2534
2697	dep = present_arch_in_ob (deparch, op);	2535	dep = present_arch_in_ob (deparch, op);
2698	if (!dep)	2536	if (!dep)
2699	{	2537	{
2700	dep = arch_to_object (deparch);	2538	dep = deparch->instance ();
2701	insert_ob_in_ob (dep, op);	2539	insert_ob_in_ob (dep, op);
2702	}	2540	}
2703	lose_this_stat = 1;	2541	lose_this_stat = 1;
2704	if (settings.balanced_stat_loss)	2542	if (settings.balanced_stat_loss)
2705	{	2543	{
…		…
2733	}	2571	}
2734	}	2572	}
2735		2573
2736	if (lose_this_stat)	2574	if (lose_this_stat)
2737	{	2575	{
2738	this_stat = get_attr_value (&(dep->stats), i);	2576	this_stat = get_attr_value (&dep->stats, i);
2739	/* We could try to do something clever like find another	2577	/* We could try to do something clever like find another
2740	* stat to reduce if this fails. But chances are, if	2578	* stat to reduce if this fails. But chances are, if
2741	* stats have been depleted to -50, all are pretty low	2579	* stats have been depleted to -50, all are pretty low
2742	* and should be roughly the same, so it shouldn't make a	2580	* and should be roughly the same, so it shouldn't make a
2743	* difference.	2581	* difference.
2744	*/	2582	*/
2745	if (this_stat >= -50)	2583	if (this_stat >= -50)
2746	{	2584	{
2747	change_attr_value (&(dep->stats), i, -1);	2585	change_attr_value (&(dep->stats), i, -1);
2748	SET_FLAG (dep, FLAG_APPLIED);	2586	dep->set_flag (FLAG_APPLIED);
2749	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2587	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2750	op->update_stats ();	2588	op->update_stats ();
2751	lost_a_stat = 1;	2589	lost_a_stat = 1;
2752	}	2590	}
2753	}	2591	}
…		…
2757	/* If no stat lost, tell the player. */	2595	/* If no stat lost, tell the player. */
2758	if (!lost_a_stat)	2596	if (!lost_a_stat)
2759	{	2597	{
2760	/* determine_god() seems to not work sometimes... why is this?	2598	/* determine_god() seems to not work sometimes... why is this?
2761	Should I be using something else? GD */	2599	Should I be using something else? GD */
2762	const char *god = determine_god (op);	2600	shstr_tmp god = determine_god (op);
2763		2601
2764	if (god && (strcmp (god, "none")))	2602	if (god != shstr_none)
2765	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2603	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2766	else	2604	else
2767	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2605	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2768	}	2606	}
2769	#else	2607	#else
2770	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2608	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2771	#endif	2609	#endif
2772		2610
2773	/* Put a gravestone up where the character 'almost' died. List the	2611	/* Put a gravestone up where the character 'almost' died. List the
2774	* exp loss on the stone.	2612	* exp loss on the stone.
2775	*/	2613	*/
2776	tmp = arch_to_object (archetype::find ("gravestone"));	2614	tmp = archetype::find (shstr_gravestone)->instance ();
2777	tmp->name = format ("%s's gravestone", &op->name);	2615	tmp->name = format ("%s's gravestone", &op->name);
2778	tmp->name_pl = format ("%s's gravestones", &op->name);	2616	tmp->name_pl = format ("%s's gravestones", &op->name);
2779	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2617	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2780	&op->name, op->contr->title, op->contr->killer_name ());	2618	&op->name, op->contr->title, op->contr->killer_name ());
2781	tmp->x = op->x, tmp->y = op->y;	2619	tmp->x = op->x, tmp->y = op->y;
2782	insert_ob_in_map (tmp, op->map, NULL, 0);	2620	insert_ob_in_map (tmp, op->map, NULL, 0);
2783		2621
2784	/**************************************/	2622	/**************************************/
2785	/* */	2623	/* */
2786	/* Subtract the experience points, */	2624	/* Subtract the experience points, */
2787	/* if we died cause of food, give us */
2788	/* food, and reset HP's... */
2789	/* */	2625	/* */
2790	/**************************************/	2626	/**************************************/
2791		2627
2792	/* remove any poisoning and confusion the character may be suffering. */
2793	/* restore player */
2794	at = archetype::find ("poisoning");
2795	tmp = present_arch_in_ob (at, op);
2796
2797	if (tmp)
2798	{
2799	tmp->destroy ();
2800	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2801	}
2802
2803	at = archetype::find ("confusion");
2804	tmp = present_arch_in_ob (at, op);
2805	if (tmp)
2806	{
2807	tmp->destroy ();
2808	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2809	}
2810
2811	cure_disease (op, 0, 0); /* remove any disease */
2812
2813	// remove all spell effects that are active
2814	// to avoid long-term effects such as word-of-recall
2815	for (object *item = op->inv; item; )
2816	{
2817	object *next = item->below;
2818
2819	if (item->type == SPELL_EFFECT && item->active)
2820	item->destroy ();
2821
2822	item = next;
2823	}
2824
2825	/*add_exp(op, (op->stats.exp * -0.20)); */	2628	/*add_exp(op, (op->stats.exp * -0.20)); */
2826	apply_death_exp_penalty (op);	2629	apply_death_exp_penalty (op);
2827
2828	if (op->stats.food < 100)
2829	op->stats.food = 900;
2830
2831	op->stats.hp = op->stats.maxhp;
2832	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2833	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2834		2630
2835	/*	2631	/*
2836	* Check to see if the player has any unpaid items. If so, remove them	2632	* Check to see if the player has any unpaid items. If so, remove them
2837	* and put them back in the map.	2633	* and put them back in the map.
2838	*/	2634	*/
…		…
2864	object *force;	2660	object *force;
2865	int at;	2661	int at;
2866		2662
2867	force = get_archetype (FORCE_NAME);	2663	force = get_archetype (FORCE_NAME);
2868	/* 50 ticks should be enough time for the spell to abate */	2664	/* 50 ticks should be enough time for the spell to abate */
2869	force->speed = 0.1f;
2870	force->speed_left = -5.f;	2665	force->speed_left = -5.f;
2871	SET_FLAG (force, FLAG_APPLIED);	2666	force->set_speed (0.1f);
		2667	force->set_flag (FLAG_APPLIED);
		2668
2872	for (at = 0; at < NROFATTACKS; at++)	2669	for (at = 0; at < NROFATTACKS; at++)
2873	if (will_kill_again & (1 << at))	2670	if (will_kill_again & (1 << at))
2874	force->resist[at] = 100;	2671	force->resist[at] = 100;
2875		2672
2876	insert_ob_in_ob (force, op);	2673	insert_ob_in_ob (force, op);
2877	op->update_stats ();	2674	op->update_stats ();
2878	}	2675	}
2879		2676
2880	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2881	}	2678	}
2882		2679
2883	void	2680	static void
2884	loot_object (object *op)	2681	loot_object (object *op)
2885	{ /* Grab and destroy some treasure */	2682	{ /* Grab and destroy some treasure */
2886	object *tmp, *tmp2, *next;	2683	object *tmp, *tmp2, *next;
2887		2684
2888	op->close_container (); /* close open sack first */	2685	op->close_container (); /* close open sack first */
…		…
2898	tmp->x = op->x, tmp->y = op->y;	2695	tmp->x = op->x, tmp->y = op->y;
2899		2696
2900	if (tmp->type == CONTAINER)	2697	if (tmp->type == CONTAINER)
2901	loot_object (tmp); /* empty container to ground */	2698	loot_object (tmp); /* empty container to ground */
2902		2699
2903	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2700	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2904	{	2701	{
2905	if (tmp->nrof > 1)	2702	if (tmp->nrof > 1)
2906	{	2703	{
2907	tmp->decrease (rndm (1, tmp->nrof - 1));	2704	tmp->decrease (rndm (1, tmp->nrof - 1));
2908	insert_ob_in_map (tmp, op->map, NULL, 0);	2705	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2919	* fix_weight(): Check recursively the weight of all players, and fix	2716	* fix_weight(): Check recursively the weight of all players, and fix
2920	* what needs to be fixed. Refresh windows and fix speed if anything	2717	* what needs to be fixed. Refresh windows and fix speed if anything
2921	* was changed.	2718	* was changed.
2922	*/	2719	*/
2923	void	2720	void
2924	fix_weight (void)	2721	fix_weight ()
2925	{	2722	{
2926	for_all_players (pl)	2723	for_all_players (pl)
2927	{	2724	{
2928	sint32 old = pl->ob->carrying;	2725	sint32 old = pl->ob->carrying;
2929		2726
…		…
2936	}	2733	}
2937	}	2734	}
2938	}	2735	}
2939		2736
2940	void	2737	void
2941	fix_luck (void)	2738	fix_luck ()
2942	{	2739	{
2943	for_all_players (pl)	2740	for_all_players (pl)
2944	if (!pl->ob->contr->ns->state)	2741	if (!pl->ob->contr->ns->state)
2945	pl->ob->change_luck (0);	2742	pl->ob->change_luck (0);
2946	}	2743	}
…		…
2998	}	2795	}
2999		2796
3000	int	2797	int
3001	is_true_undead (object *op)	2798	is_true_undead (object *op)
3002	{	2799	{
3003	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2800	if (op->arch->flag [FLAG_UNDEAD])
3004	return 1;	2801	return 1;
3005		2802
3006	return 0;	2803	return 0;
3007	}	2804	}
3008		2805
…		…
3023	level = ob->map->darklevel () - 2;	2820	level = ob->map->darklevel () - 2;
3024		2821
3025	/* this also picks up whether the object is glowing.	2822	/* this also picks up whether the object is glowing.
3026	* If you carry a light on a non-dark map, its not	2823	* If you carry a light on a non-dark map, its not
3027	* as bad as carrying a light on a pitch dark map */	2824	* as bad as carrying a light on a pitch dark map */
3028	if (has_carried_lights (ob))	2825	if (ob->has_carried_lights ())
3029	level = -(10 + (2 * ob->map->darklevel ()));	2826	level = -(10 + (2 * ob->map->darklevel ()));
3030		2827
3031	/* scan through all nearby squares for terrain to hide in */	2828	/* scan through all nearby squares for terrain to hide in */
3032	for (i = 0, x = ob->x, y = ob->y;	2829	for (i = 0, x = ob->x, y = ob->y;
3033	i <= SIZEOFFREE1;	2830	i <= SIZEOFFREE1;
…		…
3106		2903
3107	if (who->type == PLAYER)	2904	if (who->type == PLAYER)
3108	player = 1;	2905	player = 1;
3109		2906
3110	else	2907	else
3111	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2908	friendly = who->flag [FLAG_FRIENDLY];
3112		2909
3113	/* search adjacent squares */	2910	/* search adjacent squares */
3114	for (i = 1; i < 9; i++)	2911	for (i = 1; i < 9; i++)
3115	{	2912	{
3116	x = who->x + freearr_x[i];	2913	x = who->x + freearr_x[i];
…		…
3125	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2922	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3126	continue;	2923	continue;
3127		2924
3128	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2925	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3129	{	2926	{
3130	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2927	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3131	return 1;	2928	return 1;
3132	else if (tmp->type == PLAYER)	2929	else if (tmp->type == PLAYER)
3133	{	2930	{
3134	/*don't let a hidden DM prevent you from hiding */	2931	/*don't let a hidden DM prevent you from hiding */
3135	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	2932	if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
3136	return 1;	2933	return 1;
3137	}	2934	}
3138	}	2935	}
3139	}	2936	}
3140	return 0;	2937	return 0;
…		…
3190	}	2987	}
3191		2988
3192	return 0;	2989	return 0;
3193	}	2990	}
3194		2991
3195	/* routine for both players and monsters. We call this when
3196	* there is a possibility for our action distrubing our hiding
3197	* place or invisiblity spell. Artefact invisiblity causes
3198	* "noise" instead. If we arent invisible to begin with, we
3199	* return 0.
3200	*/
3201	int
3202	action_makes_visible (object *op)
3203	{
3204	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3205	{
3206	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3207	{
3208	// artefact invisibility is permanent, but we still make noise
3209	// this is important for game-balance.
3210	if (op->contr)
3211	op->make_noise ();
3212
3213	return 0;
3214	}
3215
3216	if (op->contr && op->contr->tmp_invis == 0)
3217	return 0;
3218
3219	/* If monsters, they should become visible */
3220	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3221	{
3222	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3223	return 1;
3224	}
3225	}
3226
3227	return 0;
3228	}
3229
3230	/* op_on_battleground - checks if the given object op (usually	2992	/* op_on_battleground - checks if the given object op (usually
3231	* a player) is standing on a valid battleground-tile,	2993	* a player) is standing on a valid battleground-tile,
3232	* function returns TRUE/FALSE. If true x, y returns the battleground	2994	* function returns TRUE/FALSE. If true x, y returns the battleground
3233	* -exit-coord. (and if x, y not NULL)	2995	* -exit-coord. (and if x, y not NULL)
3234	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	2996	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
…		…
3244	* and the exit-coordinates sp/hp must both be > 0.	3006	* and the exit-coordinates sp/hp must both be > 0.
3245	* => The intention here is to prevent abuse of the battleground-	3007	* => The intention here is to prevent abuse of the battleground-
3246	* feature (like pickable or hidden battleground tiles). */	3008	* feature (like pickable or hidden battleground tiles). */
3247	for (object *tmp = op->below; tmp; tmp = tmp->below)	3009	for (object *tmp = op->below; tmp; tmp = tmp->below)
3248	{	3010	{
3249	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3011	if (tmp->flag [FLAG_IS_FLOOR])
3250	{	3012	{
3251	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3013	if (tmp->flag [FLAG_NO_PICK]
3252	&& tmp->type == BATTLEGROUND	3014	&& tmp->type == BATTLEGROUND
3253	&& tmp->name == shstr_battleground	3015	&& tmp->name == shstr_battleground
3254	&& EXIT_X (tmp) && EXIT_Y (tmp))	3016	&& EXIT_X (tmp) && EXIT_Y (tmp))
3255	{	3017	{
3256	/* before we assign the exit, check if this is a teambattle */	3018	/* before we assign the exit, check if this is a teambattle */
3257	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3019	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3258	{
3259	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3020	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3021	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3260	{	3022	{
3261	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3262	{
3263	if (x && y)	3023	if (x && y)
3264	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3024	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3265		3025
3266	return 1;	3026	return 1;
3267	}
3268	}	3027	}
3269	}
3270		3028
3271	if (x && y)	3029	if (x && y)
3272	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3030	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3273		3031
3274	return 1;	3032	return 1;
…		…
3412	else	3170	else
3413	j = 1;	3171	j = 1;
3414	strcat (buf, spellpathnames[i]);	3172	strcat (buf, spellpathnames[i]);
3415	}	3173	}
3416	}	3174	}
		3175
3417	strcat (buf, ".");	3176	strcat (buf, ".");
3418	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3177	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3419	}	3178	}
3420		3179
3421	/* evtl. adding flags: */	3180	/* evtl. adding flags: */
3422	if (QUERY_FLAG (item, FLAG_XRAYS))	3181	if (item->flag [FLAG_XRAYS])
3423	SET_FLAG (skin, FLAG_XRAYS);	3182	skin->set_flag (FLAG_XRAYS);
3424	if (QUERY_FLAG (item, FLAG_STEALTH))	3183	if (item->flag [FLAG_STEALTH])
3425	SET_FLAG (skin, FLAG_STEALTH);	3184	skin->set_flag (FLAG_STEALTH);
3426	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3185	if (item->flag [FLAG_SEE_IN_DARK])
3427	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3186	skin->set_flag (FLAG_SEE_IN_DARK);
3428		3187
3429	/* print message if there is one */	3188	/* print message if there is one */
3430	if (item->msg != NULL)	3189	if (item->msg != NULL)
3431	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3190	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3432	}	3191	}
3433	else	3192	else
3434	{	3193	{
3435	/* generate misc. treasure */	3194	/* generate misc. treasure */
3436	tmp = arch_to_object (tr->item);	3195	tmp = tr->item->instance ();
3437	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3196	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3438	who->insert (tmp);	3197	who->insert (tmp);
3439	}	3198	}
3440	}	3199	}
3441		3200
3442	/**	3201	//-GPL
3443	* Unready an object for a player. This function does nothing if the object was
3444	* not readied.
3445	*/
3446	void
3447	player_unready_range_ob (player *pl, object *ob)
3448	{
3449	if (pl->ob->current_weapon == ob)
3450	pl->ob->current_weapon = 0;
3451
3452	if (pl->combat_ob == ob)
3453	pl->combat_ob = 0;
3454
3455	if (pl->ranged_ob == ob)
3456	pl->ranged_ob = 0;
3457	}
3458		3202
3459	sint8	3203	sint8
3460	player::darkness_at (maptile *map, int x, int y) const	3204	player::darkness_at (maptile *map, int x, int y) const
3461	{	3205	{
3462	if (!ns)	3206	if (!ns)
…		…
3489	{	3233	{
3490	play_sound (sound_find ("generic_failure"));	3234	play_sound (sound_find ("generic_failure"));
3491	statusmsg (msg, color);	3235	statusmsg (msg, color);
3492	}	3236	}
3493		3237
		3238	void
		3239	object::failmsgf (const char *format, ...)
		3240	{
		3241	if (!contr)
		3242	return;
		3243
		3244	va_list ap;
		3245	va_start (ap, format);
		3246	contr->failmsg (vformat (format, ap));
		3247	va_end (ap);
		3248	}
		3249
		3250	void
		3251	player::failmsgf (const char *format, ...)
		3252	{
		3253	va_list ap;
		3254	va_start (ap, format);
		3255	failmsg (vformat (format, ap));
		3256	va_end (ap);
		3257	}
		3258

Diff Legend

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