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

Diff Legend

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