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.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.232 by root, Sat Oct 3 20:11:12 2009 UTC

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

Diff Legend

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