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

Diff Legend

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