[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 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,2008 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,
128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
130	subject, news); /send previously read news /
131
132	strcpy (subject, buf + 1);
133	strip_endline (subject);
134	size = 0;
135	news[0] = '\0';
136	}
137	else
138	{
139	if (size + strlen (buf) >= HUGE_BUF)
140	{
141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142	break;
143	}
144	strncat (news + size, buf, HUGE_BUF - size);
145	size += strlen (buf);
146	}
147	}
148
149	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151	close_and_delete (fp, comp);
152	}
153
154	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
155	static void	41	static void
156	set_first_map (object *op)	42	set_first_map (object *op)
157	{	43	{
158	op->contr->maplevel = first_map_path;	44	op->contr->maplevel = first_map_path;
…		…
210	ob->close_container (); //TODO: client-specific	96	ob->close_container (); //TODO: client-specific
211		97
212	ns->update_look = 0;	98	ns->update_look = 0;
213	ns->look_position = 0;	99	ns->look_position = 0;
214		100
215	clear_los (this);	101	clear_los ();
216		102
217	ns->reset_stats ();	103	ns->reset_stats ();
218		104
219	/* make sure he's a player -- needed because of class change. */	105	/* make sure he's a player -- needed because of class change. */
220	ob->type = PLAYER; // we are paranoid	106	ob->type = PLAYER; // we are paranoid
…		…
252	esrv_send_inventory (ob, ob);	138	esrv_send_inventory (ob, ob);
253	esrv_add_spells (this, 0);	139	esrv_add_spells (this, 0);
254		140
255	activate ();	141	activate ();
256		142
257	send_rules (ob);
258	send_news (ob);
259	display_motd (ob);
260
261	INVOKE_PLAYER (CONNECT, this);	143	INVOKE_PLAYER (CONNECT, this);
262	INVOKE_PLAYER (LOGIN, this);	144	INVOKE_PLAYER (LOGIN, this);
263	}	145	}
264		146
265	void	147	void
…		…
281	ns->reset_stats ();	163	ns->reset_stats ();
282	ns->pl = 0;	164	ns->pl = 0;
283	ns = 0;	165	ns = 0;
284	}	166	}
285		167
286	observe = ob;	168	// this is important for the player scheduler to get the correct refcount
		169	// when ns = 0
		170	observe = viewpoint = ob;
287		171
288	deactivate ();	172	deactivate ();
289	}	173	}
		174
		175	//-GPL
290		176
291	// the need for this function can be explained	177	// the need for this function can be explained
292	// by load_object not returning the object	178	// by load_object not returning the object
293	void	179	void
294	player::set_object (object *op)	180	player::set_object (object *op)
295	{	181	{
296	ob = observe = op;	182	ob = observe = viewpoint = op;
297	ob->contr = this; /* this aren't yet in archetype */	183	ob->contr = this; /* this aren't yet in archetype */
298		184
299	ob->speed = 1.0f;	185	ob->speed = 1.0f;
300	ob->speed_left = 0.5f;	186	ob->speed_left = 0.5f;
301		187
…		…
330	}	216	}
331		217
332	void	218	void
333	player::set_observe (object *op)	219	player::set_observe (object *op)
334	{	220	{
335	observe = op ? op : ob;	221	observe = viewpoint = op ? op : ob;
336	do_los = 1;	222	do_los = 1;
337	}	223	}
		224
		225	void
		226	player::set_viewpoint (object *op)
		227	{
		228	viewpoint = op ? op : (object *)observe;
		229	do_los = 1;
		230	}
		231
		232	//+GPL
338		233
339	player::player ()	234	player::player ()
340	{	235	{
341	/* There are some elements we want initialised to non zero value -	236	/* There are some elements we want initialised to non zero value -
342	* we deal with that below this point.	237	* we deal with that below this point.
…		…
369	{	264	{
370	ob->destroy_inv (false);	265	ob->destroy_inv (false);
371	ob->destroy ();	266	ob->destroy ();
372	}	267	}
373		268
374	ob = observe = 0;	269	ob = observe = viewpoint = 0;
375	}	270	}
376		271
377	player::~player ()	272	player::~player ()
378	{	273	{
379	/* Clear item stack */	274	/* Clear item stack */
380	free (stack_items);	275	free (stack_items);
		276	}
		277
		278	/*
		279	* get_player_archetype() return next player archetype from archetype
		280	* list. Not very efficient routine, but used only creating new players.
		281	* Note: there MUST be at least one player archetype!
		282	*/
		283	static archetype *
		284	get_player_archetype (archetype *at)
		285	{
		286	// archetypes could have been reloaded
		287	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		288
		289	if (!nat)
		290	return at;
		291
		292	archvec::iterator i = archetypes.find (nat);
		293
		294	for (;;)
		295	{
		296	if (++i == archetypes.end ())
		297	i = archetypes.begin ();
		298	else if (*i == at)
		299	cleanup ("not a single player archetype found");
		300
		301	if ((*i)->type == PLAYER)
		302	return *i;
		303	}
381	}	304	}
382		305
383	/* Tries to add player on the connection passed in ns.	306	/* Tries to add player on the connection passed in ns.
384	* All we can really get in this is some settings like host and display	307	* All we can really get in this is some settings like host and display
385	* mode.	308	* mode.
…		…
396	pl->ob->run_away = 25; /* Then we panick... */	319	pl->ob->run_away = 25; /* Then we panick... */
397		320
398	set_first_map (pl->ob);	321	set_first_map (pl->ob);
399		322
400	return pl;	323	return pl;
401	}
402
403	/*
404	* get_player_archetype() return next player archetype from archetype
405	* list. Not very efficient routine, but used only creating new players.
406	* Note: there MUST be at least one player archetype!
407	*/
408	archetype *
409	get_player_archetype (archetype *at)
410	{
411	// archetypes could have been reloaded
412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414	if (!nat)
415	return at;
416
417	archvec::iterator i = archetypes.find (nat);
418
419	for (;;)
420	{
421	if (++i == archetypes.end ())
422	i = archetypes.begin ();
423	else if (*i == at)
424	cleanup ("not a single player archetype found");
425
426	if ((*i)->type == PLAYER)
427	return *i;
428	}
429	}	324	}
430		325
431	object *	326	object *
432	get_nearest_player (object *mon)	327	get_nearest_player (object *mon)
433	{	328	{
…		…
673	op->destroy ();	568	op->destroy ();
674	continue;	569	continue;
675	}	570	}
676	}	571	}
677		572
678	/* This really needs to be better - we should really give	573	/* Here we remove duplicated skills (as duplicated spell objects have
679	* a substitute spellbook. The problem is that we don't really	574	* _very_ confusing effects for players), which could for instance be
680	* have a good idea what to replace it with (need something like	575	* generated by bad treasurelists. - elmex
681	* a first level treasurelist for each skill.)
682	* remove duplicate skills also
683	*/	576	*/
684	if (op->type == SPELLBOOK \|\| op->type == SKILL)	577	if (op->type == SKILL)
685	{	578	{
686	object *tmp;
687
688	for (tmp = op->below; tmp; tmp = tmp->below)	579	for (object *tmp = op->below; tmp; tmp = tmp->below)
689	if (tmp->type == op->type && tmp->name == op->name)	580	if (tmp->type == op->type && tmp->name == op->name)
690	break;
691
692	if (tmp)
693	{	581	{
694	op->destroy ();	582	op->destroy ();
		583	LOG (llevError,
695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	584	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
696	continue;	585	break;
697	}	586	}
698		587
699	if (op->nrof > 1)	588	if (op->nrof > 1)
700	op->nrof = 1;	589	op->nrof = 1;
701	}	590	}
702		591
…		…
855	player::chargen_race_done ()	744	player::chargen_race_done ()
856	{	745	{
857	/* this must before then initial items are given */	746	/* this must before then initial items are given */
858	esrv_new_player (ob->contr);	747	esrv_new_player (ob->contr);
859		748
860	treasurelist *tl = treasurelist::find ("starting_wealth");	749	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
861	if (tl)	750	if (tl)
862	create_treasure (tl, ob, 0, 0, 0);	751	create_treasure (tl, ob, 0, 0, 0);
863		752
864	INVOKE_PLAYER (BIRTH, ob->contr);	753	INVOKE_PLAYER (BIRTH, ob->contr);
865	INVOKE_PLAYER (LOGIN, ob->contr);	754	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
918	ob->stats.hp = ob->stats.maxhp;	807	ob->stats.hp = ob->stats.maxhp;
919	ob->stats.sp = ob->stats.maxsp;	808	ob->stats.sp = ob->stats.maxsp;
920	ob->stats.grace = 0;	809	ob->stats.grace = 0;
921	}	810	}
922		811
923	void	812	static void
924	flee_player (object *op)	813	flee_player (object *op)
925	{	814	{
926	int dir, diff;	815	int dir, diff;
927	rv_vector rv;	816	rv_vector rv;
928		817
…		…
931	LOG (llevDebug, "Fleeing player is dead.\n");	820	LOG (llevDebug, "Fleeing player is dead.\n");
932	CLEAR_FLAG (op, FLAG_SCARED);	821	CLEAR_FLAG (op, FLAG_SCARED);
933	return;	822	return;
934	}	823	}
935		824
936	if (op->enemy == NULL)	825	if (!op->enemy)
937	{	826	{
938	LOG (llevDebug, "Fleeing player had no enemy.\n");	827	LOG (llevDebug, "Fleeing player had no enemy.\n");
939	CLEAR_FLAG (op, FLAG_SCARED);	828	CLEAR_FLAG (op, FLAG_SCARED);
940	return;	829	return;
941	}	830	}
942		831
943	/* Seen some crashes here. Since we don't store an
944	* op->enemy_count, it is possible that something destroys the
945	* actual enemy, and the object is recycled.
946	*/
947	if (op->enemy->map == NULL)
948	{
949	CLEAR_FLAG (op, FLAG_SCARED);
950	op->enemy = NULL;
951	return;
952	}
953
954	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	832	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
955	{	833	{
956	op->enemy = NULL;	834	op->enemy = NULL;
957	CLEAR_FLAG (op, FLAG_SCARED);	835	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	836	return;
…		…
961	get_rangevector (op, op->enemy, &rv, 0);	839	get_rangevector (op, op->enemy, &rv, 0);
962		840
963	dir = absdir (4 + rv.direction);	841	dir = absdir (4 + rv.direction);
964	for (diff = 0; diff < 3; diff++)	842	for (diff = 0; diff < 3; diff++)
965	{	843	{
966	int m = 1 - (RANDOM () & 2);	844	int m = 1 - rndm (2) * 2;
967		845
968	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	846	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
969	return;	847	return;
970	}	848	}
971		849
…		…
982	check_pick (object *op)	860	check_pick (object *op)
983	{	861	{
984	object tmp, next;	862	object tmp, next;
985	int stop = 0;	863	int stop = 0;
986	int wvratio;	864	int wvratio;
987	char putstring[128];
988		865
989	/* if you're flying, you cna't pick up anything */	866	/* if you're flying, you cna't pick up anything */
990	if (op->move_type & MOVE_FLYING)	867	if (op->move_type & MOVE_FLYING)
991	return 1;	868	return 1;
992		869
…		…
1016		893
1017	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	894	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1018	{	895	{
1019	if (item_matched_string (op, tmp, op->contr->search_str))	896	if (item_matched_string (op, tmp, op->contr->search_str))
1020	CHK_PICK_PICKUP;	897	CHK_PICK_PICKUP;
		898
1021	continue;	899	continue;
1022	}	900	}
1023		901
1024	/* high not bit set? We're using the old autopickup model */	902	/* pickup handling */
		903	if (op->contr->mode & PU_DEBUG)
		904	{
		905	/* some debugging code to figure out item information */
		906	const char *str = tmp->name
		907	? format ("item name: %s item type: %d weight/value: %d",
		908	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		909	: format ("item name: %s item type: %d weight/value: %d",
		910	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		911
		912	new_draw_info (NDI_UNIQUE, 0, op, str);
		913	}
		914
		915	if (op->contr->mode & PU_INHIBIT)
		916	return 1;
		917
		918	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		919	return 1;
		920
		921	/* philosophy:
		922	* It's easy to grab an item type from a pile, as long as it's
		923	* generic. This takes no game-time. For more detailed pickups
		924	* and selections, select-items should be used. This is a
		925	* grab-as-you-run type mode that's really useful for arrows for
		926	* example.
		927	* The drawback: right now it has no frontend, so you need to
		928	* stick the bits you want into a calculator in hex mode and then
		929	* convert to decimal and then 'pickup <#>
		930	*/
		931
		932	/* the first two modes are exclusive: if NOTHING we return, if
		933	* STOP then we stop. All the rest are applied sequentially,
		934	* meaning if any test passes, the item gets picked up. */
		935
		936	/* if mode is set to pick nothing up, return */
		937	if (op->contr->mode == PU_NOTHING)
		938	return 1;
		939
		940	/* if mode is set to stop when encountering objects, return */
		941	/* take STOP before INHIBIT since it doesn't actually pick
		942	* anything up */
		943	if (op->contr->mode & PU_STOP)
		944	return 0;
		945
		946	/* useful for going into stores and not losing your settings... */
		947	/* and for battles wher you don't want to get loaded down while
		948	* fighting */
		949	if (op->contr->mode & PU_INHIBIT)
		950	return 1;
		951
		952	/* prevent us from turning into auto-thieves :) */
		953	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		954	continue;
		955
		956	/* ignore known cursed objects */
		957	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		958	continue;
		959
		960	/* all food and drink if desired */
		961	/* question: don't pick up known-poisonous stuff? */
1025	if (!(op->contr->mode & PU_NEWMODE))	962	if (op->contr->mode & PU_FOOD)
		963	if (tmp->type == FOOD)
1026	{	964	{
1027	switch (op->contr->mode)	965	CHK_PICK_PICKUP;
		966	continue;
		967	}
		968
		969	if (op->contr->mode & PU_DRINK)
		970	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		971	{
		972	CHK_PICK_PICKUP;
		973	continue;
		974	}
		975
		976	if (op->contr->mode & PU_POTION)
		977	if (tmp->type == POTION)
		978	{
		979	CHK_PICK_PICKUP;
		980	continue;
		981	}
		982
		983	/* spellbooks, skillscrolls and normal books/scrolls */
		984	if (op->contr->mode & PU_SPELLBOOK)
		985	if (tmp->type == SPELLBOOK)
		986	{
		987	CHK_PICK_PICKUP;
		988	continue;
		989	}
		990
		991	if (op->contr->mode & PU_SKILLSCROLL)
		992	if (tmp->type == SKILLSCROLL)
		993	{
		994	CHK_PICK_PICKUP;
		995	continue;
		996	}
		997
		998	if (op->contr->mode & PU_READABLES)
		999	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
		1000	{
		1001	CHK_PICK_PICKUP;
		1002	continue;
		1003	}
		1004
		1005	/* wands/staves/rods/horns */
		1006	if (op->contr->mode & PU_MAGIC_DEVICE)
		1007	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
		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) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1016	{
		1017	CHK_PICK_PICKUP;
		1018	continue;
		1019	}
		1020
		1021	if (op->contr->mode & PU_VALUABLES)
		1022	{
		1023	if (tmp->type == MONEY \|\| tmp->type == GEM)
1028	{	1024	{
1029	case 0:
1030	return 1; /* don't pick up */
1031	case 1:
1032	CHK_PICK_PICKUP;	1025	CHK_PICK_PICKUP;
1033	return 1;	1026	continue;
1034	case 2:
1035	CHK_PICK_PICKUP;
1036	return 0;
1037	case 3:
1038	return 0; /* stop before pickup */
1039	case 4:
1040	CHK_PICK_PICKUP;
1041	break;
1042	case 5:
1043	CHK_PICK_PICKUP;
1044	stop = 1;
1045	break;
1046	case 6:
1047	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1048	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1049	CHK_PICK_PICKUP;
1050	break;
1051
1052	case 7:
1053	if (tmp->type == MONEY \|\| tmp->type == GEM)
1054	CHK_PICK_PICKUP;
1055	break;
1056
1057	default:
1058	/* use value density */
1059	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1060	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1061	CHK_PICK_PICKUP;
1062	}	1027	}
1063	}	1028	}
1064	else	1029
1065	{ /* old model */	1030	/* rings & amulets - talismans seems to be typed AMULET */
1066	/* NEW pickup handling */
1067	if (op->contr->mode & PU_DEBUG)	1031	if (op->contr->mode & PU_JEWELS)
		1032	if (tmp->type == RING \|\| tmp->type == AMULET)
1068	{	1033	{
1069	/* some debugging code to figure out item information */	1034	CHK_PICK_PICKUP;
1070	if (tmp->name != NULL)
1071	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1072	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1073	else
1074	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1075	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1076
1077	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1078	}
1079
1080	/* philosophy:
1081	* It's easy to grab an item type from a pile, as long as it's
1082	* generic. This takes no game-time. For more detailed pickups
1083	* and selections, select-items should be used. This is a
1084	* grab-as-you-run type mode that's really useful for arrows for
1085	* example.
1086	* The drawback: right now it has no frontend, so you need to
1087	* stick the bits you want into a calculator in hex mode and then
1088	* convert to decimal and then 'pickup <#>
1089	*/
1090
1091	/* the first two modes are exclusive: if NOTHING we return, if
1092	* STOP then we stop. All the rest are applied sequentially,
1093	* meaning if any test passes, the item gets picked up. */
1094
1095	/* if mode is set to pick nothing up, return */
1096
1097	if (op->contr->mode & PU_NOTHING)
1098	return 1;
1099
1100	/* if mode is set to stop when encountering objects, return */
1101	/* take STOP before INHIBIT since it doesn't actually pick
1102	* anything up */
1103
1104	if (op->contr->mode & PU_STOP)
1105	return 0;
1106
1107	/* useful for going into stores and not losing your settings... */
1108	/* and for battles wher you don't want to get loaded down while
1109	* fighting */
1110	if (op->contr->mode & PU_INHIBIT)
1111	return 1;
1112
1113	/* prevent us from turning into auto-thieves :) */
1114	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1115	continue;	1035	continue;
		1036	}
1116		1037
1117	/* ignore known cursed objects */	1038	/* we don't forget dragon food */
1118	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1039	if (op->contr->mode & PU_FLESH)
		1040	if (tmp->type == FLESH)
		1041	{
		1042	CHK_PICK_PICKUP;
1119	continue;	1043	continue;
		1044	}
1120		1045
1121	/* all food and drink if desired */	1046	/* bows and arrows. Bows are good for selling! */
1122	/* question: don't pick up known-poisonous stuff? */	1047	if (op->contr->mode & PU_BOW)
		1048	if (tmp->type == BOW)
		1049	{
		1050	CHK_PICK_PICKUP;
		1051	continue;
		1052	}
		1053
		1054	if (op->contr->mode & PU_ARROW)
		1055	if (tmp->type == ARROW)
		1056	{
		1057	CHK_PICK_PICKUP;
		1058	continue;
		1059	}
		1060
		1061	/* all kinds of armor etc. */
		1062	if (op->contr->mode & PU_ARMOUR)
		1063	if (tmp->type == ARMOUR)
		1064	{
		1065	CHK_PICK_PICKUP;
		1066	continue;
		1067	}
		1068
		1069	if (op->contr->mode & PU_HELMET)
		1070	if (tmp->type == HELMET)
		1071	{
		1072	CHK_PICK_PICKUP;
		1073	continue;
		1074	}
		1075
		1076	if (op->contr->mode & PU_SHIELD)
		1077	if (tmp->type == SHIELD)
		1078	{
		1079	CHK_PICK_PICKUP;
		1080	continue;
		1081	}
		1082
1123	if (op->contr->mode & PU_FOOD)	1083	if (op->contr->mode & PU_BOOTS)
1124	if (tmp->type == FOOD)	1084	if (tmp->type == BOOTS)
		1085	{
		1086	CHK_PICK_PICKUP;
		1087	continue;
		1088	}
		1089
		1090	if (op->contr->mode & PU_GLOVES)
		1091	if (tmp->type == GLOVES)
		1092	{
		1093	CHK_PICK_PICKUP;
		1094	continue;
		1095	}
		1096
		1097	if (op->contr->mode & PU_CLOAK)
		1098	if (tmp->type == CLOAK)
		1099	{
		1100	CHK_PICK_PICKUP;
		1101	continue;
		1102	}
		1103
		1104	/* hoping to catch throwing daggers here */
		1105	if (op->contr->mode & PU_MISSILEWEAPON)
		1106	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1107	{
		1108	CHK_PICK_PICKUP;
		1109	continue;
		1110	}
		1111
		1112	/* careful: chairs and tables are weapons! */
		1113	if (op->contr->mode & PU_ALLWEAPON)
		1114	{
		1115	if (tmp->type == WEAPON)
		1116	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1125	{	1117	{
1126	CHK_PICK_PICKUP;	1118	CHK_PICK_PICKUP;
1127	continue;	1119	continue;
1128	}	1120	}
		1121	}
1129		1122
		1123	/* misc stuff that's useful */
1130	if (op->contr->mode & PU_DRINK)	1124	if (op->contr->mode & PU_KEY)
1131	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1125	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)
1132	{	1126	{
1133	CHK_PICK_PICKUP;	1127	CHK_PICK_PICKUP;
1134	continue;	1128	continue;
1135	}	1129	}
1136		1130
		1131	/* any of the last 4 bits set means we use the ratio for value
		1132	* pickups */
1137	if (op->contr->mode & PU_POTION)	1133	if (op->contr->mode & PU_RATIO)
1138	if (tmp->type == POTION)	1134	{
		1135	/* use value density to decide what else to grab */
		1136	/* >=7 was >= op->contr->mode */
		1137	/* >=7 is the old standard setting. Now we take the last 4 bits
1139	{	1138	*/
1140	CHK_PICK_PICKUP;
1141	continue;
1142	}
1143
1144	/* spellbooks, skillscrolls and normal books/scrolls */
1145	if (op->contr->mode & PU_SPELLBOOK)
1146	if (tmp->type == SPELLBOOK)
1147	{
1148	CHK_PICK_PICKUP;
1149	continue;
1150	}
1151
1152	if (op->contr->mode & PU_SKILLSCROLL)
1153	if (tmp->type == SKILLSCROLL)
1154	{
1155	CHK_PICK_PICKUP;
1156	continue;
1157	}
1158
1159	if (op->contr->mode & PU_READABLES)
1160	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
1161	{
1162	CHK_PICK_PICKUP;
1163	continue;
1164	}
1165
1166	/* wands/staves/rods/horns */
1167	if (op->contr->mode & PU_MAGIC_DEVICE)
1168	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
1169	{
1170	CHK_PICK_PICKUP;
1171	continue;
1172	}
1173
1174	/* pick up all magical items */
1175	if (op->contr->mode & PU_MAGICAL)	1139	wvratio = op->contr->mode & PU_RATIO;
1176	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1140	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1177	{
1178	CHK_PICK_PICKUP;
1179	continue;
1180	}
1181
1182	if (op->contr->mode & PU_VALUABLES)
1183	{	1141	{
1184	if (tmp->type == MONEY \|\| tmp->type == GEM)	1142	#if 0
		1143	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1144	if (tmp->name != NULL)
1185	{	1145	{
1186	CHK_PICK_PICKUP;	1146	fprintf (stderr, "%s", tmp->name);
1187	continue;
1188	}	1147	}
1189	}
1190
1191	/* rings & amulets - talismans seems to be typed AMULET */
1192	if (op->contr->mode & PU_JEWELS)
1193	if (tmp->type == RING \|\| tmp->type == AMULET)
1194	{
1195	CHK_PICK_PICKUP;
1196	continue;
1197	}
1198
1199	/* we don't forget dragon food */
1200	if (op->contr->mode & PU_FLESH)
1201	if (tmp->type == FLESH)
1202	{
1203	CHK_PICK_PICKUP;
1204	continue;
1205	}
1206
1207	/* bows and arrows. Bows are good for selling! */
1208	if (op->contr->mode & PU_BOW)
1209	if (tmp->type == BOW)
1210	{
1211	CHK_PICK_PICKUP;
1212	continue;
1213	}
1214
1215	if (op->contr->mode & PU_ARROW)
1216	if (tmp->type == ARROW)
1217	{
1218	CHK_PICK_PICKUP;
1219	continue;
1220	}
1221
1222	/* all kinds of armor etc. */
1223	if (op->contr->mode & PU_ARMOUR)
1224	if (tmp->type == ARMOUR)
1225	{
1226	CHK_PICK_PICKUP;
1227	continue;
1228	}
1229
1230	if (op->contr->mode & PU_HELMET)
1231	if (tmp->type == HELMET)
1232	{
1233	CHK_PICK_PICKUP;
1234	continue;
1235	}
1236
1237	if (op->contr->mode & PU_SHIELD)
1238	if (tmp->type == SHIELD)
1239	{
1240	CHK_PICK_PICKUP;
1241	continue;
1242	}
1243
1244	if (op->contr->mode & PU_BOOTS)
1245	if (tmp->type == BOOTS)
1246	{
1247	CHK_PICK_PICKUP;
1248	continue;
1249	}
1250
1251	if (op->contr->mode & PU_GLOVES)
1252	if (tmp->type == GLOVES)
1253	{
1254	CHK_PICK_PICKUP;
1255	continue;
1256	}
1257
1258	if (op->contr->mode & PU_CLOAK)
1259	if (tmp->type == CLOAK)
1260	{
1261	CHK_PICK_PICKUP;
1262	continue;
1263	}
1264
1265	/* hoping to catch throwing daggers here */
1266	if (op->contr->mode & PU_MISSILEWEAPON)
1267	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1268	{
1269	CHK_PICK_PICKUP;
1270	continue;
1271	}
1272
1273	/* careful: chairs and tables are weapons! */
1274	if (op->contr->mode & PU_ALLWEAPON)
1275	{
1276	if (tmp->type == WEAPON && tmp->name != NULL)
1277	{
1278	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1279	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1280	{
1281	CHK_PICK_PICKUP;
1282	continue;
1283	}
1284	}
1285
1286	if (tmp->type == WEAPON && tmp->name == NULL)
1287	{
1288	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1289	{
1290	CHK_PICK_PICKUP;
1291	continue;
1292	}
1293	}
1294	}
1295
1296	/* misc stuff that's useful */
1297	if (op->contr->mode & PU_KEY)
1298	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)
1299	{
1300	CHK_PICK_PICKUP;
1301	continue;
1302	}
1303
1304	/* any of the last 4 bits set means we use the ratio for value
1305	* pickups */
1306	if (op->contr->mode & PU_RATIO)
1307	{
1308	/* use value density to decide what else to grab */
1309	/* >=7 was >= op->contr->mode */
1310	/* >=7 is the old standard setting. Now we take the last 4 bits
1311	*/
1312	wvratio = op->contr->mode & PU_RATIO;
1313	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1314	{
1315	CHK_PICK_PICKUP;
1316	#if 0
1317	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1318	if (tmp->name != NULL)
1319	{
1320	fprintf (stderr, "%s", tmp->name);
1321	}
1322	else	1148	else
1323	fprintf (stderr, "%s", tmp->arch->archname);	1149	fprintf (stderr, "%s", tmp->arch->archname);
1324	fprintf (stderr, ",%d] = ", tmp->type);	1150	fprintf (stderr, ",%d] = ", tmp->type);
1325	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1151	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1326	#endif	1152	#endif
		1153	CHK_PICK_PICKUP;
1327	continue;	1154	continue;
1328	}
1329	}	1155	}
1330	} /* the new pickup model */	1156	} /* the new pickup model */
1331	}	1157	}
1332		1158
1333	return !stop;	1159	return !stop;
		1160	}
		1161
		1162	/* routine for both players and monsters. We call this when
		1163	* there is a possibility for our action distrubing our hiding
		1164	* place or invisiblity spell. Artefact invisiblity causes
		1165	* "noise" instead. If we arent invisible to begin with, we
		1166	* return 0.
		1167	*/
		1168	static int
		1169	action_makes_visible (object *op)
		1170	{
		1171	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		1172	{
		1173	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		1174	{
		1175	// artefact invisibility is permanent, but we still make noise
		1176	// this is important for game-balance.
		1177	if (op->contr)
		1178	op->make_noise ();
		1179
		1180	return 0;
		1181	}
		1182
		1183	if (op->contr && op->contr->tmp_invis == 0)
		1184	return 0;
		1185
		1186	/* If monsters, they should become visible */
		1187	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
		1188	{
		1189	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1190	return 1;
		1191	}
		1192	}
		1193
		1194	return 0;
1334	}	1195	}
1335		1196
1336	/*	1197	/*
1337	* Find an arrow in the inventory and after that	1198	* Find an arrow in the inventory and after that
1338	* in the right type container (quiver). Pointer to the	1199	* in the right type container (quiver). Pointer to the
1339	* found object is returned.	1200	* found object is returned.
1340	*/	1201	*/
1341	object *	1202	static object *
1342	find_arrow (object op, const char type)	1203	find_arrow (object op, const char type)
1343	{	1204	{
1344	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1205	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1345	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1206	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1346	return splay (tmp);	1207	return splay (tmp);
…		…
1360	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1221	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1361	* against the target. A full test is not performed, simply a basic test	1222	* against the target. A full test is not performed, simply a basic test
1362	* of resistances. The archer is making a quick guess at what he sees down	1223	* of resistances. The archer is making a quick guess at what he sees down
1363	* the hall. Failing that it does it's best to pick the highest plus arrow.	1224	* the hall. Failing that it does it's best to pick the highest plus arrow.
1364	*/	1225	*/
1365	object *	1226	static object *
1366	find_better_arrow (object op, object target, const char type, int better)	1227	find_better_arrow (object op, object target, shstr_cmp type, int *better)
1367	{	1228	{
1368	object tmp = NULL, arrow, *ntmp;	1229	object tmp = NULL, arrow, *ntmp;
1369	int attacknum, attacktype, betterby = 0, i;	1230	int attacknum, attacktype, betterby = 0, i;
1370		1231
1371	if (!type)	1232	if (!type)
…		…
1375	{	1236	{
1376	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1237	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1377	{	1238	{
1378	i = 0;	1239	i = 0;
1379	ntmp = find_better_arrow (arrow, target, type, &i);	1240	ntmp = find_better_arrow (arrow, target, type, &i);
		1241
1380	if (i > betterby)	1242	if (i > betterby)
1381	{	1243	{
1382	tmp = ntmp;	1244	tmp = ntmp;
1383	betterby = i;	1245	betterby = i;
1384	}	1246	}
1385	}	1247	}
1386	else if (arrow->type == ARROW && arrow->race == type)	1248	else if (arrow->type == ARROW && arrow->race == type)
1387	{	1249	{
1388	/* allways prefer assasination/slaying */	1250	/* allways prefer assasination/slaying */
1389	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))	1251	if (target->race && arrow->slaying.contains (target->race))
1390	{	1252	{
1391	if (arrow->attacktype & AT_DEATH)	1253	if (arrow->attacktype & AT_DEATH)
1392	{	1254	{
1393	*better = 100;	1255	*better = 100;
1394	return arrow;	1256	return arrow;
…		…
1409	{	1271	{
1410	tmp = arrow;	1272	tmp = arrow;
1411	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1273	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1412	}	1274	}
1413	}	1275	}
		1276
1414	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1277	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1415	{	1278	{
1416	tmp = arrow;	1279	tmp = arrow;
1417	betterby = 2 + arrow->magic + arrow->stats.dam;	1280	betterby = 2 + arrow->magic + arrow->stats.dam;
1418	}	1281	}
		1282
1419	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1283	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1420	{	1284	{
1421	tmp = arrow;	1285	tmp = arrow;
1422	betterby = 1 + arrow->magic + arrow->stats.dam;	1286	betterby = 1 + arrow->magic + arrow->stats.dam;
1423	}	1287	}
…		…
1436	* find_better_arrow to find a decent arrow to use.	1300	* find_better_arrow to find a decent arrow to use.
1437	* op = the shooter	1301	* op = the shooter
1438	* type = bow->race	1302	* type = bow->race
1439	* dir = fire direction	1303	* dir = fire direction
1440	*/	1304	*/
1441	object *	1305	static object *
1442	pick_arrow_target (object op, const char type, int dir)	1306	pick_arrow_target (object *op, shstr_cmp type, int dir)
1443	{	1307	{
1444	object *tmp = NULL;	1308	object *tmp = NULL;
1445	maptile *m;	1309	maptile *m;
1446	int i, mflags, found, number;	1310	int i, mflags, found, number;
1447	sint16 x, y;	1311	sint16 x, y;
…		…
1462	for (i = 0, found = 0; i < 20; i++)	1326	for (i = 0, found = 0; i < 20; i++)
1463	{	1327	{
1464	x += freearr_x[dir];	1328	x += freearr_x[dir];
1465	y += freearr_y[dir];	1329	y += freearr_y[dir];
1466	mflags = get_map_flags (m, &m, x, y, &x, &y);	1330	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1331
1467	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)	1332	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)
1468	{	1333	{
1469	tmp = NULL;	1334	tmp = 0;
1470	break;	1335	break;
1471	}	1336	}
1472	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1337	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1473	{	1338	{
1474	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1339	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1475	* perhaps a bad assumption.	1340	* perhaps a bad assumption.
1476	*/	1341	*/
1477	tmp = NULL;	1342	tmp = 0;
1478	break;	1343	break;
1479	}	1344	}
		1345
1480	if (mflags & P_IS_ALIVE)	1346	if (mflags & P_IS_ALIVE)
1481	{
1482	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1483	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1348	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1484	{
1485	found++;
1486	break;
1487	}
1488	if (found)
1489	break;	1349	break;
1490	}
1491	}	1350	}
1492	if (tmp == NULL)	1351
		1352	if (!tmp)
1493	return find_arrow (op, type);	1353	return find_arrow (op, type);
1494		1354
1495	if (tmp->head)	1355	if (tmp->head)
1496	tmp = tmp->head;	1356	tmp = tmp->head;
1497		1357
…		…
1537	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1397	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1538	return 0;	1398	return 0;
1539	}	1399	}
1540		1400
1541	// optimisation: move object to top so we will find it quickly again	1401	// optimisation: move object to top so we will find it quickly again
1542	if (bow->below)	1402	splay (bow);
1543	{
1544	bow->remove ();
1545	op->insert (bow);
1546	}
1547
1548	}	1403	}
1549		1404
1550	if (!bow->race \|\| !bow->skill)	1405	if (!bow->race \|\| !bow->skill)
1551	{	1406	{
1552	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1407	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1598	arrow->direction = dir;	1453	arrow->direction = dir;
1599		1454
1600	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1455	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1601	arrow->stats.hp = arrow->stats.dam;	1456	arrow->stats.hp = arrow->stats.dam;
1602	arrow->stats.grace = arrow->attacktype;	1457	arrow->stats.grace = arrow->attacktype;
1603		1458	arrow->custom_name = arrow->slaying;
1604	if (arrow->slaying)
1605	arrow->spellarg = strdup (arrow->slaying);
1606		1459
1607	#if 0	1460	#if 0
1608	if (player *pl = op->contr)	1461	if (player *pl = op->contr)
1609	{	1462	{
1610	float speed = pl->weapon_sp;	1463	float speed = pl->weapon_sp;
…		…
1672	* but monsters can't. Putting that code here	1525	* but monsters can't. Putting that code here
1673	* makes the fire_bow code much cleaner.	1526	* makes the fire_bow code much cleaner.
1674	* this function should only be called if 'op' is a player,	1527	* this function should only be called if 'op' is a player,
1675	* hence the function name.	1528	* hence the function name.
1676	*/	1529	*/
1677	int	1530	static int
1678	player_fire_bow (object *op, int dir)	1531	player_fire_bow (object *op, int dir)
1679	{	1532	{
1680	int ret = 0, wcmod = 0;	1533	int ret;
1681		1534
1682	if (op->contr->bowtype == bow_bestarrow)	1535	if (op->contr->bowtype == bow_bestarrow)
1683	{	1536	{
1684	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1537	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1685	}	1538	}
1686	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1539	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1687	{	1540	{
1688	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1541	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1689	wcmod = -1;
1690
1691	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1542	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1692	}	1543	}
1693	else if (op->contr->bowtype == bow_threewide)	1544	else if (op->contr->bowtype == bow_threewide)
1694	{	1545	{
1695	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1546	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1696	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1547	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1697	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1548	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1698	}	1549	}
1699	else if (op->contr->bowtype == bow_spreadshot)	1550	else if (op->contr->bowtype == bow_spreadshot)
1700	{	1551	{
1701	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1552	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1702	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1553	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1703	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1554	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1704	}	1555	}
1705	else	1556	else
1706	{	1557	{
…		…
1712	}	1563	}
1713		1564
1714	/* Fires a misc (wand/rod/horn) object in 'dir'.	1565	/* Fires a misc (wand/rod/horn) object in 'dir'.
1715	* Broken apart from 'fire' to keep it more readable.	1566	* Broken apart from 'fire' to keep it more readable.
1716	*/	1567	*/
1717	void	1568	static void
1718	fire_misc_object (object *op, int dir)	1569	fire_misc_object (object *op, int dir)
1719	{	1570	{
1720	object *item = op->contr->ranged_ob;	1571	object *item = op->contr->ranged_ob;
1721		1572
1722	if (!item)	1573	if (!item)
…		…
1744	return;	1595	return;
1745	}	1596	}
1746	}	1597	}
1747	else if (item->type == ROD \|\| item->type == HORN)	1598	else if (item->type == ROD \|\| item->type == HORN)
1748	{	1599	{
1749	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1600	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1750		1601
1751	// using the maximum of the rods charge allows at least one spell cast	1602	// using the maximum of the rods charge allows at least one spell cast
1752	// for a rod or horn, this fixes some broken rods.	1603	// for a rod or horn, this fixes some broken rods.
1753	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1604	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1754	{	1605	{
1755	op->contr->play_sound (sound_find ("wand_poof"));	1606	op->contr->play_sound (sound_find ("wand_poof"));
1756		1607
1757	if (item->type == ROD)	1608	if (item->type == ROD)
1758	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1609	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1763	}	1614	}
1764	}	1615	}
1765		1616
1766	if (cast_spell (op, item, dir, item->inv, NULL))	1617	if (cast_spell (op, item, dir, item->inv, NULL))
1767	{	1618	{
1768	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1619	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1620
1769	if (item->type == WAND)	1621	if (item->type == WAND)
1770	{	1622	{
1771	if (!(--item->stats.food))	1623	if (!(--item->stats.food))
1772	{	1624	{
1773	object *tmp;	1625	object *tmp;
…		…
1825	case BOW:	1677	case BOW:
1826	player_fire_bow (op, dir);	1678	player_fire_bow (op, dir);
1827	break;	1679	break;
1828		1680
1829	case SPELL:	1681	case SPELL:
1830	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1682	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1831	break;	1683	break;
1832		1684
1833	case BUILDER:	1685	case BUILDER:
1834	apply_map_builder (op, dir);	1686	apply_map_builder (op, dir);
1835	break;	1687	break;
…		…
1844	}	1696	}
1845		1697
1846	return true;	1698	return true;
1847	}	1699	}
1848		1700
1849	/* find_key	1701	static object *
1850	* We try to find a key for the door as passed. If we find a key
1851	* and successfully use it, we return the key, otherwise NULL
1852	* This function merges both normal and locked door, since the logic
1853	* for both is the same - just the specific key is different.
1854	* pl is the player,
1855	* inv is the objects inventory to searched
1856	* door is the door we are trying to match against.
1857	* This function can be called recursively to search containers.
1858	*/
1859	object *
1860	find_key (object pl, object container, object *door)	1702	find_key_ (object pl, object container, object *door)
1861	{	1703	{
1862	object tmp, key;	1704	object tmp, key;
1863		1705
1864	/* Should not happen, but sanity checking is never bad */	1706	/* Should not happen, but sanity checking is never bad */
1865	if (!container->inv)	1707	if (!container->inv)
…		…
1868	/* First, lets try to find a key in the top level inventory */	1710	/* First, lets try to find a key in the top level inventory */
1869	for (tmp = container->inv; tmp; tmp = tmp->below)	1711	for (tmp = container->inv; tmp; tmp = tmp->below)
1870	{	1712	{
1871	if (door->type == DOOR && tmp->type == KEY)	1713	if (door->type == DOOR && tmp->type == KEY)
1872	break;	1714	break;
		1715
1873	/* For sanity, we should really check door type, but other stuff	1716	/* For sanity, we should really check door type, but other stuff
1874	* (like containers) can be locked with special keys	1717	* (like containers) can be locked with special keys
1875	*/	1718	*/
1876	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1719	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1877	break;	1720	break;
…		…
1883	* a key, return	1726	* a key, return
1884	*/	1727	*/
1885	if (!tmp)	1728	if (!tmp)
1886	{	1729	{
1887	for (tmp = container->inv; tmp; tmp = tmp->below)	1730	for (tmp = container->inv; tmp; tmp = tmp->below)
1888	{
1889	/* No reason to search empty containers */	1731	/* No reason to search empty containers */
1890	if (tmp->type == CONTAINER && tmp->inv)	1732	if (tmp->type == CONTAINER && tmp->inv)
1891	{
1892	if ((key = find_key (pl, tmp, door)))	1733	if ((key = find_key_ (pl, tmp, door)))
1893	return key;	1734	return key;
1894	}
1895	}
1896		1735
1897	if (!tmp)	1736	if (!tmp)
1898	return NULL;	1737	return 0;
1899	}	1738	}
1900		1739
1901	/* We get down here if we have found a key. Now if its in a container,	1740	/* We get down here if we have found a key. Now if its in a container,
1902	* see if we actually want to use it	1741	* see if we actually want to use it
1903	*/	1742	*/
1904	if (pl != container)	1743	if (pl != container)
1905	{	1744	{
1906	/* Only let players use keys in containers */	1745	/* Only let players use keys in containers */
1907	if (!pl->contr)	1746	if (!pl->contr)
1908	return NULL;	1747	return 0;
		1748
1909	/* cases where this fails:	1749	/* cases where this fails:
1910	* If we only search the player inventory, return now since we	1750	* If we only search the player inventory, return now since we
1911	* are not in the players inventory.	1751	* are not in the players inventory.
1912	* If the container is not active, return now since only active	1752	* If the container is not active, return now since only active
1913	* containers can be used.	1753	* containers can be used.
…		…
1917	* inv must have been an container and must have been active.	1757	* inv must have been an container and must have been active.
1918	*	1758	*
1919	* Change the color so that the message doesn't disappear with	1759	* Change the color so that the message doesn't disappear with
1920	* all the others.	1760	* all the others.
1921	*/	1761	*/
1922	if (pl->contr->usekeys == key_inventory \|\|	1762	if (pl->contr->usekeys == key_inventory
1923	!QUERY_FLAG (container, FLAG_APPLIED) \|\|	1763	\|\| !QUERY_FLAG (container, FLAG_APPLIED)
1924	(pl->contr->usekeys == keyrings && (!container->race \|\| strcmp (container->race, "keys"))))	1764	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1925	{	1765	{
1926	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1766	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1927	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1767	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1928	return NULL;	1768	return NULL;
1929	}	1769	}
1930	}	1770	}
1931		1771
1932	return tmp;	1772	return tmp;
		1773	}
		1774
		1775	/* find_key
		1776	* We try to find a key for the door as passed. If we find a key
		1777	* and successfully use it, we return the key, otherwise NULL
		1778	* This function merges both normal and locked door, since the logic
		1779	* for both is the same - just the specific key is different.
		1780	* pl is the player,
		1781	* inv is the objects inventory to searched
		1782	* door is the door we are trying to match against.
		1783	* This function can be called recursively to search containers.
		1784	*/
		1785	object *
		1786	find_key (object pl, object container, object *door)
		1787	{
		1788	if (door->slaying && is_match_expr (door->slaying))
		1789	{
		1790	// for match expressions, we try to find the key by applying the match
		1791	// to the op itself, which is supposed to find the "key", instead
		1792	// of searching through containers ourselves.
		1793
		1794	return match_one (door->slaying, container, door, pl, pl);
		1795	}
		1796	else
		1797	return find_key_ (pl, container, door);
1933	}	1798	}
1934		1799
1935	/* moved door processing out of move_player_attack.	1800	/* moved door processing out of move_player_attack.
1936	* returns 1 if player has opened the door with a key	1801	* returns 1 if player has opened the door with a key
1937	* such that the caller should not do anything more,	1802	* such that the caller should not do anything more,
…		…
1987	* going to try and move (not fire weapons).	1852	* going to try and move (not fire weapons).
1988	*/	1853	*/
1989	bool	1854	bool
1990	move_player_attack (object *op, int dir)	1855	move_player_attack (object *op, int dir)
1991	{	1856	{
		1857	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1858	{
		1859	--op->speed_left;
		1860	return true;
		1861	}
		1862
1992	int on_battleground;	1863	int on_battleground;
1993		1864
1994	sint16 nx = freearr_x[dir] + op->x;	1865	sint16 nx = freearr_x[dir] + op->x;
1995	sint16 ny = freearr_y[dir] + op->y;	1866	sint16 ny = freearr_y[dir] + op->y;
1996		1867
1997	on_battleground = op_on_battleground (op, 0, 0);	1868	on_battleground = op_on_battleground (op, 0, 0);
1998		1869
1999	if (out_of_map (op->map, nx, ny))	1870	if (out_of_map (op->map, nx, ny))
2000	return false;	1871	return false;
2001
2002	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2003	{
2004	--op->speed_left;
2005	return true;
2006	}
2007		1872
2008	/* If braced, or can't move to the square, and it is not out of the	1873	/* If braced, or can't move to the square, and it is not out of the
2009	* map, attack it. Note order of if statement is important - don't	1874	* map, attack it. Note order of if statement is important - don't
2010	* want to be calling move_ob if braced, because move_ob will move the	1875	* want to be calling move_ob if braced, because move_ob will move the
2011	* player. This is a pretty nasty hack, because if we could	1876	* player. This is a pretty nasty hack, because if we could
…		…
2071	--op->speed_left;	1936	--op->speed_left;
2072		1937
2073	op->play_sound (sound_find ("push_player"));	1938	op->play_sound (sound_find ("push_player"));
2074	push_ob (mon, dir, op);	1939	push_ob (mon, dir, op);
2075		1940
2076	if (op->contr->tmp_invis \|\| op->flag [FLAG_HIDDEN])	1941	if (action_makes_visible (op))
2077	make_visible (op);	1942	make_visible (op);
2078		1943
2079	return true;	1944	return true;
2080	}	1945	}
2081	else	1946	else
…		…
2153	}	2018	}
2154		2019
2155	bool	2020	bool
2156	move_player (object *op, int dir)	2021	move_player (object *op, int dir)
2157	{	2022	{
2158	int pick;
2159
2160	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2023	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)
2161	return 0;	2024	return 0;
2162		2025
2163	/* Sanity check: make sure dir is valid */	2026	/* Sanity check: make sure dir is valid */
2164	if ((dir < 0) \|\| (dir >= 9))	2027	if ((dir < 0) \|\| (dir >= 9))
…		…
2175		2038
2176	if (op->flag [FLAG_HIDDEN])	2039	if (op->flag [FLAG_HIDDEN])
2177	do_hidden_move (op);	2040	do_hidden_move (op);
2178		2041
2179	bool retval;	2042	bool retval;
		2043	int pick = 0;
2180		2044
2181	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2045	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2182	retval = RESULT_INT (0);	2046	retval = RESULT_INT (0);
2183	else if (op->contr->fire_on)	2047	else if (op->contr->fire_on)
2184	retval = fire (op, dir);	2048	retval = fire (op, dir);
…		…
2241	return move_player (op, op->direction);	2105	return move_player (op, op->direction);
2242		2106
2243	return false;	2107	return false;
2244	}	2108	}
2245		2109
2246	int	2110	static int
2247	save_life (object *op)	2111	save_life (object *op)
2248	{	2112	{
2249	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2113	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2250	return 0;	2114	return 0;
2251		2115
…		…
2298	void	2162	void
2299	object::drop_unpaid_items ()	2163	object::drop_unpaid_items ()
2300	{	2164	{
2301	if (!flag [FLAG_REMOVED])	2165	if (!flag [FLAG_REMOVED])
2302	::drop_unpaid_items (inv, this);	2166	::drop_unpaid_items (inv, this);
2303	}
2304
2305	/*
2306	* Returns pointer a static string containing gravestone text
2307	* Moved from apply.c to player.c - player.c is what
2308	* actually uses this function. player.c may not be quite the
2309	* best, a misc file for object actions is probably better,
2310	* but there isn't one in the server directory.
2311	*/
2312	const char *
2313	gravestone_text (object *op)
2314	{
2315	static dynbuf_text buf;
2316
2317	buf << "---- R.I.P. ----\n\n"
2318	<< op->name;
2319
2320	if (op->type == PLAYER)
2321	buf << " the " << op->contr->title;
2322
2323	buf << "\n\n";
2324
2325	buf << "who was level ";
2326	buf << (sint32)op->level << "\n\n" // OO breakdown
2327	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2328
2329	if (op->type == PLAYER)
2330	buf << "by " << op->contr->killer_name () << ".\n\n";
2331
2332	{
2333	static char buf2[128];
2334	time_t now = time (NULL);
2335	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2336	buf << buf2;
2337	}
2338
2339	return buf;
2340	}	2167	}
2341		2168
2342	void	2169	void
2343	do_some_living (object *op)	2170	do_some_living (object *op)
2344	{	2171	{
…		…
2499	{	2326	{
2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2327	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2501		2328
2502	if (over_hp > 0)	2329	if (over_hp > 0)
2503	{	2330	{
2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2331	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2505	op->last_heal = 0;	2332	op->last_heal = 0;
2506	}	2333	}
2507	else	2334	else
2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2335	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2509	}	2336	}
…		…
2588	*/	2415	*/
2589	void	2416	void
2590	kill_player (object *op)	2417	kill_player (object *op)
2591	{	2418	{
2592	int x, y;	2419	int x, y;
2593	char buf[MAX_BUF];
2594	maptile map; / this is for resurrection */	2420	maptile map; / this is for resurrection */
2595	int will_kill_again;	2421	int will_kill_again;
2596	archetype *at;	2422	archetype *at;
2597	object *tmp;	2423	object *tmp;
2598		2424
2599	if (save_life (op))	2425	if (save_life (op))
2600	return;	2426	return;
		2427
		2428	dynbuf_text deathtab;
		2429
		2430	/* restore player */
		2431	at = archetype::find (shstr_poisoning);
		2432	if (object *tmp = present_arch_in_ob (at, op))
		2433	{
		2434	tmp->destroy ();
		2435	deathtab << "Your body feels cleansed...\r";
		2436	}
		2437
		2438	at = archetype::find (shstr_confusion);
		2439	if (object *tmp = present_arch_in_ob (at, op))
		2440	{
		2441	tmp->destroy ();
		2442	deathtab << "Your mind feels clearer...\r";
		2443	}
		2444
		2445	cure_disease (op, 0, 0); /* remove any disease */
		2446
		2447	max_it (op->stats.hp , op->stats.maxhp);
		2448	max_it (op->stats.sp , op->stats.maxsp);
		2449	max_it (op->stats.grace, op->stats.maxgrace);
		2450
		2451	if (op->stats.food <= 0)
		2452	op->stats.food = 999;
		2453
		2454	// remove all spell effects that are active
		2455	// to avoid long-term effects such as word-of-recall
		2456	for (object *item = op->inv; item; )
		2457	{
		2458	object *next = item->below;
		2459
		2460	if (item->type == SPELL_EFFECT && item->active)
		2461	item->destroy ();
		2462
		2463	item = next;
		2464	}
2601		2465
2602	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2466	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2603	* in cities ONLY!!! It is very important that this doesn't get abused.	2467	* in cities ONLY!!! It is very important that this doesn't get abused.
2604	* Look at op_on_battleground() for more info --AndreasV	2468	* Look at op_on_battleground() for more info --AndreasV
2605	*/	2469	*/
2606	if (op_on_battleground (op, &x, &y))	2470	if (op_on_battleground (op, &x, &y))
2607	{	2471	{
2608	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2472	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2609	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2610
2611	/* restore player */
2612	at = archetype::find ("poisoning");
2613	if (object *tmp = present_arch_in_ob (at, op))
2614	{
2615	tmp->destroy ();
2616	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2617	}
2618
2619	at = archetype::find ("confusion");
2620	if (object *tmp = present_arch_in_ob (at, op))
2621	{
2622	tmp->destroy ();
2623	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2624	}
2625
2626	cure_disease (op, 0, 0); /* remove any disease */
2627	op->stats.hp = op->stats.maxhp;
2628	if (op->stats.food <= 0)
2629	op->stats.food = 999;
2630		2473
2631	/* create a bodypart-trophy to make the winner happy */	2474	/* create a bodypart-trophy to make the winner happy */
2632	if (object *tmp = arch_to_object (archetype::find ("finger")))	2475	if (object *tmp = arch_to_object (archetype::find (shstr_finger)))
2633	{	2476	{
2634	tmp->name = format ("%s's finger" , &op->name);	2477	tmp->name = format ("%s's finger" , &op->name);
2635	tmp->name_pl = format ("%s's fingers", &op->name);	2478	tmp->name_pl = format ("%s's fingers", &op->name);
2636	tmp->msg = format (	2479	tmp->msg = format (
2637	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2480	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
…		…
2645	}	2488	}
2646		2489
2647	/* teleport defeated player to new destination */	2490	/* teleport defeated player to new destination */
2648	transfer_ob (op, x, y, 0, NULL);	2491	transfer_ob (op, x, y, 0, NULL);
2649	op->contr->braced = 0;	2492	op->contr->braced = 0;
		2493
		2494	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2650	return;	2495	return;
2651	}	2496	}
		2497
		2498	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2499	deathtab << "T<YOU HAVE DIED>\n\n";
2652		2500
2653	INVOKE_PLAYER (DEATH, op->contr);	2501	INVOKE_PLAYER (DEATH, op->contr);
2654		2502
2655	command_kill_pets (op, 0);	2503	command_kill_pets (op, 0);
2656		2504
…		…
2690		2538
2691	lost_a_stat = 0;	2539	lost_a_stat = 0;
2692		2540
2693	for (z = 0; z < num_stats_lose; z++)	2541	for (z = 0; z < num_stats_lose; z++)
2694	{	2542	{
2695	i = RANDOM () % NUM_STATS;	2543	i = rndm (NUM_STATS);
2696		2544
2697	if (settings.stat_loss_on_death)	2545	if (settings.stat_loss_on_death)
2698	{	2546	{
2699	/* Pick a random stat and take a point off it. Tell the player	2547	/* Pick a random stat and take a point off it. Tell the player
2700	* what he lost.	2548	* what he lost.
…		…
2707	lost_a_stat = 1;	2555	lost_a_stat = 1;
2708	}	2556	}
2709	else	2557	else
2710	{	2558	{
2711	/* deplete a stat */	2559	/* deplete a stat */
2712	archetype *deparch = archetype::find ("depletion");	2560	archetype *deparch = archetype::find (shstr_depletion);
2713	object *dep;	2561	object *dep;
2714		2562
2715	dep = present_arch_in_ob (deparch, op);	2563	dep = present_arch_in_ob (deparch, op);
2716	if (!dep)	2564	if (!dep)
2717	{	2565	{
…		…
2751	}	2599	}
2752	}	2600	}
2753		2601
2754	if (lose_this_stat)	2602	if (lose_this_stat)
2755	{	2603	{
2756	this_stat = get_attr_value (&(dep->stats), i);	2604	this_stat = get_attr_value (&dep->stats, i);
2757	/* We could try to do something clever like find another	2605	/* We could try to do something clever like find another
2758	* stat to reduce if this fails. But chances are, if	2606	* stat to reduce if this fails. But chances are, if
2759	* stats have been depleted to -50, all are pretty low	2607	* stats have been depleted to -50, all are pretty low
2760	* and should be roughly the same, so it shouldn't make a	2608	* and should be roughly the same, so it shouldn't make a
2761	* difference.	2609	* difference.
…		…
2775	/* If no stat lost, tell the player. */	2623	/* If no stat lost, tell the player. */
2776	if (!lost_a_stat)	2624	if (!lost_a_stat)
2777	{	2625	{
2778	/* determine_god() seems to not work sometimes... why is this?	2626	/* determine_god() seems to not work sometimes... why is this?
2779	Should I be using something else? GD */	2627	Should I be using something else? GD */
2780	const char *god = determine_god (op);	2628	shstr_tmp god = determine_god (op);
2781		2629
2782	if (god && (strcmp (god, "none")))	2630	if (god != shstr_none)
2783	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2631	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2784	else	2632	else
2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2633	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2786	}	2634	}
2787	#else	2635	#else
2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");	2636	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2789	#endif	2637	#endif
2790		2638
2791	/* Put a gravestone up where the character 'almost' died. List the	2639	/* Put a gravestone up where the character 'almost' died. List the
2792	* exp loss on the stone.	2640	* exp loss on the stone.
2793	*/	2641	*/
2794	tmp = arch_to_object (archetype::find ("gravestone"));	2642	tmp = arch_to_object (archetype::find (shstr_gravestone));
2795	tmp->name = format ("%s's gravestone", &op->name);	2643	tmp->name = format ("%s's gravestone", &op->name);
2796	tmp->name_pl = format ("%s's gravestones", &op->name);	2644	tmp->name_pl = format ("%s's gravestones", &op->name);
2797	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2645	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2798	&op->name, op->contr->title, op->contr->killer_name ());	2646	&op->name, op->contr->title, op->contr->killer_name ());
2799	tmp->x = op->x, tmp->y = op->y;	2647	tmp->x = op->x, tmp->y = op->y;
2800	insert_ob_in_map (tmp, op->map, NULL, 0);	2648	insert_ob_in_map (tmp, op->map, NULL, 0);
2801		2649
2802	/**************************************/	2650	/**************************************/
2803	/* */	2651	/* */
2804	/* Subtract the experience points, */	2652	/* Subtract the experience points, */
2805	/* if we died cause of food, give us */
2806	/* food, and reset HP's... */
2807	/* */	2653	/* */
2808	/**************************************/	2654	/**************************************/
2809		2655
2810	/* remove any poisoning and confusion the character may be suffering. */
2811	/* restore player */
2812	at = archetype::find ("poisoning");
2813	tmp = present_arch_in_ob (at, op);
2814
2815	if (tmp)
2816	{
2817	tmp->destroy ();
2818	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2819	}
2820
2821	at = archetype::find ("confusion");
2822	tmp = present_arch_in_ob (at, op);
2823	if (tmp)
2824	{
2825	tmp->destroy ();
2826	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2827	}
2828
2829	cure_disease (op, 0, 0); /* remove any disease */
2830
2831	// remove all spell effects that are active
2832	// to avoid long-term effects such as word-of-recall
2833	for (object *item = op->inv; item; )
2834	{
2835	object *next = item->below;
2836
2837	if (item->type == SPELL_EFFECT && item->active)
2838	item->destroy ();
2839
2840	item = next;
2841	}
2842
2843	/add_exp(op, (op->stats.exp -0.20)); */	2656	/add_exp(op, (op->stats.exp -0.20)); */
2844	apply_death_exp_penalty (op);	2657	apply_death_exp_penalty (op);
2845
2846	if (op->stats.food < 100)
2847	op->stats.food = 900;
2848
2849	op->stats.hp = op->stats.maxhp;
2850	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2851	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2852		2658
2853	/*	2659	/*
2854	* Check to see if the player has any unpaid items. If so, remove them	2660	* Check to see if the player has any unpaid items. If so, remove them
2855	* and put them back in the map.	2661	* and put them back in the map.
2856	*/	2662	*/
…		…
2893		2699
2894	insert_ob_in_ob (force, op);	2700	insert_ob_in_ob (force, op);
2895	op->update_stats ();	2701	op->update_stats ();
2896	}	2702	}
2897		2703
2898	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2704	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2899	}	2705	}
2900		2706
2901	void	2707	static void
2902	loot_object (object *op)	2708	loot_object (object *op)
2903	{ /* Grab and destroy some treasure */	2709	{ /* Grab and destroy some treasure */
2904	object tmp, tmp2, *next;	2710	object tmp, tmp2, *next;
2905		2711
2906	op->close_container (); /* close open sack first */	2712	op->close_container (); /* close open sack first */
…		…
3036		2842
3037	if (!ob \|\| !ob->map)	2843	if (!ob \|\| !ob->map)
3038	return 0;	2844	return 0;
3039		2845
3040	/* so, on normal lighted maps, its hard to hide */	2846	/* so, on normal lighted maps, its hard to hide */
3041	level = ob->map->darkness - 2;	2847	level = ob->map->darklevel () - 2;
3042		2848
3043	/* this also picks up whether the object is glowing.	2849	/* this also picks up whether the object is glowing.
3044	* If you carry a light on a non-dark map, its not	2850	* If you carry a light on a non-dark map, its not
3045	* as bad as carrying a light on a pitch dark map */	2851	* as bad as carrying a light on a pitch dark map */
3046	if (has_carried_lights (ob))	2852	if (ob->has_carried_lights ())
3047	level = -(10 + (2 * ob->map->darkness));	2853	level = -(10 + (2 * ob->map->darklevel ()));
3048		2854
3049	/* scan through all nearby squares for terrain to hide in */	2855	/* scan through all nearby squares for terrain to hide in */
3050	for (i = 0, x = ob->x, y = ob->y;	2856	for (i = 0, x = ob->x, y = ob->y;
3051	i <= SIZEOFFREE1;	2857	i <= SIZEOFFREE1;
3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2858	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
…		…
3199	while (op)	3005	while (op)
3200	{	3006	{
3201	dx = rv.distance_x + op->arch->x;	3007	dx = rv.distance_x + op->arch->x;
3202	dy = rv.distance_y + op->arch->y;	3008	dy = rv.distance_y + op->arch->y;
3203		3009
3204	/* only the viewable area the player sees is updated by LOS
3205	* code, so we need to restrict ourselves to that range of values
3206	* for any meaningful values.
3207	*/
3208	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)	3010	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3209	return 1;	3011	return 1;
3210		3012
3211	op = op->more;	3013	op = op->more;
3212	}
3213
3214	return 0;
3215	}
3216
3217	/* routine for both players and monsters. We call this when
3218	* there is a possibility for our action distrubing our hiding
3219	* place or invisiblity spell. Artefact invisiblity is not
3220	* effected by this. If we arent invisible to begin with, we
3221	* return 0.
3222	*/
3223	int
3224	action_makes_visible (object *op)
3225	{
3226	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3227	{
3228	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3229	return 0;
3230
3231	if (op->contr && op->contr->tmp_invis == 0)
3232	return 0;
3233
3234	/* If monsters, they should become visible */
3235	if (op->flag [FLAG_HIDDEN] \|\| !op->contr \|\| (op->contr && op->contr->tmp_invis))
3236	{
3237	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3238	return 1;
3239	}
3240	}	3014	}
3241		3015
3242	return 0;	3016	return 0;
3243	}	3017	}
3244		3018
…		…
3469		3243
3470	if (pl->ranged_ob == ob)	3244	if (pl->ranged_ob == ob)
3471	pl->ranged_ob = 0;	3245	pl->ranged_ob = 0;
3472	}	3246	}
3473		3247
		3248	//-GPL
		3249
3474	sint8	3250	sint8
3475	player::visibility_at (maptile *map, int x, int y) const	3251	player::darkness_at (maptile *map, int x, int y) const
3476	{	3252	{
3477	if (!ns)	3253	if (!ns)
3478	return 0;	3254	return LOS_BLOCKED;
3479		3255
3480	int dx, dy;	3256	int dx, dy;
3481	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3257	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3482	return 0;	3258	return LOS_BLOCKED;
3483		3259
3484	x += dx - ns->current_x;	3260	x += dx - ns->current_x;
3485	y += dy - ns->current_y;	3261	y += dy - ns->current_y;
3486		3262
3487	return 100 - blocked_los (x, y);	3263	return blocked_los (x, y);
3488	}	3264	}
3489		3265
3490	void	3266	void
3491	player::infobox (const char title, const char msg, int color)	3267	player::infobox (const char title, const char msg, int color)
3492	{	3268	{

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC vs. Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.210 by root, Fri Dec 19 22:47:30 2008 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC