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.90 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC

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

Diff Legend

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