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.151 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.296 by root, Thu Nov 17 04:59:33 2016 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* under the terms of the GNU General Public License as published by the Free	9	* the terms of the Affero GNU General Public License as published by the
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the Affero GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* and the GNU General Public License along with this program. If not, see
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
		24
		25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
24		29
25	#include <global.h>	30	#include <global.h>
26	#include <sproto.h>	31	#include <sproto.h>
27	#include <sounds.h>	32	#include <sounds.h>
28	#include <living.h>	33	#include <living.h>
29	#include <object.h>	34	#include <object.h>
30	#include <spells.h>	35	#include <spells.h>
31	#include <skills.h>	36	#include <skills.h>
32		37
33	#include <algorithm>
34	#include <functional>
35
36	playervec players;	38	playervec players;
37
38	void
39	display_motd (const object *op)
40	{
41	char buf[MAX_BUF];
42	char motd[HUGE_BUF];
43	FILE *fp;
44	int comp;
45	int size;
46
47	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
48	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
49	return;
50
51	motd[0] = '\0';
52	size = 0;
53
54	while (fgets (buf, MAX_BUF, fp))
55	{
56	if (*buf == '#')
57	continue;
58
59	strncat (motd + size, buf, HUGE_BUF - size);
60	size += strlen (buf);
61	}
62
63	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
64	close_and_delete (fp, comp);
65	}
66
67	void
68	send_rules (const object *op)
69	{
70	char buf[MAX_BUF];
71	char rules[HUGE_BUF];
72	FILE *fp;
73	int comp;
74	int size;
75
76	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
77	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
78	return;
79
80	rules[0] = '\0';
81	size = 0;
82
83	while (fgets (buf, MAX_BUF, fp))
84	{
85	if (*buf == '#')
86	continue;
87
88	if (size + strlen (buf) >= HUGE_BUF)
89	{
90	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
91	break;
92	}
93
94	strncat (rules + size, buf, HUGE_BUF - size);
95	size += strlen (buf);
96	}
97
98	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
99	close_and_delete (fp, comp);
100	}
101
102	void
103	send_news (const object *op)
104	{
105	char buf[MAX_BUF];
106	char news[HUGE_BUF];
107	char subject[MAX_BUF];
108	FILE *fp;
109	int comp;
110	int size;
111
112	sprintf (buf, "%s/%s", settings.confdir, settings.news);
113	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
114	return;
115
116	news[0] = '\0';
117	subject[0] = '\0';
118	size = 0;
119
120	while (fgets (buf, MAX_BUF, fp))
121	{
122	if (*buf == '#')
123	continue;
124
125	if (*buf == '%')
126	{ /* send one news */
127	if (size > 0)
128	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
130	strcpy (subject, buf + 1);
131	strip_endline (subject);
132	size = 0;
133	news[0] = '\0';
134	}
135	else
136	{
137	if (size + strlen (buf) >= HUGE_BUF)
138	{
139	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
140	break;
141	}
142	strncat (news + size, buf, HUGE_BUF - size);
143	size += strlen (buf);
144	}
145	}
146
147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);
150	}
151		39
152	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
153	static void	41	static void
154	set_first_map (object *op)	42	set_first_map (object *op)
155	{	43	{
…		…
166		54
167	players.insert (this);	55	players.insert (this);
168	ob->remove ();	56	ob->remove ();
169	ob->map = 0;	57	ob->map = 0;
170	ob->activate_recursive ();	58	ob->activate_recursive ();
171	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
172	add_friendly_object (ob);	60	add_friendly_object (ob);
173	}	61	}
174		62
175	void	63	void
176	player::deactivate ()	64	player::deactivate ()
…		…
184		72
185	if (ob->map)	73	if (ob->map)
186	maplevel = ob->map->path;	74	maplevel = ob->map->path;
187		75
188	ob->remove ();	76	ob->remove ();
		77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
189	ob->map = 0;	78	ob->map = 0;
190	party = 0;	79	party = 0;
191
192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193		80
194	players.erase (this);	81	players.erase (this);
195	}	82	}
196		83
197	// connect the player with a specific client	84	// connect the player with a specific client
…		…
207	ob->close_container (); //TODO: client-specific	94	ob->close_container (); //TODO: client-specific
208		95
209	ns->update_look = 0;	96	ns->update_look = 0;
210	ns->look_position = 0;	97	ns->look_position = 0;
211		98
212	clear_los (this);	99	clear_los ();
213		100
214	ns->reset_stats ();	101	ns->reset_stats ();
215		102
216	/* make sure he's a player -- needed because of class change. */	103	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	104	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
219		106
220	ob->carrying = sum_weight (ob);	107	ob->update_weight ();
221	link_player_skills (ob);	108	link_skills ();
222
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		109
225	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
226		111
227	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
228	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
229	{	114	{
230	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
231
232	shstr_cmp dragon_ability_force ("dragon_ability_force");
233	shstr_cmp dragon_skin_force ("dragon_skin_force");
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)
237	if (tmp->arch->archname == dragon_ability_force)	119	if (tmp->arch->archname == shstr_dragon_ability_force)
238	abil = tmp;	120	abil = tmp;
239	else if (tmp->arch->archname == dragon_skin_force)	121	else if (tmp->arch->archname == shstr_dragon_skin_force)
240	skin = tmp;	122	skin = tmp;
241		123
242	set_dragon_name (ob, abil, skin);	124	set_dragon_name (ob, abil, skin);
243	}	125	}
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, ob->weight + ob->carrying);	129	esrv_new_player (this);
248		130
249	ob->flag [FLAG_READY_WEAPON] = false;	131	ob->flag [FLAG_READY_WEAPON] = false;
250	ob->flag [FLAG_READY_SKILL] = false;	132	ob->flag [FLAG_READY_SKILL] = false;
		133	ob->flag [FLAG_READY_RANGE] = false;
251	ob->flag [FLAG_READY_BOW] = false;	134	ob->flag [FLAG_READY_BOW] = false;
252		135
253	for (object *op = ob->inv; op; op = op->below)
254	if (op->flag [FLAG_APPLIED])
255	switch (op->type)
256	{
257	case SKILL:
258	ob->flag [FLAG_APPLIED] = false;
259	break;
260
261	case WAND:
262	case ROD:
263	case HORN:
264	case BOW:
265	ranged_ob = op;
266	break;
267
268	case WEAPON:
269	combat_ob = op;
270	break;
271	}
272
273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274	ob->update_stats ();	136	ob->update_stats ();
275		137
276	ns->floorbox_update ();	138	ns->floorbox_update ();
277	esrv_send_inventory (ob, ob);	139	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);	140	esrv_add_spells (this, 0);
279		141
280	activate ();	142	activate ();
281		143
282	send_rules (ob);
283	send_news (ob);
284	display_motd (ob);
285
286	INVOKE_PLAYER (CONNECT, this);	144	INVOKE_PLAYER (CONNECT, this);
287	INVOKE_PLAYER (LOGIN, this);	145	INVOKE_PLAYER (LOGIN, this);
288	}	146	}
289		147
290	void	148	void
291	player::disconnect ()	149	player::disconnect ()
292	{	150	{
		151	if (ob)
		152	{
		153	ob->close_container (); //TODO: client-specific
		154	ob->drop_unpaid_items ();
		155	}
		156
293	if (ns)	157	if (ns)
294	{	158	{
295	if (active)	159	if (active)
296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	160	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297		161
…		…
300	ns->reset_stats ();	164	ns->reset_stats ();
301	ns->pl = 0;	165	ns->pl = 0;
302	ns = 0;	166	ns = 0;
303	}	167	}
304		168
305	if (ob)	169	// this is important for the player scheduler to get the correct refcount
306	ob->close_container (); //TODO: client-specific	170	// when ns = 0
307		171	observe = viewpoint = ob;
308	observe = ob;
309		172
310	deactivate ();	173	deactivate ();
311	}	174	}
		175
		176	//-GPL
312		177
313	// the need for this function can be explained	178	// the need for this function can be explained
314	// by load_object not returning the object	179	// by load_object not returning the object
315	void	180	void
316	player::set_object (object *op)	181	player::set_object (object *op)
317	{	182	{
318	ob = observe = op;	183	ob = observe = viewpoint = op;
319	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
320		185
321	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
322	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
323		188
324	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
325	}	190	}
326		191
327	void	192	void
328	player::set_observe (object *op)	193	player::set_observe (object *op)
329	{	194	{
330	observe = op ? op : ob;	195	observe = viewpoint = op ? op : ob;
331	do_los = 1;	196	do_los = 1;
332	}	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
333		207
334	player::player ()	208	player::player ()
335	{	209	{
336	/* There are some elements we want initialised to non zero value -	210	/* There are some elements we want initialised to non zero value -
337	* we deal with that below this point.	211	* we deal with that below this point.
…		…
343	savebed_map = first_map_path; /* Init. respawn position */	217	savebed_map = first_map_path; /* Init. respawn position */
344		218
345	gen_sp_armour = 10;	219	gen_sp_armour = 10;
346	bowtype = bow_normal;	220	bowtype = bow_normal;
347	petmode = pet_normal;	221	petmode = pet_normal;
348	listening = 10;
349	usekeys = containers;	222	usekeys = containers;
350	peaceful = 1; /* default peaceful */	223	peaceful = 1; /* default peaceful */
351	do_los = 1;	224	do_los = 1;
352		225
353	weapon_sp = 1.0f;	226	weapon_sp = 1.0f;
…		…
360	disconnect ();	233	disconnect ();
361		234
362	attachable::do_destroy ();	235	attachable::do_destroy ();
363		236
364	if (ob)	237	if (ob)
365	{
366	ob->destroy_inv (false);
367	ob->destroy ();	238	ob->destroy ();
368	}
369		239
370	ob = observe = 0;	240	ob = observe = viewpoint = 0;
371	}	241	}
372		242
373	player::~player ()	243	player::~player ()
374	{	244	{
375	/* Clear item stack */	245	/* Clear item stack */
376	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	}
377	}	275	}
378		276
379	/* Tries to add player on the connection passed in ns.	277	/* Tries to add player on the connection passed in ns.
380	* 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
381	* mode.	279	* mode.
…		…
383	player *	281	player *
384	player::create ()	282	player::create ()
385	{	283	{
386	player *pl = new player;	284	player *pl = new player;
387		285
388	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
389		287
390	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
391	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
392	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
393		291
394	set_first_map (pl->ob);	292	set_first_map (pl->ob);
395		293
396	return pl;	294	return pl;
397	}
398
399	/*
400	* get_player_archetype() return next player archetype from archetype
401	* list. Not very efficient routine, but used only creating new players.
402	* Note: there MUST be at least one player archetype!
403	*/
404	archetype *
405	get_player_archetype (archetype *at)
406	{
407	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
408
409	for (;;)
410	{
411	if (++i == archetypes.end ())
412	i = archetypes.begin ();
413	else if (*i == at)
414	cleanup ("not a single player archetype found");
415
416	if ((*i)->type == PLAYER)
417	return *i;
418	}
419	}	295	}
420		296
421	object *	297	object *
422	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
423	{	299	{
…		…
426	unsigned lastdist;	302	unsigned lastdist;
427	rv_vector rv;	303	rv_vector rv;
428		304
429	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	305	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
430	{	306	{
431	/* We should not find free objects on this friendly list, but it
432	* does periodically happen. Given that, lets deal with it.
433	* While unlikely, it is possible the next object on the friendly
434	* list is also free, so encapsulate this in a while loop.
435	*/
436	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
437	{
438	object *tmp = ol->ob;
439
440	/* Can't do much more other than log the fact, because the object
441	* itself will have been cleared.
442	*/
443	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
444	tmp->debug_desc ());
445	ol = ol->next;
446	remove_friendly_object (tmp);
447	if (!ol)
448	return op;
449	}
450
451	/* Remove special check for player from this. First, it looks to cause
452	* some crashes (ol->ob->contr not set properly?), but secondly, a more
453	* complicated method of state checking would be needed in any case -
454	* as it was, a clever player could type quit, and the function would
455	* skip them over while waiting for confirmation. Remove
456	* on_same_map check, as can_detect_enemy also does this
457	*/
458	if (!can_detect_enemy (mon, ol->ob, &rv))	307	if (!can_detect_enemy (mon, ol->ob, &rv))
459	continue;	308	continue;
460		309
461	if (lastdist > rv.distance)	310	if (lastdist > rv.distance)
462	{	311	{
…		…
524	*/	373	*/
525	int	374	int
526	path_to_player (object *mon, object *pl, unsigned mindiff)	375	path_to_player (object *mon, object *pl, unsigned mindiff)
527	{	376	{
528	rv_vector rv;	377	rv_vector rv;
529	sint16 x, y;
530	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;
531	maptile *m, *lastmap;
532		379
533	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
534		381
535	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
536	return 0;	383	return 0;
537		384
538	x = mon->x;	385	mapxy pos (mon);
539	y = mon->y;
540	m = mon->map;
541	dir = rv.direction;	386	dir = rv.direction;
542	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 */
543	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
544		389
545	/* 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. */
546	if (diff > max)	391	if (diff > max)
547	return 0;	392	return 0;
548		393
549	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
550	{	395	{
551	lastx = x;	396	mapxy lastpos = pos;
552	lasty = y;
553	lastmap = m;
554	x = lastx + freearr_x[dir];
555	y = lasty + freearr_y[dir];
556		397
557	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
558	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
559		399
560	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
561	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
562	&& (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)))
563	{	404	{
564	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
565	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
566	*/	407	*/
567	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
568	if (rv.direction != dir)	409	if (rv.direction != dir)
569	{	410	{
570	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
571	* the values so it will try again.	412	* the values so it will try again.
572	*/	413	*/
573	x = lastx;
574	y = lasty;
575	m = lastmap;	414	pos = lastpos;
576	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
577	}	416	}
578	else	417	else
579	{	418	{
580	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
587	*/	426	*/
588	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
589	{	428	{
590	if (i == 0)	429	if (i == 0)
591	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
592	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
593	* since the direction that the creature should move in	433	* since the direction that the creature should move in
594	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
595	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
596	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
598	* 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
599	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
600	* the last direction the creature has successfully	440	* the last direction the creature has successfully
601	* moved.	441	* moved.
602	*/	442	*/
603
604	x = lastx + freearr_x[absdir (lastdir + i)];
605	y = lasty + freearr_y[absdir (lastdir + i)];
606	m = lastmap;	443	pos = lastpos;
607	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
608	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
609	continue;	447	continue;
610	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
611	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
612	continue;	452	continue;
613	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
614	continue;	455	continue;
615		456
616	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
617	break;	458	break;
618	}	459	}
		460
619	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
620	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
621	*/	463	*/
622	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
623	return 0;	465	return 0;
		466
624	diff--;	467	diff--;
625	lastdir = dir;	468	lastdir = dir;
626	max--;	469	max--;
627	if (!firstdir)	470	if (!firstdir)
628	firstdir = dir + i;	471	firstdir = dir + i;
…		…
632	{	475	{
633	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
634	diff--;	477	diff--;
635	max--;	478	max--;
636	lastdir = dir;	479	lastdir = dir;
		480
637	if (!firstdir)	481	if (!firstdir)
638	firstdir = dir;	482	firstdir = dir;
639	}	483	}
640		484
641	if (diff <= 1)	485	if (diff <= 1)
642	{	486	{
643	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
644	* headed toward player for entire distance.	488	* headed toward player for entire distance.
645	*/	489	*/
646	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
647	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
648	}	492	}
649		493
650	if (diff > max)	494	if (diff > max)
651	return 0;	495	return 0;
…		…
657		501
658	return firstdir;	502	return firstdir;
659	}	503	}
660		504
661	void	505	void
662	give_initial_items (object *pl, treasurelist * items)	506	give_initial_items (object *pl, treasurelist *items)
663	{	507	{
664	object *op, *next = NULL;
665
666	if (pl->randomitems != NULL)	508	if (pl->randomitems)
667	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	509	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
668		510
669	for (op = pl->inv; op; op = next)	511	for (object *next, *op = pl->inv; op; op = next)
670	{	512	{
671	next = op->below;	513	next = op->below;
672		514
673	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
674	* 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
675	*/	517	*/
676	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
677	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
678		520
679	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
680	* by this player due to race restrictions	522	* by this player due to race restrictions
681	*/	523	*/
682	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
683	{	525	{
684	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	526	if ((!pl->flag [FLAG_USE_ARMOUR]
		527	&&
685	(op->type == ARMOUR || op->type == BOOTS ||	528	(op->type == ARMOUR || op->type == BOOTS
686	op->type == CLOAK || op->type == HELMET ||	529	|| op->type == CLOAK || op->type == HELMET
687	op->type == SHIELD || op->type == GLOVES ||	530	|| op->type == SHIELD || op->type == GLOVES
688	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	531	|| op->type == BRACERS || op->type == GIRDLE))
		532	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
689	{	533	{
690	op->destroy ();	534	op->destroy ();
691	continue;	535	continue;
692	}	536	}
693	}	537	}
694		538
695	/* This really needs to be better - we should really give	539	/* Here we remove duplicated skills (as duplicated spell objects have
696	* a substitute spellbook. The problem is that we don't really	540	* _very_ confusing effects for players), which could for instance be
697	* have a good idea what to replace it with (need something like	541	* generated by multiple treasurelists specifying the same skills.
698	* a first level treasurelist for each skill.)
699	* remove duplicate skills also
700	*/	542	*/
701	if (op->type == SPELLBOOK || op->type == SKILL)	543	if (op->type == SKILL)
702	{	544	{
703	object *tmp;
704
705	for (tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
706	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
707	break;
708
709	if (tmp)
710	{	547	{
711	op->destroy ();	548	op->destroy ();
712	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	549	break;
713	continue;
714	}	550	}
715		551
716	if (op->nrof > 1)	552	if (op->nrof > 1)
717	op->nrof = 1;	553	op->nrof = 1;
718	}	554	}
719		555
720	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
721	{	557	op->inv->clr_flag (FLAG_STARTEQUIP);
722	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
723	}
724		558
725	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
726	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
727	* merged properly.	561	* merged properly.
728	*/	562	*/
729	if (need_identify (op))	563	if (op->need_identify ())
730	{
731	SET_FLAG (op, FLAG_IDENTIFIED);
732	CLEAR_FLAG (op, FLAG_CURSED);
733	CLEAR_FLAG (op, FLAG_DAMNED);
734	}	564	{
		565	op->set_flag (FLAG_IDENTIFIED);
		566	op->clr_flag (FLAG_CURSED);
		567	op->clr_flag (FLAG_DAMNED);
		568	}
		569
735	if (op->type == SPELL)	570	if (op->type == SPELL)
736	{	571	{
737	op->destroy ();	572	op->destroy ();
738	continue;	573	continue;
739	}	574	}
740	else if (op->type == SKILL)	575	else if (op->type == SKILL)
741	{	576	{
742	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
743	op->stats.exp = 0;	578	op->stats.exp = 0;
744	op->level = 1;	579	op->level = 1;
745	}	580	}
746	/* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
747	else	582	op->set_flag (FLAG_INV_LOCKED);
748	SET_FLAG (op, FLAG_INV_LOCKED);
749	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
750		584
751	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
752	link_player_skills (pl);	586	pl->contr->link_skills ();
753	}	587	}
754		588
755	void	589	void
756	get_party_password (object *op, partylist *party)	590	get_party_password (object *op, partylist *party)
757	{	591	{
…		…
767	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	601	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
768	}	602	}
769		603
770	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	604	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
771	static int	605	static int
772	roll_stat (void)	606	roll_stat ()
773	{	607	{
774	int a[4], i, j, k;	608	int a[4], i, j, k;
775		609
776	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
777	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
778		612
779	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
780	if (a[i] < k)	614	if (a[i] < k)
781	k = a[i], j = i;	615	k = a[i], j = i;
782		616
…		…
858	static void	692	static void
859	start_info (object *op)	693	start_info (object *op)
860	{	694	{
861	char buf[MAX_BUF];	695	char buf[MAX_BUF];
862		696
863	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	697	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
864	new_draw_info (NDI_UNIQUE, 0, op, buf);	698	new_draw_info (NDI_UNIQUE, 0, op, buf);
865	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
866	//new_draw_info (NDI_UNIQUE, 0, op, " ");
867	}	699	}
868		700
869	/* This function takes the key that is passed, and does the	701	/* This function takes the key that is passed, and does the
870	* appropriate action with it (change race, or other things).	702	* appropriate action with it (change race, or other things).
871	* The function name is for historical reasons - now we have	703	* The function name is for historical reasons - now we have
…		…
874	*/	706	*/
875	void	707	void
876	player::chargen_race_done ()	708	player::chargen_race_done ()
877	{	709	{
878	/* this must before then initial items are given */	710	/* this must before then initial items are given */
879	esrv_new_player (ob->contr, ob->weight + ob->carrying);	711	esrv_new_player (ob->contr);
880		712
881	treasurelist *tl = treasurelist::find ("starting_wealth");	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
882	if (tl)	714	if (tl)
883	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
884		716
885	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
886	INVOKE_PLAYER (LOGIN, ob->contr);
887		718
888	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
889		720
890	if (ob->msg)	721	if (ob->msg)
891	ob->msg = 0;	722	ob->msg = 0;
892		723
893	/* We create this now because some of the unique maps will need it
894	* to save here.
895	*/
896	{
897	char buf[MAX_BUF];
898	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
899	make_path_to_file (buf);
900	}
901
902	start_info (ob);	724	start_info (ob);
903	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
904	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
905	link_player_skills (ob);
906	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
907	ob->update_stats ();	728	ob->update_stats ();
908		729
909	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
910	* is one for this race	731	* is one for this race
911	*/	732	*/
912	if (*first_map_ext_path)	733	if (*first_map_ext_path)
913	{	734	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
914	object *tmp;
915	char mapname[MAX_BUF];
916
917	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
918	tmp = object::create ();
919	EXIT_PATH (tmp) = mapname;
920	EXIT_X (tmp) = ob->x;
921	EXIT_Y (tmp) = ob->y;
922	ob->enter_exit (tmp); /* we don't really care if it succeeded;
923	* if the map isn't there, then stay on the
924	* default initial map */
925	tmp->destroy ();
926	}
927	else	735	else
928	LOG (llevDebug, "first_map_ext_path not set\n");	736	LOG (llevDebug, "first_map_ext_path not set\n");
		737	}
		738
		739	/*
		740	* Returns true if the given player is a legal class.
		741	* The function to add and remove class-bonuses to the stats doesn't
		742	* check if the stat becomes negative, thus this function
		743	* merely checks that all stats are 1 or more, and returns
		744	* false otherwise.
		745	*/
		746	static int
		747	allowed_class (const object *op)
		748	{
		749	return op->stats.Dex > 0
		750	&& op->stats.Str > 0
		751	&& op->stats.Con > 0
		752	&& op->stats.Int > 0
		753	&& op->stats.Wis > 0
		754	&& op->stats.Pow > 0
		755	&& op->stats.Cha > 0;
929	}	756	}
930		757
931	void	758	void
932	player::chargen_race_next ()	759	player::chargen_race_next ()
933	{	760	{
…		…
962	ob->stats.hp = ob->stats.maxhp;	789	ob->stats.hp = ob->stats.maxhp;
963	ob->stats.sp = ob->stats.maxsp;	790	ob->stats.sp = ob->stats.maxsp;
964	ob->stats.grace = 0;	791	ob->stats.grace = 0;
965	}	792	}
966		793
967	void	794	static void
968	flee_player (object *op)	795	flee_player (object *op)
969	{	796	{
970	int dir, diff;	797	int dir, diff;
971	rv_vector rv;	798	rv_vector rv;
972		799
973	if (op->stats.hp < 0)	800	if (op->stats.hp < 0)
974	{	801	{
975	LOG (llevDebug, "Fleeing player is dead.\n");	802	LOG (llevDebug, "Fleeing player is dead.\n");
976	CLEAR_FLAG (op, FLAG_SCARED);	803	op->clr_flag (FLAG_SCARED);
977	return;	804	return;
978	}	805	}
979		806
980	if (op->enemy == NULL)	807	if (!op->enemy)
981	{	808	{
982	LOG (llevDebug, "Fleeing player had no enemy.\n");	809	LOG (llevDebug, "Fleeing player had no enemy.\n");
983	CLEAR_FLAG (op, FLAG_SCARED);	810	op->clr_flag (FLAG_SCARED);
984	return;	811	return;
985	}	812	}
986		813
987	/* Seen some crashes here. Since we don't store an	814	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
988	* op->enemy_count, it is possible that something destroys the
989	* actual enemy, and the object is recycled.
990	*/
991	if (op->enemy->map == NULL)
992	{	815	{
993	CLEAR_FLAG (op, FLAG_SCARED);
994	op->enemy = NULL;	816	op->enemy = NULL;
995	return;	817	op->clr_flag (FLAG_SCARED);
996	}
997
998	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
999	{
1000	op->enemy = NULL;
1001	CLEAR_FLAG (op, FLAG_SCARED);
1002	return;	818	return;
1003	}	819	}
1004		820
1005	get_rangevector (op, op->enemy, &rv, 0);	821	get_rangevector (op, op->enemy, &rv, 0);
1006		822
1007	dir = absdir (4 + rv.direction);	823	dir = absdir (4 + rv.direction);
1008	for (diff = 0; diff < 3; diff++)	824	for (diff = 0; diff < 3; diff++)
1009	{	825	{
1010	int m = 1 - (RANDOM () & 2);	826	int m = 1 - rndm (2) * 2;
1011		827
1012	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	828	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1013	return;	829	return;
1014	}	830	}
1015		831
1016	/* Cornered, get rid of scared */	832	/* Cornered, get rid of scared */
1017	CLEAR_FLAG (op, FLAG_SCARED);	833	op->clr_flag (FLAG_SCARED);
1018	op->enemy = NULL;	834	op->enemy = NULL;
1019	}	835	}
1020		836
1021	/* check_pick sees if there is stuff to be picked up/picks up stuff.	837	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1022	* It returns 1 if the player should keep on moving, 0 if he should	838	* It returns 1 if the player should keep on moving, 0 if he should
…		…
1026	check_pick (object *op)	842	check_pick (object *op)
1027	{	843	{
1028	object *tmp, *next;	844	object *tmp, *next;
1029	int stop = 0;	845	int stop = 0;
1030	int wvratio;	846	int wvratio;
1031	char putstring[128];
1032		847
1033	/* if you're flying, you cna't pick up anything */	848	/* if you're flying, you can't pick up anything */
1034	if (op->move_type & MOVE_FLYING)	849	if (op->move_type & MOVE_FLYING)
1035	return 1;	850	return 1;
1036		851
1037	next = op->below;	852	next = op->below;
		853
		854	int cnt = MAX_ITEM_PER_ACTION;
		855	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1038		856
1039	/* loop while there are items on the floor that are not marked as	857	/* loop while there are items on the floor that are not marked as
1040	* destroyed */	858	* destroyed */
1041	while (next && !next->destroyed ())	859	while (next && !next->destroyed ())
1042	{	860	{
1043	tmp = next;	861	tmp = next;
1044	next = tmp->below;	862	next = tmp->below;
1045		863
		864	if (cnt <= 0)
		865	{
		866	op->failmsg ("Couldn't pickup all items at once.");
		867	return 0;
		868	}
		869
1046	if (op->destroyed ())	870	if (op->destroyed ())
1047	return 0;	871	return 0;
1048		872
1049	if (!can_pick (op, tmp))	873	if (!can_pick (op, tmp))
1050	continue;	874	continue;
1051		875
1052	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	876	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1053	{	877	{
1054	if (item_matched_string (op, tmp, op->contr->search_str))	878	if (item_matched_string (op, tmp, op->contr->search_str))
1055	pick_up (op, tmp);	879	CHK_PICK_PICKUP;
		880
1056	continue;	881	continue;
1057	}	882	}
1058		883
1059	/* high not bit set? We're using the old autopickup model */	884	/* pickup handling */
		885	if (op->contr->mode & PU_DEBUG)
		886	{
		887	/* some debugging code to figure out item information */
		888	const char *str = tmp->name
		889	? format ("item name: %s item type: %d weight/value: %d",
		890	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		891	: format ("item name: %s item type: %d weight/value: %d",
		892	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		893
		894	new_draw_info (NDI_UNIQUE, 0, op, str);
		895	}
		896
		897	if (op->contr->mode & PU_INHIBIT)
		898	return 1;
		899
		900	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		901	return 1;
		902
		903	/* philosophy:
		904	* It's easy to grab an item type from a pile, as long as it's
		905	* generic. This takes no game-time. For more detailed pickups
		906	* and selections, select-items should be used. This is a
		907	* grab-as-you-run type mode that's really useful for arrows for
		908	* example.
		909	* The drawback: right now it has no frontend, so you need to
		910	* stick the bits you want into a calculator in hex mode and then
		911	* convert to decimal and then 'pickup <#>
		912	*/
		913
		914	/* the first two modes are exclusive: if NOTHING we return, if
		915	* STOP then we stop. All the rest are applied sequentially,
		916	* meaning if any test passes, the item gets picked up. */
		917
		918	/* if mode is set to pick nothing up, return */
		919	if (op->contr->mode == PU_NOTHING)
		920	return 1;
		921
		922	/* if mode is set to stop when encountering objects, return */
		923	/* take STOP before INHIBIT since it doesn't actually pick
		924	* anything up */
		925	if (op->contr->mode & PU_STOP)
		926	return 0;
		927
		928	/* useful for going into stores and not losing your settings... */
		929	/* and for battles wher you don't want to get loaded down while
		930	* fighting */
		931	if (op->contr->mode & PU_INHIBIT)
		932	return 1;
		933
		934	/* prevent us from turning into auto-thieves :) */
		935	if (tmp->flag [FLAG_UNPAID])
		936	continue;
		937
		938	/* ignore known cursed objects */
		939	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
		940	continue;
		941
		942	/* all food and drink if desired */
		943	/* question: don't pick up known-poisonous stuff? */
1060	if (!(op->contr->mode & PU_NEWMODE))	944	if (op->contr->mode & PU_FOOD)
		945	if (tmp->type == FOOD)
1061	{	946	{
1062	switch (op->contr->mode)	947	CHK_PICK_PICKUP;
		948	continue;
		949	}
		950
		951	if (op->contr->mode & PU_DRINK)
		952	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
		953	{
		954	CHK_PICK_PICKUP;
		955	continue;
		956	}
		957
		958	if (op->contr->mode & PU_POTION)
		959	if (tmp->type == POTION)
		960	{
		961	CHK_PICK_PICKUP;
		962	continue;
		963	}
		964
		965	/* spellbooks, skillscrolls and normal books/scrolls */
		966	if (op->contr->mode & PU_SPELLBOOK)
		967	if (tmp->type == SPELLBOOK)
		968	{
		969	CHK_PICK_PICKUP;
		970	continue;
		971	}
		972
		973	if (op->contr->mode & PU_SKILLSCROLL)
		974	if (tmp->type == SKILLSCROLL)
		975	{
		976	CHK_PICK_PICKUP;
		977	continue;
		978	}
		979
		980	if (op->contr->mode & PU_READABLES)
		981	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		982	{
		983	CHK_PICK_PICKUP;
		984	continue;
		985	}
		986
		987	/* wands/staves/rods/horns */
		988	if (op->contr->mode & PU_MAGIC_DEVICE)
		989	if (tmp->type == WAND
		990	|| tmp->type == ROD
		991	|| tmp->type == HORN
		992	|| tmp->type == POWER_CRYSTAL)
		993	{
		994	CHK_PICK_PICKUP;
		995	continue;
		996	}
		997
		998	/* pick up all magical items */
		999	if (op->contr->mode & PU_MAGICAL)
		1000	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1001	&& !tmp->flag [FLAG_KNOWN_CURSED])
		1002	{
		1003	CHK_PICK_PICKUP;
		1004	continue;
		1005	}
		1006
		1007	if (op->contr->mode & PU_VALUABLES)
		1008	{
		1009	if (tmp->type == MONEY || tmp->type == GEM)
1063	{	1010	{
1064	case 0:	1011	CHK_PICK_PICKUP;
1065	return 1; /* don't pick up */	1012	continue;
1066	case 1:
1067	pick_up (op, tmp);
1068	return 1;
1069	case 2:
1070	pick_up (op, tmp);
1071	return 0;
1072	case 3:
1073	return 0; /* stop before pickup */
1074	case 4:
1075	pick_up (op, tmp);
1076	break;
1077	case 5:
1078	pick_up (op, tmp);
1079	stop = 1;
1080	break;
1081	case 6:
1082	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1083	pick_up (op, tmp);
1084	break;
1085
1086	case 7:
1087	if (tmp->type == MONEY || tmp->type == GEM)
1088	pick_up (op, tmp);
1089	break;
1090
1091	default:
1092	/* use value density */
1093	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1094	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1095	pick_up (op, tmp);
1096	}	1013	}
1097	}	1014	}
1098	else	1015
1099	{ /* old model */	1016	/* rings & amulets - talismans seems to be typed AMULET */
1100	/* NEW pickup handling */
1101	if (op->contr->mode & PU_DEBUG)	1017	if (op->contr->mode & PU_JEWELS)
		1018	if (tmp->type == RING
		1019	|| tmp->type == AMULET
		1020	|| tmp->type == GIRDLE
		1021	|| tmp->type == SKILL_TOOL)
1102	{	1022	{
1103	/* some debugging code to figure out item information */	1023	CHK_PICK_PICKUP;
1104	if (tmp->name != NULL)
1105	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1106	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1107	else
1108	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1109	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1110
1111	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1112	}
1113
1114	/* philosophy:
1115	* It's easy to grab an item type from a pile, as long as it's
1116	* generic. This takes no game-time. For more detailed pickups
1117	* and selections, select-items should be used. This is a
1118	* grab-as-you-run type mode that's really useful for arrows for
1119	* example.
1120	* The drawback: right now it has no frontend, so you need to
1121	* stick the bits you want into a calculator in hex mode and then
1122	* convert to decimal and then 'pickup <#>
1123	*/
1124
1125	/* the first two modes are exclusive: if NOTHING we return, if
1126	* STOP then we stop. All the rest are applied sequentially,
1127	* meaning if any test passes, the item gets picked up. */
1128
1129	/* if mode is set to pick nothing up, return */
1130
1131	if (op->contr->mode & PU_NOTHING)
1132	return 1;
1133
1134	/* if mode is set to stop when encountering objects, return */
1135	/* take STOP before INHIBIT since it doesn't actually pick
1136	* anything up */
1137
1138	if (op->contr->mode & PU_STOP)
1139	return 0;
1140
1141	/* useful for going into stores and not losing your settings... */
1142	/* and for battles wher you don't want to get loaded down while
1143	* fighting */
1144	if (op->contr->mode & PU_INHIBIT)
1145	return 1;
1146
1147	/* prevent us from turning into auto-thieves :) */
1148	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1149	continue;	1024	continue;
		1025	}
1150		1026
1151	/* ignore known cursed objects */	1027	/* we don't forget dragon food */
1152	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1028	if (op->contr->mode & PU_FLESH)
		1029	if (tmp->type == FLESH)
		1030	{
		1031	CHK_PICK_PICKUP;
1153	continue;	1032	continue;
		1033	}
1154		1034
1155	/* all food and drink if desired */	1035	/* bows and arrows. Bows are good for selling! */
1156	/* question: don't pick up known-poisonous stuff? */	1036	if (op->contr->mode & PU_BOW)
		1037	if (tmp->type == BOW)
		1038	{
		1039	CHK_PICK_PICKUP;
		1040	continue;
		1041	}
		1042
		1043	if (op->contr->mode & PU_ARROW)
		1044	if (tmp->type == ARROW)
		1045	{
		1046	CHK_PICK_PICKUP;
		1047	continue;
		1048	}
		1049
		1050	/* all kinds of armor etc. */
		1051	if (op->contr->mode & PU_ARMOUR)
		1052	if (tmp->type == ARMOUR)
		1053	{
		1054	CHK_PICK_PICKUP;
		1055	continue;
		1056	}
		1057
		1058	if (op->contr->mode & PU_HELMET)
		1059	if (tmp->type == HELMET)
		1060	{
		1061	CHK_PICK_PICKUP;
		1062	continue;
		1063	}
		1064
		1065	if (op->contr->mode & PU_SHIELD)
		1066	if (tmp->type == SHIELD)
		1067	{
		1068	CHK_PICK_PICKUP;
		1069	continue;
		1070	}
		1071
1157	if (op->contr->mode & PU_FOOD)	1072	if (op->contr->mode & PU_BOOTS)
1158	if (tmp->type == FOOD)	1073	if (tmp->type == BOOTS)
		1074	{
		1075	CHK_PICK_PICKUP;
		1076	continue;
		1077	}
		1078
		1079	if (op->contr->mode & PU_GLOVES)
		1080	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1081	{
		1082	CHK_PICK_PICKUP;
		1083	continue;
		1084	}
		1085
		1086	if (op->contr->mode & PU_CLOAK)
		1087	if (tmp->type == CLOAK)
		1088	{
		1089	CHK_PICK_PICKUP;
		1090	continue;
		1091	}
		1092
		1093	/* hoping to catch throwing daggers here */
		1094	if (op->contr->mode & PU_MISSILEWEAPON)
		1095	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
		1096	{
		1097	CHK_PICK_PICKUP;
		1098	continue;
		1099	}
		1100
		1101	/* careful: chairs and tables are weapons! */
		1102	if (op->contr->mode & PU_ALLWEAPON)
		1103	{
		1104	if (tmp->type == WEAPON)
		1105	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1159	{	1106	{
1160	pick_up (op, tmp);	1107	CHK_PICK_PICKUP;
1161	continue;	1108	continue;
1162	}	1109	}
		1110	}
1163		1111
		1112	/* misc stuff that's useful */
1164	if (op->contr->mode & PU_DRINK)	1113	if (op->contr->mode & PU_KEY)
1165	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1114	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1166	{	1115	{
1167	pick_up (op, tmp);	1116	CHK_PICK_PICKUP;
1168	continue;	1117	continue;
1169	}	1118	}
1170		1119
		1120	/* any of the last 4 bits set means we use the ratio for value
		1121	* pickups */
1171	if (op->contr->mode & PU_POTION)	1122	if (op->contr->mode & PU_RATIO)
1172	if (tmp->type == POTION)	1123	{
		1124	/* use value density to decide what else to grab */
		1125	/* >=7 was >= op->contr->mode */
		1126	/* >=7 is the old standard setting. Now we take the last 4 bits
1173	{	1127	*/
1174	pick_up (op, tmp);
1175	continue;
1176	}
1177
1178	/* spellbooks, skillscrolls and normal books/scrolls */
1179	if (op->contr->mode & PU_SPELLBOOK)
1180	if (tmp->type == SPELLBOOK)
1181	{
1182	pick_up (op, tmp);
1183	continue;
1184	}
1185
1186	if (op->contr->mode & PU_SKILLSCROLL)
1187	if (tmp->type == SKILLSCROLL)
1188	{
1189	pick_up (op, tmp);
1190	continue;
1191	}
1192
1193	if (op->contr->mode & PU_READABLES)
1194	if (tmp->type == BOOK || tmp->type == SCROLL)
1195	{
1196	pick_up (op, tmp);
1197	continue;
1198	}
1199
1200	/* wands/staves/rods/horns */
1201	if (op->contr->mode & PU_MAGIC_DEVICE)
1202	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1203	{
1204	pick_up (op, tmp);
1205	continue;
1206	}
1207
1208	/* pick up all magical items */
1209	if (op->contr->mode & PU_MAGICAL)	1128	wvratio = op->contr->mode & PU_RATIO;
1210	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1129	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1211	{
1212	pick_up (op, tmp);
1213	continue;
1214	}
1215
1216	if (op->contr->mode & PU_VALUABLES)
1217	{	1130	{
1218	if (tmp->type == MONEY || tmp->type == GEM)	1131	#if 0
		1132	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1133	if (tmp->name != NULL)
1219	{	1134	{
1220	pick_up (op, tmp);	1135	fprintf (stderr, "%s", tmp->name);
1221	continue;
1222	}	1136	}
1223	}
1224
1225	/* rings & amulets - talismans seems to be typed AMULET */
1226	if (op->contr->mode & PU_JEWELS)
1227	if (tmp->type == RING || tmp->type == AMULET)
1228	{
1229	pick_up (op, tmp);
1230	continue;
1231	}
1232
1233	/* we don't forget dragon food */
1234	if (op->contr->mode & PU_FLESH)
1235	if (tmp->type == FLESH)
1236	{
1237	pick_up (op, tmp);
1238	continue;
1239	}
1240
1241	/* bows and arrows. Bows are good for selling! */
1242	if (op->contr->mode & PU_BOW)
1243	if (tmp->type == BOW)
1244	{
1245	pick_up (op, tmp);
1246	continue;
1247	}
1248
1249	if (op->contr->mode & PU_ARROW)
1250	if (tmp->type == ARROW)
1251	{
1252	pick_up (op, tmp);
1253	continue;
1254	}
1255
1256	/* all kinds of armor etc. */
1257	if (op->contr->mode & PU_ARMOUR)
1258	if (tmp->type == ARMOUR)
1259	{
1260	pick_up (op, tmp);
1261	continue;
1262	}
1263
1264	if (op->contr->mode & PU_HELMET)
1265	if (tmp->type == HELMET)
1266	{
1267	pick_up (op, tmp);
1268	continue;
1269	}
1270
1271	if (op->contr->mode & PU_SHIELD)
1272	if (tmp->type == SHIELD)
1273	{
1274	pick_up (op, tmp);
1275	continue;
1276	}
1277
1278	if (op->contr->mode & PU_BOOTS)
1279	if (tmp->type == BOOTS)
1280	{
1281	pick_up (op, tmp);
1282	continue;
1283	}
1284
1285	if (op->contr->mode & PU_GLOVES)
1286	if (tmp->type == GLOVES)
1287	{
1288	pick_up (op, tmp);
1289	continue;
1290	}
1291
1292	if (op->contr->mode & PU_CLOAK)
1293	if (tmp->type == CLOAK)
1294	{
1295	pick_up (op, tmp);
1296	continue;
1297	}
1298
1299	/* hoping to catch throwing daggers here */
1300	if (op->contr->mode & PU_MISSILEWEAPON)
1301	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1302	{
1303	pick_up (op, tmp);
1304	continue;
1305	}
1306
1307	/* careful: chairs and tables are weapons! */
1308	if (op->contr->mode & PU_ALLWEAPON)
1309	{
1310	if (tmp->type == WEAPON && tmp->name != NULL)
1311	{
1312	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1313	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1314	{
1315	pick_up (op, tmp);
1316	continue;
1317	}
1318	}
1319
1320	if (tmp->type == WEAPON && tmp->name == NULL)
1321	{
1322	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1323	{
1324	pick_up (op, tmp);
1325	continue;
1326	}
1327	}
1328	}
1329
1330	/* misc stuff that's useful */
1331	if (op->contr->mode & PU_KEY)
1332	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1333	{
1334	pick_up (op, tmp);
1335	continue;
1336	}
1337
1338	/* any of the last 4 bits set means we use the ratio for value
1339	* pickups */
1340	if (op->contr->mode & PU_RATIO)
1341	{
1342	/* use value density to decide what else to grab */
1343	/* >=7 was >= op->contr->mode */
1344	/* >=7 is the old standard setting. Now we take the last 4 bits
1345	* and multiply them by 5, giving 0..15*5== 5..75 */
1346	wvratio = (op->contr->mode & PU_RATIO) * 5;
1347	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1348	{
1349	pick_up (op, tmp);
1350	#if 0
1351	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1352	if (tmp->name != NULL)
1353	{
1354	fprintf (stderr, "%s", tmp->name);
1355	}
1356	else	1137	else
1357	fprintf (stderr, "%s", tmp->arch->archname);	1138	fprintf (stderr, "%s", tmp->arch->archname);
1358	fprintf (stderr, ",%d] = ", tmp->type);	1139	fprintf (stderr, ",%d] = ", tmp->type);
1359	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1140	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1360	#endif	1141	#endif
		1142	CHK_PICK_PICKUP;
1361	continue;	1143	continue;
1362	}
1363	}	1144	}
1364	} /* the new pickup model */	1145	} /* the new pickup model */
1365	}	1146	}
1366		1147
1367	return !stop;	1148	return !stop;
		1149	}
		1150
		1151	/* routine for both players and monsters. We call this when
		1152	* there is a possibility for our action distrubing our hiding
		1153	* place or invisiblity spell. Artefact invisiblity causes
		1154	* "noise" instead. If we arent invisible to begin with, we
		1155	* return 0.
		1156	*/
		1157	static int
		1158	action_makes_visible (object *op)
		1159	{
		1160	if (op->invisible && op->flag [FLAG_ALIVE])
		1161	{
		1162	if (op->flag [FLAG_MAKE_INVIS])
		1163	{
		1164	// artefact invisibility is permanent, but we still make noise
		1165	// this is important for game-balance.
		1166	if (op->contr)
		1167	op->make_noise ();
		1168
		1169	return 0;
		1170	}
		1171
		1172	if (op->contr && op->contr->tmp_invis == 0)
		1173	return 0;
		1174
		1175	/* If monsters, they should become visible */
		1176	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1177	{
		1178	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1179	return 1;
		1180	}
		1181	}
		1182
		1183	return 0;
1368	}	1184	}
1369		1185
1370	/*	1186	/*
1371	* Find an arrow in the inventory and after that	1187	* Find an arrow in the inventory and after that
1372	* in the right type container (quiver). Pointer to the	1188	* in the right type container (quiver). Pointer to the
1373	* found object is returned.	1189	* found object is returned.
1374	*/	1190	*/
1375	object *	1191	static object *
1376	find_arrow (object *op, const char *type)	1192	find_arrow (object *op, const char *type)
1377	{	1193	{
1378	object *tmp = 0;
1379
1380	for (op = op->inv; op; op = op->below)	1194	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1381	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1382	tmp = find_arrow (op, type);
1383	else if (op->type == ARROW && op->race == type)	1195	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1196	return splay (tmp);
		1197
		1198	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1199	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
		1200	if (object *arrow = find_arrow (tmp, type))
		1201	{
		1202	splay (tmp);
1384	return op;	1203	return arrow;
		1204	}
1385		1205
1386	return tmp;	1206	return 0;
1387	}	1207	}
1388		1208
1389	/*	1209	/*
1390	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1210	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1391	* against the target. A full test is not performed, simply a basic test	1211	* against the target. A full test is not performed, simply a basic test
1392	* of resistances. The archer is making a quick guess at what he sees down	1212	* of resistances. The archer is making a quick guess at what he sees down
1393	* the hall. Failing that it does it's best to pick the highest plus arrow.	1213	* the hall. Failing that it does it's best to pick the highest plus arrow.
1394	*/	1214	*/
1395	object *	1215	static object *
1396	find_better_arrow (object *op, object *target, const char *type, int *better)	1216	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1397	{	1217	{
1398	object *tmp = NULL, *arrow, *ntmp;	1218	object *tmp = NULL, *arrow, *ntmp;
1399	int attacknum, attacktype, betterby = 0, i;	1219	int attacknum, attacktype, betterby = 0, i;
1400		1220
1401	if (!type)	1221	if (!type)
1402	return NULL;	1222	return NULL;
1403		1223
1404	for (arrow = op->inv; arrow; arrow = arrow->below)	1224	for (arrow = op->inv; arrow; arrow = arrow->below)
1405	{	1225	{
1406	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1226	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1407	{	1227	{
1408	i = 0;	1228	i = 0;
1409	ntmp = find_better_arrow (arrow, target, type, &i);	1229	ntmp = find_better_arrow (arrow, target, type, &i);
		1230
1410	if (i > betterby)	1231	if (i > betterby)
1411	{	1232	{
1412	tmp = ntmp;	1233	tmp = ntmp;
1413	betterby = i;	1234	betterby = i;
1414	}	1235	}
1415	}	1236	}
1416	else if (arrow->type == ARROW && arrow->race == type)	1237	else if (arrow->type == ARROW && arrow->race == type)
1417	{	1238	{
1418	/* allways prefer assasination/slaying */	1239	/* allways prefer assasination/slaying */
1419	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1240	if (target->race && arrow->slaying.contains (target->race))
1420	{	1241	{
1421	if (arrow->attacktype & AT_DEATH)	1242	if (arrow->attacktype & AT_DEATH)
1422	{	1243	{
1423	*better = 100;	1244	*better = 100;
1424	return arrow;	1245	return arrow;
…		…
1439	{	1260	{
1440	tmp = arrow;	1261	tmp = arrow;
1441	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1262	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1442	}	1263	}
1443	}	1264	}
		1265
1444	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1266	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1445	{	1267	{
1446	tmp = arrow;	1268	tmp = arrow;
1447	betterby = 2 + arrow->magic + arrow->stats.dam;	1269	betterby = 2 + arrow->magic + arrow->stats.dam;
1448	}	1270	}
		1271
1449	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1272	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1450	{	1273	{
1451	tmp = arrow;	1274	tmp = arrow;
1452	betterby = 1 + arrow->magic + arrow->stats.dam;	1275	betterby = 1 + arrow->magic + arrow->stats.dam;
1453	}	1276	}
1454	}	1277	}
1455	}	1278	}
1456	}	1279	}
		1280
1457	if (tmp == NULL && arrow == NULL)	1281	if (tmp == NULL && arrow == NULL)
1458	return find_arrow (op, type);	1282	return find_arrow (op, type);
1459		1283
1460	*better = betterby;	1284	*better = betterby;
1461	return tmp;	1285	return tmp;
…		…
1465	* find_better_arrow to find a decent arrow to use.	1289	* find_better_arrow to find a decent arrow to use.
1466	* op = the shooter	1290	* op = the shooter
1467	* type = bow->race	1291	* type = bow->race
1468	* dir = fire direction	1292	* dir = fire direction
1469	*/	1293	*/
1470	object *	1294	static object *
1471	pick_arrow_target (object *op, const char *type, int dir)	1295	pick_arrow_target (object *op, shstr_cmp type, int dir)
1472	{	1296	{
1473	object *tmp = NULL;	1297	object *tmp = NULL;
1474	maptile *m;	1298	maptile *m;
1475	int i, mflags, found, number;	1299	int i, mflags, found, number;
1476	sint16 x, y;	1300	sint16 x, y;
…		…
1491	for (i = 0, found = 0; i < 20; i++)	1315	for (i = 0, found = 0; i < 20; i++)
1492	{	1316	{
1493	x += freearr_x[dir];	1317	x += freearr_x[dir];
1494	y += freearr_y[dir];	1318	y += freearr_y[dir];
1495	mflags = get_map_flags (m, &m, x, y, &x, &y);	1319	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1320
1496	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1321	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1497	{	1322	{
1498	tmp = NULL;	1323	tmp = 0;
1499	break;	1324	break;
1500	}	1325	}
1501	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1326	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1502	{	1327	{
1503	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1328	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1504	* perhaps a bad assumption.	1329	* perhaps a bad assumption.
1505	*/	1330	*/
1506	tmp = NULL;	1331	tmp = 0;
1507	break;	1332	break;
1508	}	1333	}
		1334
1509	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1510	{
1511	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1336	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1512	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1337	if (tmp->flag [FLAG_ALIVE])
1513	{
1514	found++;
1515	break;
1516	}
1517	if (found)
1518	break;	1338	break;
1519	}
1520	}	1339	}
1521	if (tmp == NULL)	1340
		1341	if (!tmp)
1522	return find_arrow (op, type);	1342	return find_arrow (op, type);
1523		1343
1524	if (tmp->head)	1344	if (tmp->head)
1525	tmp = tmp->head;	1345	tmp = tmp->head;
1526		1346
…		…
1566	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1386	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567	return 0;	1387	return 0;
1568	}	1388	}
1569		1389
1570	// optimisation: move object to top so we will find it quickly again	1390	// optimisation: move object to top so we will find it quickly again
1571	if (bow->below)	1391	splay (bow);
1572	{
1573	bow->remove ();
1574	op->insert (bow);
1575	}
1576
1577	}	1392	}
1578		1393
1579	if (!bow->race || !bow->skill)	1394	if (!bow->race || !bow->skill)
1580	{	1395	{
1581	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1396	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1588	{	1403	{
1589	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
1590	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1405	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1591	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1406	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1592	else	1407	else
1593	CLEAR_FLAG (op, FLAG_READY_BOW);	1408	op->clr_flag (FLAG_READY_BOW);
1594		1409
1595	return 0;	1410	return 0;
1596	}	1411	}
1597	}	1412	}
1598		1413
…		…
1607	}	1422	}
1608		1423
1609	/* this should not happen, but sometimes does */	1424	/* this should not happen, but sometimes does */
1610	if (arrow->nrof == 0)	1425	if (arrow->nrof == 0)
1611	{	1426	{
		1427	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1612	arrow->destroy ();	1428	arrow->destroy ();
1613	return 0;	1429	return 0;
1614	}	1430	}
1615		1431
1616	left = arrow; /* these are arrows left to the player */	1432	left = arrow; /* these are arrows left to the player */
1617	arrow = get_split_ob (arrow, 1);	1433	arrow = arrow->split ();
1618	if (!arrow)	1434	if (!arrow)
1619	{	1435	{
1620	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1436	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1621	return 0;	1437	return 0;
1622	}	1438	}
…		…
1626	arrow->direction = dir;	1442	arrow->direction = dir;
1627		1443
1628	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1444	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1629	arrow->stats.hp = arrow->stats.dam;	1445	arrow->stats.hp = arrow->stats.dam;
1630	arrow->stats.grace = arrow->attacktype;	1446	arrow->stats.grace = arrow->attacktype;
1631		1447	arrow->custom_name = arrow->slaying;
1632	if (arrow->slaying)
1633	arrow->spellarg = strdup (arrow->slaying);
1634		1448
1635	#if 0	1449	#if 0
1636	if (player *pl = op->contr)	1450	if (player *pl = op->contr)
1637	{	1451	{
1638	float speed = pl->weapon_sp;	1452	float speed = pl->weapon_sp;
…		…
1648	#endif	1462	#endif
1649		1463
1650	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1651		1465
1652	/* update the speed */	1466	/* update the speed */
1653	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1654	+ bow->stats.dam / 7.f;
1655		1467
1656	arrow->set_speed (max (arrow->speed, 2.f));
1657	arrow->speed_left = 0;	1468	arrow->speed_left = 0;
		1469	arrow->set_speed (max (2.f,
		1470	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1471	+ bow->stats.dam / 7.f
		1472	));
1658		1473
1659	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1474	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1660		1475
1661	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1662	{	1477	{
…		…
1683	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1498	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1684		1499
1685	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1500	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686	arrow->move_type = MOVE_FLY_LOW;	1501	arrow->move_type = MOVE_FLY_LOW;
1687	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1502	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
		1503	arrow->set_flag (FLAG_NO_PICK);
1688		1504
1689	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1505	op->play_sound (sound_find ("fire_arrow"));
1690	m->insert (arrow, sx, sy, op);	1506	m->insert (arrow, sx, sy, op);
1691		1507
1692	if (!arrow->destroyed ())	1508	if (!arrow->destroyed ())
1693	move_arrow (arrow);	1509	move_arrow (arrow);
1694
1695	if (op->type == PLAYER)
1696	{
1697	if (left->destroyed ())
1698	esrv_del_item (op->contr, left->count);
1699	else
1700	esrv_send_item (op, left);
1701	}
1702		1510
1703	return 1;	1511	return 1;
1704	}	1512	}
1705		1513
1706	/* Special fire code for players - this takes into	1514	/* Special fire code for players - this takes into
…		…
1708	* but monsters can't. Putting that code here	1516	* but monsters can't. Putting that code here
1709	* makes the fire_bow code much cleaner.	1517	* makes the fire_bow code much cleaner.
1710	* this function should only be called if 'op' is a player,	1518	* this function should only be called if 'op' is a player,
1711	* hence the function name.	1519	* hence the function name.
1712	*/	1520	*/
1713	int	1521	static int
1714	player_fire_bow (object *op, int dir)	1522	player_fire_bow (object *op, int dir)
1715	{	1523	{
1716	int ret = 0, wcmod = 0;	1524	int ret;
1717		1525
1718	if (op->contr->bowtype == bow_bestarrow)	1526	if (op->contr->bowtype == bow_bestarrow)
1719	{	1527	{
1720	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1528	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1721	}	1529	}
1722	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1530	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1723	{	1531	{
1724	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1532	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1725	wcmod = -1;
1726
1727	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1533	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1728	}	1534	}
1729	else if (op->contr->bowtype == bow_threewide)	1535	else if (op->contr->bowtype == bow_threewide)
1730	{	1536	{
1731	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1537	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1732	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1538	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1733	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1539	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1734	}	1540	}
1735	else if (op->contr->bowtype == bow_spreadshot)	1541	else if (op->contr->bowtype == bow_spreadshot)
1736	{	1542	{
1737	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1543	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1738	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1544	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1739	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1545	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1740	}	1546	}
1741	else	1547	else
1742	{	1548	{
…		…
1748	}	1554	}
1749		1555
1750	/* Fires a misc (wand/rod/horn) object in 'dir'.	1556	/* Fires a misc (wand/rod/horn) object in 'dir'.
1751	* Broken apart from 'fire' to keep it more readable.	1557	* Broken apart from 'fire' to keep it more readable.
1752	*/	1558	*/
1753	void	1559	static void
1754	fire_misc_object (object *op, int dir)	1560	fire_misc_object (object *op, int dir)
1755	{	1561	{
1756	object *item = op->contr->ranged_ob;	1562	object *item = op->contr->ranged_ob;
1757		1563
1758	if (!item)	1564	if (!item)
…		…
1765	{	1571	{
1766	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1572	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1767	return;	1573	return;
1768	}	1574	}
1769		1575
1770	if (!op->change_weapon (item))	1576	if (!op->apply (item))
1771	return;	1577	return;
1772		1578
1773	if (item->type == WAND)	1579	if (item->type == WAND)
1774	{	1580	{
1775	if (item->stats.food <= 0)	1581	if (item->stats.food <= 0)
1776	{	1582	{
1777	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1583	op->contr->play_sound (sound_find ("wand_poof"));
1778	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1584	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1779		1585
1780	return;	1586	return;
1781	}	1587	}
1782	}	1588	}
1783	else if (item->type == ROD || item->type == HORN)	1589	else if (item->type == ROD || item->type == HORN)
1784	{	1590	{
1785	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1591	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
		1592
		1593	// using the maximum of the rods charge allows at least one spell cast
		1594	// for a rod or horn, this fixes some broken rods.
		1595	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1786	{	1596	{
1787	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1597	op->contr->play_sound (sound_find ("wand_poof"));
1788		1598
1789	if (item->type == ROD)	1599	if (item->type == ROD)
1790	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1600	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1791	else	1601	else
1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1602	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1795	}	1605	}
1796	}	1606	}
1797		1607
1798	if (cast_spell (op, item, dir, item->inv, NULL))	1608	if (cast_spell (op, item, dir, item->inv, NULL))
1799	{	1609	{
1800	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1610	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1611
1801	if (item->type == WAND)	1612	if (item->type == WAND)
1802	{	1613	{
1803	if (!(--item->stats.food))	1614	if (!(--item->stats.food))
1804	{	1615	{
1805	object *tmp;
1806
1807	if (item->arch)	1616	if (item->arch)
1808	{	1617	{
1809	CLEAR_FLAG (item, FLAG_ANIMATE);	1618	item->clr_flag (FLAG_ANIMATE);
1810	item->face = item->arch->face;	1619	item->face = item->arch->face;
1811	item->set_speed (0);	1620	item->set_speed (0);
1812	}	1621	}
1813		1622
1814	if ((tmp = item->in_player ()))	1623	if (object *pl = item->visible_to ())
1815	esrv_update_item (UPD_ANIM, tmp, item);	1624	esrv_update_item (UPD_ANIM, pl, item);
1816	}	1625	}
1817	}	1626	}
1818	else if (item->type == ROD || item->type == HORN)	1627	else if (item->type == ROD || item->type == HORN)
1819	drain_rod_charge (item);	1628	drain_rod_charge (item);
1820	}	1629	}
1821	}	1630	}
1822		1631
1823	/* Received a fire command for the player - go and do it.	1632	/* Received a fire command for the player - go and do it.
1824	*/	1633	*/
1825	bool	1634	bool
1826	fire (object *op, int dir)	1635	fire (object *who, int dir)
1827	{	1636	{
1828	int spellcost = 0;	1637	int spellcost = 0;
1829		1638
1830	/* check for loss of invisiblity/hide */
1831	if (action_makes_visible (op))
1832	make_visible (op);
1833
1834	player *pl = op->contr;	1639	player *pl = who->contr;
1835		1640
1836	if (pl->golem)	1641	if (pl->golem)
1837	{	1642	{
1838	control_golem (op->contr->golem, dir);	1643	control_golem (who->contr->golem, dir);
1839	return false;	1644	return false;
1840	}	1645	}
1841		1646
1842	object *ob = pl->ranged_ob;	1647	object *ob = pl->ranged_ob;
1843		1648
1844	if (!ob)	1649	if (!ob)
1845	return false;	1650	return false;
1846		1651
1847	if (!op->change_weapon (ob))
1848	return false;
1849
1850	if (op->speed_left > 0.f)	1652	if (who->speed_left > 0.f)
1851	--op->speed_left;	1653	--who->speed_left;
1852	else	1654	else
1853	return false;	1655	return false;
1854		1656
		1657	if (!who->apply (ob))
		1658	return false;
		1659
		1660	/* check for loss of invisiblity/hide */
		1661	if (action_makes_visible (who))
		1662	make_visible (who);
		1663
1855	switch (ob->type)	1664	switch (ob->type)
1856	{	1665	{
1857	case BOW:	1666	case BOW:
1858	player_fire_bow (op, dir);	1667	player_fire_bow (who, dir);
1859	break;	1668	break;
1860		1669
1861	case SPELL:	1670	case SPELL:
1862	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1671	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1863	break;	1672	break;
1864		1673
1865	case BUILDER:	1674	case BUILDER:
1866	apply_map_builder (op, dir);	1675	apply_map_builder (who, dir);
1867	break;	1676	break;
1868		1677
1869	case SKILL:	1678	case SKILL:
1870	do_skill (op, op, ob, dir, 0);	1679	do_skill (who, who, ob, dir, 0);
1871	break;	1680	break;
1872		1681
		1682	case RANGED:
		1683	do_skill (who, ob, who->chosen_skill, dir, 0);
		1684	break;
		1685
1873	default:	1686	default:
1874	fire_misc_object (op, dir);	1687	fire_misc_object (who, dir);
1875	break;	1688	break;
1876	}	1689	}
1877		1690
1878	return true;	1691	return true;
1879	}	1692	}
1880		1693
1881	/* find_key	1694	static object *
1882	* We try to find a key for the door as passed. If we find a key
1883	* and successfully use it, we return the key, otherwise NULL
1884	* This function merges both normal and locked door, since the logic
1885	* for both is the same - just the specific key is different.
1886	* pl is the player,
1887	* inv is the objects inventory to searched
1888	* door is the door we are trying to match against.
1889	* This function can be called recursively to search containers.
1890	*/
1891	object *
1892	find_key (object *pl, object *container, object *door)	1695	find_key_ (object *pl, object *container, object *door)
1893	{	1696	{
1894	object *tmp, *key;	1697	object *tmp, *key;
1895		1698
1896	/* Should not happen, but sanity checking is never bad */	1699	/* Should not happen, but sanity checking is never bad */
1897	if (!container->inv)	1700	if (!container->inv)
…		…
1900	/* First, lets try to find a key in the top level inventory */	1703	/* First, lets try to find a key in the top level inventory */
1901	for (tmp = container->inv; tmp; tmp = tmp->below)	1704	for (tmp = container->inv; tmp; tmp = tmp->below)
1902	{	1705	{
1903	if (door->type == DOOR && tmp->type == KEY)	1706	if (door->type == DOOR && tmp->type == KEY)
1904	break;	1707	break;
		1708
1905	/* For sanity, we should really check door type, but other stuff	1709	/* For sanity, we should really check door type, but other stuff
1906	* (like containers) can be locked with special keys	1710	* (like containers) can be locked with special keys
1907	*/	1711	*/
1908	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1712	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1909	break;	1713	break;
…		…
1915	* a key, return	1719	* a key, return
1916	*/	1720	*/
1917	if (!tmp)	1721	if (!tmp)
1918	{	1722	{
1919	for (tmp = container->inv; tmp; tmp = tmp->below)	1723	for (tmp = container->inv; tmp; tmp = tmp->below)
1920	{
1921	/* No reason to search empty containers */	1724	/* No reason to search empty containers */
1922	if (tmp->type == CONTAINER && tmp->inv)	1725	if (tmp->type == CONTAINER && tmp->inv)
1923	{
1924	if ((key = find_key (pl, tmp, door)))	1726	if ((key = find_key_ (pl, tmp, door)))
1925	return key;	1727	return key;
1926	}
1927	}
1928		1728
1929	if (!tmp)	1729	if (!tmp)
1930	return NULL;	1730	return 0;
1931	}	1731	}
1932		1732
1933	/* We get down here if we have found a key. Now if its in a container,	1733	/* We get down here if we have found a key. Now if its in a container,
1934	* see if we actually want to use it	1734	* see if we actually want to use it
1935	*/	1735	*/
1936	if (pl != container)	1736	if (pl != container)
1937	{	1737	{
1938	/* Only let players use keys in containers */	1738	/* Only let players use keys in containers */
1939	if (!pl->contr)	1739	if (!pl->contr)
1940	return NULL;	1740	return 0;
		1741
1941	/* cases where this fails:	1742	/* cases where this fails:
1942	* If we only search the player inventory, return now since we	1743	* If we only search the player inventory, return now since we
1943	* are not in the players inventory.	1744	* are not in the players inventory.
1944	* If the container is not active, return now since only active	1745	* If the container is not active, return now since only active
1945	* containers can be used.	1746	* containers can be used.
…		…
1949	* inv must have been an container and must have been active.	1750	* inv must have been an container and must have been active.
1950	*	1751	*
1951	* Change the color so that the message doesn't disappear with	1752	* Change the color so that the message doesn't disappear with
1952	* all the others.	1753	* all the others.
1953	*/	1754	*/
1954	if (pl->contr->usekeys == key_inventory ||	1755	if (pl->contr->usekeys == key_inventory
1955	!QUERY_FLAG (container, FLAG_APPLIED) ||	1756	|| !container->flag [FLAG_APPLIED]
1956	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1757	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1957	{	1758	{
1958	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1759	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1959	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1760	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1960	return NULL;	1761	return NULL;
1961	}	1762	}
1962	}	1763	}
1963		1764
1964	return tmp;	1765	return tmp;
		1766	}
		1767
		1768	/* find_key
		1769	* We try to find a key for the door as passed. If we find a key
		1770	* and successfully use it, we return the key, otherwise NULL
		1771	* This function merges both normal and locked door, since the logic
		1772	* for both is the same - just the specific key is different.
		1773	* pl is the player,
		1774	* inv is the objects inventory to searched
		1775	* door is the door we are trying to match against.
		1776	* This function can be called recursively to search containers.
		1777	*/
		1778	object *
		1779	find_key (object *pl, object *container, object *door)
		1780	{
		1781	if (door->slaying && is_match_expr (door->slaying))
		1782	{
		1783	// for match expressions, we try to find the key by applying the match
		1784	// to the op itself, which is supposed to find the "key", instead
		1785	// of searching through containers ourselves.
		1786
		1787	return match_one (door->slaying, container, door, pl, pl);
		1788	}
		1789	else
		1790	return find_key_ (pl, container, door);
1965	}	1791	}
1966		1792
1967	/* moved door processing out of move_player_attack.	1793	/* moved door processing out of move_player_attack.
1968	* returns 1 if player has opened the door with a key	1794	* returns 1 if player has opened the door with a key
1969	* such that the caller should not do anything more,	1795	* such that the caller should not do anything more,
…		…
1981	/* If we found a key, do some extra work */	1807	/* If we found a key, do some extra work */
1982	if (key)	1808	if (key)
1983	{	1809	{
1984	object *container = key->env;	1810	object *container = key->env;
1985		1811
1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1987
1988	if (action_makes_visible (op))	1812	if (action_makes_visible (op))
1989	make_visible (op);	1813	make_visible (op);
1990		1814
1991	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1815	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1992	spring_trap (door->inv, op);	1816	spring_trap (door->inv, op);
1993		1817
1994	if (door->type == DOOR)	1818	if (door->type == DOOR)
1995	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1819	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1996	else if (door->type == LOCKED_DOOR)	1820	else if (door->type == LOCKED_DOOR)
1997	{	1821	{
1998	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1822	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1999	remove_door2 (door); /* remove door without violence ;-) */	1823	remove_door2 (door); /* remove door without violence ;-) */
2000	}	1824	}
2001		1825
2002	/* Do this after we print the message */	1826	/* Do this after we print the message */
2003	decrease_ob (key); /* Use up one of the keys */	1827	key->decrease (); /* Use up one of the keys */
2004	/* Need to update the weight the container the key was in */
2005	if (container != op)
2006	esrv_update_item (UPD_WEIGHT, op, container);
2007		1828
2008	return 1; /* Nothing more to do below */	1829	return 1; /* Nothing more to do below */
2009	}	1830	}
2010	else if (door->type == LOCKED_DOOR)	1831	else if (door->type == LOCKED_DOOR)
2011	{	1832	{
2012	/* Might as well return now - no other way to open this */	1833	/* Might as well return now - no other way to open this */
2013	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1834	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2014	return 1;	1835	return 1;
2015	}	1836	}
2016		1837
2017	return 0;	1838	return 0;
2018	}	1839	}
…		…
2024	* going to try and move (not fire weapons).	1845	* going to try and move (not fire weapons).
2025	*/	1846	*/
2026	bool	1847	bool
2027	move_player_attack (object *op, int dir)	1848	move_player_attack (object *op, int dir)
2028	{	1849	{
2029	int on_battleground;	1850	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1851	{
		1852	--op->speed_left;
		1853	return true;
		1854	}
2030		1855
2031	sint16 nx = freearr_x[dir] + op->x;	1856	sint16 nx = freearr_x[dir] + op->x;
2032	sint16 ny = freearr_y[dir] + op->y;	1857	sint16 ny = freearr_y[dir] + op->y;
2033		1858
2034	on_battleground = op_on_battleground (op, 0, 0);
2035
2036	if (out_of_map (op->map, nx, ny))	1859	if (out_of_map (op->map, nx, ny))
2037	return false;	1860	return false;
2038
2039	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2040	{
2041	--op->speed_left;
2042	return true;
2043	}
2044		1861
2045	/* If braced, or can't move to the square, and it is not out of the	1862	/* If braced, or can't move to the square, and it is not out of the
2046	* map, attack it. Note order of if statement is important - don't	1863	* map, attack it. Note order of if statement is important - don't
2047	* want to be calling move_ob if braced, because move_ob will move the	1864	* want to be calling move_ob if braced, because move_ob will move the
2048	* player. This is a pretty nasty hack, because if we could	1865	* player. This is a pretty nasty hack, because if we could
…		…
2066	|| mon->flag [FLAG_CAN_ROLL])	1883	|| mon->flag [FLAG_CAN_ROLL])
2067	&& mon != op)	1884	&& mon != op)
2068	break;	1885	break;
2069	}	1886	}
2070		1887
2071	if (!mon) /* This happens anytime the player tries to move */	1888	/* no monster == player tries to move into a wall or so */
2072	return false; /* into a wall */	1889	if (!mon)
		1890	{
		1891	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1892	if (op->move_type & ob->move_block)
		1893	{
		1894	if (ob->move_block == MOVE_ALL)
		1895	move_into_wall (op, ob);
		1896	else
		1897	{
		1898	if (op->contr->ns->bumpmsg)
		1899	{
		1900	op->play_sound (sound_find ("blocked_move"));
		1901
		1902	op->statusmsg (ob->invisible
		1903	? "Something blocks you."
		1904	: format ("Something blocks you from entering the %s.", query_name (ob))
		1905	);
		1906	}
		1907	}
		1908
		1909	break;
		1910	}
		1911
		1912	return false;
		1913	}
2073		1914
2074	mon = mon->head_ ();	1915	mon = mon->head_ ();
2075		1916
2076	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1917	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2077	if (op->contr->weapon_sp_left > 0.f)	1918	if (op->contr->weapon_sp_left > 0.f)
…		…
2095	*/	1936	*/
2096	if (op->type == PLAYER	1937	if (op->type == PLAYER
2097	&& ((mon->owner && mon->owner->contr	1938	&& ((mon->owner && mon->owner->contr
2098	&& same_party (mon->owner->contr->party, op->contr->party))	1939	&& same_party (mon->owner->contr->party, op->contr->party))
2099	|| mon->owner == op)	1940	|| mon->owner == op)
2100	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1941	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
2101	{	1942	{
2102	/* If we're braced, we don't want to switch places with it */	1943	/* If we're braced, we don't want to switch places with it */
2103	if (op->contr->braced)	1944	if (op->contr->braced)
2104	return false;	1945	return false;
2105		1946
2106	if (op->speed_left > 0.f)	1947	if (op->speed_left > 0.f)
2107	{	1948	{
2108	--op->speed_left;	1949	--op->speed_left;
2109		1950
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1951	op->play_sound (sound_find ("push_player"));
2111	push_ob (mon, dir, op);	1952	push_ob (mon, dir, op);
2112		1953
2113	if (op->contr->tmp_invis || op->hide)	1954	if (action_makes_visible (op))
2114	make_visible (op);	1955	make_visible (op);
2115		1956
2116	return true;	1957	return true;
2117	}	1958	}
2118	else	1959	else
2119	return false;	1960	return false;
2120	}	1961	}
		1962
		1963	bool on_battleground = op_on_battleground (op, 0, 0);
2121		1964
2122	/* in certain circumstances, you shouldn't attack friendly	1965	/* in certain circumstances, you shouldn't attack friendly
2123	* creatures. Note that if you are braced, you can't push	1966	* creatures. Note that if you are braced, you can't push
2124	* someone, but put it inside this loop so that you won't	1967	* someone, but put it inside this loop so that you won't
2125	* attack them either.	1968	* attack them either.
2126	*/	1969	*/
2127	if ((mon->type == PLAYER || mon->enemy != op)	1970	if ((mon->type == PLAYER || mon->enemy != op)
2128	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1971	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2129	&& ((op->contr->peaceful	1972	&& ((op->contr->peaceful
2130	|| (mon->type == PLAYER && mon->contr->peaceful))	1973	|| (mon->type == PLAYER && mon->contr->peaceful))
2131	&& !on_battleground))	1974	&& !on_battleground))
2132	{	1975	{
2133	if (op->speed_left > 0.f)	1976	if (op->speed_left > 0.f)
2134	{	1977	{
2135	--op->speed_left;	1978	--op->speed_left;
2136		1979
2137	if (!op->contr->braced)	1980	if (!op->contr->braced)
2138	{	1981	{
2139	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1982	op->play_sound (sound_find ("push_player"));
2140	push_ob (mon, dir, op);	1983	push_ob (mon, dir, op);
2141	}	1984	}
2142	else	1985	else
2143	new_draw_info (0, 0, op, "You withhold your attack");	1986	op->statusmsg ("You withhold your attack");
2144		1987
2145	if (op->contr->tmp_invis || op->hide)	1988	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2146	make_visible (op);	1989	make_visible (op);
2147		1990
2148	return true;	1991	return true;
2149	}	1992	}
2150	}	1993	}
2151	/* If the object is a boulder or other rollable object, then	1994	/* If the object is a boulder or other rollable object, then
2152	* roll it if not braced. You can't roll it if you are braced.	1995	* roll it if not braced. You can't roll it if you are braced.
2153	*/	1996	*/
2154	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1997	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2155	{	1998	{
2156	if (op->speed_left > 0.f)	1999	if (op->speed_left > 0.f)
2157	{	2000	{
2158	--op->speed_left;	2001	--op->speed_left;
2159		2002
…		…
2168	* Way it works is like this: First, it must have some hit points	2011	* Way it works is like this: First, it must have some hit points
2169	* and be living. Then, it must be one of the following:	2012	* and be living. Then, it must be one of the following:
2170	* 1) Not a player, 2) A player, but of a different party. Note	2013	* 1) Not a player, 2) A player, but of a different party. Note
2171	* that party_number -1 is no party, so attacks can still happen.	2014	* that party_number -1 is no party, so attacks can still happen.
2172	*/	2015	*/
2173	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2016	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2174	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2017	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2175	{	2018	{
2176	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2019	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2177	{	2020	{
2178	--op->contr->weapon_sp_left;	2021	--op->contr->weapon_sp_left;
…		…
2190	}	2033	}
2191		2034
2192	bool	2035	bool
2193	move_player (object *op, int dir)	2036	move_player (object *op, int dir)
2194	{	2037	{
2195	int pick;
2196
2197	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2038	if (!op->map || op->map->state != MAP_ACTIVE)
2198	return 0;	2039	return 0;
2199		2040
2200	/* Sanity check: make sure dir is valid */	2041	/* Sanity check: make sure dir is valid */
2201	if ((dir < 0) || (dir >= 9))	2042	if (dir < 0 || dir > 8)
2202	{	2043	{
2203	LOG (llevError, "move_player: invalid direction %d\n", dir);	2044	LOG (llevError, "move_player: invalid direction %d\n", dir);
2204	return 0;	2045	return 0;
2205	}	2046	}
2206		2047
2207	/* peterm: added following line */	2048	/* peterm: added following line */
2208	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2049	if (op->flag [FLAG_CONFUSED] && dir)
2209	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2050	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2210		2051
2211	op->facing = dir;	2052	op->facing = dir;
2212		2053
2213	if (op->hide)	2054	if (op->flag [FLAG_HIDDEN])
2214	do_hidden_move (op);	2055	do_hidden_move (op);
2215		2056
2216	bool retval;	2057	bool retval;
		2058	int pick = 0;
2217		2059
2218	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2060	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2219	retval = RESULT_INT (0);	2061	retval = RESULT_INT (0);
2220	else if (op->contr->fire_on)	2062	else if (op->contr->fire_on)
2221	retval = fire (op, dir);	2063	retval = fire (op, dir);
…		…
2252	* players.	2094	* players.
2253	*/	2095	*/
2254	bool	2096	bool
2255	handle_newcs_player (object *op)	2097	handle_newcs_player (object *op)
2256	{	2098	{
2257	if (QUERY_FLAG (op, FLAG_SCARED))	2099	if (op->flag [FLAG_SCARED])
2258	{	2100	{
2259	if (op->speed_left > 0.f)	2101	if (op->speed_left > 0.f)
2260	{	2102	{
2261	--op->speed_left;	2103	--op->speed_left;
2262	flee_player (op);	2104	flee_player (op);
…		…
2278	return move_player (op, op->direction);	2120	return move_player (op, op->direction);
2279		2121
2280	return false;	2122	return false;
2281	}	2123	}
2282		2124
2283	int	2125	static int
2284	save_life (object *op)	2126	save_life (object *op)
2285	{	2127	{
2286	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2128	if (!op->flag [FLAG_LIFESAVE])
2287	return 0;	2129	return 0;
2288		2130
2289	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2131	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2290	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2132	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2291	{	2133	{
2292	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2134	op->play_sound (sound_find ("ob_evaporate"));
2293	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2135	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2294		2136
2295	if (op->contr)
2296	esrv_del_item (op->contr, tmp->count);
2297
2298	tmp->destroy ();	2137	tmp->destroy ();
2299	CLEAR_FLAG (op, FLAG_LIFESAVE);	2138	op->clr_flag (FLAG_LIFESAVE);
2300		2139
2301	if (op->stats.hp < 0)	2140	if (op->stats.hp < 0)
2302	op->stats.hp = op->stats.maxhp;	2141	op->stats.hp = op->stats.maxhp;
2303		2142
2304	if (op->stats.food < 0)	2143	if (op->stats.food < 0)
2305	op->stats.food = 999;	2144	op->stats.food = MAX_FOOD;
2306		2145
2307	op->update_stats ();	2146	op->update_stats ();
2308	return 1;	2147	return 1;
2309	}	2148	}
2310		2149
2311	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2150	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2312	CLEAR_FLAG (op, FLAG_LIFESAVE);	2151	op->clr_flag (FLAG_LIFESAVE);
2313	enter_player_savebed (op); /* bring him home. */	2152	enter_player_savebed (op); /* bring him home. */
2314	return 0;	2153	return 0;
2315	}	2154	}
2316		2155
2317	/* This goes throws the inventory and removes unpaid objects, and puts them	2156	/* This goes throws the inventory and removes unpaid objects, and puts them
2318	* back in the map (location and map determined by values of env). This	2157	* back in the map (location and map determined by values of env). This
2319	* function will descend into containers. op is the object to start the search	2158	* function will descend into containers. op is the object to start the search
2320	* from.	2159	* from.
2321	*/	2160	*/
		2161	static void
		2162	drop_unpaid_items (object *op, object *env)
		2163	{
		2164	while (op)
		2165	{
		2166	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2167
		2168	if (op->flag [FLAG_UNPAID])
		2169	op->insert_at (env);
		2170	else if (op->inv)
		2171	drop_unpaid_items (op->inv, env);
		2172
		2173	op = next;
		2174	}
		2175	}
		2176
2322	void	2177	void
2323	remove_unpaid_objects (object *op, object *env)	2178	object::drop_unpaid_items ()
2324	{	2179	{
2325	while (op)	2180	if (!flag [FLAG_REMOVED])
2326	{	2181	::drop_unpaid_items (inv, this);
2327	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2328
2329	if (QUERY_FLAG (op, FLAG_UNPAID))
2330	{
2331	if (env->type == PLAYER)
2332	esrv_del_item (env->contr, op->count);
2333
2334	op->insert_at (env);
2335	}
2336	else if (op->inv)
2337	remove_unpaid_objects (op->inv, env);
2338
2339	op = next;
2340	}
2341	}
2342
2343	/*
2344	* Returns pointer a static string containing gravestone text
2345	* Moved from apply.c to player.c - player.c is what
2346	* actually uses this function. player.c may not be quite the
2347	* best, a misc file for object actions is probably better,
2348	* but there isn't one in the server directory.
2349	*/
2350	char *
2351	gravestone_text (object *op)
2352	{
2353	static char buf2[MAX_BUF];
2354	char buf[MAX_BUF];
2355	time_t now = time (NULL);
2356
2357	strcpy (buf2, " R.I.P.\n\n");
2358	if (op->type == PLAYER)
2359	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2360	else
2361	sprintf (buf, "%s\n", &op->name);
2362
2363	strncat (buf2, " ", 20 - strlen (buf) / 2);
2364	strcat (buf2, buf);
2365	if (op->type == PLAYER)
2366	sprintf (buf, "who was in level %d when killed\n", op->level);
2367	else
2368	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2369
2370	strncat (buf2, " ", 20 - strlen (buf) / 2);
2371	strcat (buf2, buf);
2372	if (op->type == PLAYER)
2373	{
2374	sprintf (buf, "by %s.\n\n", op->contr->killer);
2375	strncat (buf2, " ", 21 - strlen (buf) / 2);
2376	strcat (buf2, buf);
2377	}
2378
2379	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2380	strncat (buf2, " ", 20 - strlen (buf) / 2);
2381	strcat (buf2, buf);
2382
2383	return buf2;
2384	}	2182	}
2385		2183
2386	void	2184	void
2387	do_some_living (object *op)	2185	do_some_living (object *op)
2388	{	2186	{
2389	int last_food = op->stats.food;	2187	int last_food = op->stats.food;
2390	int gen_hp, gen_sp, gen_grace;	2188	int gen_hp, gen_sp, gen_grace;
2391	int over_hp, over_sp, over_grace;
2392	int i;
2393	int rate_hp = 1200;	2189	int rate_hp = 1200;
2394	int rate_sp = 2500;	2190	int rate_sp = 2500;
2395	int rate_grace = 2000;	2191	int rate_grace = 2000;
2396	const int max_hp = 1;	2192	const int max_hp = 1;
2397	const int max_sp = 1;	2193	const int max_sp = 1;
2398	const int max_grace = 1;	2194	const int max_grace = 1;
2399		2195
		2196	#if 0
2400	if (op->contr->hidden)	2197	if (op->contr->hidden)
2401	{	2198	{
2402	op->invisible = 1000;	2199	op->invisible = 1000;
2403	/* the socket code flashes the player visible/invisible	2200	/* the socket code flashes the player visible/invisible
2404	* depending on the value of invisible, so we need to	2201	* depending on the value of invisible, so we need to
2405	* alternate it here for it to work correctly.	2202	* alternate it here for it to work correctly.
2406	*/	2203	*/
2407	if (pticks & 2)	2204	if (server_tick & 2)
2408	op->invisible--;	2205	op->invisible--;
2409	}	2206	}
		2207	else
		2208	#endif
2410	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2209	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2411	{	2210	{
2412	if (!op->invisible--)	2211	if (!op->invisible--)
2413	{	2212	{
2414	make_visible (op);	2213	make_visible (op);
2415	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2214	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2442	{	2241	{
2443	gen_grace = op->stats.maxgrace;	2242	gen_grace = op->stats.maxgrace;
2444	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2243	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2445	}	2244	}
2446		2245
2447	/* Regenerate Spell Points */	2246	/* Regenerate Grace */
2448	if (!op->contr->golem && --op->last_sp < 0)	2247	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
		2248	if (--op->last_grace < 0)
2449	{	2249	{
2450	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2451	if (op->stats.sp < op->stats.maxsp)	2250	if (op->stats.grace < op->stats.maxgrace / 2)
		2251	op->stats.grace++; /* no penalty in food for regaining grace */
		2252
		2253	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2254
		2255	if (max_grace > 1)
2452	{	2256	{
2453	op->stats.sp++;	2257	int over_grace = temp / rate_grace;
2454	/* dms do not consume food */	2258
2455	if (!QUERY_FLAG (op, FLAG_WIZ))	2259	if (over_grace > 0)
2456	{	2260	{
2457	op->stats.food--;	2261	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2458	if (op->contr->digestion < 0)	2262	op->last_grace = 0;
2459	op->stats.food += op->contr->digestion;
2460	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2461	op->stats.food = last_food;
2462	}	2263	}
		2264	else
		2265	op->last_grace = rate_grace / temp;
2463	}	2266	}
		2267	else
		2268	op->last_grace = rate_grace / temp;
2464		2269
2465	if (max_sp > 1)	2270	/* wearing stuff doesn't detract from grace generation. */
		2271	}
		2272
		2273	if (op->stats.food > 0)
		2274	{
		2275	/* Regenerate Spell Points */
		2276	if (!op->contr->golem && --op->last_sp < 0)
2466	{	2277	{
2467	over_sp = (gen_sp + 10) / rate_sp;	2278	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2468	if (over_sp > 0)	2279
		2280	if (op->stats.sp < op->stats.maxsp)
2469	{	2281	{
2470	if (op->stats.sp < op->stats.maxsp)	2282	op->stats.sp++;
		2283
		2284	/* dms do not consume food */
		2285	if (!op->flag [FLAG_WIZ])
2471	{	2286	{
2472	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2473
2474	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2475	op->stats.sp--;	2287	op->stats.food--;
2476		2288
2477	if (op->stats.sp > op->stats.maxsp)	2289	if (op->contr->digestion < 0)
		2290	op->stats.food += op->contr->digestion;
		2291	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2478	op->stats.sp = op->stats.maxsp;	2292	op->stats.food = last_food;
2479	}	2293	}
		2294	}
		2295
		2296	if (max_sp > 1)
		2297	{
		2298	int over_sp = (gen_sp + 10) / rate_sp;
		2299	if (over_sp > 0)
		2300	{
		2301	if (op->stats.sp < op->stats.maxsp)
		2302	{
		2303	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2304
		2305	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2306	op->stats.sp--;
		2307
		2308	if (op->stats.sp > op->stats.maxsp)
		2309	op->stats.sp = op->stats.maxsp;
		2310	}
		2311
2480	op->last_sp = 0;	2312	op->last_sp = 0;
		2313	}
		2314	else
		2315	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2481	}	2316	}
2482	else	2317	else
2483	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2318	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2484	}	2319	}
2485	else
2486	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2487	}
2488		2320
2489	/* Regenerate Grace */	2321	/* Regenerate Hit Points */
2490	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2491	if (--op->last_grace < 0)	2322	if (--op->last_heal < 0)
2492	{
2493	if (op->stats.grace < op->stats.maxgrace / 2)
2494	op->stats.grace++; /* no penalty in food for regaining grace */
2495
2496	if (max_grace > 1)
2497	{	2323	{
2498	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2324	if (op->stats.hp < op->stats.maxhp)
2499	if (over_grace > 0)
2500	{	2325	{
2501	op->stats.sp += over_grace	2326	op->stats.hp++;
2502	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;	2327
		2328	/* dms do not consume food */
		2329	if (!op->flag [FLAG_WIZ])
		2330	{
		2331	op->stats.food--;
		2332
		2333	if (op->contr->digestion < 0)
		2334	op->stats.food += op->contr->digestion;
		2335	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2336	op->stats.food = last_food;
		2337	}
		2338	}
		2339
		2340	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2341
		2342	if (max_hp > 1)
		2343	{
		2344	int over_hp = temp / rate_hp;
		2345
		2346	if (over_hp > 0)
		2347	{
		2348	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2503	op->last_grace = 0;	2349	op->last_heal = 0;
		2350	}
		2351	else
		2352	op->last_heal = rate_hp / temp;
2504	}	2353	}
2505	else	2354	else
2506	{
2507	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2508	}
2509	}
2510	else
2511	{
2512	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2513	}
2514	/* wearing stuff doesn't detract from grace generation. */
2515	}
2516
2517	/* Regenerate Hit Points */
2518	if (--op->last_heal < 0)
2519	{
2520	if (op->stats.hp < op->stats.maxhp)
2521	{
2522	op->stats.hp++;
2523	/* dms do not consume food */
2524	if (!QUERY_FLAG (op, FLAG_WIZ))
2525	{
2526	op->stats.food--;
2527	if (op->contr->digestion < 0)
2528	op->stats.food += op->contr->digestion;
2529	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2530	op->stats.food = last_food;
2531	}
2532	}
2533
2534	if (max_hp > 1)
2535	{
2536	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2537	if (over_hp > 0)
2538	{
2539	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2540	op->last_heal = 0;	2355	op->last_heal = rate_hp / temp;
2541	}
2542	else
2543	{
2544	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545	}
2546	}
2547	else
2548	{
2549	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2550	}	2356	}
2551	}	2357	}
2552		2358
2553	/* Digestion */	2359	/* Digestion */
2554	if (--op->last_eat < 0)	2360	if (--op->last_eat < 0)
2555	{	2361	{
2556	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2362	int bonus = max (0, op->contr->digestion),
		2363	penalty = max (0, -op->contr->digestion);
2557		2364
2558	if (op->contr->gen_hp > 0)
2559	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2365	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2560	else
2561	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2562		2366
2563	/* dms do not consume food */	2367	/* dms do not consume food */
2564	if (!QUERY_FLAG (op, FLAG_WIZ))	2368	if (!op->flag [FLAG_WIZ])
2565	op->stats.food--;	2369	op->stats.food--;
2566	}	2370	}
2567		2371
2568	if (op->stats.food < 0 && op->stats.hp >= 0)	2372	if (op->stats.food < 0 && op->stats.hp >= 0)
2569	{	2373	{
2570	object *tmp, *flesh = 0;	2374	object *flesh = 0;
2571		2375
2572	for (tmp = op->inv; tmp; tmp = tmp->below)	2376	for_inv_removable (op, tmp)
2573	{	2377	{
2574	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2378	if (tmp->flag [FLAG_UNPAID])
		2379	continue;
		2380
		2381	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2575	{	2382	{
2576	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2383	op->statusmsg ("You blindly grab for a bite of food. "
2577	{	2384	"H<To prevent you from starving, you ate some random item from your backpack.>");
2578	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2385	op->apply (tmp);
2579	manual_apply (op, tmp, 0);	2386
2580	if (op->stats.food >= 0 || op->stats.hp < 0)	2387	if (op->stats.food >= 0 || op->stats.hp < 0)
2581	break;	2388	break;
2582	}	2389	}
2583	else if (tmp->type == FLESH)	2390	else if (tmp->type == FLESH)
2584	flesh = tmp;	2391	flesh = tmp;
2585	} /* End if paid for object */	2392	}
2586	} /* end of for loop */
2587		2393
2588	/* If player is still starving, it means they don't have any food, so	2394	/* If player is still starving, it means they don't have any food, so
2589	* eat flesh instead.	2395	* eat flesh instead.
2590	*/	2396	*/
2591	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2397	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2592	{	2398	{
2593	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2399	op->statusmsg ("You blindly grab for a bite of food. "
		2400	"H<To prevent you from starving, you ate some random item from your backpack.>");
2594	manual_apply (op, flesh, 0);	2401	op->apply (flesh);
2595	}	2402	}
		2403
		2404	// If player is still starving, alert him!
		2405	if (op->stats.food < 0)
		2406	op->failmsg ("You are starving! "
		2407	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2408	}
		2409
		2410	if (op->stats.food < 0)
2596	}	2411	{
		2412	op->stats.hp += op->stats.food;
		2413	op->stats.food = 0;
2597		2414
2598	while (op->stats.food < 0 && op->stats.hp >= 0)	2415	if (op->stats.hp < 0)
2599	op->stats.food++, op->stats.hp--;	2416	{
		2417	op->contr->killer = archetype::get ("killer_starvation");
		2418	op->contr->killer->destroy ();
		2419	}
		2420	}
2600		2421
		2422	/* killer should be set here already */
2601	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2423	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2602	kill_player (op);	2424	kill_player (op);
2603	}	2425	}
2604	}	2426	}
2605		2427
2606	/* If the player should die (lack of hp, food, etc), we call this.	2428	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2609	* file.	2431	* file.
2610	*/	2432	*/
2611	void	2433	void
2612	kill_player (object *op)	2434	kill_player (object *op)
2613	{	2435	{
2614	char buf[MAX_BUF];
2615	int x, y;	2436	int x, y;
2616
2617	//int i;
2618	maptile *map; /* this is for resurrection */	2437	maptile *map; /* this is for resurrection */
2619
2620	/* int z;
2621	int num_stats_lose;
2622	int lost_a_stat;
2623	int lose_this_stat;
2624	int this_stat; */
2625	int will_kill_again;	2438	int will_kill_again;
2626	archetype *at;	2439	archetype *at;
2627	object *tmp;	2440	object *tmp;
2628		2441
2629	if (save_life (op))	2442	if (save_life (op))
2630	return;	2443	return;
2631		2444
		2445	dynbuf_text deathtab;
		2446
		2447	/* restore player */
		2448	at = archetype::find (shstr_poisoning);
		2449	if (object *tmp = present_arch_in_ob (at, op))
		2450	{
		2451	tmp->destroy ();
		2452	deathtab << "Your body feels cleansed...\r";
		2453	}
		2454
		2455	at = archetype::find (shstr_confusion);
		2456	if (object *tmp = present_arch_in_ob (at, op))
		2457	{
		2458	tmp->destroy ();
		2459	deathtab << "Your mind feels clearer...\r";
		2460	}
		2461
		2462	cure_disease (op, 0, 0); /* remove any disease */
		2463
		2464	max_it (op->stats.hp , op->stats.maxhp);
		2465	max_it (op->stats.sp , op->stats.maxsp);
		2466	max_it (op->stats.grace, op->stats.maxgrace);
		2467	max_it (op->stats.food , 200);
		2468
		2469	// remove all spell effects that are active
		2470	// to avoid long-term effects such as word-of-recall
		2471	for (object *item = op->inv; item; )
		2472	{
		2473	object *next = item->below;
		2474
		2475	if (item->type == SPELL_EFFECT && item->active)
		2476	item->destroy ();
		2477
		2478	item = next;
		2479	}
2632		2480
2633	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2481	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2634	* in cities ONLY!!! It is very important that this doesn't get abused.	2482	* in cities ONLY!!! It is very important that this doesn't get abused.
2635	* Look at op_on_battleground() for more info --AndreasV	2483	* Look at op_on_battleground() for more info --AndreasV
2636	*/	2484	*/
2637	if (op_on_battleground (op, &x, &y))	2485	if (op_on_battleground (op, &x, &y))
2638	{	2486	{
2639	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2487	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2640	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2641
2642	/* restore player */
2643	at = archetype::find ("poisoning");
2644	if (object *tmp = present_arch_in_ob (at, op))
2645	{
2646	tmp->destroy ();
2647	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2648	}
2649
2650	at = archetype::find ("confusion");
2651	if (object *tmp = present_arch_in_ob (at, op))
2652	{
2653	tmp->destroy ();
2654	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2655	}
2656
2657	cure_disease (op, 0); /* remove any disease */
2658	op->stats.hp = op->stats.maxhp;
2659	if (op->stats.food <= 0)
2660	op->stats.food = 999;
2661		2488
2662	/* create a bodypart-trophy to make the winner happy */	2489	/* create a bodypart-trophy to make the winner happy */
2663	if (object *tmp = arch_to_object (archetype::find ("finger")))	2490	object *tmp = archetype::find (shstr_finger)->instance ();
2664	{	2491
2665	sprintf (buf, "%s's finger", &op->name);	2492	tmp->name = format ("%s's finger" , &op->name);
2666	tmp->name = buf;	2493	tmp->name_pl = format ("%s's fingers", &op->name);
2667	sprintf (buf, " This finger has been cut off %s\n"	2494	tmp->msg = format (
2668	" the %s, when he was defeated at\n level %d by %s.\n",	2495	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2669	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2496	&op->name, op->contr->title,
2670	tmp->msg = buf;	2497	(int)op->level,
		2498	op->contr->killer_name ()
		2499	);
2671	tmp->value = 0, tmp->type = 0;	2500	tmp->value = 0, tmp->type = 0;
2672	tmp->materialname = "organics";	2501	tmp->material = name_to_material (shstr_organic);
2673	tmp->insert_at (op, tmp);	2502	tmp->insert_at (op, tmp);
2674	}
2675		2503
2676	/* teleport defeated player to new destination */	2504	/* teleport defeated player to new destination */
2677	transfer_ob (op, x, y, 0, NULL);	2505	transfer_ob (op, x, y, 0, NULL);
2678	op->contr->braced = 0;	2506	op->contr->braced = 0;
		2507
		2508	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2679	return;	2509	return;
2680	}	2510	}
2681		2511
		2512	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2513	deathtab << "T<YOU HAVE DIED>\n\n";
		2514
2682	INVOKE_PLAYER (DEATH, op->contr);	2515	INVOKE_PLAYER (DEATH, op->contr);
2683		2516
2684	command_kill_pets (op, 0);	2517	command_kill_pets (op, 0);
2685		2518
2686	if (op->stats.food < 0)	2519	op->contr->play_sound (sound_find ("player_dies"));
2687	{
2688	sprintf (buf, "%s starved to death.", &op->name);
2689	strcpy (op->contr->killer, "starvation");
2690	}
2691	else
2692	sprintf (buf, "%s died.", &op->name);
2693
2694	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2695		2520
2696	/* save the map location for corpse, gravestone */	2521	/* save the map location for corpse, gravestone */
2697	x = op->x;	2522	x = op->x;
2698	y = op->y;	2523	y = op->y;
2699	map = op->map;	2524	map = op->map;
…		…
2727		2552
2728	lost_a_stat = 0;	2553	lost_a_stat = 0;
2729		2554
2730	for (z = 0; z < num_stats_lose; z++)	2555	for (z = 0; z < num_stats_lose; z++)
2731	{	2556	{
2732	i = RANDOM () % NUM_STATS;	2557	i = rndm (NUM_STATS);
2733		2558
2734	if (settings.stat_loss_on_death)	2559	if (settings.stat_loss_on_death)
2735	{	2560	{
2736	/* Pick a random stat and take a point off it. Tell the player	2561	/* Pick a random stat and take a point off it. Tell the player
2737	* what he lost.	2562	* what he lost.
…		…
2744	lost_a_stat = 1;	2569	lost_a_stat = 1;
2745	}	2570	}
2746	else	2571	else
2747	{	2572	{
2748	/* deplete a stat */	2573	/* deplete a stat */
2749	archetype *deparch = archetype::find ("depletion");	2574	archetype *deparch = archetype::find (shstr_depletion);
2750	object *dep;	2575	object *dep;
2751		2576
2752	dep = present_arch_in_ob (deparch, op);	2577	dep = present_arch_in_ob (deparch, op);
2753	if (!dep)	2578	if (!dep)
2754	{	2579	{
2755	dep = arch_to_object (deparch);	2580	dep = deparch->instance ();
2756	insert_ob_in_ob (dep, op);	2581	insert_ob_in_ob (dep, op);
2757	}	2582	}
2758	lose_this_stat = 1;	2583	lose_this_stat = 1;
2759	if (settings.balanced_stat_loss)	2584	if (settings.balanced_stat_loss)
2760	{	2585	{
…		…
2788	}	2613	}
2789	}	2614	}
2790		2615
2791	if (lose_this_stat)	2616	if (lose_this_stat)
2792	{	2617	{
2793	this_stat = get_attr_value (&(dep->stats), i);	2618	this_stat = get_attr_value (&dep->stats, i);
2794	/* We could try to do something clever like find another	2619	/* We could try to do something clever like find another
2795	* stat to reduce if this fails. But chances are, if	2620	* stat to reduce if this fails. But chances are, if
2796	* stats have been depleted to -50, all are pretty low	2621	* stats have been depleted to -50, all are pretty low
2797	* and should be roughly the same, so it shouldn't make a	2622	* and should be roughly the same, so it shouldn't make a
2798	* difference.	2623	* difference.
2799	*/	2624	*/
2800	if (this_stat >= -50)	2625	if (this_stat >= -50)
2801	{	2626	{
2802	change_attr_value (&(dep->stats), i, -1);	2627	change_attr_value (&(dep->stats), i, -1);
2803	SET_FLAG (dep, FLAG_APPLIED);	2628	dep->set_flag (FLAG_APPLIED);
2804	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2629	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2805	op->update_stats ();	2630	op->update_stats ();
2806	lost_a_stat = 1;	2631	lost_a_stat = 1;
2807	}	2632	}
2808	}	2633	}
2809	}	2634	}
2810	}	2635	}
		2636
2811	/* If no stat lost, tell the player. */	2637	/* If no stat lost, tell the player. */
2812	if (!lost_a_stat)	2638	if (!lost_a_stat)
2813	{	2639	{
2814	/* determine_god() seems to not work sometimes... why is this?	2640	/* determine_god() seems to not work sometimes... why is this?
2815	Should I be using something else? GD */	2641	Should I be using something else? GD */
2816	const char *god = determine_god (op);	2642	shstr_tmp god = determine_god (op);
2817		2643
2818	if (god && (strcmp (god, "none")))	2644	if (god != shstr_none)
2819	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2645	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2820	else	2646	else
2821	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2647	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2822	}	2648	}
2823	#else	2649	#else
2824	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2650	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2825	#endif	2651	#endif
2826		2652
2827	/* Put a gravestone up where the character 'almost' died. List the	2653	/* Put a gravestone up where the character 'almost' died. List the
2828	* exp loss on the stone.	2654	* exp loss on the stone.
2829	*/	2655	*/
2830	tmp = arch_to_object (archetype::find ("gravestone"));	2656	tmp = archetype::find (shstr_gravestone)->instance ();
2831	sprintf (buf, "%s's gravestone", &op->name);	2657	tmp->name = format ("%s's gravestone", &op->name);
2832	tmp->name = buf;	2658	tmp->name_pl = format ("%s's gravestones", &op->name);
2833	sprintf (buf, "%s's gravestones", &op->name);	2659	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2834	tmp->name_pl = buf;	2660	&op->name, op->contr->title, op->contr->killer_name ());
2835	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2836	tmp->msg = buf;
2837	tmp->x = op->x, tmp->y = op->y;	2661	tmp->x = op->x, tmp->y = op->y;
2838	insert_ob_in_map (tmp, op->map, NULL, 0);	2662	insert_ob_in_map (tmp, op->map, NULL, 0);
2839		2663
2840	/**************************************/	2664	/**************************************/
2841	/* */	2665	/* */
2842	/* Subtract the experience points, */	2666	/* Subtract the experience points, */
2843	/* if we died cause of food, give us */
2844	/* food, and reset HP's... */
2845	/* */	2667	/* */
2846	/**************************************/	2668	/**************************************/
2847		2669
2848	/* remove any poisoning and confusion the character may be suffering. */
2849	/* restore player */
2850	at = archetype::find ("poisoning");
2851	tmp = present_arch_in_ob (at, op);
2852
2853	if (tmp)
2854	{
2855	tmp->destroy ();
2856	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2857	}
2858
2859	at = archetype::find ("confusion");
2860	tmp = present_arch_in_ob (at, op);
2861	if (tmp)
2862	{
2863	tmp->destroy ();
2864	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2865	}
2866
2867	cure_disease (op, 0); /* remove any disease */
2868
2869	/*add_exp(op, (op->stats.exp * -0.20)); */	2670	/*add_exp(op, (op->stats.exp * -0.20)); */
2870	apply_death_exp_penalty (op);	2671	apply_death_exp_penalty (op);
2871	if (op->stats.food < 100)
2872	op->stats.food = 900;
2873	op->stats.hp = op->stats.maxhp;
2874	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2875	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2876		2672
2877	/*	2673	/*
2878	* Check to see if the player has any unpaid items. If so, remove them	2674	* Check to see if the player has any unpaid items. If so, remove them
2879	* and put them back in the map.	2675	* and put them back in the map.
2880	*/	2676	*/
2881	remove_unpaid_objects (op->inv, op);	2677	op->drop_unpaid_items ();
2882		2678
2883	/****************************************/	2679	/****************************************/
2884	/* */	2680	/* */
2885	/* Move player to his current respawn- */	2681	/* Move player to his current respawn- */
2886	/* position (usually last savebed) */	2682	/* position (usually last savebed) */
…		…
2904	if (will_kill_again)	2700	if (will_kill_again)
2905	{	2701	{
2906	object *force;	2702	object *force;
2907	int at;	2703	int at;
2908		2704
2909	force = get_archetype (FORCE_NAME);	2705	force = archetype::get (FORCE_NAME);
2910	/* 50 ticks should be enough time for the spell to abate */	2706	/* 50 ticks should be enough time for the spell to abate */
2911	force->speed = 0.1f;
2912	force->speed_left = -5.f;	2707	force->speed_left = -5.f;
2913	SET_FLAG (force, FLAG_APPLIED);	2708	force->set_speed (0.1f);
		2709	force->set_flag (FLAG_APPLIED);
		2710
2914	for (at = 0; at < NROFATTACKS; at++)	2711	for (at = 0; at < NROFATTACKS; at++)
2915	if (will_kill_again & (1 << at))	2712	if (will_kill_again & (1 << at))
2916	force->resist[at] = 100;	2713	force->resist[at] = 100;
2917		2714
2918	insert_ob_in_ob (force, op);	2715	insert_ob_in_ob (force, op);
2919	op->update_stats ();	2716	op->update_stats ();
2920
2921	}	2717	}
2922		2718
2923	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2719	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2924	}	2720	}
2925		2721
2926	void	2722	static void
2927	loot_object (object *op)	2723	loot_object (object *op)
2928	{ /* Grab and destroy some treasure */	2724	{ /* Grab and destroy some treasure */
2929	object *tmp, *tmp2, *next;	2725	object *tmp, *next;
2930		2726
2931	op->close_container (); /* close open sack first */	2727	op->close_container (); /* close open sack first */
2932		2728
2933	for (tmp = op->inv; tmp; tmp = next)	2729	for (tmp = op->inv; tmp; tmp = next)
2934	{	2730	{
…		…
2941	tmp->x = op->x, tmp->y = op->y;	2737	tmp->x = op->x, tmp->y = op->y;
2942		2738
2943	if (tmp->type == CONTAINER)	2739	if (tmp->type == CONTAINER)
2944	loot_object (tmp); /* empty container to ground */	2740	loot_object (tmp); /* empty container to ground */
2945		2741
2946	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2742	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2947	{	2743	{
2948	if (tmp->nrof > 1)	2744	if (tmp->nrof > 1)
2949	{	2745	{
2950	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2746	tmp->decrease (rndm (1, tmp->nrof - 1));
2951	tmp2->destroy ();
2952	insert_ob_in_map (tmp, op->map, NULL, 0);	2747	insert_ob_in_map (tmp, op->map, NULL, 0);
2953	}	2748	}
2954	else	2749	else
2955	tmp->destroy ();	2750	tmp->destroy ();
2956	}	2751	}
…		…
2963	* fix_weight(): Check recursively the weight of all players, and fix	2758	* fix_weight(): Check recursively the weight of all players, and fix
2964	* what needs to be fixed. Refresh windows and fix speed if anything	2759	* what needs to be fixed. Refresh windows and fix speed if anything
2965	* was changed.	2760	* was changed.
2966	*/	2761	*/
2967	void	2762	void
2968	fix_weight (void)	2763	fix_weight ()
2969	{	2764	{
2970	for_all_players (pl)	2765	for_all_players (pl)
2971	{	2766	{
2972	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2767	weight_t old = pl->ob->carrying;
2973		2768
2974	if (old == sum)	2769	pl->ob->update_weight ();
2975	continue;	2770
		2771	if (old != pl->ob->carrying)
		2772	{
2976	pl->ob->update_stats ();	2773	pl->ob->update_stats ();
2977	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2774	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2775	}
2978	}	2776	}
2979	}	2777	}
2980		2778
2981	void	2779	void
2982	fix_luck (void)	2780	fix_luck ()
2983	{	2781	{
2984	for_all_players (pl)	2782	for_all_players (pl)
2985	if (!pl->ob->contr->ns->state)	2783	if (!pl->ob->contr->ns->state)
2986	pl->ob->change_luck (0);	2784	pl->ob->change_luck (0);
2987	}	2785	}
…		…
3024	}	2822	}
3025		2823
3026	void	2824	void
3027	make_visible (object *op)	2825	make_visible (object *op)
3028	{	2826	{
3029	op->hide = 0;	2827	op->flag [FLAG_HIDDEN] = 0;
3030	op->invisible = 0;	2828	op->invisible = 0;
		2829
3031	if (op->type == PLAYER)	2830	if (op->type == PLAYER)
3032	{	2831	{
3033	op->contr->tmp_invis = 0;	2832	op->contr->tmp_invis = 0;
3034	op->contr->invis_race = 0;	2833	op->contr->invis_race = 0;
3035	}	2834	}
…		…
3038	}	2837	}
3039		2838
3040	int	2839	int
3041	is_true_undead (object *op)	2840	is_true_undead (object *op)
3042	{	2841	{
3043	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2842	if (op->arch->flag [FLAG_UNDEAD])
3044	return 1;	2843	return 1;
3045		2844
3046	return 0;	2845	return 0;
3047	}	2846	}
3048		2847
3049	/* look at the surrounding terrain to determine	2848	/* look at the surrounding terrain to determine
3050	* the hideability of this object. Positive levels	2849	* the hideability of this object. Positive levels
3051	* indicate greater hideability.	2850	* indicate greater hideability.
3052	*/	2851	*/
3053
3054	int	2852	int
3055	hideability (object *ob)	2853	hideability (object *ob)
3056	{	2854	{
3057	int i, level = 0, mflag;	2855	int i, level = 0, mflag;
3058	sint16 x, y;	2856	sint16 x, y;
3059		2857
3060	if (!ob || !ob->map)	2858	if (!ob || !ob->map)
3061	return 0;	2859	return 0;
3062		2860
3063	/* so, on normal lighted maps, its hard to hide */	2861	/* so, on normal lighted maps, its hard to hide */
3064	level = ob->map->darkness - 2;	2862	level = ob->map->darklevel () - 2;
3065		2863
3066	/* this also picks up whether the object is glowing.	2864	/* this also picks up whether the object is glowing.
3067	* If you carry a light on a non-dark map, its not	2865	* If you carry a light on a non-dark map, its not
3068	* as bad as carrying a light on a pitch dark map */	2866	* as bad as carrying a light on a pitch dark map */
3069	if (has_carried_lights (ob))	2867	if (ob->has_carried_lights ())
3070	level = -(10 + (2 * ob->map->darkness));	2868	level = -(10 + (2 * ob->map->darklevel ()));
3071		2869
3072	/* scan through all nearby squares for terrain to hide in */	2870	/* scan through all nearby squares for terrain to hide in */
3073	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2871	for (i = 0, x = ob->x, y = ob->y;
		2872	i <= SIZEOFFREE1;
		2873	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3074	{	2874	{
3075	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2875	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3076	if (mflag & P_OUT_OF_MAP)	2876	if (mflag & P_OUT_OF_MAP)
3077	{
3078	continue;	2877	continue;
3079	}	2878
3080	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2879	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3081	level += 2;	2880	level += 2;
3082	else /* open terrain! */	2881	else /* open terrain! */
3083	level -= 1;	2882	level -= 1;
3084	}	2883	}
…		…
3095	* spot (surrounded by clear terrain in broad daylight). -b.t.	2894	* spot (surrounded by clear terrain in broad daylight). -b.t.
3096	*/	2895	*/
3097	void	2896	void
3098	do_hidden_move (object *op)	2897	do_hidden_move (object *op)
3099	{	2898	{
3100	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2899	int hide = 0;
3101	object *skop;
3102		2900
3103	if (!op || !op->map)	2901	if (!op || !op->map)
3104	return;	2902	return;
3105		2903
3106	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2904	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2905	int num = random_roll (0, 19, op, PREFER_LOW);
3107		2906
3108	/* its *extremely* hard to run and sneak/hide at the same time! */	2907	/* its *extremely* hard to run and sneak/hide at the same time! */
3109	if (op->type == PLAYER && op->contr->run_on)	2908	if (op->type == PLAYER && op->contr->run_on)
3110	if (!skop || num >= skop->level)	2909	if (!skop || num >= skop->level)
3111	{	2910	{
…		…
3121	num -= hide;	2920	num -= hide;
3122		2921
3123	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2922	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3124	{	2923	{
3125	make_visible (op);	2924	make_visible (op);
		2925
3126	if (op->type == PLAYER)	2926	if (op->type == PLAYER)
3127	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2927	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3128	}	2928	}
3129	else if (op->type == PLAYER && skop)	2929	else if (op->type == PLAYER && skop)
3130	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2930	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3145		2945
3146	if (who->type == PLAYER)	2946	if (who->type == PLAYER)
3147	player = 1;	2947	player = 1;
3148		2948
3149	else	2949	else
3150	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2950	friendly = who->flag [FLAG_FRIENDLY];
3151		2951
3152	/* search adjacent squares */	2952	/* search adjacent squares */
3153	for (i = 1; i < 9; i++)	2953	for (i = 1; i < 9; i++)
3154	{	2954	{
3155	x = who->x + freearr_x[i];	2955	x = who->x + freearr_x[i];
…		…
3164	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2964	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3165	continue;	2965	continue;
3166		2966
3167	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2967	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3168	{	2968	{
3169	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2969	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3170	return 1;	2970	return 1;
3171	else if (tmp->type == PLAYER)	2971	else if (tmp->type == PLAYER)
3172	{
3173	/*don't let a hidden DM prevent you from hiding */
3174	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3175	return 1;	2972	return 1;
3176	}
3177	}	2973	}
3178	}	2974	}
3179	return 0;	2975	return 0;
3180	}	2976	}
3181		2977
3182	/* check the player los field for viewability of the	2978	/* check the player los field for viewability of the
3183	* object op. This function works fine for monsters,	2979	* object op. This function works fine for monsters,
3184	* but we dont worry if the object isnt the top one in	2980	* but we dont worry if the object isnt the top one in
3185	* a pile (say a coin under a table would return "viewable"	2981	* a pile (say a coin under a table would return "viewable"
3186	* by this routine). Another question, should we be	2982	* by this routine). Another question, should we be
3187	* concerned with the direction the player is looking	2983	* concerned with the direction the player is looking
3188	* in? Realistically, most of use cant see stuff behind	2984	* in? Realistically, most of us can't see stuff behind
3189	* our backs...on the other hand, does the "facing" direction	2985	* our backs...on the other hand, does the "facing" direction
3190	* imply the way your head, or body is facing? Its possible	2986	* imply the way your head, or body is facing? It's possible
3191	* for them to differ. Sigh, this fctn could get a bit more complex.	2987	* for them to differ. Sigh, this fctn could get a bit more complex.
3192	* -b.t.	2988	* -b.t.
3193	* This function is now map tiling safe.	2989	* This function is now map tiling safe.
3194	*/	2990	*/
3195
3196	int	2991	int
3197	player_can_view (object *pl, object *op)	2992	player_can_view (object *pl, object *op)
3198	{	2993	{
3199	rv_vector rv;	2994	rv_vector rv;
3200	int dx, dy;	2995	int dx, dy;
…		…
3212		3007
3213	get_rangevector (pl, op, &rv, 0x1);	3008	get_rangevector (pl, op, &rv, 0x1);
3214		3009
3215	/* starting with the 'head' part, lets loop	3010	/* starting with the 'head' part, lets loop
3216	* through the object and find if it has any	3011	* through the object and find if it has any
3217	* part that is in the los array but isnt on	3012	* part that is in the los array but isn't on
3218	* a blocked los square.	3013	* a blocked los square.
3219	* we use the archetype to figure out offsets.	3014	* we use the archetype to figure out offsets.
3220	*/	3015	*/
3221	while (op)	3016	while (op)
3222	{	3017	{
3223	dx = rv.distance_x + op->arch->x;	3018	dx = rv.distance_x + op->arch->x;
3224	dy = rv.distance_y + op->arch->y;	3019	dy = rv.distance_y + op->arch->y;
3225		3020
3226	/* only the viewable area the player sees is updated by LOS	3021	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3227	* code, so we need to restrict ourselves to that range of values
3228	* for any meaningful values.
3229	*/
3230	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3231	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3232	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3233	return 1;	3022	return 1;
		3023
3234	op = op->more;	3024	op = op->more;
3235	}	3025	}
3236	return 0;
3237	}
3238		3026
3239	/* routine for both players and monsters. We call this when
3240	* there is a possibility for our action distrubing our hiding
3241	* place or invisiblity spell. Artefact invisiblity is not
3242	* effected by this. If we arent invisible to begin with, we
3243	* return 0.
3244	*/
3245	int
3246	action_makes_visible (object *op)
3247	{
3248
3249	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3250	{
3251	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3252	return 0;
3253
3254	if (op->contr && op->contr->tmp_invis == 0)
3255	return 0;
3256
3257	/* If monsters, they should become visible */
3258	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3259	{
3260	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3261	return 1;
3262	}
3263	}
3264	return 0;	3027	return 0;
3265	}	3028	}
3266		3029
3267	/* op_on_battleground - checks if the given object op (usually	3030	/* op_on_battleground - checks if the given object op (usually
3268	* a player) is standing on a valid battleground-tile,	3031	* a player) is standing on a valid battleground-tile,
…		…
3273	* Default is to do the same as before, so only people wanting to have different points need worry about this	3036	* Default is to do the same as before, so only people wanting to have different points need worry about this
3274	*/	3037	*/
3275	int	3038	int
3276	op_on_battleground (object *op, int *x, int *y)	3039	op_on_battleground (object *op, int *x, int *y)
3277	{	3040	{
3278	object *tmp;
3279
3280	/* A battleground-tile needs the following attributes to be valid:	3041	/* A battleground-tile needs the following attributes to be valid:
3281	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3042	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3282	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3043	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3283	* and the exit-coordinates sp/hp must both be > 0.	3044	* and the exit-coordinates sp/hp must both be > 0.
3284	* => The intention here is to prevent abuse of the battleground-	3045	* => The intention here is to prevent abuse of the battleground-
3285	* feature (like pickable or hidden battleground tiles). */	3046	* feature (like pickable or hidden battleground tiles). */
3286	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3047	for (object *tmp = op->below; tmp; tmp = tmp->below)
3287	{	3048	{
3288	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3049	if (tmp->flag [FLAG_IS_FLOOR])
3289	{	3050	{
3290	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3051	if (tmp->flag [FLAG_NO_PICK]
3291	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3052	&& tmp->type == BATTLEGROUND
		3053	&& tmp->name == shstr_battleground
		3054	&& EXIT_X (tmp) && EXIT_Y (tmp))
3292	{	3055	{
3293	/*before we assign the exit, check if this is a teambattle */	3056	/* before we assign the exit, check if this is a teambattle */
3294	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3057	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3295	{
3296	object *invtmp;
3297
3298	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3058	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3059	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3299	{	3060	{
3300	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3301	{
3302	if (x != NULL && y != NULL)	3061	if (x && y)
3303	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3062	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3063
3304	return 1;	3064	return 1;
3305	}
3306	}	3065	}
3307	}	3066
3308	if (x != NULL && y != NULL)	3067	if (x && y)
3309	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3068	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3069
3310	return 1;	3070	return 1;
3311	}	3071	}
3312	}	3072	}
3313	}	3073	}
		3074
3314	/* If we got here, did not find a battleground */	3075	/* If we got here, did not find a battleground */
3315	return 0;	3076	return 0;
3316	}	3077	}
3317		3078
3318	/*	3079	/*
…		…
3334	char buf[MAX_BUF]; /* tmp. string buffer */	3095	char buf[MAX_BUF]; /* tmp. string buffer */
3335	int i = 0, j = 0;	3096	int i = 0, j = 0;
3336		3097
3337	/* get the appropriate treasurelist */	3098	/* get the appropriate treasurelist */
3338	if (atnr == ATNR_FIRE)	3099	if (atnr == ATNR_FIRE)
3339	trlist = treasurelist::find ("dragon_ability_fire");	3100	trlist = treasurelist::find (shstr_dragon_ability_fire);
3340	else if (atnr == ATNR_COLD)	3101	else if (atnr == ATNR_COLD)
3341	trlist = treasurelist::find ("dragon_ability_cold");	3102	trlist = treasurelist::find (shstr_dragon_ability_cold);
3342	else if (atnr == ATNR_ELECTRICITY)	3103	else if (atnr == ATNR_ELECTRICITY)
3343	trlist = treasurelist::find ("dragon_ability_elec");	3104	trlist = treasurelist::find (shstr_dragon_ability_elec);
3344	else if (atnr == ATNR_POISON)	3105	else if (atnr == ATNR_POISON)
3345	trlist = treasurelist::find ("dragon_ability_poison");	3106	trlist = treasurelist::find (shstr_dragon_ability_poison);
3346		3107
3347	if (trlist == NULL || who->type != PLAYER)	3108	if (trlist == NULL || who->type != PLAYER)
3348	return;	3109	return;
3349		3110
3350	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3111	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3423	{	3184	{
3424	/* forces in the treasurelist can alter the player's stats */	3185	/* forces in the treasurelist can alter the player's stats */
3425	object *skin;	3186	object *skin;
3426		3187
3427	/* first get the dragon skin force */	3188	/* first get the dragon skin force */
3428	shstr_cmp dragon_skin_force ("dragon_skin_force");
3429	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)	3189	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3430	;	3190	;
3431		3191
3432	if (!skin)	3192	if (!skin)
3433	return;	3193	return;
3434		3194
…		…
3448	else	3208	else
3449	j = 1;	3209	j = 1;
3450	strcat (buf, spellpathnames[i]);	3210	strcat (buf, spellpathnames[i]);
3451	}	3211	}
3452	}	3212	}
		3213
3453	strcat (buf, ".");	3214	strcat (buf, ".");
3454	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3215	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3455	}	3216	}
3456		3217
3457	/* evtl. adding flags: */	3218	/* evtl. adding flags: */
3458	if (QUERY_FLAG (item, FLAG_XRAYS))	3219	if (item->flag [FLAG_XRAYS])
3459	SET_FLAG (skin, FLAG_XRAYS);	3220	skin->set_flag (FLAG_XRAYS);
3460	if (QUERY_FLAG (item, FLAG_STEALTH))	3221	if (item->flag [FLAG_STEALTH])
3461	SET_FLAG (skin, FLAG_STEALTH);	3222	skin->set_flag (FLAG_STEALTH);
3462	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3223	if (item->flag [FLAG_SEE_IN_DARK])
3463	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3224	skin->set_flag (FLAG_SEE_IN_DARK);
3464		3225
3465	/* print message if there is one */	3226	/* print message if there is one */
3466	if (item->msg != NULL)	3227	if (item->msg != NULL)
3467	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3228	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3468	}	3229	}
3469	else	3230	else
3470	{	3231	{
3471	/* generate misc. treasure */	3232	/* generate misc. treasure */
3472	tmp = arch_to_object (tr->item);	3233	tmp = tr->item->instance ();
3473	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3234	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3474	tmp = insert_ob_in_ob (tmp, who);	3235	who->insert (tmp);
3475	if (who->type == PLAYER)
3476	esrv_send_item (who, tmp);
3477	}	3236	}
3478	}	3237	}
3479		3238
3480	/**	3239	//-GPL
3481	* Unready an object for a player. This function does nothing if the object was
3482	* not readied.
3483	*/
3484	void
3485	player_unready_range_ob (player *pl, object *ob)
3486	{
3487	if (pl->ob->current_weapon == ob)
3488	pl->ob->current_weapon = 0;
3489
3490	if (pl->combat_ob == ob)
3491	pl->combat_ob = 0;
3492
3493	if (pl->ranged_ob == ob)
3494	pl->ranged_ob = 0;
3495	}
3496		3240
3497	sint8	3241	sint8
3498	player::visibility_at (maptile *map, int x, int y) const	3242	player::darkness_at (maptile *map, int x, int y) const
3499	{	3243	{
3500	if (!ns)	3244	if (!ns)
3501	return 0;	3245	return LOS_BLOCKED;
3502		3246
3503	int dx, dy;	3247	int dx, dy;
3504	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3248	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3249	return LOS_BLOCKED;
		3250
		3251	x += dx - ns->current_x;
		3252	y += dy - ns->current_y;
		3253
		3254	return blocked_los (x, y);
		3255	}
		3256
		3257	void
		3258	player::infobox (const char *title, const char *msg, int color)
		3259	{
		3260	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3261	}
		3262
		3263	void
		3264	player::statusmsg (const char *msg, int color)
		3265	{
		3266	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3267	}
		3268
		3269	void
		3270	player::failmsg (const char *msg, int color)
		3271	{
		3272	play_sound (sound_find ("generic_failure"));
		3273	statusmsg (msg, color);
		3274	}
		3275
		3276	void
		3277	object::failmsgf (const char *format, ...)
		3278	{
		3279	if (!contr)
3505	return 0;	3280	return;
3506		3281
3507	x += dx - ns->current_x + ns->mapx / 2;	3282	va_list ap;
3508	y += dy - ns->current_y + ns->mapy / 2;	3283	va_start (ap, format);
3509		3284	contr->failmsg (vformat (format, ap));
3510	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3285	va_end (ap);
3511	return 0;
3512
3513	return 100 - blocked_los [x][y];
3514	}	3286	}
		3287
		3288	void
		3289	player::failmsgf (const char *format, ...)
		3290	{
		3291	va_list ap;
		3292	va_start (ap, format);
		3293	failmsg (vformat (format, ap));
		3294	va_end (ap);
		3295	}
		3296

Diff Legend

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