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.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.213 by root, Fri Dec 26 13:33:22 2008 UTC

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

Diff Legend

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