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.174 by root, Thu Nov 8 19:43:27 2007 UTC vs.
Revision 1.219 by root, Sun Dec 28 10:20:29 2008 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
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
…		…
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);
245		248
246	ob->update_stats ();	249	ob->update_stats ();
247		250
248	ns->floorbox_update ();	251	ns->floorbox_update ();
249	esrv_send_inventory (ob, ob);	252	esrv_send_inventory (ob, ob);
…		…
291	player::set_object (object *op)	294	player::set_object (object *op)
292	{	295	{
293	ob = observe = op;	296	ob = observe = op;
294	ob->contr = this; /* this aren't yet in archetype */	297	ob->contr = this; /* this aren't yet in archetype */
295		298
296	ob->speed = 1.0f;	299	ob->speed = 1.0f;
297	ob->speed_left = 0.5f;	300	ob->speed_left = 0.5f;
298		301
299	ob->direction = 5; /* So player faces south */	302	ob->direction = 5; /* So player faces south */
300		303
301	ob->flag [FLAG_READY_WEAPON] = false;	304	ob->flag [FLAG_READY_WEAPON] = false;
302	ob->flag [FLAG_READY_SKILL] = false;	305	ob->flag [FLAG_READY_SKILL] = false;
303	ob->flag [FLAG_READY_BOW] = false;	306	ob->flag [FLAG_READY_BOW] = false;
304		307
…		…
321	combat_ob = op;	324	combat_ob = op;
322	break;	325	break;
323	}	326	}
324		327
325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
		329	ob->deactivate (); // change_weapon activates, fix this better
326	}	330	}
327		331
328	void	332	void
329	player::set_observe (object *op)	333	player::set_observe (object *op)
330	{	334	{
…		…
344	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
345		349
346	gen_sp_armour = 10;	350	gen_sp_armour = 10;
347	bowtype = bow_normal;	351	bowtype = bow_normal;
348	petmode = pet_normal;	352	petmode = pet_normal;
349	listening = 10;
350	usekeys = containers;	353	usekeys = containers;
351	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
352	do_los = 1;	355	do_los = 1;
353		356
354	weapon_sp = 1.0f;	357	weapon_sp = 1.0f;
…		…
403	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
404	*/	407	*/
405	archetype *	408	archetype *
406	get_player_archetype (archetype *at)	409	get_player_archetype (archetype *at)
407	{	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
408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	417	archvec::iterator i = archetypes.find (nat);
409		418
410	for (;;)	419	for (;;)
411	{	420	{
412	if (++i == archetypes.end ())	421	if (++i == archetypes.end ())
413	i = archetypes.begin ();	422	i = archetypes.begin ();
…		…
631		640
632	return firstdir;	641	return firstdir;
633	}	642	}
634		643
635	void	644	void
636	give_initial_items (object *pl, treasurelist * items)	645	give_initial_items (object *pl, treasurelist *items)
637	{	646	{
638	object *op, *next = NULL;
639
640	if (pl->randomitems != NULL)	647	if (pl->randomitems)
641	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
642		649
643	for (op = pl->inv; op; op = next)	650	for (object *next, *op = pl->inv; op; op = next)
644	{	651	{
645	next = op->below;	652	next = op->below;
646		653
647	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
648	* 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
…		…
653	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
654	* by this player due to race restrictions	661	* by this player due to race restrictions
655	*/	662	*/
656	if (pl->type == PLAYER)	663	if (pl->type == PLAYER)
657	{	664	{
658	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
659	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
660	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
661	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
		670	|| op->type == BRACERS || op->type == GIRDLE))
662	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))
663	{	672	{
664	op->destroy ();	673	op->destroy ();
665	continue;	674	continue;
666	}	675	}
667	}	676	}
…		…
690	if (op->nrof > 1)	699	if (op->nrof > 1)
691	op->nrof = 1;	700	op->nrof = 1;
692	}	701	}
693		702
694	if (op->type == SPELLBOOK && op->inv)	703	if (op->type == SPELLBOOK && op->inv)
695	{
696	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
697	}
698		705
699	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
700	* 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
701	* merged properly.	708	* merged properly.
702	*/	709	*/
703	if (need_identify (op))	710	if (need_identify (op))
704	{	711	{
705	SET_FLAG (op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
706	CLEAR_FLAG (op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
707	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
708	}	715	}
		716
709	if (op->type == SPELL)	717	if (op->type == SPELL)
710	{	718	{
711	op->destroy ();	719	op->destroy ();
712	continue;	720	continue;
713	}	721	}
…		…
715	{	723	{
716	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
717	op->stats.exp = 0;	725	op->stats.exp = 0;
718	op->level = 1;	726	op->level = 1;
719	}	727	}
720	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
721	else
722	SET_FLAG (op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
723	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
724		731
725	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
726	link_player_skills (pl);	733	pl->contr->link_skills ();
727	}	734	}
728		735
729	void	736	void
730	get_party_password (object *op, partylist *party)	737	get_party_password (object *op, partylist *party)
731	{	738	{
…		…
832	static void	839	static void
833	start_info (object *op)	840	start_info (object *op)
834	{	841	{
835	char buf[MAX_BUF];	842	char buf[MAX_BUF];
836		843
837	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
838	new_draw_info (NDI_UNIQUE, 0, op, buf);	845	new_draw_info (NDI_UNIQUE, 0, op, buf);
839	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
840	//new_draw_info (NDI_UNIQUE, 0, op, " ");
841	}	846	}
842		847
843	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
844	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
845	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
…		…
848	*/	853	*/
849	void	854	void
850	player::chargen_race_done ()	855	player::chargen_race_done ()
851	{	856	{
852	/* this must before then initial items are given */	857	/* this must before then initial items are given */
853	esrv_new_player (ob->contr, ob->weight + ob->carrying);	858	esrv_new_player (ob->contr);
854		859
855	treasurelist *tl = treasurelist::find ("starting_wealth");	860	treasurelist *tl = treasurelist::find ("starting_wealth");
856	if (tl)	861	if (tl)
857	create_treasure (tl, ob, 0, 0, 0);	862	create_treasure (tl, ob, 0, 0, 0);
858		863
…		…
862	ob->contr->ns->state = ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
863		868
864	if (ob->msg)	869	if (ob->msg)
865	ob->msg = 0;	870	ob->msg = 0;
866		871
867	/* We create this now because some of the unique maps will need it
868	* to save here.
869	*/
870	{
871	char buf[MAX_BUF];
872	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
873	make_path_to_file (buf);
874	}
875
876	start_info (ob);	872	start_info (ob);
877	CLEAR_FLAG (ob, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
878	give_initial_items (ob, ob->randomitems);	874	give_initial_items (ob, ob->randomitems);
879	link_player_skills (ob);
880	esrv_send_inventory (ob, ob);	875	esrv_send_inventory (ob, ob);
881	ob->update_stats ();	876	ob->update_stats ();
882		877
883	/* This moves the player to a different start map, if there	878	/* This moves the player to a different start map, if there
884	* is one for this race	879	* is one for this race
885	*/	880	*/
886	if (*first_map_ext_path)	881	if (*first_map_ext_path)
887	{	882	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
888	object *tmp;
889	char mapname[MAX_BUF];
890
891	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
892	tmp = object::create ();
893	EXIT_PATH (tmp) = mapname;
894	EXIT_X (tmp) = ob->x;
895	EXIT_Y (tmp) = ob->y;
896	ob->enter_exit (tmp); /* we don't really care if it succeeded;
897	* if the map isn't there, then stay on the
898	* default initial map */
899	tmp->destroy ();
900	}
901	else	883	else
902	LOG (llevDebug, "first_map_ext_path not set\n");	884	LOG (llevDebug, "first_map_ext_path not set\n");
903	}	885	}
904		886
905	void	887	void
…		…
949	LOG (llevDebug, "Fleeing player is dead.\n");	931	LOG (llevDebug, "Fleeing player is dead.\n");
950	CLEAR_FLAG (op, FLAG_SCARED);	932	CLEAR_FLAG (op, FLAG_SCARED);
951	return;	933	return;
952	}	934	}
953		935
954	if (op->enemy == NULL)	936	if (!op->enemy)
955	{	937	{
956	LOG (llevDebug, "Fleeing player had no enemy.\n");	938	LOG (llevDebug, "Fleeing player had no enemy.\n");
957	CLEAR_FLAG (op, FLAG_SCARED);	939	CLEAR_FLAG (op, FLAG_SCARED);
958	return;	940	return;
959	}	941	}
960		942
961	/* Seen some crashes here. Since we don't store an
962	* op->enemy_count, it is possible that something destroys the
963	* actual enemy, and the object is recycled.
964	*/
965	if (op->enemy->map == NULL)
966	{
967	CLEAR_FLAG (op, FLAG_SCARED);
968	op->enemy = NULL;
969	return;
970	}
971
972	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	943	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
973	{	944	{
974	op->enemy = NULL;	945	op->enemy = NULL;
975	CLEAR_FLAG (op, FLAG_SCARED);	946	CLEAR_FLAG (op, FLAG_SCARED);
976	return;	947	return;
…		…
979	get_rangevector (op, op->enemy, &rv, 0);	950	get_rangevector (op, op->enemy, &rv, 0);
980		951
981	dir = absdir (4 + rv.direction);	952	dir = absdir (4 + rv.direction);
982	for (diff = 0; diff < 3; diff++)	953	for (diff = 0; diff < 3; diff++)
983	{	954	{
984	int m = 1 - (RANDOM () & 2);	955	int m = 1 - rndm (2) * 2;
985		956
986	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)))
987	return;	958	return;
988	}	959	}
989		960
…		…
1000	check_pick (object *op)	971	check_pick (object *op)
1001	{	972	{
1002	object *tmp, *next;	973	object *tmp, *next;
1003	int stop = 0;	974	int stop = 0;
1004	int wvratio;	975	int wvratio;
1005	char putstring[128];
1006		976
1007	/* if you're flying, you cna't pick up anything */	977	/* if you're flying, you cna't pick up anything */
1008	if (op->move_type & MOVE_FLYING)	978	if (op->move_type & MOVE_FLYING)
1009	return 1;	979	return 1;
1010		980
1011	next = op->below;	981	next = op->below;
1012		982
		983	int cnt = MAX_ITEM_PER_DROP;
		984	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		985
1013	/* 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
1014	* destroyed */	987	* destroyed */
1015	while (next && !next->destroyed ())	988	while (next && !next->destroyed ())
1016	{	989	{
1017	tmp = next;	990	tmp = next;
1018	next = tmp->below;	991	next = tmp->below;
1019		992
		993	if (cnt <= 0)
		994	{
		995	op->failmsg ("Couldn't pickup all items at once.");
		996	return 0;
		997	}
		998
1020	if (op->destroyed ())	999	if (op->destroyed ())
1021	return 0;	1000	return 0;
1022		1001
1023	if (!can_pick (op, tmp))	1002	if (!can_pick (op, tmp))
1024	continue;	1003	continue;
1025		1004
1026	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1005	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1027	{	1006	{
1028	if (item_matched_string (op, tmp, op->contr->search_str))	1007	if (item_matched_string (op, tmp, op->contr->search_str))
1029	pick_up (op, tmp);	1008	CHK_PICK_PICKUP;
		1009
1030	continue;	1010	continue;
1031	}	1011	}
1032		1012
1033	/* high not bit set? We're using the old autopickup model */	1013	/* NEW 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	/* philosophy:
		1027	* It's easy to grab an item type from a pile, as long as it's
		1028	* generic. This takes no game-time. For more detailed pickups
		1029	* and selections, select-items should be used. This is a
		1030	* grab-as-you-run type mode that's really useful for arrows for
		1031	* example.
		1032	* The drawback: right now it has no frontend, so you need to
		1033	* stick the bits you want into a calculator in hex mode and then
		1034	* convert to decimal and then 'pickup <#>
		1035	*/
		1036
		1037	/* the first two modes are exclusive: if NOTHING we return, if
		1038	* STOP then we stop. All the rest are applied sequentially,
		1039	* meaning if any test passes, the item gets picked up. */
		1040
		1041	/* if mode is set to pick nothing up, return */
		1042	if (op->contr->mode & PU_NOTHING)
		1043	return 1;
		1044
		1045	/* if mode is set to stop when encountering objects, return */
		1046	/* take STOP before INHIBIT since it doesn't actually pick
		1047	* anything up */
		1048	if (op->contr->mode & PU_STOP)
		1049	return 0;
		1050
		1051	/* useful for going into stores and not losing your settings... */
		1052	/* and for battles wher you don't want to get loaded down while
		1053	* fighting */
		1054	if (op->contr->mode & PU_INHIBIT)
		1055	return 1;
		1056
		1057	/* prevent us from turning into auto-thieves :) */
		1058	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		1059	continue;
		1060
		1061	/* ignore known cursed objects */
		1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		1063	continue;
		1064
		1065	/* all food and drink if desired */
		1066	/* question: don't pick up known-poisonous stuff? */
1034	if (!(op->contr->mode & PU_NEWMODE))	1067	if (op->contr->mode & PU_FOOD)
		1068	if (tmp->type == FOOD)
1035	{	1069	{
1036	switch (op->contr->mode)	1070	CHK_PICK_PICKUP;
		1071	continue;
		1072	}
		1073
		1074	if (op->contr->mode & PU_DRINK)
		1075	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		1076	{
		1077	CHK_PICK_PICKUP;
		1078	continue;
		1079	}
		1080
		1081	if (op->contr->mode & PU_POTION)
		1082	if (tmp->type == POTION)
		1083	{
		1084	CHK_PICK_PICKUP;
		1085	continue;
		1086	}
		1087
		1088	/* spellbooks, skillscrolls and normal books/scrolls */
		1089	if (op->contr->mode & PU_SPELLBOOK)
		1090	if (tmp->type == SPELLBOOK)
		1091	{
		1092	CHK_PICK_PICKUP;
		1093	continue;
		1094	}
		1095
		1096	if (op->contr->mode & PU_SKILLSCROLL)
		1097	if (tmp->type == SKILLSCROLL)
		1098	{
		1099	CHK_PICK_PICKUP;
		1100	continue;
		1101	}
		1102
		1103	if (op->contr->mode & PU_READABLES)
		1104	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		1105	{
		1106	CHK_PICK_PICKUP;
		1107	continue;
		1108	}
		1109
		1110	/* wands/staves/rods/horns */
		1111	if (op->contr->mode & PU_MAGIC_DEVICE)
		1112	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1113	{
		1114	CHK_PICK_PICKUP;
		1115	continue;
		1116	}
		1117
		1118	/* pick up all magical items */
		1119	if (op->contr->mode & PU_MAGICAL)
		1120	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1121	{
		1122	CHK_PICK_PICKUP;
		1123	continue;
		1124	}
		1125
		1126	if (op->contr->mode & PU_VALUABLES)
		1127	{
		1128	if (tmp->type == MONEY || tmp->type == GEM)
1037	{	1129	{
1038	case 0:	1130	CHK_PICK_PICKUP;
1039	return 1; /* don't pick up */	1131	continue;
1040	case 1:
1041	pick_up (op, tmp);
1042	return 1;
1043	case 2:
1044	pick_up (op, tmp);
1045	return 0;
1046	case 3:
1047	return 0; /* stop before pickup */
1048	case 4:
1049	pick_up (op, tmp);
1050	break;
1051	case 5:
1052	pick_up (op, tmp);
1053	stop = 1;
1054	break;
1055	case 6:
1056	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1057	pick_up (op, tmp);
1058	break;
1059
1060	case 7:
1061	if (tmp->type == MONEY || tmp->type == GEM)
1062	pick_up (op, tmp);
1063	break;
1064
1065	default:
1066	/* use value density */
1067	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1068	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1069	pick_up (op, tmp);
1070	}	1132	}
1071	}	1133	}
1072	else	1134
1073	{ /* old model */	1135	/* rings & amulets - talismans seems to be typed AMULET */
1074	/* NEW pickup handling */	1136	if (op->contr->mode & PU_JEWELS)
		1137	if (tmp->type == RING || tmp->type == AMULET)
		1138	{
		1139	CHK_PICK_PICKUP;
		1140	continue;
		1141	}
		1142
		1143	/* we don't forget dragon food */
		1144	if (op->contr->mode & PU_FLESH)
		1145	if (tmp->type == FLESH)
		1146	{
		1147	CHK_PICK_PICKUP;
		1148	continue;
		1149	}
		1150
		1151	/* bows and arrows. Bows are good for selling! */
1075	if (op->contr->mode & PU_DEBUG)	1152	if (op->contr->mode & PU_BOW)
		1153	if (tmp->type == BOW)
		1154	{
		1155	CHK_PICK_PICKUP;
		1156	continue;
		1157	}
		1158
		1159	if (op->contr->mode & PU_ARROW)
		1160	if (tmp->type == ARROW)
		1161	{
		1162	CHK_PICK_PICKUP;
		1163	continue;
		1164	}
		1165
		1166	/* all kinds of armor etc. */
		1167	if (op->contr->mode & PU_ARMOUR)
		1168	if (tmp->type == ARMOUR)
		1169	{
		1170	CHK_PICK_PICKUP;
		1171	continue;
		1172	}
		1173
		1174	if (op->contr->mode & PU_HELMET)
		1175	if (tmp->type == HELMET)
		1176	{
		1177	CHK_PICK_PICKUP;
		1178	continue;
		1179	}
		1180
		1181	if (op->contr->mode & PU_SHIELD)
		1182	if (tmp->type == SHIELD)
		1183	{
		1184	CHK_PICK_PICKUP;
		1185	continue;
		1186	}
		1187
		1188	if (op->contr->mode & PU_BOOTS)
		1189	if (tmp->type == BOOTS)
		1190	{
		1191	CHK_PICK_PICKUP;
		1192	continue;
		1193	}
		1194
		1195	if (op->contr->mode & PU_GLOVES)
		1196	if (tmp->type == GLOVES)
		1197	{
		1198	CHK_PICK_PICKUP;
		1199	continue;
		1200	}
		1201
		1202	if (op->contr->mode & PU_CLOAK)
		1203	if (tmp->type == CLOAK)
		1204	{
		1205	CHK_PICK_PICKUP;
		1206	continue;
		1207	}
		1208
		1209	/* hoping to catch throwing daggers here */
		1210	if (op->contr->mode & PU_MISSILEWEAPON)
		1211	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1212	{
		1213	CHK_PICK_PICKUP;
		1214	continue;
		1215	}
		1216
		1217	/* careful: chairs and tables are weapons! */
		1218	if (op->contr->mode & PU_ALLWEAPON)
		1219	{
		1220	if (tmp->type == WEAPON && tmp->name != NULL)
1076	{	1221	{
1077	/* some debugging code to figure out item information */	1222	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1078	if (tmp->name != NULL)	1223	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1079	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1080	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1081	else
1082	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1083	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1084
1085	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1086	}
1087
1088	/* philosophy:
1089	* It's easy to grab an item type from a pile, as long as it's
1090	* generic. This takes no game-time. For more detailed pickups
1091	* and selections, select-items should be used. This is a
1092	* grab-as-you-run type mode that's really useful for arrows for
1093	* example.
1094	* The drawback: right now it has no frontend, so you need to
1095	* stick the bits you want into a calculator in hex mode and then
1096	* convert to decimal and then 'pickup <#>
1097	*/
1098
1099	/* the first two modes are exclusive: if NOTHING we return, if
1100	* STOP then we stop. All the rest are applied sequentially,
1101	* meaning if any test passes, the item gets picked up. */
1102
1103	/* if mode is set to pick nothing up, return */
1104
1105	if (op->contr->mode & PU_NOTHING)
1106	return 1;
1107
1108	/* if mode is set to stop when encountering objects, return */
1109	/* take STOP before INHIBIT since it doesn't actually pick
1110	* anything up */
1111
1112	if (op->contr->mode & PU_STOP)
1113	return 0;
1114
1115	/* useful for going into stores and not losing your settings... */
1116	/* and for battles wher you don't want to get loaded down while
1117	* fighting */
1118	if (op->contr->mode & PU_INHIBIT)
1119	return 1;
1120
1121	/* prevent us from turning into auto-thieves :) */
1122	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1123	continue;
1124
1125	/* ignore known cursed objects */
1126	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1127	continue;
1128
1129	/* all food and drink if desired */
1130	/* question: don't pick up known-poisonous stuff? */
1131	if (op->contr->mode & PU_FOOD)
1132	if (tmp->type == FOOD)
1133	{
1134	pick_up (op, tmp);
1135	continue;
1136	}
1137
1138	if (op->contr->mode & PU_DRINK)
1139	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1140	{
1141	pick_up (op, tmp);
1142	continue;
1143	}
1144
1145	if (op->contr->mode & PU_POTION)
1146	if (tmp->type == POTION)
1147	{
1148	pick_up (op, tmp);
1149	continue;
1150	}
1151
1152	/* spellbooks, skillscrolls and normal books/scrolls */
1153	if (op->contr->mode & PU_SPELLBOOK)
1154	if (tmp->type == SPELLBOOK)
1155	{
1156	pick_up (op, tmp);
1157	continue;
1158	}
1159
1160	if (op->contr->mode & PU_SKILLSCROLL)
1161	if (tmp->type == SKILLSCROLL)
1162	{
1163	pick_up (op, tmp);
1164	continue;
1165	}
1166
1167	if (op->contr->mode & PU_READABLES)
1168	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1169	{
1170	pick_up (op, tmp);
1171	continue;
1172	}
1173
1174	/* wands/staves/rods/horns */
1175	if (op->contr->mode & PU_MAGIC_DEVICE)
1176	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1177	{
1178	pick_up (op, tmp);
1179	continue;
1180	}
1181
1182	/* pick up all magical items */
1183	if (op->contr->mode & PU_MAGICAL)
1184	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1185	{
1186	pick_up (op, tmp);
1187	continue;
1188	}
1189
1190	if (op->contr->mode & PU_VALUABLES)
1191	{
1192	if (tmp->type == MONEY || tmp->type == GEM)
1193	{	1224	{
1194	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1195	continue;	1226	continue;
1196	}	1227	}
1197	}	1228	}
1198		1229
1199	/* rings & amulets - talismans seems to be typed AMULET */
1200	if (op->contr->mode & PU_JEWELS)
1201	if (tmp->type == RING || tmp->type == AMULET)	1230	if (tmp->type == WEAPON && tmp->name == NULL)
1202	{
1203	pick_up (op, tmp);
1204	continue;
1205	}
1206
1207	/* we don't forget dragon food */
1208	if (op->contr->mode & PU_FLESH)
1209	if (tmp->type == FLESH)
1210	{
1211	pick_up (op, tmp);
1212	continue;
1213	}
1214
1215	/* bows and arrows. Bows are good for selling! */
1216	if (op->contr->mode & PU_BOW)
1217	if (tmp->type == BOW)
1218	{
1219	pick_up (op, tmp);
1220	continue;
1221	}
1222
1223	if (op->contr->mode & PU_ARROW)
1224	if (tmp->type == ARROW)
1225	{
1226	pick_up (op, tmp);
1227	continue;
1228	}
1229
1230	/* all kinds of armor etc. */
1231	if (op->contr->mode & PU_ARMOUR)
1232	if (tmp->type == ARMOUR)
1233	{
1234	pick_up (op, tmp);
1235	continue;
1236	}
1237
1238	if (op->contr->mode & PU_HELMET)
1239	if (tmp->type == HELMET)
1240	{
1241	pick_up (op, tmp);
1242	continue;
1243	}
1244
1245	if (op->contr->mode & PU_SHIELD)
1246	if (tmp->type == SHIELD)
1247	{
1248	pick_up (op, tmp);
1249	continue;
1250	}
1251
1252	if (op->contr->mode & PU_BOOTS)
1253	if (tmp->type == BOOTS)
1254	{
1255	pick_up (op, tmp);
1256	continue;
1257	}
1258
1259	if (op->contr->mode & PU_GLOVES)
1260	if (tmp->type == GLOVES)
1261	{
1262	pick_up (op, tmp);
1263	continue;
1264	}
1265
1266	if (op->contr->mode & PU_CLOAK)
1267	if (tmp->type == CLOAK)
1268	{
1269	pick_up (op, tmp);
1270	continue;
1271	}
1272
1273	/* hoping to catch throwing daggers here */
1274	if (op->contr->mode & PU_MISSILEWEAPON)
1275	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1276	{
1277	pick_up (op, tmp);
1278	continue;
1279	}
1280
1281	/* careful: chairs and tables are weapons! */
1282	if (op->contr->mode & PU_ALLWEAPON)
1283	{	1231	{
1284	if (tmp->type == WEAPON && tmp->name != NULL)	1232	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1285	{	1233	{
1286	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&	1234	CHK_PICK_PICKUP;
1287	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1288	{
1289	pick_up (op, tmp);
1290	continue;	1235	continue;
1291	}
1292	}
1293
1294	if (tmp->type == WEAPON && tmp->name == NULL)
1295	{
1296	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1297	{
1298	pick_up (op, tmp);
1299	continue;
1300	}
1301	}	1236	}
1302	}	1237	}
		1238	}
1303		1239
1304	/* misc stuff that's useful */	1240	/* misc stuff that's useful */
1305	if (op->contr->mode & PU_KEY)	1241	if (op->contr->mode & PU_KEY)
1306	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1242	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1307	{	1243	{
1308	pick_up (op, tmp);	1244	CHK_PICK_PICKUP;
1309	continue;	1245	continue;
1310	}	1246	}
1311		1247
1312	/* any of the last 4 bits set means we use the ratio for value	1248	/* any of the last 4 bits set means we use the ratio for value
1313	* pickups */	1249	* pickups */
1314	if (op->contr->mode & PU_RATIO)	1250	if (op->contr->mode & PU_RATIO)
		1251	{
		1252	/* use value density to decide what else to grab */
		1253	/* >=7 was >= op->contr->mode */
		1254	/* >=7 is the old standard setting. Now we take the last 4 bits
		1255	*/
		1256	wvratio = op->contr->mode & PU_RATIO;
		1257	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1315	{	1258	{
1316	/* use value density to decide what else to grab */	1259	#if 0
1317	/* >=7 was >= op->contr->mode */	1260	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1318	/* >=7 is the old standard setting. Now we take the last 4 bits	1261	if (tmp->name != NULL)
1319	* and multiply them by 5, giving 0..15*5== 5..75 */
1320	wvratio = (op->contr->mode & PU_RATIO) * 5;
1321	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1322	{	1262	{
1323	pick_up (op, tmp);
1324	#if 0
1325	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1326	if (tmp->name != NULL)
1327	{
1328	fprintf (stderr, "%s", tmp->name);	1263	fprintf (stderr, "%s", tmp->name);
1329	}	1264	}
1330	else	1265	else
1331	fprintf (stderr, "%s", tmp->arch->archname);	1266	fprintf (stderr, "%s", tmp->arch->archname);
1332	fprintf (stderr, ",%d] = ", tmp->type);	1267	fprintf (stderr, ",%d] = ", tmp->type);
1333	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1268	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1334	#endif	1269	#endif
		1270	CHK_PICK_PICKUP;
1335	continue;	1271	continue;
1336	}
1337	}	1272	}
1338	} /* the new pickup model */	1273	} /* the new pickup model */
1339	}	1274	}
1340		1275
1341	return !stop;	1276	return !stop;
…		…
1347	* found object is returned.	1282	* found object is returned.
1348	*/	1283	*/
1349	object *	1284	object *
1350	find_arrow (object *op, const char *type)	1285	find_arrow (object *op, const char *type)
1351	{	1286	{
1352	object *tmp = 0;
1353
1354	for (op = op->inv; op; op = op->below)	1287	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1355	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1356	tmp = find_arrow (splay (op), type);
1357	else if (op->type == ARROW && op->race == type)	1288	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1358	return splay (op);	1289	return splay (tmp);
1359		1290
		1291	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1292	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1293	if (object *arrow = find_arrow (tmp, type))
		1294	{
		1295	splay (tmp);
		1296	return arrow;
		1297	}
		1298
1360	return tmp;	1299	return 0;
1361	}	1300	}
1362		1301
1363	/*	1302	/*
1364	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1303	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1365	* against the target. A full test is not performed, simply a basic test	1304	* against the target. A full test is not performed, simply a basic test
…		…
1388	}	1327	}
1389	}	1328	}
1390	else if (arrow->type == ARROW && arrow->race == type)	1329	else if (arrow->type == ARROW && arrow->race == type)
1391	{	1330	{
1392	/* allways prefer assasination/slaying */	1331	/* allways prefer assasination/slaying */
1393	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1332	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1394	{	1333	{
1395	if (arrow->attacktype & AT_DEATH)	1334	if (arrow->attacktype & AT_DEATH)
1396	{	1335	{
1397	*better = 100;	1336	*better = 100;
1398	return arrow;	1337	return arrow;
…		…
1426	betterby = 1 + arrow->magic + arrow->stats.dam;	1365	betterby = 1 + arrow->magic + arrow->stats.dam;
1427	}	1366	}
1428	}	1367	}
1429	}	1368	}
1430	}	1369	}
		1370
1431	if (tmp == NULL && arrow == NULL)	1371	if (tmp == NULL && arrow == NULL)
1432	return find_arrow (op, type);	1372	return find_arrow (op, type);
1433		1373
1434	*better = betterby;	1374	*better = betterby;
1435	return tmp;	1375	return tmp;
…		…
1465	for (i = 0, found = 0; i < 20; i++)	1405	for (i = 0, found = 0; i < 20; i++)
1466	{	1406	{
1467	x += freearr_x[dir];	1407	x += freearr_x[dir];
1468	y += freearr_y[dir];	1408	y += freearr_y[dir];
1469	mflags = get_map_flags (m, &m, x, y, &x, &y);	1409	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1410
1470	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1411	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1471	{	1412	{
1472	tmp = NULL;	1413	tmp = 0;
1473	break;	1414	break;
1474	}	1415	}
1475	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1416	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1476	{	1417	{
1477	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1418	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1478	* perhaps a bad assumption.	1419	* perhaps a bad assumption.
1479	*/	1420	*/
1480	tmp = NULL;	1421	tmp = 0;
1481	break;	1422	break;
1482	}	1423	}
		1424
1483	if (mflags & P_IS_ALIVE)	1425	if (mflags & P_IS_ALIVE)
1484	{
1485	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1426	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1486	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1427	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1487	{
1488	found++;
1489	break;
1490	}
1491	if (found)
1492	break;	1428	break;
1493	}
1494	}	1429	}
1495	if (tmp == NULL)	1430
		1431	if (!tmp)
1496	return find_arrow (op, type);	1432	return find_arrow (op, type);
1497		1433
1498	if (tmp->head)	1434	if (tmp->head)
1499	tmp = tmp->head;	1435	tmp = tmp->head;
1500		1436
…		…
1545	if (bow->below)	1481	if (bow->below)
1546	{	1482	{
1547	bow->remove ();	1483	bow->remove ();
1548	op->insert (bow);	1484	op->insert (bow);
1549	}	1485	}
1550
1551	}	1486	}
1552		1487
1553	if (!bow->race || !bow->skill)	1488	if (!bow->race || !bow->skill)
1554	{	1489	{
1555	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1490	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1581	}	1516	}
1582		1517
1583	/* this should not happen, but sometimes does */	1518	/* this should not happen, but sometimes does */
1584	if (arrow->nrof == 0)	1519	if (arrow->nrof == 0)
1585	{	1520	{
		1521	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1586	arrow->destroy ();	1522	arrow->destroy ();
1587	return 0;	1523	return 0;
1588	}	1524	}
1589		1525
1590	left = arrow; /* these are arrows left to the player */	1526	left = arrow; /* these are arrows left to the player */
1591	arrow = get_split_ob (arrow, 1);	1527	arrow = arrow->split ();
1592	if (!arrow)	1528	if (!arrow)
1593	{	1529	{
1594	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1530	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1595	return 0;	1531	return 0;
1596	}	1532	}
…		…
1663	op->play_sound (sound_find ("fire_arrow"));	1599	op->play_sound (sound_find ("fire_arrow"));
1664	m->insert (arrow, sx, sy, op);	1600	m->insert (arrow, sx, sy, op);
1665		1601
1666	if (!arrow->destroyed ())	1602	if (!arrow->destroyed ())
1667	move_arrow (arrow);	1603	move_arrow (arrow);
1668
1669	if (op->type == PLAYER)
1670	{
1671	if (left->destroyed ())
1672	esrv_del_item (op->contr, left->count);
1673	else
1674	esrv_send_item (op, left);
1675	}
1676		1604
1677	return 1;	1605	return 1;
1678	}	1606	}
1679		1607
1680	/* Special fire code for players - this takes into	1608	/* Special fire code for players - this takes into
…		…
1685	* hence the function name.	1613	* hence the function name.
1686	*/	1614	*/
1687	int	1615	int
1688	player_fire_bow (object *op, int dir)	1616	player_fire_bow (object *op, int dir)
1689	{	1617	{
1690	int ret = 0, wcmod = 0;	1618	int ret;
1691		1619
1692	if (op->contr->bowtype == bow_bestarrow)	1620	if (op->contr->bowtype == bow_bestarrow)
1693	{	1621	{
1694	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1622	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1695	}	1623	}
1696	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1624	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1697	{	1625	{
1698	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1626	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1699	wcmod = -1;
1700
1701	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1627	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1702	}	1628	}
1703	else if (op->contr->bowtype == bow_threewide)	1629	else if (op->contr->bowtype == bow_threewide)
1704	{	1630	{
1705	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1631	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1706	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1632	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1707	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1633	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1708	}	1634	}
1709	else if (op->contr->bowtype == bow_spreadshot)	1635	else if (op->contr->bowtype == bow_spreadshot)
1710	{	1636	{
1711	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1637	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1712	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1638	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1713	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1639	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1714	}	1640	}
1715	else	1641	else
1716	{	1642	{
…		…
1754	return;	1680	return;
1755	}	1681	}
1756	}	1682	}
1757	else if (item->type == ROD || item->type == HORN)	1683	else if (item->type == ROD || item->type == HORN)
1758	{	1684	{
1759	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1685	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1686
		1687	// using the maximum of the rods charge allows at least one spell cast
		1688	// for a rod or horn, this fixes some broken rods.
		1689	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1760	{	1690	{
1761	op->contr->play_sound (sound_find ("wand_poof"));	1691	op->contr->play_sound (sound_find ("wand_poof"));
1762		1692
1763	if (item->type == ROD)	1693	if (item->type == ROD)
1764	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1694	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1769	}	1699	}
1770	}	1700	}
1771		1701
1772	if (cast_spell (op, item, dir, item->inv, NULL))	1702	if (cast_spell (op, item, dir, item->inv, NULL))
1773	{	1703	{
1774	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1704	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1705
1775	if (item->type == WAND)	1706	if (item->type == WAND)
1776	{	1707	{
1777	if (!(--item->stats.food))	1708	if (!(--item->stats.food))
1778	{	1709	{
1779	object *tmp;	1710	object *tmp;
…		…
1783	CLEAR_FLAG (item, FLAG_ANIMATE);	1714	CLEAR_FLAG (item, FLAG_ANIMATE);
1784	item->face = item->arch->face;	1715	item->face = item->arch->face;
1785	item->set_speed (0);	1716	item->set_speed (0);
1786	}	1717	}
1787		1718
1788	if ((tmp = item->in_player ()))	1719	if (object *pl = item->visible_to ())
1789	esrv_update_item (UPD_ANIM, tmp, item);	1720	esrv_update_item (UPD_ANIM, pl, item);
1790	}	1721	}
1791	}	1722	}
1792	else if (item->type == ROD || item->type == HORN)	1723	else if (item->type == ROD || item->type == HORN)
1793	drain_rod_charge (item);	1724	drain_rod_charge (item);
1794	}	1725	}
…		…
1799	bool	1730	bool
1800	fire (object *op, int dir)	1731	fire (object *op, int dir)
1801	{	1732	{
1802	int spellcost = 0;	1733	int spellcost = 0;
1803		1734
1804	/* check for loss of invisiblity/hide */
1805	if (action_makes_visible (op))
1806	make_visible (op);
1807
1808	player *pl = op->contr;	1735	player *pl = op->contr;
1809		1736
1810	if (pl->golem)	1737	if (pl->golem)
1811	{	1738	{
1812	control_golem (op->contr->golem, dir);	1739	control_golem (op->contr->golem, dir);
…		…
1814	}	1741	}
1815		1742
1816	object *ob = pl->ranged_ob;	1743	object *ob = pl->ranged_ob;
1817		1744
1818	if (!ob)	1745	if (!ob)
1819	return false;
1820
1821	if (!op->change_weapon (ob))
1822	return false;	1746	return false;
1823		1747
1824	if (op->speed_left > 0.f)	1748	if (op->speed_left > 0.f)
1825	--op->speed_left;	1749	--op->speed_left;
1826	else	1750	else
1827	return false;	1751	return false;
		1752
		1753	if (!op->change_weapon (ob))
		1754	return false;
		1755
		1756	/* check for loss of invisiblity/hide */
		1757	if (action_makes_visible (op))
		1758	make_visible (op);
1828		1759
1829	switch (ob->type)	1760	switch (ob->type)
1830	{	1761	{
1831	case BOW:	1762	case BOW:
1832	player_fire_bow (op, dir);	1763	player_fire_bow (op, dir);
…		…
1970	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1901	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1971	remove_door2 (door); /* remove door without violence ;-) */	1902	remove_door2 (door); /* remove door without violence ;-) */
1972	}	1903	}
1973		1904
1974	/* Do this after we print the message */	1905	/* Do this after we print the message */
1975	decrease_ob (key); /* Use up one of the keys */	1906	key->decrease (); /* Use up one of the keys */
1976	/* Need to update the weight the container the key was in */
1977	if (container != op)
1978	esrv_update_item (UPD_WEIGHT, op, container);
1979		1907
1980	return 1; /* Nothing more to do below */	1908	return 1; /* Nothing more to do below */
1981	}	1909	}
1982	else if (door->type == LOCKED_DOOR)	1910	else if (door->type == LOCKED_DOOR)
1983	{	1911	{
…		…
2080	--op->speed_left;	2008	--op->speed_left;
2081		2009
2082	op->play_sound (sound_find ("push_player"));	2010	op->play_sound (sound_find ("push_player"));
2083	push_ob (mon, dir, op);	2011	push_ob (mon, dir, op);
2084		2012
2085	if (op->contr->tmp_invis || op->hide)	2013	if (action_makes_visible (op))
2086	make_visible (op);	2014	make_visible (op);
2087		2015
2088	return true;	2016	return true;
2089	}	2017	}
2090	else	2018	else
…		…
2112	push_ob (mon, dir, op);	2040	push_ob (mon, dir, op);
2113	}	2041	}
2114	else	2042	else
2115	op->statusmsg ("You withhold your attack");	2043	op->statusmsg ("You withhold your attack");
2116		2044
2117	if (op->contr->tmp_invis || op->hide)	2045	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2118	make_visible (op);	2046	make_visible (op);
2119		2047
2120	return true;	2048	return true;
2121	}	2049	}
2122	}	2050	}
…		…
2164	bool	2092	bool
2165	move_player (object *op, int dir)	2093	move_player (object *op, int dir)
2166	{	2094	{
2167	int pick;	2095	int pick;
2168		2096
2169	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2097	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2170	return 0;	2098	return 0;
2171		2099
2172	/* Sanity check: make sure dir is valid */	2100	/* Sanity check: make sure dir is valid */
2173	if ((dir < 0) || (dir >= 9))	2101	if ((dir < 0) || (dir >= 9))
2174	{	2102	{
…		…
2180	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2108	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2181	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2109	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2182		2110
2183	op->facing = dir;	2111	op->facing = dir;
2184		2112
2185	if (op->hide)	2113	if (op->flag [FLAG_HIDDEN])
2186	do_hidden_move (op);	2114	do_hidden_move (op);
2187		2115
2188	bool retval;	2116	bool retval;
2189		2117
2190	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2118	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2262	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2190	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2263	{	2191	{
2264	op->play_sound (sound_find ("ob_evaporate"));	2192	op->play_sound (sound_find ("ob_evaporate"));
2265	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2193	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2266		2194
2267	if (op->contr)
2268	esrv_del_item (op->contr, tmp->count);
2269
2270	tmp->destroy ();	2195	tmp->destroy ();
2271	CLEAR_FLAG (op, FLAG_LIFESAVE);	2196	CLEAR_FLAG (op, FLAG_LIFESAVE);
2272		2197
2273	if (op->stats.hp < 0)	2198	if (op->stats.hp < 0)
2274	op->stats.hp = op->stats.maxhp;	2199	op->stats.hp = op->stats.maxhp;
…		…
2286	return 0;	2211	return 0;
2287	}	2212	}
2288		2213
2289	/* This goes throws the inventory and removes unpaid objects, and puts them	2214	/* This goes throws the inventory and removes unpaid objects, and puts them
2290	* back in the map (location and map determined by values of env). This	2215	* back in the map (location and map determined by values of env). This
2291	* function will descend into containers. op is the object to start the search	2216	* function will descend into containers. op is the object to start the search
2292	* from.	2217	* from.
2293	*/	2218	*/
2294	static void	2219	static void
2295	drop_unpaid_items (object *op, object *env)	2220	drop_unpaid_items (object *op, object *env)
2296	{	2221	{
2297	while (op)	2222	while (op)
2298	{	2223	{
2299	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2224	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2300		2225
2301	if (QUERY_FLAG (op, FLAG_UNPAID))	2226	if (QUERY_FLAG (op, FLAG_UNPAID))
2302	{
2303	if (env->type == PLAYER)
2304	esrv_del_item (env->contr, op->count);
2305
2306	op->insert_at (env);	2227	op->insert_at (env);
2307	}
2308	else if (op->inv)	2228	else if (op->inv)
2309	drop_unpaid_items (op->inv, env);	2229	drop_unpaid_items (op->inv, env);
2310		2230
2311	op = next;	2231	op = next;
2312	}	2232	}
…		…
2324	* Moved from apply.c to player.c - player.c is what	2244	* Moved from apply.c to player.c - player.c is what
2325	* actually uses this function. player.c may not be quite the	2245	* actually uses this function. player.c may not be quite the
2326	* best, a misc file for object actions is probably better,	2246	* best, a misc file for object actions is probably better,
2327	* but there isn't one in the server directory.	2247	* but there isn't one in the server directory.
2328	*/	2248	*/
2329	char *	2249	const char *
2330	gravestone_text (object *op)	2250	gravestone_text (object *op)
2331	{	2251	{
2332	static char buf2[MAX_BUF];	2252	static dynbuf_text buf;
2333	char buf[MAX_BUF];
2334	time_t now = time (NULL);
2335		2253
2336	strcpy (buf2, " R.I.P.\n\n");	2254	buf << "---- R.I.P. ----\n\n"
		2255	<< op->name;
		2256
2337	if (op->type == PLAYER)	2257	if (op->type == PLAYER)
2338	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2258	buf << " the " << op->contr->title;
2339	else
2340	sprintf (buf, "%s\n", &op->name);
2341		2259
2342	strncat (buf2, " ", 20 - strlen (buf) / 2);	2260	buf << "\n\n";
2343	strcat (buf2, buf);	2261
		2262	buf << "who was level ";
		2263	buf << (sint32)op->level << "\n\n" // OO breakdown
		2264	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2265
2344	if (op->type == PLAYER)	2266	if (op->type == PLAYER)
2345	sprintf (buf, "who was in level %d when killed\n", op->level);	2267	buf << "by " << op->contr->killer_name () << ".\n\n";
2346	else
2347	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2348		2268
2349	strncat (buf2, " ", 20 - strlen (buf) / 2);
2350	strcat (buf2, buf);
2351	if (op->type == PLAYER)
2352	{	2269	{
2353	sprintf (buf, "by %s.\n\n", op->contr->killer);	2270	static char buf2[128];
2354	strncat (buf2, " ", 21 - strlen (buf) / 2);	2271	time_t now = time (NULL);
2355	strcat (buf2, buf);
2356	}
2357
2358	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2272	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2359	strncat (buf2, " ", 20 - strlen (buf) / 2);	2273	buf << buf2;
2360	strcat (buf2, buf);	2274	}
2361		2275
2362	return buf2;	2276	return buf;
2363	}	2277	}
2364		2278
2365	void	2279	void
2366	do_some_living (object *op)	2280	do_some_living (object *op)
2367	{	2281	{
…		…
2522	{	2436	{
2523	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2437	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2524		2438
2525	if (over_hp > 0)	2439	if (over_hp > 0)
2526	{	2440	{
2527	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2441	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2528	op->last_heal = 0;	2442	op->last_heal = 0;
2529	}	2443	}
2530	else	2444	else
2531	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2445	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2532	}	2446	}
…		…
2548	op->stats.food--;	2462	op->stats.food--;
2549	}	2463	}
2550		2464
2551	if (op->stats.food < 0 && op->stats.hp >= 0)	2465	if (op->stats.food < 0 && op->stats.hp >= 0)
2552	{	2466	{
2553	object *tmp, *flesh = 0;	2467	object *flesh = 0;
2554		2468
2555	for (tmp = op->inv; tmp; tmp = tmp->below)	2469	for_inv_removable (op, tmp)
2556	{	2470	{
2557	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2471	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2472	continue;
		2473
		2474	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2558	{	2475	{
2559	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2476	op->statusmsg ("You blindly grab for a bite of food. "
2560	{	2477	"H<To prevent you from starving, you ate some random item from your backpack.>");
2561	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2562	manual_apply (op, tmp, 0);	2478	manual_apply (op, tmp, 0);
		2479
2563	if (op->stats.food >= 0 || op->stats.hp < 0)	2480	if (op->stats.food >= 0 || op->stats.hp < 0)
2564	break;	2481	break;
2565	}	2482	}
2566	else if (tmp->type == FLESH)	2483	else if (tmp->type == FLESH)
2567	flesh = tmp;	2484	flesh = tmp;
2568	} /* End if paid for object */	2485	}
2569	} /* end of for loop */
2570		2486
2571	/* If player is still starving, it means they don't have any food, so	2487	/* If player is still starving, it means they don't have any food, so
2572	* eat flesh instead.	2488	* eat flesh instead.
2573	*/	2489	*/
2574	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2490	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2575	{	2491	{
2576	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2492	op->statusmsg ("You blindly grab for a bite of food. "
		2493	"H<To prevent you from starving, you ate some random item from your backpack.>");
2577	manual_apply (op, flesh, 0);	2494	manual_apply (op, flesh, 0);
2578	}	2495	}
		2496
		2497	// If player is still starving, alert him!
		2498	if (op->stats.food < 0)
		2499	op->failmsg ("You are starving! "
		2500	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2579	}	2501	}
2580		2502
2581	if (op->stats.food < 0)	2503	if (op->stats.food < 0)
2582	{	2504	{
2583	op->stats.hp += op->stats.food;	2505	op->stats.hp += op->stats.food;
2584	op->stats.food = 0;	2506	op->stats.food = 0;
		2507
		2508	if (op->stats.hp < 0)
		2509	{
		2510	op->contr->killer = archetype::get ("killer_starvation");
		2511	op->contr->killer->destroy ();
2585	}	2512	}
		2513	}
2586		2514
		2515	/* killer should be set here already */
2587	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2516	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2588	kill_player (op);	2517	kill_player (op);
2589	}	2518	}
2590	}	2519	}
2591		2520
…		…
2641	{	2570	{
2642	tmp->name = format ("%s's finger" , &op->name);	2571	tmp->name = format ("%s's finger" , &op->name);
2643	tmp->name_pl = format ("%s's fingers", &op->name);	2572	tmp->name_pl = format ("%s's fingers", &op->name);
2644	tmp->msg = format (	2573	tmp->msg = format (
2645	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2574	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2646	&op->name, op->contr->title, (int) (op->level), op->contr->killer	2575	&op->name, op->contr->title,
		2576	(int)op->level,
		2577	op->contr->killer_name ()
2647	);	2578	);
2648	tmp->value = 0, tmp->type = 0;	2579	tmp->value = 0, tmp->type = 0;
2649	tmp->materialname = "organics";	2580	tmp->materialname = "organics";
2650	tmp->insert_at (op, tmp);	2581	tmp->insert_at (op, tmp);
2651	}	2582	}
…		…
2657	}	2588	}
2658		2589
2659	INVOKE_PLAYER (DEATH, op->contr);	2590	INVOKE_PLAYER (DEATH, op->contr);
2660		2591
2661	command_kill_pets (op, 0);	2592	command_kill_pets (op, 0);
2662
2663	if (op->stats.food < 0)
2664	strcpy (op->contr->killer, "starvation");
2665		2593
2666	op->contr->play_sound (sound_find ("player_dies"));	2594	op->contr->play_sound (sound_find ("player_dies"));
2667		2595
2668	/* save the map location for corpse, gravestone */	2596	/* save the map location for corpse, gravestone */
2669	x = op->x;	2597	x = op->x;
…		…
2699		2627
2700	lost_a_stat = 0;	2628	lost_a_stat = 0;
2701		2629
2702	for (z = 0; z < num_stats_lose; z++)	2630	for (z = 0; z < num_stats_lose; z++)
2703	{	2631	{
2704	i = RANDOM () % NUM_STATS;	2632	i = rndm (NUM_STATS);
2705		2633
2706	if (settings.stat_loss_on_death)	2634	if (settings.stat_loss_on_death)
2707	{	2635	{
2708	/* Pick a random stat and take a point off it. Tell the player	2636	/* Pick a random stat and take a point off it. Tell the player
2709	* what he lost.	2637	* what he lost.
…		…
2778	lost_a_stat = 1;	2706	lost_a_stat = 1;
2779	}	2707	}
2780	}	2708	}
2781	}	2709	}
2782	}	2710	}
		2711
2783	/* If no stat lost, tell the player. */	2712	/* If no stat lost, tell the player. */
2784	if (!lost_a_stat)	2713	if (!lost_a_stat)
2785	{	2714	{
2786	/* determine_god() seems to not work sometimes... why is this?	2715	/* determine_god() seems to not work sometimes... why is this?
2787	Should I be using something else? GD */	2716	Should I be using something else? GD */
…		…
2791	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2720	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2792	else	2721	else
2793	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2722	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2794	}	2723	}
2795	#else	2724	#else
2796	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2725	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2797	#endif	2726	#endif
2798		2727
2799	/* Put a gravestone up where the character 'almost' died. List the	2728	/* Put a gravestone up where the character 'almost' died. List the
2800	* exp loss on the stone.	2729	* exp loss on the stone.
2801	*/	2730	*/
2802	tmp = arch_to_object (archetype::find ("gravestone"));	2731	tmp = arch_to_object (archetype::find ("gravestone"));
2803	sprintf (buf, "%s's gravestone", &op->name);	2732	tmp->name = format ("%s's gravestone", &op->name);
2804	tmp->name = buf;	2733	tmp->name_pl = format ("%s's gravestones", &op->name);
2805	sprintf (buf, "%s's gravestones", &op->name);	2734	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2806	tmp->name_pl = buf;	2735	&op->name, op->contr->title, op->contr->killer_name ());
2807	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);
2808	tmp->msg = buf;
2809	tmp->x = op->x, tmp->y = op->y;	2736	tmp->x = op->x, tmp->y = op->y;
2810	insert_ob_in_map (tmp, op->map, NULL, 0);	2737	insert_ob_in_map (tmp, op->map, NULL, 0);
2811		2738
2812	/**************************************/	2739	/**************************************/
2813	/* */	2740	/* */
…		…
2836	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2763	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2837	}	2764	}
2838		2765
2839	cure_disease (op, 0, 0); /* remove any disease */	2766	cure_disease (op, 0, 0); /* remove any disease */
2840		2767
		2768	// remove all spell effects that are active
		2769	// to avoid long-term effects such as word-of-recall
		2770	for (object *item = op->inv; item; )
		2771	{
		2772	object *next = item->below;
		2773
		2774	if (item->type == SPELL_EFFECT && item->active)
		2775	item->destroy ();
		2776
		2777	item = next;
		2778	}
		2779
2841	/*add_exp(op, (op->stats.exp * -0.20)); */	2780	/*add_exp(op, (op->stats.exp * -0.20)); */
2842	apply_death_exp_penalty (op);	2781	apply_death_exp_penalty (op);
		2782
2843	if (op->stats.food < 100)	2783	if (op->stats.food < 100)
2844	op->stats.food = 900;	2784	op->stats.food = 900;
		2785
2845	op->stats.hp = op->stats.maxhp;	2786	op->stats.hp = op->stats.maxhp;
2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2787	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2788	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2848		2789
2849	/*	2790	/*
…		…
2887	if (will_kill_again & (1 << at))	2828	if (will_kill_again & (1 << at))
2888	force->resist[at] = 100;	2829	force->resist[at] = 100;
2889		2830
2890	insert_ob_in_ob (force, op);	2831	insert_ob_in_ob (force, op);
2891	op->update_stats ();	2832	op->update_stats ();
2892
2893	}	2833	}
2894		2834
2895	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2835	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2896	}	2836	}
2897		2837
…		…
2917		2857
2918	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2858	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2919	{	2859	{
2920	if (tmp->nrof > 1)	2860	if (tmp->nrof > 1)
2921	{	2861	{
2922	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2862	tmp->decrease (rndm (1, tmp->nrof - 1));
2923	tmp2->destroy ();
2924	insert_ob_in_map (tmp, op->map, NULL, 0);	2863	insert_ob_in_map (tmp, op->map, NULL, 0);
2925	}	2864	}
2926	else	2865	else
2927	tmp->destroy ();	2866	tmp->destroy ();
2928	}	2867	}
…		…
2939	void	2878	void
2940	fix_weight (void)	2879	fix_weight (void)
2941	{	2880	{
2942	for_all_players (pl)	2881	for_all_players (pl)
2943	{	2882	{
2944	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2883	sint32 old = pl->ob->carrying;
2945		2884
2946	if (old == sum)	2885	pl->ob->update_weight ();
2947	continue;	2886
		2887	if (old != pl->ob->carrying)
		2888	{
2948	pl->ob->update_stats ();	2889	pl->ob->update_stats ();
2949	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2890	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2891	}
2950	}	2892	}
2951	}	2893	}
2952		2894
2953	void	2895	void
2954	fix_luck (void)	2896	fix_luck (void)
…		…
2996	}	2938	}
2997		2939
2998	void	2940	void
2999	make_visible (object *op)	2941	make_visible (object *op)
3000	{	2942	{
3001	op->hide = 0;	2943	op->flag [FLAG_HIDDEN] = 0;
3002	op->invisible = 0;	2944	op->invisible = 0;
3003		2945
3004	if (op->type == PLAYER)	2946	if (op->type == PLAYER)
3005	{	2947	{
3006	op->contr->tmp_invis = 0;	2948	op->contr->tmp_invis = 0;
…		…
3031		2973
3032	if (!ob || !ob->map)	2974	if (!ob || !ob->map)
3033	return 0;	2975	return 0;
3034		2976
3035	/* so, on normal lighted maps, its hard to hide */	2977	/* so, on normal lighted maps, its hard to hide */
3036	level = ob->map->darkness - 2;	2978	level = ob->map->darklevel () - 2;
3037		2979
3038	/* this also picks up whether the object is glowing.	2980	/* this also picks up whether the object is glowing.
3039	* If you carry a light on a non-dark map, its not	2981	* If you carry a light on a non-dark map, its not
3040	* as bad as carrying a light on a pitch dark map */	2982	* as bad as carrying a light on a pitch dark map */
3041	if (has_carried_lights (ob))	2983	if (has_carried_lights (ob))
3042	level = -(10 + (2 * ob->map->darkness));	2984	level = -(10 + (2 * ob->map->darklevel ()));
3043		2985
3044	/* scan through all nearby squares for terrain to hide in */	2986	/* scan through all nearby squares for terrain to hide in */
3045	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2987	for (i = 0, x = ob->x, y = ob->y;
		2988	i <= SIZEOFFREE1;
		2989	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3046	{	2990	{
3047	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2991	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3048	if (mflag & P_OUT_OF_MAP)	2992	if (mflag & P_OUT_OF_MAP)
3049	{
3050	continue;	2993	continue;
3051	}	2994
3052	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2995	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3053	level += 2;	2996	level += 2;
3054	else /* open terrain! */	2997	else /* open terrain! */
3055	level -= 1;	2998	level -= 1;
3056	}	2999	}
…		…
3067	* spot (surrounded by clear terrain in broad daylight). -b.t.	3010	* spot (surrounded by clear terrain in broad daylight). -b.t.
3068	*/	3011	*/
3069	void	3012	void
3070	do_hidden_move (object *op)	3013	do_hidden_move (object *op)
3071	{	3014	{
3072	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3015	int hide = 0;
3073	object *skop;
3074		3016
3075	if (!op || !op->map)	3017	if (!op || !op->map)
3076	return;	3018	return;
3077		3019
3078	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3020	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3021	int num = random_roll (0, 19, op, PREFER_LOW);
3079		3022
3080	/* its *extremely* hard to run and sneak/hide at the same time! */	3023	/* its *extremely* hard to run and sneak/hide at the same time! */
3081	if (op->type == PLAYER && op->contr->run_on)	3024	if (op->type == PLAYER && op->contr->run_on)
3082	if (!skop || num >= skop->level)	3025	if (!skop || num >= skop->level)
3083	{	3026	{
…		…
3093	num -= hide;	3036	num -= hide;
3094		3037
3095	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3038	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3096	{	3039	{
3097	make_visible (op);	3040	make_visible (op);
		3041
3098	if (op->type == PLAYER)	3042	if (op->type == PLAYER)
3099	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3043	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3100	}	3044	}
3101	else if (op->type == PLAYER && skop)	3045	else if (op->type == PLAYER && skop)
3102	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3046	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3192	while (op)	3136	while (op)
3193	{	3137	{
3194	dx = rv.distance_x + op->arch->x;	3138	dx = rv.distance_x + op->arch->x;
3195	dy = rv.distance_y + op->arch->y;	3139	dy = rv.distance_y + op->arch->y;
3196		3140
3197	/* only the viewable area the player sees is updated by LOS	3141	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3198	* code, so we need to restrict ourselves to that range of values
3199	* for any meaningful values.
3200	*/
3201	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3202	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3203	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3204	return 1;	3142	return 1;
3205		3143
3206	op = op->more;	3144	op = op->more;
3207	}	3145	}
3208		3146
3209	return 0;	3147	return 0;
3210	}	3148	}
3211		3149
3212	/* routine for both players and monsters. We call this when	3150	/* routine for both players and monsters. We call this when
3213	* there is a possibility for our action distrubing our hiding	3151	* there is a possibility for our action distrubing our hiding
3214	* place or invisiblity spell. Artefact invisiblity is not	3152	* place or invisiblity spell. Artefact invisiblity causes
3215	* effected by this. If we arent invisible to begin with, we	3153	* "noise" instead. If we arent invisible to begin with, we
3216	* return 0.	3154	* return 0.
3217	*/	3155	*/
3218	int	3156	int
3219	action_makes_visible (object *op)	3157	action_makes_visible (object *op)
3220	{	3158	{
3221	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3159	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3222	{	3160	{
3223	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3161	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3162	{
		3163	// artefact invisibility is permanent, but we still make noise
		3164	// this is important for game-balance.
		3165	if (op->contr)
		3166	op->make_noise ();
		3167
3224	return 0;	3168	return 0;
		3169	}
3225		3170
3226	if (op->contr && op->contr->tmp_invis == 0)	3171	if (op->contr && op->contr->tmp_invis == 0)
3227	return 0;	3172	return 0;
3228		3173
3229	/* If monsters, they should become visible */	3174	/* If monsters, they should become visible */
3230	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3175	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3231	{	3176	{
3232	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3177	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3233	return 1;	3178	return 1;
3234	}	3179	}
3235	}	3180	}
3236		3181
3237	return 0;	3182	return 0;
…		…
3443	else	3388	else
3444	{	3389	{
3445	/* generate misc. treasure */	3390	/* generate misc. treasure */
3446	tmp = arch_to_object (tr->item);	3391	tmp = arch_to_object (tr->item);
3447	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3392	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3448	tmp = insert_ob_in_ob (tmp, who);	3393	who->insert (tmp);
3449	if (who->type == PLAYER)
3450	esrv_send_item (who, tmp);
3451	}	3394	}
3452	}	3395	}
3453		3396
3454	/**	3397	/**
3455	* Unready an object for a player. This function does nothing if the object was	3398	* Unready an object for a player. This function does nothing if the object was
…		…
3467	if (pl->ranged_ob == ob)	3410	if (pl->ranged_ob == ob)
3468	pl->ranged_ob = 0;	3411	pl->ranged_ob = 0;
3469	}	3412	}
3470		3413
3471	sint8	3414	sint8
3472	player::visibility_at (maptile *map, int x, int y) const	3415	player::darkness_at (maptile *map, int x, int y) const
3473	{	3416	{
3474	if (!ns)	3417	if (!ns)
3475	return 0;	3418	return LOS_BLOCKED;
3476		3419
3477	int dx, dy;	3420	int dx, dy;
3478	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3421	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3479	return 0;	3422	return LOS_BLOCKED;
3480		3423
3481	x += dx - ns->current_x + ns->mapx / 2;	3424	x += dx - ns->current_x;
3482	y += dy - ns->current_y + ns->mapy / 2;	3425	y += dy - ns->current_y;
3483		3426
3484	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3485	return 0;
3486
3487	return 100 - blocked_los [x][y];	3427	return blocked_los (x, y);
3488	}	3428	}
3489		3429
3490	void	3430	void
3491	player::infobox (const char *title, const char *msg, int color)	3431	player::infobox (const char *title, const char *msg, int color)
3492	{	3432	{

Diff Legend

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