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.176 by root, Sun Dec 16 01:25:17 2007 UTC vs.
Revision 1.286 by root, Wed May 4 19:04:45 2011 UTC

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