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.97 by root, Mon Jan 8 22:32:11 2007 UTC vs.
Revision 1.249 by root, Sun Nov 29 17:41:08 2009 UTC

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

Diff Legend

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