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.166 by root, Thu Aug 30 05:16:10 2007 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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