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.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 UTC

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

Diff Legend

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