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

Diff Legend

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