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

Diff Legend

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