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.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.236 by root, Thu Nov 5 14:56:06 2009 UTC

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

Diff Legend

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