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.141 by root, Fri May 18 15:05:09 2007 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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

Diff Legend

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