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.46 by root, Mon Dec 18 04:07:31 2006 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 2010 UTC

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