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.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.283 by root, Sun May 1 16:58:17 2011 UTC

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

Diff Legend

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