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.55 by root, Sat Dec 23 03:38:43 2006 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

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

Diff Legend

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