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

Diff Legend

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