ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.152 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.218 by root, Sun Dec 28 10:05:42 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';
…		…
183		186
184	if (ob->map)	187	if (ob->map)
185	maplevel = ob->map->path;	188	maplevel = ob->map->path;
186		189
187	ob->remove ();	190	ob->remove ();
		191	ob->enemy = 0; // sometimes keeps an extra refcount on itself
188	ob->map = 0;	192	ob->map = 0;
189	party = 0;	193	party = 0;
190		194
191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192		196
…		…
206	ob->close_container (); //TODO: client-specific	210	ob->close_container (); //TODO: client-specific
207		211
208	ns->update_look = 0;	212	ns->update_look = 0;
209	ns->look_position = 0;	213	ns->look_position = 0;
210		214
211	clear_los (this);	215	clear_los ();
212		216
213	ns->reset_stats ();	217	ns->reset_stats ();
214		218
215	/* make sure he's a player -- needed because of class change. */	219	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	220	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->race;	221	ob->race = ob->arch->race;
218		222
219	ob->carrying = sum_weight (ob);	223	ob->update_weight ();
220	link_player_skills (ob);	224	link_skills ();
221		225
222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223		227
224	assign (title, ob->arch->object::name);	228	assign (title, ob->arch->object::name);
225		229
226	/* if it's a dragon player, set the correct title here */	230	/* if it's a dragon player, set the correct title here */
227	if (is_dragon_pl (ob))	231	if (is_dragon_pl (ob))
228	{	232	{
229	object *tmp, *abil = 0, *skin = 0;	233	object *tmp, *abil = 0, *skin = 0;
230		234
231	shstr_cmp dragon_ability_force ("dragon_ability_force");
232	shstr_cmp dragon_skin_force ("dragon_skin_force");
233
234	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
235	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
236	if (tmp->arch->archname == dragon_ability_force)	237	if (tmp->arch->archname == shstr_dragon_ability_force)
237	abil = tmp;	238	abil = tmp;
238	else if (tmp->arch->archname == dragon_skin_force)	239	else if (tmp->arch->archname == shstr_dragon_skin_force)
239	skin = tmp;	240	skin = tmp;
240		241
241	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
242	}	243	}
243		244
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		246
246	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 */
247		303
248	ob->flag [FLAG_READY_WEAPON] = false;	304	ob->flag [FLAG_READY_WEAPON] = false;
249	ob->flag [FLAG_READY_SKILL] = false;	305	ob->flag [FLAG_READY_SKILL] = false;
250	ob->flag [FLAG_READY_BOW] = false;	306	ob->flag [FLAG_READY_BOW] = false;
251		307
…		…
268	combat_ob = op;	324	combat_ob = op;
269	break;	325	break;
270	}	326	}
271		327
272	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273	ob->update_stats ();	329	ob->deactivate (); // change_weapon activates, fix this better
274
275	ns->floorbox_update ();
276	esrv_send_inventory (ob, ob);
277	esrv_add_spells (this, 0);
278
279	activate ();
280
281	send_rules (ob);
282	send_news (ob);
283	display_motd (ob);
284
285	INVOKE_PLAYER (CONNECT, this);
286	INVOKE_PLAYER (LOGIN, this);
287	}
288
289	void
290	player::disconnect ()
291	{
292	if (ns)
293	{
294	if (active)
295	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296
297	INVOKE_PLAYER (DISCONNECT, this);
298
299	ns->reset_stats ();
300	ns->pl = 0;
301	ns = 0;
302	}
303
304	if (ob)
305	ob->close_container (); //TODO: client-specific
306
307	observe = ob;
308
309	deactivate ();
310	}
311
312	// the need for this function can be explained
313	// by load_object not returning the object
314	void
315	player::set_object (object *op)
316	{
317	ob = observe = op;
318	ob->contr = this; /* this aren't yet in archetype */
319
320	ob->speed = 1.0f;
321	ob->speed_left = 0.5f;
322
323	ob->direction = 5; /* So player faces south */
324	}	330	}
325		331
326	void	332	void
327	player::set_observe (object *op)	333	player::set_observe (object *op)
328	{	334	{
…		…
342	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
343		349
344	gen_sp_armour = 10;	350	gen_sp_armour = 10;
345	bowtype = bow_normal;	351	bowtype = bow_normal;
346	petmode = pet_normal;	352	petmode = pet_normal;
347	listening = 10;
348	usekeys = containers;	353	usekeys = containers;
349	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
350	do_los = 1;	355	do_los = 1;
351		356
352	weapon_sp = 1.0f;	357	weapon_sp = 1.0f;
…		…
401	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
402	*/	407	*/
403	archetype *	408	archetype *
404	get_player_archetype (archetype *at)	409	get_player_archetype (archetype *at)
405	{	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
406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	417	archvec::iterator i = archetypes.find (nat);
407		418
408	for (;;)	419	for (;;)
409	{	420	{
410	if (++i == archetypes.end ())	421	if (++i == archetypes.end ())
411	i = archetypes.begin ();	422	i = archetypes.begin ();
…		…
425	unsigned lastdist;	436	unsigned lastdist;
426	rv_vector rv;	437	rv_vector rv;
427		438
428	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429	{	440	{
430	/* We should not find free objects on this friendly list, but it
431	* does periodically happen. Given that, lets deal with it.
432	* While unlikely, it is possible the next object on the friendly
433	* list is also free, so encapsulate this in a while loop.
434	*/
435	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436	{
437	object *tmp = ol->ob;
438
439	/* Can't do much more other than log the fact, because the object
440	* itself will have been cleared.
441	*/
442	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443	tmp->debug_desc ());
444	ol = ol->next;
445	remove_friendly_object (tmp);
446	if (!ol)
447	return op;
448	}
449
450	/* Remove special check for player from this. First, it looks to cause
451	* some crashes (ol->ob->contr not set properly?), but secondly, a more
452	* complicated method of state checking would be needed in any case -
453	* as it was, a clever player could type quit, and the function would
454	* skip them over while waiting for confirmation. Remove
455	* on_same_map check, as can_detect_enemy also does this
456	*/
457	if (!can_detect_enemy (mon, ol->ob, &rv))	441	if (!can_detect_enemy (mon, ol->ob, &rv))
458	continue;	442	continue;
459		443
460	if (lastdist > rv.distance)	444	if (lastdist > rv.distance)
461	{	445	{
…		…
656		640
657	return firstdir;	641	return firstdir;
658	}	642	}
659		643
660	void	644	void
661	give_initial_items (object *pl, treasurelist * items)	645	give_initial_items (object *pl, treasurelist *items)
662	{	646	{
663	object *op, *next = NULL;
664
665	if (pl->randomitems != NULL)	647	if (pl->randomitems)
666	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667		649
668	for (op = pl->inv; op; op = next)	650	for (object *next, *op = pl->inv; op; op = next)
669	{	651	{
670	next = op->below;	652	next = op->below;
671		653
672	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
673	* 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
…		…
678	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
679	* by this player due to race restrictions	661	* by this player due to race restrictions
680	*/	662	*/
681	if (pl->type == PLAYER)	663	if (pl->type == PLAYER)
682	{	664	{
683	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
684	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
685	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
686	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
		670	|| op->type == BRACERS || op->type == GIRDLE))
687	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))
688	{	672	{
689	op->destroy ();	673	op->destroy ();
690	continue;	674	continue;
691	}	675	}
692	}	676	}
…		…
715	if (op->nrof > 1)	699	if (op->nrof > 1)
716	op->nrof = 1;	700	op->nrof = 1;
717	}	701	}
718		702
719	if (op->type == SPELLBOOK && op->inv)	703	if (op->type == SPELLBOOK && op->inv)
720	{
721	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722	}
723		705
724	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
725	* 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
726	* merged properly.	708	* merged properly.
727	*/	709	*/
728	if (need_identify (op))	710	if (need_identify (op))
729	{	711	{
730	SET_FLAG (op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
731	CLEAR_FLAG (op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
732	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
733	}	715	}
		716
734	if (op->type == SPELL)	717	if (op->type == SPELL)
735	{	718	{
736	op->destroy ();	719	op->destroy ();
737	continue;	720	continue;
738	}	721	}
…		…
740	{	723	{
741	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
742	op->stats.exp = 0;	725	op->stats.exp = 0;
743	op->level = 1;	726	op->level = 1;
744	}	727	}
745	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
746	else
747	SET_FLAG (op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
748	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
749		731
750	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
751	link_player_skills (pl);	733	pl->contr->link_skills ();
752	}	734	}
753		735
754	void	736	void
755	get_party_password (object *op, partylist *party)	737	get_party_password (object *op, partylist *party)
756	{	738	{
…		…
857	static void	839	static void
858	start_info (object *op)	840	start_info (object *op)
859	{	841	{
860	char buf[MAX_BUF];	842	char buf[MAX_BUF];
861		843
862	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863	new_draw_info (NDI_UNIQUE, 0, op, buf);	845	new_draw_info (NDI_UNIQUE, 0, op, buf);
864	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865	//new_draw_info (NDI_UNIQUE, 0, op, " ");
866	}	846	}
867		847
868	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
869	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
…		…
873	*/	853	*/
874	void	854	void
875	player::chargen_race_done ()	855	player::chargen_race_done ()
876	{	856	{
877	/* this must before then initial items are given */	857	/* this must before then initial items are given */
878	esrv_new_player (ob->contr, ob->weight + ob->carrying);	858	esrv_new_player (ob->contr);
879		859
880	treasurelist *tl = treasurelist::find ("starting_wealth");	860	treasurelist *tl = treasurelist::find ("starting_wealth");
881	if (tl)	861	if (tl)
882	create_treasure (tl, ob, 0, 0, 0);	862	create_treasure (tl, ob, 0, 0, 0);
883		863
…		…
887	ob->contr->ns->state = ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
888		868
889	if (ob->msg)	869	if (ob->msg)
890	ob->msg = 0;	870	ob->msg = 0;
891		871
892	/* We create this now because some of the unique maps will need it
893	* to save here.
894	*/
895	{
896	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);
899	}
900
901	start_info (ob);	872	start_info (ob);
902	CLEAR_FLAG (ob, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
903	give_initial_items (ob, ob->randomitems);	874	give_initial_items (ob, ob->randomitems);
904	link_player_skills (ob);
905	esrv_send_inventory (ob, ob);	875	esrv_send_inventory (ob, ob);
906	ob->update_stats ();	876	ob->update_stats ();
907		877
908	/* This moves the player to a different start map, if there	878	/* This moves the player to a different start map, if there
909	* is one for this race	879	* is one for this race
910	*/	880	*/
911	if (*first_map_ext_path)	881	if (*first_map_ext_path)
912	{	882	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
913	object *tmp;
914	char mapname[MAX_BUF];
915
916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917	tmp = object::create ();
918	EXIT_PATH (tmp) = mapname;
919	EXIT_X (tmp) = ob->x;
920	EXIT_Y (tmp) = ob->y;
921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
922	* if the map isn't there, then stay on the
923	* default initial map */
924	tmp->destroy ();
925	}
926	else	883	else
927	LOG (llevDebug, "first_map_ext_path not set\n");	884	LOG (llevDebug, "first_map_ext_path not set\n");
928	}	885	}
929		886
930	void	887	void
…		…
974	LOG (llevDebug, "Fleeing player is dead.\n");	931	LOG (llevDebug, "Fleeing player is dead.\n");
975	CLEAR_FLAG (op, FLAG_SCARED);	932	CLEAR_FLAG (op, FLAG_SCARED);
976	return;	933	return;
977	}	934	}
978		935
979	if (op->enemy == NULL)	936	if (!op->enemy)
980	{	937	{
981	LOG (llevDebug, "Fleeing player had no enemy.\n");	938	LOG (llevDebug, "Fleeing player had no enemy.\n");
982	CLEAR_FLAG (op, FLAG_SCARED);	939	CLEAR_FLAG (op, FLAG_SCARED);
983	return;	940	return;
984	}	941	}
985		942
986	/* Seen some crashes here. Since we don't store an
987	* op->enemy_count, it is possible that something destroys the
988	* actual enemy, and the object is recycled.
989	*/
990	if (op->enemy->map == NULL)
991	{
992	CLEAR_FLAG (op, FLAG_SCARED);
993	op->enemy = NULL;
994	return;
995	}
996
997	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	943	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
998	{	944	{
999	op->enemy = NULL;	945	op->enemy = NULL;
1000	CLEAR_FLAG (op, FLAG_SCARED);	946	CLEAR_FLAG (op, FLAG_SCARED);
1001	return;	947	return;
…		…
1004	get_rangevector (op, op->enemy, &rv, 0);	950	get_rangevector (op, op->enemy, &rv, 0);
1005		951
1006	dir = absdir (4 + rv.direction);	952	dir = absdir (4 + rv.direction);
1007	for (diff = 0; diff < 3; diff++)	953	for (diff = 0; diff < 3; diff++)
1008	{	954	{
1009	int m = 1 - (RANDOM () & 2);	955	int m = 1 - rndm (2) * 2;
1010		956
1011	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)))
1012	return;	958	return;
1013	}	959	}
1014		960
…		…
1025	check_pick (object *op)	971	check_pick (object *op)
1026	{	972	{
1027	object *tmp, *next;	973	object *tmp, *next;
1028	int stop = 0;	974	int stop = 0;
1029	int wvratio;	975	int wvratio;
1030	char putstring[128];
1031		976
1032	/* if you're flying, you cna't pick up anything */	977	/* if you're flying, you cna't pick up anything */
1033	if (op->move_type & MOVE_FLYING)	978	if (op->move_type & MOVE_FLYING)
1034	return 1;	979	return 1;
1035		980
1036	next = op->below;	981	next = op->below;
1037		982
		983	int cnt = MAX_ITEM_PER_DROP;
		984	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		985
1038	/* 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
1039	* destroyed */	987	* destroyed */
1040	while (next && !next->destroyed ())	988	while (next && !next->destroyed ())
1041	{	989	{
1042	tmp = next;	990	tmp = next;
1043	next = tmp->below;	991	next = tmp->below;
1044		992
		993	if (cnt <= 0)
		994	{
		995	op->failmsg ("Couldn't pickup all items at once.");
		996	return 0;
		997	}
		998
1045	if (op->destroyed ())	999	if (op->destroyed ())
1046	return 0;	1000	return 0;
1047		1001
1048	if (!can_pick (op, tmp))	1002	if (!can_pick (op, tmp))
1049	continue;	1003	continue;
1050		1004
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1005	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	1006	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	1007	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	1008	CHK_PICK_PICKUP;
		1009
1055	continue;	1010	continue;
1056	}	1011	}
1057		1012
1058	/* high not bit set? We're using the old autopickup model */	1013	/* high not bit set? We're using the old autopickup model */
1059	if (!(op->contr->mode & PU_NEWMODE))	1014	if (!(op->contr->mode & PU_NEWMODE))
…		…
1061	switch (op->contr->mode)	1016	switch (op->contr->mode)
1062	{	1017	{
1063	case 0:	1018	case 0:
1064	return 1; /* don't pick up */	1019	return 1; /* don't pick up */
1065	case 1:	1020	case 1:
1066	pick_up (op, tmp);	1021	CHK_PICK_PICKUP;
1067	return 1;	1022	return 1;
1068	case 2:	1023	case 2:
1069	pick_up (op, tmp);	1024	CHK_PICK_PICKUP;
1070	return 0;	1025	return 0;
1071	case 3:	1026	case 3:
1072	return 0; /* stop before pickup */	1027	return 0; /* stop before pickup */
1073	case 4:	1028	case 4:
1074	pick_up (op, tmp);	1029	CHK_PICK_PICKUP;
1075	break;	1030	break;
1076	case 5:	1031	case 5:
1077	pick_up (op, tmp);	1032	CHK_PICK_PICKUP;
1078	stop = 1;	1033	stop = 1;
1079	break;	1034	break;
1080	case 6:	1035	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1036	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082	pick_up (op, tmp);	1037	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1038	CHK_PICK_PICKUP;
1083	break;	1039	break;
1084		1040
1085	case 7:	1041	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)	1042	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);	1043	CHK_PICK_PICKUP;
1088	break;	1044	break;
1089		1045
1090	default:	1046	default:
1091	/* use value density */	1047	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1048	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1049	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094	pick_up (op, tmp);	1050	CHK_PICK_PICKUP;
1095	}	1051	}
1096	}	1052	}
1097	else	1053	else
1098	{ /* old model */	1054	{ /* old model */
1099	/* NEW pickup handling */	1055	/* NEW pickup handling */
1100	if (op->contr->mode & PU_DEBUG)	1056	if (op->contr->mode & PU_DEBUG)
1101	{	1057	{
1102	/* some debugging code to figure out item information */	1058	/* some debugging code to figure out item information */
1103	if (tmp->name != NULL)	1059	const char *str = tmp->name
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1060	? format ("item name: %s item type: %d weight/value: %d",
1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1061	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1106	else
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1062	: format ("item name: %s item type: %d weight/value: %d",
1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1063	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109		1064
1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1065	new_draw_info (NDI_UNIQUE, 0, op, str);
1111	}	1066	}
1112		1067
1113	/* philosophy:	1068	/* philosophy:
1114	* It's easy to grab an item type from a pile, as long as it's	1069	* It's easy to grab an item type from a pile, as long as it's
1115	* generic. This takes no game-time. For more detailed pickups	1070	* generic. This takes no game-time. For more detailed pickups
…		…
1154	/* all food and drink if desired */	1109	/* all food and drink if desired */
1155	/* question: don't pick up known-poisonous stuff? */	1110	/* question: don't pick up known-poisonous stuff? */
1156	if (op->contr->mode & PU_FOOD)	1111	if (op->contr->mode & PU_FOOD)
1157	if (tmp->type == FOOD)	1112	if (tmp->type == FOOD)
1158	{	1113	{
1159	pick_up (op, tmp);	1114	CHK_PICK_PICKUP;
1160	continue;	1115	continue;
1161	}	1116	}
1162		1117
1163	if (op->contr->mode & PU_DRINK)	1118	if (op->contr->mode & PU_DRINK)
1164	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1119	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1165	{	1120	{
1166	pick_up (op, tmp);	1121	CHK_PICK_PICKUP;
1167	continue;	1122	continue;
1168	}	1123	}
1169		1124
1170	if (op->contr->mode & PU_POTION)	1125	if (op->contr->mode & PU_POTION)
1171	if (tmp->type == POTION)	1126	if (tmp->type == POTION)
1172	{	1127	{
1173	pick_up (op, tmp);	1128	CHK_PICK_PICKUP;
1174	continue;	1129	continue;
1175	}	1130	}
1176		1131
1177	/* spellbooks, skillscrolls and normal books/scrolls */	1132	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)	1133	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)	1134	if (tmp->type == SPELLBOOK)
1180	{	1135	{
1181	pick_up (op, tmp);	1136	CHK_PICK_PICKUP;
1182	continue;	1137	continue;
1183	}	1138	}
1184		1139
1185	if (op->contr->mode & PU_SKILLSCROLL)	1140	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)	1141	if (tmp->type == SKILLSCROLL)
1187	{	1142	{
1188	pick_up (op, tmp);	1143	CHK_PICK_PICKUP;
1189	continue;	1144	continue;
1190	}	1145	}
1191		1146
1192	if (op->contr->mode & PU_READABLES)	1147	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL)	1148	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194	{	1149	{
1195	pick_up (op, tmp);	1150	CHK_PICK_PICKUP;
1196	continue;	1151	continue;
1197	}	1152	}
1198		1153
1199	/* wands/staves/rods/horns */	1154	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)	1155	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1156	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{	1157	{
1203	pick_up (op, tmp);	1158	CHK_PICK_PICKUP;
1204	continue;	1159	continue;
1205	}	1160	}
1206		1161
1207	/* pick up all magical items */	1162	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1163	if (op->contr->mode & PU_MAGICAL)
1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1164	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1210	{	1165	{
1211	pick_up (op, tmp);	1166	CHK_PICK_PICKUP;
1212	continue;	1167	continue;
1213	}	1168	}
1214		1169
1215	if (op->contr->mode & PU_VALUABLES)	1170	if (op->contr->mode & PU_VALUABLES)
1216	{	1171	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1172	if (tmp->type == MONEY || tmp->type == GEM)
1218	{	1173	{
1219	pick_up (op, tmp);	1174	CHK_PICK_PICKUP;
1220	continue;	1175	continue;
1221	}	1176	}
1222	}	1177	}
1223		1178
1224	/* rings & amulets - talismans seems to be typed AMULET */	1179	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)	1180	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)	1181	if (tmp->type == RING || tmp->type == AMULET)
1227	{	1182	{
1228	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1229	continue;	1184	continue;
1230	}	1185	}
1231		1186
1232	/* we don't forget dragon food */	1187	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)	1188	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)	1189	if (tmp->type == FLESH)
1235	{	1190	{
1236	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1237	continue;	1192	continue;
1238	}	1193	}
1239		1194
1240	/* bows and arrows. Bows are good for selling! */	1195	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)	1196	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)	1197	if (tmp->type == BOW)
1243	{	1198	{
1244	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1245	continue;	1200	continue;
1246	}	1201	}
1247		1202
1248	if (op->contr->mode & PU_ARROW)	1203	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)	1204	if (tmp->type == ARROW)
1250	{	1205	{
1251	pick_up (op, tmp);	1206	CHK_PICK_PICKUP;
1252	continue;	1207	continue;
1253	}	1208	}
1254		1209
1255	/* all kinds of armor etc. */	1210	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)	1211	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)	1212	if (tmp->type == ARMOUR)
1258	{	1213	{
1259	pick_up (op, tmp);	1214	CHK_PICK_PICKUP;
1260	continue;	1215	continue;
1261	}	1216	}
1262		1217
1263	if (op->contr->mode & PU_HELMET)	1218	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)	1219	if (tmp->type == HELMET)
1265	{	1220	{
1266	pick_up (op, tmp);	1221	CHK_PICK_PICKUP;
1267	continue;	1222	continue;
1268	}	1223	}
1269		1224
1270	if (op->contr->mode & PU_SHIELD)	1225	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)	1226	if (tmp->type == SHIELD)
1272	{	1227	{
1273	pick_up (op, tmp);	1228	CHK_PICK_PICKUP;
1274	continue;	1229	continue;
1275	}	1230	}
1276		1231
1277	if (op->contr->mode & PU_BOOTS)	1232	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)	1233	if (tmp->type == BOOTS)
1279	{	1234	{
1280	pick_up (op, tmp);	1235	CHK_PICK_PICKUP;
1281	continue;	1236	continue;
1282	}	1237	}
1283		1238
1284	if (op->contr->mode & PU_GLOVES)	1239	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)	1240	if (tmp->type == GLOVES)
1286	{	1241	{
1287	pick_up (op, tmp);	1242	CHK_PICK_PICKUP;
1288	continue;	1243	continue;
1289	}	1244	}
1290		1245
1291	if (op->contr->mode & PU_CLOAK)	1246	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)	1247	if (tmp->type == CLOAK)
1293	{	1248	{
1294	pick_up (op, tmp);	1249	CHK_PICK_PICKUP;
1295	continue;	1250	continue;
1296	}	1251	}
1297		1252
1298	/* hoping to catch throwing daggers here */	1253	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)	1254	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1255	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{	1256	{
1302	pick_up (op, tmp);	1257	CHK_PICK_PICKUP;
1303	continue;	1258	continue;
1304	}	1259	}
1305		1260
1306	/* careful: chairs and tables are weapons! */	1261	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)	1262	if (op->contr->mode & PU_ALLWEAPON)
…		…
1309	if (tmp->type == WEAPON && tmp->name != NULL)	1264	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{	1265	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&	1266	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1267	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{	1268	{
1314	pick_up (op, tmp);	1269	CHK_PICK_PICKUP;
1315	continue;	1270	continue;
1316	}	1271	}
1317	}	1272	}
1318		1273
1319	if (tmp->type == WEAPON && tmp->name == NULL)	1274	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{	1275	{
1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)	1276	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1277	{
1323	pick_up (op, tmp);	1278	CHK_PICK_PICKUP;
1324	continue;	1279	continue;
1325	}	1280	}
1326	}	1281	}
1327	}	1282	}
1328		1283
1329	/* misc stuff that's useful */	1284	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)	1285	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1286	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{	1287	{
1333	pick_up (op, tmp);	1288	CHK_PICK_PICKUP;
1334	continue;	1289	continue;
1335	}	1290	}
1336		1291
1337	/* any of the last 4 bits set means we use the ratio for value	1292	/* any of the last 4 bits set means we use the ratio for value
1338	* pickups */	1293	* pickups */
1339	if (op->contr->mode & PU_RATIO)	1294	if (op->contr->mode & PU_RATIO)
1340	{	1295	{
1341	/* use value density to decide what else to grab */	1296	/* use value density to decide what else to grab */
1342	/* >=7 was >= op->contr->mode */	1297	/* >=7 was >= op->contr->mode */
1343	/* >=7 is the old standard setting. Now we take the last 4 bits	1298	/* >=7 is the old standard setting. Now we take the last 4 bits
1344	* and multiply them by 5, giving 0..15*5== 5..75 */	1299	*/
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;	1300	wvratio = op->contr->mode & PU_RATIO;
1346	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1301	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1347	{	1302	{
1348	pick_up (op, tmp);	1303	CHK_PICK_PICKUP;
1349	#if 0	1304	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1305	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)	1306	if (tmp->name != NULL)
1352	{	1307	{
1353	fprintf (stderr, "%s", tmp->name);	1308	fprintf (stderr, "%s", tmp->name);
…		…
1372	* found object is returned.	1327	* found object is returned.
1373	*/	1328	*/
1374	object *	1329	object *
1375	find_arrow (object *op, const char *type)	1330	find_arrow (object *op, const char *type)
1376	{	1331	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1332	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381	tmp = find_arrow (op, type);
1382	else if (op->type == ARROW && op->race == type)	1333	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1334	return splay (tmp);
		1335
		1336	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1337	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1338	if (object *arrow = find_arrow (tmp, type))
		1339	{
		1340	splay (tmp);
1383	return op;	1341	return arrow;
		1342	}
1384		1343
1385	return tmp;	1344	return 0;
1386	}	1345	}
1387		1346
1388	/*	1347	/*
1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1348	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1390	* against the target. A full test is not performed, simply a basic test	1349	* against the target. A full test is not performed, simply a basic test
…		…
1413	}	1372	}
1414	}	1373	}
1415	else if (arrow->type == ARROW && arrow->race == type)	1374	else if (arrow->type == ARROW && arrow->race == type)
1416	{	1375	{
1417	/* allways prefer assasination/slaying */	1376	/* allways prefer assasination/slaying */
1418	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1377	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1419	{	1378	{
1420	if (arrow->attacktype & AT_DEATH)	1379	if (arrow->attacktype & AT_DEATH)
1421	{	1380	{
1422	*better = 100;	1381	*better = 100;
1423	return arrow;	1382	return arrow;
…		…
1451	betterby = 1 + arrow->magic + arrow->stats.dam;	1410	betterby = 1 + arrow->magic + arrow->stats.dam;
1452	}	1411	}
1453	}	1412	}
1454	}	1413	}
1455	}	1414	}
		1415
1456	if (tmp == NULL && arrow == NULL)	1416	if (tmp == NULL && arrow == NULL)
1457	return find_arrow (op, type);	1417	return find_arrow (op, type);
1458		1418
1459	*better = betterby;	1419	*better = betterby;
1460	return tmp;	1420	return tmp;
…		…
1490	for (i = 0, found = 0; i < 20; i++)	1450	for (i = 0, found = 0; i < 20; i++)
1491	{	1451	{
1492	x += freearr_x[dir];	1452	x += freearr_x[dir];
1493	y += freearr_y[dir];	1453	y += freearr_y[dir];
1494	mflags = get_map_flags (m, &m, x, y, &x, &y);	1454	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1455
1495	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1456	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1496	{	1457	{
1497	tmp = NULL;	1458	tmp = 0;
1498	break;	1459	break;
1499	}	1460	}
1500	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1461	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1501	{	1462	{
1502	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1463	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1503	* perhaps a bad assumption.	1464	* perhaps a bad assumption.
1504	*/	1465	*/
1505	tmp = NULL;	1466	tmp = 0;
1506	break;	1467	break;
1507	}	1468	}
		1469
1508	if (mflags & P_IS_ALIVE)	1470	if (mflags & P_IS_ALIVE)
1509	{
1510	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1471	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1511	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1472	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1512	{
1513	found++;
1514	break;
1515	}
1516	if (found)
1517	break;	1473	break;
1518	}
1519	}	1474	}
1520	if (tmp == NULL)	1475
		1476	if (!tmp)
1521	return find_arrow (op, type);	1477	return find_arrow (op, type);
1522		1478
1523	if (tmp->head)	1479	if (tmp->head)
1524	tmp = tmp->head;	1480	tmp = tmp->head;
1525		1481
…		…
1570	if (bow->below)	1526	if (bow->below)
1571	{	1527	{
1572	bow->remove ();	1528	bow->remove ();
1573	op->insert (bow);	1529	op->insert (bow);
1574	}	1530	}
1575
1576	}	1531	}
1577		1532
1578	if (!bow->race || !bow->skill)	1533	if (!bow->race || !bow->skill)
1579	{	1534	{
1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1535	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1606	}	1561	}
1607		1562
1608	/* this should not happen, but sometimes does */	1563	/* this should not happen, but sometimes does */
1609	if (arrow->nrof == 0)	1564	if (arrow->nrof == 0)
1610	{	1565	{
		1566	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1611	arrow->destroy ();	1567	arrow->destroy ();
1612	return 0;	1568	return 0;
1613	}	1569	}
1614		1570
1615	left = arrow; /* these are arrows left to the player */	1571	left = arrow; /* these are arrows left to the player */
1616	arrow = get_split_ob (arrow, 1);	1572	arrow = arrow->split ();
1617	if (!arrow)	1573	if (!arrow)
1618	{	1574	{
1619	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1575	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1620	return 0;	1576	return 0;
1621	}	1577	}
…		…
1683		1639
1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1640	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1685	arrow->move_type = MOVE_FLY_LOW;	1641	arrow->move_type = MOVE_FLY_LOW;
1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1642	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1687		1643
1688	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1644	op->play_sound (sound_find ("fire_arrow"));
1689	m->insert (arrow, sx, sy, op);	1645	m->insert (arrow, sx, sy, op);
1690		1646
1691	if (!arrow->destroyed ())	1647	if (!arrow->destroyed ())
1692	move_arrow (arrow);	1648	move_arrow (arrow);
1693
1694	if (op->type == PLAYER)
1695	{
1696	if (left->destroyed ())
1697	esrv_del_item (op->contr, left->count);
1698	else
1699	esrv_send_item (op, left);
1700	}
1701		1649
1702	return 1;	1650	return 1;
1703	}	1651	}
1704		1652
1705	/* Special fire code for players - this takes into	1653	/* Special fire code for players - this takes into
…		…
1710	* hence the function name.	1658	* hence the function name.
1711	*/	1659	*/
1712	int	1660	int
1713	player_fire_bow (object *op, int dir)	1661	player_fire_bow (object *op, int dir)
1714	{	1662	{
1715	int ret = 0, wcmod = 0;	1663	int ret;
1716		1664
1717	if (op->contr->bowtype == bow_bestarrow)	1665	if (op->contr->bowtype == bow_bestarrow)
1718	{	1666	{
1719	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1667	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1720	}	1668	}
1721	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1669	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1722	{	1670	{
1723	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1671	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1724	wcmod = -1;
1725
1726	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1672	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1727	}	1673	}
1728	else if (op->contr->bowtype == bow_threewide)	1674	else if (op->contr->bowtype == bow_threewide)
1729	{	1675	{
1730	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1676	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1731	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1677	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1732	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1678	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1733	}	1679	}
1734	else if (op->contr->bowtype == bow_spreadshot)	1680	else if (op->contr->bowtype == bow_spreadshot)
1735	{	1681	{
1736	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1682	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1683	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1738	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1684	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1739	}	1685	}
1740	else	1686	else
1741	{	1687	{
…		…
1771		1717
1772	if (item->type == WAND)	1718	if (item->type == WAND)
1773	{	1719	{
1774	if (item->stats.food <= 0)	1720	if (item->stats.food <= 0)
1775	{	1721	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1722	op->contr->play_sound (sound_find ("wand_poof"));
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1723	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1778		1724
1779	return;	1725	return;
1780	}	1726	}
1781	}	1727	}
1782	else if (item->type == ROD || item->type == HORN)	1728	else if (item->type == ROD || item->type == HORN)
1783	{	1729	{
1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1730	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1731
		1732	// using the maximum of the rods charge allows at least one spell cast
		1733	// for a rod or horn, this fixes some broken rods.
		1734	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1785	{	1735	{
1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1736	op->contr->play_sound (sound_find ("wand_poof"));
1787		1737
1788	if (item->type == ROD)	1738	if (item->type == ROD)
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1739	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1790	else	1740	else
1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1741	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1794	}	1744	}
1795	}	1745	}
1796		1746
1797	if (cast_spell (op, item, dir, item->inv, NULL))	1747	if (cast_spell (op, item, dir, item->inv, NULL))
1798	{	1748	{
1799	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1749	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1750
1800	if (item->type == WAND)	1751	if (item->type == WAND)
1801	{	1752	{
1802	if (!(--item->stats.food))	1753	if (!(--item->stats.food))
1803	{	1754	{
1804	object *tmp;	1755	object *tmp;
…		…
1808	CLEAR_FLAG (item, FLAG_ANIMATE);	1759	CLEAR_FLAG (item, FLAG_ANIMATE);
1809	item->face = item->arch->face;	1760	item->face = item->arch->face;
1810	item->set_speed (0);	1761	item->set_speed (0);
1811	}	1762	}
1812		1763
1813	if ((tmp = item->in_player ()))	1764	if (object *pl = item->visible_to ())
1814	esrv_update_item (UPD_ANIM, tmp, item);	1765	esrv_update_item (UPD_ANIM, pl, item);
1815	}	1766	}
1816	}	1767	}
1817	else if (item->type == ROD || item->type == HORN)	1768	else if (item->type == ROD || item->type == HORN)
1818	drain_rod_charge (item);	1769	drain_rod_charge (item);
1819	}	1770	}
…		…
1824	bool	1775	bool
1825	fire (object *op, int dir)	1776	fire (object *op, int dir)
1826	{	1777	{
1827	int spellcost = 0;	1778	int spellcost = 0;
1828		1779
1829	/* check for loss of invisiblity/hide */
1830	if (action_makes_visible (op))
1831	make_visible (op);
1832
1833	player *pl = op->contr;	1780	player *pl = op->contr;
1834		1781
1835	if (pl->golem)	1782	if (pl->golem)
1836	{	1783	{
1837	control_golem (op->contr->golem, dir);	1784	control_golem (op->contr->golem, dir);
…		…
1839	}	1786	}
1840		1787
1841	object *ob = pl->ranged_ob;	1788	object *ob = pl->ranged_ob;
1842		1789
1843	if (!ob)	1790	if (!ob)
1844	return false;
1845
1846	if (!op->change_weapon (ob))
1847	return false;	1791	return false;
1848		1792
1849	if (op->speed_left > 0.f)	1793	if (op->speed_left > 0.f)
1850	--op->speed_left;	1794	--op->speed_left;
1851	else	1795	else
1852	return false;	1796	return false;
		1797
		1798	if (!op->change_weapon (ob))
		1799	return false;
		1800
		1801	/* check for loss of invisiblity/hide */
		1802	if (action_makes_visible (op))
		1803	make_visible (op);
1853		1804
1854	switch (ob->type)	1805	switch (ob->type)
1855	{	1806	{
1856	case BOW:	1807	case BOW:
1857	player_fire_bow (op, dir);	1808	player_fire_bow (op, dir);
…		…
1980	/* If we found a key, do some extra work */	1931	/* If we found a key, do some extra work */
1981	if (key)	1932	if (key)
1982	{	1933	{
1983	object *container = key->env;	1934	object *container = key->env;
1984		1935
1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1987	if (action_makes_visible (op))	1936	if (action_makes_visible (op))
1988	make_visible (op);	1937	make_visible (op);
1989		1938
1990	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1939	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1991	spring_trap (door->inv, op);	1940	spring_trap (door->inv, op);
1992		1941
1993	if (door->type == DOOR)	1942	if (door->type == DOOR)
1994	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1943	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1995	else if (door->type == LOCKED_DOOR)	1944	else if (door->type == LOCKED_DOOR)
1996	{	1945	{
1997	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1946	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1998	remove_door2 (door); /* remove door without violence ;-) */	1947	remove_door2 (door); /* remove door without violence ;-) */
1999	}	1948	}
2000		1949
2001	/* Do this after we print the message */	1950	/* Do this after we print the message */
2002	decrease_ob (key); /* Use up one of the keys */	1951	key->decrease (); /* Use up one of the keys */
2003	/* Need to update the weight the container the key was in */
2004	if (container != op)
2005	esrv_update_item (UPD_WEIGHT, op, container);
2006		1952
2007	return 1; /* Nothing more to do below */	1953	return 1; /* Nothing more to do below */
2008	}	1954	}
2009	else if (door->type == LOCKED_DOOR)	1955	else if (door->type == LOCKED_DOOR)
2010	{	1956	{
2011	/* Might as well return now - no other way to open this */	1957	/* Might as well return now - no other way to open this */
2012	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1958	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2013	return 1;	1959	return 1;
2014	}	1960	}
2015		1961
2016	return 0;	1962	return 0;
2017	}	1963	}
…		…
2104		2050
2105	if (op->speed_left > 0.f)	2051	if (op->speed_left > 0.f)
2106	{	2052	{
2107	--op->speed_left;	2053	--op->speed_left;
2108		2054
2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2055	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	2056	push_ob (mon, dir, op);
2111		2057
2112	if (op->contr->tmp_invis || op->hide)	2058	if (action_makes_visible (op))
2113	make_visible (op);	2059	make_visible (op);
2114		2060
2115	return true;	2061	return true;
2116	}	2062	}
2117	else	2063	else
…		…
2133	{	2079	{
2134	--op->speed_left;	2080	--op->speed_left;
2135		2081
2136	if (!op->contr->braced)	2082	if (!op->contr->braced)
2137	{	2083	{
2138	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2084	op->play_sound (sound_find ("push_player"));
2139	push_ob (mon, dir, op);	2085	push_ob (mon, dir, op);
2140	}	2086	}
2141	else	2087	else
2142	new_draw_info (0, 0, op, "You withhold your attack");	2088	op->statusmsg ("You withhold your attack");
2143		2089
2144	if (op->contr->tmp_invis || op->hide)	2090	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2145	make_visible (op);	2091	make_visible (op);
2146		2092
2147	return true;	2093	return true;
2148	}	2094	}
2149	}	2095	}
…		…
2191	bool	2137	bool
2192	move_player (object *op, int dir)	2138	move_player (object *op, int dir)
2193	{	2139	{
2194	int pick;	2140	int pick;
2195		2141
2196	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2142	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2197	return 0;	2143	return 0;
2198		2144
2199	/* Sanity check: make sure dir is valid */	2145	/* Sanity check: make sure dir is valid */
2200	if ((dir < 0) || (dir >= 9))	2146	if ((dir < 0) || (dir >= 9))
2201	{	2147	{
…		…
2207	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2153	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2208	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2154	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2209		2155
2210	op->facing = dir;	2156	op->facing = dir;
2211		2157
2212	if (op->hide)	2158	if (op->flag [FLAG_HIDDEN])
2213	do_hidden_move (op);	2159	do_hidden_move (op);
2214		2160
2215	bool retval;	2161	bool retval;
2216		2162
2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2163	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
…		…
2286	return 0;	2232	return 0;
2287		2233
2288	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2234	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2289	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2235	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2290	{	2236	{
2291	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2237	op->play_sound (sound_find ("ob_evaporate"));
2292	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2238	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2293
2294	if (op->contr)
2295	esrv_del_item (op->contr, tmp->count);
2296		2239
2297	tmp->destroy ();	2240	tmp->destroy ();
2298	CLEAR_FLAG (op, FLAG_LIFESAVE);	2241	CLEAR_FLAG (op, FLAG_LIFESAVE);
2299		2242
2300	if (op->stats.hp < 0)	2243	if (op->stats.hp < 0)
…		…
2313	return 0;	2256	return 0;
2314	}	2257	}
2315		2258
2316	/* This goes throws the inventory and removes unpaid objects, and puts them	2259	/* This goes throws the inventory and removes unpaid objects, and puts them
2317	* back in the map (location and map determined by values of env). This	2260	* back in the map (location and map determined by values of env). This
2318	* function will descend into containers. op is the object to start the search	2261	* function will descend into containers. op is the object to start the search
2319	* from.	2262	* from.
2320	*/	2263	*/
		2264	static void
		2265	drop_unpaid_items (object *op, object *env)
		2266	{
		2267	while (op)
		2268	{
		2269	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2270
		2271	if (QUERY_FLAG (op, FLAG_UNPAID))
		2272	op->insert_at (env);
		2273	else if (op->inv)
		2274	drop_unpaid_items (op->inv, env);
		2275
		2276	op = next;
		2277	}
		2278	}
		2279
2321	void	2280	void
2322	remove_unpaid_objects (object *op, object *env)	2281	object::drop_unpaid_items ()
2323	{	2282	{
2324	while (op)	2283	if (!flag [FLAG_REMOVED])
2325	{	2284	::drop_unpaid_items (inv, this);
2326	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2327
2328	if (QUERY_FLAG (op, FLAG_UNPAID))
2329	{
2330	if (env->type == PLAYER)
2331	esrv_del_item (env->contr, op->count);
2332
2333	op->insert_at (env);
2334	}
2335	else if (op->inv)
2336	remove_unpaid_objects (op->inv, env);
2337
2338	op = next;
2339	}
2340	}	2285	}
2341		2286
2342	/*	2287	/*
2343	* Returns pointer a static string containing gravestone text	2288	* Returns pointer a static string containing gravestone text
2344	* Moved from apply.c to player.c - player.c is what	2289	* Moved from apply.c to player.c - player.c is what
2345	* actually uses this function. player.c may not be quite the	2290	* actually uses this function. player.c may not be quite the
2346	* best, a misc file for object actions is probably better,	2291	* best, a misc file for object actions is probably better,
2347	* but there isn't one in the server directory.	2292	* but there isn't one in the server directory.
2348	*/	2293	*/
2349	char *	2294	const char *
2350	gravestone_text (object *op)	2295	gravestone_text (object *op)
2351	{	2296	{
2352	static char buf2[MAX_BUF];	2297	static dynbuf_text buf;
2353	char buf[MAX_BUF];
2354	time_t now = time (NULL);
2355		2298
2356	strcpy (buf2, " R.I.P.\n\n");	2299	buf << "---- R.I.P. ----\n\n"
		2300	<< op->name;
		2301
2357	if (op->type == PLAYER)	2302	if (op->type == PLAYER)
2358	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2303	buf << " the " << op->contr->title;
2359	else
2360	sprintf (buf, "%s\n", &op->name);
2361		2304
2362	strncat (buf2, " ", 20 - strlen (buf) / 2);	2305	buf << "\n\n";
2363	strcat (buf2, buf);	2306
		2307	buf << "who was level ";
		2308	buf << (sint32)op->level << "\n\n" // OO breakdown
		2309	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2310
2364	if (op->type == PLAYER)	2311	if (op->type == PLAYER)
2365	sprintf (buf, "who was in level %d when killed\n", op->level);	2312	buf << "by " << op->contr->killer_name () << ".\n\n";
2366	else
2367	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2368		2313
2369	strncat (buf2, " ", 20 - strlen (buf) / 2);
2370	strcat (buf2, buf);
2371	if (op->type == PLAYER)
2372	{	2314	{
2373	sprintf (buf, "by %s.\n\n", op->contr->killer);	2315	static char buf2[128];
2374	strncat (buf2, " ", 21 - strlen (buf) / 2);	2316	time_t now = time (NULL);
2375	strcat (buf2, buf);
2376	}
2377
2378	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2317	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2379	strncat (buf2, " ", 20 - strlen (buf) / 2);	2318	buf << buf2;
2380	strcat (buf2, buf);	2319	}
2381		2320
2382	return buf2;	2321	return buf;
2383	}	2322	}
2384		2323
2385	void	2324	void
2386	do_some_living (object *op)	2325	do_some_living (object *op)
2387	{	2326	{
…		…
2439	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2378	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2440	else	2379	else
2441	{	2380	{
2442	gen_grace = op->stats.maxgrace;	2381	gen_grace = op->stats.maxgrace;
2443	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2382	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2444	}
2445
2446	/* Regenerate Spell Points */
2447	if (!op->contr->golem && --op->last_sp < 0)
2448	{
2449	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2450	if (op->stats.sp < op->stats.maxsp)
2451	{
2452	op->stats.sp++;
2453	/* dms do not consume food */
2454	if (!QUERY_FLAG (op, FLAG_WIZ))
2455	{
2456	op->stats.food--;
2457	if (op->contr->digestion < 0)
2458	op->stats.food += op->contr->digestion;
2459	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2460	op->stats.food = last_food;
2461	}
2462	}
2463
2464	if (max_sp > 1)
2465	{
2466	over_sp = (gen_sp + 10) / rate_sp;
2467	if (over_sp > 0)
2468	{
2469	if (op->stats.sp < op->stats.maxsp)
2470	{
2471	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2472
2473	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2474	op->stats.sp--;
2475
2476	if (op->stats.sp > op->stats.maxsp)
2477	op->stats.sp = op->stats.maxsp;
2478	}
2479	op->last_sp = 0;
2480	}
2481	else
2482	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483	}
2484	else
2485	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486	}	2383	}
2487		2384
2488	/* Regenerate Grace */	2385	/* Regenerate Grace */
2489	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2386	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2490	if (--op->last_grace < 0)	2387	if (--op->last_grace < 0)
…		…
2511	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2408	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2512	}	2409	}
2513	/* wearing stuff doesn't detract from grace generation. */	2410	/* wearing stuff doesn't detract from grace generation. */
2514	}	2411	}
2515		2412
		2413	if (op->stats.food > 0)
		2414	{
2516	/* Regenerate Hit Points */	2415	/* Regenerate Spell Points */
2517	if (--op->last_heal < 0)	2416	if (!op->contr->golem && --op->last_sp < 0)
2518	{
2519	if (op->stats.hp < op->stats.maxhp)
2520	{	2417	{
2521	op->stats.hp++;	2418	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2522	/* dms do not consume food */	2419
2523	if (!QUERY_FLAG (op, FLAG_WIZ))	2420	if (op->stats.sp < op->stats.maxsp)
2524	{	2421	{
		2422	op->stats.sp++;
		2423
		2424	/* dms do not consume food */
		2425	if (!QUERY_FLAG (op, FLAG_WIZ))
		2426	{
2525	op->stats.food--;	2427	op->stats.food--;
		2428
2526	if (op->contr->digestion < 0)	2429	if (op->contr->digestion < 0)
2527	op->stats.food += op->contr->digestion;	2430	op->stats.food += op->contr->digestion;
2528	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2431	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2529	op->stats.food = last_food;	2432	op->stats.food = last_food;
		2433	}
2530	}	2434	}
2531	}
2532		2435
2533	if (max_hp > 1)	2436	if (max_sp > 1)
2534	{
2535	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2536	if (over_hp > 0)
2537	{	2437	{
2538	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2438	over_sp = (gen_sp + 10) / rate_sp;
		2439	if (over_sp > 0)
		2440	{
		2441	if (op->stats.sp < op->stats.maxsp)
		2442	{
		2443	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2444
		2445	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2446	op->stats.sp--;
		2447
		2448	if (op->stats.sp > op->stats.maxsp)
		2449	op->stats.sp = op->stats.maxsp;
		2450	}
		2451
2539	op->last_heal = 0;	2452	op->last_sp = 0;
		2453	}
		2454	else
		2455	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2540	}	2456	}
2541	else	2457	else
		2458	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2459	}
		2460
		2461	/* Regenerate Hit Points */
		2462	if (--op->last_heal < 0)
		2463	{
		2464	if (op->stats.hp < op->stats.maxhp)
2542	{	2465	{
2543	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2466	op->stats.hp++;
		2467
		2468	/* dms do not consume food */
		2469	if (!QUERY_FLAG (op, FLAG_WIZ))
		2470	{
		2471	op->stats.food--;
		2472
		2473	if (op->contr->digestion < 0)
		2474	op->stats.food += op->contr->digestion;
		2475	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2476	op->stats.food = last_food;
		2477	}
2544	}	2478	}
		2479
		2480	if (max_hp > 1)
		2481	{
		2482	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2483
		2484	if (over_hp > 0)
		2485	{
		2486	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2487	op->last_heal = 0;
		2488	}
		2489	else
		2490	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545	}	2491	}
2546	else	2492	else
2547	{
2548	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2493	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2549	}	2494	}
2550	}	2495	}
2551		2496
2552	/* Digestion */	2497	/* Digestion */
2553	if (--op->last_eat < 0)	2498	if (--op->last_eat < 0)
2554	{	2499	{
2555	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2500	int bonus = max (0, op->contr->digestion),
		2501	penalty = max (0, -op->contr->digestion);
2556		2502
2557	if (op->contr->gen_hp > 0)
2558	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2503	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2559	else
2560	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561		2504
2562	/* dms do not consume food */	2505	/* dms do not consume food */
2563	if (!QUERY_FLAG (op, FLAG_WIZ))	2506	if (!QUERY_FLAG (op, FLAG_WIZ))
2564	op->stats.food--;	2507	op->stats.food--;
2565	}	2508	}
2566		2509
2567	if (op->stats.food < 0 && op->stats.hp >= 0)	2510	if (op->stats.food < 0 && op->stats.hp >= 0)
2568	{	2511	{
2569	object *tmp, *flesh = 0;	2512	object *flesh = 0;
2570		2513
2571	for (tmp = op->inv; tmp; tmp = tmp->below)	2514	for_inv_removable (op, tmp)
2572	{	2515	{
2573	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2516	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2517	continue;
		2518
		2519	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2574	{	2520	{
2575	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2521	op->statusmsg ("You blindly grab for a bite of food. "
2576	{	2522	"H<To prevent you from starving, you ate some random item from your backpack.>");
2577	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2578	manual_apply (op, tmp, 0);	2523	manual_apply (op, tmp, 0);
		2524
2579	if (op->stats.food >= 0 || op->stats.hp < 0)	2525	if (op->stats.food >= 0 || op->stats.hp < 0)
2580	break;	2526	break;
2581	}	2527	}
2582	else if (tmp->type == FLESH)	2528	else if (tmp->type == FLESH)
2583	flesh = tmp;	2529	flesh = tmp;
2584	} /* End if paid for object */	2530	}
2585	} /* end of for loop */
2586		2531
2587	/* If player is still starving, it means they don't have any food, so	2532	/* If player is still starving, it means they don't have any food, so
2588	* eat flesh instead.	2533	* eat flesh instead.
2589	*/	2534	*/
2590	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2535	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2591	{	2536	{
2592	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2537	op->statusmsg ("You blindly grab for a bite of food. "
		2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2593	manual_apply (op, flesh, 0);	2539	manual_apply (op, flesh, 0);
2594	}	2540	}
		2541
		2542	// If player is still starving, alert him!
		2543	if (op->stats.food < 0)
		2544	op->failmsg ("You are starving! "
		2545	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2546	}
		2547
		2548	if (op->stats.food < 0)
2595	}	2549	{
		2550	op->stats.hp += op->stats.food;
		2551	op->stats.food = 0;
2596		2552
2597	while (op->stats.food < 0 && op->stats.hp >= 0)	2553	if (op->stats.hp < 0)
2598	op->stats.food++, op->stats.hp--;	2554	{
		2555	op->contr->killer = archetype::get ("killer_starvation");
		2556	op->contr->killer->destroy ();
		2557	}
		2558	}
2599		2559
		2560	/* killer should be set here already */
2600	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2561	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2601	kill_player (op);	2562	kill_player (op);
2602	}	2563	}
2603	}	2564	}
2604		2565
…		…
2608	* file.	2569	* file.
2609	*/	2570	*/
2610	void	2571	void
2611	kill_player (object *op)	2572	kill_player (object *op)
2612	{	2573	{
		2574	int x, y;
2613	char buf[MAX_BUF];	2575	char buf[MAX_BUF];
2614	int x, y;
2615
2616	//int i;
2617	maptile *map; /* this is for resurrection */	2576	maptile *map; /* this is for resurrection */
2618
2619	/* int z;
2620	int num_stats_lose;
2621	int lost_a_stat;
2622	int lose_this_stat;
2623	int this_stat; */
2624	int will_kill_again;	2577	int will_kill_again;
2625	archetype *at;	2578	archetype *at;
2626	object *tmp;	2579	object *tmp;
2627		2580
2628	if (save_life (op))	2581	if (save_life (op))
2629	return;	2582	return;
2630
2631		2583
2632	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2584	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2633	* in cities ONLY!!! It is very important that this doesn't get abused.	2585	* in cities ONLY!!! It is very important that this doesn't get abused.
2634	* Look at op_on_battleground() for more info --AndreasV	2586	* Look at op_on_battleground() for more info --AndreasV
2635	*/	2587	*/
…		…
2651	{	2603	{
2652	tmp->destroy ();	2604	tmp->destroy ();
2653	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2605	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2654	}	2606	}
2655		2607
2656	cure_disease (op, 0); /* remove any disease */	2608	cure_disease (op, 0, 0); /* remove any disease */
2657	op->stats.hp = op->stats.maxhp;	2609	op->stats.hp = op->stats.maxhp;
2658	if (op->stats.food <= 0)	2610	if (op->stats.food <= 0)
2659	op->stats.food = 999;	2611	op->stats.food = 999;
2660		2612
2661	/* create a bodypart-trophy to make the winner happy */	2613	/* create a bodypart-trophy to make the winner happy */
2662	if (object *tmp = arch_to_object (archetype::find ("finger")))	2614	if (object *tmp = arch_to_object (archetype::find ("finger")))
2663	{	2615	{
2664	sprintf (buf, "%s's finger", &op->name);	2616	tmp->name = format ("%s's finger" , &op->name);
2665	tmp->name = buf;	2617	tmp->name_pl = format ("%s's fingers", &op->name);
2666	sprintf (buf, " This finger has been cut off %s\n"
2667	" the %s, when he was defeated at\n level %d by %s.\n",
2668	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2669	tmp->msg = buf;	2618	tmp->msg = format (
		2619	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2620	&op->name, op->contr->title,
		2621	(int)op->level,
		2622	op->contr->killer_name ()
		2623	);
2670	tmp->value = 0, tmp->type = 0;	2624	tmp->value = 0, tmp->type = 0;
2671	tmp->materialname = "organics";	2625	tmp->materialname = "organics";
2672	tmp->insert_at (op, tmp);	2626	tmp->insert_at (op, tmp);
2673	}	2627	}
2674		2628
…		…
2680		2634
2681	INVOKE_PLAYER (DEATH, op->contr);	2635	INVOKE_PLAYER (DEATH, op->contr);
2682		2636
2683	command_kill_pets (op, 0);	2637	command_kill_pets (op, 0);
2684		2638
2685	if (op->stats.food < 0)	2639	op->contr->play_sound (sound_find ("player_dies"));
2686	{
2687	sprintf (buf, "%s starved to death.", &op->name);
2688	strcpy (op->contr->killer, "starvation");
2689	}
2690	else
2691	sprintf (buf, "%s died.", &op->name);
2692
2693	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2694		2640
2695	/* save the map location for corpse, gravestone */	2641	/* save the map location for corpse, gravestone */
2696	x = op->x;	2642	x = op->x;
2697	y = op->y;	2643	y = op->y;
2698	map = op->map;	2644	map = op->map;
…		…
2726		2672
2727	lost_a_stat = 0;	2673	lost_a_stat = 0;
2728		2674
2729	for (z = 0; z < num_stats_lose; z++)	2675	for (z = 0; z < num_stats_lose; z++)
2730	{	2676	{
2731	i = RANDOM () % NUM_STATS;	2677	i = rndm (NUM_STATS);
2732		2678
2733	if (settings.stat_loss_on_death)	2679	if (settings.stat_loss_on_death)
2734	{	2680	{
2735	/* Pick a random stat and take a point off it. Tell the player	2681	/* Pick a random stat and take a point off it. Tell the player
2736	* what he lost.	2682	* what he lost.
…		…
2805	lost_a_stat = 1;	2751	lost_a_stat = 1;
2806	}	2752	}
2807	}	2753	}
2808	}	2754	}
2809	}	2755	}
		2756
2810	/* If no stat lost, tell the player. */	2757	/* If no stat lost, tell the player. */
2811	if (!lost_a_stat)	2758	if (!lost_a_stat)
2812	{	2759	{
2813	/* determine_god() seems to not work sometimes... why is this?	2760	/* determine_god() seems to not work sometimes... why is this?
2814	Should I be using something else? GD */	2761	Should I be using something else? GD */
…		…
2818	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2765	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2819	else	2766	else
2820	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2767	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2821	}	2768	}
2822	#else	2769	#else
2823	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2770	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2824	#endif	2771	#endif
2825		2772
2826	/* Put a gravestone up where the character 'almost' died. List the	2773	/* Put a gravestone up where the character 'almost' died. List the
2827	* exp loss on the stone.	2774	* exp loss on the stone.
2828	*/	2775	*/
2829	tmp = arch_to_object (archetype::find ("gravestone"));	2776	tmp = arch_to_object (archetype::find ("gravestone"));
2830	sprintf (buf, "%s's gravestone", &op->name);	2777	tmp->name = format ("%s's gravestone", &op->name);
2831	tmp->name = buf;	2778	tmp->name_pl = format ("%s's gravestones", &op->name);
2832	sprintf (buf, "%s's gravestones", &op->name);	2779	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2833	tmp->name_pl = buf;	2780	&op->name, op->contr->title, op->contr->killer_name ());
2834	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2835	tmp->msg = buf;
2836	tmp->x = op->x, tmp->y = op->y;	2781	tmp->x = op->x, tmp->y = op->y;
2837	insert_ob_in_map (tmp, op->map, NULL, 0);	2782	insert_ob_in_map (tmp, op->map, NULL, 0);
2838		2783
2839	/**************************************/	2784	/**************************************/
2840	/* */	2785	/* */
…		…
2861	{	2806	{
2862	tmp->destroy ();	2807	tmp->destroy ();
2863	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2808	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2864	}	2809	}
2865		2810
2866	cure_disease (op, 0); /* remove any disease */	2811	cure_disease (op, 0, 0); /* remove any disease */
		2812
		2813	// remove all spell effects that are active
		2814	// to avoid long-term effects such as word-of-recall
		2815	for (object *item = op->inv; item; )
		2816	{
		2817	object *next = item->below;
		2818
		2819	if (item->type == SPELL_EFFECT && item->active)
		2820	item->destroy ();
		2821
		2822	item = next;
		2823	}
2867		2824
2868	/*add_exp(op, (op->stats.exp * -0.20)); */	2825	/*add_exp(op, (op->stats.exp * -0.20)); */
2869	apply_death_exp_penalty (op);	2826	apply_death_exp_penalty (op);
		2827
2870	if (op->stats.food < 100)	2828	if (op->stats.food < 100)
2871	op->stats.food = 900;	2829	op->stats.food = 900;
		2830
2872	op->stats.hp = op->stats.maxhp;	2831	op->stats.hp = op->stats.maxhp;
2873	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2832	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2874	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2833	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2875		2834
2876	/*	2835	/*
2877	* Check to see if the player has any unpaid items. If so, remove them	2836	* Check to see if the player has any unpaid items. If so, remove them
2878	* and put them back in the map.	2837	* and put them back in the map.
2879	*/	2838	*/
2880	remove_unpaid_objects (op->inv, op);	2839	op->drop_unpaid_items ();
2881		2840
2882	/****************************************/	2841	/****************************************/
2883	/* */	2842	/* */
2884	/* Move player to his current respawn- */	2843	/* Move player to his current respawn- */
2885	/* position (usually last savebed) */	2844	/* position (usually last savebed) */
…		…
2914	if (will_kill_again & (1 << at))	2873	if (will_kill_again & (1 << at))
2915	force->resist[at] = 100;	2874	force->resist[at] = 100;
2916		2875
2917	insert_ob_in_ob (force, op);	2876	insert_ob_in_ob (force, op);
2918	op->update_stats ();	2877	op->update_stats ();
2919
2920	}	2878	}
2921		2879
2922	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2880	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2923	}	2881	}
2924		2882
…		…
2944		2902
2945	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2903	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2946	{	2904	{
2947	if (tmp->nrof > 1)	2905	if (tmp->nrof > 1)
2948	{	2906	{
2949	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2907	tmp->decrease (rndm (1, tmp->nrof - 1));
2950	tmp2->destroy ();
2951	insert_ob_in_map (tmp, op->map, NULL, 0);	2908	insert_ob_in_map (tmp, op->map, NULL, 0);
2952	}	2909	}
2953	else	2910	else
2954	tmp->destroy ();	2911	tmp->destroy ();
2955	}	2912	}
…		…
2966	void	2923	void
2967	fix_weight (void)	2924	fix_weight (void)
2968	{	2925	{
2969	for_all_players (pl)	2926	for_all_players (pl)
2970	{	2927	{
2971	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2928	sint32 old = pl->ob->carrying;
2972		2929
2973	if (old == sum)	2930	pl->ob->update_weight ();
2974	continue;	2931
		2932	if (old != pl->ob->carrying)
		2933	{
2975	pl->ob->update_stats ();	2934	pl->ob->update_stats ();
2976	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2935	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2936	}
2977	}	2937	}
2978	}	2938	}
2979		2939
2980	void	2940	void
2981	fix_luck (void)	2941	fix_luck (void)
…		…
3023	}	2983	}
3024		2984
3025	void	2985	void
3026	make_visible (object *op)	2986	make_visible (object *op)
3027	{	2987	{
3028	op->hide = 0;	2988	op->flag [FLAG_HIDDEN] = 0;
3029	op->invisible = 0;	2989	op->invisible = 0;
		2990
3030	if (op->type == PLAYER)	2991	if (op->type == PLAYER)
3031	{	2992	{
3032	op->contr->tmp_invis = 0;	2993	op->contr->tmp_invis = 0;
3033	op->contr->invis_race = 0;	2994	op->contr->invis_race = 0;
3034	}	2995	}
…		…
3047		3008
3048	/* look at the surrounding terrain to determine	3009	/* look at the surrounding terrain to determine
3049	* the hideability of this object. Positive levels	3010	* the hideability of this object. Positive levels
3050	* indicate greater hideability.	3011	* indicate greater hideability.
3051	*/	3012	*/
3052
3053	int	3013	int
3054	hideability (object *ob)	3014	hideability (object *ob)
3055	{	3015	{
3056	int i, level = 0, mflag;	3016	int i, level = 0, mflag;
3057	sint16 x, y;	3017	sint16 x, y;
3058		3018
3059	if (!ob || !ob->map)	3019	if (!ob || !ob->map)
3060	return 0;	3020	return 0;
3061		3021
3062	/* so, on normal lighted maps, its hard to hide */	3022	/* so, on normal lighted maps, its hard to hide */
3063	level = ob->map->darkness - 2;	3023	level = ob->map->darklevel () - 2;
3064		3024
3065	/* this also picks up whether the object is glowing.	3025	/* this also picks up whether the object is glowing.
3066	* If you carry a light on a non-dark map, its not	3026	* If you carry a light on a non-dark map, its not
3067	* as bad as carrying a light on a pitch dark map */	3027	* as bad as carrying a light on a pitch dark map */
3068	if (has_carried_lights (ob))	3028	if (has_carried_lights (ob))
3069	level = -(10 + (2 * ob->map->darkness));	3029	level = -(10 + (2 * ob->map->darklevel ()));
3070		3030
3071	/* scan through all nearby squares for terrain to hide in */	3031	/* scan through all nearby squares for terrain to hide in */
3072	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3032	for (i = 0, x = ob->x, y = ob->y;
		3033	i <= SIZEOFFREE1;
		3034	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3073	{	3035	{
3074	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3036	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3075	if (mflag & P_OUT_OF_MAP)	3037	if (mflag & P_OUT_OF_MAP)
3076	{
3077	continue;	3038	continue;
3078	}	3039
3079	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3040	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3080	level += 2;	3041	level += 2;
3081	else /* open terrain! */	3042	else /* open terrain! */
3082	level -= 1;	3043	level -= 1;
3083	}	3044	}
…		…
3094	* spot (surrounded by clear terrain in broad daylight). -b.t.	3055	* spot (surrounded by clear terrain in broad daylight). -b.t.
3095	*/	3056	*/
3096	void	3057	void
3097	do_hidden_move (object *op)	3058	do_hidden_move (object *op)
3098	{	3059	{
3099	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3060	int hide = 0;
3100	object *skop;
3101		3061
3102	if (!op || !op->map)	3062	if (!op || !op->map)
3103	return;	3063	return;
3104		3064
3105	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3065	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3066	int num = random_roll (0, 19, op, PREFER_LOW);
3106		3067
3107	/* its *extremely* hard to run and sneak/hide at the same time! */	3068	/* its *extremely* hard to run and sneak/hide at the same time! */
3108	if (op->type == PLAYER && op->contr->run_on)	3069	if (op->type == PLAYER && op->contr->run_on)
3109	if (!skop || num >= skop->level)	3070	if (!skop || num >= skop->level)
3110	{	3071	{
…		…
3120	num -= hide;	3081	num -= hide;
3121		3082
3122	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3083	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3123	{	3084	{
3124	make_visible (op);	3085	make_visible (op);
		3086
3125	if (op->type == PLAYER)	3087	if (op->type == PLAYER)
3126	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3088	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3127	}	3089	}
3128	else if (op->type == PLAYER && skop)	3090	else if (op->type == PLAYER && skop)
3129	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3091	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3182	* object op. This function works fine for monsters,	3144	* object op. This function works fine for monsters,
3183	* but we dont worry if the object isnt the top one in	3145	* but we dont worry if the object isnt the top one in
3184	* a pile (say a coin under a table would return "viewable"	3146	* a pile (say a coin under a table would return "viewable"
3185	* by this routine). Another question, should we be	3147	* by this routine). Another question, should we be
3186	* concerned with the direction the player is looking	3148	* concerned with the direction the player is looking
3187	* in? Realistically, most of use cant see stuff behind	3149	* in? Realistically, most of us can't see stuff behind
3188	* our backs...on the other hand, does the "facing" direction	3150	* our backs...on the other hand, does the "facing" direction
3189	* imply the way your head, or body is facing? Its possible	3151	* imply the way your head, or body is facing? It's possible
3190	* for them to differ. Sigh, this fctn could get a bit more complex.	3152	* for them to differ. Sigh, this fctn could get a bit more complex.
3191	* -b.t.	3153	* -b.t.
3192	* This function is now map tiling safe.	3154	* This function is now map tiling safe.
3193	*/	3155	*/
3194
3195	int	3156	int
3196	player_can_view (object *pl, object *op)	3157	player_can_view (object *pl, object *op)
3197	{	3158	{
3198	rv_vector rv;	3159	rv_vector rv;
3199	int dx, dy;	3160	int dx, dy;
…		…
3211		3172
3212	get_rangevector (pl, op, &rv, 0x1);	3173	get_rangevector (pl, op, &rv, 0x1);
3213		3174
3214	/* starting with the 'head' part, lets loop	3175	/* starting with the 'head' part, lets loop
3215	* through the object and find if it has any	3176	* through the object and find if it has any
3216	* part that is in the los array but isnt on	3177	* part that is in the los array but isn't on
3217	* a blocked los square.	3178	* a blocked los square.
3218	* we use the archetype to figure out offsets.	3179	* we use the archetype to figure out offsets.
3219	*/	3180	*/
3220	while (op)	3181	while (op)
3221	{	3182	{
3222	dx = rv.distance_x + op->arch->x;	3183	dx = rv.distance_x + op->arch->x;
3223	dy = rv.distance_y + op->arch->y;	3184	dy = rv.distance_y + op->arch->y;
3224		3185
3225	/* only the viewable area the player sees is updated by LOS	3186	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3226	* code, so we need to restrict ourselves to that range of values
3227	* for any meaningful values.
3228	*/
3229	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3230	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3231	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3232	return 1;	3187	return 1;
		3188
3233	op = op->more;	3189	op = op->more;
3234	}	3190	}
		3191
3235	return 0;	3192	return 0;
3236	}	3193	}
3237		3194
3238	/* routine for both players and monsters. We call this when	3195	/* routine for both players and monsters. We call this when
3239	* there is a possibility for our action distrubing our hiding	3196	* there is a possibility for our action distrubing our hiding
3240	* place or invisiblity spell. Artefact invisiblity is not	3197	* place or invisiblity spell. Artefact invisiblity causes
3241	* effected by this. If we arent invisible to begin with, we	3198	* "noise" instead. If we arent invisible to begin with, we
3242	* return 0.	3199	* return 0.
3243	*/	3200	*/
3244	int	3201	int
3245	action_makes_visible (object *op)	3202	action_makes_visible (object *op)
3246	{	3203	{
3247
3248	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3204	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3249	{	3205	{
3250	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3206	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3207	{
		3208	// artefact invisibility is permanent, but we still make noise
		3209	// this is important for game-balance.
		3210	if (op->contr)
		3211	op->make_noise ();
		3212
3251	return 0;	3213	return 0;
		3214	}
3252		3215
3253	if (op->contr && op->contr->tmp_invis == 0)	3216	if (op->contr && op->contr->tmp_invis == 0)
3254	return 0;	3217	return 0;
3255		3218
3256	/* If monsters, they should become visible */	3219	/* If monsters, they should become visible */
3257	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3220	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3258	{	3221	{
3259	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3222	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3260	return 1;	3223	return 1;
3261	}	3224	}
3262	}	3225	}
		3226
3263	return 0;	3227	return 0;
3264	}	3228	}
3265		3229
3266	/* op_on_battleground - checks if the given object op (usually	3230	/* op_on_battleground - checks if the given object op (usually
3267	* a player) is standing on a valid battleground-tile,	3231	* a player) is standing on a valid battleground-tile,
…		…
3272	* Default is to do the same as before, so only people wanting to have different points need worry about this	3236	* Default is to do the same as before, so only people wanting to have different points need worry about this
3273	*/	3237	*/
3274	int	3238	int
3275	op_on_battleground (object *op, int *x, int *y)	3239	op_on_battleground (object *op, int *x, int *y)
3276	{	3240	{
3277	object *tmp;
3278
3279	/* A battleground-tile needs the following attributes to be valid:	3241	/* A battleground-tile needs the following attributes to be valid:
3280	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3242	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3281	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3243	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3282	* and the exit-coordinates sp/hp must both be > 0.	3244	* and the exit-coordinates sp/hp must both be > 0.
3283	* => The intention here is to prevent abuse of the battleground-	3245	* => The intention here is to prevent abuse of the battleground-
3284	* feature (like pickable or hidden battleground tiles). */	3246	* feature (like pickable or hidden battleground tiles). */
3285	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3247	for (object *tmp = op->below; tmp; tmp = tmp->below)
3286	{	3248	{
3287	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3249	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3288	{	3250	{
3289	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3251	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3290	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3252	&& tmp->type == BATTLEGROUND
		3253	&& tmp->name == shstr_battleground
		3254	&& EXIT_X (tmp) && EXIT_Y (tmp))
3291	{	3255	{
3292	/*before we assign the exit, check if this is a teambattle */	3256	/* before we assign the exit, check if this is a teambattle */
3293	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3257	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3294	{	3258	{
3295	object *invtmp;
3296
3297	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3259	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3298	{	3260	{
3299	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3261	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3300	{	3262	{
3301	if (x != NULL && y != NULL)	3263	if (x && y)
3302	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3264	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3265
3303	return 1;	3266	return 1;
3304	}	3267	}
3305	}	3268	}
3306	}	3269	}
		3270
3307	if (x != NULL && y != NULL)	3271	if (x && y)
3308	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3272	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3273
3309	return 1;	3274	return 1;
3310	}	3275	}
3311	}	3276	}
3312	}	3277	}
		3278
3313	/* If we got here, did not find a battleground */	3279	/* If we got here, did not find a battleground */
3314	return 0;	3280	return 0;
3315	}	3281	}
3316		3282
3317	/*	3283	/*
…		…
3333	char buf[MAX_BUF]; /* tmp. string buffer */	3299	char buf[MAX_BUF]; /* tmp. string buffer */
3334	int i = 0, j = 0;	3300	int i = 0, j = 0;
3335		3301
3336	/* get the appropriate treasurelist */	3302	/* get the appropriate treasurelist */
3337	if (atnr == ATNR_FIRE)	3303	if (atnr == ATNR_FIRE)
3338	trlist = treasurelist::find ("dragon_ability_fire");	3304	trlist = treasurelist::find (shstr_dragon_ability_fire);
3339	else if (atnr == ATNR_COLD)	3305	else if (atnr == ATNR_COLD)
3340	trlist = treasurelist::find ("dragon_ability_cold");	3306	trlist = treasurelist::find (shstr_dragon_ability_cold);
3341	else if (atnr == ATNR_ELECTRICITY)	3307	else if (atnr == ATNR_ELECTRICITY)
3342	trlist = treasurelist::find ("dragon_ability_elec");	3308	trlist = treasurelist::find (shstr_dragon_ability_elec);
3343	else if (atnr == ATNR_POISON)	3309	else if (atnr == ATNR_POISON)
3344	trlist = treasurelist::find ("dragon_ability_poison");	3310	trlist = treasurelist::find (shstr_dragon_ability_poison);
3345		3311
3346	if (trlist == NULL || who->type != PLAYER)	3312	if (trlist == NULL || who->type != PLAYER)
3347	return;	3313	return;
3348		3314
3349	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3315	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3422	{	3388	{
3423	/* forces in the treasurelist can alter the player's stats */	3389	/* forces in the treasurelist can alter the player's stats */
3424	object *skin;	3390	object *skin;
3425		3391
3426	/* first get the dragon skin force */	3392	/* first get the dragon skin force */
3427	shstr_cmp dragon_skin_force ("dragon_skin_force");
3428	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)	3393	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3429	;	3394	;
3430		3395
3431	if (!skin)	3396	if (!skin)
3432	return;	3397	return;
3433		3398
…		…
3468	else	3433	else
3469	{	3434	{
3470	/* generate misc. treasure */	3435	/* generate misc. treasure */
3471	tmp = arch_to_object (tr->item);	3436	tmp = arch_to_object (tr->item);
3472	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3437	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3473	tmp = insert_ob_in_ob (tmp, who);	3438	who->insert (tmp);
3474	if (who->type == PLAYER)
3475	esrv_send_item (who, tmp);
3476	}	3439	}
3477	}	3440	}
3478		3441
3479	/**	3442	/**
3480	* Unready an object for a player. This function does nothing if the object was	3443	* Unready an object for a player. This function does nothing if the object was
…		…
3492	if (pl->ranged_ob == ob)	3455	if (pl->ranged_ob == ob)
3493	pl->ranged_ob = 0;	3456	pl->ranged_ob = 0;
3494	}	3457	}
3495		3458
3496	sint8	3459	sint8
3497	player::visibility_at (maptile *map, int x, int y) const	3460	player::darkness_at (maptile *map, int x, int y) const
3498	{	3461	{
3499	if (!ns)	3462	if (!ns)
3500	return 0;	3463	return LOS_BLOCKED;
3501		3464
3502	int dx, dy;	3465	int dx, dy;
3503	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3466	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3504	return 0;	3467	return LOS_BLOCKED;
3505		3468
3506	x += dx - ns->current_x + ns->mapx / 2;	3469	x += dx - ns->current_x;
3507	y += dy - ns->current_y + ns->mapy / 2;	3470	y += dy - ns->current_y;
3508		3471
3509	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3510	return 0;
3511
3512	return 100 - blocked_los [x][y];	3472	return blocked_los (x, y);
3513	}	3473	}
		3474
		3475	void
		3476	player::infobox (const char *title, const char *msg, int color)
		3477	{
		3478	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3479	}
		3480
		3481	void
		3482	player::statusmsg (const char *msg, int color)
		3483	{
		3484	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3485	}
		3486
		3487	void
		3488	player::failmsg (const char *msg, int color)
		3489	{
		3490	play_sound (sound_find ("generic_failure"));
		3491	statusmsg (msg, color);
		3492	}
		3493

Diff Legend

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