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