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

Diff Legend

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