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

Diff Legend

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