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

Diff Legend

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