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

Diff Legend

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