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.171 by root, Sat Sep 8 07:06:51 2007 UTC vs.
Revision 1.223 by root, Thu Jan 1 15:43:35 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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,
…		…
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 GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <sproto.h>	25	#include <sproto.h>
26	#include <sounds.h>	26	#include <sounds.h>
…		…
122	continue;	122	continue;
123		123
124	if (*buf == '%')	124	if (*buf == '%')
125	{ /* send one news */	125	{ /* send one news */
126	if (size > 0)	126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */	127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
		128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
		129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
		130	subject, news); /*send previously read news */
128		131
129	strcpy (subject, buf + 1);	132	strcpy (subject, buf + 1);
130	strip_endline (subject);	133	strip_endline (subject);
131	size = 0;	134	size = 0;
132	news[0] = '\0';	135	news[0] = '\0';
…		…
207	ob->close_container (); //TODO: client-specific	210	ob->close_container (); //TODO: client-specific
208		211
209	ns->update_look = 0;	212	ns->update_look = 0;
210	ns->look_position = 0;	213	ns->look_position = 0;
211		214
212	clear_los (this);	215	clear_los ();
213		216
214	ns->reset_stats ();	217	ns->reset_stats ();
215		218
216	/* make sure he's a player -- needed because of class change. */	219	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	220	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->race;	221	ob->race = ob->arch->race;
219		222
220	ob->carrying = sum_weight (ob);	223	ob->update_weight ();
221	link_player_skills (ob);	224	link_skills ();
222		225
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		227
225	assign (title, ob->arch->object::name);	228	assign (title, ob->arch->object::name);
226		229
…		…
239	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
240	}	243	}
241		244
242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243		246
244	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this);
		248
		249	ob->update_stats ();
		250
		251	ns->floorbox_update ();
		252	esrv_send_inventory (ob, ob);
		253	esrv_add_spells (this, 0);
		254
		255	activate ();
		256
		257	send_rules (ob);
		258	send_news (ob);
		259	display_motd (ob);
		260
		261	INVOKE_PLAYER (CONNECT, this);
		262	INVOKE_PLAYER (LOGIN, this);
		263	}
		264
		265	void
		266	player::disconnect ()
		267	{
		268	if (ob)
		269	{
		270	ob->close_container (); //TODO: client-specific
		271	ob->drop_unpaid_items ();
		272	}
		273
		274	if (ns)
		275	{
		276	if (active)
		277	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		278
		279	INVOKE_PLAYER (DISCONNECT, this);
		280
		281	ns->reset_stats ();
		282	ns->pl = 0;
		283	ns = 0;
		284	}
		285
		286	observe = ob;
		287
		288	deactivate ();
		289	}
		290
		291	// the need for this function can be explained
		292	// by load_object not returning the object
		293	void
		294	player::set_object (object *op)
		295	{
		296	ob = observe = op;
		297	ob->contr = this; /* this aren't yet in archetype */
		298
		299	ob->speed = 1.0f;
		300	ob->speed_left = 0.5f;
		301
		302	ob->direction = 5; /* So player faces south */
245		303
246	ob->flag [FLAG_READY_WEAPON] = false;	304	ob->flag [FLAG_READY_WEAPON] = false;
247	ob->flag [FLAG_READY_SKILL] = false;	305	ob->flag [FLAG_READY_SKILL] = false;
248	ob->flag [FLAG_READY_BOW] = false;	306	ob->flag [FLAG_READY_BOW] = false;
249		307
…		…
266	combat_ob = op;	324	combat_ob = op;
267	break;	325	break;
268	}	326	}
269		327
270	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
271	ob->update_stats ();	329	ob->deactivate (); // change_weapon activates, fix this better
272
273	ns->floorbox_update ();
274	esrv_send_inventory (ob, ob);
275	esrv_add_spells (this, 0);
276
277	activate ();
278
279	send_rules (ob);
280	send_news (ob);
281	display_motd (ob);
282
283	INVOKE_PLAYER (CONNECT, this);
284	INVOKE_PLAYER (LOGIN, this);
285	}
286
287	void
288	player::disconnect ()
289	{
290	if (ob)
291	{
292	ob->close_container (); //TODO: client-specific
293	ob->drop_unpaid_items ();
294	}
295
296	if (ns)
297	{
298	if (active)
299	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
300
301	INVOKE_PLAYER (DISCONNECT, this);
302
303	ns->reset_stats ();
304	ns->pl = 0;
305	ns = 0;
306	}
307
308	observe = ob;
309
310	deactivate ();
311	}
312
313	// the need for this function can be explained
314	// by load_object not returning the object
315	void
316	player::set_object (object *op)
317	{
318	ob = observe = op;
319	ob->contr = this; /* this aren't yet in archetype */
320
321	ob->speed = 1.0f;
322	ob->speed_left = 0.5f;
323
324	ob->direction = 5; /* So player faces south */
325	}	330	}
326		331
327	void	332	void
328	player::set_observe (object *op)	333	player::set_observe (object *op)
329	{	334	{
…		…
343	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
344		349
345	gen_sp_armour = 10;	350	gen_sp_armour = 10;
346	bowtype = bow_normal;	351	bowtype = bow_normal;
347	petmode = pet_normal;	352	petmode = pet_normal;
348	listening = 10;
349	usekeys = containers;	353	usekeys = containers;
350	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
351	do_los = 1;	355	do_los = 1;
352		356
353	weapon_sp = 1.0f;	357	weapon_sp = 1.0f;
…		…
402	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
403	*/	407	*/
404	archetype *	408	archetype *
405	get_player_archetype (archetype *at)	409	get_player_archetype (archetype *at)
406	{	410	{
		411	// archetypes could have been reloaded
		412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		413
		414	if (!nat)
		415	return at;
		416
407	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	417	archvec::iterator i = archetypes.find (nat);
408		418
409	for (;;)	419	for (;;)
410	{	420	{
411	if (++i == archetypes.end ())	421	if (++i == archetypes.end ())
412	i = archetypes.begin ();	422	i = archetypes.begin ();
…		…
630		640
631	return firstdir;	641	return firstdir;
632	}	642	}
633		643
634	void	644	void
635	give_initial_items (object *pl, treasurelist * items)	645	give_initial_items (object *pl, treasurelist *items)
636	{	646	{
637	object *op, *next = NULL;
638
639	if (pl->randomitems != NULL)	647	if (pl->randomitems)
640	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641		649
642	for (op = pl->inv; op; op = next)	650	for (object *next, *op = pl->inv; op; op = next)
643	{	651	{
644	next = op->below;	652	next = op->below;
645		653
646	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
647	* flag "neutral" set. Sorry but I can't think of a better way	655	* flag "neutral" set. Sorry but I can't think of a better way
…		…
652	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
653	* by this player due to race restrictions	661	* by this player due to race restrictions
654	*/	662	*/
655	if (pl->type == PLAYER)	663	if (pl->type == PLAYER)
656	{	664	{
657	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
658	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
659	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
660	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
		670	|| op->type == BRACERS || op->type == GIRDLE))
661	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
662	{	672	{
663	op->destroy ();	673	op->destroy ();
664	continue;	674	continue;
665	}	675	}
666	}	676	}
…		…
689	if (op->nrof > 1)	699	if (op->nrof > 1)
690	op->nrof = 1;	700	op->nrof = 1;
691	}	701	}
692		702
693	if (op->type == SPELLBOOK && op->inv)	703	if (op->type == SPELLBOOK && op->inv)
694	{
695	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
696	}
697		705
698	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
699	* items. Just don't identify gold or silver, or it won't be	707	* items. Just don't identify gold or silver, or it won't be
700	* merged properly.	708	* merged properly.
701	*/	709	*/
702	if (need_identify (op))	710	if (need_identify (op))
703	{	711	{
704	SET_FLAG (op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
705	CLEAR_FLAG (op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
706	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
707	}	715	}
		716
708	if (op->type == SPELL)	717	if (op->type == SPELL)
709	{	718	{
710	op->destroy ();	719	op->destroy ();
711	continue;	720	continue;
712	}	721	}
…		…
714	{	723	{
715	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
716	op->stats.exp = 0;	725	op->stats.exp = 0;
717	op->level = 1;	726	op->level = 1;
718	}	727	}
719	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
720	else
721	SET_FLAG (op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
722	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
723		731
724	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
725	link_player_skills (pl);	733	pl->contr->link_skills ();
726	}	734	}
727		735
728	void	736	void
729	get_party_password (object *op, partylist *party)	737	get_party_password (object *op, partylist *party)
730	{	738	{
…		…
831	static void	839	static void
832	start_info (object *op)	840	start_info (object *op)
833	{	841	{
834	char buf[MAX_BUF];	842	char buf[MAX_BUF];
835		843
836	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
837	new_draw_info (NDI_UNIQUE, 0, op, buf);	845	new_draw_info (NDI_UNIQUE, 0, op, buf);
838	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
839	//new_draw_info (NDI_UNIQUE, 0, op, " ");
840	}	846	}
841		847
842	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
843	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
844	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
…		…
847	*/	853	*/
848	void	854	void
849	player::chargen_race_done ()	855	player::chargen_race_done ()
850	{	856	{
851	/* this must before then initial items are given */	857	/* this must before then initial items are given */
852	esrv_new_player (ob->contr, ob->weight + ob->carrying);	858	esrv_new_player (ob->contr);
853		859
854	treasurelist *tl = treasurelist::find ("starting_wealth");	860	treasurelist *tl = treasurelist::find ("starting_wealth");
855	if (tl)	861	if (tl)
856	create_treasure (tl, ob, 0, 0, 0);	862	create_treasure (tl, ob, 0, 0, 0);
857		863
…		…
861	ob->contr->ns->state = ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
862		868
863	if (ob->msg)	869	if (ob->msg)
864	ob->msg = 0;	870	ob->msg = 0;
865		871
866	/* We create this now because some of the unique maps will need it
867	* to save here.
868	*/
869	{
870	char buf[MAX_BUF];
871	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
872	make_path_to_file (buf);
873	}
874
875	start_info (ob);	872	start_info (ob);
876	CLEAR_FLAG (ob, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
877	give_initial_items (ob, ob->randomitems);	874	give_initial_items (ob, ob->randomitems);
878	link_player_skills (ob);
879	esrv_send_inventory (ob, ob);	875	esrv_send_inventory (ob, ob);
880	ob->update_stats ();	876	ob->update_stats ();
881		877
882	/* This moves the player to a different start map, if there	878	/* This moves the player to a different start map, if there
883	* is one for this race	879	* is one for this race
884	*/	880	*/
885	if (*first_map_ext_path)	881	if (*first_map_ext_path)
886	{	882	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
887	object *tmp;
888	char mapname[MAX_BUF];
889
890	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
891	tmp = object::create ();
892	EXIT_PATH (tmp) = mapname;
893	EXIT_X (tmp) = ob->x;
894	EXIT_Y (tmp) = ob->y;
895	ob->enter_exit (tmp); /* we don't really care if it succeeded;
896	* if the map isn't there, then stay on the
897	* default initial map */
898	tmp->destroy ();
899	}
900	else	883	else
901	LOG (llevDebug, "first_map_ext_path not set\n");	884	LOG (llevDebug, "first_map_ext_path not set\n");
902	}	885	}
903		886
904	void	887	void
…		…
948	LOG (llevDebug, "Fleeing player is dead.\n");	931	LOG (llevDebug, "Fleeing player is dead.\n");
949	CLEAR_FLAG (op, FLAG_SCARED);	932	CLEAR_FLAG (op, FLAG_SCARED);
950	return;	933	return;
951	}	934	}
952		935
953	if (op->enemy == NULL)	936	if (!op->enemy)
954	{	937	{
955	LOG (llevDebug, "Fleeing player had no enemy.\n");	938	LOG (llevDebug, "Fleeing player had no enemy.\n");
956	CLEAR_FLAG (op, FLAG_SCARED);	939	CLEAR_FLAG (op, FLAG_SCARED);
957	return;	940	return;
958	}	941	}
959		942
960	/* Seen some crashes here. Since we don't store an
961	* op->enemy_count, it is possible that something destroys the
962	* actual enemy, and the object is recycled.
963	*/
964	if (op->enemy->map == NULL)
965	{
966	CLEAR_FLAG (op, FLAG_SCARED);
967	op->enemy = NULL;
968	return;
969	}
970
971	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	943	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
972	{	944	{
973	op->enemy = NULL;	945	op->enemy = NULL;
974	CLEAR_FLAG (op, FLAG_SCARED);	946	CLEAR_FLAG (op, FLAG_SCARED);
975	return;	947	return;
…		…
978	get_rangevector (op, op->enemy, &rv, 0);	950	get_rangevector (op, op->enemy, &rv, 0);
979		951
980	dir = absdir (4 + rv.direction);	952	dir = absdir (4 + rv.direction);
981	for (diff = 0; diff < 3; diff++)	953	for (diff = 0; diff < 3; diff++)
982	{	954	{
983	int m = 1 - (RANDOM () & 2);	955	int m = 1 - rndm (2) * 2;
984		956
985	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	957	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
986	return;	958	return;
987	}	959	}
988		960
…		…
999	check_pick (object *op)	971	check_pick (object *op)
1000	{	972	{
1001	object *tmp, *next;	973	object *tmp, *next;
1002	int stop = 0;	974	int stop = 0;
1003	int wvratio;	975	int wvratio;
1004	char putstring[128];
1005		976
1006	/* if you're flying, you cna't pick up anything */	977	/* if you're flying, you cna't pick up anything */
1007	if (op->move_type & MOVE_FLYING)	978	if (op->move_type & MOVE_FLYING)
1008	return 1;	979	return 1;
1009		980
1010	next = op->below;	981	next = op->below;
1011		982
		983	int cnt = MAX_ITEM_PER_DROP;
		984	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		985
1012	/* loop while there are items on the floor that are not marked as	986	/* loop while there are items on the floor that are not marked as
1013	* destroyed */	987	* destroyed */
1014	while (next && !next->destroyed ())	988	while (next && !next->destroyed ())
1015	{	989	{
1016	tmp = next;	990	tmp = next;
1017	next = tmp->below;	991	next = tmp->below;
1018		992
		993	if (cnt <= 0)
		994	{
		995	op->failmsg ("Couldn't pickup all items at once.");
		996	return 0;
		997	}
		998
1019	if (op->destroyed ())	999	if (op->destroyed ())
1020	return 0;	1000	return 0;
1021		1001
1022	if (!can_pick (op, tmp))	1002	if (!can_pick (op, tmp))
1023	continue;	1003	continue;
1024		1004
1025	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1005	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1026	{	1006	{
1027	if (item_matched_string (op, tmp, op->contr->search_str))	1007	if (item_matched_string (op, tmp, op->contr->search_str))
1028	pick_up (op, tmp);	1008	CHK_PICK_PICKUP;
		1009
1029	continue;	1010	continue;
1030	}	1011	}
1031		1012
1032	/* high not bit set? We're using the old autopickup model */	1013	/* pickup handling */
		1014	if (op->contr->mode & PU_DEBUG)
		1015	{
		1016	/* some debugging code to figure out item information */
		1017	const char *str = tmp->name
		1018	? format ("item name: %s item type: %d weight/value: %d",
		1019	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		1020	: format ("item name: %s item type: %d weight/value: %d",
		1021	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1022
		1023	new_draw_info (NDI_UNIQUE, 0, op, str);
		1024	}
		1025
		1026	if (op->contr->mode & PU_INHIBIT)
		1027	return 1;
		1028
		1029	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		1030	return 1;
		1031
		1032	/* philosophy:
		1033	* It's easy to grab an item type from a pile, as long as it's
		1034	* generic. This takes no game-time. For more detailed pickups
		1035	* and selections, select-items should be used. This is a
		1036	* grab-as-you-run type mode that's really useful for arrows for
		1037	* example.
		1038	* The drawback: right now it has no frontend, so you need to
		1039	* stick the bits you want into a calculator in hex mode and then
		1040	* convert to decimal and then 'pickup <#>
		1041	*/
		1042
		1043	/* the first two modes are exclusive: if NOTHING we return, if
		1044	* STOP then we stop. All the rest are applied sequentially,
		1045	* meaning if any test passes, the item gets picked up. */
		1046
		1047	/* if mode is set to pick nothing up, return */
		1048	if (op->contr->mode == PU_NOTHING)
		1049	return 1;
		1050
		1051	/* if mode is set to stop when encountering objects, return */
		1052	/* take STOP before INHIBIT since it doesn't actually pick
		1053	* anything up */
		1054	if (op->contr->mode & PU_STOP)
		1055	return 0;
		1056
		1057	/* useful for going into stores and not losing your settings... */
		1058	/* and for battles wher you don't want to get loaded down while
		1059	* fighting */
		1060	if (op->contr->mode & PU_INHIBIT)
		1061	return 1;
		1062
		1063	/* prevent us from turning into auto-thieves :) */
		1064	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		1065	continue;
		1066
		1067	/* ignore known cursed objects */
		1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		1069	continue;
		1070
		1071	/* all food and drink if desired */
		1072	/* question: don't pick up known-poisonous stuff? */
1033	if (!(op->contr->mode & PU_NEWMODE))	1073	if (op->contr->mode & PU_FOOD)
		1074	if (tmp->type == FOOD)
1034	{	1075	{
1035	switch (op->contr->mode)	1076	CHK_PICK_PICKUP;
		1077	continue;
		1078	}
		1079
		1080	if (op->contr->mode & PU_DRINK)
		1081	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		1082	{
		1083	CHK_PICK_PICKUP;
		1084	continue;
		1085	}
		1086
		1087	if (op->contr->mode & PU_POTION)
		1088	if (tmp->type == POTION)
		1089	{
		1090	CHK_PICK_PICKUP;
		1091	continue;
		1092	}
		1093
		1094	/* spellbooks, skillscrolls and normal books/scrolls */
		1095	if (op->contr->mode & PU_SPELLBOOK)
		1096	if (tmp->type == SPELLBOOK)
		1097	{
		1098	CHK_PICK_PICKUP;
		1099	continue;
		1100	}
		1101
		1102	if (op->contr->mode & PU_SKILLSCROLL)
		1103	if (tmp->type == SKILLSCROLL)
		1104	{
		1105	CHK_PICK_PICKUP;
		1106	continue;
		1107	}
		1108
		1109	if (op->contr->mode & PU_READABLES)
		1110	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		1111	{
		1112	CHK_PICK_PICKUP;
		1113	continue;
		1114	}
		1115
		1116	/* wands/staves/rods/horns */
		1117	if (op->contr->mode & PU_MAGIC_DEVICE)
		1118	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1119	{
		1120	CHK_PICK_PICKUP;
		1121	continue;
		1122	}
		1123
		1124	/* pick up all magical items */
		1125	if (op->contr->mode & PU_MAGICAL)
		1126	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1127	{
		1128	CHK_PICK_PICKUP;
		1129	continue;
		1130	}
		1131
		1132	if (op->contr->mode & PU_VALUABLES)
		1133	{
		1134	if (tmp->type == MONEY || tmp->type == GEM)
1036	{	1135	{
1037	case 0:	1136	CHK_PICK_PICKUP;
1038	return 1; /* don't pick up */	1137	continue;
1039	case 1:
1040	pick_up (op, tmp);
1041	return 1;
1042	case 2:
1043	pick_up (op, tmp);
1044	return 0;
1045	case 3:
1046	return 0; /* stop before pickup */
1047	case 4:
1048	pick_up (op, tmp);
1049	break;
1050	case 5:
1051	pick_up (op, tmp);
1052	stop = 1;
1053	break;
1054	case 6:
1055	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1056	pick_up (op, tmp);
1057	break;
1058
1059	case 7:
1060	if (tmp->type == MONEY || tmp->type == GEM)
1061	pick_up (op, tmp);
1062	break;
1063
1064	default:
1065	/* use value density */
1066	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1067	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1068	pick_up (op, tmp);
1069	}	1138	}
1070	}	1139	}
1071	else	1140
1072	{ /* old model */	1141	/* rings & amulets - talismans seems to be typed AMULET */
1073	/* NEW pickup handling */
1074	if (op->contr->mode & PU_DEBUG)	1142	if (op->contr->mode & PU_JEWELS)
		1143	if (tmp->type == RING || tmp->type == AMULET)
1075	{	1144	{
1076	/* some debugging code to figure out item information */	1145	CHK_PICK_PICKUP;
1077	if (tmp->name != NULL)
1078	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1079	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1080	else
1081	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1082	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1083
1084	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1085	}
1086
1087	/* philosophy:
1088	* It's easy to grab an item type from a pile, as long as it's
1089	* generic. This takes no game-time. For more detailed pickups
1090	* and selections, select-items should be used. This is a
1091	* grab-as-you-run type mode that's really useful for arrows for
1092	* example.
1093	* The drawback: right now it has no frontend, so you need to
1094	* stick the bits you want into a calculator in hex mode and then
1095	* convert to decimal and then 'pickup <#>
1096	*/
1097
1098	/* the first two modes are exclusive: if NOTHING we return, if
1099	* STOP then we stop. All the rest are applied sequentially,
1100	* meaning if any test passes, the item gets picked up. */
1101
1102	/* if mode is set to pick nothing up, return */
1103
1104	if (op->contr->mode & PU_NOTHING)
1105	return 1;
1106
1107	/* if mode is set to stop when encountering objects, return */
1108	/* take STOP before INHIBIT since it doesn't actually pick
1109	* anything up */
1110
1111	if (op->contr->mode & PU_STOP)
1112	return 0;
1113
1114	/* useful for going into stores and not losing your settings... */
1115	/* and for battles wher you don't want to get loaded down while
1116	* fighting */
1117	if (op->contr->mode & PU_INHIBIT)
1118	return 1;
1119
1120	/* prevent us from turning into auto-thieves :) */
1121	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1122	continue;	1146	continue;
		1147	}
1123		1148
1124	/* ignore known cursed objects */	1149	/* we don't forget dragon food */
1125	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1150	if (op->contr->mode & PU_FLESH)
		1151	if (tmp->type == FLESH)
		1152	{
		1153	CHK_PICK_PICKUP;
1126	continue;	1154	continue;
		1155	}
1127		1156
1128	/* all food and drink if desired */	1157	/* bows and arrows. Bows are good for selling! */
1129	/* question: don't pick up known-poisonous stuff? */	1158	if (op->contr->mode & PU_BOW)
		1159	if (tmp->type == BOW)
		1160	{
		1161	CHK_PICK_PICKUP;
		1162	continue;
		1163	}
		1164
		1165	if (op->contr->mode & PU_ARROW)
		1166	if (tmp->type == ARROW)
		1167	{
		1168	CHK_PICK_PICKUP;
		1169	continue;
		1170	}
		1171
		1172	/* all kinds of armor etc. */
		1173	if (op->contr->mode & PU_ARMOUR)
		1174	if (tmp->type == ARMOUR)
		1175	{
		1176	CHK_PICK_PICKUP;
		1177	continue;
		1178	}
		1179
		1180	if (op->contr->mode & PU_HELMET)
		1181	if (tmp->type == HELMET)
		1182	{
		1183	CHK_PICK_PICKUP;
		1184	continue;
		1185	}
		1186
		1187	if (op->contr->mode & PU_SHIELD)
		1188	if (tmp->type == SHIELD)
		1189	{
		1190	CHK_PICK_PICKUP;
		1191	continue;
		1192	}
		1193
1130	if (op->contr->mode & PU_FOOD)	1194	if (op->contr->mode & PU_BOOTS)
1131	if (tmp->type == FOOD)	1195	if (tmp->type == BOOTS)
		1196	{
		1197	CHK_PICK_PICKUP;
		1198	continue;
		1199	}
		1200
		1201	if (op->contr->mode & PU_GLOVES)
		1202	if (tmp->type == GLOVES)
		1203	{
		1204	CHK_PICK_PICKUP;
		1205	continue;
		1206	}
		1207
		1208	if (op->contr->mode & PU_CLOAK)
		1209	if (tmp->type == CLOAK)
		1210	{
		1211	CHK_PICK_PICKUP;
		1212	continue;
		1213	}
		1214
		1215	/* hoping to catch throwing daggers here */
		1216	if (op->contr->mode & PU_MISSILEWEAPON)
		1217	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1218	{
		1219	CHK_PICK_PICKUP;
		1220	continue;
		1221	}
		1222
		1223	/* careful: chairs and tables are weapons! */
		1224	if (op->contr->mode & PU_ALLWEAPON)
		1225	{
		1226	if (tmp->type == WEAPON)
		1227	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1132	{	1228	{
1133	pick_up (op, tmp);	1229	CHK_PICK_PICKUP;
1134	continue;	1230	continue;
1135	}	1231	}
		1232	}
1136		1233
		1234	/* misc stuff that's useful */
1137	if (op->contr->mode & PU_DRINK)	1235	if (op->contr->mode & PU_KEY)
1138	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1236	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1139	{	1237	{
1140	pick_up (op, tmp);	1238	CHK_PICK_PICKUP;
1141	continue;	1239	continue;
1142	}	1240	}
1143		1241
		1242	/* any of the last 4 bits set means we use the ratio for value
		1243	* pickups */
1144	if (op->contr->mode & PU_POTION)	1244	if (op->contr->mode & PU_RATIO)
1145	if (tmp->type == POTION)	1245	{
		1246	/* use value density to decide what else to grab */
		1247	/* >=7 was >= op->contr->mode */
		1248	/* >=7 is the old standard setting. Now we take the last 4 bits
1146	{	1249	*/
1147	pick_up (op, tmp);
1148	continue;
1149	}
1150
1151	/* spellbooks, skillscrolls and normal books/scrolls */
1152	if (op->contr->mode & PU_SPELLBOOK)
1153	if (tmp->type == SPELLBOOK)
1154	{
1155	pick_up (op, tmp);
1156	continue;
1157	}
1158
1159	if (op->contr->mode & PU_SKILLSCROLL)
1160	if (tmp->type == SKILLSCROLL)
1161	{
1162	pick_up (op, tmp);
1163	continue;
1164	}
1165
1166	if (op->contr->mode & PU_READABLES)
1167	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1168	{
1169	pick_up (op, tmp);
1170	continue;
1171	}
1172
1173	/* wands/staves/rods/horns */
1174	if (op->contr->mode & PU_MAGIC_DEVICE)
1175	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1176	{
1177	pick_up (op, tmp);
1178	continue;
1179	}
1180
1181	/* pick up all magical items */
1182	if (op->contr->mode & PU_MAGICAL)	1250	wvratio = op->contr->mode & PU_RATIO;
1183	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1251	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1184	{
1185	pick_up (op, tmp);
1186	continue;
1187	}
1188
1189	if (op->contr->mode & PU_VALUABLES)
1190	{	1252	{
1191	if (tmp->type == MONEY || tmp->type == GEM)	1253	#if 0
		1254	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1255	if (tmp->name != NULL)
1192	{	1256	{
1193	pick_up (op, tmp);	1257	fprintf (stderr, "%s", tmp->name);
1194	continue;
1195	}	1258	}
1196	}
1197
1198	/* rings & amulets - talismans seems to be typed AMULET */
1199	if (op->contr->mode & PU_JEWELS)
1200	if (tmp->type == RING || tmp->type == AMULET)
1201	{
1202	pick_up (op, tmp);
1203	continue;
1204	}
1205
1206	/* we don't forget dragon food */
1207	if (op->contr->mode & PU_FLESH)
1208	if (tmp->type == FLESH)
1209	{
1210	pick_up (op, tmp);
1211	continue;
1212	}
1213
1214	/* bows and arrows. Bows are good for selling! */
1215	if (op->contr->mode & PU_BOW)
1216	if (tmp->type == BOW)
1217	{
1218	pick_up (op, tmp);
1219	continue;
1220	}
1221
1222	if (op->contr->mode & PU_ARROW)
1223	if (tmp->type == ARROW)
1224	{
1225	pick_up (op, tmp);
1226	continue;
1227	}
1228
1229	/* all kinds of armor etc. */
1230	if (op->contr->mode & PU_ARMOUR)
1231	if (tmp->type == ARMOUR)
1232	{
1233	pick_up (op, tmp);
1234	continue;
1235	}
1236
1237	if (op->contr->mode & PU_HELMET)
1238	if (tmp->type == HELMET)
1239	{
1240	pick_up (op, tmp);
1241	continue;
1242	}
1243
1244	if (op->contr->mode & PU_SHIELD)
1245	if (tmp->type == SHIELD)
1246	{
1247	pick_up (op, tmp);
1248	continue;
1249	}
1250
1251	if (op->contr->mode & PU_BOOTS)
1252	if (tmp->type == BOOTS)
1253	{
1254	pick_up (op, tmp);
1255	continue;
1256	}
1257
1258	if (op->contr->mode & PU_GLOVES)
1259	if (tmp->type == GLOVES)
1260	{
1261	pick_up (op, tmp);
1262	continue;
1263	}
1264
1265	if (op->contr->mode & PU_CLOAK)
1266	if (tmp->type == CLOAK)
1267	{
1268	pick_up (op, tmp);
1269	continue;
1270	}
1271
1272	/* hoping to catch throwing daggers here */
1273	if (op->contr->mode & PU_MISSILEWEAPON)
1274	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1275	{
1276	pick_up (op, tmp);
1277	continue;
1278	}
1279
1280	/* careful: chairs and tables are weapons! */
1281	if (op->contr->mode & PU_ALLWEAPON)
1282	{
1283	if (tmp->type == WEAPON && tmp->name != NULL)
1284	{
1285	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1286	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1287	{
1288	pick_up (op, tmp);
1289	continue;
1290	}
1291	}
1292
1293	if (tmp->type == WEAPON && tmp->name == NULL)
1294	{
1295	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1296	{
1297	pick_up (op, tmp);
1298	continue;
1299	}
1300	}
1301	}
1302
1303	/* misc stuff that's useful */
1304	if (op->contr->mode & PU_KEY)
1305	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1306	{
1307	pick_up (op, tmp);
1308	continue;
1309	}
1310
1311	/* any of the last 4 bits set means we use the ratio for value
1312	* pickups */
1313	if (op->contr->mode & PU_RATIO)
1314	{
1315	/* use value density to decide what else to grab */
1316	/* >=7 was >= op->contr->mode */
1317	/* >=7 is the old standard setting. Now we take the last 4 bits
1318	* and multiply them by 5, giving 0..15*5== 5..75 */
1319	wvratio = (op->contr->mode & PU_RATIO) * 5;
1320	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1321	{
1322	pick_up (op, tmp);
1323	#if 0
1324	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1325	if (tmp->name != NULL)
1326	{
1327	fprintf (stderr, "%s", tmp->name);
1328	}
1329	else	1259	else
1330	fprintf (stderr, "%s", tmp->arch->archname);	1260	fprintf (stderr, "%s", tmp->arch->archname);
1331	fprintf (stderr, ",%d] = ", tmp->type);	1261	fprintf (stderr, ",%d] = ", tmp->type);
1332	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1262	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1333	#endif	1263	#endif
		1264	CHK_PICK_PICKUP;
1334	continue;	1265	continue;
1335	}
1336	}	1266	}
1337	} /* the new pickup model */	1267	} /* the new pickup model */
1338	}	1268	}
1339		1269
1340	return !stop;	1270	return !stop;
…		…
1346	* found object is returned.	1276	* found object is returned.
1347	*/	1277	*/
1348	object *	1278	object *
1349	find_arrow (object *op, const char *type)	1279	find_arrow (object *op, const char *type)
1350	{	1280	{
1351	object *tmp = 0;
1352
1353	for (op = op->inv; op; op = op->below)	1281	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1354	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1355	tmp = find_arrow (op, type);
1356	else if (op->type == ARROW && op->race == type)	1282	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1283	return splay (tmp);
		1284
		1285	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1286	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1287	if (object *arrow = find_arrow (tmp, type))
		1288	{
		1289	splay (tmp);
1357	return op;	1290	return arrow;
		1291	}
1358		1292
1359	return tmp;	1293	return 0;
1360	}	1294	}
1361		1295
1362	/*	1296	/*
1363	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1297	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1364	* against the target. A full test is not performed, simply a basic test	1298	* against the target. A full test is not performed, simply a basic test
1365	* of resistances. The archer is making a quick guess at what he sees down	1299	* of resistances. The archer is making a quick guess at what he sees down
1366	* the hall. Failing that it does it's best to pick the highest plus arrow.	1300	* the hall. Failing that it does it's best to pick the highest plus arrow.
1367	*/	1301	*/
1368	object *	1302	object *
1369	find_better_arrow (object *op, object *target, const char *type, int *better)	1303	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1370	{	1304	{
1371	object *tmp = NULL, *arrow, *ntmp;	1305	object *tmp = NULL, *arrow, *ntmp;
1372	int attacknum, attacktype, betterby = 0, i;	1306	int attacknum, attacktype, betterby = 0, i;
1373		1307
1374	if (!type)	1308	if (!type)
…		…
1378	{	1312	{
1379	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1313	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1380	{	1314	{
1381	i = 0;	1315	i = 0;
1382	ntmp = find_better_arrow (arrow, target, type, &i);	1316	ntmp = find_better_arrow (arrow, target, type, &i);
		1317
1383	if (i > betterby)	1318	if (i > betterby)
1384	{	1319	{
1385	tmp = ntmp;	1320	tmp = ntmp;
1386	betterby = i;	1321	betterby = i;
1387	}	1322	}
1388	}	1323	}
1389	else if (arrow->type == ARROW && arrow->race == type)	1324	else if (arrow->type == ARROW && arrow->race == type)
1390	{	1325	{
1391	/* allways prefer assasination/slaying */	1326	/* allways prefer assasination/slaying */
1392	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1327	if (target->race && arrow->slaying && arrow->slaying.contains (target->race))
1393	{	1328	{
1394	if (arrow->attacktype & AT_DEATH)	1329	if (arrow->attacktype & AT_DEATH)
1395	{	1330	{
1396	*better = 100;	1331	*better = 100;
1397	return arrow;	1332	return arrow;
…		…
1412	{	1347	{
1413	tmp = arrow;	1348	tmp = arrow;
1414	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1349	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1415	}	1350	}
1416	}	1351	}
		1352
1417	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1353	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1418	{	1354	{
1419	tmp = arrow;	1355	tmp = arrow;
1420	betterby = 2 + arrow->magic + arrow->stats.dam;	1356	betterby = 2 + arrow->magic + arrow->stats.dam;
1421	}	1357	}
		1358
1422	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1359	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1423	{	1360	{
1424	tmp = arrow;	1361	tmp = arrow;
1425	betterby = 1 + arrow->magic + arrow->stats.dam;	1362	betterby = 1 + arrow->magic + arrow->stats.dam;
1426	}	1363	}
1427	}	1364	}
1428	}	1365	}
1429	}	1366	}
		1367
1430	if (tmp == NULL && arrow == NULL)	1368	if (tmp == NULL && arrow == NULL)
1431	return find_arrow (op, type);	1369	return find_arrow (op, type);
1432		1370
1433	*better = betterby;	1371	*better = betterby;
1434	return tmp;	1372	return tmp;
…		…
1439	* op = the shooter	1377	* op = the shooter
1440	* type = bow->race	1378	* type = bow->race
1441	* dir = fire direction	1379	* dir = fire direction
1442	*/	1380	*/
1443	object *	1381	object *
1444	pick_arrow_target (object *op, const char *type, int dir)	1382	pick_arrow_target (object *op, shstr_cmp type, int dir)
1445	{	1383	{
1446	object *tmp = NULL;	1384	object *tmp = NULL;
1447	maptile *m;	1385	maptile *m;
1448	int i, mflags, found, number;	1386	int i, mflags, found, number;
1449	sint16 x, y;	1387	sint16 x, y;
…		…
1464	for (i = 0, found = 0; i < 20; i++)	1402	for (i = 0, found = 0; i < 20; i++)
1465	{	1403	{
1466	x += freearr_x[dir];	1404	x += freearr_x[dir];
1467	y += freearr_y[dir];	1405	y += freearr_y[dir];
1468	mflags = get_map_flags (m, &m, x, y, &x, &y);	1406	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1407
1469	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1408	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1470	{	1409	{
1471	tmp = NULL;	1410	tmp = 0;
1472	break;	1411	break;
1473	}	1412	}
1474	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1413	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1475	{	1414	{
1476	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1415	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1477	* perhaps a bad assumption.	1416	* perhaps a bad assumption.
1478	*/	1417	*/
1479	tmp = NULL;	1418	tmp = 0;
1480	break;	1419	break;
1481	}	1420	}
		1421
1482	if (mflags & P_IS_ALIVE)	1422	if (mflags & P_IS_ALIVE)
1483	{
1484	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1423	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1485	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1424	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1486	{
1487	found++;
1488	break;
1489	}
1490	if (found)
1491	break;	1425	break;
1492	}
1493	}	1426	}
1494	if (tmp == NULL)	1427
		1428	if (!tmp)
1495	return find_arrow (op, type);	1429	return find_arrow (op, type);
1496		1430
1497	if (tmp->head)	1431	if (tmp->head)
1498	tmp = tmp->head;	1432	tmp = tmp->head;
1499		1433
…		…
1544	if (bow->below)	1478	if (bow->below)
1545	{	1479	{
1546	bow->remove ();	1480	bow->remove ();
1547	op->insert (bow);	1481	op->insert (bow);
1548	}	1482	}
1549
1550	}	1483	}
1551		1484
1552	if (!bow->race || !bow->skill)	1485	if (!bow->race || !bow->skill)
1553	{	1486	{
1554	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1487	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1580	}	1513	}
1581		1514
1582	/* this should not happen, but sometimes does */	1515	/* this should not happen, but sometimes does */
1583	if (arrow->nrof == 0)	1516	if (arrow->nrof == 0)
1584	{	1517	{
		1518	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1585	arrow->destroy ();	1519	arrow->destroy ();
1586	return 0;	1520	return 0;
1587	}	1521	}
1588		1522
1589	left = arrow; /* these are arrows left to the player */	1523	left = arrow; /* these are arrows left to the player */
1590	arrow = get_split_ob (arrow, 1);	1524	arrow = arrow->split ();
1591	if (!arrow)	1525	if (!arrow)
1592	{	1526	{
1593	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1527	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1594	return 0;	1528	return 0;
1595	}	1529	}
…		…
1662	op->play_sound (sound_find ("fire_arrow"));	1596	op->play_sound (sound_find ("fire_arrow"));
1663	m->insert (arrow, sx, sy, op);	1597	m->insert (arrow, sx, sy, op);
1664		1598
1665	if (!arrow->destroyed ())	1599	if (!arrow->destroyed ())
1666	move_arrow (arrow);	1600	move_arrow (arrow);
1667
1668	if (op->type == PLAYER)
1669	{
1670	if (left->destroyed ())
1671	esrv_del_item (op->contr, left->count);
1672	else
1673	esrv_send_item (op, left);
1674	}
1675		1601
1676	return 1;	1602	return 1;
1677	}	1603	}
1678		1604
1679	/* Special fire code for players - this takes into	1605	/* Special fire code for players - this takes into
…		…
1684	* hence the function name.	1610	* hence the function name.
1685	*/	1611	*/
1686	int	1612	int
1687	player_fire_bow (object *op, int dir)	1613	player_fire_bow (object *op, int dir)
1688	{	1614	{
1689	int ret = 0, wcmod = 0;	1615	int ret;
1690		1616
1691	if (op->contr->bowtype == bow_bestarrow)	1617	if (op->contr->bowtype == bow_bestarrow)
1692	{	1618	{
1693	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1619	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1694	}	1620	}
1695	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1621	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1696	{	1622	{
1697	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1623	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1698	wcmod = -1;
1699
1700	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1624	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1701	}	1625	}
1702	else if (op->contr->bowtype == bow_threewide)	1626	else if (op->contr->bowtype == bow_threewide)
1703	{	1627	{
1704	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1628	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1705	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1629	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1706	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1630	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1707	}	1631	}
1708	else if (op->contr->bowtype == bow_spreadshot)	1632	else if (op->contr->bowtype == bow_spreadshot)
1709	{	1633	{
1710	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1634	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1711	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1635	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1712	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1636	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1713	}	1637	}
1714	else	1638	else
1715	{	1639	{
…		…
1753	return;	1677	return;
1754	}	1678	}
1755	}	1679	}
1756	else if (item->type == ROD || item->type == HORN)	1680	else if (item->type == ROD || item->type == HORN)
1757	{	1681	{
1758	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1682	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1683
		1684	// using the maximum of the rods charge allows at least one spell cast
		1685	// for a rod or horn, this fixes some broken rods.
		1686	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1759	{	1687	{
1760	op->contr->play_sound (sound_find ("wand_poof"));	1688	op->contr->play_sound (sound_find ("wand_poof"));
1761		1689
1762	if (item->type == ROD)	1690	if (item->type == ROD)
1763	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1691	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1768	}	1696	}
1769	}	1697	}
1770		1698
1771	if (cast_spell (op, item, dir, item->inv, NULL))	1699	if (cast_spell (op, item, dir, item->inv, NULL))
1772	{	1700	{
1773	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1701	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1702
1774	if (item->type == WAND)	1703	if (item->type == WAND)
1775	{	1704	{
1776	if (!(--item->stats.food))	1705	if (!(--item->stats.food))
1777	{	1706	{
1778	object *tmp;	1707	object *tmp;
…		…
1782	CLEAR_FLAG (item, FLAG_ANIMATE);	1711	CLEAR_FLAG (item, FLAG_ANIMATE);
1783	item->face = item->arch->face;	1712	item->face = item->arch->face;
1784	item->set_speed (0);	1713	item->set_speed (0);
1785	}	1714	}
1786		1715
1787	if ((tmp = item->in_player ()))	1716	if (object *pl = item->visible_to ())
1788	esrv_update_item (UPD_ANIM, tmp, item);	1717	esrv_update_item (UPD_ANIM, pl, item);
1789	}	1718	}
1790	}	1719	}
1791	else if (item->type == ROD || item->type == HORN)	1720	else if (item->type == ROD || item->type == HORN)
1792	drain_rod_charge (item);	1721	drain_rod_charge (item);
1793	}	1722	}
…		…
1798	bool	1727	bool
1799	fire (object *op, int dir)	1728	fire (object *op, int dir)
1800	{	1729	{
1801	int spellcost = 0;	1730	int spellcost = 0;
1802		1731
1803	/* check for loss of invisiblity/hide */
1804	if (action_makes_visible (op))
1805	make_visible (op);
1806
1807	player *pl = op->contr;	1732	player *pl = op->contr;
1808		1733
1809	if (pl->golem)	1734	if (pl->golem)
1810	{	1735	{
1811	control_golem (op->contr->golem, dir);	1736	control_golem (op->contr->golem, dir);
…		…
1813	}	1738	}
1814		1739
1815	object *ob = pl->ranged_ob;	1740	object *ob = pl->ranged_ob;
1816		1741
1817	if (!ob)	1742	if (!ob)
1818	return false;
1819
1820	if (!op->change_weapon (ob))
1821	return false;	1743	return false;
1822		1744
1823	if (op->speed_left > 0.f)	1745	if (op->speed_left > 0.f)
1824	--op->speed_left;	1746	--op->speed_left;
1825	else	1747	else
1826	return false;	1748	return false;
		1749
		1750	if (!op->change_weapon (ob))
		1751	return false;
		1752
		1753	/* check for loss of invisiblity/hide */
		1754	if (action_makes_visible (op))
		1755	make_visible (op);
1827		1756
1828	switch (ob->type)	1757	switch (ob->type)
1829	{	1758	{
1830	case BOW:	1759	case BOW:
1831	player_fire_bow (op, dir);	1760	player_fire_bow (op, dir);
…		…
1969	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1898	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1970	remove_door2 (door); /* remove door without violence ;-) */	1899	remove_door2 (door); /* remove door without violence ;-) */
1971	}	1900	}
1972		1901
1973	/* Do this after we print the message */	1902	/* Do this after we print the message */
1974	decrease_ob (key); /* Use up one of the keys */	1903	key->decrease (); /* Use up one of the keys */
1975	/* Need to update the weight the container the key was in */
1976	if (container != op)
1977	esrv_update_item (UPD_WEIGHT, op, container);
1978		1904
1979	return 1; /* Nothing more to do below */	1905	return 1; /* Nothing more to do below */
1980	}	1906	}
1981	else if (door->type == LOCKED_DOOR)	1907	else if (door->type == LOCKED_DOOR)
1982	{	1908	{
…		…
2079	--op->speed_left;	2005	--op->speed_left;
2080		2006
2081	op->play_sound (sound_find ("push_player"));	2007	op->play_sound (sound_find ("push_player"));
2082	push_ob (mon, dir, op);	2008	push_ob (mon, dir, op);
2083		2009
2084	if (op->contr->tmp_invis || op->hide)	2010	if (action_makes_visible (op))
2085	make_visible (op);	2011	make_visible (op);
2086		2012
2087	return true;	2013	return true;
2088	}	2014	}
2089	else	2015	else
…		…
2111	push_ob (mon, dir, op);	2037	push_ob (mon, dir, op);
2112	}	2038	}
2113	else	2039	else
2114	op->statusmsg ("You withhold your attack");	2040	op->statusmsg ("You withhold your attack");
2115		2041
2116	if (op->contr->tmp_invis || op->hide)	2042	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2117	make_visible (op);	2043	make_visible (op);
2118		2044
2119	return true;	2045	return true;
2120	}	2046	}
2121	}	2047	}
…		…
2163	bool	2089	bool
2164	move_player (object *op, int dir)	2090	move_player (object *op, int dir)
2165	{	2091	{
2166	int pick;	2092	int pick;
2167		2093
2168	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2094	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2169	return 0;	2095	return 0;
2170		2096
2171	/* Sanity check: make sure dir is valid */	2097	/* Sanity check: make sure dir is valid */
2172	if ((dir < 0) || (dir >= 9))	2098	if ((dir < 0) || (dir >= 9))
2173	{	2099	{
…		…
2179	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2105	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2180	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2106	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2181		2107
2182	op->facing = dir;	2108	op->facing = dir;
2183		2109
2184	if (op->hide)	2110	if (op->flag [FLAG_HIDDEN])
2185	do_hidden_move (op);	2111	do_hidden_move (op);
2186		2112
2187	bool retval;	2113	bool retval;
2188		2114
2189	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2115	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2261	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2187	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2262	{	2188	{
2263	op->play_sound (sound_find ("ob_evaporate"));	2189	op->play_sound (sound_find ("ob_evaporate"));
2264	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2190	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2265		2191
2266	if (op->contr)
2267	esrv_del_item (op->contr, tmp->count);
2268
2269	tmp->destroy ();	2192	tmp->destroy ();
2270	CLEAR_FLAG (op, FLAG_LIFESAVE);	2193	CLEAR_FLAG (op, FLAG_LIFESAVE);
2271		2194
2272	if (op->stats.hp < 0)	2195	if (op->stats.hp < 0)
2273	op->stats.hp = op->stats.maxhp;	2196	op->stats.hp = op->stats.maxhp;
…		…
2285	return 0;	2208	return 0;
2286	}	2209	}
2287		2210
2288	/* This goes throws the inventory and removes unpaid objects, and puts them	2211	/* This goes throws the inventory and removes unpaid objects, and puts them
2289	* back in the map (location and map determined by values of env). This	2212	* back in the map (location and map determined by values of env). This
2290	* function will descend into containers. op is the object to start the search	2213	* function will descend into containers. op is the object to start the search
2291	* from.	2214	* from.
2292	*/	2215	*/
2293	static void	2216	static void
2294	drop_unpaid_items (object *op, object *env)	2217	drop_unpaid_items (object *op, object *env)
2295	{	2218	{
2296	while (op)	2219	while (op)
2297	{	2220	{
2298	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2221	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2299		2222
2300	if (QUERY_FLAG (op, FLAG_UNPAID))	2223	if (QUERY_FLAG (op, FLAG_UNPAID))
2301	{
2302	if (env->type == PLAYER)
2303	esrv_del_item (env->contr, op->count);
2304
2305	op->insert_at (env);	2224	op->insert_at (env);
2306	}
2307	else if (op->inv)	2225	else if (op->inv)
2308	drop_unpaid_items (op->inv, env);	2226	drop_unpaid_items (op->inv, env);
2309		2227
2310	op = next;	2228	op = next;
2311	}	2229	}
…		…
2323	* Moved from apply.c to player.c - player.c is what	2241	* Moved from apply.c to player.c - player.c is what
2324	* actually uses this function. player.c may not be quite the	2242	* actually uses this function. player.c may not be quite the
2325	* best, a misc file for object actions is probably better,	2243	* best, a misc file for object actions is probably better,
2326	* but there isn't one in the server directory.	2244	* but there isn't one in the server directory.
2327	*/	2245	*/
2328	char *	2246	const char *
2329	gravestone_text (object *op)	2247	gravestone_text (object *op)
2330	{	2248	{
2331	static char buf2[MAX_BUF];	2249	static dynbuf_text buf;
2332	char buf[MAX_BUF];
2333	time_t now = time (NULL);
2334		2250
2335	strcpy (buf2, " R.I.P.\n\n");	2251	buf << "---- R.I.P. ----\n\n"
		2252	<< op->name;
		2253
2336	if (op->type == PLAYER)	2254	if (op->type == PLAYER)
2337	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2255	buf << " the " << op->contr->title;
2338	else
2339	sprintf (buf, "%s\n", &op->name);
2340		2256
2341	strncat (buf2, " ", 20 - strlen (buf) / 2);	2257	buf << "\n\n";
2342	strcat (buf2, buf);	2258
		2259	buf << "who was level ";
		2260	buf << (sint32)op->level << "\n\n" // OO breakdown
		2261	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2262
2343	if (op->type == PLAYER)	2263	if (op->type == PLAYER)
2344	sprintf (buf, "who was in level %d when killed\n", op->level);	2264	buf << "by " << op->contr->killer_name () << ".\n\n";
2345	else
2346	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2347		2265
2348	strncat (buf2, " ", 20 - strlen (buf) / 2);
2349	strcat (buf2, buf);
2350	if (op->type == PLAYER)
2351	{	2266	{
2352	sprintf (buf, "by %s.\n\n", op->contr->killer);	2267	static char buf2[128];
2353	strncat (buf2, " ", 21 - strlen (buf) / 2);	2268	time_t now = time (NULL);
2354	strcat (buf2, buf);
2355	}
2356
2357	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2269	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2358	strncat (buf2, " ", 20 - strlen (buf) / 2);	2270	buf << buf2;
2359	strcat (buf2, buf);	2271	}
2360		2272
2361	return buf2;	2273	return buf;
2362	}	2274	}
2363		2275
2364	void	2276	void
2365	do_some_living (object *op)	2277	do_some_living (object *op)
2366	{	2278	{
…		…
2521	{	2433	{
2522	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2434	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2523		2435
2524	if (over_hp > 0)	2436	if (over_hp > 0)
2525	{	2437	{
2526	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2438	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2527	op->last_heal = 0;	2439	op->last_heal = 0;
2528	}	2440	}
2529	else	2441	else
2530	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2442	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2531	}	2443	}
…		…
2547	op->stats.food--;	2459	op->stats.food--;
2548	}	2460	}
2549		2461
2550	if (op->stats.food < 0 && op->stats.hp >= 0)	2462	if (op->stats.food < 0 && op->stats.hp >= 0)
2551	{	2463	{
2552	object *tmp, *flesh = 0;	2464	object *flesh = 0;
2553		2465
2554	for (tmp = op->inv; tmp; tmp = tmp->below)	2466	for_inv_removable (op, tmp)
2555	{	2467	{
2556	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2468	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2469	continue;
		2470
		2471	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2557	{	2472	{
2558	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2473	op->statusmsg ("You blindly grab for a bite of food. "
2559	{	2474	"H<To prevent you from starving, you ate some random item from your backpack.>");
2560	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2561	manual_apply (op, tmp, 0);	2475	manual_apply (op, tmp, 0);
		2476
2562	if (op->stats.food >= 0 || op->stats.hp < 0)	2477	if (op->stats.food >= 0 || op->stats.hp < 0)
2563	break;	2478	break;
2564	}	2479	}
2565	else if (tmp->type == FLESH)	2480	else if (tmp->type == FLESH)
2566	flesh = tmp;	2481	flesh = tmp;
2567	} /* End if paid for object */	2482	}
2568	} /* end of for loop */
2569		2483
2570	/* If player is still starving, it means they don't have any food, so	2484	/* If player is still starving, it means they don't have any food, so
2571	* eat flesh instead.	2485	* eat flesh instead.
2572	*/	2486	*/
2573	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2487	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2574	{	2488	{
2575	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2489	op->statusmsg ("You blindly grab for a bite of food. "
		2490	"H<To prevent you from starving, you ate some random item from your backpack.>");
2576	manual_apply (op, flesh, 0);	2491	manual_apply (op, flesh, 0);
2577	}	2492	}
		2493
		2494	// If player is still starving, alert him!
		2495	if (op->stats.food < 0)
		2496	op->failmsg ("You are starving! "
		2497	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2578	}	2498	}
2579		2499
2580	if (op->stats.food < 0)	2500	if (op->stats.food < 0)
2581	{	2501	{
2582	op->stats.hp += op->stats.food;	2502	op->stats.hp += op->stats.food;
2583	op->stats.food = 0;	2503	op->stats.food = 0;
		2504
		2505	if (op->stats.hp < 0)
		2506	{
		2507	op->contr->killer = archetype::get ("killer_starvation");
		2508	op->contr->killer->destroy ();
2584	}	2509	}
		2510	}
2585		2511
		2512	/* killer should be set here already */
2586	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2513	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2587	kill_player (op);	2514	kill_player (op);
2588	}	2515	}
2589	}	2516	}
2590		2517
…		…
2604	object *tmp;	2531	object *tmp;
2605		2532
2606	if (save_life (op))	2533	if (save_life (op))
2607	return;	2534	return;
2608		2535
		2536	/* restore player */
		2537	at = archetype::find ("poisoning");
		2538	if (object *tmp = present_arch_in_ob (at, op))
		2539	{
		2540	tmp->destroy ();
		2541	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
		2542	}
		2543
		2544	at = archetype::find ("confusion");
		2545	if (object *tmp = present_arch_in_ob (at, op))
		2546	{
		2547	tmp->destroy ();
		2548	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
		2549	}
		2550
		2551	cure_disease (op, 0, 0); /* remove any disease */
		2552
		2553	max_it (op->stats.hp , op->stats.maxhp);
		2554	max_it (op->stats.sp , op->stats.maxsp);
		2555	max_it (op->stats.grace, op->stats.maxgrace);
		2556
		2557	if (op->stats.food <= 0)
		2558	op->stats.food = 999;
		2559
		2560	// remove all spell effects that are active
		2561	// to avoid long-term effects such as word-of-recall
		2562	for (object *item = op->inv; item; )
		2563	{
		2564	object *next = item->below;
		2565
		2566	if (item->type == SPELL_EFFECT && item->active)
		2567	item->destroy ();
		2568
		2569	item = next;
		2570	}
		2571
2609	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2572	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2610	* in cities ONLY!!! It is very important that this doesn't get abused.	2573	* in cities ONLY!!! It is very important that this doesn't get abused.
2611	* Look at op_on_battleground() for more info --AndreasV	2574	* Look at op_on_battleground() for more info --AndreasV
2612	*/	2575	*/
2613	if (op_on_battleground (op, &x, &y))	2576	if (op_on_battleground (op, &x, &y))
2614	{	2577	{
2615	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2578	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2616	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2579	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2617		2580
2618	/* restore player */
2619	at = archetype::find ("poisoning");
2620	if (object *tmp = present_arch_in_ob (at, op))
2621	{
2622	tmp->destroy ();
2623	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2624	}
2625
2626	at = archetype::find ("confusion");
2627	if (object *tmp = present_arch_in_ob (at, op))
2628	{
2629	tmp->destroy ();
2630	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2631	}
2632
2633	cure_disease (op, 0, 0); /* remove any disease */
2634	op->stats.hp = op->stats.maxhp;
2635	if (op->stats.food <= 0)
2636	op->stats.food = 999;
2637
2638	/* create a bodypart-trophy to make the winner happy */	2581	/* create a bodypart-trophy to make the winner happy */
2639	if (object *tmp = arch_to_object (archetype::find ("finger")))	2582	if (object *tmp = arch_to_object (archetype::find ("finger")))
2640	{	2583	{
2641	tmp->name = format ("%s's finger" , &op->name);	2584	tmp->name = format ("%s's finger" , &op->name);
2642	tmp->name_pl = format ("%s's fingers", &op->name);	2585	tmp->name_pl = format ("%s's fingers", &op->name);
2643	tmp->msg = format (	2586	tmp->msg = format (
2644	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2587	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2645	&op->name, op->contr->title, (int) (op->level), op->contr->killer	2588	&op->name, op->contr->title,
		2589	(int)op->level,
		2590	op->contr->killer_name ()
2646	);	2591	);
2647	tmp->value = 0, tmp->type = 0;	2592	tmp->value = 0, tmp->type = 0;
2648	tmp->materialname = "organics";	2593	tmp->materialname = "organics";
2649	tmp->insert_at (op, tmp);	2594	tmp->insert_at (op, tmp);
2650	}	2595	}
…		…
2656	}	2601	}
2657		2602
2658	INVOKE_PLAYER (DEATH, op->contr);	2603	INVOKE_PLAYER (DEATH, op->contr);
2659		2604
2660	command_kill_pets (op, 0);	2605	command_kill_pets (op, 0);
2661
2662	if (op->stats.food < 0)
2663	strcpy (op->contr->killer, "starvation");
2664		2606
2665	op->contr->play_sound (sound_find ("player_dies"));	2607	op->contr->play_sound (sound_find ("player_dies"));
2666		2608
2667	/* save the map location for corpse, gravestone */	2609	/* save the map location for corpse, gravestone */
2668	x = op->x;	2610	x = op->x;
…		…
2698		2640
2699	lost_a_stat = 0;	2641	lost_a_stat = 0;
2700		2642
2701	for (z = 0; z < num_stats_lose; z++)	2643	for (z = 0; z < num_stats_lose; z++)
2702	{	2644	{
2703	i = RANDOM () % NUM_STATS;	2645	i = rndm (NUM_STATS);
2704		2646
2705	if (settings.stat_loss_on_death)	2647	if (settings.stat_loss_on_death)
2706	{	2648	{
2707	/* Pick a random stat and take a point off it. Tell the player	2649	/* Pick a random stat and take a point off it. Tell the player
2708	* what he lost.	2650	* what he lost.
…		…
2759	}	2701	}
2760	}	2702	}
2761		2703
2762	if (lose_this_stat)	2704	if (lose_this_stat)
2763	{	2705	{
2764	this_stat = get_attr_value (&(dep->stats), i);	2706	this_stat = get_attr_value (&dep->stats, i);
2765	/* We could try to do something clever like find another	2707	/* We could try to do something clever like find another
2766	* stat to reduce if this fails. But chances are, if	2708	* stat to reduce if this fails. But chances are, if
2767	* stats have been depleted to -50, all are pretty low	2709	* stats have been depleted to -50, all are pretty low
2768	* and should be roughly the same, so it shouldn't make a	2710	* and should be roughly the same, so it shouldn't make a
2769	* difference.	2711	* difference.
…		…
2777	lost_a_stat = 1;	2719	lost_a_stat = 1;
2778	}	2720	}
2779	}	2721	}
2780	}	2722	}
2781	}	2723	}
		2724
2782	/* If no stat lost, tell the player. */	2725	/* If no stat lost, tell the player. */
2783	if (!lost_a_stat)	2726	if (!lost_a_stat)
2784	{	2727	{
2785	/* determine_god() seems to not work sometimes... why is this?	2728	/* determine_god() seems to not work sometimes... why is this?
2786	Should I be using something else? GD */	2729	Should I be using something else? GD */
2787	const char *god = determine_god (op);	2730	shstr_tmp god = determine_god (op);
2788		2731
2789	if (god && (strcmp (god, "none")))	2732	if (god != shstr_none)
2790	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2733	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", &god);
2791	else	2734	else
2792	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2735	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2793	}	2736	}
2794	#else	2737	#else
2795	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2738	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2796	#endif	2739	#endif
2797		2740
2798	/* Put a gravestone up where the character 'almost' died. List the	2741	/* Put a gravestone up where the character 'almost' died. List the
2799	* exp loss on the stone.	2742	* exp loss on the stone.
2800	*/	2743	*/
2801	tmp = arch_to_object (archetype::find ("gravestone"));	2744	tmp = arch_to_object (archetype::find ("gravestone"));
2802	sprintf (buf, "%s's gravestone", &op->name);	2745	tmp->name = format ("%s's gravestone", &op->name);
2803	tmp->name = buf;	2746	tmp->name_pl = format ("%s's gravestones", &op->name);
2804	sprintf (buf, "%s's gravestones", &op->name);	2747	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2805	tmp->name_pl = buf;	2748	&op->name, op->contr->title, op->contr->killer_name ());
2806	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);
2807	tmp->msg = buf;
2808	tmp->x = op->x, tmp->y = op->y;	2749	tmp->x = op->x, tmp->y = op->y;
2809	insert_ob_in_map (tmp, op->map, NULL, 0);	2750	insert_ob_in_map (tmp, op->map, NULL, 0);
2810		2751
2811	/**************************************/	2752	/**************************************/
2812	/* */	2753	/* */
2813	/* Subtract the experience points, */	2754	/* Subtract the experience points, */
2814	/* if we died cause of food, give us */
2815	/* food, and reset HP's... */
2816	/* */	2755	/* */
2817	/**************************************/	2756	/**************************************/
2818		2757
2819	/* remove any poisoning and confusion the character may be suffering. */
2820	/* restore player */
2821	at = archetype::find ("poisoning");
2822	tmp = present_arch_in_ob (at, op);
2823
2824	if (tmp)
2825	{
2826	tmp->destroy ();
2827	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2828	}
2829
2830	at = archetype::find ("confusion");
2831	tmp = present_arch_in_ob (at, op);
2832	if (tmp)
2833	{
2834	tmp->destroy ();
2835	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2836	}
2837
2838	cure_disease (op, 0, 0); /* remove any disease */
2839
2840	/*add_exp(op, (op->stats.exp * -0.20)); */	2758	/*add_exp(op, (op->stats.exp * -0.20)); */
2841	apply_death_exp_penalty (op);	2759	apply_death_exp_penalty (op);
2842	if (op->stats.food < 100)
2843	op->stats.food = 900;
2844	op->stats.hp = op->stats.maxhp;
2845	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2846	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2847		2760
2848	/*	2761	/*
2849	* Check to see if the player has any unpaid items. If so, remove them	2762	* Check to see if the player has any unpaid items. If so, remove them
2850	* and put them back in the map.	2763	* and put them back in the map.
2851	*/	2764	*/
…		…
2886	if (will_kill_again & (1 << at))	2799	if (will_kill_again & (1 << at))
2887	force->resist[at] = 100;	2800	force->resist[at] = 100;
2888		2801
2889	insert_ob_in_ob (force, op);	2802	insert_ob_in_ob (force, op);
2890	op->update_stats ();	2803	op->update_stats ();
2891
2892	}	2804	}
2893		2805
2894	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2806	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2895	}	2807	}
2896		2808
…		…
2916		2828
2917	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2829	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2918	{	2830	{
2919	if (tmp->nrof > 1)	2831	if (tmp->nrof > 1)
2920	{	2832	{
2921	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2833	tmp->decrease (rndm (1, tmp->nrof - 1));
2922	tmp2->destroy ();
2923	insert_ob_in_map (tmp, op->map, NULL, 0);	2834	insert_ob_in_map (tmp, op->map, NULL, 0);
2924	}	2835	}
2925	else	2836	else
2926	tmp->destroy ();	2837	tmp->destroy ();
2927	}	2838	}
…		…
2938	void	2849	void
2939	fix_weight (void)	2850	fix_weight (void)
2940	{	2851	{
2941	for_all_players (pl)	2852	for_all_players (pl)
2942	{	2853	{
2943	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2854	sint32 old = pl->ob->carrying;
2944		2855
2945	if (old == sum)	2856	pl->ob->update_weight ();
2946	continue;	2857
		2858	if (old != pl->ob->carrying)
		2859	{
2947	pl->ob->update_stats ();	2860	pl->ob->update_stats ();
2948	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2861	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2862	}
2949	}	2863	}
2950	}	2864	}
2951		2865
2952	void	2866	void
2953	fix_luck (void)	2867	fix_luck (void)
…		…
2995	}	2909	}
2996		2910
2997	void	2911	void
2998	make_visible (object *op)	2912	make_visible (object *op)
2999	{	2913	{
3000	op->hide = 0;	2914	op->flag [FLAG_HIDDEN] = 0;
3001	op->invisible = 0;	2915	op->invisible = 0;
3002		2916
3003	if (op->type == PLAYER)	2917	if (op->type == PLAYER)
3004	{	2918	{
3005	op->contr->tmp_invis = 0;	2919	op->contr->tmp_invis = 0;
…		…
3030		2944
3031	if (!ob || !ob->map)	2945	if (!ob || !ob->map)
3032	return 0;	2946	return 0;
3033		2947
3034	/* so, on normal lighted maps, its hard to hide */	2948	/* so, on normal lighted maps, its hard to hide */
3035	level = ob->map->darkness - 2;	2949	level = ob->map->darklevel () - 2;
3036		2950
3037	/* this also picks up whether the object is glowing.	2951	/* this also picks up whether the object is glowing.
3038	* If you carry a light on a non-dark map, its not	2952	* If you carry a light on a non-dark map, its not
3039	* as bad as carrying a light on a pitch dark map */	2953	* as bad as carrying a light on a pitch dark map */
3040	if (has_carried_lights (ob))	2954	if (has_carried_lights (ob))
3041	level = -(10 + (2 * ob->map->darkness));	2955	level = -(10 + (2 * ob->map->darklevel ()));
3042		2956
3043	/* scan through all nearby squares for terrain to hide in */	2957	/* scan through all nearby squares for terrain to hide in */
3044	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2958	for (i = 0, x = ob->x, y = ob->y;
		2959	i <= SIZEOFFREE1;
		2960	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3045	{	2961	{
3046	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2962	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3047	if (mflag & P_OUT_OF_MAP)	2963	if (mflag & P_OUT_OF_MAP)
3048	{
3049	continue;	2964	continue;
3050	}	2965
3051	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2966	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3052	level += 2;	2967	level += 2;
3053	else /* open terrain! */	2968	else /* open terrain! */
3054	level -= 1;	2969	level -= 1;
3055	}	2970	}
…		…
3066	* spot (surrounded by clear terrain in broad daylight). -b.t.	2981	* spot (surrounded by clear terrain in broad daylight). -b.t.
3067	*/	2982	*/
3068	void	2983	void
3069	do_hidden_move (object *op)	2984	do_hidden_move (object *op)
3070	{	2985	{
3071	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2986	int hide = 0;
3072	object *skop;
3073		2987
3074	if (!op || !op->map)	2988	if (!op || !op->map)
3075	return;	2989	return;
3076		2990
3077	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2991	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2992	int num = random_roll (0, 19, op, PREFER_LOW);
3078		2993
3079	/* its *extremely* hard to run and sneak/hide at the same time! */	2994	/* its *extremely* hard to run and sneak/hide at the same time! */
3080	if (op->type == PLAYER && op->contr->run_on)	2995	if (op->type == PLAYER && op->contr->run_on)
3081	if (!skop || num >= skop->level)	2996	if (!skop || num >= skop->level)
3082	{	2997	{
…		…
3092	num -= hide;	3007	num -= hide;
3093		3008
3094	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3009	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3095	{	3010	{
3096	make_visible (op);	3011	make_visible (op);
		3012
3097	if (op->type == PLAYER)	3013	if (op->type == PLAYER)
3098	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3014	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3099	}	3015	}
3100	else if (op->type == PLAYER && skop)	3016	else if (op->type == PLAYER && skop)
3101	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3017	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3191	while (op)	3107	while (op)
3192	{	3108	{
3193	dx = rv.distance_x + op->arch->x;	3109	dx = rv.distance_x + op->arch->x;
3194	dy = rv.distance_y + op->arch->y;	3110	dy = rv.distance_y + op->arch->y;
3195		3111
3196	/* only the viewable area the player sees is updated by LOS	3112	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3197	* code, so we need to restrict ourselves to that range of values
3198	* for any meaningful values.
3199	*/
3200	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3201	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3202	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3203	return 1;	3113	return 1;
3204		3114
3205	op = op->more;	3115	op = op->more;
3206	}	3116	}
3207		3117
3208	return 0;	3118	return 0;
3209	}	3119	}
3210		3120
3211	/* routine for both players and monsters. We call this when	3121	/* routine for both players and monsters. We call this when
3212	* there is a possibility for our action distrubing our hiding	3122	* there is a possibility for our action distrubing our hiding
3213	* place or invisiblity spell. Artefact invisiblity is not	3123	* place or invisiblity spell. Artefact invisiblity causes
3214	* effected by this. If we arent invisible to begin with, we	3124	* "noise" instead. If we arent invisible to begin with, we
3215	* return 0.	3125	* return 0.
3216	*/	3126	*/
3217	int	3127	int
3218	action_makes_visible (object *op)	3128	action_makes_visible (object *op)
3219	{	3129	{
3220	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3130	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3221	{	3131	{
3222	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3132	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3133	{
		3134	// artefact invisibility is permanent, but we still make noise
		3135	// this is important for game-balance.
		3136	if (op->contr)
		3137	op->make_noise ();
		3138
3223	return 0;	3139	return 0;
		3140	}
3224		3141
3225	if (op->contr && op->contr->tmp_invis == 0)	3142	if (op->contr && op->contr->tmp_invis == 0)
3226	return 0;	3143	return 0;
3227		3144
3228	/* If monsters, they should become visible */	3145	/* If monsters, they should become visible */
3229	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3146	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3230	{	3147	{
3231	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3148	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3232	return 1;	3149	return 1;
3233	}	3150	}
3234	}	3151	}
3235		3152
3236	return 0;	3153	return 0;
…		…
3442	else	3359	else
3443	{	3360	{
3444	/* generate misc. treasure */	3361	/* generate misc. treasure */
3445	tmp = arch_to_object (tr->item);	3362	tmp = arch_to_object (tr->item);
3446	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3363	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3447	tmp = insert_ob_in_ob (tmp, who);	3364	who->insert (tmp);
3448	if (who->type == PLAYER)
3449	esrv_send_item (who, tmp);
3450	}	3365	}
3451	}	3366	}
3452		3367
3453	/**	3368	/**
3454	* Unready an object for a player. This function does nothing if the object was	3369	* Unready an object for a player. This function does nothing if the object was
…		…
3466	if (pl->ranged_ob == ob)	3381	if (pl->ranged_ob == ob)
3467	pl->ranged_ob = 0;	3382	pl->ranged_ob = 0;
3468	}	3383	}
3469		3384
3470	sint8	3385	sint8
3471	player::visibility_at (maptile *map, int x, int y) const	3386	player::darkness_at (maptile *map, int x, int y) const
3472	{	3387	{
3473	if (!ns)	3388	if (!ns)
3474	return 0;	3389	return LOS_BLOCKED;
3475		3390
3476	int dx, dy;	3391	int dx, dy;
3477	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3392	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3478	return 0;	3393	return LOS_BLOCKED;
3479		3394
3480	x += dx - ns->current_x + ns->mapx / 2;	3395	x += dx - ns->current_x;
3481	y += dy - ns->current_y + ns->mapy / 2;	3396	y += dy - ns->current_y;
3482		3397
3483	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3484	return 0;
3485
3486	return 100 - blocked_los [x][y];	3398	return blocked_los (x, y);
3487	}	3399	}
3488		3400
3489	void	3401	void
3490	player::infobox (const char *title, const char *msg, int color)	3402	player::infobox (const char *title, const char *msg, int color)
3491	{	3403	{

Diff Legend

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