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

Diff Legend

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