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.175 by elmex, Mon Nov 26 12:54:32 2007 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);
		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 */
326	}	213	}
327		214
328	void	215	void
329	player::set_observe (object *op)	216	player::set_observe (object *op)
330	{	217	{
331	observe = op ? op : ob;	218	observe = viewpoint = op ? op : ob;
332	do_los = 1;	219	do_los = 1;
333	}	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
334		230
335	player::player ()	231	player::player ()
336	{	232	{
337	/* There are some elements we want initialised to non zero value -	233	/* There are some elements we want initialised to non zero value -
338	* we deal with that below this point.	234	* we deal with that below this point.
…		…
344	savebed_map = first_map_path; /* Init. respawn position */	240	savebed_map = first_map_path; /* Init. respawn position */
345		241
346	gen_sp_armour = 10;	242	gen_sp_armour = 10;
347	bowtype = bow_normal;	243	bowtype = bow_normal;
348	petmode = pet_normal;	244	petmode = pet_normal;
349	listening = 10;
350	usekeys = containers;	245	usekeys = containers;
351	peaceful = 1; /* default peaceful */	246	peaceful = 1; /* default peaceful */
352	do_los = 1;	247	do_los = 1;
353		248
354	weapon_sp = 1.0f;	249	weapon_sp = 1.0f;
…		…
366	{	261	{
367	ob->destroy_inv (false);	262	ob->destroy_inv (false);
368	ob->destroy ();	263	ob->destroy ();
369	}	264	}
370		265
371	ob = observe = 0;	266	ob = observe = viewpoint = 0;
372	}	267	}
373		268
374	player::~player ()	269	player::~player ()
375	{	270	{
376	/* Clear item stack */	271	/* Clear item stack */
377	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	}
378	}	301	}
379		302
380	/* Tries to add player on the connection passed in ns.	303	/* Tries to add player on the connection passed in ns.
381	* 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
382	* mode.	305	* mode.
…		…
384	player *	307	player *
385	player::create ()	308	player::create ()
386	{	309	{
387	player *pl = new player;	310	player *pl = new player;
388		311
389	pl->set_object (arch_to_object (get_player_archetype (0)));	312	pl->set_object (get_player_archetype (0)->instance ());
390		313
391	pl->ob->roll_stats ();	314	pl->ob->roll_stats ();
392	pl->ob->stats.wc = 2;	315	pl->ob->stats.wc = 2;
393	pl->ob->run_away = 25; /* Then we panick... */	316	pl->ob->run_away = 25; /* Then we panick... */
394		317
395	set_first_map (pl->ob);	318	set_first_map (pl->ob);
396		319
397	return pl;	320	return pl;
398	}
399
400	/*
401	* get_player_archetype() return next player archetype from archetype
402	* list. Not very efficient routine, but used only creating new players.
403	* Note: there MUST be at least one player archetype!
404	*/
405	archetype *
406	get_player_archetype (archetype *at)
407	{
408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
409
410	for (;;)
411	{
412	if (++i == archetypes.end ())
413	i = archetypes.begin ();
414	else if (*i == at)
415	cleanup ("not a single player archetype found");
416
417	if ((*i)->type == PLAYER)
418	return *i;
419	}
420	}	321	}
421		322
422	object *	323	object *
423	get_nearest_player (object *mon)	324	get_nearest_player (object *mon)
424	{	325	{
…		…
631		532
632	return firstdir;	533	return firstdir;
633	}	534	}
634		535
635	void	536	void
636	give_initial_items (object *pl, treasurelist * items)	537	give_initial_items (object *pl, treasurelist *items)
637	{	538	{
638	object *op, *next = NULL;
639
640	if (pl->randomitems != NULL)	539	if (pl->randomitems)
641	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	540	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
642		541
643	for (op = pl->inv; op; op = next)	542	for (object *next, *op = pl->inv; op; op = next)
644	{	543	{
645	next = op->below;	544	next = op->below;
646		545
647	/* Forces get applied per default, unless they have the	546	/* Forces get applied per default, unless they have the
648	* flag "neutral" set. Sorry but I can't think of a better way	547	* flag "neutral" set. Sorry but I can't think of a better way
…		…
653	/* we never give weapons/armour if these cannot be used	552	/* we never give weapons/armour if these cannot be used
654	* by this player due to race restrictions	553	* by this player due to race restrictions
655	*/	554	*/
656	if (pl->type == PLAYER)	555	if (pl->type == PLAYER)
657	{	556	{
658	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	557	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		558	&&
659	(op->type == ARMOUR || op->type == BOOTS ||	559	(op->type == ARMOUR || op->type == BOOTS
660	op->type == CLOAK || op->type == HELMET ||	560	|| op->type == CLOAK || op->type == HELMET
661	op->type == SHIELD || op->type == GLOVES ||	561	|| op->type == SHIELD || op->type == GLOVES
		562	|| op->type == BRACERS || op->type == GIRDLE))
662	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	563	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
663	{	564	{
664	op->destroy ();	565	op->destroy ();
665	continue;	566	continue;
666	}	567	}
667	}	568	}
668		569
669	/* This really needs to be better - we should really give	570	/* Here we remove duplicated skills (as duplicated spell objects have
670	* a substitute spellbook. The problem is that we don't really	571	* _very_ confusing effects for players), which could for instance be
671	* have a good idea what to replace it with (need something like	572	* generated by bad treasurelists. - elmex
672	* a first level treasurelist for each skill.)
673	* remove duplicate skills also
674	*/	573	*/
675	if (op->type == SPELLBOOK || op->type == SKILL)	574	if (op->type == SKILL)
676	{	575	{
677	object *tmp;
678
679	for (tmp = op->below; tmp; tmp = tmp->below)	576	for (object *tmp = op->below; tmp; tmp = tmp->below)
680	if (tmp->type == op->type && tmp->name == op->name)	577	if (tmp->type == op->type && tmp->name == op->name)
681	break;
682
683	if (tmp)
684	{	578	{
685	op->destroy ();	579	op->destroy ();
		580	LOG (llevError,
686	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	581	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
687	continue;	582	break;
688	}	583	}
689		584
690	if (op->nrof > 1)	585	if (op->nrof > 1)
691	op->nrof = 1;	586	op->nrof = 1;
692	}	587	}
693		588
694	if (op->type == SPELLBOOK && op->inv)	589	if (op->type == SPELLBOOK && op->inv)
695	{
696	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	590	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
697	}
698		591
699	/* Give starting characters identified, uncursed, and undamned	592	/* Give starting characters identified, uncursed, and undamned
700	* items. Just don't identify gold or silver, or it won't be	593	* items. Just don't identify gold or silver, or it won't be
701	* merged properly.	594	* merged properly.
702	*/	595	*/
703	if (need_identify (op))	596	if (need_identify (op))
704	{	597	{
705	SET_FLAG (op, FLAG_IDENTIFIED);	598	SET_FLAG (op, FLAG_IDENTIFIED);
706	CLEAR_FLAG (op, FLAG_CURSED);	599	CLEAR_FLAG (op, FLAG_CURSED);
707	CLEAR_FLAG (op, FLAG_DAMNED);	600	CLEAR_FLAG (op, FLAG_DAMNED);
708	}	601	}
		602
709	if (op->type == SPELL)	603	if (op->type == SPELL)
710	{	604	{
711	op->destroy ();	605	op->destroy ();
712	continue;	606	continue;
713	}	607	}
…		…
715	{	609	{
716	SET_FLAG (op, FLAG_CAN_USE_SKILL);	610	SET_FLAG (op, FLAG_CAN_USE_SKILL);
717	op->stats.exp = 0;	611	op->stats.exp = 0;
718	op->level = 1;	612	op->level = 1;
719	}	613	}
720	/* lock all 'normal items by default */	614	else /* lock all 'normal items by default */
721	else
722	SET_FLAG (op, FLAG_INV_LOCKED);	615	SET_FLAG (op, FLAG_INV_LOCKED);
723	} /* for loop of objects in player inv */	616	} /* for loop of objects in player inv */
724		617
725	/* Need to set up the skill pointers */	618	/* Need to set up the skill pointers */
726	link_player_skills (pl);	619	pl->contr->link_skills ();
727	}	620	}
728		621
729	void	622	void
730	get_party_password (object *op, partylist *party)	623	get_party_password (object *op, partylist *party)
731	{	624	{
…		…
741	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:");
742	}	635	}
743		636
744	/* 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. */
745	static int	638	static int
746	roll_stat (void)	639	roll_stat ()
747	{	640	{
748	int a[4], i, j, k;	641	int a[4], i, j, k;
749		642
750	for (i = 0; i < 4; i++)	643	for (i = 0; i < 4; i++)
751	a[i] = (int) rndm (6) + 1;	644	a[i] = (int) rndm (6) + 1;
…		…
832	static void	725	static void
833	start_info (object *op)	726	start_info (object *op)
834	{	727	{
835	char buf[MAX_BUF];	728	char buf[MAX_BUF];
836		729
837	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	730	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
838	new_draw_info (NDI_UNIQUE, 0, op, buf);	731	new_draw_info (NDI_UNIQUE, 0, op, buf);
839	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
840	//new_draw_info (NDI_UNIQUE, 0, op, " ");
841	}	732	}
842		733
843	/* This function takes the key that is passed, and does the	734	/* This function takes the key that is passed, and does the
844	* appropriate action with it (change race, or other things).	735	* appropriate action with it (change race, or other things).
845	* The function name is for historical reasons - now we have	736	* The function name is for historical reasons - now we have
…		…
848	*/	739	*/
849	void	740	void
850	player::chargen_race_done ()	741	player::chargen_race_done ()
851	{	742	{
852	/* this must before then initial items are given */	743	/* this must before then initial items are given */
853	esrv_new_player (ob->contr, ob->weight + ob->carrying);	744	esrv_new_player (ob->contr);
854		745
855	treasurelist *tl = treasurelist::find ("starting_wealth");	746	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
856	if (tl)	747	if (tl)
857	create_treasure (tl, ob, 0, 0, 0);	748	create_treasure (tl, ob, 0, 0, 0);
858		749
859	INVOKE_PLAYER (BIRTH, ob->contr);	750	INVOKE_PLAYER (BIRTH, ob->contr);
860	INVOKE_PLAYER (LOGIN, ob->contr);	751	INVOKE_PLAYER (LOGIN, ob->contr);
861		752
862	ob->contr->ns->state = ST_PLAYING;	753	ob->contr->ns->state = ST_PLAYING;
863		754
864	if (ob->msg)	755	if (ob->msg)
865	ob->msg = 0;	756	ob->msg = 0;
866
867	/* We create this now because some of the unique maps will need it
868	* to save here.
869	*/
870	{
871	char buf[MAX_BUF];
872	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
873	make_path_to_file (buf);
874	}
875		757
876	start_info (ob);	758	start_info (ob);
877	CLEAR_FLAG (ob, FLAG_WIZ);	759	CLEAR_FLAG (ob, FLAG_WIZ);
878	give_initial_items (ob, ob->randomitems);	760	give_initial_items (ob, ob->randomitems);
879	link_player_skills (ob);
880	esrv_send_inventory (ob, ob);	761	esrv_send_inventory (ob, ob);
881	ob->update_stats ();	762	ob->update_stats ();
882		763
883	/* This moves the player to a different start map, if there	764	/* This moves the player to a different start map, if there
884	* is one for this race	765	* is one for this race
885	*/	766	*/
886	if (*first_map_ext_path)	767	if (*first_map_ext_path)
887	{	768	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
888	object *tmp;
889	char mapname[MAX_BUF];
890
891	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
892	tmp = object::create ();
893	EXIT_PATH (tmp) = mapname;
894	EXIT_X (tmp) = ob->x;
895	EXIT_Y (tmp) = ob->y;
896	ob->enter_exit (tmp); /* we don't really care if it succeeded;
897	* if the map isn't there, then stay on the
898	* default initial map */
899	tmp->destroy ();
900	}
901	else	769	else
902	LOG (llevDebug, "first_map_ext_path not set\n");	770	LOG (llevDebug, "first_map_ext_path not set\n");
903	}	771	}
904		772
905	void	773	void
…		…
936	ob->stats.hp = ob->stats.maxhp;	804	ob->stats.hp = ob->stats.maxhp;
937	ob->stats.sp = ob->stats.maxsp;	805	ob->stats.sp = ob->stats.maxsp;
938	ob->stats.grace = 0;	806	ob->stats.grace = 0;
939	}	807	}
940		808
941	void	809	static void
942	flee_player (object *op)	810	flee_player (object *op)
943	{	811	{
944	int dir, diff;	812	int dir, diff;
945	rv_vector rv;	813	rv_vector rv;
946		814
…		…
949	LOG (llevDebug, "Fleeing player is dead.\n");	817	LOG (llevDebug, "Fleeing player is dead.\n");
950	CLEAR_FLAG (op, FLAG_SCARED);	818	CLEAR_FLAG (op, FLAG_SCARED);
951	return;	819	return;
952	}	820	}
953		821
954	if (op->enemy == NULL)	822	if (!op->enemy)
955	{	823	{
956	LOG (llevDebug, "Fleeing player had no enemy.\n");	824	LOG (llevDebug, "Fleeing player had no enemy.\n");
957	CLEAR_FLAG (op, FLAG_SCARED);	825	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	826	return;
959	}	827	}
960		828
961	/* Seen some crashes here. Since we don't store an
962	* op->enemy_count, it is possible that something destroys the
963	* actual enemy, and the object is recycled.
964	*/
965	if (op->enemy->map == NULL)
966	{
967	CLEAR_FLAG (op, FLAG_SCARED);
968	op->enemy = NULL;
969	return;
970	}
971
972	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))
973	{	830	{
974	op->enemy = NULL;	831	op->enemy = NULL;
975	CLEAR_FLAG (op, FLAG_SCARED);	832	CLEAR_FLAG (op, FLAG_SCARED);
976	return;	833	return;
…		…
979	get_rangevector (op, op->enemy, &rv, 0);	836	get_rangevector (op, op->enemy, &rv, 0);
980		837
981	dir = absdir (4 + rv.direction);	838	dir = absdir (4 + rv.direction);
982	for (diff = 0; diff < 3; diff++)	839	for (diff = 0; diff < 3; diff++)
983	{	840	{
984	int m = 1 - (RANDOM () & 2);	841	int m = 1 - rndm (2) * 2;
985		842
986	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)))
987	return;	844	return;
988	}	845	}
989		846
…		…
1000	check_pick (object *op)	857	check_pick (object *op)
1001	{	858	{
1002	object *tmp, *next;	859	object *tmp, *next;
1003	int stop = 0;	860	int stop = 0;
1004	int wvratio;	861	int wvratio;
1005	char putstring[128];
1006		862
1007	/* if you're flying, you cna't pick up anything */	863	/* if you're flying, you cna't pick up anything */
1008	if (op->move_type & MOVE_FLYING)	864	if (op->move_type & MOVE_FLYING)
1009	return 1;	865	return 1;
1010		866
1011	next = op->below;	867	next = op->below;
1012		868
1013	int cnt = MAX_ITEM_PER_DROP;	869	int cnt = MAX_ITEM_PER_ACTION;
1014	#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)
1015		871
1016	/* 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
1017	* destroyed */	873	* destroyed */
1018	while (next && !next->destroyed ())	874	while (next && !next->destroyed ())
…		…
1034		890
1035	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	891	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1036	{	892	{
1037	if (item_matched_string (op, tmp, op->contr->search_str))	893	if (item_matched_string (op, tmp, op->contr->search_str))
1038	CHK_PICK_PICKUP;	894	CHK_PICK_PICKUP;
		895
1039	continue;	896	continue;
1040	}	897	}
1041		898
1042	/* 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? */
1043	if (!(op->contr->mode & PU_NEWMODE))	959	if (op->contr->mode & PU_FOOD)
		960	if (tmp->type == FOOD)
1044	{	961	{
1045	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)
1046	{	1025	{
1047	case 0:
1048	return 1; /* don't pick up */
1049	case 1:
1050	CHK_PICK_PICKUP;	1026	CHK_PICK_PICKUP;
1051	return 1;	1027	continue;
1052	case 2:
1053	CHK_PICK_PICKUP;
1054	return 0;
1055	case 3:
1056	return 0; /* stop before pickup */
1057	case 4:
1058	CHK_PICK_PICKUP;
1059	break;
1060	case 5:
1061	CHK_PICK_PICKUP;
1062	stop = 1;
1063	break;
1064	case 6:
1065	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1066	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1067	CHK_PICK_PICKUP;
1068	break;
1069
1070	case 7:
1071	if (tmp->type == MONEY || tmp->type == GEM)
1072	CHK_PICK_PICKUP;
1073	break;
1074
1075	default:
1076	/* use value density */
1077	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1078	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1079	CHK_PICK_PICKUP;
1080	}	1028	}
1081	}	1029	}
1082	else	1030
1083	{ /* old model */	1031	/* rings & amulets - talismans seems to be typed AMULET */
1084	/* NEW pickup handling */
1085	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)
1086	{	1037	{
1087	/* some debugging code to figure out item information */	1038	CHK_PICK_PICKUP;
1088	if (tmp->name != NULL)
1089	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1090	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1091	else
1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1093	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1094
1095	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1096	}
1097
1098	/* philosophy:
1099	* It's easy to grab an item type from a pile, as long as it's
1100	* generic. This takes no game-time. For more detailed pickups
1101	* and selections, select-items should be used. This is a
1102	* grab-as-you-run type mode that's really useful for arrows for
1103	* example.
1104	* The drawback: right now it has no frontend, so you need to
1105	* stick the bits you want into a calculator in hex mode and then
1106	* convert to decimal and then 'pickup <#>
1107	*/
1108
1109	/* the first two modes are exclusive: if NOTHING we return, if
1110	* STOP then we stop. All the rest are applied sequentially,
1111	* meaning if any test passes, the item gets picked up. */
1112
1113	/* if mode is set to pick nothing up, return */
1114
1115	if (op->contr->mode & PU_NOTHING)
1116	return 1;
1117
1118	/* if mode is set to stop when encountering objects, return */
1119	/* take STOP before INHIBIT since it doesn't actually pick
1120	* anything up */
1121
1122	if (op->contr->mode & PU_STOP)
1123	return 0;
1124
1125	/* useful for going into stores and not losing your settings... */
1126	/* and for battles wher you don't want to get loaded down while
1127	* fighting */
1128	if (op->contr->mode & PU_INHIBIT)
1129	return 1;
1130
1131	/* prevent us from turning into auto-thieves :) */
1132	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1133	continue;	1039	continue;
		1040	}
1134		1041
1135	/* ignore known cursed objects */	1042	/* we don't forget dragon food */
1136	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;
1137	continue;	1047	continue;
		1048	}
1138		1049
1139	/* all food and drink if desired */	1050	/* bows and arrows. Bows are good for selling! */
1140	/* 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
1141	if (op->contr->mode & PU_FOOD)	1087	if (op->contr->mode & PU_BOOTS)
1142	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"))
1143	{	1121	{
1144	CHK_PICK_PICKUP;	1122	CHK_PICK_PICKUP;
1145	continue;	1123	continue;
1146	}	1124	}
		1125	}
1147		1126
		1127	/* misc stuff that's useful */
1148	if (op->contr->mode & PU_DRINK)	1128	if (op->contr->mode & PU_KEY)
1149	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1129	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1150	{	1130	{
1151	CHK_PICK_PICKUP;	1131	CHK_PICK_PICKUP;
1152	continue;	1132	continue;
1153	}	1133	}
1154		1134
		1135	/* any of the last 4 bits set means we use the ratio for value
		1136	* pickups */
1155	if (op->contr->mode & PU_POTION)	1137	if (op->contr->mode & PU_RATIO)
1156	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
1157	{	1142	*/
1158	CHK_PICK_PICKUP;
1159	continue;
1160	}
1161
1162	/* spellbooks, skillscrolls and normal books/scrolls */
1163	if (op->contr->mode & PU_SPELLBOOK)
1164	if (tmp->type == SPELLBOOK)
1165	{
1166	CHK_PICK_PICKUP;
1167	continue;
1168	}
1169
1170	if (op->contr->mode & PU_SKILLSCROLL)
1171	if (tmp->type == SKILLSCROLL)
1172	{
1173	CHK_PICK_PICKUP;
1174	continue;
1175	}
1176
1177	if (op->contr->mode & PU_READABLES)
1178	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1179	{
1180	CHK_PICK_PICKUP;
1181	continue;
1182	}
1183
1184	/* wands/staves/rods/horns */
1185	if (op->contr->mode & PU_MAGIC_DEVICE)
1186	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1187	{
1188	CHK_PICK_PICKUP;
1189	continue;
1190	}
1191
1192	/* pick up all magical items */
1193	if (op->contr->mode & PU_MAGICAL)	1143	wvratio = op->contr->mode & PU_RATIO;
1194	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)
1195	{
1196	CHK_PICK_PICKUP;
1197	continue;
1198	}
1199
1200	if (op->contr->mode & PU_VALUABLES)
1201	{	1145	{
1202	if (tmp->type == MONEY || tmp->type == GEM)	1146	#if 0
		1147	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1148	if (tmp->name != NULL)
1203	{	1149	{
1204	CHK_PICK_PICKUP;	1150	fprintf (stderr, "%s", tmp->name);
1205	continue;
1206	}	1151	}
1207	}
1208
1209	/* rings & amulets - talismans seems to be typed AMULET */
1210	if (op->contr->mode & PU_JEWELS)
1211	if (tmp->type == RING || tmp->type == AMULET)
1212	{
1213	CHK_PICK_PICKUP;
1214	continue;
1215	}
1216
1217	/* we don't forget dragon food */
1218	if (op->contr->mode & PU_FLESH)
1219	if (tmp->type == FLESH)
1220	{
1221	CHK_PICK_PICKUP;
1222	continue;
1223	}
1224
1225	/* bows and arrows. Bows are good for selling! */
1226	if (op->contr->mode & PU_BOW)
1227	if (tmp->type == BOW)
1228	{
1229	CHK_PICK_PICKUP;
1230	continue;
1231	}
1232
1233	if (op->contr->mode & PU_ARROW)
1234	if (tmp->type == ARROW)
1235	{
1236	CHK_PICK_PICKUP;
1237	continue;
1238	}
1239
1240	/* all kinds of armor etc. */
1241	if (op->contr->mode & PU_ARMOUR)
1242	if (tmp->type == ARMOUR)
1243	{
1244	CHK_PICK_PICKUP;
1245	continue;
1246	}
1247
1248	if (op->contr->mode & PU_HELMET)
1249	if (tmp->type == HELMET)
1250	{
1251	CHK_PICK_PICKUP;
1252	continue;
1253	}
1254
1255	if (op->contr->mode & PU_SHIELD)
1256	if (tmp->type == SHIELD)
1257	{
1258	CHK_PICK_PICKUP;
1259	continue;
1260	}
1261
1262	if (op->contr->mode & PU_BOOTS)
1263	if (tmp->type == BOOTS)
1264	{
1265	CHK_PICK_PICKUP;
1266	continue;
1267	}
1268
1269	if (op->contr->mode & PU_GLOVES)
1270	if (tmp->type == GLOVES)
1271	{
1272	CHK_PICK_PICKUP;
1273	continue;
1274	}
1275
1276	if (op->contr->mode & PU_CLOAK)
1277	if (tmp->type == CLOAK)
1278	{
1279	CHK_PICK_PICKUP;
1280	continue;
1281	}
1282
1283	/* hoping to catch throwing daggers here */
1284	if (op->contr->mode & PU_MISSILEWEAPON)
1285	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1286	{
1287	CHK_PICK_PICKUP;
1288	continue;
1289	}
1290
1291	/* careful: chairs and tables are weapons! */
1292	if (op->contr->mode & PU_ALLWEAPON)
1293	{
1294	if (tmp->type == WEAPON && tmp->name != NULL)
1295	{
1296	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1297	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1298	{
1299	CHK_PICK_PICKUP;
1300	continue;
1301	}
1302	}
1303
1304	if (tmp->type == WEAPON && tmp->name == NULL)
1305	{
1306	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1307	{
1308	CHK_PICK_PICKUP;
1309	continue;
1310	}
1311	}
1312	}
1313
1314	/* misc stuff that's useful */
1315	if (op->contr->mode & PU_KEY)
1316	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1317	{
1318	CHK_PICK_PICKUP;
1319	continue;
1320	}
1321
1322	/* any of the last 4 bits set means we use the ratio for value
1323	* pickups */
1324	if (op->contr->mode & PU_RATIO)
1325	{
1326	/* use value density to decide what else to grab */
1327	/* >=7 was >= op->contr->mode */
1328	/* >=7 is the old standard setting. Now we take the last 4 bits
1329	* and multiply them by 5, giving 0..15*5== 5..75 */
1330	wvratio = (op->contr->mode & PU_RATIO) * 5;
1331	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1332	{
1333	CHK_PICK_PICKUP;
1334	#if 0
1335	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1336	if (tmp->name != NULL)
1337	{
1338	fprintf (stderr, "%s", tmp->name);
1339	}
1340	else	1152	else
1341	fprintf (stderr, "%s", tmp->arch->archname);	1153	fprintf (stderr, "%s", tmp->arch->archname);
1342	fprintf (stderr, ",%d] = ", tmp->type);	1154	fprintf (stderr, ",%d] = ", tmp->type);
1343	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))));
1344	#endif	1156	#endif
		1157	CHK_PICK_PICKUP;
1345	continue;	1158	continue;
1346	}
1347	}	1159	}
1348	} /* the new pickup model */	1160	} /* the new pickup model */
1349	}	1161	}
1350		1162
1351	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;
1352	}	1199	}
1353		1200
1354	/*	1201	/*
1355	* Find an arrow in the inventory and after that	1202	* Find an arrow in the inventory and after that
1356	* in the right type container (quiver). Pointer to the	1203	* in the right type container (quiver). Pointer to the
1357	* found object is returned.	1204	* found object is returned.
1358	*/	1205	*/
1359	object *	1206	static object *
1360	find_arrow (object *op, const char *type)	1207	find_arrow (object *op, const char *type)
1361	{	1208	{
1362	object *tmp = 0;
1363
1364	for (op = op->inv; op; op = op->below)	1209	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1365	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1366	tmp = find_arrow (splay (op), type);
1367	else if (op->type == ARROW && op->race == type)	1210	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1368	return splay (op);	1211	return splay (tmp);
1369		1212
		1213	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1214	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1215	if (object *arrow = find_arrow (tmp, type))
		1216	{
		1217	splay (tmp);
		1218	return arrow;
		1219	}
		1220
1370	return tmp;	1221	return 0;
1371	}	1222	}
1372		1223
1373	/*	1224	/*
1374	* 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
1375	* 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
1376	* 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
1377	* 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.
1378	*/	1229	*/
1379	object *	1230	static object *
1380	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)
1381	{	1232	{
1382	object *tmp = NULL, *arrow, *ntmp;	1233	object *tmp = NULL, *arrow, *ntmp;
1383	int attacknum, attacktype, betterby = 0, i;	1234	int attacknum, attacktype, betterby = 0, i;
1384		1235
1385	if (!type)	1236	if (!type)
…		…
1389	{	1240	{
1390	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))
1391	{	1242	{
1392	i = 0;	1243	i = 0;
1393	ntmp = find_better_arrow (arrow, target, type, &i);	1244	ntmp = find_better_arrow (arrow, target, type, &i);
		1245
1394	if (i > betterby)	1246	if (i > betterby)
1395	{	1247	{
1396	tmp = ntmp;	1248	tmp = ntmp;
1397	betterby = i;	1249	betterby = i;
1398	}	1250	}
1399	}	1251	}
1400	else if (arrow->type == ARROW && arrow->race == type)	1252	else if (arrow->type == ARROW && arrow->race == type)
1401	{	1253	{
1402	/* allways prefer assasination/slaying */	1254	/* allways prefer assasination/slaying */
1403	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1255	if (target->race && arrow->slaying.contains (target->race))
1404	{	1256	{
1405	if (arrow->attacktype & AT_DEATH)	1257	if (arrow->attacktype & AT_DEATH)
1406	{	1258	{
1407	*better = 100;	1259	*better = 100;
1408	return arrow;	1260	return arrow;
…		…
1423	{	1275	{
1424	tmp = arrow;	1276	tmp = arrow;
1425	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;
1426	}	1278	}
1427	}	1279	}
		1280
1428	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1281	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1429	{	1282	{
1430	tmp = arrow;	1283	tmp = arrow;
1431	betterby = 2 + arrow->magic + arrow->stats.dam;	1284	betterby = 2 + arrow->magic + arrow->stats.dam;
1432	}	1285	}
		1286
1433	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1287	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1434	{	1288	{
1435	tmp = arrow;	1289	tmp = arrow;
1436	betterby = 1 + arrow->magic + arrow->stats.dam;	1290	betterby = 1 + arrow->magic + arrow->stats.dam;
1437	}	1291	}
1438	}	1292	}
1439	}	1293	}
1440	}	1294	}
		1295
1441	if (tmp == NULL && arrow == NULL)	1296	if (tmp == NULL && arrow == NULL)
1442	return find_arrow (op, type);	1297	return find_arrow (op, type);
1443		1298
1444	*better = betterby;	1299	*better = betterby;
1445	return tmp;	1300	return tmp;
…		…
1449	* find_better_arrow to find a decent arrow to use.	1304	* find_better_arrow to find a decent arrow to use.
1450	* op = the shooter	1305	* op = the shooter
1451	* type = bow->race	1306	* type = bow->race
1452	* dir = fire direction	1307	* dir = fire direction
1453	*/	1308	*/
1454	object *	1309	static object *
1455	pick_arrow_target (object *op, const char *type, int dir)	1310	pick_arrow_target (object *op, shstr_cmp type, int dir)
1456	{	1311	{
1457	object *tmp = NULL;	1312	object *tmp = NULL;
1458	maptile *m;	1313	maptile *m;
1459	int i, mflags, found, number;	1314	int i, mflags, found, number;
1460	sint16 x, y;	1315	sint16 x, y;
…		…
1475	for (i = 0, found = 0; i < 20; i++)	1330	for (i = 0, found = 0; i < 20; i++)
1476	{	1331	{
1477	x += freearr_x[dir];	1332	x += freearr_x[dir];
1478	y += freearr_y[dir];	1333	y += freearr_y[dir];
1479	mflags = get_map_flags (m, &m, x, y, &x, &y);	1334	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1335
1480	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1336	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1481	{	1337	{
1482	tmp = NULL;	1338	tmp = 0;
1483	break;	1339	break;
1484	}	1340	}
1485	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)
1486	{	1342	{
1487	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1343	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1488	* perhaps a bad assumption.	1344	* perhaps a bad assumption.
1489	*/	1345	*/
1490	tmp = NULL;	1346	tmp = 0;
1491	break;	1347	break;
1492	}	1348	}
		1349
1493	if (mflags & P_IS_ALIVE)	1350	if (mflags & P_IS_ALIVE)
1494	{
1495	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)
1496	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1352	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1497	{
1498	found++;
1499	break;
1500	}
1501	if (found)
1502	break;	1353	break;
1503	}
1504	}	1354	}
1505	if (tmp == NULL)	1355
		1356	if (!tmp)
1506	return find_arrow (op, type);	1357	return find_arrow (op, type);
1507		1358
1508	if (tmp->head)	1359	if (tmp->head)
1509	tmp = tmp->head;	1360	tmp = tmp->head;
1510		1361
…		…
1550	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1401	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1551	return 0;	1402	return 0;
1552	}	1403	}
1553		1404
1554	// 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
1555	if (bow->below)	1406	splay (bow);
1556	{
1557	bow->remove ();
1558	op->insert (bow);
1559	}
1560
1561	}	1407	}
1562		1408
1563	if (!bow->race || !bow->skill)	1409	if (!bow->race || !bow->skill)
1564	{	1410	{
1565	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);
…		…
1591	}	1437	}
1592		1438
1593	/* this should not happen, but sometimes does */	1439	/* this should not happen, but sometimes does */
1594	if (arrow->nrof == 0)	1440	if (arrow->nrof == 0)
1595	{	1441	{
		1442	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1596	arrow->destroy ();	1443	arrow->destroy ();
1597	return 0;	1444	return 0;
1598	}	1445	}
1599		1446
1600	left = arrow; /* these are arrows left to the player */	1447	left = arrow; /* these are arrows left to the player */
1601	arrow = get_split_ob (arrow, 1);	1448	arrow = arrow->split ();
1602	if (!arrow)	1449	if (!arrow)
1603	{	1450	{
1604	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);
1605	return 0;	1452	return 0;
1606	}	1453	}
…		…
1610	arrow->direction = dir;	1457	arrow->direction = dir;
1611		1458
1612	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 */
1613	arrow->stats.hp = arrow->stats.dam;	1460	arrow->stats.hp = arrow->stats.dam;
1614	arrow->stats.grace = arrow->attacktype;	1461	arrow->stats.grace = arrow->attacktype;
1615		1462	arrow->custom_name = arrow->slaying;
1616	if (arrow->slaying)
1617	arrow->spellarg = strdup (arrow->slaying);
1618		1463
1619	#if 0	1464	#if 0
1620	if (player *pl = op->contr)	1465	if (player *pl = op->contr)
1621	{	1466	{
1622	float speed = pl->weapon_sp;	1467	float speed = pl->weapon_sp;
…		…
1673	op->play_sound (sound_find ("fire_arrow"));	1518	op->play_sound (sound_find ("fire_arrow"));
1674	m->insert (arrow, sx, sy, op);	1519	m->insert (arrow, sx, sy, op);
1675		1520
1676	if (!arrow->destroyed ())	1521	if (!arrow->destroyed ())
1677	move_arrow (arrow);	1522	move_arrow (arrow);
1678
1679	if (op->type == PLAYER)
1680	{
1681	if (left->destroyed ())
1682	esrv_del_item (op->contr, left->count);
1683	else
1684	esrv_send_item (op, left);
1685	}
1686		1523
1687	return 1;	1524	return 1;
1688	}	1525	}
1689		1526
1690	/* Special fire code for players - this takes into	1527	/* Special fire code for players - this takes into
…		…
1692	* but monsters can't. Putting that code here	1529	* but monsters can't. Putting that code here
1693	* makes the fire_bow code much cleaner.	1530	* makes the fire_bow code much cleaner.
1694	* this function should only be called if 'op' is a player,	1531	* this function should only be called if 'op' is a player,
1695	* hence the function name.	1532	* hence the function name.
1696	*/	1533	*/
1697	int	1534	static int
1698	player_fire_bow (object *op, int dir)	1535	player_fire_bow (object *op, int dir)
1699	{	1536	{
1700	int ret = 0, wcmod = 0;	1537	int ret;
1701		1538
1702	if (op->contr->bowtype == bow_bestarrow)	1539	if (op->contr->bowtype == bow_bestarrow)
1703	{	1540	{
1704	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);
1705	}	1542	}
1706	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)
1707	{	1544	{
1708	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1545	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1709	wcmod = -1;
1710
1711	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);
1712	}	1547	}
1713	else if (op->contr->bowtype == bow_threewide)	1548	else if (op->contr->bowtype == bow_threewide)
1714	{	1549	{
1715	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);
1716	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)]);
1717	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)]);
1718	}	1553	}
1719	else if (op->contr->bowtype == bow_spreadshot)	1554	else if (op->contr->bowtype == bow_spreadshot)
1720	{	1555	{
1721	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);
1722	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);
1723	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);
1724	}	1559	}
1725	else	1560	else
1726	{	1561	{
…		…
1732	}	1567	}
1733		1568
1734	/* Fires a misc (wand/rod/horn) object in 'dir'.	1569	/* Fires a misc (wand/rod/horn) object in 'dir'.
1735	* Broken apart from 'fire' to keep it more readable.	1570	* Broken apart from 'fire' to keep it more readable.
1736	*/	1571	*/
1737	void	1572	static void
1738	fire_misc_object (object *op, int dir)	1573	fire_misc_object (object *op, int dir)
1739	{	1574	{
1740	object *item = op->contr->ranged_ob;	1575	object *item = op->contr->ranged_ob;
1741		1576
1742	if (!item)	1577	if (!item)
…		…
1764	return;	1599	return;
1765	}	1600	}
1766	}	1601	}
1767	else if (item->type == ROD || item->type == HORN)	1602	else if (item->type == ROD || item->type == HORN)
1768	{	1603	{
1769	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))
1770	{	1609	{
1771	op->contr->play_sound (sound_find ("wand_poof"));	1610	op->contr->play_sound (sound_find ("wand_poof"));
1772		1611
1773	if (item->type == ROD)	1612	if (item->type == ROD)
1774	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));
…		…
1779	}	1618	}
1780	}	1619	}
1781		1620
1782	if (cast_spell (op, item, dir, item->inv, NULL))	1621	if (cast_spell (op, item, dir, item->inv, NULL))
1783	{	1622	{
1784	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
1785	if (item->type == WAND)	1625	if (item->type == WAND)
1786	{	1626	{
1787	if (!(--item->stats.food))	1627	if (!(--item->stats.food))
1788	{	1628	{
1789	object *tmp;	1629	object *tmp;
…		…
1793	CLEAR_FLAG (item, FLAG_ANIMATE);	1633	CLEAR_FLAG (item, FLAG_ANIMATE);
1794	item->face = item->arch->face;	1634	item->face = item->arch->face;
1795	item->set_speed (0);	1635	item->set_speed (0);
1796	}	1636	}
1797		1637
1798	if ((tmp = item->in_player ()))	1638	if (object *pl = item->visible_to ())
1799	esrv_update_item (UPD_ANIM, tmp, item);	1639	esrv_update_item (UPD_ANIM, pl, item);
1800	}	1640	}
1801	}	1641	}
1802	else if (item->type == ROD || item->type == HORN)	1642	else if (item->type == ROD || item->type == HORN)
1803	drain_rod_charge (item);	1643	drain_rod_charge (item);
1804	}	1644	}
…		…
1809	bool	1649	bool
1810	fire (object *op, int dir)	1650	fire (object *op, int dir)
1811	{	1651	{
1812	int spellcost = 0;	1652	int spellcost = 0;
1813		1653
1814	/* check for loss of invisiblity/hide */
1815	if (action_makes_visible (op))
1816	make_visible (op);
1817
1818	player *pl = op->contr;	1654	player *pl = op->contr;
1819		1655
1820	if (pl->golem)	1656	if (pl->golem)
1821	{	1657	{
1822	control_golem (op->contr->golem, dir);	1658	control_golem (op->contr->golem, dir);
…		…
1824	}	1660	}
1825		1661
1826	object *ob = pl->ranged_ob;	1662	object *ob = pl->ranged_ob;
1827		1663
1828	if (!ob)	1664	if (!ob)
1829	return false;
1830
1831	if (!op->change_weapon (ob))
1832	return false;	1665	return false;
1833		1666
1834	if (op->speed_left > 0.f)	1667	if (op->speed_left > 0.f)
1835	--op->speed_left;	1668	--op->speed_left;
1836	else	1669	else
1837	return false;	1670	return false;
1838		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
1839	switch (ob->type)	1679	switch (ob->type)
1840	{	1680	{
1841	case BOW:	1681	case BOW:
1842	player_fire_bow (op, dir);	1682	player_fire_bow (op, dir);
1843	break;	1683	break;
1844		1684
1845	case SPELL:	1685	case SPELL:
1846	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);
1847	break;	1687	break;
1848		1688
1849	case BUILDER:	1689	case BUILDER:
1850	apply_map_builder (op, dir);	1690	apply_map_builder (op, dir);
1851	break;	1691	break;
…		…
1860	}	1700	}
1861		1701
1862	return true;	1702	return true;
1863	}	1703	}
1864		1704
1865	/* find_key	1705	static object *
1866	* We try to find a key for the door as passed. If we find a key
1867	* and successfully use it, we return the key, otherwise NULL
1868	* This function merges both normal and locked door, since the logic
1869	* for both is the same - just the specific key is different.
1870	* pl is the player,
1871	* inv is the objects inventory to searched
1872	* door is the door we are trying to match against.
1873	* This function can be called recursively to search containers.
1874	*/
1875	object *
1876	find_key (object *pl, object *container, object *door)	1706	find_key_ (object *pl, object *container, object *door)
1877	{	1707	{
1878	object *tmp, *key;	1708	object *tmp, *key;
1879		1709
1880	/* Should not happen, but sanity checking is never bad */	1710	/* Should not happen, but sanity checking is never bad */
1881	if (!container->inv)	1711	if (!container->inv)
…		…
1884	/* 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 */
1885	for (tmp = container->inv; tmp; tmp = tmp->below)	1715	for (tmp = container->inv; tmp; tmp = tmp->below)
1886	{	1716	{
1887	if (door->type == DOOR && tmp->type == KEY)	1717	if (door->type == DOOR && tmp->type == KEY)
1888	break;	1718	break;
		1719
1889	/* For sanity, we should really check door type, but other stuff	1720	/* For sanity, we should really check door type, but other stuff
1890	* (like containers) can be locked with special keys	1721	* (like containers) can be locked with special keys
1891	*/	1722	*/
1892	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1723	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1893	break;	1724	break;
…		…
1899	* a key, return	1730	* a key, return
1900	*/	1731	*/
1901	if (!tmp)	1732	if (!tmp)
1902	{	1733	{
1903	for (tmp = container->inv; tmp; tmp = tmp->below)	1734	for (tmp = container->inv; tmp; tmp = tmp->below)
1904	{
1905	/* No reason to search empty containers */	1735	/* No reason to search empty containers */
1906	if (tmp->type == CONTAINER && tmp->inv)	1736	if (tmp->type == CONTAINER && tmp->inv)
1907	{
1908	if ((key = find_key (pl, tmp, door)))	1737	if ((key = find_key_ (pl, tmp, door)))
1909	return key;	1738	return key;
1910	}
1911	}
1912		1739
1913	if (!tmp)	1740	if (!tmp)
1914	return NULL;	1741	return 0;
1915	}	1742	}
1916		1743
1917	/* 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,
1918	* see if we actually want to use it	1745	* see if we actually want to use it
1919	*/	1746	*/
1920	if (pl != container)	1747	if (pl != container)
1921	{	1748	{
1922	/* Only let players use keys in containers */	1749	/* Only let players use keys in containers */
1923	if (!pl->contr)	1750	if (!pl->contr)
1924	return NULL;	1751	return 0;
		1752
1925	/* cases where this fails:	1753	/* cases where this fails:
1926	* If we only search the player inventory, return now since we	1754	* If we only search the player inventory, return now since we
1927	* are not in the players inventory.	1755	* are not in the players inventory.
1928	* If the container is not active, return now since only active	1756	* If the container is not active, return now since only active
1929	* containers can be used.	1757	* containers can be used.
…		…
1933	* inv must have been an container and must have been active.	1761	* inv must have been an container and must have been active.
1934	*	1762	*
1935	* Change the color so that the message doesn't disappear with	1763	* Change the color so that the message doesn't disappear with
1936	* all the others.	1764	* all the others.
1937	*/	1765	*/
1938	if (pl->contr->usekeys == key_inventory ||	1766	if (pl->contr->usekeys == key_inventory
1939	!QUERY_FLAG (container, FLAG_APPLIED) ||	1767	|| !QUERY_FLAG (container, FLAG_APPLIED)
1940	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1768	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1941	{	1769	{
1942	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1770	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1943	"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));
1944	return NULL;	1772	return NULL;
1945	}	1773	}
1946	}	1774	}
1947		1775
1948	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);
1949	}	1802	}
1950		1803
1951	/* moved door processing out of move_player_attack.	1804	/* moved door processing out of move_player_attack.
1952	* returns 1 if player has opened the door with a key	1805	* returns 1 if player has opened the door with a key
1953	* such that the caller should not do anything more,	1806	* such that the caller should not do anything more,
…		…
1980	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);
1981	remove_door2 (door); /* remove door without violence ;-) */	1834	remove_door2 (door); /* remove door without violence ;-) */
1982	}	1835	}
1983		1836
1984	/* Do this after we print the message */	1837	/* Do this after we print the message */
1985	decrease_ob (key); /* Use up one of the keys */	1838	key->decrease (); /* Use up one of the keys */
1986	/* Need to update the weight the container the key was in */
1987	if (container != op)
1988	esrv_update_item (UPD_WEIGHT, op, container);
1989		1839
1990	return 1; /* Nothing more to do below */	1840	return 1; /* Nothing more to do below */
1991	}	1841	}
1992	else if (door->type == LOCKED_DOOR)	1842	else if (door->type == LOCKED_DOOR)
1993	{	1843	{
…		…
2006	* going to try and move (not fire weapons).	1856	* going to try and move (not fire weapons).
2007	*/	1857	*/
2008	bool	1858	bool
2009	move_player_attack (object *op, int dir)	1859	move_player_attack (object *op, int dir)
2010	{	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
2011	int on_battleground;	1867	int on_battleground;
2012		1868
2013	sint16 nx = freearr_x[dir] + op->x;	1869	sint16 nx = freearr_x[dir] + op->x;
2014	sint16 ny = freearr_y[dir] + op->y;	1870	sint16 ny = freearr_y[dir] + op->y;
2015		1871
2016	on_battleground = op_on_battleground (op, 0, 0);	1872	on_battleground = op_on_battleground (op, 0, 0);
2017		1873
2018	if (out_of_map (op->map, nx, ny))	1874	if (out_of_map (op->map, nx, ny))
2019	return false;	1875	return false;
2020
2021	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2022	{
2023	--op->speed_left;
2024	return true;
2025	}
2026		1876
2027	/* 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
2028	* 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
2029	* 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
2030	* player. This is a pretty nasty hack, because if we could	1880	* player. This is a pretty nasty hack, because if we could
…		…
2090	--op->speed_left;	1940	--op->speed_left;
2091		1941
2092	op->play_sound (sound_find ("push_player"));	1942	op->play_sound (sound_find ("push_player"));
2093	push_ob (mon, dir, op);	1943	push_ob (mon, dir, op);
2094		1944
2095	if (op->contr->tmp_invis || op->hide)	1945	if (action_makes_visible (op))
2096	make_visible (op);	1946	make_visible (op);
2097		1947
2098	return true;	1948	return true;
2099	}	1949	}
2100	else	1950	else
…		…
2122	push_ob (mon, dir, op);	1972	push_ob (mon, dir, op);
2123	}	1973	}
2124	else	1974	else
2125	op->statusmsg ("You withhold your attack");	1975	op->statusmsg ("You withhold your attack");
2126		1976
2127	if (op->contr->tmp_invis || op->hide)	1977	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2128	make_visible (op);	1978	make_visible (op);
2129		1979
2130	return true;	1980	return true;
2131	}	1981	}
2132	}	1982	}
…		…
2172	}	2022	}
2173		2023
2174	bool	2024	bool
2175	move_player (object *op, int dir)	2025	move_player (object *op, int dir)
2176	{	2026	{
2177	int pick;
2178
2179	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2027	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2180	return 0;	2028	return 0;
2181		2029
2182	/* Sanity check: make sure dir is valid */	2030	/* Sanity check: make sure dir is valid */
2183	if ((dir < 0) || (dir >= 9))	2031	if ((dir < 0) || (dir >= 9))
2184	{	2032	{
…		…
2190	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2038	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2191	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2039	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2192		2040
2193	op->facing = dir;	2041	op->facing = dir;
2194		2042
2195	if (op->hide)	2043	if (op->flag [FLAG_HIDDEN])
2196	do_hidden_move (op);	2044	do_hidden_move (op);
2197		2045
2198	bool retval;	2046	bool retval;
		2047	int pick = 0;
2199		2048
2200	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2049	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2201	retval = RESULT_INT (0);	2050	retval = RESULT_INT (0);
2202	else if (op->contr->fire_on)	2051	else if (op->contr->fire_on)
2203	retval = fire (op, dir);	2052	retval = fire (op, dir);
…		…
2260	return move_player (op, op->direction);	2109	return move_player (op, op->direction);
2261		2110
2262	return false;	2111	return false;
2263	}	2112	}
2264		2113
2265	int	2114	static int
2266	save_life (object *op)	2115	save_life (object *op)
2267	{	2116	{
2268	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2117	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2269	return 0;	2118	return 0;
2270		2119
…		…
2272	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2121	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2273	{	2122	{
2274	op->play_sound (sound_find ("ob_evaporate"));	2123	op->play_sound (sound_find ("ob_evaporate"));
2275	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));
2276		2125
2277	if (op->contr)
2278	esrv_del_item (op->contr, tmp->count);
2279
2280	tmp->destroy ();	2126	tmp->destroy ();
2281	CLEAR_FLAG (op, FLAG_LIFESAVE);	2127	CLEAR_FLAG (op, FLAG_LIFESAVE);
2282		2128
2283	if (op->stats.hp < 0)	2129	if (op->stats.hp < 0)
2284	op->stats.hp = op->stats.maxhp;	2130	op->stats.hp = op->stats.maxhp;
…		…
2296	return 0;	2142	return 0;
2297	}	2143	}
2298		2144
2299	/* 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
2300	* 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
2301	* 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
2302	* from.	2148	* from.
2303	*/	2149	*/
2304	static void	2150	static void
2305	drop_unpaid_items (object *op, object *env)	2151	drop_unpaid_items (object *op, object *env)
2306	{	2152	{
2307	while (op)	2153	while (op)
2308	{	2154	{
2309	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' */
2310		2156
2311	if (QUERY_FLAG (op, FLAG_UNPAID))	2157	if (QUERY_FLAG (op, FLAG_UNPAID))
2312	{
2313	if (env->type == PLAYER)
2314	esrv_del_item (env->contr, op->count);
2315
2316	op->insert_at (env);	2158	op->insert_at (env);
2317	}
2318	else if (op->inv)	2159	else if (op->inv)
2319	drop_unpaid_items (op->inv, env);	2160	drop_unpaid_items (op->inv, env);
2320		2161
2321	op = next;	2162	op = next;
2322	}	2163	}
…		…
2325	void	2166	void
2326	object::drop_unpaid_items ()	2167	object::drop_unpaid_items ()
2327	{	2168	{
2328	if (!flag [FLAG_REMOVED])	2169	if (!flag [FLAG_REMOVED])
2329	::drop_unpaid_items (inv, this);	2170	::drop_unpaid_items (inv, this);
2330	}
2331
2332	/*
2333	* Returns pointer a static string containing gravestone text
2334	* Moved from apply.c to player.c - player.c is what
2335	* actually uses this function. player.c may not be quite the
2336	* best, a misc file for object actions is probably better,
2337	* but there isn't one in the server directory.
2338	*/
2339	char *
2340	gravestone_text (object *op)
2341	{
2342	static char buf2[MAX_BUF];
2343	char buf[MAX_BUF];
2344	time_t now = time (NULL);
2345
2346	strcpy (buf2, " R.I.P.\n\n");
2347	if (op->type == PLAYER)
2348	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2349	else
2350	sprintf (buf, "%s\n", &op->name);
2351
2352	strncat (buf2, " ", 20 - strlen (buf) / 2);
2353	strcat (buf2, buf);
2354	if (op->type == PLAYER)
2355	sprintf (buf, "who was in level %d when killed\n", op->level);
2356	else
2357	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2358
2359	strncat (buf2, " ", 20 - strlen (buf) / 2);
2360	strcat (buf2, buf);
2361	if (op->type == PLAYER)
2362	{
2363	sprintf (buf, "by %s.\n\n", op->contr->killer);
2364	strncat (buf2, " ", 21 - strlen (buf) / 2);
2365	strcat (buf2, buf);
2366	}
2367
2368	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2369	strncat (buf2, " ", 20 - strlen (buf) / 2);
2370	strcat (buf2, buf);
2371
2372	return buf2;
2373	}	2171	}
2374		2172
2375	void	2173	void
2376	do_some_living (object *op)	2174	do_some_living (object *op)
2377	{	2175	{
…		…
2532	{	2330	{
2533	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2331	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2534		2332
2535	if (over_hp > 0)	2333	if (over_hp > 0)
2536	{	2334	{
2537	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;
2538	op->last_heal = 0;	2336	op->last_heal = 0;
2539	}	2337	}
2540	else	2338	else
2541	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);
2542	}	2340	}
…		…
2558	op->stats.food--;	2356	op->stats.food--;
2559	}	2357	}
2560		2358
2561	if (op->stats.food < 0 && op->stats.hp >= 0)	2359	if (op->stats.food < 0 && op->stats.hp >= 0)
2562	{	2360	{
2563	object *tmp, *flesh = 0;	2361	object *flesh = 0;
2564		2362
2565	for (tmp = op->inv; tmp; tmp = tmp->below)	2363	for_inv_removable (op, tmp)
2566	{	2364	{
2567	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)
2568	{	2369	{
2569	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2370	op->statusmsg ("You blindly grab for a bite of food. "
2570	{	2371	"H<To prevent you from starving, you ate some random item from your backpack.>");
2571	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2572	manual_apply (op, tmp, 0);	2372	manual_apply (op, tmp, 0);
		2373
2573	if (op->stats.food >= 0 || op->stats.hp < 0)	2374	if (op->stats.food >= 0 || op->stats.hp < 0)
2574	break;	2375	break;
2575	}	2376	}
2576	else if (tmp->type == FLESH)	2377	else if (tmp->type == FLESH)
2577	flesh = tmp;	2378	flesh = tmp;
2578	} /* End if paid for object */	2379	}
2579	} /* end of for loop */
2580		2380
2581	/* 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
2582	* eat flesh instead.	2382	* eat flesh instead.
2583	*/	2383	*/
2584	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2384	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2585	{	2385	{
2586	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.>");
2587	manual_apply (op, flesh, 0);	2388	manual_apply (op, flesh, 0);
2588	}	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.>");
2589	}	2395	}
2590		2396
2591	if (op->stats.food < 0)	2397	if (op->stats.food < 0)
2592	{	2398	{
2593	op->stats.hp += op->stats.food;	2399	op->stats.hp += op->stats.food;
2594	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 ();
2595	}	2406	}
		2407	}
2596		2408
		2409	/* killer should be set here already */
2597	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2410	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2598	kill_player (op);	2411	kill_player (op);
2599	}	2412	}
2600	}	2413	}
2601		2414
…		…
2606	*/	2419	*/
2607	void	2420	void
2608	kill_player (object *op)	2421	kill_player (object *op)
2609	{	2422	{
2610	int x, y;	2423	int x, y;
2611	char buf[MAX_BUF];
2612	maptile *map; /* this is for resurrection */	2424	maptile *map; /* this is for resurrection */
2613	int will_kill_again;	2425	int will_kill_again;
2614	archetype *at;	2426	archetype *at;
2615	object *tmp;	2427	object *tmp;
2616		2428
2617	if (save_life (op))	2429	if (save_life (op))
2618	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	}
2619		2469
2620	/* 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
2621	* 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.
2622	* Look at op_on_battleground() for more info --AndreasV	2472	* Look at op_on_battleground() for more info --AndreasV
2623	*/	2473	*/
2624	if (op_on_battleground (op, &x, &y))	2474	if (op_on_battleground (op, &x, &y))
2625	{	2475	{
2626	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";
2627	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2628
2629	/* restore player */
2630	at = archetype::find ("poisoning");
2631	if (object *tmp = present_arch_in_ob (at, op))
2632	{
2633	tmp->destroy ();
2634	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2635	}
2636
2637	at = archetype::find ("confusion");
2638	if (object *tmp = present_arch_in_ob (at, op))
2639	{
2640	tmp->destroy ();
2641	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2642	}
2643
2644	cure_disease (op, 0, 0); /* remove any disease */
2645	op->stats.hp = op->stats.maxhp;
2646	if (op->stats.food <= 0)
2647	op->stats.food = 999;
2648		2477
2649	/* create a bodypart-trophy to make the winner happy */	2478	/* create a bodypart-trophy to make the winner happy */
2650	if (object *tmp = arch_to_object (archetype::find ("finger")))	2479	object *tmp = archetype::find (shstr_finger)->instance ();
2651	{	2480
2652	tmp->name = format ("%s's finger" , &op->name);	2481	tmp->name = format ("%s's finger" , &op->name);
2653	tmp->name_pl = format ("%s's fingers", &op->name);	2482	tmp->name_pl = format ("%s's fingers", &op->name);
2654	tmp->msg = format (	2483	tmp->msg = format (
2655	"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",
2656	&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 ()
2657	);	2488	);
2658	tmp->value = 0, tmp->type = 0;	2489	tmp->value = 0, tmp->type = 0;
2659	tmp->materialname = "organics";	2490	tmp->material = name_to_material (shstr_organic);
2660	tmp->insert_at (op, tmp);	2491	tmp->insert_at (op, tmp);
2661	}
2662		2492
2663	/* teleport defeated player to new destination */	2493	/* teleport defeated player to new destination */
2664	transfer_ob (op, x, y, 0, NULL);	2494	transfer_ob (op, x, y, 0, NULL);
2665	op->contr->braced = 0;	2495	op->contr->braced = 0;
		2496
		2497	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2666	return;	2498	return;
2667	}	2499	}
2668		2500
		2501	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2502	deathtab << "T<YOU HAVE DIED>\n\n";
		2503
2669	INVOKE_PLAYER (DEATH, op->contr);	2504	INVOKE_PLAYER (DEATH, op->contr);
2670		2505
2671	command_kill_pets (op, 0);	2506	command_kill_pets (op, 0);
2672
2673	if (op->stats.food < 0)
2674	strcpy (op->contr->killer, "starvation");
2675		2507
2676	op->contr->play_sound (sound_find ("player_dies"));	2508	op->contr->play_sound (sound_find ("player_dies"));
2677		2509
2678	/* save the map location for corpse, gravestone */	2510	/* save the map location for corpse, gravestone */
2679	x = op->x;	2511	x = op->x;
…		…
2709		2541
2710	lost_a_stat = 0;	2542	lost_a_stat = 0;
2711		2543
2712	for (z = 0; z < num_stats_lose; z++)	2544	for (z = 0; z < num_stats_lose; z++)
2713	{	2545	{
2714	i = RANDOM () % NUM_STATS;	2546	i = rndm (NUM_STATS);
2715		2547
2716	if (settings.stat_loss_on_death)	2548	if (settings.stat_loss_on_death)
2717	{	2549	{
2718	/* 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
2719	* what he lost.	2551	* what he lost.
…		…
2726	lost_a_stat = 1;	2558	lost_a_stat = 1;
2727	}	2559	}
2728	else	2560	else
2729	{	2561	{
2730	/* deplete a stat */	2562	/* deplete a stat */
2731	archetype *deparch = archetype::find ("depletion");	2563	archetype *deparch = archetype::find (shstr_depletion);
2732	object *dep;	2564	object *dep;
2733		2565
2734	dep = present_arch_in_ob (deparch, op);	2566	dep = present_arch_in_ob (deparch, op);
2735	if (!dep)	2567	if (!dep)
2736	{	2568	{
2737	dep = arch_to_object (deparch);	2569	dep = deparch->instance ();
2738	insert_ob_in_ob (dep, op);	2570	insert_ob_in_ob (dep, op);
2739	}	2571	}
2740	lose_this_stat = 1;	2572	lose_this_stat = 1;
2741	if (settings.balanced_stat_loss)	2573	if (settings.balanced_stat_loss)
2742	{	2574	{
…		…
2770	}	2602	}
2771	}	2603	}
2772		2604
2773	if (lose_this_stat)	2605	if (lose_this_stat)
2774	{	2606	{
2775	this_stat = get_attr_value (&(dep->stats), i);	2607	this_stat = get_attr_value (&dep->stats, i);
2776	/* We could try to do something clever like find another	2608	/* We could try to do something clever like find another
2777	* stat to reduce if this fails. But chances are, if	2609	* stat to reduce if this fails. But chances are, if
2778	* stats have been depleted to -50, all are pretty low	2610	* stats have been depleted to -50, all are pretty low
2779	* 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
2780	* difference.	2612	* difference.
…		…
2788	lost_a_stat = 1;	2620	lost_a_stat = 1;
2789	}	2621	}
2790	}	2622	}
2791	}	2623	}
2792	}	2624	}
		2625
2793	/* If no stat lost, tell the player. */	2626	/* If no stat lost, tell the player. */
2794	if (!lost_a_stat)	2627	if (!lost_a_stat)
2795	{	2628	{
2796	/* determine_god() seems to not work sometimes... why is this?	2629	/* determine_god() seems to not work sometimes... why is this?
2797	Should I be using something else? GD */	2630	Should I be using something else? GD */
2798	const char *god = determine_god (op);	2631	shstr_tmp god = determine_god (op);
2799		2632
2800	if (god && (strcmp (god, "none")))	2633	if (god != shstr_none)
2801	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";
2802	else	2635	else
2803	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";
2804	}	2637	}
2805	#else	2638	#else
2806	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.";
2807	#endif	2640	#endif
2808		2641
2809	/* Put a gravestone up where the character 'almost' died. List the	2642	/* Put a gravestone up where the character 'almost' died. List the
2810	* exp loss on the stone.	2643	* exp loss on the stone.
2811	*/	2644	*/
2812	tmp = arch_to_object (archetype::find ("gravestone"));	2645	tmp = archetype::find (shstr_gravestone)->instance ();
2813	sprintf (buf, "%s's gravestone", &op->name);	2646	tmp->name = format ("%s's gravestone", &op->name);
2814	tmp->name = buf;	2647	tmp->name_pl = format ("%s's gravestones", &op->name);
2815	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",
2816	tmp->name_pl = buf;	2649	&op->name, op->contr->title, op->contr->killer_name ());
2817	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);
2818	tmp->msg = buf;
2819	tmp->x = op->x, tmp->y = op->y;	2650	tmp->x = op->x, tmp->y = op->y;
2820	insert_ob_in_map (tmp, op->map, NULL, 0);	2651	insert_ob_in_map (tmp, op->map, NULL, 0);
2821		2652
2822	/**************************************/	2653	/**************************************/
2823	/* */	2654	/* */
2824	/* Subtract the experience points, */	2655	/* Subtract the experience points, */
2825	/* if we died cause of food, give us */
2826	/* food, and reset HP's... */
2827	/* */	2656	/* */
2828	/**************************************/	2657	/**************************************/
2829		2658
2830	/* remove any poisoning and confusion the character may be suffering. */
2831	/* restore player */
2832	at = archetype::find ("poisoning");
2833	tmp = present_arch_in_ob (at, op);
2834
2835	if (tmp)
2836	{
2837	tmp->destroy ();
2838	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2839	}
2840
2841	at = archetype::find ("confusion");
2842	tmp = present_arch_in_ob (at, op);
2843	if (tmp)
2844	{
2845	tmp->destroy ();
2846	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2847	}
2848
2849	cure_disease (op, 0, 0); /* remove any disease */
2850
2851	/*add_exp(op, (op->stats.exp * -0.20)); */	2659	/*add_exp(op, (op->stats.exp * -0.20)); */
2852	apply_death_exp_penalty (op);	2660	apply_death_exp_penalty (op);
2853	if (op->stats.food < 100)
2854	op->stats.food = 900;
2855	op->stats.hp = op->stats.maxhp;
2856	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2857	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2858		2661
2859	/*	2662	/*
2860	* 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
2861	* and put them back in the map.	2664	* and put them back in the map.
2862	*/	2665	*/
…		…
2897	if (will_kill_again & (1 << at))	2700	if (will_kill_again & (1 << at))
2898	force->resist[at] = 100;	2701	force->resist[at] = 100;
2899		2702
2900	insert_ob_in_ob (force, op);	2703	insert_ob_in_ob (force, op);
2901	op->update_stats ();	2704	op->update_stats ();
2902
2903	}	2705	}
2904		2706
2905	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2707	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2906	}	2708	}
2907		2709
2908	void	2710	static void
2909	loot_object (object *op)	2711	loot_object (object *op)
2910	{ /* Grab and destroy some treasure */	2712	{ /* Grab and destroy some treasure */
2911	object *tmp, *tmp2, *next;	2713	object *tmp, *tmp2, *next;
2912		2714
2913	op->close_container (); /* close open sack first */	2715	op->close_container (); /* close open sack first */
…		…
2927		2729
2928	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))))
2929	{	2731	{
2930	if (tmp->nrof > 1)	2732	if (tmp->nrof > 1)
2931	{	2733	{
2932	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2734	tmp->decrease (rndm (1, tmp->nrof - 1));
2933	tmp2->destroy ();
2934	insert_ob_in_map (tmp, op->map, NULL, 0);	2735	insert_ob_in_map (tmp, op->map, NULL, 0);
2935	}	2736	}
2936	else	2737	else
2937	tmp->destroy ();	2738	tmp->destroy ();
2938	}	2739	}
…		…
2945	* fix_weight(): Check recursively the weight of all players, and fix	2746	* fix_weight(): Check recursively the weight of all players, and fix
2946	* 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
2947	* was changed.	2748	* was changed.
2948	*/	2749	*/
2949	void	2750	void
2950	fix_weight (void)	2751	fix_weight ()
2951	{	2752	{
2952	for_all_players (pl)	2753	for_all_players (pl)
2953	{	2754	{
2954	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2755	sint32 old = pl->ob->carrying;
2955		2756
2956	if (old == sum)	2757	pl->ob->update_weight ();
2957	continue;	2758
		2759	if (old != pl->ob->carrying)
		2760	{
2958	pl->ob->update_stats ();	2761	pl->ob->update_stats ();
2959	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	}
2960	}	2764	}
2961	}	2765	}
2962		2766
2963	void	2767	void
2964	fix_luck (void)	2768	fix_luck ()
2965	{	2769	{
2966	for_all_players (pl)	2770	for_all_players (pl)
2967	if (!pl->ob->contr->ns->state)	2771	if (!pl->ob->contr->ns->state)
2968	pl->ob->change_luck (0);	2772	pl->ob->change_luck (0);
2969	}	2773	}
…		…
3006	}	2810	}
3007		2811
3008	void	2812	void
3009	make_visible (object *op)	2813	make_visible (object *op)
3010	{	2814	{
3011	op->hide = 0;	2815	op->flag [FLAG_HIDDEN] = 0;
3012	op->invisible = 0;	2816	op->invisible = 0;
3013		2817
3014	if (op->type == PLAYER)	2818	if (op->type == PLAYER)
3015	{	2819	{
3016	op->contr->tmp_invis = 0;	2820	op->contr->tmp_invis = 0;
…		…
3041		2845
3042	if (!ob || !ob->map)	2846	if (!ob || !ob->map)
3043	return 0;	2847	return 0;
3044		2848
3045	/* so, on normal lighted maps, its hard to hide */	2849	/* so, on normal lighted maps, its hard to hide */
3046	level = ob->map->darkness - 2;	2850	level = ob->map->darklevel () - 2;
3047		2851
3048	/* this also picks up whether the object is glowing.	2852	/* this also picks up whether the object is glowing.
3049	* 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
3050	* as bad as carrying a light on a pitch dark map */	2854	* as bad as carrying a light on a pitch dark map */
3051	if (has_carried_lights (ob))	2855	if (ob->has_carried_lights ())
3052	level = -(10 + (2 * ob->map->darkness));	2856	level = -(10 + (2 * ob->map->darklevel ()));
3053		2857
3054	/* scan through all nearby squares for terrain to hide in */	2858	/* scan through all nearby squares for terrain to hide in */
3055	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2859	for (i = 0, x = ob->x, y = ob->y;
		2860	i <= SIZEOFFREE1;
		2861	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3056	{	2862	{
3057	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2863	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3058	if (mflag & P_OUT_OF_MAP)	2864	if (mflag & P_OUT_OF_MAP)
3059	{
3060	continue;	2865	continue;
3061	}	2866
3062	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2867	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3063	level += 2;	2868	level += 2;
3064	else /* open terrain! */	2869	else /* open terrain! */
3065	level -= 1;	2870	level -= 1;
3066	}	2871	}
…		…
3077	* spot (surrounded by clear terrain in broad daylight). -b.t.	2882	* spot (surrounded by clear terrain in broad daylight). -b.t.
3078	*/	2883	*/
3079	void	2884	void
3080	do_hidden_move (object *op)	2885	do_hidden_move (object *op)
3081	{	2886	{
3082	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2887	int hide = 0;
3083	object *skop;
3084		2888
3085	if (!op || !op->map)	2889	if (!op || !op->map)
3086	return;	2890	return;
3087		2891
3088	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);
3089		2894
3090	/* 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! */
3091	if (op->type == PLAYER && op->contr->run_on)	2896	if (op->type == PLAYER && op->contr->run_on)
3092	if (!skop || num >= skop->level)	2897	if (!skop || num >= skop->level)
3093	{	2898	{
…		…
3103	num -= hide;	2908	num -= hide;
3104		2909
3105	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2910	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3106	{	2911	{
3107	make_visible (op);	2912	make_visible (op);
		2913
3108	if (op->type == PLAYER)	2914	if (op->type == PLAYER)
3109	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!");
3110	}	2916	}
3111	else if (op->type == PLAYER && skop)	2917	else if (op->type == PLAYER && skop)
3112	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);
…		…
3202	while (op)	3008	while (op)
3203	{	3009	{
3204	dx = rv.distance_x + op->arch->x;	3010	dx = rv.distance_x + op->arch->x;
3205	dy = rv.distance_y + op->arch->y;	3011	dy = rv.distance_y + op->arch->y;
3206		3012
3207	/* only the viewable area the player sees is updated by LOS	3013	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3208	* code, so we need to restrict ourselves to that range of values
3209	* for any meaningful values.
3210	*/
3211	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3212	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3213	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3214	return 1;	3014	return 1;
3215		3015
3216	op = op->more;	3016	op = op->more;
3217	}
3218
3219	return 0;
3220	}
3221
3222	/* routine for both players and monsters. We call this when
3223	* there is a possibility for our action distrubing our hiding
3224	* place or invisiblity spell. Artefact invisiblity is not
3225	* effected by this. If we arent invisible to begin with, we
3226	* return 0.
3227	*/
3228	int
3229	action_makes_visible (object *op)
3230	{
3231	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3232	{
3233	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3234	return 0;
3235
3236	if (op->contr && op->contr->tmp_invis == 0)
3237	return 0;
3238
3239	/* If monsters, they should become visible */
3240	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3241	{
3242	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3243	return 1;
3244	}
3245	}	3017	}
3246		3018
3247	return 0;	3019	return 0;
3248	}	3020	}
3249		3021
…		…
3451	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3223	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3452	}	3224	}
3453	else	3225	else
3454	{	3226	{
3455	/* generate misc. treasure */	3227	/* generate misc. treasure */
3456	tmp = arch_to_object (tr->item);	3228	tmp = tr->item->instance ();
3457	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));
3458	tmp = insert_ob_in_ob (tmp, who);	3230	who->insert (tmp);
3459	if (who->type == PLAYER)
3460	esrv_send_item (who, tmp);
3461	}	3231	}
3462	}	3232	}
3463		3233
3464	/**	3234	/**
3465	* 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
…		…
3476		3246
3477	if (pl->ranged_ob == ob)	3247	if (pl->ranged_ob == ob)
3478	pl->ranged_ob = 0;	3248	pl->ranged_ob = 0;
3479	}	3249	}
3480		3250
		3251	//-GPL
		3252
3481	sint8	3253	sint8
3482	player::visibility_at (maptile *map, int x, int y) const	3254	player::darkness_at (maptile *map, int x, int y) const
3483	{	3255	{
3484	if (!ns)	3256	if (!ns)
3485	return 0;	3257	return LOS_BLOCKED;
3486		3258
3487	int dx, dy;	3259	int dx, dy;
3488	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3260	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3489	return 0;	3261	return LOS_BLOCKED;
3490		3262
3491	x += dx - ns->current_x + ns->mapx / 2;	3263	x += dx - ns->current_x;
3492	y += dy - ns->current_y + ns->mapy / 2;	3264	y += dy - ns->current_y;
3493		3265
3494	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3495	return 0;
3496
3497	return 100 - blocked_los [x][y];	3266	return blocked_los (x, y);
3498	}	3267	}
3499		3268
3500	void	3269	void
3501	player::infobox (const char *title, const char *msg, int color)	3270	player::infobox (const char *title, const char *msg, int color)
3502	{	3271	{

Diff Legend

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