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.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.244 by root, Sun Nov 8 20:55:40 2009 UTC

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

Diff Legend

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