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.152 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.233 by root, Mon Oct 12 14:00:59 2009 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 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	* Crossfire TRT 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 <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <sproto.h>	26	#include <sproto.h>
26	#include <sounds.h>	27	#include <sounds.h>
…		…
122	continue;	123	continue;
123		124
124	if (*buf == '%')	125	if (*buf == '%')
125	{ /* send one news */	126	{ /* send one news */
126	if (size > 0)	127	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	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
		129	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
		130	"INFORMATION: %s\n%s", (char *)"%s\n%s",
		131	subject, news); /*send previously read news */
128		132
129	strcpy (subject, buf + 1);	133	strcpy (subject, buf + 1);
130	strip_endline (subject);	134	strip_endline (subject);
131	size = 0;	135	size = 0;
132	news[0] = '\0';	136	news[0] = '\0';
…		…
183		187
184	if (ob->map)	188	if (ob->map)
185	maplevel = ob->map->path;	189	maplevel = ob->map->path;
186		190
187	ob->remove ();	191	ob->remove ();
		192	ob->enemy = 0; // sometimes keeps an extra refcount on itself
188	ob->map = 0;	193	ob->map = 0;
189	party = 0;	194	party = 0;
190		195
191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	196	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192		197
…		…
206	ob->close_container (); //TODO: client-specific	211	ob->close_container (); //TODO: client-specific
207		212
208	ns->update_look = 0;	213	ns->update_look = 0;
209	ns->look_position = 0;	214	ns->look_position = 0;
210		215
211	clear_los (this);	216	clear_los ();
212		217
213	ns->reset_stats ();	218	ns->reset_stats ();
214		219
215	/* make sure he's a player -- needed because of class change. */	220	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	221	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->race;	222	ob->race = ob->arch->race;
218		223
219	ob->carrying = sum_weight (ob);	224	ob->update_weight ();
220	link_player_skills (ob);	225	link_skills ();
221		226
222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	227	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223		228
224	assign (title, ob->arch->object::name);	229	assign (title, ob->arch->object::name);
225		230
226	/* if it's a dragon player, set the correct title here */	231	/* if it's a dragon player, set the correct title here */
227	if (is_dragon_pl (ob))	232	if (is_dragon_pl (ob))
228	{	233	{
229	object *tmp, *abil = 0, *skin = 0;	234	object *tmp, *abil = 0, *skin = 0;
230		235
231	shstr_cmp dragon_ability_force ("dragon_ability_force");
232	shstr_cmp dragon_skin_force ("dragon_skin_force");
233
234	for (tmp = ob->inv; tmp; tmp = tmp->below)	236	for (tmp = ob->inv; tmp; tmp = tmp->below)
235	if (tmp->type == FORCE)	237	if (tmp->type == FORCE)
236	if (tmp->arch->archname == dragon_ability_force)	238	if (tmp->arch->archname == shstr_dragon_ability_force)
237	abil = tmp;	239	abil = tmp;
238	else if (tmp->arch->archname == dragon_skin_force)	240	else if (tmp->arch->archname == shstr_dragon_skin_force)
239	skin = tmp;	241	skin = tmp;
240		242
241	set_dragon_name (ob, abil, skin);	243	set_dragon_name (ob, abil, skin);
242	}	244	}
243		245
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	246	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		247
246	esrv_new_player (this, ob->weight + ob->carrying);	248	esrv_new_player (this);
		249
		250	ob->update_stats ();
		251
		252	ns->floorbox_update ();
		253	esrv_send_inventory (ob, ob);
		254	esrv_add_spells (this, 0);
		255
		256	activate ();
		257
		258	send_rules (ob);
		259	send_news (ob);
		260	display_motd (ob);
		261
		262	INVOKE_PLAYER (CONNECT, this);
		263	INVOKE_PLAYER (LOGIN, this);
		264	}
		265
		266	void
		267	player::disconnect ()
		268	{
		269	if (ob)
		270	{
		271	ob->close_container (); //TODO: client-specific
		272	ob->drop_unpaid_items ();
		273	}
		274
		275	if (ns)
		276	{
		277	if (active)
		278	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		279
		280	INVOKE_PLAYER (DISCONNECT, this);
		281
		282	ns->reset_stats ();
		283	ns->pl = 0;
		284	ns = 0;
		285	}
		286
		287	observe = ob;
		288
		289	deactivate ();
		290	}
		291
		292	// the need for this function can be explained
		293	// by load_object not returning the object
		294	void
		295	player::set_object (object *op)
		296	{
		297	ob = observe = op;
		298	ob->contr = this; /* this aren't yet in archetype */
		299
		300	ob->speed = 1.0f;
		301	ob->speed_left = 0.5f;
		302
		303	ob->direction = 5; /* So player faces south */
247		304
248	ob->flag [FLAG_READY_WEAPON] = false;	305	ob->flag [FLAG_READY_WEAPON] = false;
249	ob->flag [FLAG_READY_SKILL] = false;	306	ob->flag [FLAG_READY_SKILL] = false;
250	ob->flag [FLAG_READY_BOW] = false;	307	ob->flag [FLAG_READY_BOW] = false;
251		308
…		…
268	combat_ob = op;	325	combat_ob = op;
269	break;	326	break;
270	}	327	}
271		328
272	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	329	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273	ob->update_stats ();	330	ob->deactivate (); // change_weapon activates, fix this better
274
275	ns->floorbox_update ();
276	esrv_send_inventory (ob, ob);
277	esrv_add_spells (this, 0);
278
279	activate ();
280
281	send_rules (ob);
282	send_news (ob);
283	display_motd (ob);
284
285	INVOKE_PLAYER (CONNECT, this);
286	INVOKE_PLAYER (LOGIN, this);
287	}
288
289	void
290	player::disconnect ()
291	{
292	if (ns)
293	{
294	if (active)
295	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296
297	INVOKE_PLAYER (DISCONNECT, this);
298
299	ns->reset_stats ();
300	ns->pl = 0;
301	ns = 0;
302	}
303
304	if (ob)
305	ob->close_container (); //TODO: client-specific
306
307	observe = ob;
308
309	deactivate ();
310	}
311
312	// the need for this function can be explained
313	// by load_object not returning the object
314	void
315	player::set_object (object *op)
316	{
317	ob = observe = op;
318	ob->contr = this; /* this aren't yet in archetype */
319
320	ob->speed = 1.0f;
321	ob->speed_left = 0.5f;
322
323	ob->direction = 5; /* So player faces south */
324	}	331	}
325		332
326	void	333	void
327	player::set_observe (object *op)	334	player::set_observe (object *op)
328	{	335	{
…		…
342	savebed_map = first_map_path; /* Init. respawn position */	349	savebed_map = first_map_path; /* Init. respawn position */
343		350
344	gen_sp_armour = 10;	351	gen_sp_armour = 10;
345	bowtype = bow_normal;	352	bowtype = bow_normal;
346	petmode = pet_normal;	353	petmode = pet_normal;
347	listening = 10;
348	usekeys = containers;	354	usekeys = containers;
349	peaceful = 1; /* default peaceful */	355	peaceful = 1; /* default peaceful */
350	do_los = 1;	356	do_los = 1;
351		357
352	weapon_sp = 1.0f;	358	weapon_sp = 1.0f;
…		…
401	* Note: there MUST be at least one player archetype!	407	* Note: there MUST be at least one player archetype!
402	*/	408	*/
403	archetype *	409	archetype *
404	get_player_archetype (archetype *at)	410	get_player_archetype (archetype *at)
405	{	411	{
		412	// archetypes could have been reloaded
		413	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		414
		415	if (!nat)
		416	return at;
		417
406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	418	archvec::iterator i = archetypes.find (nat);
407		419
408	for (;;)	420	for (;;)
409	{	421	{
410	if (++i == archetypes.end ())	422	if (++i == archetypes.end ())
411	i = archetypes.begin ();	423	i = archetypes.begin ();
…		…
425	unsigned lastdist;	437	unsigned lastdist;
426	rv_vector rv;	438	rv_vector rv;
427		439
428	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	440	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429	{	441	{
430	/* We should not find free objects on this friendly list, but it
431	* does periodically happen. Given that, lets deal with it.
432	* While unlikely, it is possible the next object on the friendly
433	* list is also free, so encapsulate this in a while loop.
434	*/
435	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436	{
437	object *tmp = ol->ob;
438
439	/* Can't do much more other than log the fact, because the object
440	* itself will have been cleared.
441	*/
442	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443	tmp->debug_desc ());
444	ol = ol->next;
445	remove_friendly_object (tmp);
446	if (!ol)
447	return op;
448	}
449
450	/* Remove special check for player from this. First, it looks to cause
451	* some crashes (ol->ob->contr not set properly?), but secondly, a more
452	* complicated method of state checking would be needed in any case -
453	* as it was, a clever player could type quit, and the function would
454	* skip them over while waiting for confirmation. Remove
455	* on_same_map check, as can_detect_enemy also does this
456	*/
457	if (!can_detect_enemy (mon, ol->ob, &rv))	442	if (!can_detect_enemy (mon, ol->ob, &rv))
458	continue;	443	continue;
459		444
460	if (lastdist > rv.distance)	445	if (lastdist > rv.distance)
461	{	446	{
…		…
656		641
657	return firstdir;	642	return firstdir;
658	}	643	}
659		644
660	void	645	void
661	give_initial_items (object *pl, treasurelist * items)	646	give_initial_items (object *pl, treasurelist *items)
662	{	647	{
663	object *op, *next = NULL;
664
665	if (pl->randomitems != NULL)	648	if (pl->randomitems)
666	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	649	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667		650
668	for (op = pl->inv; op; op = next)	651	for (object *next, *op = pl->inv; op; op = next)
669	{	652	{
670	next = op->below;	653	next = op->below;
671		654
672	/* Forces get applied per default, unless they have the	655	/* Forces get applied per default, unless they have the
673	* flag "neutral" set. Sorry but I can't think of a better way	656	* flag "neutral" set. Sorry but I can't think of a better way
…		…
678	/* we never give weapons/armour if these cannot be used	661	/* we never give weapons/armour if these cannot be used
679	* by this player due to race restrictions	662	* by this player due to race restrictions
680	*/	663	*/
681	if (pl->type == PLAYER)	664	if (pl->type == PLAYER)
682	{	665	{
683	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	666	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		667	&&
684	(op->type == ARMOUR || op->type == BOOTS ||	668	(op->type == ARMOUR || op->type == BOOTS
685	op->type == CLOAK || op->type == HELMET ||	669	|| op->type == CLOAK || op->type == HELMET
686	op->type == SHIELD || op->type == GLOVES ||	670	|| op->type == SHIELD || op->type == GLOVES
		671	|| op->type == BRACERS || op->type == GIRDLE))
687	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	672	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
688	{	673	{
689	op->destroy ();	674	op->destroy ();
690	continue;	675	continue;
691	}	676	}
692	}	677	}
693		678
694	/* This really needs to be better - we should really give	679	/* Here we remove duplicated skills (as duplicated spell objects have
695	* a substitute spellbook. The problem is that we don't really	680	* _very_ confusing effects for players), which could for instance be
696	* have a good idea what to replace it with (need something like	681	* generated by bad treasurelists. - elmex
697	* a first level treasurelist for each skill.)
698	* remove duplicate skills also
699	*/	682	*/
700	if (op->type == SPELLBOOK || op->type == SKILL)	683	if (op->type == SKILL)
701	{	684	{
702	object *tmp;
703
704	for (tmp = op->below; tmp; tmp = tmp->below)	685	for (object *tmp = op->below; tmp; tmp = tmp->below)
705	if (tmp->type == op->type && tmp->name == op->name)	686	if (tmp->type == op->type && tmp->name == op->name)
706	break;
707
708	if (tmp)
709	{	687	{
710	op->destroy ();	688	op->destroy ();
		689	LOG (llevError,
711	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	690	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
712	continue;	691	break;
713	}	692	}
714		693
715	if (op->nrof > 1)	694	if (op->nrof > 1)
716	op->nrof = 1;	695	op->nrof = 1;
717	}	696	}
718		697
719	if (op->type == SPELLBOOK && op->inv)	698	if (op->type == SPELLBOOK && op->inv)
720	{
721	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	699	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722	}
723		700
724	/* Give starting characters identified, uncursed, and undamned	701	/* Give starting characters identified, uncursed, and undamned
725	* items. Just don't identify gold or silver, or it won't be	702	* items. Just don't identify gold or silver, or it won't be
726	* merged properly.	703	* merged properly.
727	*/	704	*/
728	if (need_identify (op))	705	if (need_identify (op))
729	{	706	{
730	SET_FLAG (op, FLAG_IDENTIFIED);	707	SET_FLAG (op, FLAG_IDENTIFIED);
731	CLEAR_FLAG (op, FLAG_CURSED);	708	CLEAR_FLAG (op, FLAG_CURSED);
732	CLEAR_FLAG (op, FLAG_DAMNED);	709	CLEAR_FLAG (op, FLAG_DAMNED);
733	}	710	}
		711
734	if (op->type == SPELL)	712	if (op->type == SPELL)
735	{	713	{
736	op->destroy ();	714	op->destroy ();
737	continue;	715	continue;
738	}	716	}
…		…
740	{	718	{
741	SET_FLAG (op, FLAG_CAN_USE_SKILL);	719	SET_FLAG (op, FLAG_CAN_USE_SKILL);
742	op->stats.exp = 0;	720	op->stats.exp = 0;
743	op->level = 1;	721	op->level = 1;
744	}	722	}
745	/* lock all 'normal items by default */	723	else /* lock all 'normal items by default */
746	else
747	SET_FLAG (op, FLAG_INV_LOCKED);	724	SET_FLAG (op, FLAG_INV_LOCKED);
748	} /* for loop of objects in player inv */	725	} /* for loop of objects in player inv */
749		726
750	/* Need to set up the skill pointers */	727	/* Need to set up the skill pointers */
751	link_player_skills (pl);	728	pl->contr->link_skills ();
752	}	729	}
753		730
754	void	731	void
755	get_party_password (object *op, partylist *party)	732	get_party_password (object *op, partylist *party)
756	{	733	{
…		…
857	static void	834	static void
858	start_info (object *op)	835	start_info (object *op)
859	{	836	{
860	char buf[MAX_BUF];	837	char buf[MAX_BUF];
861		838
862	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	839	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863	new_draw_info (NDI_UNIQUE, 0, op, buf);	840	new_draw_info (NDI_UNIQUE, 0, op, buf);
864	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865	//new_draw_info (NDI_UNIQUE, 0, op, " ");
866	}	841	}
867		842
868	/* This function takes the key that is passed, and does the	843	/* This function takes the key that is passed, and does the
869	* appropriate action with it (change race, or other things).	844	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	845	* The function name is for historical reasons - now we have
…		…
873	*/	848	*/
874	void	849	void
875	player::chargen_race_done ()	850	player::chargen_race_done ()
876	{	851	{
877	/* this must before then initial items are given */	852	/* this must before then initial items are given */
878	esrv_new_player (ob->contr, ob->weight + ob->carrying);	853	esrv_new_player (ob->contr);
879		854
880	treasurelist *tl = treasurelist::find ("starting_wealth");	855	treasurelist *tl = treasurelist::find ("starting_wealth");
881	if (tl)	856	if (tl)
882	create_treasure (tl, ob, 0, 0, 0);	857	create_treasure (tl, ob, 0, 0, 0);
883		858
…		…
887	ob->contr->ns->state = ST_PLAYING;	862	ob->contr->ns->state = ST_PLAYING;
888		863
889	if (ob->msg)	864	if (ob->msg)
890	ob->msg = 0;	865	ob->msg = 0;
891		866
892	/* We create this now because some of the unique maps will need it
893	* to save here.
894	*/
895	{
896	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);
899	}
900
901	start_info (ob);	867	start_info (ob);
902	CLEAR_FLAG (ob, FLAG_WIZ);	868	CLEAR_FLAG (ob, FLAG_WIZ);
903	give_initial_items (ob, ob->randomitems);	869	give_initial_items (ob, ob->randomitems);
904	link_player_skills (ob);
905	esrv_send_inventory (ob, ob);	870	esrv_send_inventory (ob, ob);
906	ob->update_stats ();	871	ob->update_stats ();
907		872
908	/* This moves the player to a different start map, if there	873	/* This moves the player to a different start map, if there
909	* is one for this race	874	* is one for this race
910	*/	875	*/
911	if (*first_map_ext_path)	876	if (*first_map_ext_path)
912	{	877	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
913	object *tmp;
914	char mapname[MAX_BUF];
915
916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917	tmp = object::create ();
918	EXIT_PATH (tmp) = mapname;
919	EXIT_X (tmp) = ob->x;
920	EXIT_Y (tmp) = ob->y;
921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
922	* if the map isn't there, then stay on the
923	* default initial map */
924	tmp->destroy ();
925	}
926	else	878	else
927	LOG (llevDebug, "first_map_ext_path not set\n");	879	LOG (llevDebug, "first_map_ext_path not set\n");
928	}	880	}
929		881
930	void	882	void
…		…
974	LOG (llevDebug, "Fleeing player is dead.\n");	926	LOG (llevDebug, "Fleeing player is dead.\n");
975	CLEAR_FLAG (op, FLAG_SCARED);	927	CLEAR_FLAG (op, FLAG_SCARED);
976	return;	928	return;
977	}	929	}
978		930
979	if (op->enemy == NULL)	931	if (!op->enemy)
980	{	932	{
981	LOG (llevDebug, "Fleeing player had no enemy.\n");	933	LOG (llevDebug, "Fleeing player had no enemy.\n");
982	CLEAR_FLAG (op, FLAG_SCARED);	934	CLEAR_FLAG (op, FLAG_SCARED);
983	return;	935	return;
984	}	936	}
985		937
986	/* Seen some crashes here. Since we don't store an
987	* op->enemy_count, it is possible that something destroys the
988	* actual enemy, and the object is recycled.
989	*/
990	if (op->enemy->map == NULL)
991	{
992	CLEAR_FLAG (op, FLAG_SCARED);
993	op->enemy = NULL;
994	return;
995	}
996
997	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	938	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
998	{	939	{
999	op->enemy = NULL;	940	op->enemy = NULL;
1000	CLEAR_FLAG (op, FLAG_SCARED);	941	CLEAR_FLAG (op, FLAG_SCARED);
1001	return;	942	return;
…		…
1004	get_rangevector (op, op->enemy, &rv, 0);	945	get_rangevector (op, op->enemy, &rv, 0);
1005		946
1006	dir = absdir (4 + rv.direction);	947	dir = absdir (4 + rv.direction);
1007	for (diff = 0; diff < 3; diff++)	948	for (diff = 0; diff < 3; diff++)
1008	{	949	{
1009	int m = 1 - (RANDOM () & 2);	950	int m = 1 - rndm (2) * 2;
1010		951
1011	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	952	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1012	return;	953	return;
1013	}	954	}
1014		955
…		…
1025	check_pick (object *op)	966	check_pick (object *op)
1026	{	967	{
1027	object *tmp, *next;	968	object *tmp, *next;
1028	int stop = 0;	969	int stop = 0;
1029	int wvratio;	970	int wvratio;
1030	char putstring[128];
1031		971
1032	/* if you're flying, you cna't pick up anything */	972	/* if you're flying, you cna't pick up anything */
1033	if (op->move_type & MOVE_FLYING)	973	if (op->move_type & MOVE_FLYING)
1034	return 1;	974	return 1;
1035		975
1036	next = op->below;	976	next = op->below;
1037		977
		978	int cnt = MAX_ITEM_PER_DROP;
		979	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		980
1038	/* loop while there are items on the floor that are not marked as	981	/* loop while there are items on the floor that are not marked as
1039	* destroyed */	982	* destroyed */
1040	while (next && !next->destroyed ())	983	while (next && !next->destroyed ())
1041	{	984	{
1042	tmp = next;	985	tmp = next;
1043	next = tmp->below;	986	next = tmp->below;
1044		987
		988	if (cnt <= 0)
		989	{
		990	op->failmsg ("Couldn't pickup all items at once.");
		991	return 0;
		992	}
		993
1045	if (op->destroyed ())	994	if (op->destroyed ())
1046	return 0;	995	return 0;
1047		996
1048	if (!can_pick (op, tmp))	997	if (!can_pick (op, tmp))
1049	continue;	998	continue;
1050		999
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1000	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	1001	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	1002	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	1003	CHK_PICK_PICKUP;
		1004
1055	continue;	1005	continue;
1056	}	1006	}
1057		1007
1058	/* high not bit set? We're using the old autopickup model */	1008	/* pickup handling */
		1009	if (op->contr->mode & PU_DEBUG)
		1010	{
		1011	/* some debugging code to figure out item information */
		1012	const char *str = tmp->name
		1013	? format ("item name: %s item type: %d weight/value: %d",
		1014	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		1015	: format ("item name: %s item type: %d weight/value: %d",
		1016	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1017
		1018	new_draw_info (NDI_UNIQUE, 0, op, str);
		1019	}
		1020
		1021	if (op->contr->mode & PU_INHIBIT)
		1022	return 1;
		1023
		1024	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		1025	return 1;
		1026
		1027	/* philosophy:
		1028	* It's easy to grab an item type from a pile, as long as it's
		1029	* generic. This takes no game-time. For more detailed pickups
		1030	* and selections, select-items should be used. This is a
		1031	* grab-as-you-run type mode that's really useful for arrows for
		1032	* example.
		1033	* The drawback: right now it has no frontend, so you need to
		1034	* stick the bits you want into a calculator in hex mode and then
		1035	* convert to decimal and then 'pickup <#>
		1036	*/
		1037
		1038	/* the first two modes are exclusive: if NOTHING we return, if
		1039	* STOP then we stop. All the rest are applied sequentially,
		1040	* meaning if any test passes, the item gets picked up. */
		1041
		1042	/* if mode is set to pick nothing up, return */
		1043	if (op->contr->mode == PU_NOTHING)
		1044	return 1;
		1045
		1046	/* if mode is set to stop when encountering objects, return */
		1047	/* take STOP before INHIBIT since it doesn't actually pick
		1048	* anything up */
		1049	if (op->contr->mode & PU_STOP)
		1050	return 0;
		1051
		1052	/* useful for going into stores and not losing your settings... */
		1053	/* and for battles wher you don't want to get loaded down while
		1054	* fighting */
		1055	if (op->contr->mode & PU_INHIBIT)
		1056	return 1;
		1057
		1058	/* prevent us from turning into auto-thieves :) */
		1059	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		1060	continue;
		1061
		1062	/* ignore known cursed objects */
		1063	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		1064	continue;
		1065
		1066	/* all food and drink if desired */
		1067	/* question: don't pick up known-poisonous stuff? */
1059	if (!(op->contr->mode & PU_NEWMODE))	1068	if (op->contr->mode & PU_FOOD)
		1069	if (tmp->type == FOOD)
1060	{	1070	{
1061	switch (op->contr->mode)	1071	CHK_PICK_PICKUP;
		1072	continue;
		1073	}
		1074
		1075	if (op->contr->mode & PU_DRINK)
		1076	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		1077	{
		1078	CHK_PICK_PICKUP;
		1079	continue;
		1080	}
		1081
		1082	if (op->contr->mode & PU_POTION)
		1083	if (tmp->type == POTION)
		1084	{
		1085	CHK_PICK_PICKUP;
		1086	continue;
		1087	}
		1088
		1089	/* spellbooks, skillscrolls and normal books/scrolls */
		1090	if (op->contr->mode & PU_SPELLBOOK)
		1091	if (tmp->type == SPELLBOOK)
		1092	{
		1093	CHK_PICK_PICKUP;
		1094	continue;
		1095	}
		1096
		1097	if (op->contr->mode & PU_SKILLSCROLL)
		1098	if (tmp->type == SKILLSCROLL)
		1099	{
		1100	CHK_PICK_PICKUP;
		1101	continue;
		1102	}
		1103
		1104	if (op->contr->mode & PU_READABLES)
		1105	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		1106	{
		1107	CHK_PICK_PICKUP;
		1108	continue;
		1109	}
		1110
		1111	/* wands/staves/rods/horns */
		1112	if (op->contr->mode & PU_MAGIC_DEVICE)
		1113	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1114	{
		1115	CHK_PICK_PICKUP;
		1116	continue;
		1117	}
		1118
		1119	/* pick up all magical items */
		1120	if (op->contr->mode & PU_MAGICAL)
		1121	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1122	{
		1123	CHK_PICK_PICKUP;
		1124	continue;
		1125	}
		1126
		1127	if (op->contr->mode & PU_VALUABLES)
		1128	{
		1129	if (tmp->type == MONEY || tmp->type == GEM)
1062	{	1130	{
1063	case 0:	1131	CHK_PICK_PICKUP;
1064	return 1; /* don't pick up */	1132	continue;
1065	case 1:
1066	pick_up (op, tmp);
1067	return 1;
1068	case 2:
1069	pick_up (op, tmp);
1070	return 0;
1071	case 3:
1072	return 0; /* stop before pickup */
1073	case 4:
1074	pick_up (op, tmp);
1075	break;
1076	case 5:
1077	pick_up (op, tmp);
1078	stop = 1;
1079	break;
1080	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1082	pick_up (op, tmp);
1083	break;
1084
1085	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);
1088	break;
1089
1090	default:
1091	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094	pick_up (op, tmp);
1095	}	1133	}
1096	}	1134	}
1097	else	1135
1098	{ /* old model */	1136	/* rings & amulets - talismans seems to be typed AMULET */
1099	/* NEW pickup handling */
1100	if (op->contr->mode & PU_DEBUG)	1137	if (op->contr->mode & PU_JEWELS)
		1138	if (tmp->type == RING || tmp->type == AMULET)
1101	{	1139	{
1102	/* some debugging code to figure out item information */	1140	CHK_PICK_PICKUP;
1103	if (tmp->name != NULL)
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106	else
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111	}
1112
1113	/* philosophy:
1114	* It's easy to grab an item type from a pile, as long as it's
1115	* generic. This takes no game-time. For more detailed pickups
1116	* and selections, select-items should be used. This is a
1117	* grab-as-you-run type mode that's really useful for arrows for
1118	* example.
1119	* The drawback: right now it has no frontend, so you need to
1120	* stick the bits you want into a calculator in hex mode and then
1121	* convert to decimal and then 'pickup <#>
1122	*/
1123
1124	/* the first two modes are exclusive: if NOTHING we return, if
1125	* STOP then we stop. All the rest are applied sequentially,
1126	* meaning if any test passes, the item gets picked up. */
1127
1128	/* if mode is set to pick nothing up, return */
1129
1130	if (op->contr->mode & PU_NOTHING)
1131	return 1;
1132
1133	/* if mode is set to stop when encountering objects, return */
1134	/* take STOP before INHIBIT since it doesn't actually pick
1135	* anything up */
1136
1137	if (op->contr->mode & PU_STOP)
1138	return 0;
1139
1140	/* useful for going into stores and not losing your settings... */
1141	/* and for battles wher you don't want to get loaded down while
1142	* fighting */
1143	if (op->contr->mode & PU_INHIBIT)
1144	return 1;
1145
1146	/* prevent us from turning into auto-thieves :) */
1147	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1148	continue;	1141	continue;
		1142	}
1149		1143
1150	/* ignore known cursed objects */	1144	/* we don't forget dragon food */
1151	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1145	if (op->contr->mode & PU_FLESH)
		1146	if (tmp->type == FLESH)
		1147	{
		1148	CHK_PICK_PICKUP;
1152	continue;	1149	continue;
		1150	}
1153		1151
1154	/* all food and drink if desired */	1152	/* bows and arrows. Bows are good for selling! */
1155	/* question: don't pick up known-poisonous stuff? */	1153	if (op->contr->mode & PU_BOW)
		1154	if (tmp->type == BOW)
		1155	{
		1156	CHK_PICK_PICKUP;
		1157	continue;
		1158	}
		1159
		1160	if (op->contr->mode & PU_ARROW)
		1161	if (tmp->type == ARROW)
		1162	{
		1163	CHK_PICK_PICKUP;
		1164	continue;
		1165	}
		1166
		1167	/* all kinds of armor etc. */
		1168	if (op->contr->mode & PU_ARMOUR)
		1169	if (tmp->type == ARMOUR)
		1170	{
		1171	CHK_PICK_PICKUP;
		1172	continue;
		1173	}
		1174
		1175	if (op->contr->mode & PU_HELMET)
		1176	if (tmp->type == HELMET)
		1177	{
		1178	CHK_PICK_PICKUP;
		1179	continue;
		1180	}
		1181
		1182	if (op->contr->mode & PU_SHIELD)
		1183	if (tmp->type == SHIELD)
		1184	{
		1185	CHK_PICK_PICKUP;
		1186	continue;
		1187	}
		1188
1156	if (op->contr->mode & PU_FOOD)	1189	if (op->contr->mode & PU_BOOTS)
1157	if (tmp->type == FOOD)	1190	if (tmp->type == BOOTS)
		1191	{
		1192	CHK_PICK_PICKUP;
		1193	continue;
		1194	}
		1195
		1196	if (op->contr->mode & PU_GLOVES)
		1197	if (tmp->type == GLOVES)
		1198	{
		1199	CHK_PICK_PICKUP;
		1200	continue;
		1201	}
		1202
		1203	if (op->contr->mode & PU_CLOAK)
		1204	if (tmp->type == CLOAK)
		1205	{
		1206	CHK_PICK_PICKUP;
		1207	continue;
		1208	}
		1209
		1210	/* hoping to catch throwing daggers here */
		1211	if (op->contr->mode & PU_MISSILEWEAPON)
		1212	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1213	{
		1214	CHK_PICK_PICKUP;
		1215	continue;
		1216	}
		1217
		1218	/* careful: chairs and tables are weapons! */
		1219	if (op->contr->mode & PU_ALLWEAPON)
		1220	{
		1221	if (tmp->type == WEAPON)
		1222	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1158	{	1223	{
1159	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1160	continue;	1225	continue;
1161	}	1226	}
		1227	}
1162		1228
		1229	/* misc stuff that's useful */
1163	if (op->contr->mode & PU_DRINK)	1230	if (op->contr->mode & PU_KEY)
1164	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1231	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1165	{	1232	{
1166	pick_up (op, tmp);	1233	CHK_PICK_PICKUP;
1167	continue;	1234	continue;
1168	}	1235	}
1169		1236
		1237	/* any of the last 4 bits set means we use the ratio for value
		1238	* pickups */
1170	if (op->contr->mode & PU_POTION)	1239	if (op->contr->mode & PU_RATIO)
1171	if (tmp->type == POTION)	1240	{
		1241	/* use value density to decide what else to grab */
		1242	/* >=7 was >= op->contr->mode */
		1243	/* >=7 is the old standard setting. Now we take the last 4 bits
1172	{	1244	*/
1173	pick_up (op, tmp);
1174	continue;
1175	}
1176
1177	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)
1180	{
1181	pick_up (op, tmp);
1182	continue;
1183	}
1184
1185	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)
1187	{
1188	pick_up (op, tmp);
1189	continue;
1190	}
1191
1192	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL)
1194	{
1195	pick_up (op, tmp);
1196	continue;
1197	}
1198
1199	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{
1203	pick_up (op, tmp);
1204	continue;
1205	}
1206
1207	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1245	wvratio = op->contr->mode & PU_RATIO;
1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1246	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1210	{
1211	pick_up (op, tmp);
1212	continue;
1213	}
1214
1215	if (op->contr->mode & PU_VALUABLES)
1216	{	1247	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1248	#if 0
		1249	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1250	if (tmp->name != NULL)
1218	{	1251	{
1219	pick_up (op, tmp);	1252	fprintf (stderr, "%s", tmp->name);
1220	continue;
1221	}	1253	}
1222	}
1223
1224	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)
1227	{
1228	pick_up (op, tmp);
1229	continue;
1230	}
1231
1232	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)
1235	{
1236	pick_up (op, tmp);
1237	continue;
1238	}
1239
1240	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)
1243	{
1244	pick_up (op, tmp);
1245	continue;
1246	}
1247
1248	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)
1250	{
1251	pick_up (op, tmp);
1252	continue;
1253	}
1254
1255	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)
1258	{
1259	pick_up (op, tmp);
1260	continue;
1261	}
1262
1263	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)
1265	{
1266	pick_up (op, tmp);
1267	continue;
1268	}
1269
1270	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)
1272	{
1273	pick_up (op, tmp);
1274	continue;
1275	}
1276
1277	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)
1279	{
1280	pick_up (op, tmp);
1281	continue;
1282	}
1283
1284	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)
1286	{
1287	pick_up (op, tmp);
1288	continue;
1289	}
1290
1291	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)
1293	{
1294	pick_up (op, tmp);
1295	continue;
1296	}
1297
1298	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{
1302	pick_up (op, tmp);
1303	continue;
1304	}
1305
1306	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)
1308	{
1309	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{
1314	pick_up (op, tmp);
1315	continue;
1316	}
1317	}
1318
1319	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{
1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{
1323	pick_up (op, tmp);
1324	continue;
1325	}
1326	}
1327	}
1328
1329	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{
1333	pick_up (op, tmp);
1334	continue;
1335	}
1336
1337	/* any of the last 4 bits set means we use the ratio for value
1338	* pickups */
1339	if (op->contr->mode & PU_RATIO)
1340	{
1341	/* use value density to decide what else to grab */
1342	/* >=7 was >= op->contr->mode */
1343	/* >=7 is the old standard setting. Now we take the last 4 bits
1344	* and multiply them by 5, giving 0..15*5== 5..75 */
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;
1346	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347	{
1348	pick_up (op, tmp);
1349	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)
1352	{
1353	fprintf (stderr, "%s", tmp->name);
1354	}
1355	else	1254	else
1356	fprintf (stderr, "%s", tmp->arch->archname);	1255	fprintf (stderr, "%s", tmp->arch->archname);
1357	fprintf (stderr, ",%d] = ", tmp->type);	1256	fprintf (stderr, ",%d] = ", tmp->type);
1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1257	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1359	#endif	1258	#endif
		1259	CHK_PICK_PICKUP;
1360	continue;	1260	continue;
1361	}
1362	}	1261	}
1363	} /* the new pickup model */	1262	} /* the new pickup model */
1364	}	1263	}
1365		1264
1366	return !stop;	1265	return !stop;
…		…
1372	* found object is returned.	1271	* found object is returned.
1373	*/	1272	*/
1374	object *	1273	object *
1375	find_arrow (object *op, const char *type)	1274	find_arrow (object *op, const char *type)
1376	{	1275	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1276	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381	tmp = find_arrow (op, type);
1382	else if (op->type == ARROW && op->race == type)	1277	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1278	return splay (tmp);
		1279
		1280	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1281	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1282	if (object *arrow = find_arrow (tmp, type))
		1283	{
		1284	splay (tmp);
1383	return op;	1285	return arrow;
		1286	}
1384		1287
1385	return tmp;	1288	return 0;
1386	}	1289	}
1387		1290
1388	/*	1291	/*
1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1292	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1390	* against the target. A full test is not performed, simply a basic test	1293	* against the target. A full test is not performed, simply a basic test
1391	* of resistances. The archer is making a quick guess at what he sees down	1294	* of resistances. The archer is making a quick guess at what he sees down
1392	* the hall. Failing that it does it's best to pick the highest plus arrow.	1295	* the hall. Failing that it does it's best to pick the highest plus arrow.
1393	*/	1296	*/
1394	object *	1297	object *
1395	find_better_arrow (object *op, object *target, const char *type, int *better)	1298	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1396	{	1299	{
1397	object *tmp = NULL, *arrow, *ntmp;	1300	object *tmp = NULL, *arrow, *ntmp;
1398	int attacknum, attacktype, betterby = 0, i;	1301	int attacknum, attacktype, betterby = 0, i;
1399		1302
1400	if (!type)	1303	if (!type)
…		…
1404	{	1307	{
1405	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1308	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1406	{	1309	{
1407	i = 0;	1310	i = 0;
1408	ntmp = find_better_arrow (arrow, target, type, &i);	1311	ntmp = find_better_arrow (arrow, target, type, &i);
		1312
1409	if (i > betterby)	1313	if (i > betterby)
1410	{	1314	{
1411	tmp = ntmp;	1315	tmp = ntmp;
1412	betterby = i;	1316	betterby = i;
1413	}	1317	}
1414	}	1318	}
1415	else if (arrow->type == ARROW && arrow->race == type)	1319	else if (arrow->type == ARROW && arrow->race == type)
1416	{	1320	{
1417	/* allways prefer assasination/slaying */	1321	/* allways prefer assasination/slaying */
1418	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1322	if (target->race && arrow->slaying.contains (target->race))
1419	{	1323	{
1420	if (arrow->attacktype & AT_DEATH)	1324	if (arrow->attacktype & AT_DEATH)
1421	{	1325	{
1422	*better = 100;	1326	*better = 100;
1423	return arrow;	1327	return arrow;
…		…
1438	{	1342	{
1439	tmp = arrow;	1343	tmp = arrow;
1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1344	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1441	}	1345	}
1442	}	1346	}
		1347
1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1348	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1444	{	1349	{
1445	tmp = arrow;	1350	tmp = arrow;
1446	betterby = 2 + arrow->magic + arrow->stats.dam;	1351	betterby = 2 + arrow->magic + arrow->stats.dam;
1447	}	1352	}
		1353
1448	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1354	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1449	{	1355	{
1450	tmp = arrow;	1356	tmp = arrow;
1451	betterby = 1 + arrow->magic + arrow->stats.dam;	1357	betterby = 1 + arrow->magic + arrow->stats.dam;
1452	}	1358	}
1453	}	1359	}
1454	}	1360	}
1455	}	1361	}
		1362
1456	if (tmp == NULL && arrow == NULL)	1363	if (tmp == NULL && arrow == NULL)
1457	return find_arrow (op, type);	1364	return find_arrow (op, type);
1458		1365
1459	*better = betterby;	1366	*better = betterby;
1460	return tmp;	1367	return tmp;
…		…
1465	* op = the shooter	1372	* op = the shooter
1466	* type = bow->race	1373	* type = bow->race
1467	* dir = fire direction	1374	* dir = fire direction
1468	*/	1375	*/
1469	object *	1376	object *
1470	pick_arrow_target (object *op, const char *type, int dir)	1377	pick_arrow_target (object *op, shstr_cmp type, int dir)
1471	{	1378	{
1472	object *tmp = NULL;	1379	object *tmp = NULL;
1473	maptile *m;	1380	maptile *m;
1474	int i, mflags, found, number;	1381	int i, mflags, found, number;
1475	sint16 x, y;	1382	sint16 x, y;
…		…
1490	for (i = 0, found = 0; i < 20; i++)	1397	for (i = 0, found = 0; i < 20; i++)
1491	{	1398	{
1492	x += freearr_x[dir];	1399	x += freearr_x[dir];
1493	y += freearr_y[dir];	1400	y += freearr_y[dir];
1494	mflags = get_map_flags (m, &m, x, y, &x, &y);	1401	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1402
1495	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1403	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1496	{	1404	{
1497	tmp = NULL;	1405	tmp = 0;
1498	break;	1406	break;
1499	}	1407	}
1500	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1408	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1501	{	1409	{
1502	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1410	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1503	* perhaps a bad assumption.	1411	* perhaps a bad assumption.
1504	*/	1412	*/
1505	tmp = NULL;	1413	tmp = 0;
1506	break;	1414	break;
1507	}	1415	}
		1416
1508	if (mflags & P_IS_ALIVE)	1417	if (mflags & P_IS_ALIVE)
1509	{
1510	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1418	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1511	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1419	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1512	{
1513	found++;
1514	break;
1515	}
1516	if (found)
1517	break;	1420	break;
1518	}
1519	}	1421	}
1520	if (tmp == NULL)	1422
		1423	if (!tmp)
1521	return find_arrow (op, type);	1424	return find_arrow (op, type);
1522		1425
1523	if (tmp->head)	1426	if (tmp->head)
1524	tmp = tmp->head;	1427	tmp = tmp->head;
1525		1428
…		…
1565	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1468	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1566	return 0;	1469	return 0;
1567	}	1470	}
1568		1471
1569	// optimisation: move object to top so we will find it quickly again	1472	// optimisation: move object to top so we will find it quickly again
1570	if (bow->below)	1473	splay (bow);
1571	{
1572	bow->remove ();
1573	op->insert (bow);
1574	}
1575
1576	}	1474	}
1577		1475
1578	if (!bow->race || !bow->skill)	1476	if (!bow->race || !bow->skill)
1579	{	1477	{
1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1478	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1606	}	1504	}
1607		1505
1608	/* this should not happen, but sometimes does */	1506	/* this should not happen, but sometimes does */
1609	if (arrow->nrof == 0)	1507	if (arrow->nrof == 0)
1610	{	1508	{
		1509	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1611	arrow->destroy ();	1510	arrow->destroy ();
1612	return 0;	1511	return 0;
1613	}	1512	}
1614		1513
1615	left = arrow; /* these are arrows left to the player */	1514	left = arrow; /* these are arrows left to the player */
1616	arrow = get_split_ob (arrow, 1);	1515	arrow = arrow->split ();
1617	if (!arrow)	1516	if (!arrow)
1618	{	1517	{
1619	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1518	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1620	return 0;	1519	return 0;
1621	}	1520	}
…		…
1625	arrow->direction = dir;	1524	arrow->direction = dir;
1626		1525
1627	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1526	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1628	arrow->stats.hp = arrow->stats.dam;	1527	arrow->stats.hp = arrow->stats.dam;
1629	arrow->stats.grace = arrow->attacktype;	1528	arrow->stats.grace = arrow->attacktype;
1630		1529	arrow->custom_name = arrow->slaying;
1631	if (arrow->slaying)
1632	arrow->spellarg = strdup (arrow->slaying);
1633		1530
1634	#if 0	1531	#if 0
1635	if (player *pl = op->contr)	1532	if (player *pl = op->contr)
1636	{	1533	{
1637	float speed = pl->weapon_sp;	1534	float speed = pl->weapon_sp;
…		…
1683		1580
1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1581	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1685	arrow->move_type = MOVE_FLY_LOW;	1582	arrow->move_type = MOVE_FLY_LOW;
1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1583	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1687		1584
1688	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1585	op->play_sound (sound_find ("fire_arrow"));
1689	m->insert (arrow, sx, sy, op);	1586	m->insert (arrow, sx, sy, op);
1690		1587
1691	if (!arrow->destroyed ())	1588	if (!arrow->destroyed ())
1692	move_arrow (arrow);	1589	move_arrow (arrow);
1693
1694	if (op->type == PLAYER)
1695	{
1696	if (left->destroyed ())
1697	esrv_del_item (op->contr, left->count);
1698	else
1699	esrv_send_item (op, left);
1700	}
1701		1590
1702	return 1;	1591	return 1;
1703	}	1592	}
1704		1593
1705	/* Special fire code for players - this takes into	1594	/* Special fire code for players - this takes into
…		…
1710	* hence the function name.	1599	* hence the function name.
1711	*/	1600	*/
1712	int	1601	int
1713	player_fire_bow (object *op, int dir)	1602	player_fire_bow (object *op, int dir)
1714	{	1603	{
1715	int ret = 0, wcmod = 0;	1604	int ret;
1716		1605
1717	if (op->contr->bowtype == bow_bestarrow)	1606	if (op->contr->bowtype == bow_bestarrow)
1718	{	1607	{
1719	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1608	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1720	}	1609	}
1721	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1610	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1722	{	1611	{
1723	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1612	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1724	wcmod = -1;
1725
1726	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1613	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1727	}	1614	}
1728	else if (op->contr->bowtype == bow_threewide)	1615	else if (op->contr->bowtype == bow_threewide)
1729	{	1616	{
1730	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1617	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1731	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1618	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1732	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1619	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1733	}	1620	}
1734	else if (op->contr->bowtype == bow_spreadshot)	1621	else if (op->contr->bowtype == bow_spreadshot)
1735	{	1622	{
1736	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1623	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1624	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1738	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1625	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1739	}	1626	}
1740	else	1627	else
1741	{	1628	{
…		…
1771		1658
1772	if (item->type == WAND)	1659	if (item->type == WAND)
1773	{	1660	{
1774	if (item->stats.food <= 0)	1661	if (item->stats.food <= 0)
1775	{	1662	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1663	op->contr->play_sound (sound_find ("wand_poof"));
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1664	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1778		1665
1779	return;	1666	return;
1780	}	1667	}
1781	}	1668	}
1782	else if (item->type == ROD || item->type == HORN)	1669	else if (item->type == ROD || item->type == HORN)
1783	{	1670	{
1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1671	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1672
		1673	// using the maximum of the rods charge allows at least one spell cast
		1674	// for a rod or horn, this fixes some broken rods.
		1675	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1785	{	1676	{
1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1677	op->contr->play_sound (sound_find ("wand_poof"));
1787		1678
1788	if (item->type == ROD)	1679	if (item->type == ROD)
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1680	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1790	else	1681	else
1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1682	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1794	}	1685	}
1795	}	1686	}
1796		1687
1797	if (cast_spell (op, item, dir, item->inv, NULL))	1688	if (cast_spell (op, item, dir, item->inv, NULL))
1798	{	1689	{
1799	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1690	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1691
1800	if (item->type == WAND)	1692	if (item->type == WAND)
1801	{	1693	{
1802	if (!(--item->stats.food))	1694	if (!(--item->stats.food))
1803	{	1695	{
1804	object *tmp;	1696	object *tmp;
…		…
1808	CLEAR_FLAG (item, FLAG_ANIMATE);	1700	CLEAR_FLAG (item, FLAG_ANIMATE);
1809	item->face = item->arch->face;	1701	item->face = item->arch->face;
1810	item->set_speed (0);	1702	item->set_speed (0);
1811	}	1703	}
1812		1704
1813	if ((tmp = item->in_player ()))	1705	if (object *pl = item->visible_to ())
1814	esrv_update_item (UPD_ANIM, tmp, item);	1706	esrv_update_item (UPD_ANIM, pl, item);
1815	}	1707	}
1816	}	1708	}
1817	else if (item->type == ROD || item->type == HORN)	1709	else if (item->type == ROD || item->type == HORN)
1818	drain_rod_charge (item);	1710	drain_rod_charge (item);
1819	}	1711	}
…		…
1824	bool	1716	bool
1825	fire (object *op, int dir)	1717	fire (object *op, int dir)
1826	{	1718	{
1827	int spellcost = 0;	1719	int spellcost = 0;
1828		1720
1829	/* check for loss of invisiblity/hide */
1830	if (action_makes_visible (op))
1831	make_visible (op);
1832
1833	player *pl = op->contr;	1721	player *pl = op->contr;
1834		1722
1835	if (pl->golem)	1723	if (pl->golem)
1836	{	1724	{
1837	control_golem (op->contr->golem, dir);	1725	control_golem (op->contr->golem, dir);
…		…
1839	}	1727	}
1840		1728
1841	object *ob = pl->ranged_ob;	1729	object *ob = pl->ranged_ob;
1842		1730
1843	if (!ob)	1731	if (!ob)
1844	return false;
1845
1846	if (!op->change_weapon (ob))
1847	return false;	1732	return false;
1848		1733
1849	if (op->speed_left > 0.f)	1734	if (op->speed_left > 0.f)
1850	--op->speed_left;	1735	--op->speed_left;
1851	else	1736	else
1852	return false;	1737	return false;
1853		1738
		1739	if (!op->change_weapon (ob))
		1740	return false;
		1741
		1742	/* check for loss of invisiblity/hide */
		1743	if (action_makes_visible (op))
		1744	make_visible (op);
		1745
1854	switch (ob->type)	1746	switch (ob->type)
1855	{	1747	{
1856	case BOW:	1748	case BOW:
1857	player_fire_bow (op, dir);	1749	player_fire_bow (op, dir);
1858	break;	1750	break;
1859		1751
1860	case SPELL:	1752	case SPELL:
1861	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1753	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1862	break;	1754	break;
1863		1755
1864	case BUILDER:	1756	case BUILDER:
1865	apply_map_builder (op, dir);	1757	apply_map_builder (op, dir);
1866	break;	1758	break;
…		…
1899	/* First, lets try to find a key in the top level inventory */	1791	/* First, lets try to find a key in the top level inventory */
1900	for (tmp = container->inv; tmp; tmp = tmp->below)	1792	for (tmp = container->inv; tmp; tmp = tmp->below)
1901	{	1793	{
1902	if (door->type == DOOR && tmp->type == KEY)	1794	if (door->type == DOOR && tmp->type == KEY)
1903	break;	1795	break;
		1796
1904	/* For sanity, we should really check door type, but other stuff	1797	/* For sanity, we should really check door type, but other stuff
1905	* (like containers) can be locked with special keys	1798	* (like containers) can be locked with special keys
1906	*/	1799	*/
1907	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1800	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908	break;	1801	break;
…		…
1914	* a key, return	1807	* a key, return
1915	*/	1808	*/
1916	if (!tmp)	1809	if (!tmp)
1917	{	1810	{
1918	for (tmp = container->inv; tmp; tmp = tmp->below)	1811	for (tmp = container->inv; tmp; tmp = tmp->below)
1919	{
1920	/* No reason to search empty containers */	1812	/* No reason to search empty containers */
1921	if (tmp->type == CONTAINER && tmp->inv)	1813	if (tmp->type == CONTAINER && tmp->inv)
1922	{
1923	if ((key = find_key (pl, tmp, door)))	1814	if ((key = find_key (pl, tmp, door)))
1924	return key;	1815	return key;
1925	}
1926	}
1927		1816
1928	if (!tmp)	1817	if (!tmp)
1929	return NULL;	1818	return 0;
1930	}	1819	}
1931		1820
1932	/* We get down here if we have found a key. Now if its in a container,	1821	/* We get down here if we have found a key. Now if its in a container,
1933	* see if we actually want to use it	1822	* see if we actually want to use it
1934	*/	1823	*/
1935	if (pl != container)	1824	if (pl != container)
1936	{	1825	{
1937	/* Only let players use keys in containers */	1826	/* Only let players use keys in containers */
1938	if (!pl->contr)	1827	if (!pl->contr)
1939	return NULL;	1828	return 0;
		1829
1940	/* cases where this fails:	1830	/* cases where this fails:
1941	* If we only search the player inventory, return now since we	1831	* If we only search the player inventory, return now since we
1942	* are not in the players inventory.	1832	* are not in the players inventory.
1943	* If the container is not active, return now since only active	1833	* If the container is not active, return now since only active
1944	* containers can be used.	1834	* containers can be used.
…		…
1950	* Change the color so that the message doesn't disappear with	1840	* Change the color so that the message doesn't disappear with
1951	* all the others.	1841	* all the others.
1952	*/	1842	*/
1953	if (pl->contr->usekeys == key_inventory ||	1843	if (pl->contr->usekeys == key_inventory ||
1954	!QUERY_FLAG (container, FLAG_APPLIED) ||	1844	!QUERY_FLAG (container, FLAG_APPLIED) ||
1955	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1845	(pl->contr->usekeys == keyrings && container->race != shstr_keys))
1956	{	1846	{
1957	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1847	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1958	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1848	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1959	return NULL;	1849	return NULL;
1960	}	1850	}
…		…
1980	/* If we found a key, do some extra work */	1870	/* If we found a key, do some extra work */
1981	if (key)	1871	if (key)
1982	{	1872	{
1983	object *container = key->env;	1873	object *container = key->env;
1984		1874
1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1987	if (action_makes_visible (op))	1875	if (action_makes_visible (op))
1988	make_visible (op);	1876	make_visible (op);
1989		1877
1990	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1878	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1991	spring_trap (door->inv, op);	1879	spring_trap (door->inv, op);
1992		1880
1993	if (door->type == DOOR)	1881	if (door->type == DOOR)
1994	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1882	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1995	else if (door->type == LOCKED_DOOR)	1883	else if (door->type == LOCKED_DOOR)
1996	{	1884	{
1997	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1885	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1998	remove_door2 (door); /* remove door without violence ;-) */	1886	remove_door2 (door); /* remove door without violence ;-) */
1999	}	1887	}
2000		1888
2001	/* Do this after we print the message */	1889	/* Do this after we print the message */
2002	decrease_ob (key); /* Use up one of the keys */	1890	key->decrease (); /* Use up one of the keys */
2003	/* Need to update the weight the container the key was in */
2004	if (container != op)
2005	esrv_update_item (UPD_WEIGHT, op, container);
2006		1891
2007	return 1; /* Nothing more to do below */	1892	return 1; /* Nothing more to do below */
2008	}	1893	}
2009	else if (door->type == LOCKED_DOOR)	1894	else if (door->type == LOCKED_DOOR)
2010	{	1895	{
2011	/* Might as well return now - no other way to open this */	1896	/* Might as well return now - no other way to open this */
2012	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1897	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2013	return 1;	1898	return 1;
2014	}	1899	}
2015		1900
2016	return 0;	1901	return 0;
2017	}	1902	}
…		…
2023	* going to try and move (not fire weapons).	1908	* going to try and move (not fire weapons).
2024	*/	1909	*/
2025	bool	1910	bool
2026	move_player_attack (object *op, int dir)	1911	move_player_attack (object *op, int dir)
2027	{	1912	{
		1913	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1914	{
		1915	--op->speed_left;
		1916	return true;
		1917	}
		1918
2028	int on_battleground;	1919	int on_battleground;
2029		1920
2030	sint16 nx = freearr_x[dir] + op->x;	1921	sint16 nx = freearr_x[dir] + op->x;
2031	sint16 ny = freearr_y[dir] + op->y;	1922	sint16 ny = freearr_y[dir] + op->y;
2032		1923
2033	on_battleground = op_on_battleground (op, 0, 0);	1924	on_battleground = op_on_battleground (op, 0, 0);
2034		1925
2035	if (out_of_map (op->map, nx, ny))	1926	if (out_of_map (op->map, nx, ny))
2036	return false;	1927	return false;
2037
2038	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2039	{
2040	--op->speed_left;
2041	return true;
2042	}
2043		1928
2044	/* If braced, or can't move to the square, and it is not out of the	1929	/* If braced, or can't move to the square, and it is not out of the
2045	* map, attack it. Note order of if statement is important - don't	1930	* map, attack it. Note order of if statement is important - don't
2046	* want to be calling move_ob if braced, because move_ob will move the	1931	* want to be calling move_ob if braced, because move_ob will move the
2047	* player. This is a pretty nasty hack, because if we could	1932	* player. This is a pretty nasty hack, because if we could
…		…
2104		1989
2105	if (op->speed_left > 0.f)	1990	if (op->speed_left > 0.f)
2106	{	1991	{
2107	--op->speed_left;	1992	--op->speed_left;
2108		1993
2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	1994	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	1995	push_ob (mon, dir, op);
2111		1996
2112	if (op->contr->tmp_invis || op->hide)	1997	if (action_makes_visible (op))
2113	make_visible (op);	1998	make_visible (op);
2114		1999
2115	return true;	2000	return true;
2116	}	2001	}
2117	else	2002	else
…		…
2133	{	2018	{
2134	--op->speed_left;	2019	--op->speed_left;
2135		2020
2136	if (!op->contr->braced)	2021	if (!op->contr->braced)
2137	{	2022	{
2138	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2023	op->play_sound (sound_find ("push_player"));
2139	push_ob (mon, dir, op);	2024	push_ob (mon, dir, op);
2140	}	2025	}
2141	else	2026	else
2142	new_draw_info (0, 0, op, "You withhold your attack");	2027	op->statusmsg ("You withhold your attack");
2143		2028
2144	if (op->contr->tmp_invis || op->hide)	2029	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2145	make_visible (op);	2030	make_visible (op);
2146		2031
2147	return true;	2032	return true;
2148	}	2033	}
2149	}	2034	}
…		…
2191	bool	2076	bool
2192	move_player (object *op, int dir)	2077	move_player (object *op, int dir)
2193	{	2078	{
2194	int pick;	2079	int pick;
2195		2080
2196	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2081	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2197	return 0;	2082	return 0;
2198		2083
2199	/* Sanity check: make sure dir is valid */	2084	/* Sanity check: make sure dir is valid */
2200	if ((dir < 0) || (dir >= 9))	2085	if ((dir < 0) || (dir >= 9))
2201	{	2086	{
…		…
2207	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2092	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2208	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2093	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2209		2094
2210	op->facing = dir;	2095	op->facing = dir;
2211		2096
2212	if (op->hide)	2097	if (op->flag [FLAG_HIDDEN])
2213	do_hidden_move (op);	2098	do_hidden_move (op);
2214		2099
2215	bool retval;	2100	bool retval;
2216		2101
2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2102	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2286	return 0;	2171	return 0;
2287		2172
2288	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2173	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2289	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2174	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2290	{	2175	{
2291	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2176	op->play_sound (sound_find ("ob_evaporate"));
2292	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2177	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2293
2294	if (op->contr)
2295	esrv_del_item (op->contr, tmp->count);
2296		2178
2297	tmp->destroy ();	2179	tmp->destroy ();
2298	CLEAR_FLAG (op, FLAG_LIFESAVE);	2180	CLEAR_FLAG (op, FLAG_LIFESAVE);
2299		2181
2300	if (op->stats.hp < 0)	2182	if (op->stats.hp < 0)
…		…
2313	return 0;	2195	return 0;
2314	}	2196	}
2315		2197
2316	/* This goes throws the inventory and removes unpaid objects, and puts them	2198	/* This goes throws the inventory and removes unpaid objects, and puts them
2317	* back in the map (location and map determined by values of env). This	2199	* back in the map (location and map determined by values of env). This
2318	* function will descend into containers. op is the object to start the search	2200	* function will descend into containers. op is the object to start the search
2319	* from.	2201	* from.
2320	*/	2202	*/
		2203	static void
		2204	drop_unpaid_items (object *op, object *env)
		2205	{
		2206	while (op)
		2207	{
		2208	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2209
		2210	if (QUERY_FLAG (op, FLAG_UNPAID))
		2211	op->insert_at (env);
		2212	else if (op->inv)
		2213	drop_unpaid_items (op->inv, env);
		2214
		2215	op = next;
		2216	}
		2217	}
		2218
2321	void	2219	void
2322	remove_unpaid_objects (object *op, object *env)	2220	object::drop_unpaid_items ()
2323	{	2221	{
2324	while (op)	2222	if (!flag [FLAG_REMOVED])
2325	{	2223	::drop_unpaid_items (inv, this);
2326	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2327
2328	if (QUERY_FLAG (op, FLAG_UNPAID))
2329	{
2330	if (env->type == PLAYER)
2331	esrv_del_item (env->contr, op->count);
2332
2333	op->insert_at (env);
2334	}
2335	else if (op->inv)
2336	remove_unpaid_objects (op->inv, env);
2337
2338	op = next;
2339	}
2340	}	2224	}
2341		2225
2342	/*	2226	/*
2343	* Returns pointer a static string containing gravestone text	2227	* Returns pointer a static string containing gravestone text
2344	* Moved from apply.c to player.c - player.c is what	2228	* Moved from apply.c to player.c - player.c is what
2345	* actually uses this function. player.c may not be quite the	2229	* actually uses this function. player.c may not be quite the
2346	* best, a misc file for object actions is probably better,	2230	* best, a misc file for object actions is probably better,
2347	* but there isn't one in the server directory.	2231	* but there isn't one in the server directory.
2348	*/	2232	*/
2349	char *	2233	const char *
2350	gravestone_text (object *op)	2234	gravestone_text (object *op)
2351	{	2235	{
2352	static char buf2[MAX_BUF];	2236	static dynbuf_text buf;
2353	char buf[MAX_BUF];
2354	time_t now = time (NULL);
2355		2237
2356	strcpy (buf2, " R.I.P.\n\n");	2238	buf << "---- R.I.P. ----\n\n"
		2239	<< op->name;
		2240
2357	if (op->type == PLAYER)	2241	if (op->type == PLAYER)
2358	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2242	buf << " the " << op->contr->title;
2359	else
2360	sprintf (buf, "%s\n", &op->name);
2361		2243
2362	strncat (buf2, " ", 20 - strlen (buf) / 2);	2244	buf << "\n\n";
2363	strcat (buf2, buf);	2245
		2246	buf << "who was level ";
		2247	buf << (sint32)op->level << "\n\n" // OO breakdown
		2248	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2249
2364	if (op->type == PLAYER)	2250	if (op->type == PLAYER)
2365	sprintf (buf, "who was in level %d when killed\n", op->level);	2251	buf << "by " << op->contr->killer_name () << ".\n\n";
2366	else
2367	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2368		2252
2369	strncat (buf2, " ", 20 - strlen (buf) / 2);
2370	strcat (buf2, buf);
2371	if (op->type == PLAYER)
2372	{	2253	{
2373	sprintf (buf, "by %s.\n\n", op->contr->killer);	2254	static char buf2[128];
2374	strncat (buf2, " ", 21 - strlen (buf) / 2);	2255	time_t now = time (NULL);
2375	strcat (buf2, buf);
2376	}
2377
2378	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2256	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2379	strncat (buf2, " ", 20 - strlen (buf) / 2);	2257	buf << buf2;
2380	strcat (buf2, buf);	2258	}
2381		2259
2382	return buf2;	2260	return buf;
2383	}	2261	}
2384		2262
2385	void	2263	void
2386	do_some_living (object *op)	2264	do_some_living (object *op)
2387	{	2265	{
…		…
2439	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2317	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2440	else	2318	else
2441	{	2319	{
2442	gen_grace = op->stats.maxgrace;	2320	gen_grace = op->stats.maxgrace;
2443	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2321	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2444	}
2445
2446	/* Regenerate Spell Points */
2447	if (!op->contr->golem && --op->last_sp < 0)
2448	{
2449	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2450	if (op->stats.sp < op->stats.maxsp)
2451	{
2452	op->stats.sp++;
2453	/* dms do not consume food */
2454	if (!QUERY_FLAG (op, FLAG_WIZ))
2455	{
2456	op->stats.food--;
2457	if (op->contr->digestion < 0)
2458	op->stats.food += op->contr->digestion;
2459	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2460	op->stats.food = last_food;
2461	}
2462	}
2463
2464	if (max_sp > 1)
2465	{
2466	over_sp = (gen_sp + 10) / rate_sp;
2467	if (over_sp > 0)
2468	{
2469	if (op->stats.sp < op->stats.maxsp)
2470	{
2471	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2472
2473	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2474	op->stats.sp--;
2475
2476	if (op->stats.sp > op->stats.maxsp)
2477	op->stats.sp = op->stats.maxsp;
2478	}
2479	op->last_sp = 0;
2480	}
2481	else
2482	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483	}
2484	else
2485	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486	}	2322	}
2487		2323
2488	/* Regenerate Grace */	2324	/* Regenerate Grace */
2489	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2325	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2490	if (--op->last_grace < 0)	2326	if (--op->last_grace < 0)
…		…
2511	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2347	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2512	}	2348	}
2513	/* wearing stuff doesn't detract from grace generation. */	2349	/* wearing stuff doesn't detract from grace generation. */
2514	}	2350	}
2515		2351
		2352	if (op->stats.food > 0)
		2353	{
2516	/* Regenerate Hit Points */	2354	/* Regenerate Spell Points */
2517	if (--op->last_heal < 0)	2355	if (!op->contr->golem && --op->last_sp < 0)
2518	{
2519	if (op->stats.hp < op->stats.maxhp)
2520	{	2356	{
2521	op->stats.hp++;	2357	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2522	/* dms do not consume food */	2358
2523	if (!QUERY_FLAG (op, FLAG_WIZ))	2359	if (op->stats.sp < op->stats.maxsp)
2524	{	2360	{
		2361	op->stats.sp++;
		2362
		2363	/* dms do not consume food */
		2364	if (!QUERY_FLAG (op, FLAG_WIZ))
		2365	{
2525	op->stats.food--;	2366	op->stats.food--;
		2367
2526	if (op->contr->digestion < 0)	2368	if (op->contr->digestion < 0)
2527	op->stats.food += op->contr->digestion;	2369	op->stats.food += op->contr->digestion;
2528	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2370	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2529	op->stats.food = last_food;	2371	op->stats.food = last_food;
		2372	}
2530	}	2373	}
2531	}
2532		2374
2533	if (max_hp > 1)	2375	if (max_sp > 1)
2534	{
2535	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2536	if (over_hp > 0)
2537	{	2376	{
2538	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2377	over_sp = (gen_sp + 10) / rate_sp;
		2378	if (over_sp > 0)
		2379	{
		2380	if (op->stats.sp < op->stats.maxsp)
		2381	{
		2382	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2383
		2384	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2385	op->stats.sp--;
		2386
		2387	if (op->stats.sp > op->stats.maxsp)
		2388	op->stats.sp = op->stats.maxsp;
		2389	}
		2390
2539	op->last_heal = 0;	2391	op->last_sp = 0;
		2392	}
		2393	else
		2394	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2540	}	2395	}
2541	else	2396	else
		2397	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2398	}
		2399
		2400	/* Regenerate Hit Points */
		2401	if (--op->last_heal < 0)
		2402	{
		2403	if (op->stats.hp < op->stats.maxhp)
2542	{	2404	{
2543	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2405	op->stats.hp++;
		2406
		2407	/* dms do not consume food */
		2408	if (!QUERY_FLAG (op, FLAG_WIZ))
		2409	{
		2410	op->stats.food--;
		2411
		2412	if (op->contr->digestion < 0)
		2413	op->stats.food += op->contr->digestion;
		2414	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2415	op->stats.food = last_food;
		2416	}
2544	}	2417	}
		2418
		2419	if (max_hp > 1)
		2420	{
		2421	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2422
		2423	if (over_hp > 0)
		2424	{
		2425	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2426	op->last_heal = 0;
		2427	}
		2428	else
		2429	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545	}	2430	}
2546	else	2431	else
2547	{
2548	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2432	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2549	}	2433	}
2550	}	2434	}
2551		2435
2552	/* Digestion */	2436	/* Digestion */
2553	if (--op->last_eat < 0)	2437	if (--op->last_eat < 0)
2554	{	2438	{
2555	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2439	int bonus = max (0, op->contr->digestion),
		2440	penalty = max (0, -op->contr->digestion);
2556		2441
2557	if (op->contr->gen_hp > 0)
2558	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2442	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2559	else
2560	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561		2443
2562	/* dms do not consume food */	2444	/* dms do not consume food */
2563	if (!QUERY_FLAG (op, FLAG_WIZ))	2445	if (!QUERY_FLAG (op, FLAG_WIZ))
2564	op->stats.food--;	2446	op->stats.food--;
2565	}	2447	}
2566		2448
2567	if (op->stats.food < 0 && op->stats.hp >= 0)	2449	if (op->stats.food < 0 && op->stats.hp >= 0)
2568	{	2450	{
2569	object *tmp, *flesh = 0;	2451	object *flesh = 0;
2570		2452
2571	for (tmp = op->inv; tmp; tmp = tmp->below)	2453	for_inv_removable (op, tmp)
2572	{	2454	{
2573	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2455	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2456	continue;
		2457
		2458	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2574	{	2459	{
2575	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2460	op->statusmsg ("You blindly grab for a bite of food. "
2576	{	2461	"H<To prevent you from starving, you ate some random item from your backpack.>");
2577	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2578	manual_apply (op, tmp, 0);	2462	manual_apply (op, tmp, 0);
		2463
2579	if (op->stats.food >= 0 || op->stats.hp < 0)	2464	if (op->stats.food >= 0 || op->stats.hp < 0)
2580	break;	2465	break;
2581	}	2466	}
2582	else if (tmp->type == FLESH)	2467	else if (tmp->type == FLESH)
2583	flesh = tmp;	2468	flesh = tmp;
2584	} /* End if paid for object */	2469	}
2585	} /* end of for loop */
2586		2470
2587	/* If player is still starving, it means they don't have any food, so	2471	/* If player is still starving, it means they don't have any food, so
2588	* eat flesh instead.	2472	* eat flesh instead.
2589	*/	2473	*/
2590	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2474	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2591	{	2475	{
2592	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2476	op->statusmsg ("You blindly grab for a bite of food. "
		2477	"H<To prevent you from starving, you ate some random item from your backpack.>");
2593	manual_apply (op, flesh, 0);	2478	manual_apply (op, flesh, 0);
2594	}	2479	}
		2480
		2481	// If player is still starving, alert him!
		2482	if (op->stats.food < 0)
		2483	op->failmsg ("You are starving! "
		2484	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2485	}
		2486
		2487	if (op->stats.food < 0)
2595	}	2488	{
		2489	op->stats.hp += op->stats.food;
		2490	op->stats.food = 0;
2596		2491
2597	while (op->stats.food < 0 && op->stats.hp >= 0)	2492	if (op->stats.hp < 0)
2598	op->stats.food++, op->stats.hp--;	2493	{
		2494	op->contr->killer = archetype::get ("killer_starvation");
		2495	op->contr->killer->destroy ();
		2496	}
		2497	}
2599		2498
		2499	/* killer should be set here already */
2600	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2500	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2601	kill_player (op);	2501	kill_player (op);
2602	}	2502	}
2603	}	2503	}
2604		2504
…		…
2608	* file.	2508	* file.
2609	*/	2509	*/
2610	void	2510	void
2611	kill_player (object *op)	2511	kill_player (object *op)
2612	{	2512	{
2613	char buf[MAX_BUF];
2614	int x, y;	2513	int x, y;
2615
2616	//int i;
2617	maptile *map; /* this is for resurrection */	2514	maptile *map; /* this is for resurrection */
2618
2619	/* int z;
2620	int num_stats_lose;
2621	int lost_a_stat;
2622	int lose_this_stat;
2623	int this_stat; */
2624	int will_kill_again;	2515	int will_kill_again;
2625	archetype *at;	2516	archetype *at;
2626	object *tmp;	2517	object *tmp;
2627		2518
2628	if (save_life (op))	2519	if (save_life (op))
2629	return;	2520	return;
2630		2521
		2522	dynbuf_text deathtab;
		2523
		2524	/* restore player */
		2525	at = archetype::find ("poisoning");
		2526	if (object *tmp = present_arch_in_ob (at, op))
		2527	{
		2528	tmp->destroy ();
		2529	deathtab << "Your body feels cleansed...\r";
		2530	}
		2531
		2532	at = archetype::find ("confusion");
		2533	if (object *tmp = present_arch_in_ob (at, op))
		2534	{
		2535	tmp->destroy ();
		2536	deathtab << "Your mind feels clearer...\r";
		2537	}
		2538
		2539	cure_disease (op, 0, 0); /* remove any disease */
		2540
		2541	max_it (op->stats.hp , op->stats.maxhp);
		2542	max_it (op->stats.sp , op->stats.maxsp);
		2543	max_it (op->stats.grace, op->stats.maxgrace);
		2544
		2545	if (op->stats.food <= 0)
		2546	op->stats.food = 999;
		2547
		2548	// remove all spell effects that are active
		2549	// to avoid long-term effects such as word-of-recall
		2550	for (object *item = op->inv; item; )
		2551	{
		2552	object *next = item->below;
		2553
		2554	if (item->type == SPELL_EFFECT && item->active)
		2555	item->destroy ();
		2556
		2557	item = next;
		2558	}
2631		2559
2632	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2560	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2633	* in cities ONLY!!! It is very important that this doesn't get abused.	2561	* in cities ONLY!!! It is very important that this doesn't get abused.
2634	* Look at op_on_battleground() for more info --AndreasV	2562	* Look at op_on_battleground() for more info --AndreasV
2635	*/	2563	*/
2636	if (op_on_battleground (op, &x, &y))	2564	if (op_on_battleground (op, &x, &y))
2637	{	2565	{
2638	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2566	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2639	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2640
2641	/* restore player */
2642	at = archetype::find ("poisoning");
2643	if (object *tmp = present_arch_in_ob (at, op))
2644	{
2645	tmp->destroy ();
2646	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2647	}
2648
2649	at = archetype::find ("confusion");
2650	if (object *tmp = present_arch_in_ob (at, op))
2651	{
2652	tmp->destroy ();
2653	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2654	}
2655
2656	cure_disease (op, 0); /* remove any disease */
2657	op->stats.hp = op->stats.maxhp;
2658	if (op->stats.food <= 0)
2659	op->stats.food = 999;
2660		2567
2661	/* create a bodypart-trophy to make the winner happy */	2568	/* create a bodypart-trophy to make the winner happy */
2662	if (object *tmp = arch_to_object (archetype::find ("finger")))	2569	if (object *tmp = arch_to_object (archetype::find ("finger")))
2663	{	2570	{
2664	sprintf (buf, "%s's finger", &op->name);	2571	tmp->name = format ("%s's finger" , &op->name);
2665	tmp->name = buf;	2572	tmp->name_pl = format ("%s's fingers", &op->name);
2666	sprintf (buf, " This finger has been cut off %s\n"
2667	" the %s, when he was defeated at\n level %d by %s.\n",
2668	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2669	tmp->msg = buf;	2573	tmp->msg = format (
		2574	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2575	&op->name, op->contr->title,
		2576	(int)op->level,
		2577	op->contr->killer_name ()
		2578	);
2670	tmp->value = 0, tmp->type = 0;	2579	tmp->value = 0, tmp->type = 0;
2671	tmp->materialname = "organics";	2580	tmp->materialname = "organics";
2672	tmp->insert_at (op, tmp);	2581	tmp->insert_at (op, tmp);
2673	}	2582	}
2674		2583
2675	/* teleport defeated player to new destination */	2584	/* teleport defeated player to new destination */
2676	transfer_ob (op, x, y, 0, NULL);	2585	transfer_ob (op, x, y, 0, NULL);
2677	op->contr->braced = 0;	2586	op->contr->braced = 0;
		2587
		2588	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2678	return;	2589	return;
2679	}	2590	}
2680		2591
		2592	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2593	deathtab << "T<YOU HAVE DIED>\n\n";
		2594
2681	INVOKE_PLAYER (DEATH, op->contr);	2595	INVOKE_PLAYER (DEATH, op->contr);
2682		2596
2683	command_kill_pets (op, 0);	2597	command_kill_pets (op, 0);
2684		2598
2685	if (op->stats.food < 0)	2599	op->contr->play_sound (sound_find ("player_dies"));
2686	{
2687	sprintf (buf, "%s starved to death.", &op->name);
2688	strcpy (op->contr->killer, "starvation");
2689	}
2690	else
2691	sprintf (buf, "%s died.", &op->name);
2692
2693	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2694		2600
2695	/* save the map location for corpse, gravestone */	2601	/* save the map location for corpse, gravestone */
2696	x = op->x;	2602	x = op->x;
2697	y = op->y;	2603	y = op->y;
2698	map = op->map;	2604	map = op->map;
…		…
2726		2632
2727	lost_a_stat = 0;	2633	lost_a_stat = 0;
2728		2634
2729	for (z = 0; z < num_stats_lose; z++)	2635	for (z = 0; z < num_stats_lose; z++)
2730	{	2636	{
2731	i = RANDOM () % NUM_STATS;	2637	i = rndm (NUM_STATS);
2732		2638
2733	if (settings.stat_loss_on_death)	2639	if (settings.stat_loss_on_death)
2734	{	2640	{
2735	/* Pick a random stat and take a point off it. Tell the player	2641	/* Pick a random stat and take a point off it. Tell the player
2736	* what he lost.	2642	* what he lost.
…		…
2787	}	2693	}
2788	}	2694	}
2789		2695
2790	if (lose_this_stat)	2696	if (lose_this_stat)
2791	{	2697	{
2792	this_stat = get_attr_value (&(dep->stats), i);	2698	this_stat = get_attr_value (&dep->stats, i);
2793	/* We could try to do something clever like find another	2699	/* We could try to do something clever like find another
2794	* stat to reduce if this fails. But chances are, if	2700	* stat to reduce if this fails. But chances are, if
2795	* stats have been depleted to -50, all are pretty low	2701	* stats have been depleted to -50, all are pretty low
2796	* and should be roughly the same, so it shouldn't make a	2702	* and should be roughly the same, so it shouldn't make a
2797	* difference.	2703	* difference.
…		…
2805	lost_a_stat = 1;	2711	lost_a_stat = 1;
2806	}	2712	}
2807	}	2713	}
2808	}	2714	}
2809	}	2715	}
		2716
2810	/* If no stat lost, tell the player. */	2717	/* If no stat lost, tell the player. */
2811	if (!lost_a_stat)	2718	if (!lost_a_stat)
2812	{	2719	{
2813	/* determine_god() seems to not work sometimes... why is this?	2720	/* determine_god() seems to not work sometimes... why is this?
2814	Should I be using something else? GD */	2721	Should I be using something else? GD */
2815	const char *god = determine_god (op);	2722	shstr_tmp god = determine_god (op);
2816		2723
2817	if (god && (strcmp (god, "none")))	2724	if (god != shstr_none)
2818	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2725	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2819	else	2726	else
2820	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2727	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2821	}	2728	}
2822	#else	2729	#else
2823	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2730	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2824	#endif	2731	#endif
2825		2732
2826	/* Put a gravestone up where the character 'almost' died. List the	2733	/* Put a gravestone up where the character 'almost' died. List the
2827	* exp loss on the stone.	2734	* exp loss on the stone.
2828	*/	2735	*/
2829	tmp = arch_to_object (archetype::find ("gravestone"));	2736	tmp = arch_to_object (archetype::find ("gravestone"));
2830	sprintf (buf, "%s's gravestone", &op->name);	2737	tmp->name = format ("%s's gravestone", &op->name);
2831	tmp->name = buf;	2738	tmp->name_pl = format ("%s's gravestones", &op->name);
2832	sprintf (buf, "%s's gravestones", &op->name);	2739	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2833	tmp->name_pl = buf;	2740	&op->name, op->contr->title, op->contr->killer_name ());
2834	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);
2835	tmp->msg = buf;
2836	tmp->x = op->x, tmp->y = op->y;	2741	tmp->x = op->x, tmp->y = op->y;
2837	insert_ob_in_map (tmp, op->map, NULL, 0);	2742	insert_ob_in_map (tmp, op->map, NULL, 0);
2838		2743
2839	/**************************************/	2744	/**************************************/
2840	/* */	2745	/* */
2841	/* Subtract the experience points, */	2746	/* Subtract the experience points, */
2842	/* if we died cause of food, give us */
2843	/* food, and reset HP's... */
2844	/* */	2747	/* */
2845	/**************************************/	2748	/**************************************/
2846		2749
2847	/* remove any poisoning and confusion the character may be suffering. */
2848	/* restore player */
2849	at = archetype::find ("poisoning");
2850	tmp = present_arch_in_ob (at, op);
2851
2852	if (tmp)
2853	{
2854	tmp->destroy ();
2855	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2856	}
2857
2858	at = archetype::find ("confusion");
2859	tmp = present_arch_in_ob (at, op);
2860	if (tmp)
2861	{
2862	tmp->destroy ();
2863	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2864	}
2865
2866	cure_disease (op, 0); /* remove any disease */
2867
2868	/*add_exp(op, (op->stats.exp * -0.20)); */	2750	/*add_exp(op, (op->stats.exp * -0.20)); */
2869	apply_death_exp_penalty (op);	2751	apply_death_exp_penalty (op);
2870	if (op->stats.food < 100)
2871	op->stats.food = 900;
2872	op->stats.hp = op->stats.maxhp;
2873	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2874	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2875		2752
2876	/*	2753	/*
2877	* Check to see if the player has any unpaid items. If so, remove them	2754	* Check to see if the player has any unpaid items. If so, remove them
2878	* and put them back in the map.	2755	* and put them back in the map.
2879	*/	2756	*/
2880	remove_unpaid_objects (op->inv, op);	2757	op->drop_unpaid_items ();
2881		2758
2882	/****************************************/	2759	/****************************************/
2883	/* */	2760	/* */
2884	/* Move player to his current respawn- */	2761	/* Move player to his current respawn- */
2885	/* position (usually last savebed) */	2762	/* position (usually last savebed) */
…		…
2914	if (will_kill_again & (1 << at))	2791	if (will_kill_again & (1 << at))
2915	force->resist[at] = 100;	2792	force->resist[at] = 100;
2916		2793
2917	insert_ob_in_ob (force, op);	2794	insert_ob_in_ob (force, op);
2918	op->update_stats ();	2795	op->update_stats ();
2919
2920	}	2796	}
2921		2797
2922	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2798	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2923	}	2799	}
2924		2800
2925	void	2801	void
2926	loot_object (object *op)	2802	loot_object (object *op)
2927	{ /* Grab and destroy some treasure */	2803	{ /* Grab and destroy some treasure */
…		…
2944		2820
2945	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2821	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2946	{	2822	{
2947	if (tmp->nrof > 1)	2823	if (tmp->nrof > 1)
2948	{	2824	{
2949	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2825	tmp->decrease (rndm (1, tmp->nrof - 1));
2950	tmp2->destroy ();
2951	insert_ob_in_map (tmp, op->map, NULL, 0);	2826	insert_ob_in_map (tmp, op->map, NULL, 0);
2952	}	2827	}
2953	else	2828	else
2954	tmp->destroy ();	2829	tmp->destroy ();
2955	}	2830	}
…		…
2966	void	2841	void
2967	fix_weight (void)	2842	fix_weight (void)
2968	{	2843	{
2969	for_all_players (pl)	2844	for_all_players (pl)
2970	{	2845	{
2971	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2846	sint32 old = pl->ob->carrying;
2972		2847
2973	if (old == sum)	2848	pl->ob->update_weight ();
2974	continue;	2849
		2850	if (old != pl->ob->carrying)
		2851	{
2975	pl->ob->update_stats ();	2852	pl->ob->update_stats ();
2976	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2853	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2854	}
2977	}	2855	}
2978	}	2856	}
2979		2857
2980	void	2858	void
2981	fix_luck (void)	2859	fix_luck (void)
…		…
3023	}	2901	}
3024		2902
3025	void	2903	void
3026	make_visible (object *op)	2904	make_visible (object *op)
3027	{	2905	{
3028	op->hide = 0;	2906	op->flag [FLAG_HIDDEN] = 0;
3029	op->invisible = 0;	2907	op->invisible = 0;
		2908
3030	if (op->type == PLAYER)	2909	if (op->type == PLAYER)
3031	{	2910	{
3032	op->contr->tmp_invis = 0;	2911	op->contr->tmp_invis = 0;
3033	op->contr->invis_race = 0;	2912	op->contr->invis_race = 0;
3034	}	2913	}
…		…
3047		2926
3048	/* look at the surrounding terrain to determine	2927	/* look at the surrounding terrain to determine
3049	* the hideability of this object. Positive levels	2928	* the hideability of this object. Positive levels
3050	* indicate greater hideability.	2929	* indicate greater hideability.
3051	*/	2930	*/
3052
3053	int	2931	int
3054	hideability (object *ob)	2932	hideability (object *ob)
3055	{	2933	{
3056	int i, level = 0, mflag;	2934	int i, level = 0, mflag;
3057	sint16 x, y;	2935	sint16 x, y;
3058		2936
3059	if (!ob || !ob->map)	2937	if (!ob || !ob->map)
3060	return 0;	2938	return 0;
3061		2939
3062	/* so, on normal lighted maps, its hard to hide */	2940	/* so, on normal lighted maps, its hard to hide */
3063	level = ob->map->darkness - 2;	2941	level = ob->map->darklevel () - 2;
3064		2942
3065	/* this also picks up whether the object is glowing.	2943	/* this also picks up whether the object is glowing.
3066	* If you carry a light on a non-dark map, its not	2944	* If you carry a light on a non-dark map, its not
3067	* as bad as carrying a light on a pitch dark map */	2945	* as bad as carrying a light on a pitch dark map */
3068	if (has_carried_lights (ob))	2946	if (ob->has_carried_lights ())
3069	level = -(10 + (2 * ob->map->darkness));	2947	level = -(10 + (2 * ob->map->darklevel ()));
3070		2948
3071	/* scan through all nearby squares for terrain to hide in */	2949	/* scan through all nearby squares for terrain to hide in */
3072	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2950	for (i = 0, x = ob->x, y = ob->y;
		2951	i <= SIZEOFFREE1;
		2952	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3073	{	2953	{
3074	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2954	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3075	if (mflag & P_OUT_OF_MAP)	2955	if (mflag & P_OUT_OF_MAP)
3076	{
3077	continue;	2956	continue;
3078	}	2957
3079	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2958	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3080	level += 2;	2959	level += 2;
3081	else /* open terrain! */	2960	else /* open terrain! */
3082	level -= 1;	2961	level -= 1;
3083	}	2962	}
…		…
3094	* spot (surrounded by clear terrain in broad daylight). -b.t.	2973	* spot (surrounded by clear terrain in broad daylight). -b.t.
3095	*/	2974	*/
3096	void	2975	void
3097	do_hidden_move (object *op)	2976	do_hidden_move (object *op)
3098	{	2977	{
3099	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2978	int hide = 0;
3100	object *skop;
3101		2979
3102	if (!op || !op->map)	2980	if (!op || !op->map)
3103	return;	2981	return;
3104		2982
3105	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2983	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2984	int num = random_roll (0, 19, op, PREFER_LOW);
3106		2985
3107	/* its *extremely* hard to run and sneak/hide at the same time! */	2986	/* its *extremely* hard to run and sneak/hide at the same time! */
3108	if (op->type == PLAYER && op->contr->run_on)	2987	if (op->type == PLAYER && op->contr->run_on)
3109	if (!skop || num >= skop->level)	2988	if (!skop || num >= skop->level)
3110	{	2989	{
…		…
3120	num -= hide;	2999	num -= hide;
3121		3000
3122	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3001	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3123	{	3002	{
3124	make_visible (op);	3003	make_visible (op);
		3004
3125	if (op->type == PLAYER)	3005	if (op->type == PLAYER)
3126	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3006	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3127	}	3007	}
3128	else if (op->type == PLAYER && skop)	3008	else if (op->type == PLAYER && skop)
3129	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3009	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3182	* object op. This function works fine for monsters,	3062	* object op. This function works fine for monsters,
3183	* but we dont worry if the object isnt the top one in	3063	* but we dont worry if the object isnt the top one in
3184	* a pile (say a coin under a table would return "viewable"	3064	* a pile (say a coin under a table would return "viewable"
3185	* by this routine). Another question, should we be	3065	* by this routine). Another question, should we be
3186	* concerned with the direction the player is looking	3066	* concerned with the direction the player is looking
3187	* in? Realistically, most of use cant see stuff behind	3067	* in? Realistically, most of us can't see stuff behind
3188	* our backs...on the other hand, does the "facing" direction	3068	* our backs...on the other hand, does the "facing" direction
3189	* imply the way your head, or body is facing? Its possible	3069	* imply the way your head, or body is facing? It's possible
3190	* for them to differ. Sigh, this fctn could get a bit more complex.	3070	* for them to differ. Sigh, this fctn could get a bit more complex.
3191	* -b.t.	3071	* -b.t.
3192	* This function is now map tiling safe.	3072	* This function is now map tiling safe.
3193	*/	3073	*/
3194
3195	int	3074	int
3196	player_can_view (object *pl, object *op)	3075	player_can_view (object *pl, object *op)
3197	{	3076	{
3198	rv_vector rv;	3077	rv_vector rv;
3199	int dx, dy;	3078	int dx, dy;
…		…
3211		3090
3212	get_rangevector (pl, op, &rv, 0x1);	3091	get_rangevector (pl, op, &rv, 0x1);
3213		3092
3214	/* starting with the 'head' part, lets loop	3093	/* starting with the 'head' part, lets loop
3215	* through the object and find if it has any	3094	* through the object and find if it has any
3216	* part that is in the los array but isnt on	3095	* part that is in the los array but isn't on
3217	* a blocked los square.	3096	* a blocked los square.
3218	* we use the archetype to figure out offsets.	3097	* we use the archetype to figure out offsets.
3219	*/	3098	*/
3220	while (op)	3099	while (op)
3221	{	3100	{
3222	dx = rv.distance_x + op->arch->x;	3101	dx = rv.distance_x + op->arch->x;
3223	dy = rv.distance_y + op->arch->y;	3102	dy = rv.distance_y + op->arch->y;
3224		3103
3225	/* only the viewable area the player sees is updated by LOS	3104	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3226	* code, so we need to restrict ourselves to that range of values
3227	* for any meaningful values.
3228	*/
3229	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3230	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3231	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3232	return 1;	3105	return 1;
		3106
3233	op = op->more;	3107	op = op->more;
3234	}	3108	}
		3109
3235	return 0;	3110	return 0;
3236	}	3111	}
3237		3112
3238	/* routine for both players and monsters. We call this when	3113	/* routine for both players and monsters. We call this when
3239	* there is a possibility for our action distrubing our hiding	3114	* there is a possibility for our action distrubing our hiding
3240	* place or invisiblity spell. Artefact invisiblity is not	3115	* place or invisiblity spell. Artefact invisiblity causes
3241	* effected by this. If we arent invisible to begin with, we	3116	* "noise" instead. If we arent invisible to begin with, we
3242	* return 0.	3117	* return 0.
3243	*/	3118	*/
3244	int	3119	int
3245	action_makes_visible (object *op)	3120	action_makes_visible (object *op)
3246	{	3121	{
3247
3248	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3122	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3249	{	3123	{
3250	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3124	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3125	{
		3126	// artefact invisibility is permanent, but we still make noise
		3127	// this is important for game-balance.
		3128	if (op->contr)
		3129	op->make_noise ();
		3130
3251	return 0;	3131	return 0;
		3132	}
3252		3133
3253	if (op->contr && op->contr->tmp_invis == 0)	3134	if (op->contr && op->contr->tmp_invis == 0)
3254	return 0;	3135	return 0;
3255		3136
3256	/* If monsters, they should become visible */	3137	/* If monsters, they should become visible */
3257	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3138	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3258	{	3139	{
3259	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3140	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3260	return 1;	3141	return 1;
3261	}	3142	}
3262	}	3143	}
		3144
3263	return 0;	3145	return 0;
3264	}	3146	}
3265		3147
3266	/* op_on_battleground - checks if the given object op (usually	3148	/* op_on_battleground - checks if the given object op (usually
3267	* a player) is standing on a valid battleground-tile,	3149	* a player) is standing on a valid battleground-tile,
…		…
3272	* Default is to do the same as before, so only people wanting to have different points need worry about this	3154	* Default is to do the same as before, so only people wanting to have different points need worry about this
3273	*/	3155	*/
3274	int	3156	int
3275	op_on_battleground (object *op, int *x, int *y)	3157	op_on_battleground (object *op, int *x, int *y)
3276	{	3158	{
3277	object *tmp;
3278
3279	/* A battleground-tile needs the following attributes to be valid:	3159	/* A battleground-tile needs the following attributes to be valid:
3280	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3160	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3281	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3161	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3282	* and the exit-coordinates sp/hp must both be > 0.	3162	* and the exit-coordinates sp/hp must both be > 0.
3283	* => The intention here is to prevent abuse of the battleground-	3163	* => The intention here is to prevent abuse of the battleground-
3284	* feature (like pickable or hidden battleground tiles). */	3164	* feature (like pickable or hidden battleground tiles). */
3285	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3165	for (object *tmp = op->below; tmp; tmp = tmp->below)
3286	{	3166	{
3287	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3167	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3288	{	3168	{
3289	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3169	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3290	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3170	&& tmp->type == BATTLEGROUND
		3171	&& tmp->name == shstr_battleground
		3172	&& EXIT_X (tmp) && EXIT_Y (tmp))
3291	{	3173	{
3292	/*before we assign the exit, check if this is a teambattle */	3174	/* before we assign the exit, check if this is a teambattle */
3293	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3175	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3294	{	3176	{
3295	object *invtmp;
3296
3297	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3177	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3298	{	3178	{
3299	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3179	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3300	{	3180	{
3301	if (x != NULL && y != NULL)	3181	if (x && y)
3302	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3182	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3183
3303	return 1;	3184	return 1;
3304	}	3185	}
3305	}	3186	}
3306	}	3187	}
		3188
3307	if (x != NULL && y != NULL)	3189	if (x && y)
3308	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3190	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3191
3309	return 1;	3192	return 1;
3310	}	3193	}
3311	}	3194	}
3312	}	3195	}
		3196
3313	/* If we got here, did not find a battleground */	3197	/* If we got here, did not find a battleground */
3314	return 0;	3198	return 0;
3315	}	3199	}
3316		3200
3317	/*	3201	/*
…		…
3333	char buf[MAX_BUF]; /* tmp. string buffer */	3217	char buf[MAX_BUF]; /* tmp. string buffer */
3334	int i = 0, j = 0;	3218	int i = 0, j = 0;
3335		3219
3336	/* get the appropriate treasurelist */	3220	/* get the appropriate treasurelist */
3337	if (atnr == ATNR_FIRE)	3221	if (atnr == ATNR_FIRE)
3338	trlist = treasurelist::find ("dragon_ability_fire");	3222	trlist = treasurelist::find (shstr_dragon_ability_fire);
3339	else if (atnr == ATNR_COLD)	3223	else if (atnr == ATNR_COLD)
3340	trlist = treasurelist::find ("dragon_ability_cold");	3224	trlist = treasurelist::find (shstr_dragon_ability_cold);
3341	else if (atnr == ATNR_ELECTRICITY)	3225	else if (atnr == ATNR_ELECTRICITY)
3342	trlist = treasurelist::find ("dragon_ability_elec");	3226	trlist = treasurelist::find (shstr_dragon_ability_elec);
3343	else if (atnr == ATNR_POISON)	3227	else if (atnr == ATNR_POISON)
3344	trlist = treasurelist::find ("dragon_ability_poison");	3228	trlist = treasurelist::find (shstr_dragon_ability_poison);
3345		3229
3346	if (trlist == NULL || who->type != PLAYER)	3230	if (trlist == NULL || who->type != PLAYER)
3347	return;	3231	return;
3348		3232
3349	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3233	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3422	{	3306	{
3423	/* forces in the treasurelist can alter the player's stats */	3307	/* forces in the treasurelist can alter the player's stats */
3424	object *skin;	3308	object *skin;
3425		3309
3426	/* first get the dragon skin force */	3310	/* first get the dragon skin force */
3427	shstr_cmp dragon_skin_force ("dragon_skin_force");
3428	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)	3311	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3429	;	3312	;
3430		3313
3431	if (!skin)	3314	if (!skin)
3432	return;	3315	return;
3433		3316
…		…
3468	else	3351	else
3469	{	3352	{
3470	/* generate misc. treasure */	3353	/* generate misc. treasure */
3471	tmp = arch_to_object (tr->item);	3354	tmp = arch_to_object (tr->item);
3472	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3355	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3473	tmp = insert_ob_in_ob (tmp, who);	3356	who->insert (tmp);
3474	if (who->type == PLAYER)
3475	esrv_send_item (who, tmp);
3476	}	3357	}
3477	}	3358	}
3478		3359
3479	/**	3360	/**
3480	* Unready an object for a player. This function does nothing if the object was	3361	* Unready an object for a player. This function does nothing if the object was
…		…
3492	if (pl->ranged_ob == ob)	3373	if (pl->ranged_ob == ob)
3493	pl->ranged_ob = 0;	3374	pl->ranged_ob = 0;
3494	}	3375	}
3495		3376
3496	sint8	3377	sint8
3497	player::visibility_at (maptile *map, int x, int y) const	3378	player::darkness_at (maptile *map, int x, int y) const
3498	{	3379	{
3499	if (!ns)	3380	if (!ns)
3500	return 0;	3381	return LOS_BLOCKED;
3501		3382
3502	int dx, dy;	3383	int dx, dy;
3503	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3384	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3504	return 0;	3385	return LOS_BLOCKED;
3505		3386
3506	x += dx - ns->current_x + ns->mapx / 2;	3387	x += dx - ns->current_x;
3507	y += dy - ns->current_y + ns->mapy / 2;	3388	y += dy - ns->current_y;
3508		3389
3509	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3510	return 0;
3511
3512	return 100 - blocked_los [x][y];	3390	return blocked_los (x, y);
3513	}	3391	}
		3392
		3393	void
		3394	player::infobox (const char *title, const char *msg, int color)
		3395	{
		3396	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3397	}
		3398
		3399	void
		3400	player::statusmsg (const char *msg, int color)
		3401	{
		3402	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3403	}
		3404
		3405	void
		3406	player::failmsg (const char *msg, int color)
		3407	{
		3408	play_sound (sound_find ("generic_failure"));
		3409	statusmsg (msg, color);
		3410	}
		3411

Diff Legend

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