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.126 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC

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

Diff Legend

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