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.127 by root, Sat May 12 18:14:48 2007 UTC vs.
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC

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

Diff Legend

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