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.150 by root, Sun Jun 10 03:11:17 2007 UTC vs.
Revision 1.271 by root, Sun Apr 11 23:32:10 2010 UTC

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

Diff Legend

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