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.182 by root, Thu Apr 17 14:06:03 2008 UTC vs.
Revision 1.250 by root, Sat Dec 12 03:17:21 2009 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	#include <global.h>	27	#include <global.h>
25	#include <sproto.h>	28	#include <sproto.h>
26	#include <sounds.h>	29	#include <sounds.h>
27	#include <living.h>	30	#include <living.h>
…		…
32	#include <algorithm>	35	#include <algorithm>
33	#include <functional>	36	#include <functional>
34		37
35	playervec players;	38	playervec players;
36		39
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	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 */
128
129	strcpy (subject, buf + 1);
130	strip_endline (subject);
131	size = 0;
132	news[0] = '\0';
133	}
134	else
135	{
136	if (size + strlen (buf) >= HUGE_BUF)
137	{
138	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
139	break;
140	}
141	strncat (news + size, buf, HUGE_BUF - size);
142	size += strlen (buf);
143	}
144	}
145
146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
148	close_and_delete (fp, comp);
149	}
150
151	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
152	static void	41	static void
153	set_first_map (object *op)	42	set_first_map (object *op)
154	{	43	{
155	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
207	ob->close_container (); //TODO: client-specific	96	ob->close_container (); //TODO: client-specific
208		97
209	ns->update_look = 0;	98	ns->update_look = 0;
210	ns->look_position = 0;	99	ns->look_position = 0;
211		100
212	clear_los (this);	101	clear_los ();
213		102
214	ns->reset_stats ();	103	ns->reset_stats ();
215		104
216	/* make sure he's a player -- needed because of class change. */	105	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	106	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	107	ob->race = ob->arch->race;
219		108
220	ob->carrying = sum_weight (ob);	109	ob->update_weight ();
221	link_player_skills (ob);	110	link_skills ();
222
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		111
225	assign (title, ob->arch->object::name);	112	assign (title, ob->arch->object::name);
226		113
227	/* if it's a dragon player, set the correct title here */	114	/* if it's a dragon player, set the correct title here */
228	if (is_dragon_pl (ob))	115	if (is_dragon_pl (ob))
…		…
239	set_dragon_name (ob, abil, skin);	126	set_dragon_name (ob, abil, skin);
240	}	127	}
241		128
242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243		130
244	esrv_new_player (this, ob->weight + ob->carrying);	131	esrv_new_player (this);
245		132
246	ob->update_stats ();	133	ob->update_stats ();
247		134
248	ns->floorbox_update ();	135	ns->floorbox_update ();
249	esrv_send_inventory (ob, ob);	136	esrv_send_inventory (ob, ob);
250	esrv_add_spells (this, 0);	137	esrv_add_spells (this, 0);
251		138
252	activate ();
253
254	send_rules (ob);
255	send_news (ob);
256	display_motd (ob);
257
258	INVOKE_PLAYER (CONNECT, this);
259	INVOKE_PLAYER (LOGIN, this);
260	}
261
262	void
263	player::disconnect ()
264	{
265	if (ob)
266	{
267	ob->close_container (); //TODO: client-specific
268	ob->drop_unpaid_items ();
269	}
270
271	if (ns)
272	{
273	if (active)
274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276	INVOKE_PLAYER (DISCONNECT, this);
277
278	ns->reset_stats ();
279	ns->pl = 0;
280	ns = 0;
281	}
282
283	observe = ob;
284
285	deactivate ();
286	}
287
288	// the need for this function can be explained
289	// by load_object not returning the object
290	void
291	player::set_object (object *op)
292	{
293	ob = observe = op;
294	ob->contr = this; /* this aren't yet in archetype */
295
296	ob->speed = 1.0f;
297	ob->speed_left = 0.5f;
298
299	ob->direction = 5; /* So player faces south */
300
301	ob->flag [FLAG_READY_WEAPON] = false;	139	ob->flag [FLAG_READY_WEAPON] = false;
302	ob->flag [FLAG_READY_SKILL] = false;	140	ob->flag [FLAG_READY_SKILL] = false;
303	ob->flag [FLAG_READY_BOW] = false;	141	ob->flag [FLAG_READY_BOW] = false;
304		142
305	for (object *op = ob->inv; op; op = op->below)	143	for (object *op = ob->inv; op; op = op->below)
306	if (op->flag [FLAG_APPLIED])	144	if (op->flag [FLAG_APPLIED])
307	switch (op->type)	145	switch (op->type)
308	{	146	{
309	case SKILL:	147	case SKILL:
310	ob->flag [FLAG_APPLIED] = false;	148	op->flag [FLAG_APPLIED] = false;
311	break;	149	break;
312		150
313	case WAND:	151	case WAND:
314	case ROD:	152	case ROD:
315	case HORN:	153	case HORN:
…		…
320	case WEAPON:	158	case WEAPON:
321	combat_ob = op;	159	combat_ob = op;
322	break;	160	break;
323	}	161	}
324		162
		163	ob->current_weapon = 0;
325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	164	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326	ob->deactivate (); // change_Weapon activates, fix this better	165	activate (); // change_weapon also activates, but this doesn't hurt
		166
		167	INVOKE_PLAYER (CONNECT, this);
		168	INVOKE_PLAYER (LOGIN, this);
		169	}
		170
		171	void
		172	player::disconnect ()
		173	{
		174	if (ob)
		175	{
		176	ob->close_container (); //TODO: client-specific
		177	ob->drop_unpaid_items ();
		178	}
		179
		180	if (ns)
		181	{
		182	if (active)
		183	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		184
		185	INVOKE_PLAYER (DISCONNECT, this);
		186
		187	ns->reset_stats ();
		188	ns->pl = 0;
		189	ns = 0;
		190	}
		191
		192	// this is important for the player scheduler to get the correct refcount
		193	// when ns = 0
		194	observe = viewpoint = ob;
		195
		196	deactivate ();
		197	}
		198
		199	//-GPL
		200
		201	// the need for this function can be explained
		202	// by load_object not returning the object
		203	void
		204	player::set_object (object *op)
		205	{
		206	ob = observe = viewpoint = op;
		207	ob->contr = this; /* this aren't yet in archetype */
		208
		209	ob->speed = 1.0f;
		210	ob->speed_left = 0.5f;
		211
		212	ob->direction = 5; /* So player faces south */
327	}	213	}
328		214
329	void	215	void
330	player::set_observe (object *op)	216	player::set_observe (object *op)
331	{	217	{
332	observe = op ? op : ob;	218	observe = viewpoint = op ? op : ob;
333	do_los = 1;	219	do_los = 1;
334	}	220	}
		221
		222	void
		223	player::set_viewpoint (object *op)
		224	{
		225	viewpoint = op ? op : (object *)observe;
		226	do_los = 1;
		227	}
		228
		229	//+GPL
335		230
336	player::player ()	231	player::player ()
337	{	232	{
338	/* There are some elements we want initialised to non zero value -	233	/* There are some elements we want initialised to non zero value -
339	* we deal with that below this point.	234	* we deal with that below this point.
…		…
345	savebed_map = first_map_path; /* Init. respawn position */	240	savebed_map = first_map_path; /* Init. respawn position */
346		241
347	gen_sp_armour = 10;	242	gen_sp_armour = 10;
348	bowtype = bow_normal;	243	bowtype = bow_normal;
349	petmode = pet_normal;	244	petmode = pet_normal;
350	listening = 10;
351	usekeys = containers;	245	usekeys = containers;
352	peaceful = 1; /* default peaceful */	246	peaceful = 1; /* default peaceful */
353	do_los = 1;	247	do_los = 1;
354		248
355	weapon_sp = 1.0f;	249	weapon_sp = 1.0f;
…		…
367	{	261	{
368	ob->destroy_inv (false);	262	ob->destroy_inv (false);
369	ob->destroy ();	263	ob->destroy ();
370	}	264	}
371		265
372	ob = observe = 0;	266	ob = observe = viewpoint = 0;
373	}	267	}
374		268
375	player::~player ()	269	player::~player ()
376	{	270	{
377	/* Clear item stack */	271	/* Clear item stack */
378	free (stack_items);	272	free (stack_items);
		273	}
		274
		275	/*
		276	* get_player_archetype() return next player archetype from archetype
		277	* list. Not very efficient routine, but used only creating new players.
		278	* Note: there MUST be at least one player archetype!
		279	*/
		280	static archetype *
		281	get_player_archetype (archetype *at)
		282	{
		283	// archetypes could have been reloaded
		284	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		285
		286	if (!nat)
		287	return at;
		288
		289	archvec::iterator i = archetypes.find (nat);
		290
		291	for (;;)
		292	{
		293	if (++i == archetypes.end ())
		294	i = archetypes.begin ();
		295	else if (*i == at)
		296	cleanup ("not a single player archetype found");
		297
		298	if ((*i)->type == PLAYER)
		299	return *i;
		300	}
379	}	301	}
380		302
381	/* Tries to add player on the connection passed in ns.	303	/* Tries to add player on the connection passed in ns.
382	* All we can really get in this is some settings like host and display	304	* All we can really get in this is some settings like host and display
383	* mode.	305	* mode.
…		…
385	player *	307	player *
386	player::create ()	308	player::create ()
387	{	309	{
388	player *pl = new player;	310	player *pl = new player;
389		311
390	pl->set_object (arch_to_object (get_player_archetype (0)));	312	pl->set_object (get_player_archetype (0)->instance ());
391		313
392	pl->ob->roll_stats ();	314	pl->ob->roll_stats ();
393	pl->ob->stats.wc = 2;	315	pl->ob->stats.wc = 2;
394	pl->ob->run_away = 25; /* Then we panick... */	316	pl->ob->run_away = 25; /* Then we panick... */
395		317
396	set_first_map (pl->ob);	318	set_first_map (pl->ob);
397		319
398	return pl;	320	return pl;
399	}
400
401	/*
402	* get_player_archetype() return next player archetype from archetype
403	* list. Not very efficient routine, but used only creating new players.
404	* Note: there MUST be at least one player archetype!
405	*/
406	archetype *
407	get_player_archetype (archetype *at)
408	{
409	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
410
411	for (;;)
412	{
413	if (++i == archetypes.end ())
414	i = archetypes.begin ();
415	else if (*i == at)
416	cleanup ("not a single player archetype found");
417
418	if ((*i)->type == PLAYER)
419	return *i;
420	}
421	}	321	}
422		322
423	object *	323	object *
424	get_nearest_player (object *mon)	324	get_nearest_player (object *mon)
425	{	325	{
…		…
665	op->destroy ();	565	op->destroy ();
666	continue;	566	continue;
667	}	567	}
668	}	568	}
669		569
670	/* This really needs to be better - we should really give	570	/* Here we remove duplicated skills (as duplicated spell objects have
671	* a substitute spellbook. The problem is that we don't really	571	* _very_ confusing effects for players), which could for instance be
672	* have a good idea what to replace it with (need something like	572	* generated by bad treasurelists. - elmex
673	* a first level treasurelist for each skill.)
674	* remove duplicate skills also
675	*/	573	*/
676	if (op->type == SPELLBOOK || op->type == SKILL)	574	if (op->type == SKILL)
677	{	575	{
678	object *tmp;
679
680	for (tmp = op->below; tmp; tmp = tmp->below)	576	for (object *tmp = op->below; tmp; tmp = tmp->below)
681	if (tmp->type == op->type && tmp->name == op->name)	577	if (tmp->type == op->type && tmp->name == op->name)
682	break;
683
684	if (tmp)
685	{	578	{
686	op->destroy ();	579	op->destroy ();
		580	LOG (llevError,
687	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	581	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
688	continue;	582	break;
689	}	583	}
690		584
691	if (op->nrof > 1)	585	if (op->nrof > 1)
692	op->nrof = 1;	586	op->nrof = 1;
693	}	587	}
694		588
…		…
720	else /* lock all 'normal items by default */	614	else /* lock all 'normal items by default */
721	SET_FLAG (op, FLAG_INV_LOCKED);	615	SET_FLAG (op, FLAG_INV_LOCKED);
722	} /* for loop of objects in player inv */	616	} /* for loop of objects in player inv */
723		617
724	/* Need to set up the skill pointers */	618	/* Need to set up the skill pointers */
725	link_player_skills (pl);	619	pl->contr->link_skills ();
726	}	620	}
727		621
728	void	622	void
729	get_party_password (object *op, partylist *party)	623	get_party_password (object *op, partylist *party)
730	{	624	{
…		…
740	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	634	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
741	}	635	}
742		636
743	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	637	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
744	static int	638	static int
745	roll_stat (void)	639	roll_stat ()
746	{	640	{
747	int a[4], i, j, k;	641	int a[4], i, j, k;
748		642
749	for (i = 0; i < 4; i++)	643	for (i = 0; i < 4; i++)
750	a[i] = (int) rndm (6) + 1;	644	a[i] = (int) rndm (6) + 1;
…		…
845	*/	739	*/
846	void	740	void
847	player::chargen_race_done ()	741	player::chargen_race_done ()
848	{	742	{
849	/* this must before then initial items are given */	743	/* this must before then initial items are given */
850	esrv_new_player (ob->contr, ob->weight + ob->carrying);	744	esrv_new_player (ob->contr);
851		745
852	treasurelist *tl = treasurelist::find ("starting_wealth");	746	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
853	if (tl)	747	if (tl)
854	create_treasure (tl, ob, 0, 0, 0);	748	create_treasure (tl, ob, 0, 0, 0);
855		749
856	INVOKE_PLAYER (BIRTH, ob->contr);	750	INVOKE_PLAYER (BIRTH, ob->contr);
857	INVOKE_PLAYER (LOGIN, ob->contr);	751	INVOKE_PLAYER (LOGIN, ob->contr);
858		752
859	ob->contr->ns->state = ST_PLAYING;	753	ob->contr->ns->state = ST_PLAYING;
860		754
861	if (ob->msg)	755	if (ob->msg)
862	ob->msg = 0;	756	ob->msg = 0;
863
864	/* We create this now because some of the unique maps will need it
865	* to save here.
866	*/
867	{
868	char buf[MAX_BUF];
869	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
870	make_path_to_file (buf);
871	}
872		757
873	start_info (ob);	758	start_info (ob);
874	CLEAR_FLAG (ob, FLAG_WIZ);	759	CLEAR_FLAG (ob, FLAG_WIZ);
875	give_initial_items (ob, ob->randomitems);	760	give_initial_items (ob, ob->randomitems);
876	link_player_skills (ob);
877	esrv_send_inventory (ob, ob);	761	esrv_send_inventory (ob, ob);
878	ob->update_stats ();	762	ob->update_stats ();
879		763
880	/* This moves the player to a different start map, if there	764	/* This moves the player to a different start map, if there
881	* is one for this race	765	* is one for this race
882	*/	766	*/
883	if (*first_map_ext_path)	767	if (*first_map_ext_path)
884	{	768	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
885	object *tmp;
886	char mapname[MAX_BUF];
887
888	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
889	tmp = object::create ();
890	EXIT_PATH (tmp) = mapname;
891	EXIT_X (tmp) = ob->x;
892	EXIT_Y (tmp) = ob->y;
893	ob->enter_exit (tmp); /* we don't really care if it succeeded;
894	* if the map isn't there, then stay on the
895	* default initial map */
896	tmp->destroy ();
897	}
898	else	769	else
899	LOG (llevDebug, "first_map_ext_path not set\n");	770	LOG (llevDebug, "first_map_ext_path not set\n");
900	}	771	}
901		772
902	void	773	void
…		…
933	ob->stats.hp = ob->stats.maxhp;	804	ob->stats.hp = ob->stats.maxhp;
934	ob->stats.sp = ob->stats.maxsp;	805	ob->stats.sp = ob->stats.maxsp;
935	ob->stats.grace = 0;	806	ob->stats.grace = 0;
936	}	807	}
937		808
938	void	809	static void
939	flee_player (object *op)	810	flee_player (object *op)
940	{	811	{
941	int dir, diff;	812	int dir, diff;
942	rv_vector rv;	813	rv_vector rv;
943		814
…		…
946	LOG (llevDebug, "Fleeing player is dead.\n");	817	LOG (llevDebug, "Fleeing player is dead.\n");
947	CLEAR_FLAG (op, FLAG_SCARED);	818	CLEAR_FLAG (op, FLAG_SCARED);
948	return;	819	return;
949	}	820	}
950		821
951	if (op->enemy == NULL)	822	if (!op->enemy)
952	{	823	{
953	LOG (llevDebug, "Fleeing player had no enemy.\n");	824	LOG (llevDebug, "Fleeing player had no enemy.\n");
954	CLEAR_FLAG (op, FLAG_SCARED);	825	CLEAR_FLAG (op, FLAG_SCARED);
955	return;	826	return;
956	}	827	}
957		828
958	/* Seen some crashes here. Since we don't store an
959	* op->enemy_count, it is possible that something destroys the
960	* actual enemy, and the object is recycled.
961	*/
962	if (op->enemy->map == NULL)
963	{
964	CLEAR_FLAG (op, FLAG_SCARED);
965	op->enemy = NULL;
966	return;
967	}
968
969	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	829	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
970	{	830	{
971	op->enemy = NULL;	831	op->enemy = NULL;
972	CLEAR_FLAG (op, FLAG_SCARED);	832	CLEAR_FLAG (op, FLAG_SCARED);
973	return;	833	return;
…		…
976	get_rangevector (op, op->enemy, &rv, 0);	836	get_rangevector (op, op->enemy, &rv, 0);
977		837
978	dir = absdir (4 + rv.direction);	838	dir = absdir (4 + rv.direction);
979	for (diff = 0; diff < 3; diff++)	839	for (diff = 0; diff < 3; diff++)
980	{	840	{
981	int m = 1 - (RANDOM () & 2);	841	int m = 1 - rndm (2) * 2;
982		842
983	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	843	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
984	return;	844	return;
985	}	845	}
986		846
…		…
997	check_pick (object *op)	857	check_pick (object *op)
998	{	858	{
999	object *tmp, *next;	859	object *tmp, *next;
1000	int stop = 0;	860	int stop = 0;
1001	int wvratio;	861	int wvratio;
1002	char putstring[128];
1003		862
1004	/* if you're flying, you cna't pick up anything */	863	/* if you're flying, you cna't pick up anything */
1005	if (op->move_type & MOVE_FLYING)	864	if (op->move_type & MOVE_FLYING)
1006	return 1;	865	return 1;
1007		866
1008	next = op->below;	867	next = op->below;
1009		868
1010	int cnt = MAX_ITEM_PER_DROP;	869	int cnt = MAX_ITEM_PER_ACTION;
1011	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	870	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1012		871
1013	/* loop while there are items on the floor that are not marked as	872	/* loop while there are items on the floor that are not marked as
1014	* destroyed */	873	* destroyed */
1015	while (next && !next->destroyed ())	874	while (next && !next->destroyed ())
…		…
1031		890
1032	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	891	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1033	{	892	{
1034	if (item_matched_string (op, tmp, op->contr->search_str))	893	if (item_matched_string (op, tmp, op->contr->search_str))
1035	CHK_PICK_PICKUP;	894	CHK_PICK_PICKUP;
		895
1036	continue;	896	continue;
1037	}	897	}
1038		898
1039	/* high not bit set? We're using the old autopickup model */	899	/* pickup handling */
		900	if (op->contr->mode & PU_DEBUG)
		901	{
		902	/* some debugging code to figure out item information */
		903	const char *str = tmp->name
		904	? format ("item name: %s item type: %d weight/value: %d",
		905	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		906	: format ("item name: %s item type: %d weight/value: %d",
		907	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		908
		909	new_draw_info (NDI_UNIQUE, 0, op, str);
		910	}
		911
		912	if (op->contr->mode & PU_INHIBIT)
		913	return 1;
		914
		915	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		916	return 1;
		917
		918	/* philosophy:
		919	* It's easy to grab an item type from a pile, as long as it's
		920	* generic. This takes no game-time. For more detailed pickups
		921	* and selections, select-items should be used. This is a
		922	* grab-as-you-run type mode that's really useful for arrows for
		923	* example.
		924	* The drawback: right now it has no frontend, so you need to
		925	* stick the bits you want into a calculator in hex mode and then
		926	* convert to decimal and then 'pickup <#>
		927	*/
		928
		929	/* the first two modes are exclusive: if NOTHING we return, if
		930	* STOP then we stop. All the rest are applied sequentially,
		931	* meaning if any test passes, the item gets picked up. */
		932
		933	/* if mode is set to pick nothing up, return */
		934	if (op->contr->mode == PU_NOTHING)
		935	return 1;
		936
		937	/* if mode is set to stop when encountering objects, return */
		938	/* take STOP before INHIBIT since it doesn't actually pick
		939	* anything up */
		940	if (op->contr->mode & PU_STOP)
		941	return 0;
		942
		943	/* useful for going into stores and not losing your settings... */
		944	/* and for battles wher you don't want to get loaded down while
		945	* fighting */
		946	if (op->contr->mode & PU_INHIBIT)
		947	return 1;
		948
		949	/* prevent us from turning into auto-thieves :) */
		950	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		951	continue;
		952
		953	/* ignore known cursed objects */
		954	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		955	continue;
		956
		957	/* all food and drink if desired */
		958	/* question: don't pick up known-poisonous stuff? */
1040	if (!(op->contr->mode & PU_NEWMODE))	959	if (op->contr->mode & PU_FOOD)
		960	if (tmp->type == FOOD)
1041	{	961	{
1042	switch (op->contr->mode)	962	CHK_PICK_PICKUP;
		963	continue;
		964	}
		965
		966	if (op->contr->mode & PU_DRINK)
		967	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		968	{
		969	CHK_PICK_PICKUP;
		970	continue;
		971	}
		972
		973	if (op->contr->mode & PU_POTION)
		974	if (tmp->type == POTION)
		975	{
		976	CHK_PICK_PICKUP;
		977	continue;
		978	}
		979
		980	/* spellbooks, skillscrolls and normal books/scrolls */
		981	if (op->contr->mode & PU_SPELLBOOK)
		982	if (tmp->type == SPELLBOOK)
		983	{
		984	CHK_PICK_PICKUP;
		985	continue;
		986	}
		987
		988	if (op->contr->mode & PU_SKILLSCROLL)
		989	if (tmp->type == SKILLSCROLL)
		990	{
		991	CHK_PICK_PICKUP;
		992	continue;
		993	}
		994
		995	if (op->contr->mode & PU_READABLES)
		996	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		997	{
		998	CHK_PICK_PICKUP;
		999	continue;
		1000	}
		1001
		1002	/* wands/staves/rods/horns */
		1003	if (op->contr->mode & PU_MAGIC_DEVICE)
		1004	if (tmp->type == WAND
		1005	|| tmp->type == ROD
		1006	|| tmp->type == HORN
		1007	|| tmp->type == POWER_CRYSTAL)
		1008	{
		1009	CHK_PICK_PICKUP;
		1010	continue;
		1011	}
		1012
		1013	/* pick up all magical items */
		1014	if (op->contr->mode & PU_MAGICAL)
		1015	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
		1016	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1017	{
		1018	CHK_PICK_PICKUP;
		1019	continue;
		1020	}
		1021
		1022	if (op->contr->mode & PU_VALUABLES)
		1023	{
		1024	if (tmp->type == MONEY || tmp->type == GEM)
1043	{	1025	{
1044	case 0:
1045	return 1; /* don't pick up */
1046	case 1:
1047	CHK_PICK_PICKUP;	1026	CHK_PICK_PICKUP;
1048	return 1;	1027	continue;
1049	case 2:
1050	CHK_PICK_PICKUP;
1051	return 0;
1052	case 3:
1053	return 0; /* stop before pickup */
1054	case 4:
1055	CHK_PICK_PICKUP;
1056	break;
1057	case 5:
1058	CHK_PICK_PICKUP;
1059	stop = 1;
1060	break;
1061	case 6:
1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1063	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1064	CHK_PICK_PICKUP;
1065	break;
1066
1067	case 7:
1068	if (tmp->type == MONEY || tmp->type == GEM)
1069	CHK_PICK_PICKUP;
1070	break;
1071
1072	default:
1073	/* use value density */
1074	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1075	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1076	CHK_PICK_PICKUP;
1077	}	1028	}
1078	}	1029	}
1079	else	1030
1080	{ /* old model */	1031	/* rings & amulets - talismans seems to be typed AMULET */
1081	/* NEW pickup handling */
1082	if (op->contr->mode & PU_DEBUG)	1032	if (op->contr->mode & PU_JEWELS)
		1033	if (tmp->type == RING
		1034	|| tmp->type == AMULET
		1035	|| tmp->type == GIRDLE
		1036	|| tmp->type == SKILL_TOOL)
1083	{	1037	{
1084	/* some debugging code to figure out item information */	1038	CHK_PICK_PICKUP;
1085	if (tmp->name != NULL)
1086	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1087	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1088	else
1089	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1090	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1091
1092	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1093	}
1094
1095	/* philosophy:
1096	* It's easy to grab an item type from a pile, as long as it's
1097	* generic. This takes no game-time. For more detailed pickups
1098	* and selections, select-items should be used. This is a
1099	* grab-as-you-run type mode that's really useful for arrows for
1100	* example.
1101	* The drawback: right now it has no frontend, so you need to
1102	* stick the bits you want into a calculator in hex mode and then
1103	* convert to decimal and then 'pickup <#>
1104	*/
1105
1106	/* the first two modes are exclusive: if NOTHING we return, if
1107	* STOP then we stop. All the rest are applied sequentially,
1108	* meaning if any test passes, the item gets picked up. */
1109
1110	/* if mode is set to pick nothing up, return */
1111
1112	if (op->contr->mode & PU_NOTHING)
1113	return 1;
1114
1115	/* if mode is set to stop when encountering objects, return */
1116	/* take STOP before INHIBIT since it doesn't actually pick
1117	* anything up */
1118
1119	if (op->contr->mode & PU_STOP)
1120	return 0;
1121
1122	/* useful for going into stores and not losing your settings... */
1123	/* and for battles wher you don't want to get loaded down while
1124	* fighting */
1125	if (op->contr->mode & PU_INHIBIT)
1126	return 1;
1127
1128	/* prevent us from turning into auto-thieves :) */
1129	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1130	continue;	1039	continue;
		1040	}
1131		1041
1132	/* ignore known cursed objects */	1042	/* we don't forget dragon food */
1133	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1043	if (op->contr->mode & PU_FLESH)
		1044	if (tmp->type == FLESH)
		1045	{
		1046	CHK_PICK_PICKUP;
1134	continue;	1047	continue;
		1048	}
1135		1049
1136	/* all food and drink if desired */	1050	/* bows and arrows. Bows are good for selling! */
1137	/* question: don't pick up known-poisonous stuff? */	1051	if (op->contr->mode & PU_BOW)
		1052	if (tmp->type == BOW)
		1053	{
		1054	CHK_PICK_PICKUP;
		1055	continue;
		1056	}
		1057
		1058	if (op->contr->mode & PU_ARROW)
		1059	if (tmp->type == ARROW)
		1060	{
		1061	CHK_PICK_PICKUP;
		1062	continue;
		1063	}
		1064
		1065	/* all kinds of armor etc. */
		1066	if (op->contr->mode & PU_ARMOUR)
		1067	if (tmp->type == ARMOUR)
		1068	{
		1069	CHK_PICK_PICKUP;
		1070	continue;
		1071	}
		1072
		1073	if (op->contr->mode & PU_HELMET)
		1074	if (tmp->type == HELMET)
		1075	{
		1076	CHK_PICK_PICKUP;
		1077	continue;
		1078	}
		1079
		1080	if (op->contr->mode & PU_SHIELD)
		1081	if (tmp->type == SHIELD)
		1082	{
		1083	CHK_PICK_PICKUP;
		1084	continue;
		1085	}
		1086
1138	if (op->contr->mode & PU_FOOD)	1087	if (op->contr->mode & PU_BOOTS)
1139	if (tmp->type == FOOD)	1088	if (tmp->type == BOOTS)
		1089	{
		1090	CHK_PICK_PICKUP;
		1091	continue;
		1092	}
		1093
		1094	if (op->contr->mode & PU_GLOVES)
		1095	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1096	{
		1097	CHK_PICK_PICKUP;
		1098	continue;
		1099	}
		1100
		1101	if (op->contr->mode & PU_CLOAK)
		1102	if (tmp->type == CLOAK)
		1103	{
		1104	CHK_PICK_PICKUP;
		1105	continue;
		1106	}
		1107
		1108	/* hoping to catch throwing daggers here */
		1109	if (op->contr->mode & PU_MISSILEWEAPON)
		1110	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1111	{
		1112	CHK_PICK_PICKUP;
		1113	continue;
		1114	}
		1115
		1116	/* careful: chairs and tables are weapons! */
		1117	if (op->contr->mode & PU_ALLWEAPON)
		1118	{
		1119	if (tmp->type == WEAPON)
		1120	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1140	{	1121	{
1141	CHK_PICK_PICKUP;	1122	CHK_PICK_PICKUP;
1142	continue;	1123	continue;
1143	}	1124	}
		1125	}
1144		1126
		1127	/* misc stuff that's useful */
1145	if (op->contr->mode & PU_DRINK)	1128	if (op->contr->mode & PU_KEY)
1146	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1129	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1147	{	1130	{
1148	CHK_PICK_PICKUP;	1131	CHK_PICK_PICKUP;
1149	continue;	1132	continue;
1150	}	1133	}
1151		1134
		1135	/* any of the last 4 bits set means we use the ratio for value
		1136	* pickups */
1152	if (op->contr->mode & PU_POTION)	1137	if (op->contr->mode & PU_RATIO)
1153	if (tmp->type == POTION)	1138	{
		1139	/* use value density to decide what else to grab */
		1140	/* >=7 was >= op->contr->mode */
		1141	/* >=7 is the old standard setting. Now we take the last 4 bits
1154	{	1142	*/
1155	CHK_PICK_PICKUP;
1156	continue;
1157	}
1158
1159	/* spellbooks, skillscrolls and normal books/scrolls */
1160	if (op->contr->mode & PU_SPELLBOOK)
1161	if (tmp->type == SPELLBOOK)
1162	{
1163	CHK_PICK_PICKUP;
1164	continue;
1165	}
1166
1167	if (op->contr->mode & PU_SKILLSCROLL)
1168	if (tmp->type == SKILLSCROLL)
1169	{
1170	CHK_PICK_PICKUP;
1171	continue;
1172	}
1173
1174	if (op->contr->mode & PU_READABLES)
1175	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1176	{
1177	CHK_PICK_PICKUP;
1178	continue;
1179	}
1180
1181	/* wands/staves/rods/horns */
1182	if (op->contr->mode & PU_MAGIC_DEVICE)
1183	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1184	{
1185	CHK_PICK_PICKUP;
1186	continue;
1187	}
1188
1189	/* pick up all magical items */
1190	if (op->contr->mode & PU_MAGICAL)	1143	wvratio = op->contr->mode & PU_RATIO;
1191	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1144	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1192	{
1193	CHK_PICK_PICKUP;
1194	continue;
1195	}
1196
1197	if (op->contr->mode & PU_VALUABLES)
1198	{	1145	{
1199	if (tmp->type == MONEY || tmp->type == GEM)	1146	#if 0
		1147	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1148	if (tmp->name != NULL)
1200	{	1149	{
1201	CHK_PICK_PICKUP;	1150	fprintf (stderr, "%s", tmp->name);
1202	continue;
1203	}	1151	}
1204	}
1205
1206	/* rings & amulets - talismans seems to be typed AMULET */
1207	if (op->contr->mode & PU_JEWELS)
1208	if (tmp->type == RING || tmp->type == AMULET)
1209	{
1210	CHK_PICK_PICKUP;
1211	continue;
1212	}
1213
1214	/* we don't forget dragon food */
1215	if (op->contr->mode & PU_FLESH)
1216	if (tmp->type == FLESH)
1217	{
1218	CHK_PICK_PICKUP;
1219	continue;
1220	}
1221
1222	/* bows and arrows. Bows are good for selling! */
1223	if (op->contr->mode & PU_BOW)
1224	if (tmp->type == BOW)
1225	{
1226	CHK_PICK_PICKUP;
1227	continue;
1228	}
1229
1230	if (op->contr->mode & PU_ARROW)
1231	if (tmp->type == ARROW)
1232	{
1233	CHK_PICK_PICKUP;
1234	continue;
1235	}
1236
1237	/* all kinds of armor etc. */
1238	if (op->contr->mode & PU_ARMOUR)
1239	if (tmp->type == ARMOUR)
1240	{
1241	CHK_PICK_PICKUP;
1242	continue;
1243	}
1244
1245	if (op->contr->mode & PU_HELMET)
1246	if (tmp->type == HELMET)
1247	{
1248	CHK_PICK_PICKUP;
1249	continue;
1250	}
1251
1252	if (op->contr->mode & PU_SHIELD)
1253	if (tmp->type == SHIELD)
1254	{
1255	CHK_PICK_PICKUP;
1256	continue;
1257	}
1258
1259	if (op->contr->mode & PU_BOOTS)
1260	if (tmp->type == BOOTS)
1261	{
1262	CHK_PICK_PICKUP;
1263	continue;
1264	}
1265
1266	if (op->contr->mode & PU_GLOVES)
1267	if (tmp->type == GLOVES)
1268	{
1269	CHK_PICK_PICKUP;
1270	continue;
1271	}
1272
1273	if (op->contr->mode & PU_CLOAK)
1274	if (tmp->type == CLOAK)
1275	{
1276	CHK_PICK_PICKUP;
1277	continue;
1278	}
1279
1280	/* hoping to catch throwing daggers here */
1281	if (op->contr->mode & PU_MISSILEWEAPON)
1282	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1283	{
1284	CHK_PICK_PICKUP;
1285	continue;
1286	}
1287
1288	/* careful: chairs and tables are weapons! */
1289	if (op->contr->mode & PU_ALLWEAPON)
1290	{
1291	if (tmp->type == WEAPON && tmp->name != NULL)
1292	{
1293	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1294	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1295	{
1296	CHK_PICK_PICKUP;
1297	continue;
1298	}
1299	}
1300
1301	if (tmp->type == WEAPON && tmp->name == NULL)
1302	{
1303	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1304	{
1305	CHK_PICK_PICKUP;
1306	continue;
1307	}
1308	}
1309	}
1310
1311	/* misc stuff that's useful */
1312	if (op->contr->mode & PU_KEY)
1313	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1314	{
1315	CHK_PICK_PICKUP;
1316	continue;
1317	}
1318
1319	/* any of the last 4 bits set means we use the ratio for value
1320	* pickups */
1321	if (op->contr->mode & PU_RATIO)
1322	{
1323	/* use value density to decide what else to grab */
1324	/* >=7 was >= op->contr->mode */
1325	/* >=7 is the old standard setting. Now we take the last 4 bits
1326	* and multiply them by 5, giving 0..15*5== 5..75 */
1327	wvratio = (op->contr->mode & PU_RATIO) * 5;
1328	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1329	{
1330	CHK_PICK_PICKUP;
1331	#if 0
1332	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1333	if (tmp->name != NULL)
1334	{
1335	fprintf (stderr, "%s", tmp->name);
1336	}
1337	else	1152	else
1338	fprintf (stderr, "%s", tmp->arch->archname);	1153	fprintf (stderr, "%s", tmp->arch->archname);
1339	fprintf (stderr, ",%d] = ", tmp->type);	1154	fprintf (stderr, ",%d] = ", tmp->type);
1340	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1155	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1341	#endif	1156	#endif
		1157	CHK_PICK_PICKUP;
1342	continue;	1158	continue;
1343	}
1344	}	1159	}
1345	} /* the new pickup model */	1160	} /* the new pickup model */
1346	}	1161	}
1347		1162
1348	return !stop;	1163	return !stop;
		1164	}
		1165
		1166	/* routine for both players and monsters. We call this when
		1167	* there is a possibility for our action distrubing our hiding
		1168	* place or invisiblity spell. Artefact invisiblity causes
		1169	* "noise" instead. If we arent invisible to begin with, we
		1170	* return 0.
		1171	*/
		1172	static int
		1173	action_makes_visible (object *op)
		1174	{
		1175	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1176	{
		1177	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1178	{
		1179	// artefact invisibility is permanent, but we still make noise
		1180	// this is important for game-balance.
		1181	if (op->contr)
		1182	op->make_noise ();
		1183
		1184	return 0;
		1185	}
		1186
		1187	if (op->contr && op->contr->tmp_invis == 0)
		1188	return 0;
		1189
		1190	/* If monsters, they should become visible */
		1191	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1192	{
		1193	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1194	return 1;
		1195	}
		1196	}
		1197
		1198	return 0;
1349	}	1199	}
1350		1200
1351	/*	1201	/*
1352	* Find an arrow in the inventory and after that	1202	* Find an arrow in the inventory and after that
1353	* in the right type container (quiver). Pointer to the	1203	* in the right type container (quiver). Pointer to the
1354	* found object is returned.	1204	* found object is returned.
1355	*/	1205	*/
1356	object *	1206	static object *
1357	find_arrow (object *op, const char *type)	1207	find_arrow (object *op, const char *type)
1358	{	1208	{
1359	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1209	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1360	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1210	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1361	return splay (tmp);	1211	return splay (tmp);
…		…
1375	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1225	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1376	* against the target. A full test is not performed, simply a basic test	1226	* against the target. A full test is not performed, simply a basic test
1377	* of resistances. The archer is making a quick guess at what he sees down	1227	* of resistances. The archer is making a quick guess at what he sees down
1378	* the hall. Failing that it does it's best to pick the highest plus arrow.	1228	* the hall. Failing that it does it's best to pick the highest plus arrow.
1379	*/	1229	*/
1380	object *	1230	static object *
1381	find_better_arrow (object *op, object *target, const char *type, int *better)	1231	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1382	{	1232	{
1383	object *tmp = NULL, *arrow, *ntmp;	1233	object *tmp = NULL, *arrow, *ntmp;
1384	int attacknum, attacktype, betterby = 0, i;	1234	int attacknum, attacktype, betterby = 0, i;
1385		1235
1386	if (!type)	1236	if (!type)
…		…
1390	{	1240	{
1391	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1241	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1392	{	1242	{
1393	i = 0;	1243	i = 0;
1394	ntmp = find_better_arrow (arrow, target, type, &i);	1244	ntmp = find_better_arrow (arrow, target, type, &i);
		1245
1395	if (i > betterby)	1246	if (i > betterby)
1396	{	1247	{
1397	tmp = ntmp;	1248	tmp = ntmp;
1398	betterby = i;	1249	betterby = i;
1399	}	1250	}
1400	}	1251	}
1401	else if (arrow->type == ARROW && arrow->race == type)	1252	else if (arrow->type == ARROW && arrow->race == type)
1402	{	1253	{
1403	/* allways prefer assasination/slaying */	1254	/* allways prefer assasination/slaying */
1404	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1255	if (target->race && arrow->slaying.contains (target->race))
1405	{	1256	{
1406	if (arrow->attacktype & AT_DEATH)	1257	if (arrow->attacktype & AT_DEATH)
1407	{	1258	{
1408	*better = 100;	1259	*better = 100;
1409	return arrow;	1260	return arrow;
…		…
1424	{	1275	{
1425	tmp = arrow;	1276	tmp = arrow;
1426	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1277	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1427	}	1278	}
1428	}	1279	}
		1280
1429	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1281	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1430	{	1282	{
1431	tmp = arrow;	1283	tmp = arrow;
1432	betterby = 2 + arrow->magic + arrow->stats.dam;	1284	betterby = 2 + arrow->magic + arrow->stats.dam;
1433	}	1285	}
		1286
1434	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1287	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1435	{	1288	{
1436	tmp = arrow;	1289	tmp = arrow;
1437	betterby = 1 + arrow->magic + arrow->stats.dam;	1290	betterby = 1 + arrow->magic + arrow->stats.dam;
1438	}	1291	}
1439	}	1292	}
1440	}	1293	}
1441	}	1294	}
		1295
1442	if (tmp == NULL && arrow == NULL)	1296	if (tmp == NULL && arrow == NULL)
1443	return find_arrow (op, type);	1297	return find_arrow (op, type);
1444		1298
1445	*better = betterby;	1299	*better = betterby;
1446	return tmp;	1300	return tmp;
…		…
1450	* find_better_arrow to find a decent arrow to use.	1304	* find_better_arrow to find a decent arrow to use.
1451	* op = the shooter	1305	* op = the shooter
1452	* type = bow->race	1306	* type = bow->race
1453	* dir = fire direction	1307	* dir = fire direction
1454	*/	1308	*/
1455	object *	1309	static object *
1456	pick_arrow_target (object *op, const char *type, int dir)	1310	pick_arrow_target (object *op, shstr_cmp type, int dir)
1457	{	1311	{
1458	object *tmp = NULL;	1312	object *tmp = NULL;
1459	maptile *m;	1313	maptile *m;
1460	int i, mflags, found, number;	1314	int i, mflags, found, number;
1461	sint16 x, y;	1315	sint16 x, y;
…		…
1476	for (i = 0, found = 0; i < 20; i++)	1330	for (i = 0, found = 0; i < 20; i++)
1477	{	1331	{
1478	x += freearr_x[dir];	1332	x += freearr_x[dir];
1479	y += freearr_y[dir];	1333	y += freearr_y[dir];
1480	mflags = get_map_flags (m, &m, x, y, &x, &y);	1334	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1335
1481	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1336	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1482	{	1337	{
1483	tmp = NULL;	1338	tmp = 0;
1484	break;	1339	break;
1485	}	1340	}
1486	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1341	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1487	{	1342	{
1488	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1343	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1489	* perhaps a bad assumption.	1344	* perhaps a bad assumption.
1490	*/	1345	*/
1491	tmp = NULL;	1346	tmp = 0;
1492	break;	1347	break;
1493	}	1348	}
		1349
1494	if (mflags & P_IS_ALIVE)	1350	if (mflags & P_IS_ALIVE)
1495	{
1496	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1351	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1497	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1352	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1498	{
1499	found++;
1500	break;
1501	}
1502	if (found)
1503	break;	1353	break;
1504	}
1505	}	1354	}
1506	if (tmp == NULL)	1355
		1356	if (!tmp)
1507	return find_arrow (op, type);	1357	return find_arrow (op, type);
1508		1358
1509	if (tmp->head)	1359	if (tmp->head)
1510	tmp = tmp->head;	1360	tmp = tmp->head;
1511		1361
…		…
1551	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1401	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1552	return 0;	1402	return 0;
1553	}	1403	}
1554		1404
1555	// optimisation: move object to top so we will find it quickly again	1405	// optimisation: move object to top so we will find it quickly again
1556	if (bow->below)	1406	splay (bow);
1557	{
1558	bow->remove ();
1559	op->insert (bow);
1560	}
1561
1562	}	1407	}
1563		1408
1564	if (!bow->race || !bow->skill)	1409	if (!bow->race || !bow->skill)
1565	{	1410	{
1566	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1592	}	1437	}
1593		1438
1594	/* this should not happen, but sometimes does */	1439	/* this should not happen, but sometimes does */
1595	if (arrow->nrof == 0)	1440	if (arrow->nrof == 0)
1596	{	1441	{
		1442	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1597	arrow->destroy ();	1443	arrow->destroy ();
1598	return 0;	1444	return 0;
1599	}	1445	}
1600		1446
1601	left = arrow; /* these are arrows left to the player */	1447	left = arrow; /* these are arrows left to the player */
1602	arrow = get_split_ob (arrow, 1);	1448	arrow = arrow->split ();
1603	if (!arrow)	1449	if (!arrow)
1604	{	1450	{
1605	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1451	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1606	return 0;	1452	return 0;
1607	}	1453	}
…		…
1611	arrow->direction = dir;	1457	arrow->direction = dir;
1612		1458
1613	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1459	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1614	arrow->stats.hp = arrow->stats.dam;	1460	arrow->stats.hp = arrow->stats.dam;
1615	arrow->stats.grace = arrow->attacktype;	1461	arrow->stats.grace = arrow->attacktype;
1616		1462	arrow->custom_name = arrow->slaying;
1617	if (arrow->slaying)
1618	arrow->spellarg = strdup (arrow->slaying);
1619		1463
1620	#if 0	1464	#if 0
1621	if (player *pl = op->contr)	1465	if (player *pl = op->contr)
1622	{	1466	{
1623	float speed = pl->weapon_sp;	1467	float speed = pl->weapon_sp;
…		…
1674	op->play_sound (sound_find ("fire_arrow"));	1518	op->play_sound (sound_find ("fire_arrow"));
1675	m->insert (arrow, sx, sy, op);	1519	m->insert (arrow, sx, sy, op);
1676		1520
1677	if (!arrow->destroyed ())	1521	if (!arrow->destroyed ())
1678	move_arrow (arrow);	1522	move_arrow (arrow);
1679
1680	if (op->type == PLAYER)
1681	{
1682	if (left->destroyed ())
1683	esrv_del_item (op->contr, left->count);
1684	else
1685	esrv_send_item (op, left);
1686	}
1687		1523
1688	return 1;	1524	return 1;
1689	}	1525	}
1690		1526
1691	/* Special fire code for players - this takes into	1527	/* Special fire code for players - this takes into
…		…
1693	* but monsters can't. Putting that code here	1529	* but monsters can't. Putting that code here
1694	* makes the fire_bow code much cleaner.	1530	* makes the fire_bow code much cleaner.
1695	* this function should only be called if 'op' is a player,	1531	* this function should only be called if 'op' is a player,
1696	* hence the function name.	1532	* hence the function name.
1697	*/	1533	*/
1698	int	1534	static int
1699	player_fire_bow (object *op, int dir)	1535	player_fire_bow (object *op, int dir)
1700	{	1536	{
1701	int ret = 0, wcmod = 0;	1537	int ret;
1702		1538
1703	if (op->contr->bowtype == bow_bestarrow)	1539	if (op->contr->bowtype == bow_bestarrow)
1704	{	1540	{
1705	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1541	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1706	}	1542	}
1707	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1543	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1708	{	1544	{
1709	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1545	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1710	wcmod = -1;
1711
1712	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1546	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1713	}	1547	}
1714	else if (op->contr->bowtype == bow_threewide)	1548	else if (op->contr->bowtype == bow_threewide)
1715	{	1549	{
1716	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1550	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1717	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1551	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1718	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1552	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1719	}	1553	}
1720	else if (op->contr->bowtype == bow_spreadshot)	1554	else if (op->contr->bowtype == bow_spreadshot)
1721	{	1555	{
1722	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1556	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1723	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1557	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1724	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1558	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1725	}	1559	}
1726	else	1560	else
1727	{	1561	{
…		…
1733	}	1567	}
1734		1568
1735	/* Fires a misc (wand/rod/horn) object in 'dir'.	1569	/* Fires a misc (wand/rod/horn) object in 'dir'.
1736	* Broken apart from 'fire' to keep it more readable.	1570	* Broken apart from 'fire' to keep it more readable.
1737	*/	1571	*/
1738	void	1572	static void
1739	fire_misc_object (object *op, int dir)	1573	fire_misc_object (object *op, int dir)
1740	{	1574	{
1741	object *item = op->contr->ranged_ob;	1575	object *item = op->contr->ranged_ob;
1742		1576
1743	if (!item)	1577	if (!item)
…		…
1765	return;	1599	return;
1766	}	1600	}
1767	}	1601	}
1768	else if (item->type == ROD || item->type == HORN)	1602	else if (item->type == ROD || item->type == HORN)
1769	{	1603	{
1770	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1604	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
		1605
		1606	// using the maximum of the rods charge allows at least one spell cast
		1607	// for a rod or horn, this fixes some broken rods.
		1608	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1771	{	1609	{
1772	op->contr->play_sound (sound_find ("wand_poof"));	1610	op->contr->play_sound (sound_find ("wand_poof"));
1773		1611
1774	if (item->type == ROD)	1612	if (item->type == ROD)
1775	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1613	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1780	}	1618	}
1781	}	1619	}
1782		1620
1783	if (cast_spell (op, item, dir, item->inv, NULL))	1621	if (cast_spell (op, item, dir, item->inv, NULL))
1784	{	1622	{
1785	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1623	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1624
1786	if (item->type == WAND)	1625	if (item->type == WAND)
1787	{	1626	{
1788	if (!(--item->stats.food))	1627	if (!(--item->stats.food))
1789	{	1628	{
1790	object *tmp;	1629	object *tmp;
…		…
1794	CLEAR_FLAG (item, FLAG_ANIMATE);	1633	CLEAR_FLAG (item, FLAG_ANIMATE);
1795	item->face = item->arch->face;	1634	item->face = item->arch->face;
1796	item->set_speed (0);	1635	item->set_speed (0);
1797	}	1636	}
1798		1637
1799	if ((tmp = item->in_player ()))	1638	if (object *pl = item->visible_to ())
1800	esrv_update_item (UPD_ANIM, tmp, item);	1639	esrv_update_item (UPD_ANIM, pl, item);
1801	}	1640	}
1802	}	1641	}
1803	else if (item->type == ROD || item->type == HORN)	1642	else if (item->type == ROD || item->type == HORN)
1804	drain_rod_charge (item);	1643	drain_rod_charge (item);
1805	}	1644	}
…		…
1810	bool	1649	bool
1811	fire (object *op, int dir)	1650	fire (object *op, int dir)
1812	{	1651	{
1813	int spellcost = 0;	1652	int spellcost = 0;
1814		1653
1815	/* check for loss of invisiblity/hide */
1816	if (action_makes_visible (op))
1817	make_visible (op);
1818
1819	player *pl = op->contr;	1654	player *pl = op->contr;
1820		1655
1821	if (pl->golem)	1656	if (pl->golem)
1822	{	1657	{
1823	control_golem (op->contr->golem, dir);	1658	control_golem (op->contr->golem, dir);
…		…
1825	}	1660	}
1826		1661
1827	object *ob = pl->ranged_ob;	1662	object *ob = pl->ranged_ob;
1828		1663
1829	if (!ob)	1664	if (!ob)
1830	return false;
1831
1832	if (!op->change_weapon (ob))
1833	return false;	1665	return false;
1834		1666
1835	if (op->speed_left > 0.f)	1667	if (op->speed_left > 0.f)
1836	--op->speed_left;	1668	--op->speed_left;
1837	else	1669	else
1838	return false;	1670	return false;
1839		1671
		1672	if (!op->change_weapon (ob))
		1673	return false;
		1674
		1675	/* check for loss of invisiblity/hide */
		1676	if (action_makes_visible (op))
		1677	make_visible (op);
		1678
1840	switch (ob->type)	1679	switch (ob->type)
1841	{	1680	{
1842	case BOW:	1681	case BOW:
1843	player_fire_bow (op, dir);	1682	player_fire_bow (op, dir);
1844	break;	1683	break;
1845		1684
1846	case SPELL:	1685	case SPELL:
1847	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1686	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1848	break;	1687	break;
1849		1688
1850	case BUILDER:	1689	case BUILDER:
1851	apply_map_builder (op, dir);	1690	apply_map_builder (op, dir);
1852	break;	1691	break;
…		…
1861	}	1700	}
1862		1701
1863	return true;	1702	return true;
1864	}	1703	}
1865		1704
1866	/* find_key	1705	static object *
1867	* We try to find a key for the door as passed. If we find a key
1868	* and successfully use it, we return the key, otherwise NULL
1869	* This function merges both normal and locked door, since the logic
1870	* for both is the same - just the specific key is different.
1871	* pl is the player,
1872	* inv is the objects inventory to searched
1873	* door is the door we are trying to match against.
1874	* This function can be called recursively to search containers.
1875	*/
1876	object *
1877	find_key (object *pl, object *container, object *door)	1706	find_key_ (object *pl, object *container, object *door)
1878	{	1707	{
1879	object *tmp, *key;	1708	object *tmp, *key;
1880		1709
1881	/* Should not happen, but sanity checking is never bad */	1710	/* Should not happen, but sanity checking is never bad */
1882	if (!container->inv)	1711	if (!container->inv)
…		…
1885	/* First, lets try to find a key in the top level inventory */	1714	/* First, lets try to find a key in the top level inventory */
1886	for (tmp = container->inv; tmp; tmp = tmp->below)	1715	for (tmp = container->inv; tmp; tmp = tmp->below)
1887	{	1716	{
1888	if (door->type == DOOR && tmp->type == KEY)	1717	if (door->type == DOOR && tmp->type == KEY)
1889	break;	1718	break;
		1719
1890	/* For sanity, we should really check door type, but other stuff	1720	/* For sanity, we should really check door type, but other stuff
1891	* (like containers) can be locked with special keys	1721	* (like containers) can be locked with special keys
1892	*/	1722	*/
1893	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1723	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1894	break;	1724	break;
…		…
1900	* a key, return	1730	* a key, return
1901	*/	1731	*/
1902	if (!tmp)	1732	if (!tmp)
1903	{	1733	{
1904	for (tmp = container->inv; tmp; tmp = tmp->below)	1734	for (tmp = container->inv; tmp; tmp = tmp->below)
1905	{
1906	/* No reason to search empty containers */	1735	/* No reason to search empty containers */
1907	if (tmp->type == CONTAINER && tmp->inv)	1736	if (tmp->type == CONTAINER && tmp->inv)
1908	{
1909	if ((key = find_key (pl, tmp, door)))	1737	if ((key = find_key_ (pl, tmp, door)))
1910	return key;	1738	return key;
1911	}
1912	}
1913		1739
1914	if (!tmp)	1740	if (!tmp)
1915	return NULL;	1741	return 0;
1916	}	1742	}
1917		1743
1918	/* We get down here if we have found a key. Now if its in a container,	1744	/* We get down here if we have found a key. Now if its in a container,
1919	* see if we actually want to use it	1745	* see if we actually want to use it
1920	*/	1746	*/
1921	if (pl != container)	1747	if (pl != container)
1922	{	1748	{
1923	/* Only let players use keys in containers */	1749	/* Only let players use keys in containers */
1924	if (!pl->contr)	1750	if (!pl->contr)
1925	return NULL;	1751	return 0;
		1752
1926	/* cases where this fails:	1753	/* cases where this fails:
1927	* If we only search the player inventory, return now since we	1754	* If we only search the player inventory, return now since we
1928	* are not in the players inventory.	1755	* are not in the players inventory.
1929	* If the container is not active, return now since only active	1756	* If the container is not active, return now since only active
1930	* containers can be used.	1757	* containers can be used.
…		…
1934	* inv must have been an container and must have been active.	1761	* inv must have been an container and must have been active.
1935	*	1762	*
1936	* Change the color so that the message doesn't disappear with	1763	* Change the color so that the message doesn't disappear with
1937	* all the others.	1764	* all the others.
1938	*/	1765	*/
1939	if (pl->contr->usekeys == key_inventory ||	1766	if (pl->contr->usekeys == key_inventory
1940	!QUERY_FLAG (container, FLAG_APPLIED) ||	1767	|| !QUERY_FLAG (container, FLAG_APPLIED)
1941	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1768	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1942	{	1769	{
1943	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1770	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1944	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1771	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945	return NULL;	1772	return NULL;
1946	}	1773	}
1947	}	1774	}
1948		1775
1949	return tmp;	1776	return tmp;
		1777	}
		1778
		1779	/* find_key
		1780	* We try to find a key for the door as passed. If we find a key
		1781	* and successfully use it, we return the key, otherwise NULL
		1782	* This function merges both normal and locked door, since the logic
		1783	* for both is the same - just the specific key is different.
		1784	* pl is the player,
		1785	* inv is the objects inventory to searched
		1786	* door is the door we are trying to match against.
		1787	* This function can be called recursively to search containers.
		1788	*/
		1789	object *
		1790	find_key (object *pl, object *container, object *door)
		1791	{
		1792	if (door->slaying && is_match_expr (door->slaying))
		1793	{
		1794	// for match expressions, we try to find the key by applying the match
		1795	// to the op itself, which is supposed to find the "key", instead
		1796	// of searching through containers ourselves.
		1797
		1798	return match_one (door->slaying, container, door, pl, pl);
		1799	}
		1800	else
		1801	return find_key_ (pl, container, door);
1950	}	1802	}
1951		1803
1952	/* moved door processing out of move_player_attack.	1804	/* moved door processing out of move_player_attack.
1953	* returns 1 if player has opened the door with a key	1805	* returns 1 if player has opened the door with a key
1954	* such that the caller should not do anything more,	1806	* such that the caller should not do anything more,
…		…
1981	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1833	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1982	remove_door2 (door); /* remove door without violence ;-) */	1834	remove_door2 (door); /* remove door without violence ;-) */
1983	}	1835	}
1984		1836
1985	/* Do this after we print the message */	1837	/* Do this after we print the message */
1986	decrease_ob (key); /* Use up one of the keys */	1838	key->decrease (); /* Use up one of the keys */
1987	/* Need to update the weight the container the key was in */
1988	if (container != op)
1989	esrv_update_item (UPD_WEIGHT, op, container);
1990		1839
1991	return 1; /* Nothing more to do below */	1840	return 1; /* Nothing more to do below */
1992	}	1841	}
1993	else if (door->type == LOCKED_DOOR)	1842	else if (door->type == LOCKED_DOOR)
1994	{	1843	{
…		…
2007	* going to try and move (not fire weapons).	1856	* going to try and move (not fire weapons).
2008	*/	1857	*/
2009	bool	1858	bool
2010	move_player_attack (object *op, int dir)	1859	move_player_attack (object *op, int dir)
2011	{	1860	{
		1861	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1862	{
		1863	--op->speed_left;
		1864	return true;
		1865	}
		1866
2012	int on_battleground;	1867	int on_battleground;
2013		1868
2014	sint16 nx = freearr_x[dir] + op->x;	1869	sint16 nx = freearr_x[dir] + op->x;
2015	sint16 ny = freearr_y[dir] + op->y;	1870	sint16 ny = freearr_y[dir] + op->y;
2016		1871
2017	on_battleground = op_on_battleground (op, 0, 0);	1872	on_battleground = op_on_battleground (op, 0, 0);
2018		1873
2019	if (out_of_map (op->map, nx, ny))	1874	if (out_of_map (op->map, nx, ny))
2020	return false;	1875	return false;
2021
2022	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2023	{
2024	--op->speed_left;
2025	return true;
2026	}
2027		1876
2028	/* If braced, or can't move to the square, and it is not out of the	1877	/* If braced, or can't move to the square, and it is not out of the
2029	* map, attack it. Note order of if statement is important - don't	1878	* map, attack it. Note order of if statement is important - don't
2030	* want to be calling move_ob if braced, because move_ob will move the	1879	* want to be calling move_ob if braced, because move_ob will move the
2031	* player. This is a pretty nasty hack, because if we could	1880	* player. This is a pretty nasty hack, because if we could
…		…
2091	--op->speed_left;	1940	--op->speed_left;
2092		1941
2093	op->play_sound (sound_find ("push_player"));	1942	op->play_sound (sound_find ("push_player"));
2094	push_ob (mon, dir, op);	1943	push_ob (mon, dir, op);
2095		1944
2096	if (op->contr->tmp_invis || op->hide)	1945	if (action_makes_visible (op))
2097	make_visible (op);	1946	make_visible (op);
2098		1947
2099	return true;	1948	return true;
2100	}	1949	}
2101	else	1950	else
…		…
2123	push_ob (mon, dir, op);	1972	push_ob (mon, dir, op);
2124	}	1973	}
2125	else	1974	else
2126	op->statusmsg ("You withhold your attack");	1975	op->statusmsg ("You withhold your attack");
2127		1976
2128	if (op->contr->tmp_invis || op->hide)	1977	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2129	make_visible (op);	1978	make_visible (op);
2130		1979
2131	return true;	1980	return true;
2132	}	1981	}
2133	}	1982	}
…		…
2173	}	2022	}
2174		2023
2175	bool	2024	bool
2176	move_player (object *op, int dir)	2025	move_player (object *op, int dir)
2177	{	2026	{
2178	int pick;
2179
2180	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2027	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2181	return 0;	2028	return 0;
2182		2029
2183	/* Sanity check: make sure dir is valid */	2030	/* Sanity check: make sure dir is valid */
2184	if ((dir < 0) || (dir >= 9))	2031	if ((dir < 0) || (dir >= 9))
…		…
2191	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2038	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2192	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2039	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2193		2040
2194	op->facing = dir;	2041	op->facing = dir;
2195		2042
2196	if (op->hide)	2043	if (op->flag [FLAG_HIDDEN])
2197	do_hidden_move (op);	2044	do_hidden_move (op);
2198		2045
2199	bool retval;	2046	bool retval;
		2047	int pick = 0;
2200		2048
2201	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2049	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2202	retval = RESULT_INT (0);	2050	retval = RESULT_INT (0);
2203	else if (op->contr->fire_on)	2051	else if (op->contr->fire_on)
2204	retval = fire (op, dir);	2052	retval = fire (op, dir);
…		…
2261	return move_player (op, op->direction);	2109	return move_player (op, op->direction);
2262		2110
2263	return false;	2111	return false;
2264	}	2112	}
2265		2113
2266	int	2114	static int
2267	save_life (object *op)	2115	save_life (object *op)
2268	{	2116	{
2269	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2117	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2270	return 0;	2118	return 0;
2271		2119
…		…
2273	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2121	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2274	{	2122	{
2275	op->play_sound (sound_find ("ob_evaporate"));	2123	op->play_sound (sound_find ("ob_evaporate"));
2276	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2124	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2277		2125
2278	if (op->contr)
2279	esrv_del_item (op->contr, tmp->count);
2280
2281	tmp->destroy ();	2126	tmp->destroy ();
2282	CLEAR_FLAG (op, FLAG_LIFESAVE);	2127	CLEAR_FLAG (op, FLAG_LIFESAVE);
2283		2128
2284	if (op->stats.hp < 0)	2129	if (op->stats.hp < 0)
2285	op->stats.hp = op->stats.maxhp;	2130	op->stats.hp = op->stats.maxhp;
…		…
2297	return 0;	2142	return 0;
2298	}	2143	}
2299		2144
2300	/* This goes throws the inventory and removes unpaid objects, and puts them	2145	/* This goes throws the inventory and removes unpaid objects, and puts them
2301	* back in the map (location and map determined by values of env). This	2146	* back in the map (location and map determined by values of env). This
2302	* function will descend into containers. op is the object to start the search	2147	* function will descend into containers. op is the object to start the search
2303	* from.	2148	* from.
2304	*/	2149	*/
2305	static void	2150	static void
2306	drop_unpaid_items (object *op, object *env)	2151	drop_unpaid_items (object *op, object *env)
2307	{	2152	{
2308	while (op)	2153	while (op)
2309	{	2154	{
2310	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2155	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2311		2156
2312	if (QUERY_FLAG (op, FLAG_UNPAID))	2157	if (QUERY_FLAG (op, FLAG_UNPAID))
2313	{
2314	if (env->type == PLAYER)
2315	esrv_del_item (env->contr, op->count);
2316
2317	op->insert_at (env);	2158	op->insert_at (env);
2318	}
2319	else if (op->inv)	2159	else if (op->inv)
2320	drop_unpaid_items (op->inv, env);	2160	drop_unpaid_items (op->inv, env);
2321		2161
2322	op = next;	2162	op = next;
2323	}	2163	}
…		…
2326	void	2166	void
2327	object::drop_unpaid_items ()	2167	object::drop_unpaid_items ()
2328	{	2168	{
2329	if (!flag [FLAG_REMOVED])	2169	if (!flag [FLAG_REMOVED])
2330	::drop_unpaid_items (inv, this);	2170	::drop_unpaid_items (inv, this);
2331	}
2332
2333	/*
2334	* Returns pointer a static string containing gravestone text
2335	* Moved from apply.c to player.c - player.c is what
2336	* actually uses this function. player.c may not be quite the
2337	* best, a misc file for object actions is probably better,
2338	* but there isn't one in the server directory.
2339	*/
2340	char *
2341	gravestone_text (object *op)
2342	{
2343	static char buf2[MAX_BUF];
2344	char buf[MAX_BUF];
2345	time_t now = time (NULL);
2346
2347	strcpy (buf2, " R.I.P.\n\n");
2348	if (op->type == PLAYER)
2349	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2350	else
2351	sprintf (buf, "%s\n", &op->name);
2352
2353	strncat (buf2, " ", 20 - strlen (buf) / 2);
2354	strcat (buf2, buf);
2355	if (op->type == PLAYER)
2356	sprintf (buf, "who was in level %d when killed\n", op->level);
2357	else
2358	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2359
2360	strncat (buf2, " ", 20 - strlen (buf) / 2);
2361	strcat (buf2, buf);
2362	if (op->type == PLAYER)
2363	{
2364	sprintf (buf, "by %s.\n\n", op->contr->killer);
2365	strncat (buf2, " ", 21 - strlen (buf) / 2);
2366	strcat (buf2, buf);
2367	}
2368
2369	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2370	strncat (buf2, " ", 20 - strlen (buf) / 2);
2371	strcat (buf2, buf);
2372
2373	return buf2;
2374	}	2171	}
2375		2172
2376	void	2173	void
2377	do_some_living (object *op)	2174	do_some_living (object *op)
2378	{	2175	{
…		…
2533	{	2330	{
2534	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2331	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2535		2332
2536	if (over_hp > 0)	2333	if (over_hp > 0)
2537	{	2334	{
2538	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2335	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2539	op->last_heal = 0;	2336	op->last_heal = 0;
2540	}	2337	}
2541	else	2338	else
2542	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2339	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2543	}	2340	}
…		…
2559	op->stats.food--;	2356	op->stats.food--;
2560	}	2357	}
2561		2358
2562	if (op->stats.food < 0 && op->stats.hp >= 0)	2359	if (op->stats.food < 0 && op->stats.hp >= 0)
2563	{	2360	{
2564	object *tmp, *flesh = 0;	2361	object *flesh = 0;
2565		2362
2566	for (tmp = op->inv; tmp; tmp = tmp->below)	2363	for_inv_removable (op, tmp)
2567	{	2364	{
2568	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2365	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2366	continue;
		2367
		2368	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2569	{	2369	{
2570	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2370	op->statusmsg ("You blindly grab for a bite of food. "
2571	{	2371	"H<To prevent you from starving, you ate some random item from your backpack.>");
2572	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2573	manual_apply (op, tmp, 0);	2372	manual_apply (op, tmp, 0);
		2373
2574	if (op->stats.food >= 0 || op->stats.hp < 0)	2374	if (op->stats.food >= 0 || op->stats.hp < 0)
2575	break;	2375	break;
2576	}	2376	}
2577	else if (tmp->type == FLESH)	2377	else if (tmp->type == FLESH)
2578	flesh = tmp;	2378	flesh = tmp;
2579	} /* End if paid for object */	2379	}
2580	} /* end of for loop */
2581		2380
2582	/* If player is still starving, it means they don't have any food, so	2381	/* If player is still starving, it means they don't have any food, so
2583	* eat flesh instead.	2382	* eat flesh instead.
2584	*/	2383	*/
2585	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2384	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2586	{	2385	{
2587	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2386	op->statusmsg ("You blindly grab for a bite of food. "
		2387	"H<To prevent you from starving, you ate some random item from your backpack.>");
2588	manual_apply (op, flesh, 0);	2388	manual_apply (op, flesh, 0);
2589	}	2389	}
		2390
		2391	// If player is still starving, alert him!
		2392	if (op->stats.food < 0)
		2393	op->failmsg ("You are starving! "
		2394	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2590	}	2395	}
2591		2396
2592	if (op->stats.food < 0)	2397	if (op->stats.food < 0)
2593	{	2398	{
2594	op->stats.hp += op->stats.food;	2399	op->stats.hp += op->stats.food;
2595	op->stats.food = 0;	2400	op->stats.food = 0;
		2401
		2402	if (op->stats.hp < 0)
		2403	{
		2404	op->contr->killer = archetype::get ("killer_starvation");
		2405	op->contr->killer->destroy ();
2596	}	2406	}
		2407	}
2597		2408
		2409	/* killer should be set here already */
2598	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2410	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2599	kill_player (op);	2411	kill_player (op);
2600	}	2412	}
2601	}	2413	}
2602		2414
…		…
2607	*/	2419	*/
2608	void	2420	void
2609	kill_player (object *op)	2421	kill_player (object *op)
2610	{	2422	{
2611	int x, y;	2423	int x, y;
2612	char buf[MAX_BUF];
2613	maptile *map; /* this is for resurrection */	2424	maptile *map; /* this is for resurrection */
2614	int will_kill_again;	2425	int will_kill_again;
2615	archetype *at;	2426	archetype *at;
2616	object *tmp;	2427	object *tmp;
2617		2428
2618	if (save_life (op))	2429	if (save_life (op))
2619	return;	2430	return;
		2431
		2432	dynbuf_text deathtab;
		2433
		2434	/* restore player */
		2435	at = archetype::find (shstr_poisoning);
		2436	if (object *tmp = present_arch_in_ob (at, op))
		2437	{
		2438	tmp->destroy ();
		2439	deathtab << "Your body feels cleansed...\r";
		2440	}
		2441
		2442	at = archetype::find (shstr_confusion);
		2443	if (object *tmp = present_arch_in_ob (at, op))
		2444	{
		2445	tmp->destroy ();
		2446	deathtab << "Your mind feels clearer...\r";
		2447	}
		2448
		2449	cure_disease (op, 0, 0); /* remove any disease */
		2450
		2451	max_it (op->stats.hp , op->stats.maxhp);
		2452	max_it (op->stats.sp , op->stats.maxsp);
		2453	max_it (op->stats.grace, op->stats.maxgrace);
		2454
		2455	if (op->stats.food <= 0)
		2456	op->stats.food = 999;
		2457
		2458	// remove all spell effects that are active
		2459	// to avoid long-term effects such as word-of-recall
		2460	for (object *item = op->inv; item; )
		2461	{
		2462	object *next = item->below;
		2463
		2464	if (item->type == SPELL_EFFECT && item->active)
		2465	item->destroy ();
		2466
		2467	item = next;
		2468	}
2620		2469
2621	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2470	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2622	* in cities ONLY!!! It is very important that this doesn't get abused.	2471	* in cities ONLY!!! It is very important that this doesn't get abused.
2623	* Look at op_on_battleground() for more info --AndreasV	2472	* Look at op_on_battleground() for more info --AndreasV
2624	*/	2473	*/
2625	if (op_on_battleground (op, &x, &y))	2474	if (op_on_battleground (op, &x, &y))
2626	{	2475	{
2627	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2476	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2628	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2629
2630	/* restore player */
2631	at = archetype::find ("poisoning");
2632	if (object *tmp = present_arch_in_ob (at, op))
2633	{
2634	tmp->destroy ();
2635	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2636	}
2637
2638	at = archetype::find ("confusion");
2639	if (object *tmp = present_arch_in_ob (at, op))
2640	{
2641	tmp->destroy ();
2642	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2643	}
2644
2645	cure_disease (op, 0, 0); /* remove any disease */
2646	op->stats.hp = op->stats.maxhp;
2647	if (op->stats.food <= 0)
2648	op->stats.food = 999;
2649		2477
2650	/* create a bodypart-trophy to make the winner happy */	2478	/* create a bodypart-trophy to make the winner happy */
2651	if (object *tmp = arch_to_object (archetype::find ("finger")))	2479	object *tmp = archetype::find (shstr_finger)->instance ();
2652	{	2480
2653	tmp->name = format ("%s's finger" , &op->name);	2481	tmp->name = format ("%s's finger" , &op->name);
2654	tmp->name_pl = format ("%s's fingers", &op->name);	2482	tmp->name_pl = format ("%s's fingers", &op->name);
2655	tmp->msg = format (	2483	tmp->msg = format (
2656	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2484	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2657	&op->name, op->contr->title, (int) (op->level), op->contr->killer	2485	&op->name, op->contr->title,
		2486	(int)op->level,
		2487	op->contr->killer_name ()
2658	);	2488	);
2659	tmp->value = 0, tmp->type = 0;	2489	tmp->value = 0, tmp->type = 0;
2660	tmp->materialname = "organics";	2490	tmp->material = name_to_material (shstr_organic);
2661	tmp->insert_at (op, tmp);	2491	tmp->insert_at (op, tmp);
2662	}
2663		2492
2664	/* teleport defeated player to new destination */	2493	/* teleport defeated player to new destination */
2665	transfer_ob (op, x, y, 0, NULL);	2494	transfer_ob (op, x, y, 0, NULL);
2666	op->contr->braced = 0;	2495	op->contr->braced = 0;
		2496
		2497	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2667	return;	2498	return;
2668	}	2499	}
2669		2500
		2501	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2502	deathtab << "T<YOU HAVE DIED>\n\n";
		2503
2670	INVOKE_PLAYER (DEATH, op->contr);	2504	INVOKE_PLAYER (DEATH, op->contr);
2671		2505
2672	command_kill_pets (op, 0);	2506	command_kill_pets (op, 0);
2673
2674	if (op->stats.food < 0)
2675	strcpy (op->contr->killer, "starvation");
2676		2507
2677	op->contr->play_sound (sound_find ("player_dies"));	2508	op->contr->play_sound (sound_find ("player_dies"));
2678		2509
2679	/* save the map location for corpse, gravestone */	2510	/* save the map location for corpse, gravestone */
2680	x = op->x;	2511	x = op->x;
…		…
2710		2541
2711	lost_a_stat = 0;	2542	lost_a_stat = 0;
2712		2543
2713	for (z = 0; z < num_stats_lose; z++)	2544	for (z = 0; z < num_stats_lose; z++)
2714	{	2545	{
2715	i = RANDOM () % NUM_STATS;	2546	i = rndm (NUM_STATS);
2716		2547
2717	if (settings.stat_loss_on_death)	2548	if (settings.stat_loss_on_death)
2718	{	2549	{
2719	/* Pick a random stat and take a point off it. Tell the player	2550	/* Pick a random stat and take a point off it. Tell the player
2720	* what he lost.	2551	* what he lost.
…		…
2727	lost_a_stat = 1;	2558	lost_a_stat = 1;
2728	}	2559	}
2729	else	2560	else
2730	{	2561	{
2731	/* deplete a stat */	2562	/* deplete a stat */
2732	archetype *deparch = archetype::find ("depletion");	2563	archetype *deparch = archetype::find (shstr_depletion);
2733	object *dep;	2564	object *dep;
2734		2565
2735	dep = present_arch_in_ob (deparch, op);	2566	dep = present_arch_in_ob (deparch, op);
2736	if (!dep)	2567	if (!dep)
2737	{	2568	{
2738	dep = arch_to_object (deparch);	2569	dep = deparch->instance ();
2739	insert_ob_in_ob (dep, op);	2570	insert_ob_in_ob (dep, op);
2740	}	2571	}
2741	lose_this_stat = 1;	2572	lose_this_stat = 1;
2742	if (settings.balanced_stat_loss)	2573	if (settings.balanced_stat_loss)
2743	{	2574	{
…		…
2771	}	2602	}
2772	}	2603	}
2773		2604
2774	if (lose_this_stat)	2605	if (lose_this_stat)
2775	{	2606	{
2776	this_stat = get_attr_value (&(dep->stats), i);	2607	this_stat = get_attr_value (&dep->stats, i);
2777	/* We could try to do something clever like find another	2608	/* We could try to do something clever like find another
2778	* stat to reduce if this fails. But chances are, if	2609	* stat to reduce if this fails. But chances are, if
2779	* stats have been depleted to -50, all are pretty low	2610	* stats have been depleted to -50, all are pretty low
2780	* and should be roughly the same, so it shouldn't make a	2611	* and should be roughly the same, so it shouldn't make a
2781	* difference.	2612	* difference.
…		…
2789	lost_a_stat = 1;	2620	lost_a_stat = 1;
2790	}	2621	}
2791	}	2622	}
2792	}	2623	}
2793	}	2624	}
		2625
2794	/* If no stat lost, tell the player. */	2626	/* If no stat lost, tell the player. */
2795	if (!lost_a_stat)	2627	if (!lost_a_stat)
2796	{	2628	{
2797	/* determine_god() seems to not work sometimes... why is this?	2629	/* determine_god() seems to not work sometimes... why is this?
2798	Should I be using something else? GD */	2630	Should I be using something else? GD */
2799	const char *god = determine_god (op);	2631	shstr_tmp god = determine_god (op);
2800		2632
2801	if (god && (strcmp (god, "none")))	2633	if (god != shstr_none)
2802	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2634	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2803	else	2635	else
2804	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2636	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2805	}	2637	}
2806	#else	2638	#else
2807	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2639	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2808	#endif	2640	#endif
2809		2641
2810	/* Put a gravestone up where the character 'almost' died. List the	2642	/* Put a gravestone up where the character 'almost' died. List the
2811	* exp loss on the stone.	2643	* exp loss on the stone.
2812	*/	2644	*/
2813	tmp = arch_to_object (archetype::find ("gravestone"));	2645	tmp = archetype::find (shstr_gravestone)->instance ();
2814	sprintf (buf, "%s's gravestone", &op->name);	2646	tmp->name = format ("%s's gravestone", &op->name);
2815	tmp->name = buf;	2647	tmp->name_pl = format ("%s's gravestones", &op->name);
2816	sprintf (buf, "%s's gravestones", &op->name);	2648	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2817	tmp->name_pl = buf;	2649	&op->name, op->contr->title, op->contr->killer_name ());
2818	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);
2819	tmp->msg = buf;
2820	tmp->x = op->x, tmp->y = op->y;	2650	tmp->x = op->x, tmp->y = op->y;
2821	insert_ob_in_map (tmp, op->map, NULL, 0);	2651	insert_ob_in_map (tmp, op->map, NULL, 0);
2822		2652
2823	/**************************************/	2653	/**************************************/
2824	/* */	2654	/* */
2825	/* Subtract the experience points, */	2655	/* Subtract the experience points, */
2826	/* if we died cause of food, give us */
2827	/* food, and reset HP's... */
2828	/* */	2656	/* */
2829	/**************************************/	2657	/**************************************/
2830		2658
2831	/* remove any poisoning and confusion the character may be suffering. */
2832	/* restore player */
2833	at = archetype::find ("poisoning");
2834	tmp = present_arch_in_ob (at, op);
2835
2836	if (tmp)
2837	{
2838	tmp->destroy ();
2839	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2840	}
2841
2842	at = archetype::find ("confusion");
2843	tmp = present_arch_in_ob (at, op);
2844	if (tmp)
2845	{
2846	tmp->destroy ();
2847	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2848	}
2849
2850	cure_disease (op, 0, 0); /* remove any disease */
2851
2852	/*add_exp(op, (op->stats.exp * -0.20)); */	2659	/*add_exp(op, (op->stats.exp * -0.20)); */
2853	apply_death_exp_penalty (op);	2660	apply_death_exp_penalty (op);
2854	if (op->stats.food < 100)
2855	op->stats.food = 900;
2856	op->stats.hp = op->stats.maxhp;
2857	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2858	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2859		2661
2860	/*	2662	/*
2861	* Check to see if the player has any unpaid items. If so, remove them	2663	* Check to see if the player has any unpaid items. If so, remove them
2862	* and put them back in the map.	2664	* and put them back in the map.
2863	*/	2665	*/
…		…
2898	if (will_kill_again & (1 << at))	2700	if (will_kill_again & (1 << at))
2899	force->resist[at] = 100;	2701	force->resist[at] = 100;
2900		2702
2901	insert_ob_in_ob (force, op);	2703	insert_ob_in_ob (force, op);
2902	op->update_stats ();	2704	op->update_stats ();
2903
2904	}	2705	}
2905		2706
2906	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2707	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2907	}	2708	}
2908		2709
2909	void	2710	static void
2910	loot_object (object *op)	2711	loot_object (object *op)
2911	{ /* Grab and destroy some treasure */	2712	{ /* Grab and destroy some treasure */
2912	object *tmp, *tmp2, *next;	2713	object *tmp, *tmp2, *next;
2913		2714
2914	op->close_container (); /* close open sack first */	2715	op->close_container (); /* close open sack first */
…		…
2928		2729
2929	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2730	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2930	{	2731	{
2931	if (tmp->nrof > 1)	2732	if (tmp->nrof > 1)
2932	{	2733	{
2933	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2734	tmp->decrease (rndm (1, tmp->nrof - 1));
2934	tmp2->destroy ();
2935	insert_ob_in_map (tmp, op->map, NULL, 0);	2735	insert_ob_in_map (tmp, op->map, NULL, 0);
2936	}	2736	}
2937	else	2737	else
2938	tmp->destroy ();	2738	tmp->destroy ();
2939	}	2739	}
…		…
2946	* fix_weight(): Check recursively the weight of all players, and fix	2746	* fix_weight(): Check recursively the weight of all players, and fix
2947	* what needs to be fixed. Refresh windows and fix speed if anything	2747	* what needs to be fixed. Refresh windows and fix speed if anything
2948	* was changed.	2748	* was changed.
2949	*/	2749	*/
2950	void	2750	void
2951	fix_weight (void)	2751	fix_weight ()
2952	{	2752	{
2953	for_all_players (pl)	2753	for_all_players (pl)
2954	{	2754	{
2955	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2755	sint32 old = pl->ob->carrying;
2956		2756
2957	if (old == sum)	2757	pl->ob->update_weight ();
2958	continue;	2758
		2759	if (old != pl->ob->carrying)
		2760	{
2959	pl->ob->update_stats ();	2761	pl->ob->update_stats ();
2960	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2762	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2763	}
2961	}	2764	}
2962	}	2765	}
2963		2766
2964	void	2767	void
2965	fix_luck (void)	2768	fix_luck ()
2966	{	2769	{
2967	for_all_players (pl)	2770	for_all_players (pl)
2968	if (!pl->ob->contr->ns->state)	2771	if (!pl->ob->contr->ns->state)
2969	pl->ob->change_luck (0);	2772	pl->ob->change_luck (0);
2970	}	2773	}
…		…
3007	}	2810	}
3008		2811
3009	void	2812	void
3010	make_visible (object *op)	2813	make_visible (object *op)
3011	{	2814	{
3012	op->hide = 0;	2815	op->flag [FLAG_HIDDEN] = 0;
3013	op->invisible = 0;	2816	op->invisible = 0;
3014		2817
3015	if (op->type == PLAYER)	2818	if (op->type == PLAYER)
3016	{	2819	{
3017	op->contr->tmp_invis = 0;	2820	op->contr->tmp_invis = 0;
…		…
3042		2845
3043	if (!ob || !ob->map)	2846	if (!ob || !ob->map)
3044	return 0;	2847	return 0;
3045		2848
3046	/* so, on normal lighted maps, its hard to hide */	2849	/* so, on normal lighted maps, its hard to hide */
3047	level = ob->map->darkness - 2;	2850	level = ob->map->darklevel () - 2;
3048		2851
3049	/* this also picks up whether the object is glowing.	2852	/* this also picks up whether the object is glowing.
3050	* If you carry a light on a non-dark map, its not	2853	* If you carry a light on a non-dark map, its not
3051	* as bad as carrying a light on a pitch dark map */	2854	* as bad as carrying a light on a pitch dark map */
3052	if (has_carried_lights (ob))	2855	if (ob->has_carried_lights ())
3053	level = -(10 + (2 * ob->map->darkness));	2856	level = -(10 + (2 * ob->map->darklevel ()));
3054		2857
3055	/* scan through all nearby squares for terrain to hide in */	2858	/* scan through all nearby squares for terrain to hide in */
3056	for (i = 0, x = ob->x, y = ob->y;	2859	for (i = 0, x = ob->x, y = ob->y;
3057	i <= SIZEOFFREE1;	2860	i <= SIZEOFFREE1;
3058	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2861	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3079	* spot (surrounded by clear terrain in broad daylight). -b.t.	2882	* spot (surrounded by clear terrain in broad daylight). -b.t.
3080	*/	2883	*/
3081	void	2884	void
3082	do_hidden_move (object *op)	2885	do_hidden_move (object *op)
3083	{	2886	{
3084	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2887	int hide = 0;
3085	object *skop;
3086		2888
3087	if (!op || !op->map)	2889	if (!op || !op->map)
3088	return;	2890	return;
3089		2891
3090	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2892	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2893	int num = random_roll (0, 19, op, PREFER_LOW);
3091		2894
3092	/* its *extremely* hard to run and sneak/hide at the same time! */	2895	/* its *extremely* hard to run and sneak/hide at the same time! */
3093	if (op->type == PLAYER && op->contr->run_on)	2896	if (op->type == PLAYER && op->contr->run_on)
3094	if (!skop || num >= skop->level)	2897	if (!skop || num >= skop->level)
3095	{	2898	{
…		…
3105	num -= hide;	2908	num -= hide;
3106		2909
3107	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2910	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3108	{	2911	{
3109	make_visible (op);	2912	make_visible (op);
		2913
3110	if (op->type == PLAYER)	2914	if (op->type == PLAYER)
3111	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2915	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3112	}	2916	}
3113	else if (op->type == PLAYER && skop)	2917	else if (op->type == PLAYER && skop)
3114	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2918	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3204	while (op)	3008	while (op)
3205	{	3009	{
3206	dx = rv.distance_x + op->arch->x;	3010	dx = rv.distance_x + op->arch->x;
3207	dy = rv.distance_y + op->arch->y;	3011	dy = rv.distance_y + op->arch->y;
3208		3012
3209	/* only the viewable area the player sees is updated by LOS	3013	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3210	* code, so we need to restrict ourselves to that range of values
3211	* for any meaningful values.
3212	*/
3213	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3214	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3215	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3216	return 1;	3014	return 1;
3217		3015
3218	op = op->more;	3016	op = op->more;
3219	}
3220
3221	return 0;
3222	}
3223
3224	/* routine for both players and monsters. We call this when
3225	* there is a possibility for our action distrubing our hiding
3226	* place or invisiblity spell. Artefact invisiblity is not
3227	* effected by this. If we arent invisible to begin with, we
3228	* return 0.
3229	*/
3230	int
3231	action_makes_visible (object *op)
3232	{
3233	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3234	{
3235	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3236	return 0;
3237
3238	if (op->contr && op->contr->tmp_invis == 0)
3239	return 0;
3240
3241	/* If monsters, they should become visible */
3242	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3243	{
3244	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3245	return 1;
3246	}
3247	}	3017	}
3248		3018
3249	return 0;	3019	return 0;
3250	}	3020	}
3251		3021
…		…
3453	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3223	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3454	}	3224	}
3455	else	3225	else
3456	{	3226	{
3457	/* generate misc. treasure */	3227	/* generate misc. treasure */
3458	tmp = arch_to_object (tr->item);	3228	tmp = tr->item->instance ();
3459	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3229	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3460	tmp = insert_ob_in_ob (tmp, who);	3230	who->insert (tmp);
3461	if (who->type == PLAYER)
3462	esrv_send_item (who, tmp);
3463	}	3231	}
3464	}	3232	}
3465		3233
3466	/**	3234	/**
3467	* Unready an object for a player. This function does nothing if the object was	3235	* Unready an object for a player. This function does nothing if the object was
…		…
3478		3246
3479	if (pl->ranged_ob == ob)	3247	if (pl->ranged_ob == ob)
3480	pl->ranged_ob = 0;	3248	pl->ranged_ob = 0;
3481	}	3249	}
3482		3250
		3251	//-GPL
		3252
3483	sint8	3253	sint8
3484	player::visibility_at (maptile *map, int x, int y) const	3254	player::darkness_at (maptile *map, int x, int y) const
3485	{	3255	{
3486	if (!ns)	3256	if (!ns)
3487	return 0;	3257	return LOS_BLOCKED;
3488		3258
3489	int dx, dy;	3259	int dx, dy;
3490	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3260	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3491	return 0;	3261	return LOS_BLOCKED;
3492		3262
3493	x += dx - ns->current_x + ns->mapx / 2;	3263	x += dx - ns->current_x;
3494	y += dy - ns->current_y + ns->mapy / 2;	3264	y += dy - ns->current_y;
3495		3265
3496	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3497	return 0;
3498
3499	return 100 - blocked_los [x][y];	3266	return blocked_los (x, y);
3500	}	3267	}
3501		3268
3502	void	3269	void
3503	player::infobox (const char *title, const char *msg, int color)	3270	player::infobox (const char *title, const char *msg, int color)
3504	{	3271	{

Diff Legend

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