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

Diff Legend

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