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

Diff Legend

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