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.123 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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