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.216 by root, Sun Dec 28 06:59:27 2008 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
…		…
1007	if (op->move_type & MOVE_FLYING)	979	if (op->move_type & MOVE_FLYING)
1008	return 1;	980	return 1;
1009		981
1010	next = op->below;	982	next = op->below;
1011		983
		984	int cnt = MAX_ITEM_PER_DROP;
		985	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		986
1012	/* loop while there are items on the floor that are not marked as	987	/* loop while there are items on the floor that are not marked as
1013	* destroyed */	988	* destroyed */
1014	while (next && !next->destroyed ())	989	while (next && !next->destroyed ())
1015	{	990	{
1016	tmp = next;	991	tmp = next;
1017	next = tmp->below;	992	next = tmp->below;
1018		993
		994	if (cnt <= 0)
		995	{
		996	op->failmsg ("Couldn't pickup all items at once.");
		997	return 0;
		998	}
		999
1019	if (op->destroyed ())	1000	if (op->destroyed ())
1020	return 0;	1001	return 0;
1021		1002
1022	if (!can_pick (op, tmp))	1003	if (!can_pick (op, tmp))
1023	continue;	1004	continue;
1024		1005
1025	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1006	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1026	{	1007	{
1027	if (item_matched_string (op, tmp, op->contr->search_str))	1008	if (item_matched_string (op, tmp, op->contr->search_str))
1028	pick_up (op, tmp);	1009	CHK_PICK_PICKUP;
		1010
1029	continue;	1011	continue;
1030	}	1012	}
1031		1013
1032	/* high not bit set? We're using the old autopickup model */	1014	/* high not bit set? We're using the old autopickup model */
1033	if (!(op->contr->mode & PU_NEWMODE))	1015	if (!(op->contr->mode & PU_NEWMODE))
…		…
1035	switch (op->contr->mode)	1017	switch (op->contr->mode)
1036	{	1018	{
1037	case 0:	1019	case 0:
1038	return 1; /* don't pick up */	1020	return 1; /* don't pick up */
1039	case 1:	1021	case 1:
1040	pick_up (op, tmp);	1022	CHK_PICK_PICKUP;
1041	return 1;	1023	return 1;
1042	case 2:	1024	case 2:
1043	pick_up (op, tmp);	1025	CHK_PICK_PICKUP;
1044	return 0;	1026	return 0;
1045	case 3:	1027	case 3:
1046	return 0; /* stop before pickup */	1028	return 0; /* stop before pickup */
1047	case 4:	1029	case 4:
1048	pick_up (op, tmp);	1030	CHK_PICK_PICKUP;
1049	break;	1031	break;
1050	case 5:	1032	case 5:
1051	pick_up (op, tmp);	1033	CHK_PICK_PICKUP;
1052	stop = 1;	1034	stop = 1;
1053	break;	1035	break;
1054	case 6:	1036	case 6:
1055	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1037	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1056	pick_up (op, tmp);	1038	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1039	CHK_PICK_PICKUP;
1057	break;	1040	break;
1058		1041
1059	case 7:	1042	case 7:
1060	if (tmp->type == MONEY || tmp->type == GEM)	1043	if (tmp->type == MONEY || tmp->type == GEM)
1061	pick_up (op, tmp);	1044	CHK_PICK_PICKUP;
1062	break;	1045	break;
1063		1046
1064	default:	1047	default:
1065	/* use value density */	1048	/* use value density */
1066	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1049	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1067	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1050	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1068	pick_up (op, tmp);	1051	CHK_PICK_PICKUP;
1069	}	1052	}
1070	}	1053	}
1071	else	1054	else
1072	{ /* old model */	1055	{ /* old model */
1073	/* NEW pickup handling */	1056	/* NEW pickup handling */
…		…
1128	/* all food and drink if desired */	1111	/* all food and drink if desired */
1129	/* question: don't pick up known-poisonous stuff? */	1112	/* question: don't pick up known-poisonous stuff? */
1130	if (op->contr->mode & PU_FOOD)	1113	if (op->contr->mode & PU_FOOD)
1131	if (tmp->type == FOOD)	1114	if (tmp->type == FOOD)
1132	{	1115	{
1133	pick_up (op, tmp);	1116	CHK_PICK_PICKUP;
1134	continue;	1117	continue;
1135	}	1118	}
1136		1119
1137	if (op->contr->mode & PU_DRINK)	1120	if (op->contr->mode & PU_DRINK)
1138	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1121	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1139	{	1122	{
1140	pick_up (op, tmp);	1123	CHK_PICK_PICKUP;
1141	continue;	1124	continue;
1142	}	1125	}
1143		1126
1144	if (op->contr->mode & PU_POTION)	1127	if (op->contr->mode & PU_POTION)
1145	if (tmp->type == POTION)	1128	if (tmp->type == POTION)
1146	{	1129	{
1147	pick_up (op, tmp);	1130	CHK_PICK_PICKUP;
1148	continue;	1131	continue;
1149	}	1132	}
1150		1133
1151	/* spellbooks, skillscrolls and normal books/scrolls */	1134	/* spellbooks, skillscrolls and normal books/scrolls */
1152	if (op->contr->mode & PU_SPELLBOOK)	1135	if (op->contr->mode & PU_SPELLBOOK)
1153	if (tmp->type == SPELLBOOK)	1136	if (tmp->type == SPELLBOOK)
1154	{	1137	{
1155	pick_up (op, tmp);	1138	CHK_PICK_PICKUP;
1156	continue;	1139	continue;
1157	}	1140	}
1158		1141
1159	if (op->contr->mode & PU_SKILLSCROLL)	1142	if (op->contr->mode & PU_SKILLSCROLL)
1160	if (tmp->type == SKILLSCROLL)	1143	if (tmp->type == SKILLSCROLL)
1161	{	1144	{
1162	pick_up (op, tmp);	1145	CHK_PICK_PICKUP;
1163	continue;	1146	continue;
1164	}	1147	}
1165		1148
1166	if (op->contr->mode & PU_READABLES)	1149	if (op->contr->mode & PU_READABLES)
1167	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)	1150	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1168	{	1151	{
1169	pick_up (op, tmp);	1152	CHK_PICK_PICKUP;
1170	continue;	1153	continue;
1171	}	1154	}
1172		1155
1173	/* wands/staves/rods/horns */	1156	/* wands/staves/rods/horns */
1174	if (op->contr->mode & PU_MAGIC_DEVICE)	1157	if (op->contr->mode & PU_MAGIC_DEVICE)
1175	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1158	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1176	{	1159	{
1177	pick_up (op, tmp);	1160	CHK_PICK_PICKUP;
1178	continue;	1161	continue;
1179	}	1162	}
1180		1163
1181	/* pick up all magical items */	1164	/* pick up all magical items */
1182	if (op->contr->mode & PU_MAGICAL)	1165	if (op->contr->mode & PU_MAGICAL)
1183	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1166	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1184	{	1167	{
1185	pick_up (op, tmp);	1168	CHK_PICK_PICKUP;
1186	continue;	1169	continue;
1187	}	1170	}
1188		1171
1189	if (op->contr->mode & PU_VALUABLES)	1172	if (op->contr->mode & PU_VALUABLES)
1190	{	1173	{
1191	if (tmp->type == MONEY || tmp->type == GEM)	1174	if (tmp->type == MONEY || tmp->type == GEM)
1192	{	1175	{
1193	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1194	continue;	1177	continue;
1195	}	1178	}
1196	}	1179	}
1197		1180
1198	/* rings & amulets - talismans seems to be typed AMULET */	1181	/* rings & amulets - talismans seems to be typed AMULET */
1199	if (op->contr->mode & PU_JEWELS)	1182	if (op->contr->mode & PU_JEWELS)
1200	if (tmp->type == RING || tmp->type == AMULET)	1183	if (tmp->type == RING || tmp->type == AMULET)
1201	{	1184	{
1202	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1203	continue;	1186	continue;
1204	}	1187	}
1205		1188
1206	/* we don't forget dragon food */	1189	/* we don't forget dragon food */
1207	if (op->contr->mode & PU_FLESH)	1190	if (op->contr->mode & PU_FLESH)
1208	if (tmp->type == FLESH)	1191	if (tmp->type == FLESH)
1209	{	1192	{
1210	pick_up (op, tmp);	1193	CHK_PICK_PICKUP;
1211	continue;	1194	continue;
1212	}	1195	}
1213		1196
1214	/* bows and arrows. Bows are good for selling! */	1197	/* bows and arrows. Bows are good for selling! */
1215	if (op->contr->mode & PU_BOW)	1198	if (op->contr->mode & PU_BOW)
1216	if (tmp->type == BOW)	1199	if (tmp->type == BOW)
1217	{	1200	{
1218	pick_up (op, tmp);	1201	CHK_PICK_PICKUP;
1219	continue;	1202	continue;
1220	}	1203	}
1221		1204
1222	if (op->contr->mode & PU_ARROW)	1205	if (op->contr->mode & PU_ARROW)
1223	if (tmp->type == ARROW)	1206	if (tmp->type == ARROW)
1224	{	1207	{
1225	pick_up (op, tmp);	1208	CHK_PICK_PICKUP;
1226	continue;	1209	continue;
1227	}	1210	}
1228		1211
1229	/* all kinds of armor etc. */	1212	/* all kinds of armor etc. */
1230	if (op->contr->mode & PU_ARMOUR)	1213	if (op->contr->mode & PU_ARMOUR)
1231	if (tmp->type == ARMOUR)	1214	if (tmp->type == ARMOUR)
1232	{	1215	{
1233	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1234	continue;	1217	continue;
1235	}	1218	}
1236		1219
1237	if (op->contr->mode & PU_HELMET)	1220	if (op->contr->mode & PU_HELMET)
1238	if (tmp->type == HELMET)	1221	if (tmp->type == HELMET)
1239	{	1222	{
1240	pick_up (op, tmp);	1223	CHK_PICK_PICKUP;
1241	continue;	1224	continue;
1242	}	1225	}
1243		1226
1244	if (op->contr->mode & PU_SHIELD)	1227	if (op->contr->mode & PU_SHIELD)
1245	if (tmp->type == SHIELD)	1228	if (tmp->type == SHIELD)
1246	{	1229	{
1247	pick_up (op, tmp);	1230	CHK_PICK_PICKUP;
1248	continue;	1231	continue;
1249	}	1232	}
1250		1233
1251	if (op->contr->mode & PU_BOOTS)	1234	if (op->contr->mode & PU_BOOTS)
1252	if (tmp->type == BOOTS)	1235	if (tmp->type == BOOTS)
1253	{	1236	{
1254	pick_up (op, tmp);	1237	CHK_PICK_PICKUP;
1255	continue;	1238	continue;
1256	}	1239	}
1257		1240
1258	if (op->contr->mode & PU_GLOVES)	1241	if (op->contr->mode & PU_GLOVES)
1259	if (tmp->type == GLOVES)	1242	if (tmp->type == GLOVES)
1260	{	1243	{
1261	pick_up (op, tmp);	1244	CHK_PICK_PICKUP;
1262	continue;	1245	continue;
1263	}	1246	}
1264		1247
1265	if (op->contr->mode & PU_CLOAK)	1248	if (op->contr->mode & PU_CLOAK)
1266	if (tmp->type == CLOAK)	1249	if (tmp->type == CLOAK)
1267	{	1250	{
1268	pick_up (op, tmp);	1251	CHK_PICK_PICKUP;
1269	continue;	1252	continue;
1270	}	1253	}
1271		1254
1272	/* hoping to catch throwing daggers here */	1255	/* hoping to catch throwing daggers here */
1273	if (op->contr->mode & PU_MISSILEWEAPON)	1256	if (op->contr->mode & PU_MISSILEWEAPON)
1274	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1257	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1275	{	1258	{
1276	pick_up (op, tmp);	1259	CHK_PICK_PICKUP;
1277	continue;	1260	continue;
1278	}	1261	}
1279		1262
1280	/* careful: chairs and tables are weapons! */	1263	/* careful: chairs and tables are weapons! */
1281	if (op->contr->mode & PU_ALLWEAPON)	1264	if (op->contr->mode & PU_ALLWEAPON)
…		…
1283	if (tmp->type == WEAPON && tmp->name != NULL)	1266	if (tmp->type == WEAPON && tmp->name != NULL)
1284	{	1267	{
1285	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&	1268	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1286	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1269	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1287	{	1270	{
1288	pick_up (op, tmp);	1271	CHK_PICK_PICKUP;
1289	continue;	1272	continue;
1290	}	1273	}
1291	}	1274	}
1292		1275
1293	if (tmp->type == WEAPON && tmp->name == NULL)	1276	if (tmp->type == WEAPON && tmp->name == NULL)
1294	{	1277	{
1295	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)	1278	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1296	{	1279	{
1297	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1298	continue;	1281	continue;
1299	}	1282	}
1300	}	1283	}
1301	}	1284	}
1302		1285
1303	/* misc stuff that's useful */	1286	/* misc stuff that's useful */
1304	if (op->contr->mode & PU_KEY)	1287	if (op->contr->mode & PU_KEY)
1305	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1288	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1306	{	1289	{
1307	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1308	continue;	1291	continue;
1309	}	1292	}
1310		1293
1311	/* any of the last 4 bits set means we use the ratio for value	1294	/* any of the last 4 bits set means we use the ratio for value
1312	* pickups */	1295	* pickups */
1313	if (op->contr->mode & PU_RATIO)	1296	if (op->contr->mode & PU_RATIO)
1314	{	1297	{
1315	/* use value density to decide what else to grab */	1298	/* use value density to decide what else to grab */
1316	/* >=7 was >= op->contr->mode */	1299	/* >=7 was >= op->contr->mode */
1317	/* >=7 is the old standard setting. Now we take the last 4 bits	1300	/* >=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 */	1301	*/
1319	wvratio = (op->contr->mode & PU_RATIO) * 5;	1302	wvratio = op->contr->mode & PU_RATIO;
1320	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1303	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1321	{	1304	{
1322	pick_up (op, tmp);	1305	CHK_PICK_PICKUP;
1323	#if 0	1306	#if 0
1324	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1307	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1325	if (tmp->name != NULL)	1308	if (tmp->name != NULL)
1326	{	1309	{
1327	fprintf (stderr, "%s", tmp->name);	1310	fprintf (stderr, "%s", tmp->name);
…		…
1346	* found object is returned.	1329	* found object is returned.
1347	*/	1330	*/
1348	object *	1331	object *
1349	find_arrow (object *op, const char *type)	1332	find_arrow (object *op, const char *type)
1350	{	1333	{
1351	object *tmp = 0;
1352
1353	for (op = op->inv; op; op = op->below)	1334	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)	1335	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1336	return splay (tmp);
		1337
		1338	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1339	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1340	if (object *arrow = find_arrow (tmp, type))
		1341	{
		1342	splay (tmp);
1357	return op;	1343	return arrow;
		1344	}
1358		1345
1359	return tmp;	1346	return 0;
1360	}	1347	}
1361		1348
1362	/*	1349	/*
1363	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1350	* 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	1351	* against the target. A full test is not performed, simply a basic test
…		…
1387	}	1374	}
1388	}	1375	}
1389	else if (arrow->type == ARROW && arrow->race == type)	1376	else if (arrow->type == ARROW && arrow->race == type)
1390	{	1377	{
1391	/* allways prefer assasination/slaying */	1378	/* allways prefer assasination/slaying */
1392	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1379	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1393	{	1380	{
1394	if (arrow->attacktype & AT_DEATH)	1381	if (arrow->attacktype & AT_DEATH)
1395	{	1382	{
1396	*better = 100;	1383	*better = 100;
1397	return arrow;	1384	return arrow;
…		…
1425	betterby = 1 + arrow->magic + arrow->stats.dam;	1412	betterby = 1 + arrow->magic + arrow->stats.dam;
1426	}	1413	}
1427	}	1414	}
1428	}	1415	}
1429	}	1416	}
		1417
1430	if (tmp == NULL && arrow == NULL)	1418	if (tmp == NULL && arrow == NULL)
1431	return find_arrow (op, type);	1419	return find_arrow (op, type);
1432		1420
1433	*better = betterby;	1421	*better = betterby;
1434	return tmp;	1422	return tmp;
…		…
1464	for (i = 0, found = 0; i < 20; i++)	1452	for (i = 0, found = 0; i < 20; i++)
1465	{	1453	{
1466	x += freearr_x[dir];	1454	x += freearr_x[dir];
1467	y += freearr_y[dir];	1455	y += freearr_y[dir];
1468	mflags = get_map_flags (m, &m, x, y, &x, &y);	1456	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1457
1469	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1458	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1470	{	1459	{
1471	tmp = NULL;	1460	tmp = 0;
1472	break;	1461	break;
1473	}	1462	}
1474	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1463	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1475	{	1464	{
1476	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1465	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1477	* perhaps a bad assumption.	1466	* perhaps a bad assumption.
1478	*/	1467	*/
1479	tmp = NULL;	1468	tmp = 0;
1480	break;	1469	break;
1481	}	1470	}
		1471
1482	if (mflags & P_IS_ALIVE)	1472	if (mflags & P_IS_ALIVE)
1483	{
1484	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1473	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1485	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1474	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1486	{
1487	found++;
1488	break;
1489	}
1490	if (found)
1491	break;	1475	break;
1492	}
1493	}	1476	}
1494	if (tmp == NULL)	1477
		1478	if (!tmp)
1495	return find_arrow (op, type);	1479	return find_arrow (op, type);
1496		1480
1497	if (tmp->head)	1481	if (tmp->head)
1498	tmp = tmp->head;	1482	tmp = tmp->head;
1499		1483
…		…
1544	if (bow->below)	1528	if (bow->below)
1545	{	1529	{
1546	bow->remove ();	1530	bow->remove ();
1547	op->insert (bow);	1531	op->insert (bow);
1548	}	1532	}
1549
1550	}	1533	}
1551		1534
1552	if (!bow->race || !bow->skill)	1535	if (!bow->race || !bow->skill)
1553	{	1536	{
1554	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1537	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1580	}	1563	}
1581		1564
1582	/* this should not happen, but sometimes does */	1565	/* this should not happen, but sometimes does */
1583	if (arrow->nrof == 0)	1566	if (arrow->nrof == 0)
1584	{	1567	{
		1568	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1585	arrow->destroy ();	1569	arrow->destroy ();
1586	return 0;	1570	return 0;
1587	}	1571	}
1588		1572
1589	left = arrow; /* these are arrows left to the player */	1573	left = arrow; /* these are arrows left to the player */
1590	arrow = get_split_ob (arrow, 1);	1574	arrow = arrow->split ();
1591	if (!arrow)	1575	if (!arrow)
1592	{	1576	{
1593	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1577	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1594	return 0;	1578	return 0;
1595	}	1579	}
…		…
1662	op->play_sound (sound_find ("fire_arrow"));	1646	op->play_sound (sound_find ("fire_arrow"));
1663	m->insert (arrow, sx, sy, op);	1647	m->insert (arrow, sx, sy, op);
1664		1648
1665	if (!arrow->destroyed ())	1649	if (!arrow->destroyed ())
1666	move_arrow (arrow);	1650	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		1651
1676	return 1;	1652	return 1;
1677	}	1653	}
1678		1654
1679	/* Special fire code for players - this takes into	1655	/* Special fire code for players - this takes into
…		…
1684	* hence the function name.	1660	* hence the function name.
1685	*/	1661	*/
1686	int	1662	int
1687	player_fire_bow (object *op, int dir)	1663	player_fire_bow (object *op, int dir)
1688	{	1664	{
1689	int ret = 0, wcmod = 0;	1665	int ret;
1690		1666
1691	if (op->contr->bowtype == bow_bestarrow)	1667	if (op->contr->bowtype == bow_bestarrow)
1692	{	1668	{
1693	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1669	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1694	}	1670	}
1695	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1671	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1696	{	1672	{
1697	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1673	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);	1674	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1701	}	1675	}
1702	else if (op->contr->bowtype == bow_threewide)	1676	else if (op->contr->bowtype == bow_threewide)
1703	{	1677	{
1704	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1678	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)]);	1679	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)]);	1680	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1707	}	1681	}
1708	else if (op->contr->bowtype == bow_spreadshot)	1682	else if (op->contr->bowtype == bow_spreadshot)
1709	{	1683	{
1710	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1684	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);	1685	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);	1686	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1713	}	1687	}
1714	else	1688	else
1715	{	1689	{
…		…
1753	return;	1727	return;
1754	}	1728	}
1755	}	1729	}
1756	else if (item->type == ROD || item->type == HORN)	1730	else if (item->type == ROD || item->type == HORN)
1757	{	1731	{
1758	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1732	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1733
		1734	// using the maximum of the rods charge allows at least one spell cast
		1735	// for a rod or horn, this fixes some broken rods.
		1736	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1759	{	1737	{
1760	op->contr->play_sound (sound_find ("wand_poof"));	1738	op->contr->play_sound (sound_find ("wand_poof"));
1761		1739
1762	if (item->type == ROD)	1740	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));	1741	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1768	}	1746	}
1769	}	1747	}
1770		1748
1771	if (cast_spell (op, item, dir, item->inv, NULL))	1749	if (cast_spell (op, item, dir, item->inv, NULL))
1772	{	1750	{
1773	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1751	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1752
1774	if (item->type == WAND)	1753	if (item->type == WAND)
1775	{	1754	{
1776	if (!(--item->stats.food))	1755	if (!(--item->stats.food))
1777	{	1756	{
1778	object *tmp;	1757	object *tmp;
…		…
1782	CLEAR_FLAG (item, FLAG_ANIMATE);	1761	CLEAR_FLAG (item, FLAG_ANIMATE);
1783	item->face = item->arch->face;	1762	item->face = item->arch->face;
1784	item->set_speed (0);	1763	item->set_speed (0);
1785	}	1764	}
1786		1765
1787	if ((tmp = item->in_player ()))	1766	if (object *pl = item->visible_to ())
1788	esrv_update_item (UPD_ANIM, tmp, item);	1767	esrv_update_item (UPD_ANIM, pl, item);
1789	}	1768	}
1790	}	1769	}
1791	else if (item->type == ROD || item->type == HORN)	1770	else if (item->type == ROD || item->type == HORN)
1792	drain_rod_charge (item);	1771	drain_rod_charge (item);
1793	}	1772	}
…		…
1798	bool	1777	bool
1799	fire (object *op, int dir)	1778	fire (object *op, int dir)
1800	{	1779	{
1801	int spellcost = 0;	1780	int spellcost = 0;
1802		1781
1803	/* check for loss of invisiblity/hide */
1804	if (action_makes_visible (op))
1805	make_visible (op);
1806
1807	player *pl = op->contr;	1782	player *pl = op->contr;
1808		1783
1809	if (pl->golem)	1784	if (pl->golem)
1810	{	1785	{
1811	control_golem (op->contr->golem, dir);	1786	control_golem (op->contr->golem, dir);
…		…
1813	}	1788	}
1814		1789
1815	object *ob = pl->ranged_ob;	1790	object *ob = pl->ranged_ob;
1816		1791
1817	if (!ob)	1792	if (!ob)
1818	return false;
1819
1820	if (!op->change_weapon (ob))
1821	return false;	1793	return false;
1822		1794
1823	if (op->speed_left > 0.f)	1795	if (op->speed_left > 0.f)
1824	--op->speed_left;	1796	--op->speed_left;
1825	else	1797	else
1826	return false;	1798	return false;
		1799
		1800	if (!op->change_weapon (ob))
		1801	return false;
		1802
		1803	/* check for loss of invisiblity/hide */
		1804	if (action_makes_visible (op))
		1805	make_visible (op);
1827		1806
1828	switch (ob->type)	1807	switch (ob->type)
1829	{	1808	{
1830	case BOW:	1809	case BOW:
1831	player_fire_bow (op, dir);	1810	player_fire_bow (op, dir);
…		…
1969	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);	1948	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1970	remove_door2 (door); /* remove door without violence ;-) */	1949	remove_door2 (door); /* remove door without violence ;-) */
1971	}	1950	}
1972		1951
1973	/* Do this after we print the message */	1952	/* Do this after we print the message */
1974	decrease_ob (key); /* Use up one of the keys */	1953	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		1954
1979	return 1; /* Nothing more to do below */	1955	return 1; /* Nothing more to do below */
1980	}	1956	}
1981	else if (door->type == LOCKED_DOOR)	1957	else if (door->type == LOCKED_DOOR)
1982	{	1958	{
…		…
2079	--op->speed_left;	2055	--op->speed_left;
2080		2056
2081	op->play_sound (sound_find ("push_player"));	2057	op->play_sound (sound_find ("push_player"));
2082	push_ob (mon, dir, op);	2058	push_ob (mon, dir, op);
2083		2059
2084	if (op->contr->tmp_invis || op->hide)	2060	if (action_makes_visible (op))
2085	make_visible (op);	2061	make_visible (op);
2086		2062
2087	return true;	2063	return true;
2088	}	2064	}
2089	else	2065	else
…		…
2111	push_ob (mon, dir, op);	2087	push_ob (mon, dir, op);
2112	}	2088	}
2113	else	2089	else
2114	op->statusmsg ("You withhold your attack");	2090	op->statusmsg ("You withhold your attack");
2115		2091
2116	if (op->contr->tmp_invis || op->hide)	2092	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2117	make_visible (op);	2093	make_visible (op);
2118		2094
2119	return true;	2095	return true;
2120	}	2096	}
2121	}	2097	}
…		…
2163	bool	2139	bool
2164	move_player (object *op, int dir)	2140	move_player (object *op, int dir)
2165	{	2141	{
2166	int pick;	2142	int pick;
2167		2143
2168	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2144	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2169	return 0;	2145	return 0;
2170		2146
2171	/* Sanity check: make sure dir is valid */	2147	/* Sanity check: make sure dir is valid */
2172	if ((dir < 0) || (dir >= 9))	2148	if ((dir < 0) || (dir >= 9))
2173	{	2149	{
…		…
2179	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2155	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2180	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2156	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2181		2157
2182	op->facing = dir;	2158	op->facing = dir;
2183		2159
2184	if (op->hide)	2160	if (op->flag [FLAG_HIDDEN])
2185	do_hidden_move (op);	2161	do_hidden_move (op);
2186		2162
2187	bool retval;	2163	bool retval;
2188		2164
2189	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2165	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2261	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2237	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2262	{	2238	{
2263	op->play_sound (sound_find ("ob_evaporate"));	2239	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));	2240	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2265		2241
2266	if (op->contr)
2267	esrv_del_item (op->contr, tmp->count);
2268
2269	tmp->destroy ();	2242	tmp->destroy ();
2270	CLEAR_FLAG (op, FLAG_LIFESAVE);	2243	CLEAR_FLAG (op, FLAG_LIFESAVE);
2271		2244
2272	if (op->stats.hp < 0)	2245	if (op->stats.hp < 0)
2273	op->stats.hp = op->stats.maxhp;	2246	op->stats.hp = op->stats.maxhp;
…		…
2285	return 0;	2258	return 0;
2286	}	2259	}
2287		2260
2288	/* This goes throws the inventory and removes unpaid objects, and puts them	2261	/* 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	2262	* 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	2263	* function will descend into containers. op is the object to start the search
2291	* from.	2264	* from.
2292	*/	2265	*/
2293	static void	2266	static void
2294	drop_unpaid_items (object *op, object *env)	2267	drop_unpaid_items (object *op, object *env)
2295	{	2268	{
2296	while (op)	2269	while (op)
2297	{	2270	{
2298	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2271	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2299		2272
2300	if (QUERY_FLAG (op, FLAG_UNPAID))	2273	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);	2274	op->insert_at (env);
2306	}
2307	else if (op->inv)	2275	else if (op->inv)
2308	drop_unpaid_items (op->inv, env);	2276	drop_unpaid_items (op->inv, env);
2309		2277
2310	op = next;	2278	op = next;
2311	}	2279	}
…		…
2323	* Moved from apply.c to player.c - player.c is what	2291	* Moved from apply.c to player.c - player.c is what
2324	* actually uses this function. player.c may not be quite the	2292	* actually uses this function. player.c may not be quite the
2325	* best, a misc file for object actions is probably better,	2293	* best, a misc file for object actions is probably better,
2326	* but there isn't one in the server directory.	2294	* but there isn't one in the server directory.
2327	*/	2295	*/
2328	char *	2296	const char *
2329	gravestone_text (object *op)	2297	gravestone_text (object *op)
2330	{	2298	{
2331	static char buf2[MAX_BUF];	2299	static dynbuf_text buf;
2332	char buf[MAX_BUF];
2333	time_t now = time (NULL);
2334		2300
2335	strcpy (buf2, " R.I.P.\n\n");	2301	buf << "---- R.I.P. ----\n\n"
		2302	<< op->name;
		2303
2336	if (op->type == PLAYER)	2304	if (op->type == PLAYER)
2337	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2305	buf << " the " << op->contr->title;
2338	else
2339	sprintf (buf, "%s\n", &op->name);
2340		2306
2341	strncat (buf2, " ", 20 - strlen (buf) / 2);	2307	buf << "\n\n";
2342	strcat (buf2, buf);	2308
		2309	buf << "who was level ";
		2310	buf << (sint32)op->level << "\n\n" // OO breakdown
		2311	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2312
2343	if (op->type == PLAYER)	2313	if (op->type == PLAYER)
2344	sprintf (buf, "who was in level %d when killed\n", op->level);	2314	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		2315
2348	strncat (buf2, " ", 20 - strlen (buf) / 2);
2349	strcat (buf2, buf);
2350	if (op->type == PLAYER)
2351	{	2316	{
2352	sprintf (buf, "by %s.\n\n", op->contr->killer);	2317	static char buf2[128];
2353	strncat (buf2, " ", 21 - strlen (buf) / 2);	2318	time_t now = time (NULL);
2354	strcat (buf2, buf);
2355	}
2356
2357	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2319	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2358	strncat (buf2, " ", 20 - strlen (buf) / 2);	2320	buf << buf2;
2359	strcat (buf2, buf);	2321	}
2360		2322
2361	return buf2;	2323	return buf;
2362	}	2324	}
2363		2325
2364	void	2326	void
2365	do_some_living (object *op)	2327	do_some_living (object *op)
2366	{	2328	{
…		…
2521	{	2483	{
2522	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2484	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2523		2485
2524	if (over_hp > 0)	2486	if (over_hp > 0)
2525	{	2487	{
2526	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2488	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2527	op->last_heal = 0;	2489	op->last_heal = 0;
2528	}	2490	}
2529	else	2491	else
2530	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2492	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2531	}	2493	}
…		…
2547	op->stats.food--;	2509	op->stats.food--;
2548	}	2510	}
2549		2511
2550	if (op->stats.food < 0 && op->stats.hp >= 0)	2512	if (op->stats.food < 0 && op->stats.hp >= 0)
2551	{	2513	{
2552	object *tmp, *flesh = 0;	2514	object *flesh = 0;
2553		2515
2554	for (tmp = op->inv; tmp; tmp = tmp->below)	2516	for_inv_removable (op, tmp)
2555	{	2517	{
2556	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2518	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2519	continue;
		2520
		2521	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2557	{	2522	{
2558	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2523	op->statusmsg ("You blindly grab for a bite of food. "
2559	{	2524	"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);	2525	manual_apply (op, tmp, 0);
		2526
2562	if (op->stats.food >= 0 || op->stats.hp < 0)	2527	if (op->stats.food >= 0 || op->stats.hp < 0)
2563	break;	2528	break;
2564	}	2529	}
2565	else if (tmp->type == FLESH)	2530	else if (tmp->type == FLESH)
2566	flesh = tmp;	2531	flesh = tmp;
2567	} /* End if paid for object */	2532	}
2568	} /* end of for loop */
2569		2533
2570	/* If player is still starving, it means they don't have any food, so	2534	/* If player is still starving, it means they don't have any food, so
2571	* eat flesh instead.	2535	* eat flesh instead.
2572	*/	2536	*/
2573	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2537	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2574	{	2538	{
2575	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2539	op->statusmsg ("You blindly grab for a bite of food. "
		2540	"H<To prevent you from starving, you ate some random item from your backpack.>");
2576	manual_apply (op, flesh, 0);	2541	manual_apply (op, flesh, 0);
2577	}	2542	}
		2543
		2544	// If player is still starving, alert him!
		2545	if (op->stats.food < 0)
		2546	op->failmsg ("You are starving! "
		2547	"H<Eat some food to increase your food and prevent you from an untimely death.>");
2578	}	2548	}
2579		2549
2580	if (op->stats.food < 0)	2550	if (op->stats.food < 0)
2581	{	2551	{
2582	op->stats.hp += op->stats.food;	2552	op->stats.hp += op->stats.food;
2583	op->stats.food = 0;	2553	op->stats.food = 0;
		2554
		2555	if (op->stats.hp < 0)
		2556	{
		2557	op->contr->killer = archetype::get ("killer_starvation");
		2558	op->contr->killer->destroy ();
2584	}	2559	}
		2560	}
2585		2561
		2562	/* killer should be set here already */
2586	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2563	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2587	kill_player (op);	2564	kill_player (op);
2588	}	2565	}
2589	}	2566	}
2590		2567
…		…
2640	{	2617	{
2641	tmp->name = format ("%s's finger" , &op->name);	2618	tmp->name = format ("%s's finger" , &op->name);
2642	tmp->name_pl = format ("%s's fingers", &op->name);	2619	tmp->name_pl = format ("%s's fingers", &op->name);
2643	tmp->msg = format (	2620	tmp->msg = format (
2644	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2621	"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	2622	&op->name, op->contr->title,
		2623	(int)op->level,
		2624	op->contr->killer_name ()
2646	);	2625	);
2647	tmp->value = 0, tmp->type = 0;	2626	tmp->value = 0, tmp->type = 0;
2648	tmp->materialname = "organics";	2627	tmp->materialname = "organics";
2649	tmp->insert_at (op, tmp);	2628	tmp->insert_at (op, tmp);
2650	}	2629	}
…		…
2656	}	2635	}
2657		2636
2658	INVOKE_PLAYER (DEATH, op->contr);	2637	INVOKE_PLAYER (DEATH, op->contr);
2659		2638
2660	command_kill_pets (op, 0);	2639	command_kill_pets (op, 0);
2661
2662	if (op->stats.food < 0)
2663	strcpy (op->contr->killer, "starvation");
2664		2640
2665	op->contr->play_sound (sound_find ("player_dies"));	2641	op->contr->play_sound (sound_find ("player_dies"));
2666		2642
2667	/* save the map location for corpse, gravestone */	2643	/* save the map location for corpse, gravestone */
2668	x = op->x;	2644	x = op->x;
…		…
2698		2674
2699	lost_a_stat = 0;	2675	lost_a_stat = 0;
2700		2676
2701	for (z = 0; z < num_stats_lose; z++)	2677	for (z = 0; z < num_stats_lose; z++)
2702	{	2678	{
2703	i = RANDOM () % NUM_STATS;	2679	i = rndm (NUM_STATS);
2704		2680
2705	if (settings.stat_loss_on_death)	2681	if (settings.stat_loss_on_death)
2706	{	2682	{
2707	/* Pick a random stat and take a point off it. Tell the player	2683	/* Pick a random stat and take a point off it. Tell the player
2708	* what he lost.	2684	* what he lost.
…		…
2777	lost_a_stat = 1;	2753	lost_a_stat = 1;
2778	}	2754	}
2779	}	2755	}
2780	}	2756	}
2781	}	2757	}
		2758
2782	/* If no stat lost, tell the player. */	2759	/* If no stat lost, tell the player. */
2783	if (!lost_a_stat)	2760	if (!lost_a_stat)
2784	{	2761	{
2785	/* determine_god() seems to not work sometimes... why is this?	2762	/* determine_god() seems to not work sometimes... why is this?
2786	Should I be using something else? GD */	2763	Should I be using something else? GD */
…		…
2790	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2767	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2791	else	2768	else
2792	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2769	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2793	}	2770	}
2794	#else	2771	#else
2795	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2772	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2796	#endif	2773	#endif
2797		2774
2798	/* Put a gravestone up where the character 'almost' died. List the	2775	/* Put a gravestone up where the character 'almost' died. List the
2799	* exp loss on the stone.	2776	* exp loss on the stone.
2800	*/	2777	*/
2801	tmp = arch_to_object (archetype::find ("gravestone"));	2778	tmp = arch_to_object (archetype::find ("gravestone"));
2802	sprintf (buf, "%s's gravestone", &op->name);	2779	tmp->name = format ("%s's gravestone", &op->name);
2803	tmp->name = buf;	2780	tmp->name_pl = format ("%s's gravestones", &op->name);
2804	sprintf (buf, "%s's gravestones", &op->name);	2781	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2805	tmp->name_pl = buf;	2782	&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;	2783	tmp->x = op->x, tmp->y = op->y;
2809	insert_ob_in_map (tmp, op->map, NULL, 0);	2784	insert_ob_in_map (tmp, op->map, NULL, 0);
2810		2785
2811	/**************************************/	2786	/**************************************/
2812	/* */	2787	/* */
…		…
2835	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2810	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2836	}	2811	}
2837		2812
2838	cure_disease (op, 0, 0); /* remove any disease */	2813	cure_disease (op, 0, 0); /* remove any disease */
2839		2814
		2815	// remove all spell effects that are active
		2816	// to avoid long-term effects such as word-of-recall
		2817	for (object *item = op->inv; item; )
		2818	{
		2819	object *next = item->below;
		2820
		2821	if (item->type == SPELL_EFFECT && item->active)
		2822	item->destroy ();
		2823
		2824	item = next;
		2825	}
		2826
2840	/*add_exp(op, (op->stats.exp * -0.20)); */	2827	/*add_exp(op, (op->stats.exp * -0.20)); */
2841	apply_death_exp_penalty (op);	2828	apply_death_exp_penalty (op);
		2829
2842	if (op->stats.food < 100)	2830	if (op->stats.food < 100)
2843	op->stats.food = 900;	2831	op->stats.food = 900;
		2832
2844	op->stats.hp = op->stats.maxhp;	2833	op->stats.hp = op->stats.maxhp;
2845	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2834	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2846	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2835	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2847		2836
2848	/*	2837	/*
…		…
2886	if (will_kill_again & (1 << at))	2875	if (will_kill_again & (1 << at))
2887	force->resist[at] = 100;	2876	force->resist[at] = 100;
2888		2877
2889	insert_ob_in_ob (force, op);	2878	insert_ob_in_ob (force, op);
2890	op->update_stats ();	2879	op->update_stats ();
2891
2892	}	2880	}
2893		2881
2894	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2882	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2895	}	2883	}
2896		2884
…		…
2916		2904
2917	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2905	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2918	{	2906	{
2919	if (tmp->nrof > 1)	2907	if (tmp->nrof > 1)
2920	{	2908	{
2921	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2909	tmp->decrease (rndm (1, tmp->nrof - 1));
2922	tmp2->destroy ();
2923	insert_ob_in_map (tmp, op->map, NULL, 0);	2910	insert_ob_in_map (tmp, op->map, NULL, 0);
2924	}	2911	}
2925	else	2912	else
2926	tmp->destroy ();	2913	tmp->destroy ();
2927	}	2914	}
…		…
2938	void	2925	void
2939	fix_weight (void)	2926	fix_weight (void)
2940	{	2927	{
2941	for_all_players (pl)	2928	for_all_players (pl)
2942	{	2929	{
2943	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2930	sint32 old = pl->ob->carrying;
2944		2931
2945	if (old == sum)	2932	pl->ob->update_weight ();
2946	continue;	2933
		2934	if (old != pl->ob->carrying)
		2935	{
2947	pl->ob->update_stats ();	2936	pl->ob->update_stats ();
2948	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2937	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2938	}
2949	}	2939	}
2950	}	2940	}
2951		2941
2952	void	2942	void
2953	fix_luck (void)	2943	fix_luck (void)
…		…
2995	}	2985	}
2996		2986
2997	void	2987	void
2998	make_visible (object *op)	2988	make_visible (object *op)
2999	{	2989	{
3000	op->hide = 0;	2990	op->flag [FLAG_HIDDEN] = 0;
3001	op->invisible = 0;	2991	op->invisible = 0;
3002		2992
3003	if (op->type == PLAYER)	2993	if (op->type == PLAYER)
3004	{	2994	{
3005	op->contr->tmp_invis = 0;	2995	op->contr->tmp_invis = 0;
…		…
3030		3020
3031	if (!ob || !ob->map)	3021	if (!ob || !ob->map)
3032	return 0;	3022	return 0;
3033		3023
3034	/* so, on normal lighted maps, its hard to hide */	3024	/* so, on normal lighted maps, its hard to hide */
3035	level = ob->map->darkness - 2;	3025	level = ob->map->darklevel () - 2;
3036		3026
3037	/* this also picks up whether the object is glowing.	3027	/* this also picks up whether the object is glowing.
3038	* If you carry a light on a non-dark map, its not	3028	* If you carry a light on a non-dark map, its not
3039	* as bad as carrying a light on a pitch dark map */	3029	* as bad as carrying a light on a pitch dark map */
3040	if (has_carried_lights (ob))	3030	if (has_carried_lights (ob))
3041	level = -(10 + (2 * ob->map->darkness));	3031	level = -(10 + (2 * ob->map->darklevel ()));
3042		3032
3043	/* scan through all nearby squares for terrain to hide in */	3033	/* 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])	3034	for (i = 0, x = ob->x, y = ob->y;
		3035	i <= SIZEOFFREE1;
		3036	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3045	{	3037	{
3046	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3038	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3047	if (mflag & P_OUT_OF_MAP)	3039	if (mflag & P_OUT_OF_MAP)
3048	{
3049	continue;	3040	continue;
3050	}	3041
3051	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3042	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3052	level += 2;	3043	level += 2;
3053	else /* open terrain! */	3044	else /* open terrain! */
3054	level -= 1;	3045	level -= 1;
3055	}	3046	}
…		…
3066	* spot (surrounded by clear terrain in broad daylight). -b.t.	3057	* spot (surrounded by clear terrain in broad daylight). -b.t.
3067	*/	3058	*/
3068	void	3059	void
3069	do_hidden_move (object *op)	3060	do_hidden_move (object *op)
3070	{	3061	{
3071	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3062	int hide = 0;
3072	object *skop;
3073		3063
3074	if (!op || !op->map)	3064	if (!op || !op->map)
3075	return;	3065	return;
3076		3066
3077	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3067	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3068	int num = random_roll (0, 19, op, PREFER_LOW);
3078		3069
3079	/* its *extremely* hard to run and sneak/hide at the same time! */	3070	/* its *extremely* hard to run and sneak/hide at the same time! */
3080	if (op->type == PLAYER && op->contr->run_on)	3071	if (op->type == PLAYER && op->contr->run_on)
3081	if (!skop || num >= skop->level)	3072	if (!skop || num >= skop->level)
3082	{	3073	{
…		…
3092	num -= hide;	3083	num -= hide;
3093		3084
3094	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3085	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3095	{	3086	{
3096	make_visible (op);	3087	make_visible (op);
		3088
3097	if (op->type == PLAYER)	3089	if (op->type == PLAYER)
3098	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3090	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3099	}	3091	}
3100	else if (op->type == PLAYER && skop)	3092	else if (op->type == PLAYER && skop)
3101	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3093	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3195		3187
3196	/* only the viewable area the player sees is updated by LOS	3188	/* only the viewable area the player sees is updated by LOS
3197	* code, so we need to restrict ourselves to that range of values	3189	* code, so we need to restrict ourselves to that range of values
3198	* for any meaningful values.	3190	* for any meaningful values.
3199	*/	3191	*/
3200	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&	3192	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
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;	3193	return 1;
3204		3194
3205	op = op->more;	3195	op = op->more;
3206	}	3196	}
3207		3197
3208	return 0;	3198	return 0;
3209	}	3199	}
3210		3200
3211	/* routine for both players and monsters. We call this when	3201	/* routine for both players and monsters. We call this when
3212	* there is a possibility for our action distrubing our hiding	3202	* there is a possibility for our action distrubing our hiding
3213	* place or invisiblity spell. Artefact invisiblity is not	3203	* place or invisiblity spell. Artefact invisiblity causes
3214	* effected by this. If we arent invisible to begin with, we	3204	* "noise" instead. If we arent invisible to begin with, we
3215	* return 0.	3205	* return 0.
3216	*/	3206	*/
3217	int	3207	int
3218	action_makes_visible (object *op)	3208	action_makes_visible (object *op)
3219	{	3209	{
3220	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3210	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3221	{	3211	{
3222	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3212	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3213	{
		3214	// artefact invisibility is permanent, but we still make noise
		3215	// this is important for game-balance.
		3216	if (op->contr)
		3217	op->make_noise ();
		3218
3223	return 0;	3219	return 0;
		3220	}
3224		3221
3225	if (op->contr && op->contr->tmp_invis == 0)	3222	if (op->contr && op->contr->tmp_invis == 0)
3226	return 0;	3223	return 0;
3227		3224
3228	/* If monsters, they should become visible */	3225	/* If monsters, they should become visible */
3229	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3226	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3230	{	3227	{
3231	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3228	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3232	return 1;	3229	return 1;
3233	}	3230	}
3234	}	3231	}
3235		3232
3236	return 0;	3233	return 0;
…		…
3442	else	3439	else
3443	{	3440	{
3444	/* generate misc. treasure */	3441	/* generate misc. treasure */
3445	tmp = arch_to_object (tr->item);	3442	tmp = arch_to_object (tr->item);
3446	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3443	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);	3444	who->insert (tmp);
3448	if (who->type == PLAYER)
3449	esrv_send_item (who, tmp);
3450	}	3445	}
3451	}	3446	}
3452		3447
3453	/**	3448	/**
3454	* Unready an object for a player. This function does nothing if the object was	3449	* Unready an object for a player. This function does nothing if the object was
…		…
3466	if (pl->ranged_ob == ob)	3461	if (pl->ranged_ob == ob)
3467	pl->ranged_ob = 0;	3462	pl->ranged_ob = 0;
3468	}	3463	}
3469		3464
3470	sint8	3465	sint8
3471	player::visibility_at (maptile *map, int x, int y) const	3466	player::darkness_at (maptile *map, int x, int y) const
3472	{	3467	{
3473	if (!ns)	3468	if (!ns)
3474	return 0;	3469	return LOS_BLOCKED;
3475		3470
3476	int dx, dy;	3471	int dx, dy;
3477	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3472	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3478	return 0;	3473	return LOS_BLOCKED;
3479		3474
3480	x += dx - ns->current_x + ns->mapx / 2;	3475	x += dx - ns->current_x;
3481	y += dy - ns->current_y + ns->mapy / 2;	3476	y += dy - ns->current_y;
3482		3477
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];	3478	return blocked_los (x, y);
3487	}	3479	}
3488		3480
3489	void	3481	void
3490	player::infobox (const char *title, const char *msg, int color)	3482	player::infobox (const char *title, const char *msg, int color)
3491	{	3483	{

Diff Legend

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