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.81 by pippijn, Wed Jan 3 00:21:36 2007 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC

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

Diff Legend

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