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.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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