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.293 by root, Mon Nov 26 15:12:16 2012 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,2012 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;
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 multiple treasurelists specifying the same skills.
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 ();
722	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	549	break;
723	continue;
724	}	550	}
725		551
726	if (op->nrof > 1)	552	if (op->nrof > 1)
727	op->nrof = 1;	553	op->nrof = 1;
728	}	554	}
729		555
730	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
731	{	557	op->inv->clr_flag (FLAG_STARTEQUIP);
732	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
733	}
734		558
735	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
736	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
737	* merged properly.	561	* merged properly.
738	*/	562	*/
739	if (need_identify (op))	563	if (op->need_identify ())
740	{
741	SET_FLAG (op, FLAG_IDENTIFIED);
742	CLEAR_FLAG (op, FLAG_CURSED);
743	CLEAR_FLAG (op, FLAG_DAMNED);
744	}	564	{
		565	op->set_flag (FLAG_IDENTIFIED);
		566	op->clr_flag (FLAG_CURSED);
		567	op->clr_flag (FLAG_DAMNED);
		568	}
		569
745	if (op->type == SPELL)	570	if (op->type == SPELL)
746	{	571	{
747	op->destroy ();	572	op->destroy ();
748	continue;	573	continue;
749	}	574	}
750	else if (op->type == SKILL)	575	else if (op->type == SKILL)
751	{	576	{
752	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
753	op->stats.exp = 0;	578	op->stats.exp = 0;
754	op->level = 1;	579	op->level = 1;
755	}	580	}
756	/* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
757	else	582	op->set_flag (FLAG_INV_LOCKED);
758	SET_FLAG (op, FLAG_INV_LOCKED);
759	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
760		584
761	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
762	link_player_skills (pl);	586	pl->contr->link_skills ();
763	}	587	}
764		588
765	void	589	void
766	get_party_password (object *op, partylist *party)	590	get_party_password (object *op, partylist *party)
767	{	591	{
…		…
777	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	601	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
778	}	602	}
779		603
780	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	604	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
781	static int	605	static int
782	roll_stat (void)	606	roll_stat ()
783	{	607	{
784	int a[4], i, j, k;	608	int a[4], i, j, k;
785		609
786	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
787	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
788		612
789	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
790	if (a[i] < k)	614	if (a[i] < k)
791	k = a[i], j = i;	615	k = a[i], j = i;
792		616
…		…
868	static void	692	static void
869	start_info (object *op)	693	start_info (object *op)
870	{	694	{
871	char buf[MAX_BUF];	695	char buf[MAX_BUF];
872		696
873	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	697	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
874	new_draw_info (NDI_UNIQUE, 0, op, buf);	698	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	}	699	}
878		700
879	/* This function takes the key that is passed, and does the	701	/* This function takes the key that is passed, and does the
880	* appropriate action with it (change race, or other things).	702	* appropriate action with it (change race, or other things).
881	* The function name is for historical reasons - now we have	703	* The function name is for historical reasons - now we have
…		…
884	*/	706	*/
885	void	707	void
886	player::chargen_race_done ()	708	player::chargen_race_done ()
887	{	709	{
888	/* this must before then initial items are given */	710	/* this must before then initial items are given */
889	esrv_new_player (ob->contr, ob->weight + ob->carrying);	711	esrv_new_player (ob->contr);
890		712
891	treasurelist *tl = treasurelist::find ("starting_wealth");	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
892	if (tl)	714	if (tl)
893	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
894		716
895	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
896	INVOKE_PLAYER (LOGIN, ob->contr);
897		718
898	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
899		720
900	if (ob->msg)	721	if (ob->msg)
901	ob->msg = 0;	722	ob->msg = 0;
902		723
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);	724	start_info (ob);
913	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
914	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
915	link_player_skills (ob);
916	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
917	ob->update_stats ();	728	ob->update_stats ();
918		729
919	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
920	* is one for this race	731	* is one for this race
921	*/	732	*/
922	if (*first_map_ext_path)	733	if (*first_map_ext_path)
923	{	734	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	735	else
938	LOG (llevDebug, "first_map_ext_path not set\n");	736	LOG (llevDebug, "first_map_ext_path not set\n");
		737	}
		738
		739	/*
		740	* Returns true if the given player is a legal class.
		741	* The function to add and remove class-bonuses to the stats doesn't
		742	* check if the stat becomes negative, thus this function
		743	* merely checks that all stats are 1 or more, and returns
		744	* false otherwise.
		745	*/
		746	static int
		747	allowed_class (const object *op)
		748	{
		749	return op->stats.Dex > 0
		750	&& op->stats.Str > 0
		751	&& op->stats.Con > 0
		752	&& op->stats.Int > 0
		753	&& op->stats.Wis > 0
		754	&& op->stats.Pow > 0
		755	&& op->stats.Cha > 0;
939	}	756	}
940		757
941	void	758	void
942	player::chargen_race_next ()	759	player::chargen_race_next ()
943	{	760	{
…		…
951	int x = ob->x, y = ob->y;	768	int x = ob->x, y = ob->y;
952		769
953	ob->remove_statbonus ();	770	ob->remove_statbonus ();
954	ob->remove ();	771	ob->remove ();
955	ob->arch = get_player_archetype (ob->arch);	772	ob->arch = get_player_archetype (ob->arch);
956	ob->arch->clone.copy_to (ob);	773	ob->arch->copy_to (ob);
957	ob->instantiate ();	774	ob->instantiate ();
958	ob->stats = ob->contr->orig_stats;	775	ob->stats = ob->contr->orig_stats;
959	ob->name = ob->name_pl = name;	776	ob->name = ob->name_pl = name;
960	ob->x = x;	777	ob->x = x;
961	ob->y = y;	778	ob->y = y;
962	SET_ANIMATION (ob, 2); /* So player faces south */	779	SET_ANIMATION (ob, 2); /* So player faces south */
963	insert_ob_in_map (ob, ob->map, ob, 0);	780	insert_ob_in_map (ob, ob->map, ob, 0);
964	assign (ob->contr->title, ob->arch->clone.name);	781	assign (ob->contr->title, ob->arch->object::name);
965	ob->add_statbonus ();	782	ob->add_statbonus ();
966	}	783	}
967	while (!allowed_class (ob));	784	while (!allowed_class (ob));
968		785
969	update_object (ob, UP_OBJ_FACE);	786	update_object (ob, UP_OBJ_FACE);
…		…
972	ob->stats.hp = ob->stats.maxhp;	789	ob->stats.hp = ob->stats.maxhp;
973	ob->stats.sp = ob->stats.maxsp;	790	ob->stats.sp = ob->stats.maxsp;
974	ob->stats.grace = 0;	791	ob->stats.grace = 0;
975	}	792	}
976		793
977	void	794	static void
978	flee_player (object *op)	795	flee_player (object *op)
979	{	796	{
980	int dir, diff;	797	int dir, diff;
981	rv_vector rv;	798	rv_vector rv;
982		799
983	if (op->stats.hp < 0)	800	if (op->stats.hp < 0)
984	{	801	{
985	LOG (llevDebug, "Fleeing player is dead.\n");	802	LOG (llevDebug, "Fleeing player is dead.\n");
986	CLEAR_FLAG (op, FLAG_SCARED);	803	op->clr_flag (FLAG_SCARED);
987	return;	804	return;
988	}	805	}
989		806
990	if (op->enemy == NULL)	807	if (!op->enemy)
991	{	808	{
992	LOG (llevDebug, "Fleeing player had no enemy.\n");	809	LOG (llevDebug, "Fleeing player had no enemy.\n");
993	CLEAR_FLAG (op, FLAG_SCARED);	810	op->clr_flag (FLAG_SCARED);
994	return;	811	return;
995	}	812	}
996		813
997	/* Seen some crashes here. Since we don't store an	814	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
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	{	815	{
1003	CLEAR_FLAG (op, FLAG_SCARED);
1004	op->enemy = NULL;	816	op->enemy = NULL;
1005	return;	817	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;	818	return;
1013	}	819	}
1014		820
1015	get_rangevector (op, op->enemy, &rv, 0);	821	get_rangevector (op, op->enemy, &rv, 0);
1016		822
1017	dir = absdir (4 + rv.direction);	823	dir = absdir (4 + rv.direction);
1018	for (diff = 0; diff < 3; diff++)	824	for (diff = 0; diff < 3; diff++)
1019	{	825	{
1020	int m = 1 - (RANDOM () & 2);	826	int m = 1 - rndm (2) * 2;
1021		827
1022	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	828	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1023	return;	829	return;
1024	}	830	}
1025		831
1026	/* Cornered, get rid of scared */	832	/* Cornered, get rid of scared */
1027	CLEAR_FLAG (op, FLAG_SCARED);	833	op->clr_flag (FLAG_SCARED);
1028	op->enemy = NULL;	834	op->enemy = NULL;
1029	}	835	}
1030		836
1031	/* check_pick sees if there is stuff to be picked up/picks up stuff.	837	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1032	* It returns 1 if the player should keep on moving, 0 if he should	838	* It returns 1 if the player should keep on moving, 0 if he should
…		…
1036	check_pick (object *op)	842	check_pick (object *op)
1037	{	843	{
1038	object *tmp, *next;	844	object *tmp, *next;
1039	int stop = 0;	845	int stop = 0;
1040	int wvratio;	846	int wvratio;
1041	char putstring[128];
1042		847
1043	/* if you're flying, you cna't pick up anything */	848	/* if you're flying, you can't pick up anything */
1044	if (op->move_type & MOVE_FLYING)	849	if (op->move_type & MOVE_FLYING)
1045	return 1;	850	return 1;
1046		851
1047	next = op->below;	852	next = op->below;
		853
		854	int cnt = MAX_ITEM_PER_ACTION;
		855	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1048		856
1049	/* loop while there are items on the floor that are not marked as	857	/* loop while there are items on the floor that are not marked as
1050	* destroyed */	858	* destroyed */
1051	while (next && !next->destroyed ())	859	while (next && !next->destroyed ())
1052	{	860	{
1053	tmp = next;	861	tmp = next;
1054	next = tmp->below;	862	next = tmp->below;
1055		863
		864	if (cnt <= 0)
		865	{
		866	op->failmsg ("Couldn't pickup all items at once.");
		867	return 0;
		868	}
		869
1056	if (op->destroyed ())	870	if (op->destroyed ())
1057	return 0;	871	return 0;
1058		872
1059	if (!can_pick (op, tmp))	873	if (!can_pick (op, tmp))
1060	continue;	874	continue;
1061		875
1062	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	876	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1063	{	877	{
1064	if (item_matched_string (op, tmp, op->contr->search_str))	878	if (item_matched_string (op, tmp, op->contr->search_str))
1065	pick_up (op, tmp);	879	CHK_PICK_PICKUP;
		880
1066	continue;	881	continue;
1067	}	882	}
1068		883
1069	/* high not bit set? We're using the old autopickup model */	884	/* pickup handling */
		885	if (op->contr->mode & PU_DEBUG)
		886	{
		887	/* some debugging code to figure out item information */
		888	const char *str = tmp->name
		889	? format ("item name: %s item type: %d weight/value: %d",
		890	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		891	: format ("item name: %s item type: %d weight/value: %d",
		892	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		893
		894	new_draw_info (NDI_UNIQUE, 0, op, str);
		895	}
		896
		897	if (op->contr->mode & PU_INHIBIT)
		898	return 1;
		899
		900	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		901	return 1;
		902
		903	/* philosophy:
		904	* It's easy to grab an item type from a pile, as long as it's
		905	* generic. This takes no game-time. For more detailed pickups
		906	* and selections, select-items should be used. This is a
		907	* grab-as-you-run type mode that's really useful for arrows for
		908	* example.
		909	* The drawback: right now it has no frontend, so you need to
		910	* stick the bits you want into a calculator in hex mode and then
		911	* convert to decimal and then 'pickup <#>
		912	*/
		913
		914	/* the first two modes are exclusive: if NOTHING we return, if
		915	* STOP then we stop. All the rest are applied sequentially,
		916	* meaning if any test passes, the item gets picked up. */
		917
		918	/* if mode is set to pick nothing up, return */
		919	if (op->contr->mode == PU_NOTHING)
		920	return 1;
		921
		922	/* if mode is set to stop when encountering objects, return */
		923	/* take STOP before INHIBIT since it doesn't actually pick
		924	* anything up */
		925	if (op->contr->mode & PU_STOP)
		926	return 0;
		927
		928	/* useful for going into stores and not losing your settings... */
		929	/* and for battles wher you don't want to get loaded down while
		930	* fighting */
		931	if (op->contr->mode & PU_INHIBIT)
		932	return 1;
		933
		934	/* prevent us from turning into auto-thieves :) */
		935	if (tmp->flag [FLAG_UNPAID])
		936	continue;
		937
		938	/* ignore known cursed objects */
		939	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
		940	continue;
		941
		942	/* all food and drink if desired */
		943	/* question: don't pick up known-poisonous stuff? */
1070	if (!(op->contr->mode & PU_NEWMODE))	944	if (op->contr->mode & PU_FOOD)
		945	if (tmp->type == FOOD)
1071	{	946	{
1072	switch (op->contr->mode)	947	CHK_PICK_PICKUP;
		948	continue;
		949	}
		950
		951	if (op->contr->mode & PU_DRINK)
		952	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
		953	{
		954	CHK_PICK_PICKUP;
		955	continue;
		956	}
		957
		958	if (op->contr->mode & PU_POTION)
		959	if (tmp->type == POTION)
		960	{
		961	CHK_PICK_PICKUP;
		962	continue;
		963	}
		964
		965	/* spellbooks, skillscrolls and normal books/scrolls */
		966	if (op->contr->mode & PU_SPELLBOOK)
		967	if (tmp->type == SPELLBOOK)
		968	{
		969	CHK_PICK_PICKUP;
		970	continue;
		971	}
		972
		973	if (op->contr->mode & PU_SKILLSCROLL)
		974	if (tmp->type == SKILLSCROLL)
		975	{
		976	CHK_PICK_PICKUP;
		977	continue;
		978	}
		979
		980	if (op->contr->mode & PU_READABLES)
		981	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		982	{
		983	CHK_PICK_PICKUP;
		984	continue;
		985	}
		986
		987	/* wands/staves/rods/horns */
		988	if (op->contr->mode & PU_MAGIC_DEVICE)
		989	if (tmp->type == WAND
		990	|| tmp->type == ROD
		991	|| tmp->type == HORN
		992	|| tmp->type == POWER_CRYSTAL)
		993	{
		994	CHK_PICK_PICKUP;
		995	continue;
		996	}
		997
		998	/* pick up all magical items */
		999	if (op->contr->mode & PU_MAGICAL)
		1000	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1001	&& !tmp->flag [FLAG_KNOWN_CURSED])
		1002	{
		1003	CHK_PICK_PICKUP;
		1004	continue;
		1005	}
		1006
		1007	if (op->contr->mode & PU_VALUABLES)
		1008	{
		1009	if (tmp->type == MONEY || tmp->type == GEM)
1073	{	1010	{
1074	case 0:	1011	CHK_PICK_PICKUP;
1075	return 1; /* don't pick up */	1012	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	}	1013	}
1107	}	1014	}
1108	else	1015
1109	{ /* old model */	1016	/* rings & amulets - talismans seems to be typed AMULET */
1110	/* NEW pickup handling */
1111	if (op->contr->mode & PU_DEBUG)	1017	if (op->contr->mode & PU_JEWELS)
		1018	if (tmp->type == RING
		1019	|| tmp->type == AMULET
		1020	|| tmp->type == GIRDLE
		1021	|| tmp->type == SKILL_TOOL)
1112	{	1022	{
1113	/* some debugging code to figure out item information */	1023	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;	1024	continue;
		1025	}
1160		1026
1161	/* ignore known cursed objects */	1027	/* we don't forget dragon food */
1162	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1028	if (op->contr->mode & PU_FLESH)
		1029	if (tmp->type == FLESH)
		1030	{
		1031	CHK_PICK_PICKUP;
1163	continue;	1032	continue;
		1033	}
1164		1034
1165	/* all food and drink if desired */	1035	/* bows and arrows. Bows are good for selling! */
1166	/* question: don't pick up known-poisonous stuff? */	1036	if (op->contr->mode & PU_BOW)
		1037	if (tmp->type == BOW)
		1038	{
		1039	CHK_PICK_PICKUP;
		1040	continue;
		1041	}
		1042
		1043	if (op->contr->mode & PU_ARROW)
		1044	if (tmp->type == ARROW)
		1045	{
		1046	CHK_PICK_PICKUP;
		1047	continue;
		1048	}
		1049
		1050	/* all kinds of armor etc. */
		1051	if (op->contr->mode & PU_ARMOUR)
		1052	if (tmp->type == ARMOUR)
		1053	{
		1054	CHK_PICK_PICKUP;
		1055	continue;
		1056	}
		1057
		1058	if (op->contr->mode & PU_HELMET)
		1059	if (tmp->type == HELMET)
		1060	{
		1061	CHK_PICK_PICKUP;
		1062	continue;
		1063	}
		1064
		1065	if (op->contr->mode & PU_SHIELD)
		1066	if (tmp->type == SHIELD)
		1067	{
		1068	CHK_PICK_PICKUP;
		1069	continue;
		1070	}
		1071
1167	if (op->contr->mode & PU_FOOD)	1072	if (op->contr->mode & PU_BOOTS)
1168	if (tmp->type == FOOD)	1073	if (tmp->type == BOOTS)
		1074	{
		1075	CHK_PICK_PICKUP;
		1076	continue;
		1077	}
		1078
		1079	if (op->contr->mode & PU_GLOVES)
		1080	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1081	{
		1082	CHK_PICK_PICKUP;
		1083	continue;
		1084	}
		1085
		1086	if (op->contr->mode & PU_CLOAK)
		1087	if (tmp->type == CLOAK)
		1088	{
		1089	CHK_PICK_PICKUP;
		1090	continue;
		1091	}
		1092
		1093	/* hoping to catch throwing daggers here */
		1094	if (op->contr->mode & PU_MISSILEWEAPON)
		1095	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
		1096	{
		1097	CHK_PICK_PICKUP;
		1098	continue;
		1099	}
		1100
		1101	/* careful: chairs and tables are weapons! */
		1102	if (op->contr->mode & PU_ALLWEAPON)
		1103	{
		1104	if (tmp->type == WEAPON)
		1105	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1169	{	1106	{
1170	pick_up (op, tmp);	1107	CHK_PICK_PICKUP;
1171	continue;	1108	continue;
1172	}	1109	}
		1110	}
1173		1111
		1112	/* misc stuff that's useful */
1174	if (op->contr->mode & PU_DRINK)	1113	if (op->contr->mode & PU_KEY)
1175	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1114	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1176	{	1115	{
1177	pick_up (op, tmp);	1116	CHK_PICK_PICKUP;
1178	continue;	1117	continue;
1179	}	1118	}
1180		1119
		1120	/* any of the last 4 bits set means we use the ratio for value
		1121	* pickups */
1181	if (op->contr->mode & PU_POTION)	1122	if (op->contr->mode & PU_RATIO)
1182	if (tmp->type == POTION)	1123	{
		1124	/* use value density to decide what else to grab */
		1125	/* >=7 was >= op->contr->mode */
		1126	/* >=7 is the old standard setting. Now we take the last 4 bits
1183	{	1127	*/
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)	1128	wvratio = op->contr->mode & PU_RATIO;
1220	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1129	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1221	{
1222	pick_up (op, tmp);
1223	continue;
1224	}
1225
1226	if (op->contr->mode & PU_VALUABLES)
1227	{	1130	{
1228	if (tmp->type == MONEY || tmp->type == GEM)	1131	#if 0
		1132	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1133	if (tmp->name != NULL)
1229	{	1134	{
1230	pick_up (op, tmp);	1135	fprintf (stderr, "%s", tmp->name);
1231	continue;
1232	}	1136	}
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	1137	else
1367	fprintf (stderr, "%s", tmp->arch->name);	1138	fprintf (stderr, "%s", tmp->arch->archname);
1368	fprintf (stderr, ",%d] = ", tmp->type);	1139	fprintf (stderr, ",%d] = ", tmp->type);
1369	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1140	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1370	#endif	1141	#endif
		1142	CHK_PICK_PICKUP;
1371	continue;	1143	continue;
1372	}
1373	}	1144	}
1374	} /* the new pickup model */	1145	} /* the new pickup model */
1375	}	1146	}
1376		1147
1377	return !stop;	1148	return !stop;
		1149	}
		1150
		1151	/* routine for both players and monsters. We call this when
		1152	* there is a possibility for our action distrubing our hiding
		1153	* place or invisiblity spell. Artefact invisiblity causes
		1154	* "noise" instead. If we arent invisible to begin with, we
		1155	* return 0.
		1156	*/
		1157	static int
		1158	action_makes_visible (object *op)
		1159	{
		1160	if (op->invisible && op->flag [FLAG_ALIVE])
		1161	{
		1162	if (op->flag [FLAG_MAKE_INVIS])
		1163	{
		1164	// artefact invisibility is permanent, but we still make noise
		1165	// this is important for game-balance.
		1166	if (op->contr)
		1167	op->make_noise ();
		1168
		1169	return 0;
		1170	}
		1171
		1172	if (op->contr && op->contr->tmp_invis == 0)
		1173	return 0;
		1174
		1175	/* If monsters, they should become visible */
		1176	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1177	{
		1178	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1179	return 1;
		1180	}
		1181	}
		1182
		1183	return 0;
1378	}	1184	}
1379		1185
1380	/*	1186	/*
1381	* Find an arrow in the inventory and after that	1187	* Find an arrow in the inventory and after that
1382	* in the right type container (quiver). Pointer to the	1188	* in the right type container (quiver). Pointer to the
1383	* found object is returned.	1189	* found object is returned.
1384	*/	1190	*/
1385	object *	1191	static object *
1386	find_arrow (object *op, const char *type)	1192	find_arrow (object *op, const char *type)
1387	{	1193	{
1388	object *tmp = 0;
1389
1390	for (op = op->inv; op; op = op->below)	1194	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)	1195	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1196	return splay (tmp);
		1197
		1198	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1199	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
		1200	if (object *arrow = find_arrow (tmp, type))
		1201	{
		1202	splay (tmp);
1394	return op;	1203	return arrow;
		1204	}
1395		1205
1396	return tmp;	1206	return 0;
1397	}	1207	}
1398		1208
1399	/*	1209	/*
1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1210	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1401	* against the target. A full test is not performed, simply a basic test	1211	* against the target. A full test is not performed, simply a basic test
1402	* of resistances. The archer is making a quick guess at what he sees down	1212	* of resistances. The archer is making a quick guess at what he sees down
1403	* the hall. Failing that it does it's best to pick the highest plus arrow.	1213	* the hall. Failing that it does it's best to pick the highest plus arrow.
1404	*/	1214	*/
1405	object *	1215	static object *
1406	find_better_arrow (object *op, object *target, const char *type, int *better)	1216	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1407	{	1217	{
1408	object *tmp = NULL, *arrow, *ntmp;	1218	object *tmp = NULL, *arrow, *ntmp;
1409	int attacknum, attacktype, betterby = 0, i;	1219	int attacknum, attacktype, betterby = 0, i;
1410		1220
1411	if (!type)	1221	if (!type)
1412	return NULL;	1222	return NULL;
1413		1223
1414	for (arrow = op->inv; arrow; arrow = arrow->below)	1224	for (arrow = op->inv; arrow; arrow = arrow->below)
1415	{	1225	{
1416	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1226	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1417	{	1227	{
1418	i = 0;	1228	i = 0;
1419	ntmp = find_better_arrow (arrow, target, type, &i);	1229	ntmp = find_better_arrow (arrow, target, type, &i);
		1230
1420	if (i > betterby)	1231	if (i > betterby)
1421	{	1232	{
1422	tmp = ntmp;	1233	tmp = ntmp;
1423	betterby = i;	1234	betterby = i;
1424	}	1235	}
1425	}	1236	}
1426	else if (arrow->type == ARROW && arrow->race == type)	1237	else if (arrow->type == ARROW && arrow->race == type)
1427	{	1238	{
1428	/* allways prefer assasination/slaying */	1239	/* allways prefer assasination/slaying */
1429	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1240	if (target->race && arrow->slaying.contains (target->race))
1430	{	1241	{
1431	if (arrow->attacktype & AT_DEATH)	1242	if (arrow->attacktype & AT_DEATH)
1432	{	1243	{
1433	*better = 100;	1244	*better = 100;
1434	return arrow;	1245	return arrow;
…		…
1442	else	1253	else
1443	{	1254	{
1444	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1255	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1445	{	1256	{
1446	attacktype = 1 << attacknum;	1257	attacktype = 1 << attacknum;
1447	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1258	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1448	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1259	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1449	{	1260	{
1450	tmp = arrow;	1261	tmp = arrow;
1451	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1262	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1452	}	1263	}
1453	}	1264	}
		1265
1454	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1266	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1455	{	1267	{
1456	tmp = arrow;	1268	tmp = arrow;
1457	betterby = 2 + arrow->magic + arrow->stats.dam;	1269	betterby = 2 + arrow->magic + arrow->stats.dam;
1458	}	1270	}
		1271
1459	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1272	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1460	{	1273	{
1461	tmp = arrow;	1274	tmp = arrow;
1462	betterby = 1 + arrow->magic + arrow->stats.dam;	1275	betterby = 1 + arrow->magic + arrow->stats.dam;
1463	}	1276	}
1464	}	1277	}
1465	}	1278	}
1466	}	1279	}
		1280
1467	if (tmp == NULL && arrow == NULL)	1281	if (tmp == NULL && arrow == NULL)
1468	return find_arrow (op, type);	1282	return find_arrow (op, type);
1469		1283
1470	*better = betterby;	1284	*better = betterby;
1471	return tmp;	1285	return tmp;
…		…
1475	* find_better_arrow to find a decent arrow to use.	1289	* find_better_arrow to find a decent arrow to use.
1476	* op = the shooter	1290	* op = the shooter
1477	* type = bow->race	1291	* type = bow->race
1478	* dir = fire direction	1292	* dir = fire direction
1479	*/	1293	*/
1480	object *	1294	static object *
1481	pick_arrow_target (object *op, const char *type, int dir)	1295	pick_arrow_target (object *op, shstr_cmp type, int dir)
1482	{	1296	{
1483	object *tmp = NULL;	1297	object *tmp = NULL;
1484	maptile *m;	1298	maptile *m;
1485	int i, mflags, found, number;	1299	int i, mflags, found, number;
1486	sint16 x, y;	1300	sint16 x, y;
…		…
1501	for (i = 0, found = 0; i < 20; i++)	1315	for (i = 0, found = 0; i < 20; i++)
1502	{	1316	{
1503	x += freearr_x[dir];	1317	x += freearr_x[dir];
1504	y += freearr_y[dir];	1318	y += freearr_y[dir];
1505	mflags = get_map_flags (m, &m, x, y, &x, &y);	1319	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1320
1506	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1321	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1507	{	1322	{
1508	tmp = NULL;	1323	tmp = 0;
1509	break;	1324	break;
1510	}	1325	}
1511	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1326	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1512	{	1327	{
1513	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1328	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1514	* perhaps a bad assumption.	1329	* perhaps a bad assumption.
1515	*/	1330	*/
1516	tmp = NULL;	1331	tmp = 0;
1517	break;	1332	break;
1518	}	1333	}
		1334
1519	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1520	{
1521	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1336	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1522	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1337	if (tmp->flag [FLAG_ALIVE])
1523	{
1524	found++;
1525	break;
1526	}
1527	if (found)
1528	break;	1338	break;
1529	}
1530	}	1339	}
1531	if (tmp == NULL)	1340
		1341	if (!tmp)
1532	return find_arrow (op, type);	1342	return find_arrow (op, type);
1533		1343
1534	if (tmp->head)	1344	if (tmp->head)
1535	tmp = tmp->head;	1345	tmp = tmp->head;
1536		1346
…		…
1576	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1386	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1577	return 0;	1387	return 0;
1578	}	1388	}
1579		1389
1580	// optimisation: move object to top so we will find it quickly again	1390	// optimisation: move object to top so we will find it quickly again
1581	if (bow->below)	1391	splay (bow);
1582	{
1583	bow->remove ();
1584	op->insert (bow);
1585	}
1586
1587	}	1392	}
1588		1393
1589	if (!bow->race || !bow->skill)	1394	if (!bow->race || !bow->skill)
1590	{	1395	{
1591	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1396	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1598	{	1403	{
1599	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
1600	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1405	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1601	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1406	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1602	else	1407	else
1603	CLEAR_FLAG (op, FLAG_READY_BOW);	1408	op->clr_flag (FLAG_READY_BOW);
1604		1409
1605	return 0;	1410	return 0;
1606	}	1411	}
1607	}	1412	}
1608		1413
…		…
1617	}	1422	}
1618		1423
1619	/* this should not happen, but sometimes does */	1424	/* this should not happen, but sometimes does */
1620	if (arrow->nrof == 0)	1425	if (arrow->nrof == 0)
1621	{	1426	{
		1427	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1622	arrow->destroy ();	1428	arrow->destroy ();
1623	return 0;	1429	return 0;
1624	}	1430	}
1625		1431
1626	left = arrow; /* these are arrows left to the player */	1432	left = arrow; /* these are arrows left to the player */
1627	arrow = get_split_ob (arrow, 1);	1433	arrow = arrow->split ();
1628	if (!arrow)	1434	if (!arrow)
1629	{	1435	{
1630	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1436	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1631	return 0;	1437	return 0;
1632	}	1438	}
…		…
1636	arrow->direction = dir;	1442	arrow->direction = dir;
1637		1443
1638	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1444	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1639	arrow->stats.hp = arrow->stats.dam;	1445	arrow->stats.hp = arrow->stats.dam;
1640	arrow->stats.grace = arrow->attacktype;	1446	arrow->stats.grace = arrow->attacktype;
		1447	arrow->custom_name = arrow->slaying;
1641		1448
1642	if (arrow->slaying)	1449	#if 0
1643	arrow->spellarg = strdup (arrow->slaying);
1644
1645	if (player *pl = op->contr)	1450	if (player *pl = op->contr)
1646	{	1451	{
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;	1452	float speed = pl->weapon_sp;
1654		1453
1655	/* penalize ROF for bestarrow */	1454	/* penalize ROF for bestarrow */
1656	if (pl->bowtype == bow_bestarrow)	1455	if (pl->bowtype == bow_bestarrow)
1657	speed *= .9f;	1456	speed *= .9f;
1658	else	1457	else
1659	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1458	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1660		1459
1661	op->speed_left += speed - op->speed;	1460	op->speed_left += speed - op->speed;
		1461	}
1662	#endif	1462	#endif
1663	}
1664		1463
1665	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1666		1465
1667	/* update the speed */	1466	/* 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		1467
1671	arrow->set_speed (max (arrow->speed, 2.0));
1672	arrow->speed_left = 0;	1468	arrow->speed_left = 0;
		1469	arrow->set_speed (max (2.f,
		1470	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1471	+ bow->stats.dam / 7.f
		1472	));
1673		1473
1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1474	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1675		1475
1676	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1677	{	1477	{
…		…
1699		1499
1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1500	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1701	arrow->move_type = MOVE_FLY_LOW;	1501	arrow->move_type = MOVE_FLY_LOW;
1702	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1502	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1703		1503
1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1504	op->play_sound (sound_find ("fire_arrow"));
1705	m->insert (arrow, sx, sy, op);	1505	m->insert (arrow, sx, sy, op);
1706		1506
1707	if (!arrow->destroyed ())	1507	if (!arrow->destroyed ())
1708	move_arrow (arrow);	1508	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		1509
1718	return 1;	1510	return 1;
1719	}	1511	}
1720		1512
1721	/* Special fire code for players - this takes into	1513	/* Special fire code for players - this takes into
…		…
1723	* but monsters can't. Putting that code here	1515	* but monsters can't. Putting that code here
1724	* makes the fire_bow code much cleaner.	1516	* makes the fire_bow code much cleaner.
1725	* this function should only be called if 'op' is a player,	1517	* this function should only be called if 'op' is a player,
1726	* hence the function name.	1518	* hence the function name.
1727	*/	1519	*/
1728	int	1520	static int
1729	player_fire_bow (object *op, int dir)	1521	player_fire_bow (object *op, int dir)
1730	{	1522	{
1731	int ret = 0, wcmod = 0;	1523	int ret;
1732		1524
1733	if (op->contr->bowtype == bow_bestarrow)	1525	if (op->contr->bowtype == bow_bestarrow)
1734	{	1526	{
1735	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1527	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1736	}	1528	}
1737	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1529	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1738	{	1530	{
1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1531	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);	1532	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1743	}	1533	}
1744	else if (op->contr->bowtype == bow_threewide)	1534	else if (op->contr->bowtype == bow_threewide)
1745	{	1535	{
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1536	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)]);	1537	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)]);	1538	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1749	}	1539	}
1750	else if (op->contr->bowtype == bow_spreadshot)	1540	else if (op->contr->bowtype == bow_spreadshot)
1751	{	1541	{
1752	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1542	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);	1543	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);	1544	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1755	}	1545	}
1756	else	1546	else
1757	{	1547	{
…		…
1763	}	1553	}
1764		1554
1765	/* Fires a misc (wand/rod/horn) object in 'dir'.	1555	/* Fires a misc (wand/rod/horn) object in 'dir'.
1766	* Broken apart from 'fire' to keep it more readable.	1556	* Broken apart from 'fire' to keep it more readable.
1767	*/	1557	*/
1768	void	1558	static void
1769	fire_misc_object (object *op, int dir)	1559	fire_misc_object (object *op, int dir)
1770	{	1560	{
1771	object *item = op->contr->ranged_ob;	1561	object *item = op->contr->ranged_ob;
1772		1562
1773	if (!item)	1563	if (!item)
…		…
1780	{	1570	{
1781	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1571	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1782	return;	1572	return;
1783	}	1573	}
1784		1574
1785	if (!op->change_weapon (item))	1575	if (!op->apply (item))
1786	return;	1576	return;
1787		1577
1788	if (item->type == WAND)	1578	if (item->type == WAND)
1789	{	1579	{
1790	if (item->stats.food <= 0)	1580	if (item->stats.food <= 0)
1791	{	1581	{
1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1582	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));	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1794		1584
1795	return;	1585	return;
1796	}	1586	}
1797	}	1587	}
1798	else if (item->type == ROD || item->type == HORN)	1588	else if (item->type == ROD || item->type == HORN)
1799	{	1589	{
1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1590	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
		1591
		1592	// using the maximum of the rods charge allows at least one spell cast
		1593	// for a rod or horn, this fixes some broken rods.
		1594	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1801	{	1595	{
1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1596	op->contr->play_sound (sound_find ("wand_poof"));
1803		1597
1804	if (item->type == ROD)	1598	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));	1599	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1806	else	1600	else
1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1601	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1810	}	1604	}
1811	}	1605	}
1812		1606
1813	if (cast_spell (op, item, dir, item->inv, NULL))	1607	if (cast_spell (op, item, dir, item->inv, NULL))
1814	{	1608	{
1815	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1609	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1610
1816	if (item->type == WAND)	1611	if (item->type == WAND)
1817	{	1612	{
1818	if (!(--item->stats.food))	1613	if (!(--item->stats.food))
1819	{	1614	{
1820	object *tmp;
1821
1822	if (item->arch)	1615	if (item->arch)
1823	{	1616	{
1824	CLEAR_FLAG (item, FLAG_ANIMATE);	1617	item->clr_flag (FLAG_ANIMATE);
1825	item->face = item->arch->clone.face;	1618	item->face = item->arch->face;
1826	item->set_speed (0);	1619	item->set_speed (0);
1827	}	1620	}
1828		1621
1829	if ((tmp = item->in_player ()))	1622	if (object *pl = item->visible_to ())
1830	esrv_update_item (UPD_ANIM, tmp, item);	1623	esrv_update_item (UPD_ANIM, pl, item);
1831	}	1624	}
1832	}	1625	}
1833	else if (item->type == ROD || item->type == HORN)	1626	else if (item->type == ROD || item->type == HORN)
1834	drain_rod_charge (item);	1627	drain_rod_charge (item);
1835	}	1628	}
1836	}	1629	}
1837		1630
1838	/* Received a fire command for the player - go and do it.	1631	/* Received a fire command for the player - go and do it.
1839	*/	1632	*/
1840	void	1633	bool
1841	fire (object *op, int dir)	1634	fire (object *who, int dir)
1842	{	1635	{
1843	int spellcost = 0;	1636	int spellcost = 0;
1844		1637
		1638	player *pl = who->contr;
		1639
		1640	if (pl->golem)
		1641	{
		1642	control_golem (who->contr->golem, dir);
		1643	return false;
		1644	}
		1645
		1646	object *ob = pl->ranged_ob;
		1647
		1648	if (!ob)
		1649	return false;
		1650
		1651	if (who->speed_left > 0.f)
		1652	--who->speed_left;
		1653	else
		1654	return false;
		1655
		1656	if (!who->apply (ob))
		1657	return false;
		1658
1845	/* check for loss of invisiblity/hide */	1659	/* check for loss of invisiblity/hide */
1846	if (action_makes_visible (op))	1660	if (action_makes_visible (who))
1847	make_visible (op);	1661	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		1662
1865	switch (ob->type)	1663	switch (ob->type)
1866	{	1664	{
1867	case BOW:	1665	case BOW:
1868	player_fire_bow (op, dir);	1666	player_fire_bow (who, dir);
1869	break;	1667	break;
1870		1668
1871	case SPELL:	1669	case SPELL:
1872	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1670	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1873	break;	1671	break;
1874		1672
1875	case BUILDER:	1673	case BUILDER:
1876	apply_map_builder (op, dir);	1674	apply_map_builder (who, dir);
1877	break;	1675	break;
1878		1676
1879	case SKILL:	1677	case SKILL:
1880	do_skill (op, op, ob, dir, 0);	1678	do_skill (who, who, ob, dir, 0);
1881	break;	1679	break;
1882		1680
		1681	case RANGED:
		1682	do_skill (who, ob, who->chosen_skill, dir, 0);
		1683	break;
		1684
1883	default:	1685	default:
1884	fire_misc_object (op, dir);	1686	fire_misc_object (who, dir);
1885	break;	1687	break;
1886	}	1688	}
1887	}
1888		1689
1889	/* find_key	1690	return true;
1890	* We try to find a key for the door as passed. If we find a key	1691	}
1891	* and successfully use it, we return the key, otherwise NULL	1692
1892	* This function merges both normal and locked door, since the logic	1693	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)	1694	find_key_ (object *pl, object *container, object *door)
1901	{	1695	{
1902	object *tmp, *key;	1696	object *tmp, *key;
1903		1697
1904	/* Should not happen, but sanity checking is never bad */	1698	/* Should not happen, but sanity checking is never bad */
1905	if (!container->inv)	1699	if (!container->inv)
…		…
1908	/* First, lets try to find a key in the top level inventory */	1702	/* First, lets try to find a key in the top level inventory */
1909	for (tmp = container->inv; tmp; tmp = tmp->below)	1703	for (tmp = container->inv; tmp; tmp = tmp->below)
1910	{	1704	{
1911	if (door->type == DOOR && tmp->type == KEY)	1705	if (door->type == DOOR && tmp->type == KEY)
1912	break;	1706	break;
		1707
1913	/* For sanity, we should really check door type, but other stuff	1708	/* For sanity, we should really check door type, but other stuff
1914	* (like containers) can be locked with special keys	1709	* (like containers) can be locked with special keys
1915	*/	1710	*/
1916	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1711	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1917	break;	1712	break;
…		…
1923	* a key, return	1718	* a key, return
1924	*/	1719	*/
1925	if (!tmp)	1720	if (!tmp)
1926	{	1721	{
1927	for (tmp = container->inv; tmp; tmp = tmp->below)	1722	for (tmp = container->inv; tmp; tmp = tmp->below)
1928	{
1929	/* No reason to search empty containers */	1723	/* No reason to search empty containers */
1930	if (tmp->type == CONTAINER && tmp->inv)	1724	if (tmp->type == CONTAINER && tmp->inv)
1931	{
1932	if ((key = find_key (pl, tmp, door)))	1725	if ((key = find_key_ (pl, tmp, door)))
1933	return key;	1726	return key;
1934	}
1935	}
1936		1727
1937	if (!tmp)	1728	if (!tmp)
1938	return NULL;	1729	return 0;
1939	}	1730	}
1940		1731
1941	/* We get down here if we have found a key. Now if its in a container,	1732	/* 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	1733	* see if we actually want to use it
1943	*/	1734	*/
1944	if (pl != container)	1735	if (pl != container)
1945	{	1736	{
1946	/* Only let players use keys in containers */	1737	/* Only let players use keys in containers */
1947	if (!pl->contr)	1738	if (!pl->contr)
1948	return NULL;	1739	return 0;
		1740
1949	/* cases where this fails:	1741	/* cases where this fails:
1950	* If we only search the player inventory, return now since we	1742	* If we only search the player inventory, return now since we
1951	* are not in the players inventory.	1743	* are not in the players inventory.
1952	* If the container is not active, return now since only active	1744	* If the container is not active, return now since only active
1953	* containers can be used.	1745	* containers can be used.
…		…
1957	* inv must have been an container and must have been active.	1749	* inv must have been an container and must have been active.
1958	*	1750	*
1959	* Change the color so that the message doesn't disappear with	1751	* Change the color so that the message doesn't disappear with
1960	* all the others.	1752	* all the others.
1961	*/	1753	*/
1962	if (pl->contr->usekeys == key_inventory ||	1754	if (pl->contr->usekeys == key_inventory
1963	!QUERY_FLAG (container, FLAG_APPLIED) ||	1755	|| !container->flag [FLAG_APPLIED]
1964	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1756	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1965	{	1757	{
1966	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1758	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));	1759	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1968	return NULL;	1760	return NULL;
1969	}	1761	}
1970	}	1762	}
1971		1763
1972	return tmp;	1764	return tmp;
		1765	}
		1766
		1767	/* find_key
		1768	* We try to find a key for the door as passed. If we find a key
		1769	* and successfully use it, we return the key, otherwise NULL
		1770	* This function merges both normal and locked door, since the logic
		1771	* for both is the same - just the specific key is different.
		1772	* pl is the player,
		1773	* inv is the objects inventory to searched
		1774	* door is the door we are trying to match against.
		1775	* This function can be called recursively to search containers.
		1776	*/
		1777	object *
		1778	find_key (object *pl, object *container, object *door)
		1779	{
		1780	if (door->slaying && is_match_expr (door->slaying))
		1781	{
		1782	// for match expressions, we try to find the key by applying the match
		1783	// to the op itself, which is supposed to find the "key", instead
		1784	// of searching through containers ourselves.
		1785
		1786	return match_one (door->slaying, container, door, pl, pl);
		1787	}
		1788	else
		1789	return find_key_ (pl, container, door);
1973	}	1790	}
1974		1791
1975	/* moved door processing out of move_player_attack.	1792	/* moved door processing out of move_player_attack.
1976	* returns 1 if player has opened the door with a key	1793	* returns 1 if player has opened the door with a key
1977	* such that the caller should not do anything more,	1794	* such that the caller should not do anything more,
1978	* 0 otherwise	1795	* 0 otherwise
1979	*/	1796	*/
1980	static int	1797	static int
1981	player_attack_door (object *op, object *door)	1798	player_attack_door (object *op, object *door)
1982	{	1799	{
1983	/* If its a door, try to find a use a key. If we do destroy the door,	1800	/* 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 -	1801	* might as well return immediately as there is nothing more to do -
1985	* otherwise, we fall through to the rest of the code.	1802	* otherwise, we fall through to the rest of the code.
1986	*/	1803	*/
1987	object *key = find_key (op, op, door);	1804	object *key = find_key (op, op, door);
1988		1805
1989	/* IF we found a key, do some extra work */	1806	/* If we found a key, do some extra work */
1990	if (key)	1807	if (key)
1991	{	1808	{
1992	object *container = key->env;	1809	object *container = key->env;
1993
1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1995		1810
1996	if (action_makes_visible (op))	1811	if (action_makes_visible (op))
1997	make_visible (op);	1812	make_visible (op);
1998		1813
1999	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1814	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
2001		1816
2002	if (door->type == DOOR)	1817	if (door->type == DOOR)
2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1818	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2004	else if (door->type == LOCKED_DOOR)	1819	else if (door->type == LOCKED_DOOR)
2005	{	1820	{
2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1821	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2007	remove_door2 (door); /* remove door without violence ;-) */	1822	remove_door2 (door); /* remove door without violence ;-) */
2008	}	1823	}
2009		1824
2010	/* Do this after we print the message */	1825	/* Do this after we print the message */
2011	decrease_ob (key); /* Use up one of the keys */	1826	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		1827
2016	return 1; /* Nothing more to do below */	1828	return 1; /* Nothing more to do below */
2017	}	1829	}
2018	else if (door->type == LOCKED_DOOR)	1830	else if (door->type == LOCKED_DOOR)
2019	{	1831	{
2020	/* Might as well return now - no other way to open this */	1832	/* Might as well return now - no other way to open this */
2021	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1833	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2022	return 1;	1834	return 1;
2023	}	1835	}
2024		1836
2025	return 0;	1837	return 0;
2026	}	1838	}
…		…
2029	* It should keep the code cleaner.	1841	* It should keep the code cleaner.
2030	* When this is called, the players direction has been updated	1842	* When this is called, the players direction has been updated
2031	* (taking into account confusion.) The player is also actually	1843	* (taking into account confusion.) The player is also actually
2032	* going to try and move (not fire weapons).	1844	* going to try and move (not fire weapons).
2033	*/	1845	*/
2034	void	1846	bool
2035	move_player_attack (object *op, int dir)	1847	move_player_attack (object *op, int dir)
2036	{	1848	{
2037	object *tmp, *mon;	1849	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
2038	int on_battleground;	1850	{
2039	maptile *m;	1851	--op->speed_left;
		1852	return true;
		1853	}
2040		1854
2041	sint16 nx = freearr_x[dir] + op->x;	1855	sint16 nx = freearr_x[dir] + op->x;
2042	sint16 ny = freearr_y[dir] + op->y;	1856	sint16 ny = freearr_y[dir] + op->y;
2043		1857
2044	on_battleground = op_on_battleground (op, 0, 0);	1858	if (out_of_map (op->map, nx, ny))
		1859	return false;
2045		1860
2046	/* If braced, or can't move to the square, and it is not out of the	1861	/* 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	1862	* 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	1863	* 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	1864	* 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	1865	* 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	1866	* 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	1867	* quite a bit of processing. However, it probably is less than what
2053	* move_ob uses.	1868	* move_ob uses.
2054	*/	1869	*/
2055	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	1870	maptile *m = op->map->xy_find (nx, ny);
		1871
		1872	/* Go through all the objects, and find ones of interest. Only stop if
		1873	* we find a monster - that is something we know we want to attack.
		1874	* if its a door or barrel (can roll) see if there may be monsters
		1875	* on the space
		1876	*/
		1877	object *mon;
		1878	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
		1879	{
		1880	if ((mon->flag [FLAG_ALIVE]
		1881	|| mon->type == LOCKED_DOOR
		1882	|| mon->flag [FLAG_CAN_ROLL])
		1883	&& mon != op)
		1884	break;
2056	{	1885	}
2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))	1886
		1887	/* no monster == player tries to move into a wall or so */
		1888	if (!mon)
		1889	{
		1890	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1891	if (op->move_type & ob->move_block)
2058	{	1892	{
2059	m = op->map->xy_find (nx, ny);	1893	if (ob->move_block == MOVE_ALL)
2060	if (!m)	1894	move_into_wall (op, ob);
2061	return; /* Don't think this should happen */	1895	else
		1896	{
		1897	if (op->contr->ns->bumpmsg)
		1898	{
		1899	op->play_sound (sound_find ("blocked_move"));
		1900
		1901	op->statusmsg (ob->invisible
		1902	? "Something blocks you."
		1903	: format ("Something blocks you from entering the %s.", query_name (ob))
		1904	);
		1905	}
		1906	}
		1907
		1908	break;
		1909	}
		1910
		1911	return false;
		1912	}
		1913
		1914	mon = mon->head_ ();
		1915
		1916	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		1917	if (op->contr->weapon_sp_left > 0.f)
		1918	if (player_attack_door (op, mon))
		1919	{
		1920	--op->contr->weapon_sp_left;
		1921	return true;
		1922	}
		1923
		1924	/* The following deals with possibly attacking peaceful
		1925	* or friendly creatures. Basically, all players are considered
		1926	* unaggressive. If the moving player has peaceful set, then the
		1927	* object should be pushed instead of attacked. It is assumed that
		1928	* if you are braced, you will not attack friends accidently,
		1929	* and thus will not push them.
		1930	*/
		1931
		1932	/* If the creature is a pet, push it even if the player is not
		1933	* peaceful. Our assumption is the creature is a pet if the
		1934	* player owns it and it is either friendly or unagressive.
		1935	*/
		1936	if (op->type == PLAYER
		1937	&& ((mon->owner && mon->owner->contr
		1938	&& same_party (mon->owner->contr->party, op->contr->party))
		1939	|| mon->owner == op)
		1940	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
		1941	{
		1942	/* If we're braced, we don't want to switch places with it */
		1943	if (op->contr->braced)
		1944	return false;
		1945
		1946	if (op->speed_left > 0.f)
		1947	{
		1948	--op->speed_left;
		1949
		1950	op->play_sound (sound_find ("push_player"));
		1951	push_ob (mon, dir, op);
		1952
		1953	if (action_makes_visible (op))
		1954	make_visible (op);
		1955
		1956	return true;
2062	}	1957	}
2063	else	1958	else
2064	m = op->map;
2065
2066	if (!(tmp = m->at (nx, ny).bot))
2067	return;	1959	return false;
		1960	}
2068		1961
2069	mon = 0;	1962	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		1963
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	1964	/* in certain circumstances, you shouldn't attack friendly
2136	* creatures. Note that if you are braced, you can't push	1965	* creatures. Note that if you are braced, you can't push
2137	* someone, but put it inside this loop so that you won't	1966	* someone, but put it inside this loop so that you won't
2138	* attack them either.	1967	* attack them either.
2139	*/	1968	*/
2140	if ((mon->type == PLAYER || mon->enemy != op)	1969	if ((mon->type == PLAYER || mon->enemy != op)
2141	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1970	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2142	&& ((op->contr->peaceful	1971	&& ((op->contr->peaceful
2143	|| (mon->type == PLAYER && mon->contr->peaceful))	1972	|| (mon->type == PLAYER && mon->contr->peaceful))
2144	&& !on_battleground))	1973	&& !on_battleground))
		1974	{
		1975	if (op->speed_left > 0.f)
2145	{	1976	{
		1977	--op->speed_left;
		1978
2146	if (!op->contr->braced)	1979	if (!op->contr->braced)
2147	{	1980	{
2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1981	op->play_sound (sound_find ("push_player"));
2149	push_ob (mon, dir, op);	1982	push_ob (mon, dir, op);
2150	}	1983	}
2151	else	1984	else
2152	new_draw_info (0, 0, op, "You withhold your attack");	1985	op->statusmsg ("You withhold your attack");
2153		1986
2154	if (op->contr->tmp_invis || op->hide)	1987	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2155	make_visible (op);	1988	make_visible (op);
2156	}
2157		1989
		1990	return true;
		1991	}
		1992	}
2158	/* If the object is a boulder or other rollable object, then	1993	/* 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.	1994	* roll it if not braced. You can't roll it if you are braced.
2160	*/	1995	*/
2161	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1996	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
		1997	{
		1998	if (op->speed_left > 0.f)
2162	{	1999	{
		2000	--op->speed_left;
		2001
2163	recursive_roll (mon, dir, op);	2002	recursive_roll (mon, dir, op);
2164	if (action_makes_visible (op))	2003	if (action_makes_visible (op))
2165	make_visible (op);	2004	make_visible (op);
2166	}
2167		2005
		2006	return true;
		2007	}
		2008	}
2168	/* Any generic living creature. Including things like doors.	2009	/* Any generic living creature. Including things like doors.
2169	* Way it works is like this: First, it must have some hit points	2010	* 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:	2011	* 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	2012	* 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.	2013	* that party_number -1 is no party, so attacks can still happen.
2173	*/	2014	*/
2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2015	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2175	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2016	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2176	{	2017	{
2177	if (!op->contr->has_hit)	2018	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2178	{	2019	{
2179	op->contr->has_hit = 1;	2020	--op->contr->weapon_sp_left;
2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2181	}
2182		2021
2183	skill_attack (mon, op, 0, 0, 0);	2022	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		2023
2199	if (action_makes_visible (op))	2024	if (action_makes_visible (op))
2200	make_visible (op);	2025	make_visible (op);
2201	}
2202	} /* if player should attack something */
2203	}
2204		2026
2205	int	2027	return true;
		2028	}
		2029	}
		2030
		2031	return false;
		2032	}
		2033
		2034	bool
2206	move_player (object *op, int dir)	2035	move_player (object *op, int dir)
2207	{	2036	{
2208	int pick;
2209
2210	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2037	if (!op->map || op->map->state != MAP_ACTIVE)
2211	return 0;	2038	return 0;
2212		2039
2213	/* Sanity check: make sure dir is valid */	2040	/* Sanity check: make sure dir is valid */
2214	if ((dir < 0) || (dir >= 9))	2041	if (dir < 0 || dir > 8)
2215	{	2042	{
2216	LOG (llevError, "move_player: invalid direction %d\n", dir);	2043	LOG (llevError, "move_player: invalid direction %d\n", dir);
2217	return 0;	2044	return 0;
2218	}	2045	}
2219		2046
2220	/* peterm: added following line */	2047	/* peterm: added following line */
2221	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2048	if (op->flag [FLAG_CONFUSED] && dir)
2222	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2049	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2223		2050
2224	op->facing = dir;	2051	op->facing = dir;
2225		2052
2226	if (op->hide)	2053	if (op->flag [FLAG_HIDDEN])
2227	do_hidden_move (op);	2054	do_hidden_move (op);
2228		2055
		2056	bool retval;
		2057	int pick = 0;
		2058
2229	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2059	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2230	/*nop */ ;	2060	retval = RESULT_INT (0);
2231	else if (op->contr->fire_on)	2061	else if (op->contr->fire_on)
2232	fire (op, dir);	2062	retval = fire (op, dir);
2233	else	2063	else
2234	{	2064	{
2235	move_player_attack (op, dir);	2065	retval = move_player_attack (op, dir);
2236	pick = check_pick (op);	2066	pick = check_pick (op);
2237	}	2067	}
2238		2068
2239	/* Add special check for newcs players and fire on - this way, the	2069	/* Add special check for newcs players and fire on - this way, the
2240	* server can handle repeat firing.	2070	* server can handle repeat firing.
…		…
2247	/* Update how the player looks. Use the facing, so direction may	2077	/* Update how the player looks. Use the facing, so direction may
2248	* get reset to zero. This allows for full animation capabilities	2078	* get reset to zero. This allows for full animation capabilities
2249	* for players.	2079	* for players.
2250	*/	2080	*/
2251	animate_object (op, op->facing);	2081	animate_object (op, op->facing);
2252	return 0;	2082
		2083	return retval;
2253	}	2084	}
2254		2085
2255	/* This is similar to handle_player, below, but is only used by the	2086	/* This is similar to handle_player, below, but is only used by the
2256	* new client/server stuff.	2087	* new client/server stuff.
2257	* This is sort of special, in that the new client/server actually uses	2088	* This is sort of special, in that the new client/server actually uses
2258	* the new speed values for commands.	2089	* the new speed values for commands.
2259	*	2090	*
2260	* Returns true if there are more actions we can do.	2091	* Returns true if there are more actions we can do. Should not do
		2092	* many actions in a row, as that would be too unfair to other
		2093	* players.
2261	*/	2094	*/
2262	int	2095	bool
2263	handle_newcs_player (object *op)	2096	handle_newcs_player (object *op)
2264	{	2097	{
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])	2098	if (op->flag [FLAG_SCARED])
		2099	{
		2100	if (op->speed_left > 0.f)
2271	{	2101	{
2272	--op->speed_left;	2102	--op->speed_left;
		2103	flee_player (op);
		2104
2273	return 0;	2105	return true;
2274	}	2106	}
		2107	else
		2108	return false;
2275	}	2109	}
2276		2110
2277	/* call this here - we also will call this in do_ericserver, but	2111	/* call this here - we also will call this in do_ericserver, but
2278	* the players time has been increased when doericserver has been	2112	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2113	* called, so we recheck it here.
2280	*/	2114	*/
2281	if (op->contr->ns->handle_command ())	2115	if (op->contr->ns->handle_command ())
2282	return 1;	2116	return true;
2283		2117
2284	if (op->speed_left > 0.f)
2285	{
2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2118	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);	2119	return move_player (op, op->direction);
2296		2120
2297	return op->speed_left > 0.f;
2298	}
2299	}
2300
2301	return 0;	2121	return false;
2302	}	2122	}
2303		2123
2304	int	2124	static int
2305	save_life (object *op)	2125	save_life (object *op)
2306	{	2126	{
2307	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2127	if (!op->flag [FLAG_LIFESAVE])
2308	return 0;	2128	return 0;
2309		2129
2310	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2130	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2311	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2131	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2312	{	2132	{
2313	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2133	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));	2134	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2315		2135
2316	if (op->contr)
2317	esrv_del_item (op->contr, tmp->count);
2318
2319	tmp->destroy ();	2136	tmp->destroy ();
2320	CLEAR_FLAG (op, FLAG_LIFESAVE);	2137	op->clr_flag (FLAG_LIFESAVE);
2321		2138
2322	if (op->stats.hp < 0)	2139	if (op->stats.hp < 0)
2323	op->stats.hp = op->stats.maxhp;	2140	op->stats.hp = op->stats.maxhp;
2324		2141
2325	if (op->stats.food < 0)	2142	if (op->stats.food < 0)
2326	op->stats.food = 999;	2143	op->stats.food = MAX_FOOD;
2327		2144
2328	op->update_stats ();	2145	op->update_stats ();
2329	return 1;	2146	return 1;
2330	}	2147	}
2331		2148
2332	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2149	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2333	CLEAR_FLAG (op, FLAG_LIFESAVE);	2150	op->clr_flag (FLAG_LIFESAVE);
2334	enter_player_savebed (op); /* bring him home. */	2151	enter_player_savebed (op); /* bring him home. */
2335	return 0;	2152	return 0;
2336	}	2153	}
2337		2154
2338	/* This goes throws the inventory and removes unpaid objects, and puts them	2155	/* 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	2156	* 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	2157	* function will descend into containers. op is the object to start the search
2341	* from.	2158	* from.
2342	*/	2159	*/
		2160	static void
		2161	drop_unpaid_items (object *op, object *env)
		2162	{
		2163	while (op)
		2164	{
		2165	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2166
		2167	if (op->flag [FLAG_UNPAID])
		2168	op->insert_at (env);
		2169	else if (op->inv)
		2170	drop_unpaid_items (op->inv, env);
		2171
		2172	op = next;
		2173	}
		2174	}
		2175
2343	void	2176	void
2344	remove_unpaid_objects (object *op, object *env)	2177	object::drop_unpaid_items ()
2345	{	2178	{
2346	while (op)	2179	if (!flag [FLAG_REMOVED])
2347	{	2180	::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	}	2181	}
2406		2182
2407	void	2183	void
2408	do_some_living (object *op)	2184	do_some_living (object *op)
2409	{	2185	{
2410	int last_food = op->stats.food;	2186	int last_food = op->stats.food;
2411	int gen_hp, gen_sp, gen_grace;	2187	int gen_hp, gen_sp, gen_grace;
2412	int over_hp, over_sp, over_grace;
2413	int i;
2414	int rate_hp = 1200;	2188	int rate_hp = 1200;
2415	int rate_sp = 2500;	2189	int rate_sp = 2500;
2416	int rate_grace = 2000;	2190	int rate_grace = 2000;
2417	const int max_hp = 1;	2191	const int max_hp = 1;
2418	const int max_sp = 1;	2192	const int max_sp = 1;
2419	const int max_grace = 1;	2193	const int max_grace = 1;
2420		2194
		2195	#if 0
2421	if (op->contr->hidden)	2196	if (op->contr->hidden)
2422	{	2197	{
2423	op->invisible = 1000;	2198	op->invisible = 1000;
2424	/* the socket code flashes the player visible/invisible	2199	/* the socket code flashes the player visible/invisible
2425	* depending on the value of invisible, so we need to	2200	* depending on the value of invisible, so we need to
2426	* alternate it here for it to work correctly.	2201	* alternate it here for it to work correctly.
2427	*/	2202	*/
2428	if (pticks & 2)	2203	if (server_tick & 2)
2429	op->invisible--;	2204	op->invisible--;
2430	}	2205	}
		2206	else
		2207	#endif
2431	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2208	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2432	{	2209	{
2433	if (!op->invisible--)	2210	if (!op->invisible--)
2434	{	2211	{
2435	make_visible (op);	2212	make_visible (op);
2436	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2213	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2463	{	2240	{
2464	gen_grace = op->stats.maxgrace;	2241	gen_grace = op->stats.maxgrace;
2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2242	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2466	}	2243	}
2467		2244
2468	/* Regenerate Spell Points */	2245	/* Regenerate Grace */
2469	if (!op->contr->golem && --op->last_sp < 0)	2246	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
		2247	if (--op->last_grace < 0)
2470	{	2248	{
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)	2249	if (op->stats.grace < op->stats.maxgrace / 2)
		2250	op->stats.grace++; /* no penalty in food for regaining grace */
		2251
		2252	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2253
		2254	if (max_grace > 1)
2473	{	2255	{
2474	op->stats.sp++;	2256	int over_grace = temp / rate_grace;
2475	/* dms do not consume food */	2257
2476	if (!QUERY_FLAG (op, FLAG_WIZ))	2258	if (over_grace > 0)
2477	{	2259	{
2478	op->stats.food--;	2260	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)	2261	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	}	2262	}
		2263	else
		2264	op->last_grace = rate_grace / temp;
2484	}	2265	}
		2266	else
		2267	op->last_grace = rate_grace / temp;
2485		2268
2486	if (max_sp > 1)	2269	/* wearing stuff doesn't detract from grace generation. */
		2270	}
		2271
		2272	if (op->stats.food > 0)
		2273	{
		2274	/* Regenerate Spell Points */
		2275	if (!op->contr->golem && --op->last_sp < 0)
2487	{	2276	{
2488	over_sp = (gen_sp + 10) / rate_sp;	2277	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2489	if (over_sp > 0)	2278
		2279	if (op->stats.sp < op->stats.maxsp)
2490	{	2280	{
2491	if (op->stats.sp < op->stats.maxsp)	2281	op->stats.sp++;
		2282
		2283	/* dms do not consume food */
		2284	if (!op->flag [FLAG_WIZ])
2492	{	2285	{
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--;	2286	op->stats.food--;
2497		2287
2498	if (op->stats.sp > op->stats.maxsp)	2288	if (op->contr->digestion < 0)
		2289	op->stats.food += op->contr->digestion;
		2290	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2499	op->stats.sp = op->stats.maxsp;	2291	op->stats.food = last_food;
2500	}	2292	}
		2293	}
		2294
		2295	if (max_sp > 1)
		2296	{
		2297	int over_sp = (gen_sp + 10) / rate_sp;
		2298	if (over_sp > 0)
		2299	{
		2300	if (op->stats.sp < op->stats.maxsp)
		2301	{
		2302	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2303
		2304	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2305	op->stats.sp--;
		2306
		2307	if (op->stats.sp > op->stats.maxsp)
		2308	op->stats.sp = op->stats.maxsp;
		2309	}
		2310
2501	op->last_sp = 0;	2311	op->last_sp = 0;
		2312	}
		2313	else
		2314	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2502	}	2315	}
2503	else	2316	else
2504	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2317	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2505	}	2318	}
2506	else
2507	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2508	}
2509		2319
2510	/* Regenerate Grace */	2320	/* Regenerate Hit Points */
2511	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2512	if (--op->last_grace < 0)	2321	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	{	2322	{
2519	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2323	if (op->stats.hp < op->stats.maxhp)
2520	if (over_grace > 0)
2521	{	2324	{
2522	op->stats.sp += over_grace	2325	op->stats.hp++;
2523	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;	2326
		2327	/* dms do not consume food */
		2328	if (!op->flag [FLAG_WIZ])
		2329	{
		2330	op->stats.food--;
		2331
		2332	if (op->contr->digestion < 0)
		2333	op->stats.food += op->contr->digestion;
		2334	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2335	op->stats.food = last_food;
		2336	}
		2337	}
		2338
		2339	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2340
		2341	if (max_hp > 1)
		2342	{
		2343	int over_hp = temp / rate_hp;
		2344
		2345	if (over_hp > 0)
		2346	{
		2347	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2524	op->last_grace = 0;	2348	op->last_heal = 0;
		2349	}
		2350	else
		2351	op->last_heal = rate_hp / temp;
2525	}	2352	}
2526	else	2353	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;	2354	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	}	2355	}
2572	}	2356	}
2573		2357
2574	/* Digestion */	2358	/* Digestion */
2575	if (--op->last_eat < 0)	2359	if (--op->last_eat < 0)
2576	{	2360	{
2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2361	int bonus = max (0, op->contr->digestion),
		2362	penalty = max (0, -op->contr->digestion);
2578		2363
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2364	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		2365
2584	/* dms do not consume food */	2366	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2367	if (!op->flag [FLAG_WIZ])
2586	op->stats.food--;	2368	op->stats.food--;
2587	}	2369	}
2588		2370
2589	if (op->stats.food < 0 && op->stats.hp >= 0)	2371	if (op->stats.food < 0 && op->stats.hp >= 0)
2590	{	2372	{
2591	object *tmp, *flesh = 0;	2373	object *flesh = 0;
2592		2374
2593	for (tmp = op->inv; tmp; tmp = tmp->below)	2375	for_inv_removable (op, tmp)
2594	{	2376	{
2595	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2377	if (tmp->flag [FLAG_UNPAID])
		2378	continue;
		2379
		2380	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2596	{	2381	{
2597	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2382	op->statusmsg ("You blindly grab for a bite of food. "
2598	{	2383	"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.");	2384	op->apply (tmp);
2600	manual_apply (op, tmp, 0);	2385
2601	if (op->stats.food >= 0 || op->stats.hp < 0)	2386	if (op->stats.food >= 0 || op->stats.hp < 0)
2602	break;	2387	break;
2603	}	2388	}
2604	else if (tmp->type == FLESH)	2389	else if (tmp->type == FLESH)
2605	flesh = tmp;	2390	flesh = tmp;
2606	} /* End if paid for object */	2391	}
2607	} /* end of for loop */
2608		2392
2609	/* If player is still starving, it means they don't have any food, so	2393	/* If player is still starving, it means they don't have any food, so
2610	* eat flesh instead.	2394	* eat flesh instead.
2611	*/	2395	*/
2612	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2396	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2613	{	2397	{
2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2398	op->statusmsg ("You blindly grab for a bite of food. "
		2399	"H<To prevent you from starving, you ate some random item from your backpack.>");
2615	manual_apply (op, flesh, 0);	2400	op->apply (flesh);
2616	}	2401	}
		2402
		2403	// If player is still starving, alert him!
		2404	if (op->stats.food < 0)
		2405	op->failmsg ("You are starving! "
		2406	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2407	}
		2408
		2409	if (op->stats.food < 0)
2617	}	2410	{
		2411	op->stats.hp += op->stats.food;
		2412	op->stats.food = 0;
2618		2413
2619	while (op->stats.food < 0 && op->stats.hp >= 0)	2414	if (op->stats.hp < 0)
2620	op->stats.food++, op->stats.hp--;	2415	{
		2416	op->contr->killer = archetype::get ("killer_starvation");
		2417	op->contr->killer->destroy ();
		2418	}
		2419	}
2621		2420
		2421	/* killer should be set here already */
2622	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2422	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2623	kill_player (op);	2423	kill_player (op);
2624	}	2424	}
2625	}	2425	}
2626		2426
2627	/* If the player should die (lack of hp, food, etc), we call this.	2427	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2630	* file.	2430	* file.
2631	*/	2431	*/
2632	void	2432	void
2633	kill_player (object *op)	2433	kill_player (object *op)
2634	{	2434	{
2635	char buf[MAX_BUF];
2636	int x, y;	2435	int x, y;
2637
2638	//int i;
2639	maptile *map; /* this is for resurrection */	2436	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;	2437	int will_kill_again;
2647	archetype *at;	2438	archetype *at;
2648	object *tmp;	2439	object *tmp;
2649		2440
2650	if (save_life (op))	2441	if (save_life (op))
2651	return;	2442	return;
2652		2443
		2444	dynbuf_text deathtab;
		2445
		2446	/* restore player */
		2447	at = archetype::find (shstr_poisoning);
		2448	if (object *tmp = present_arch_in_ob (at, op))
		2449	{
		2450	tmp->destroy ();
		2451	deathtab << "Your body feels cleansed...\r";
		2452	}
		2453
		2454	at = archetype::find (shstr_confusion);
		2455	if (object *tmp = present_arch_in_ob (at, op))
		2456	{
		2457	tmp->destroy ();
		2458	deathtab << "Your mind feels clearer...\r";
		2459	}
		2460
		2461	cure_disease (op, 0, 0); /* remove any disease */
		2462
		2463	max_it (op->stats.hp , op->stats.maxhp);
		2464	max_it (op->stats.sp , op->stats.maxsp);
		2465	max_it (op->stats.grace, op->stats.maxgrace);
		2466	max_it (op->stats.food , 200);
		2467
		2468	// remove all spell effects that are active
		2469	// to avoid long-term effects such as word-of-recall
		2470	for (object *item = op->inv; item; )
		2471	{
		2472	object *next = item->below;
		2473
		2474	if (item->type == SPELL_EFFECT && item->active)
		2475	item->destroy ();
		2476
		2477	item = next;
		2478	}
2653		2479
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2480	/* 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.	2481	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2482	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2483	*/
2658	if (op_on_battleground (op, &x, &y))	2484	if (op_on_battleground (op, &x, &y))
2659	{	2485	{
2660	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2486	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		2487
2683	/* create a bodypart-trophy to make the winner happy */	2488	/* create a bodypart-trophy to make the winner happy */
2684	if (object *tmp = arch_to_object (archetype::find ("finger")))	2489	object *tmp = archetype::find (shstr_finger)->instance ();
2685	{	2490
2686	sprintf (buf, "%s's finger", &op->name);	2491	tmp->name = format ("%s's finger" , &op->name);
2687	tmp->name = buf;	2492	tmp->name_pl = format ("%s's fingers", &op->name);
2688	sprintf (buf, " This finger has been cut off %s\n"	2493	tmp->msg = format (
2689	" the %s, when he was defeated at\n level %d by %s.\n",	2494	"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);	2495	&op->name, op->contr->title,
2691	tmp->msg = buf;	2496	(int)op->level,
		2497	op->contr->killer_name ()
		2498	);
2692	tmp->value = 0, tmp->type = 0;	2499	tmp->value = 0, tmp->type = 0;
2693	tmp->materialname = "organics";	2500	tmp->material = name_to_material (shstr_organic);
2694	tmp->insert_at (op, tmp);	2501	tmp->insert_at (op, tmp);
2695	}
2696		2502
2697	/* teleport defeated player to new destination */	2503	/* teleport defeated player to new destination */
2698	transfer_ob (op, x, y, 0, NULL);	2504	transfer_ob (op, x, y, 0, NULL);
2699	op->contr->braced = 0;	2505	op->contr->braced = 0;
		2506
		2507	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2700	return;	2508	return;
2701	}	2509	}
2702		2510
		2511	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2512	deathtab << "T<YOU HAVE DIED>\n\n";
		2513
2703	INVOKE_PLAYER (DEATH, op->contr);	2514	INVOKE_PLAYER (DEATH, op->contr);
2704		2515
2705	command_kill_pets (op, 0);	2516	command_kill_pets (op, 0);
2706		2517
2707	if (op->stats.food < 0)	2518	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		2519
2717	/* save the map location for corpse, gravestone */	2520	/* save the map location for corpse, gravestone */
2718	x = op->x;	2521	x = op->x;
2719	y = op->y;	2522	y = op->y;
2720	map = op->map;	2523	map = op->map;
…		…
2748		2551
2749	lost_a_stat = 0;	2552	lost_a_stat = 0;
2750		2553
2751	for (z = 0; z < num_stats_lose; z++)	2554	for (z = 0; z < num_stats_lose; z++)
2752	{	2555	{
2753	i = RANDOM () % NUM_STATS;	2556	i = rndm (NUM_STATS);
2754		2557
2755	if (settings.stat_loss_on_death)	2558	if (settings.stat_loss_on_death)
2756	{	2559	{
2757	/* Pick a random stat and take a point off it. Tell the player	2560	/* Pick a random stat and take a point off it. Tell the player
2758	* what he lost.	2561	* what he lost.
…		…
2765	lost_a_stat = 1;	2568	lost_a_stat = 1;
2766	}	2569	}
2767	else	2570	else
2768	{	2571	{
2769	/* deplete a stat */	2572	/* deplete a stat */
2770	archetype *deparch = archetype::find ("depletion");	2573	archetype *deparch = archetype::find (shstr_depletion);
2771	object *dep;	2574	object *dep;
2772		2575
2773	dep = present_arch_in_ob (deparch, op);	2576	dep = present_arch_in_ob (deparch, op);
2774	if (!dep)	2577	if (!dep)
2775	{	2578	{
2776	dep = arch_to_object (deparch);	2579	dep = deparch->instance ();
2777	insert_ob_in_ob (dep, op);	2580	insert_ob_in_ob (dep, op);
2778	}	2581	}
2779	lose_this_stat = 1;	2582	lose_this_stat = 1;
2780	if (settings.balanced_stat_loss)	2583	if (settings.balanced_stat_loss)
2781	{	2584	{
…		…
2809	}	2612	}
2810	}	2613	}
2811		2614
2812	if (lose_this_stat)	2615	if (lose_this_stat)
2813	{	2616	{
2814	this_stat = get_attr_value (&(dep->stats), i);	2617	this_stat = get_attr_value (&dep->stats, i);
2815	/* We could try to do something clever like find another	2618	/* We could try to do something clever like find another
2816	* stat to reduce if this fails. But chances are, if	2619	* stat to reduce if this fails. But chances are, if
2817	* stats have been depleted to -50, all are pretty low	2620	* stats have been depleted to -50, all are pretty low
2818	* and should be roughly the same, so it shouldn't make a	2621	* and should be roughly the same, so it shouldn't make a
2819	* difference.	2622	* difference.
2820	*/	2623	*/
2821	if (this_stat >= -50)	2624	if (this_stat >= -50)
2822	{	2625	{
2823	change_attr_value (&(dep->stats), i, -1);	2626	change_attr_value (&(dep->stats), i, -1);
2824	SET_FLAG (dep, FLAG_APPLIED);	2627	dep->set_flag (FLAG_APPLIED);
2825	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2628	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2826	op->update_stats ();	2629	op->update_stats ();
2827	lost_a_stat = 1;	2630	lost_a_stat = 1;
2828	}	2631	}
2829	}	2632	}
2830	}	2633	}
2831	}	2634	}
		2635
2832	/* If no stat lost, tell the player. */	2636	/* If no stat lost, tell the player. */
2833	if (!lost_a_stat)	2637	if (!lost_a_stat)
2834	{	2638	{
2835	/* determine_god() seems to not work sometimes... why is this?	2639	/* determine_god() seems to not work sometimes... why is this?
2836	Should I be using something else? GD */	2640	Should I be using something else? GD */
2837	const char *god = determine_god (op);	2641	shstr_tmp god = determine_god (op);
2838		2642
2839	if (god && (strcmp (god, "none")))	2643	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);	2644	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2841	else	2645	else
2842	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2646	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2843	}	2647	}
2844	#else	2648	#else
2845	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2649	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2846	#endif	2650	#endif
2847		2651
2848	/* Put a gravestone up where the character 'almost' died. List the	2652	/* Put a gravestone up where the character 'almost' died. List the
2849	* exp loss on the stone.	2653	* exp loss on the stone.
2850	*/	2654	*/
2851	tmp = arch_to_object (archetype::find ("gravestone"));	2655	tmp = archetype::find (shstr_gravestone)->instance ();
2852	sprintf (buf, "%s's gravestone", &op->name);	2656	tmp->name = format ("%s's gravestone", &op->name);
2853	tmp->name = buf;	2657	tmp->name_pl = format ("%s's gravestones", &op->name);
2854	sprintf (buf, "%s's gravestones", &op->name);	2658	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2855	tmp->name_pl = buf;	2659	&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;	2660	tmp->x = op->x, tmp->y = op->y;
2859	insert_ob_in_map (tmp, op->map, NULL, 0);	2661	insert_ob_in_map (tmp, op->map, NULL, 0);
2860		2662
2861	/**************************************/	2663	/**************************************/
2862	/* */	2664	/* */
2863	/* Subtract the experience points, */	2665	/* Subtract the experience points, */
2864	/* if we died cause of food, give us */
2865	/* food, and reset HP's... */
2866	/* */	2666	/* */
2867	/**************************************/	2667	/**************************************/
2868		2668
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)); */	2669	/*add_exp(op, (op->stats.exp * -0.20)); */
2891	apply_death_exp_penalty (op);	2670	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		2671
2898	/*	2672	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2673	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2674	* and put them back in the map.
2901	*/	2675	*/
2902	remove_unpaid_objects (op->inv, op);	2676	op->drop_unpaid_items ();
2903		2677
2904	/****************************************/	2678	/****************************************/
2905	/* */	2679	/* */
2906	/* Move player to his current respawn- */	2680	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2681	/* position (usually last savebed) */
…		…
2925	if (will_kill_again)	2699	if (will_kill_again)
2926	{	2700	{
2927	object *force;	2701	object *force;
2928	int at;	2702	int at;
2929		2703
2930	force = get_archetype (FORCE_NAME);	2704	force = archetype::get (FORCE_NAME);
2931	/* 50 ticks should be enough time for the spell to abate */	2705	/* 50 ticks should be enough time for the spell to abate */
2932	force->speed = 0.1f;
2933	force->speed_left = -5.f;	2706	force->speed_left = -5.f;
2934	SET_FLAG (force, FLAG_APPLIED);	2707	force->set_speed (0.1f);
		2708	force->set_flag (FLAG_APPLIED);
		2709
2935	for (at = 0; at < NROFATTACKS; at++)	2710	for (at = 0; at < NROFATTACKS; at++)
2936	if (will_kill_again & (1 << at))	2711	if (will_kill_again & (1 << at))
2937	force->resist[at] = 100;	2712	force->resist[at] = 100;
2938		2713
2939	insert_ob_in_ob (force, op);	2714	insert_ob_in_ob (force, op);
2940	op->update_stats ();	2715	op->update_stats ();
2941
2942	}	2716	}
2943		2717
2944	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2718	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2945	}	2719	}
2946		2720
2947	void	2721	static void
2948	loot_object (object *op)	2722	loot_object (object *op)
2949	{ /* Grab and destroy some treasure */	2723	{ /* Grab and destroy some treasure */
2950	object *tmp, *tmp2, *next;	2724	object *tmp, *next;
2951		2725
2952	op->close_container (); /* close open sack first */	2726	op->close_container (); /* close open sack first */
2953		2727
2954	for (tmp = op->inv; tmp; tmp = next)	2728	for (tmp = op->inv; tmp; tmp = next)
2955	{	2729	{
…		…
2962	tmp->x = op->x, tmp->y = op->y;	2736	tmp->x = op->x, tmp->y = op->y;
2963		2737
2964	if (tmp->type == CONTAINER)	2738	if (tmp->type == CONTAINER)
2965	loot_object (tmp); /* empty container to ground */	2739	loot_object (tmp); /* empty container to ground */
2966		2740
2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2741	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2968	{	2742	{
2969	if (tmp->nrof > 1)	2743	if (tmp->nrof > 1)
2970	{	2744	{
2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2745	tmp->decrease (rndm (1, tmp->nrof - 1));
2972	tmp2->destroy ();
2973	insert_ob_in_map (tmp, op->map, NULL, 0);	2746	insert_ob_in_map (tmp, op->map, NULL, 0);
2974	}	2747	}
2975	else	2748	else
2976	tmp->destroy ();	2749	tmp->destroy ();
2977	}	2750	}
…		…
2984	* fix_weight(): Check recursively the weight of all players, and fix	2757	* fix_weight(): Check recursively the weight of all players, and fix
2985	* what needs to be fixed. Refresh windows and fix speed if anything	2758	* what needs to be fixed. Refresh windows and fix speed if anything
2986	* was changed.	2759	* was changed.
2987	*/	2760	*/
2988	void	2761	void
2989	fix_weight (void)	2762	fix_weight ()
2990	{	2763	{
2991	for_all_players (pl)	2764	for_all_players (pl)
2992	{	2765	{
2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2766	weight_t old = pl->ob->carrying;
2994		2767
2995	if (old == sum)	2768	pl->ob->update_weight ();
2996	continue;	2769
		2770	if (old != pl->ob->carrying)
		2771	{
2997	pl->ob->update_stats ();	2772	pl->ob->update_stats ();
2998	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2773	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2774	}
2999	}	2775	}
3000	}	2776	}
3001		2777
3002	void	2778	void
3003	fix_luck (void)	2779	fix_luck ()
3004	{	2780	{
3005	for_all_players (pl)	2781	for_all_players (pl)
3006	if (!pl->ob->contr->ns->state)	2782	if (!pl->ob->contr->ns->state)
3007	pl->ob->change_luck (0);	2783	pl->ob->change_luck (0);
3008	}	2784	}
…		…
3045	}	2821	}
3046		2822
3047	void	2823	void
3048	make_visible (object *op)	2824	make_visible (object *op)
3049	{	2825	{
3050	op->hide = 0;	2826	op->flag [FLAG_HIDDEN] = 0;
3051	op->invisible = 0;	2827	op->invisible = 0;
		2828
3052	if (op->type == PLAYER)	2829	if (op->type == PLAYER)
3053	{	2830	{
3054	op->contr->tmp_invis = 0;	2831	op->contr->tmp_invis = 0;
3055	op->contr->invis_race = 0;	2832	op->contr->invis_race = 0;
3056	}	2833	}
…		…
3059	}	2836	}
3060		2837
3061	int	2838	int
3062	is_true_undead (object *op)	2839	is_true_undead (object *op)
3063	{	2840	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	2841	if (op->arch->flag [FLAG_UNDEAD])
3065	return 1;	2842	return 1;
3066		2843
3067	return 0;	2844	return 0;
3068	}	2845	}
3069		2846
3070	/* look at the surrounding terrain to determine	2847	/* look at the surrounding terrain to determine
3071	* the hideability of this object. Positive levels	2848	* the hideability of this object. Positive levels
3072	* indicate greater hideability.	2849	* indicate greater hideability.
3073	*/	2850	*/
3074
3075	int	2851	int
3076	hideability (object *ob)	2852	hideability (object *ob)
3077	{	2853	{
3078	int i, level = 0, mflag;	2854	int i, level = 0, mflag;
3079	sint16 x, y;	2855	sint16 x, y;
3080		2856
3081	if (!ob || !ob->map)	2857	if (!ob || !ob->map)
3082	return 0;	2858	return 0;
3083		2859
3084	/* so, on normal lighted maps, its hard to hide */	2860	/* so, on normal lighted maps, its hard to hide */
3085	level = ob->map->darkness - 2;	2861	level = ob->map->darklevel () - 2;
3086		2862
3087	/* this also picks up whether the object is glowing.	2863	/* this also picks up whether the object is glowing.
3088	* If you carry a light on a non-dark map, its not	2864	* If you carry a light on a non-dark map, its not
3089	* as bad as carrying a light on a pitch dark map */	2865	* as bad as carrying a light on a pitch dark map */
3090	if (has_carried_lights (ob))	2866	if (ob->has_carried_lights ())
3091	level = -(10 + (2 * ob->map->darkness));	2867	level = -(10 + (2 * ob->map->darklevel ()));
3092		2868
3093	/* scan through all nearby squares for terrain to hide in */	2869	/* 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])	2870	for (i = 0, x = ob->x, y = ob->y;
		2871	i <= SIZEOFFREE1;
		2872	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3095	{	2873	{
3096	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2874	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3097	if (mflag & P_OUT_OF_MAP)	2875	if (mflag & P_OUT_OF_MAP)
3098	{
3099	continue;	2876	continue;
3100	}	2877
3101	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2878	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3102	level += 2;	2879	level += 2;
3103	else /* open terrain! */	2880	else /* open terrain! */
3104	level -= 1;	2881	level -= 1;
3105	}	2882	}
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	2890	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	2891	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	2892	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	2893	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	2894	*/
3118
3119	void	2895	void
3120	do_hidden_move (object *op)	2896	do_hidden_move (object *op)
3121	{	2897	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2898	int hide = 0;
3123	object *skop;
3124		2899
3125	if (!op || !op->map)	2900	if (!op || !op->map)
3126	return;	2901	return;
3127		2902
3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2903	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2904	int num = random_roll (0, 19, op, PREFER_LOW);
3129		2905
3130	/* its *extremely* hard to run and sneak/hide at the same time! */	2906	/* its *extremely* hard to run and sneak/hide at the same time! */
3131	if (op->type == PLAYER && op->contr->run_on)	2907	if (op->type == PLAYER && op->contr->run_on)
3132	if (!skop || num >= skop->level)	2908	if (!skop || num >= skop->level)
3133	{	2909	{
…		…
3143	num -= hide;	2919	num -= hide;
3144		2920
3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2921	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3146	{	2922	{
3147	make_visible (op);	2923	make_visible (op);
		2924
3148	if (op->type == PLAYER)	2925	if (op->type == PLAYER)
3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2926	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3150	}	2927	}
3151	else if (op->type == PLAYER && skop)	2928	else if (op->type == PLAYER && skop)
3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2929	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3167		2944
3168	if (who->type == PLAYER)	2945	if (who->type == PLAYER)
3169	player = 1;	2946	player = 1;
3170		2947
3171	else	2948	else
3172	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2949	friendly = who->flag [FLAG_FRIENDLY];
3173		2950
3174	/* search adjacent squares */	2951	/* search adjacent squares */
3175	for (i = 1; i < 9; i++)	2952	for (i = 1; i < 9; i++)
3176	{	2953	{
3177	x = who->x + freearr_x[i];	2954	x = who->x + freearr_x[i];
…		…
3186	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2963	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3187	continue;	2964	continue;
3188		2965
3189	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2966	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3190	{	2967	{
3191	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2968	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3192	return 1;	2969	return 1;
3193	else if (tmp->type == PLAYER)	2970	else if (tmp->type == PLAYER)
3194	{
3195	/*don't let a hidden DM prevent you from hiding */
3196	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3197	return 1;	2971	return 1;
3198	}
3199	}	2972	}
3200	}	2973	}
3201	return 0;	2974	return 0;
3202	}	2975	}
3203		2976
3204	/* check the player los field for viewability of the	2977	/* check the player los field for viewability of the
3205	* object op. This function works fine for monsters,	2978	* object op. This function works fine for monsters,
3206	* but we dont worry if the object isnt the top one in	2979	* but we dont worry if the object isnt the top one in
3207	* a pile (say a coin under a table would return "viewable"	2980	* a pile (say a coin under a table would return "viewable"
3208	* by this routine). Another question, should we be	2981	* by this routine). Another question, should we be
3209	* concerned with the direction the player is looking	2982	* concerned with the direction the player is looking
3210	* in? Realistically, most of use cant see stuff behind	2983	* in? Realistically, most of us can't see stuff behind
3211	* our backs...on the other hand, does the "facing" direction	2984	* our backs...on the other hand, does the "facing" direction
3212	* imply the way your head, or body is facing? Its possible	2985	* 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.	2986	* for them to differ. Sigh, this fctn could get a bit more complex.
3214	* -b.t.	2987	* -b.t.
3215	* This function is now map tiling safe.	2988	* This function is now map tiling safe.
3216	*/	2989	*/
3217
3218	int	2990	int
3219	player_can_view (object *pl, object *op)	2991	player_can_view (object *pl, object *op)
3220	{	2992	{
3221	rv_vector rv;	2993	rv_vector rv;
3222	int dx, dy;	2994	int dx, dy;
…		…
3234		3006
3235	get_rangevector (pl, op, &rv, 0x1);	3007	get_rangevector (pl, op, &rv, 0x1);
3236		3008
3237	/* starting with the 'head' part, lets loop	3009	/* starting with the 'head' part, lets loop
3238	* through the object and find if it has any	3010	* through the object and find if it has any
3239	* part that is in the los array but isnt on	3011	* part that is in the los array but isn't on
3240	* a blocked los square.	3012	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3013	* we use the archetype to figure out offsets.
3242	*/	3014	*/
3243	while (op)	3015	while (op)
3244	{	3016	{
3245	dx = rv.distance_x + op->arch->clone.x;	3017	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3018	dy = rv.distance_y + op->arch->y;
3247		3019
3248	/* only the viewable area the player sees is updated by LOS	3020	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;	3021	return 1;
		3022
3256	op = op->more;	3023	op = op->more;
3257	}	3024	}
3258	return 0;
3259	}
3260		3025
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;	3026	return 0;
3287	}	3027	}
3288		3028
3289	/* op_on_battleground - checks if the given object op (usually	3029	/* op_on_battleground - checks if the given object op (usually
3290	* a player) is standing on a valid battleground-tile,	3030	* 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	3035	* Default is to do the same as before, so only people wanting to have different points need worry about this
3296	*/	3036	*/
3297	int	3037	int
3298	op_on_battleground (object *op, int *x, int *y)	3038	op_on_battleground (object *op, int *x, int *y)
3299	{	3039	{
3300	object *tmp;
3301
3302	/* A battleground-tile needs the following attributes to be valid:	3040	/* 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),	3041	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3304	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3042	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3305	* and the exit-coordinates sp/hp must both be > 0.	3043	* and the exit-coordinates sp/hp must both be > 0.
3306	* => The intention here is to prevent abuse of the battleground-	3044	* => The intention here is to prevent abuse of the battleground-
3307	* feature (like pickable or hidden battleground tiles). */	3045	* feature (like pickable or hidden battleground tiles). */
3308	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3046	for (object *tmp = op->below; tmp; tmp = tmp->below)
3309	{	3047	{
3310	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3048	if (tmp->flag [FLAG_IS_FLOOR])
3311	{	3049	{
3312	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3050	if (tmp->flag [FLAG_NO_PICK]
3313	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3051	&& tmp->type == BATTLEGROUND
		3052	&& tmp->name == shstr_battleground
		3053	&& EXIT_X (tmp) && EXIT_Y (tmp))
3314	{	3054	{
3315	/*before we assign the exit, check if this is a teambattle */	3055	/* before we assign the exit, check if this is a teambattle */
3316	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3056	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)	3057	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3058	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3321	{	3059	{
3322	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3323	{
3324	if (x != NULL && y != NULL)	3060	if (x && y)
3325	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3061	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3062
3326	return 1;	3063	return 1;
3327	}
3328	}	3064	}
3329	}	3065
3330	if (x != NULL && y != NULL)	3066	if (x && y)
3331	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3067	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3068
3332	return 1;	3069	return 1;
3333	}	3070	}
3334	}	3071	}
3335	}	3072	}
		3073
3336	/* If we got here, did not find a battleground */	3074	/* If we got here, did not find a battleground */
3337	return 0;	3075	return 0;
3338	}	3076	}
3339		3077
3340	/*	3078	/*
…		…
3356	char buf[MAX_BUF]; /* tmp. string buffer */	3094	char buf[MAX_BUF]; /* tmp. string buffer */
3357	int i = 0, j = 0;	3095	int i = 0, j = 0;
3358		3096
3359	/* get the appropriate treasurelist */	3097	/* get the appropriate treasurelist */
3360	if (atnr == ATNR_FIRE)	3098	if (atnr == ATNR_FIRE)
3361	trlist = treasurelist::find ("dragon_ability_fire");	3099	trlist = treasurelist::find (shstr_dragon_ability_fire);
3362	else if (atnr == ATNR_COLD)	3100	else if (atnr == ATNR_COLD)
3363	trlist = treasurelist::find ("dragon_ability_cold");	3101	trlist = treasurelist::find (shstr_dragon_ability_cold);
3364	else if (atnr == ATNR_ELECTRICITY)	3102	else if (atnr == ATNR_ELECTRICITY)
3365	trlist = treasurelist::find ("dragon_ability_elec");	3103	trlist = treasurelist::find (shstr_dragon_ability_elec);
3366	else if (atnr == ATNR_POISON)	3104	else if (atnr == ATNR_POISON)
3367	trlist = treasurelist::find ("dragon_ability_poison");	3105	trlist = treasurelist::find (shstr_dragon_ability_poison);
3368		3106
3369	if (trlist == NULL || who->type != PLAYER)	3107	if (trlist == NULL || who->type != PLAYER)
3370	return;	3108	return;
3371		3109
3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3110	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]); */	3114	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3377	return;	3115	return;
3378	}	3116	}
3379		3117
3380	/* everything seems okay - now bring on the gift: */	3118	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3119	item = tr->item;
3382		3120
3383	if (item->type == SPELL)	3121	if (item->type == SPELL)
3384	{	3122	{
3385	if (check_spell_known (who, item->name))	3123	if (check_spell_known (who, item->name))
3386	return;	3124	return;
…		…
3445	{	3183	{
3446	/* forces in the treasurelist can alter the player's stats */	3184	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3185	object *skin;
3448		3186
3449	/* first get the dragon skin force */	3187	/* 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)	3188	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3452	;	3189	;
3453		3190
3454	if (!skin)	3191	if (!skin)
3455	return;	3192	return;
3456		3193
…		…
3470	else	3207	else
3471	j = 1;	3208	j = 1;
3472	strcat (buf, spellpathnames[i]);	3209	strcat (buf, spellpathnames[i]);
3473	}	3210	}
3474	}	3211	}
		3212
3475	strcat (buf, ".");	3213	strcat (buf, ".");
3476	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3214	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3477	}	3215	}
3478		3216
3479	/* evtl. adding flags: */	3217	/* evtl. adding flags: */
3480	if (QUERY_FLAG (item, FLAG_XRAYS))	3218	if (item->flag [FLAG_XRAYS])
3481	SET_FLAG (skin, FLAG_XRAYS);	3219	skin->set_flag (FLAG_XRAYS);
3482	if (QUERY_FLAG (item, FLAG_STEALTH))	3220	if (item->flag [FLAG_STEALTH])
3483	SET_FLAG (skin, FLAG_STEALTH);	3221	skin->set_flag (FLAG_STEALTH);
3484	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3222	if (item->flag [FLAG_SEE_IN_DARK])
3485	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3223	skin->set_flag (FLAG_SEE_IN_DARK);
3486		3224
3487	/* print message if there is one */	3225	/* print message if there is one */
3488	if (item->msg != NULL)	3226	if (item->msg != NULL)
3489	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3227	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3490	}	3228	}
3491	else	3229	else
3492	{	3230	{
3493	/* generate misc. treasure */	3231	/* generate misc. treasure */
3494	tmp = arch_to_object (tr->item);	3232	tmp = tr->item->instance ();
3495	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3233	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);	3234	who->insert (tmp);
3497	if (who->type == PLAYER)
3498	esrv_send_item (who, tmp);
3499	}	3235	}
3500	}	3236	}
3501		3237
3502	/**	3238	//-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		3239
3519	sint8	3240	sint8
3520	player::visibility_at (maptile *map, int x, int y) const	3241	player::darkness_at (maptile *map, int x, int y) const
3521	{	3242	{
3522	if (!ns)	3243	if (!ns)
3523	return 0;	3244	return LOS_BLOCKED;
3524		3245
3525	int dx, dy;	3246	int dx, dy;
3526	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3247	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3248	return LOS_BLOCKED;
		3249
		3250	x += dx - ns->current_x;
		3251	y += dy - ns->current_y;
		3252
		3253	return blocked_los (x, y);
		3254	}
		3255
		3256	void
		3257	player::infobox (const char *title, const char *msg, int color)
		3258	{
		3259	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3260	}
		3261
		3262	void
		3263	player::statusmsg (const char *msg, int color)
		3264	{
		3265	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3266	}
		3267
		3268	void
		3269	player::failmsg (const char *msg, int color)
		3270	{
		3271	play_sound (sound_find ("generic_failure"));
		3272	statusmsg (msg, color);
		3273	}
		3274
		3275	void
		3276	object::failmsgf (const char *format, ...)
		3277	{
		3278	if (!contr)
3527	return 0;	3279	return;
3528		3280
3529	x += dx - ns->current_x + ns->mapx / 2;	3281	va_list ap;
3530	y += dy - ns->current_y + ns->mapy / 2;	3282	va_start (ap, format);
3531		3283	contr->failmsg (vformat (format, ap));
3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3284	va_end (ap);
3533	return 0;
3534
3535	return 100 - blocked_los [x][y];
3536	}	3285	}
		3286
		3287	void
		3288	player::failmsgf (const char *format, ...)
		3289	{
		3290	va_list ap;
		3291	va_start (ap, format);
		3292	failmsg (vformat (format, ap));
		3293	va_end (ap);
		3294	}
		3295

Diff Legend

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