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.202 by root, Fri Aug 29 02:07:09 2008 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 (this);
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_player_skills (ob);
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	}
…		…
711	if (op->nrof > 1)	699	if (op->nrof > 1)
712	op->nrof = 1;	700	op->nrof = 1;
713	}	701	}
714		702
715	if (op->type == SPELLBOOK && op->inv)	703	if (op->type == SPELLBOOK && op->inv)
716	{
717	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
718	}
719		705
720	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
721	* items. Just don't identify gold or silver, or it won't be	707	* items. Just don't identify gold or silver, or it won't be
722	* merged properly.	708	* merged properly.
723	*/	709	*/
724	if (need_identify (op))	710	if (need_identify (op))
725	{	711	{
726	SET_FLAG (op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
727	CLEAR_FLAG (op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
728	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
729	}	715	}
		716
730	if (op->type == SPELL)	717	if (op->type == SPELL)
731	{	718	{
732	op->destroy ();	719	op->destroy ();
733	continue;	720	continue;
734	}	721	}
…		…
736	{	723	{
737	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
738	op->stats.exp = 0;	725	op->stats.exp = 0;
739	op->level = 1;	726	op->level = 1;
740	}	727	}
741	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
742	else
743	SET_FLAG (op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
744	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
745		731
746	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
747	link_player_skills (pl);	733	link_player_skills (pl);
…		…
853	static void	839	static void
854	start_info (object *op)	840	start_info (object *op)
855	{	841	{
856	char buf[MAX_BUF];	842	char buf[MAX_BUF];
857		843
858	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
859	new_draw_info (NDI_UNIQUE, 0, op, buf);	845	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	}	846	}
863		847
864	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
865	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
…		…
869	*/	853	*/
870	void	854	void
871	player::chargen_race_done ()	855	player::chargen_race_done ()
872	{	856	{
873	/* this must before then initial items are given */	857	/* this must before then initial items are given */
874	esrv_new_player (ob->contr, ob->weight + ob->carrying);	858	esrv_new_player (ob->contr);
875		859
876	treasurelist *tl = treasurelist::find ("starting_wealth");	860	treasurelist *tl = treasurelist::find ("starting_wealth");
877	if (tl)	861	if (tl)
878	create_treasure (tl, ob, 0, 0, 0);	862	create_treasure (tl, ob, 0, 0, 0);
879		863
…		…
882		866
883	ob->contr->ns->state = ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
884		868
885	if (ob->msg)	869	if (ob->msg)
886	ob->msg = 0;	870	ob->msg = 0;
887
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		871
897	start_info (ob);	872	start_info (ob);
898	CLEAR_FLAG (ob, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
899	give_initial_items (ob, ob->randomitems);	874	give_initial_items (ob, ob->randomitems);
900	link_player_skills (ob);	875	link_player_skills (ob);
…		…
903		878
904	/* This moves the player to a different start map, if there	879	/* This moves the player to a different start map, if there
905	* is one for this race	880	* is one for this race
906	*/	881	*/
907	if (*first_map_ext_path)	882	if (*first_map_ext_path)
908	{	883	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	884	else
923	LOG (llevDebug, "first_map_ext_path not set\n");	885	LOG (llevDebug, "first_map_ext_path not set\n");
924	}	886	}
925		887
926	void	888	void
…		…
936	int x = ob->x, y = ob->y;	898	int x = ob->x, y = ob->y;
937		899
938	ob->remove_statbonus ();	900	ob->remove_statbonus ();
939	ob->remove ();	901	ob->remove ();
940	ob->arch = get_player_archetype (ob->arch);	902	ob->arch = get_player_archetype (ob->arch);
941	ob->arch->clone.copy_to (ob);	903	ob->arch->copy_to (ob);
942	ob->instantiate ();	904	ob->instantiate ();
943	ob->stats = ob->contr->orig_stats;	905	ob->stats = ob->contr->orig_stats;
944	ob->name = ob->name_pl = name;	906	ob->name = ob->name_pl = name;
945	ob->x = x;	907	ob->x = x;
946	ob->y = y;	908	ob->y = y;
947	SET_ANIMATION (ob, 2); /* So player faces south */	909	SET_ANIMATION (ob, 2); /* So player faces south */
948	insert_ob_in_map (ob, ob->map, ob, 0);	910	insert_ob_in_map (ob, ob->map, ob, 0);
949	assign (ob->contr->title, ob->arch->clone.name);	911	assign (ob->contr->title, ob->arch->object::name);
950	ob->add_statbonus ();	912	ob->add_statbonus ();
951	}	913	}
952	while (!allowed_class (ob));	914	while (!allowed_class (ob));
953		915
954	update_object (ob, UP_OBJ_FACE);	916	update_object (ob, UP_OBJ_FACE);
…		…
1029	if (op->move_type & MOVE_FLYING)	991	if (op->move_type & MOVE_FLYING)
1030	return 1;	992	return 1;
1031		993
1032	next = op->below;	994	next = op->below;
1033		995
		996	int cnt = MAX_ITEM_PER_DROP;
		997	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		998
1034	/* loop while there are items on the floor that are not marked as	999	/* loop while there are items on the floor that are not marked as
1035	* destroyed */	1000	* destroyed */
1036	while (next && !next->destroyed ())	1001	while (next && !next->destroyed ())
1037	{	1002	{
1038	tmp = next;	1003	tmp = next;
1039	next = tmp->below;	1004	next = tmp->below;
1040		1005
		1006	if (cnt <= 0)
		1007	{
		1008	op->failmsg ("Couldn't pickup all items at once.");
		1009	return 0;
		1010	}
		1011
1041	if (op->destroyed ())	1012	if (op->destroyed ())
1042	return 0;	1013	return 0;
1043		1014
1044	if (!can_pick (op, tmp))	1015	if (!can_pick (op, tmp))
1045	continue;	1016	continue;
1046		1017
1047	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1018	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1048	{	1019	{
1049	if (item_matched_string (op, tmp, op->contr->search_str))	1020	if (item_matched_string (op, tmp, op->contr->search_str))
1050	pick_up (op, tmp);	1021	CHK_PICK_PICKUP;
1051	continue;	1022	continue;
1052	}	1023	}
1053		1024
1054	/* high not bit set? We're using the old autopickup model */	1025	/* high not bit set? We're using the old autopickup model */
1055	if (!(op->contr->mode & PU_NEWMODE))	1026	if (!(op->contr->mode & PU_NEWMODE))
…		…
1057	switch (op->contr->mode)	1028	switch (op->contr->mode)
1058	{	1029	{
1059	case 0:	1030	case 0:
1060	return 1; /* don't pick up */	1031	return 1; /* don't pick up */
1061	case 1:	1032	case 1:
1062	pick_up (op, tmp);	1033	CHK_PICK_PICKUP;
1063	return 1;	1034	return 1;
1064	case 2:	1035	case 2:
1065	pick_up (op, tmp);	1036	CHK_PICK_PICKUP;
1066	return 0;	1037	return 0;
1067	case 3:	1038	case 3:
1068	return 0; /* stop before pickup */	1039	return 0; /* stop before pickup */
1069	case 4:	1040	case 4:
1070	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1071	break;	1042	break;
1072	case 5:	1043	case 5:
1073	pick_up (op, tmp);	1044	CHK_PICK_PICKUP;
1074	stop = 1;	1045	stop = 1;
1075	break;	1046	break;
1076	case 6:	1047	case 6:
1077	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1048	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1078	pick_up (op, tmp);	1049	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1050	CHK_PICK_PICKUP;
1079	break;	1051	break;
1080		1052
1081	case 7:	1053	case 7:
1082	if (tmp->type == MONEY || tmp->type == GEM)	1054	if (tmp->type == MONEY || tmp->type == GEM)
1083	pick_up (op, tmp);	1055	CHK_PICK_PICKUP;
1084	break;	1056	break;
1085		1057
1086	default:	1058	default:
1087	/* use value density */	1059	/* use value density */
1088	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1060	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1089	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1061	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1090	pick_up (op, tmp);	1062	CHK_PICK_PICKUP;
1091	}	1063	}
1092	}	1064	}
1093	else	1065	else
1094	{ /* old model */	1066	{ /* old model */
1095	/* NEW pickup handling */	1067	/* NEW pickup handling */
…		…
1099	if (tmp->name != NULL)	1071	if (tmp->name != NULL)
1100	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1072	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))));	1073	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1102	else	1074	else
1103	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1075	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))));	1076	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1105		1077
1106	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1078	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1107	}	1079	}
1108		1080
1109	/* philosophy:	1081	/* philosophy:
…		…
1150	/* all food and drink if desired */	1122	/* all food and drink if desired */
1151	/* question: don't pick up known-poisonous stuff? */	1123	/* question: don't pick up known-poisonous stuff? */
1152	if (op->contr->mode & PU_FOOD)	1124	if (op->contr->mode & PU_FOOD)
1153	if (tmp->type == FOOD)	1125	if (tmp->type == FOOD)
1154	{	1126	{
1155	pick_up (op, tmp);	1127	CHK_PICK_PICKUP;
1156	continue;	1128	continue;
1157	}	1129	}
1158		1130
1159	if (op->contr->mode & PU_DRINK)	1131	if (op->contr->mode & PU_DRINK)
1160	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1132	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1161	{	1133	{
1162	pick_up (op, tmp);	1134	CHK_PICK_PICKUP;
1163	continue;	1135	continue;
1164	}	1136	}
1165		1137
1166	if (op->contr->mode & PU_POTION)	1138	if (op->contr->mode & PU_POTION)
1167	if (tmp->type == POTION)	1139	if (tmp->type == POTION)
1168	{	1140	{
1169	pick_up (op, tmp);	1141	CHK_PICK_PICKUP;
1170	continue;	1142	continue;
1171	}	1143	}
1172		1144
1173	/* spellbooks, skillscrolls and normal books/scrolls */	1145	/* spellbooks, skillscrolls and normal books/scrolls */
1174	if (op->contr->mode & PU_SPELLBOOK)	1146	if (op->contr->mode & PU_SPELLBOOK)
1175	if (tmp->type == SPELLBOOK)	1147	if (tmp->type == SPELLBOOK)
1176	{	1148	{
1177	pick_up (op, tmp);	1149	CHK_PICK_PICKUP;
1178	continue;	1150	continue;
1179	}	1151	}
1180		1152
1181	if (op->contr->mode & PU_SKILLSCROLL)	1153	if (op->contr->mode & PU_SKILLSCROLL)
1182	if (tmp->type == SKILLSCROLL)	1154	if (tmp->type == SKILLSCROLL)
1183	{	1155	{
1184	pick_up (op, tmp);	1156	CHK_PICK_PICKUP;
1185	continue;	1157	continue;
1186	}	1158	}
1187		1159
1188	if (op->contr->mode & PU_READABLES)	1160	if (op->contr->mode & PU_READABLES)
1189	if (tmp->type == BOOK || tmp->type == SCROLL)	1161	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1190	{	1162	{
1191	pick_up (op, tmp);	1163	CHK_PICK_PICKUP;
1192	continue;	1164	continue;
1193	}	1165	}
1194		1166
1195	/* wands/staves/rods/horns */	1167	/* wands/staves/rods/horns */
1196	if (op->contr->mode & PU_MAGIC_DEVICE)	1168	if (op->contr->mode & PU_MAGIC_DEVICE)
1197	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1169	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1198	{	1170	{
1199	pick_up (op, tmp);	1171	CHK_PICK_PICKUP;
1200	continue;	1172	continue;
1201	}	1173	}
1202		1174
1203	/* pick up all magical items */	1175	/* pick up all magical items */
1204	if (op->contr->mode & PU_MAGICAL)	1176	if (op->contr->mode & PU_MAGICAL)
1205	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1177	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1206	{	1178	{
1207	pick_up (op, tmp);	1179	CHK_PICK_PICKUP;
1208	continue;	1180	continue;
1209	}	1181	}
1210		1182
1211	if (op->contr->mode & PU_VALUABLES)	1183	if (op->contr->mode & PU_VALUABLES)
1212	{	1184	{
1213	if (tmp->type == MONEY || tmp->type == GEM)	1185	if (tmp->type == MONEY || tmp->type == GEM)
1214	{	1186	{
1215	pick_up (op, tmp);	1187	CHK_PICK_PICKUP;
1216	continue;	1188	continue;
1217	}	1189	}
1218	}	1190	}
1219		1191
1220	/* rings & amulets - talismans seems to be typed AMULET */	1192	/* rings & amulets - talismans seems to be typed AMULET */
1221	if (op->contr->mode & PU_JEWELS)	1193	if (op->contr->mode & PU_JEWELS)
1222	if (tmp->type == RING || tmp->type == AMULET)	1194	if (tmp->type == RING || tmp->type == AMULET)
1223	{	1195	{
1224	pick_up (op, tmp);	1196	CHK_PICK_PICKUP;
1225	continue;	1197	continue;
1226	}	1198	}
1227		1199
1228	/* we don't forget dragon food */	1200	/* we don't forget dragon food */
1229	if (op->contr->mode & PU_FLESH)	1201	if (op->contr->mode & PU_FLESH)
1230	if (tmp->type == FLESH)	1202	if (tmp->type == FLESH)
1231	{	1203	{
1232	pick_up (op, tmp);	1204	CHK_PICK_PICKUP;
1233	continue;	1205	continue;
1234	}	1206	}
1235		1207
1236	/* bows and arrows. Bows are good for selling! */	1208	/* bows and arrows. Bows are good for selling! */
1237	if (op->contr->mode & PU_BOW)	1209	if (op->contr->mode & PU_BOW)
1238	if (tmp->type == BOW)	1210	if (tmp->type == BOW)
1239	{	1211	{
1240	pick_up (op, tmp);	1212	CHK_PICK_PICKUP;
1241	continue;	1213	continue;
1242	}	1214	}
1243		1215
1244	if (op->contr->mode & PU_ARROW)	1216	if (op->contr->mode & PU_ARROW)
1245	if (tmp->type == ARROW)	1217	if (tmp->type == ARROW)
1246	{	1218	{
1247	pick_up (op, tmp);	1219	CHK_PICK_PICKUP;
1248	continue;	1220	continue;
1249	}	1221	}
1250		1222
1251	/* all kinds of armor etc. */	1223	/* all kinds of armor etc. */
1252	if (op->contr->mode & PU_ARMOUR)	1224	if (op->contr->mode & PU_ARMOUR)
1253	if (tmp->type == ARMOUR)	1225	if (tmp->type == ARMOUR)
1254	{	1226	{
1255	pick_up (op, tmp);	1227	CHK_PICK_PICKUP;
1256	continue;	1228	continue;
1257	}	1229	}
1258		1230
1259	if (op->contr->mode & PU_HELMET)	1231	if (op->contr->mode & PU_HELMET)
1260	if (tmp->type == HELMET)	1232	if (tmp->type == HELMET)
1261	{	1233	{
1262	pick_up (op, tmp);	1234	CHK_PICK_PICKUP;
1263	continue;	1235	continue;
1264	}	1236	}
1265		1237
1266	if (op->contr->mode & PU_SHIELD)	1238	if (op->contr->mode & PU_SHIELD)
1267	if (tmp->type == SHIELD)	1239	if (tmp->type == SHIELD)
1268	{	1240	{
1269	pick_up (op, tmp);	1241	CHK_PICK_PICKUP;
1270	continue;	1242	continue;
1271	}	1243	}
1272		1244
1273	if (op->contr->mode & PU_BOOTS)	1245	if (op->contr->mode & PU_BOOTS)
1274	if (tmp->type == BOOTS)	1246	if (tmp->type == BOOTS)
1275	{	1247	{
1276	pick_up (op, tmp);	1248	CHK_PICK_PICKUP;
1277	continue;	1249	continue;
1278	}	1250	}
1279		1251
1280	if (op->contr->mode & PU_GLOVES)	1252	if (op->contr->mode & PU_GLOVES)
1281	if (tmp->type == GLOVES)	1253	if (tmp->type == GLOVES)
1282	{	1254	{
1283	pick_up (op, tmp);	1255	CHK_PICK_PICKUP;
1284	continue;	1256	continue;
1285	}	1257	}
1286		1258
1287	if (op->contr->mode & PU_CLOAK)	1259	if (op->contr->mode & PU_CLOAK)
1288	if (tmp->type == CLOAK)	1260	if (tmp->type == CLOAK)
1289	{	1261	{
1290	pick_up (op, tmp);	1262	CHK_PICK_PICKUP;
1291	continue;	1263	continue;
1292	}	1264	}
1293		1265
1294	/* hoping to catch throwing daggers here */	1266	/* hoping to catch throwing daggers here */
1295	if (op->contr->mode & PU_MISSILEWEAPON)	1267	if (op->contr->mode & PU_MISSILEWEAPON)
1296	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1268	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1297	{	1269	{
1298	pick_up (op, tmp);	1270	CHK_PICK_PICKUP;
1299	continue;	1271	continue;
1300	}	1272	}
1301		1273
1302	/* careful: chairs and tables are weapons! */	1274	/* careful: chairs and tables are weapons! */
1303	if (op->contr->mode & PU_ALLWEAPON)	1275	if (op->contr->mode & PU_ALLWEAPON)
1304	{	1276	{
1305	if (tmp->type == WEAPON && tmp->name != NULL)	1277	if (tmp->type == WEAPON && tmp->name != NULL)
1306	{	1278	{
1307	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1279	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1308	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1280	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1309	{	1281	{
1310	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1311	continue;	1283	continue;
1312	}	1284	}
1313	}	1285	}
1314		1286
1315	if (tmp->type == WEAPON && tmp->name == NULL)	1287	if (tmp->type == WEAPON && tmp->name == NULL)
1316	{	1288	{
1317	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1289	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1318	{	1290	{
1319	pick_up (op, tmp);	1291	CHK_PICK_PICKUP;
1320	continue;	1292	continue;
1321	}	1293	}
1322	}	1294	}
1323	}	1295	}
1324		1296
1325	/* misc stuff that's useful */	1297	/* misc stuff that's useful */
1326	if (op->contr->mode & PU_KEY)	1298	if (op->contr->mode & PU_KEY)
1327	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1299	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1328	{	1300	{
1329	pick_up (op, tmp);	1301	CHK_PICK_PICKUP;
1330	continue;	1302	continue;
1331	}	1303	}
1332		1304
1333	/* any of the last 4 bits set means we use the ratio for value	1305	/* any of the last 4 bits set means we use the ratio for value
1334	* pickups */	1306	* pickups */
1335	if (op->contr->mode & PU_RATIO)	1307	if (op->contr->mode & PU_RATIO)
1336	{	1308	{
1337	/* use value density to decide what else to grab */	1309	/* use value density to decide what else to grab */
1338	/* >=7 was >= op->contr->mode */	1310	/* >=7 was >= op->contr->mode */
1339	/* >=7 is the old standard setting. Now we take the last 4 bits	1311	/* >=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 */	1312	*/
1341	wvratio = (op->contr->mode & PU_RATIO) * 5;	1313	wvratio = op->contr->mode & PU_RATIO;
1342	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1314	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1343	{	1315	{
1344	pick_up (op, tmp);	1316	CHK_PICK_PICKUP;
1345	#if 0	1317	#if 0
1346	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1318	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1347	if (tmp->name != NULL)	1319	if (tmp->name != NULL)
1348	{	1320	{
1349	fprintf (stderr, "%s", tmp->name);	1321	fprintf (stderr, "%s", tmp->name);
1350	}	1322	}
1351	else	1323	else
1352	fprintf (stderr, "%s", tmp->arch->name);	1324	fprintf (stderr, "%s", tmp->arch->archname);
1353	fprintf (stderr, ",%d] = ", tmp->type);	1325	fprintf (stderr, ",%d] = ", tmp->type);
1354	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1326	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1355	#endif	1327	#endif
1356	continue;	1328	continue;
1357	}	1329	}
…		…
1368	* found object is returned.	1340	* found object is returned.
1369	*/	1341	*/
1370	object *	1342	object *
1371	find_arrow (object *op, const char *type)	1343	find_arrow (object *op, const char *type)
1372	{	1344	{
1373	object *tmp = 0;
1374
1375	for (op = op->inv; op; op = op->below)	1345	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)	1346	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1347	return splay (tmp);
		1348
		1349	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1350	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1351	if (object *arrow = find_arrow (tmp, type))
		1352	{
		1353	splay (tmp);
1379	return op;	1354	return arrow;
		1355	}
1380		1356
1381	return tmp;	1357	return 0;
1382	}	1358	}
1383		1359
1384	/*	1360	/*
1385	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1361	* 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	1362	* against the target. A full test is not performed, simply a basic test
…		…
1409	}	1385	}
1410	}	1386	}
1411	else if (arrow->type == ARROW && arrow->race == type)	1387	else if (arrow->type == ARROW && arrow->race == type)
1412	{	1388	{
1413	/* allways prefer assasination/slaying */	1389	/* allways prefer assasination/slaying */
1414	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1390	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1415	{	1391	{
1416	if (arrow->attacktype & AT_DEATH)	1392	if (arrow->attacktype & AT_DEATH)
1417	{	1393	{
1418	*better = 100;	1394	*better = 100;
1419	return arrow;	1395	return arrow;
…		…
1427	else	1403	else
1428	{	1404	{
1429	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1405	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1430	{	1406	{
1431	attacktype = 1 << attacknum;	1407	attacktype = 1 << attacknum;
1432	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1408	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1433	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1409	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1434	{	1410	{
1435	tmp = arrow;	1411	tmp = arrow;
1436	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1412	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1437	}	1413	}
1438	}	1414	}
1439	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1415	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1440	{	1416	{
1441	tmp = arrow;	1417	tmp = arrow;
…		…
1447	betterby = 1 + arrow->magic + arrow->stats.dam;	1423	betterby = 1 + arrow->magic + arrow->stats.dam;
1448	}	1424	}
1449	}	1425	}
1450	}	1426	}
1451	}	1427	}
		1428
1452	if (tmp == NULL && arrow == NULL)	1429	if (tmp == NULL && arrow == NULL)
1453	return find_arrow (op, type);	1430	return find_arrow (op, type);
1454		1431
1455	*better = betterby;	1432	*better = betterby;
1456	return tmp;	1433	return tmp;
…		…
1607	arrow->destroy ();	1584	arrow->destroy ();
1608	return 0;	1585	return 0;
1609	}	1586	}
1610		1587
1611	left = arrow; /* these are arrows left to the player */	1588	left = arrow; /* these are arrows left to the player */
1612	arrow = get_split_ob (arrow, 1);	1589	arrow = arrow->split ();
1613	if (!arrow)	1590	if (!arrow)
1614	{	1591	{
1615	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1616	return 0;	1593	return 0;
1617	}	1594	}
…		…
1679		1656
1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1657	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1681	arrow->move_type = MOVE_FLY_LOW;	1658	arrow->move_type = MOVE_FLY_LOW;
1682	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1659	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1683		1660
1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1661	op->play_sound (sound_find ("fire_arrow"));
1685	m->insert (arrow, sx, sy, op);	1662	m->insert (arrow, sx, sy, op);
1686		1663
1687	if (!arrow->destroyed ())	1664	if (!arrow->destroyed ())
1688	move_arrow (arrow);	1665	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		1666
1698	return 1;	1667	return 1;
1699	}	1668	}
1700		1669
1701	/* Special fire code for players - this takes into	1670	/* Special fire code for players - this takes into
…		…
1767		1736
1768	if (item->type == WAND)	1737	if (item->type == WAND)
1769	{	1738	{
1770	if (item->stats.food <= 0)	1739	if (item->stats.food <= 0)
1771	{	1740	{
1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1741	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));	1742	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774		1743
1775	return;	1744	return;
1776	}	1745	}
1777	}	1746	}
1778	else if (item->type == ROD || item->type == HORN)	1747	else if (item->type == ROD || item->type == HORN)
1779	{	1748	{
1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1749	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1750
		1751	// using the maximum of the rods charge allows at least one spell cast
		1752	// for a rod or horn, this fixes some broken rods.
		1753	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1781	{	1754	{
1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1755	op->contr->play_sound (sound_find ("wand_poof"));
1783		1756
1784	if (item->type == ROD)	1757	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));	1758	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1786	else	1759	else
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1760	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1800	object *tmp;	1773	object *tmp;
1801		1774
1802	if (item->arch)	1775	if (item->arch)
1803	{	1776	{
1804	CLEAR_FLAG (item, FLAG_ANIMATE);	1777	CLEAR_FLAG (item, FLAG_ANIMATE);
1805	item->face = item->arch->clone.face;	1778	item->face = item->arch->face;
1806	item->set_speed (0);	1779	item->set_speed (0);
1807	}	1780	}
1808		1781
1809	if ((tmp = item->in_player ()))	1782	if (object *pl = item->visible_to ())
1810	esrv_update_item (UPD_ANIM, tmp, item);	1783	esrv_update_item (UPD_ANIM, pl, item);
1811	}	1784	}
1812	}	1785	}
1813	else if (item->type == ROD || item->type == HORN)	1786	else if (item->type == ROD || item->type == HORN)
1814	drain_rod_charge (item);	1787	drain_rod_charge (item);
1815	}	1788	}
…		…
1976	/* If we found a key, do some extra work */	1949	/* If we found a key, do some extra work */
1977	if (key)	1950	if (key)
1978	{	1951	{
1979	object *container = key->env;	1952	object *container = key->env;
1980		1953
1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982
1983	if (action_makes_visible (op))	1954	if (action_makes_visible (op))
1984	make_visible (op);	1955	make_visible (op);
1985		1956
1986	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1957	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1987	spring_trap (door->inv, op);	1958	spring_trap (door->inv, op);
1988		1959
1989	if (door->type == DOOR)	1960	if (door->type == DOOR)
1990	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1961	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1991	else if (door->type == LOCKED_DOOR)	1962	else if (door->type == LOCKED_DOOR)
1992	{	1963	{
1993	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1964	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1994	remove_door2 (door); /* remove door without violence ;-) */	1965	remove_door2 (door); /* remove door without violence ;-) */
1995	}	1966	}
1996		1967
1997	/* Do this after we print the message */	1968	/* Do this after we print the message */
1998	decrease_ob (key); /* Use up one of the keys */	1969	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		1970
2003	return 1; /* Nothing more to do below */	1971	return 1; /* Nothing more to do below */
2004	}	1972	}
2005	else if (door->type == LOCKED_DOOR)	1973	else if (door->type == LOCKED_DOOR)
2006	{	1974	{
2007	/* Might as well return now - no other way to open this */	1975	/* Might as well return now - no other way to open this */
2008	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1976	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2009	return 1;	1977	return 1;
2010	}	1978	}
2011		1979
2012	return 0;	1980	return 0;
2013	}	1981	}
…		…
2100		2068
2101	if (op->speed_left > 0.f)	2069	if (op->speed_left > 0.f)
2102	{	2070	{
2103	--op->speed_left;	2071	--op->speed_left;
2104		2072
2105	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2073	op->play_sound (sound_find ("push_player"));
2106	push_ob (mon, dir, op);	2074	push_ob (mon, dir, op);
2107		2075
2108	if (op->contr->tmp_invis || op->hide)	2076	if (op->contr->tmp_invis || op->hide)
2109	make_visible (op);	2077	make_visible (op);
2110		2078
…		…
2129	{	2097	{
2130	--op->speed_left;	2098	--op->speed_left;
2131		2099
2132	if (!op->contr->braced)	2100	if (!op->contr->braced)
2133	{	2101	{
2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2102	op->play_sound (sound_find ("push_player"));
2135	push_ob (mon, dir, op);	2103	push_ob (mon, dir, op);
2136	}	2104	}
2137	else	2105	else
2138	new_draw_info (0, 0, op, "You withhold your attack");	2106	op->statusmsg ("You withhold your attack");
2139		2107
2140	if (op->contr->tmp_invis || op->hide)	2108	if (op->contr->tmp_invis || op->hide)
2141	make_visible (op);	2109	make_visible (op);
2142		2110
2143	return true;	2111	return true;
…		…
2187	bool	2155	bool
2188	move_player (object *op, int dir)	2156	move_player (object *op, int dir)
2189	{	2157	{
2190	int pick;	2158	int pick;
2191		2159
2192	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2160	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2193	return 0;	2161	return 0;
2194		2162
2195	/* Sanity check: make sure dir is valid */	2163	/* Sanity check: make sure dir is valid */
2196	if ((dir < 0) || (dir >= 9))	2164	if ((dir < 0) || (dir >= 9))
2197	{	2165	{
…		…
2282	return 0;	2250	return 0;
2283		2251
2284	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2252	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2285	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2286	{	2254	{
2287	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2255	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));	2256	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		2257
2293	tmp->destroy ();	2258	tmp->destroy ();
2294	CLEAR_FLAG (op, FLAG_LIFESAVE);	2259	CLEAR_FLAG (op, FLAG_LIFESAVE);
2295		2260
2296	if (op->stats.hp < 0)	2261	if (op->stats.hp < 0)
…		…
2309	return 0;	2274	return 0;
2310	}	2275	}
2311		2276
2312	/* This goes throws the inventory and removes unpaid objects, and puts them	2277	/* 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	2278	* 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	2279	* function will descend into containers. op is the object to start the search
2315	* from.	2280	* from.
2316	*/	2281	*/
		2282	static void
		2283	drop_unpaid_items (object *op, object *env)
		2284	{
		2285	while (op)
		2286	{
		2287	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2288
		2289	if (QUERY_FLAG (op, FLAG_UNPAID))
		2290	op->insert_at (env);
		2291	else if (op->inv)
		2292	drop_unpaid_items (op->inv, env);
		2293
		2294	op = next;
		2295	}
		2296	}
		2297
2317	void	2298	void
2318	remove_unpaid_objects (object *op, object *env)	2299	object::drop_unpaid_items ()
2319	{	2300	{
2320	while (op)	2301	if (!flag [FLAG_REMOVED])
2321	{	2302	::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	}	2303	}
2337		2304
2338	/*	2305	/*
2339	* Returns pointer a static string containing gravestone text	2306	* Returns pointer a static string containing gravestone text
2340	* Moved from apply.c to player.c - player.c is what	2307	* Moved from apply.c to player.c - player.c is what
2341	* actually uses this function. player.c may not be quite the	2308	* actually uses this function. player.c may not be quite the
2342	* best, a misc file for object actions is probably better,	2309	* best, a misc file for object actions is probably better,
2343	* but there isn't one in the server directory.	2310	* but there isn't one in the server directory.
2344	*/	2311	*/
2345	char *	2312	const char *
2346	gravestone_text (object *op)	2313	gravestone_text (object *op)
2347	{	2314	{
2348	static char buf2[MAX_BUF];	2315	static dynbuf_text buf;
2349	char buf[MAX_BUF];
2350	time_t now = time (NULL);
2351		2316
2352	strcpy (buf2, " R.I.P.\n\n");	2317	buf << "---- R.I.P. ----\n\n";
		2318	op->name;
		2319
2353	if (op->type == PLAYER)	2320	if (op->type == PLAYER)
2354	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2321	buf << " the " << op->contr->title;
2355	else
2356	sprintf (buf, "%s\n", &op->name);
2357		2322
2358	strncat (buf2, " ", 20 - strlen (buf) / 2);	2323	buf << "\n\n";
2359	strcat (buf2, buf);	2324
		2325	buf << "who was level ";
		2326	buf << (sint32)op->level << "\n\n" // OO breakdown
		2327	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2328
2360	if (op->type == PLAYER)	2329	if (op->type == PLAYER)
2361	sprintf (buf, "who was in level %d when killed\n", op->level);	2330	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		2331
2365	strncat (buf2, " ", 20 - strlen (buf) / 2);
2366	strcat (buf2, buf);
2367	if (op->type == PLAYER)
2368	{	2332	{
2369	sprintf (buf, "by %s.\n\n", op->contr->killer);	2333	static char buf2[128];
2370	strncat (buf2, " ", 21 - strlen (buf) / 2);	2334	time_t now = time (NULL);
2371	strcat (buf2, buf);
2372	}
2373
2374	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2335	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2375	strncat (buf2, " ", 20 - strlen (buf) / 2);	2336	buf << buf2;
2376	strcat (buf2, buf);	2337	}
2377		2338
2378	return buf2;	2339	return buf;
2379	}	2340	}
2380		2341
2381	void	2342	void
2382	do_some_living (object *op)	2343	do_some_living (object *op)
2383	{	2344	{
…		…
2435	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2396	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2436	else	2397	else
2437	{	2398	{
2438	gen_grace = op->stats.maxgrace;	2399	gen_grace = op->stats.maxgrace;
2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2400	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	}	2401	}
2483		2402
2484	/* Regenerate Grace */	2403	/* Regenerate Grace */
2485	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2404	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2486	if (--op->last_grace < 0)	2405	if (--op->last_grace < 0)
…		…
2507	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2426	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2508	}	2427	}
2509	/* wearing stuff doesn't detract from grace generation. */	2428	/* wearing stuff doesn't detract from grace generation. */
2510	}	2429	}
2511		2430
		2431	if (op->stats.food > 0)
		2432	{
2512	/* Regenerate Hit Points */	2433	/* Regenerate Spell Points */
2513	if (--op->last_heal < 0)	2434	if (!op->contr->golem && --op->last_sp < 0)
2514	{
2515	if (op->stats.hp < op->stats.maxhp)
2516	{	2435	{
2517	op->stats.hp++;	2436	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2518	/* dms do not consume food */	2437
2519	if (!QUERY_FLAG (op, FLAG_WIZ))	2438	if (op->stats.sp < op->stats.maxsp)
2520	{	2439	{
		2440	op->stats.sp++;
		2441
		2442	/* dms do not consume food */
		2443	if (!QUERY_FLAG (op, FLAG_WIZ))
		2444	{
2521	op->stats.food--;	2445	op->stats.food--;
		2446
2522	if (op->contr->digestion < 0)	2447	if (op->contr->digestion < 0)
2523	op->stats.food += op->contr->digestion;	2448	op->stats.food += op->contr->digestion;
2524	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2449	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2525	op->stats.food = last_food;	2450	op->stats.food = last_food;
		2451	}
2526	}	2452	}
2527	}
2528		2453
2529	if (max_hp > 1)	2454	if (max_sp > 1)
2530	{
2531	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2532	if (over_hp > 0)
2533	{	2455	{
2534	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2456	over_sp = (gen_sp + 10) / rate_sp;
		2457	if (over_sp > 0)
		2458	{
		2459	if (op->stats.sp < op->stats.maxsp)
		2460	{
		2461	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2462
		2463	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2464	op->stats.sp--;
		2465
		2466	if (op->stats.sp > op->stats.maxsp)
		2467	op->stats.sp = op->stats.maxsp;
		2468	}
		2469
2535	op->last_heal = 0;	2470	op->last_sp = 0;
		2471	}
		2472	else
		2473	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2536	}	2474	}
2537	else	2475	else
		2476	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2477	}
		2478
		2479	/* Regenerate Hit Points */
		2480	if (--op->last_heal < 0)
		2481	{
		2482	if (op->stats.hp < op->stats.maxhp)
2538	{	2483	{
2539	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2484	op->stats.hp++;
		2485
		2486	/* dms do not consume food */
		2487	if (!QUERY_FLAG (op, FLAG_WIZ))
		2488	{
		2489	op->stats.food--;
		2490
		2491	if (op->contr->digestion < 0)
		2492	op->stats.food += op->contr->digestion;
		2493	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2494	op->stats.food = last_food;
		2495	}
2540	}	2496	}
		2497
		2498	if (max_hp > 1)
		2499	{
		2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2501
		2502	if (over_hp > 0)
		2503	{
		2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2505	op->last_heal = 0;
		2506	}
		2507	else
		2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2541	}	2509	}
2542	else	2510	else
2543	{
2544	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2511	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545	}	2512	}
2546	}	2513	}
2547		2514
2548	/* Digestion */	2515	/* Digestion */
2549	if (--op->last_eat < 0)	2516	if (--op->last_eat < 0)
2550	{	2517	{
2551	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2518	int bonus = max (0, op->contr->digestion),
		2519	penalty = max (0, -op->contr->digestion);
2552		2520
2553	if (op->contr->gen_hp > 0)
2554	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2521	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		2522
2558	/* dms do not consume food */	2523	/* dms do not consume food */
2559	if (!QUERY_FLAG (op, FLAG_WIZ))	2524	if (!QUERY_FLAG (op, FLAG_WIZ))
2560	op->stats.food--;	2525	op->stats.food--;
2561	}	2526	}
2562		2527
2563	if (op->stats.food < 0 && op->stats.hp >= 0)	2528	if (op->stats.food < 0 && op->stats.hp >= 0)
2564	{	2529	{
2565	object *tmp, *flesh = 0;	2530	object *flesh = 0;
2566		2531
2567	for (tmp = op->inv; tmp; tmp = tmp->below)	2532	for_inv_removable (op, tmp)
2568	{	2533	{
2569	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2534	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2535	continue;
		2536
		2537	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2570	{	2538	{
2571	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2539	op->statusmsg ("You blindly grab for a bite of food. "
2572	{	2540	"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);	2541	manual_apply (op, tmp, 0);
		2542
2575	if (op->stats.food >= 0 || op->stats.hp < 0)	2543	if (op->stats.food >= 0 || op->stats.hp < 0)
2576	break;	2544	break;
2577	}	2545	}
2578	else if (tmp->type == FLESH)	2546	else if (tmp->type == FLESH)
2579	flesh = tmp;	2547	flesh = tmp;
2580	} /* End if paid for object */	2548	}
2581	} /* end of for loop */
2582		2549
2583	/* If player is still starving, it means they don't have any food, so	2550	/* If player is still starving, it means they don't have any food, so
2584	* eat flesh instead.	2551	* eat flesh instead.
2585	*/	2552	*/
2586	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2553	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2587	{	2554	{
2588	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2555	op->statusmsg ("You blindly grab for a bite of food. "
		2556	"H<To prevent you from starving, you ate some random item from your backpack.>");
2589	manual_apply (op, flesh, 0);	2557	manual_apply (op, flesh, 0);
2590	}	2558	}
		2559
		2560	// If player is still starving, alert him!
		2561	if (op->stats.food < 0)
		2562	op->failmsg ("You are starving! "
		2563	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2564	}
		2565
		2566	if (op->stats.food < 0)
2591	}	2567	{
		2568	op->stats.hp += op->stats.food;
		2569	op->stats.food = 0;
2592		2570
2593	while (op->stats.food < 0 && op->stats.hp >= 0)	2571	if (op->stats.hp < 0)
2594	op->stats.food++, op->stats.hp--;	2572	{
		2573	op->contr->killer = archetype::get ("killer_starvation");
		2574	op->contr->killer->destroy ();
		2575	}
		2576	}
2595		2577
		2578	/* killer should be set here already */
2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597	kill_player (op);	2580	kill_player (op);
2598	}	2581	}
2599	}	2582	}
2600		2583
…		…
2604	* file.	2587	* file.
2605	*/	2588	*/
2606	void	2589	void
2607	kill_player (object *op)	2590	kill_player (object *op)
2608	{	2591	{
		2592	int x, y;
2609	char buf[MAX_BUF];	2593	char buf[MAX_BUF];
2610	int x, y;
2611
2612	//int i;
2613	maptile *map; /* this is for resurrection */	2594	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;	2595	int will_kill_again;
2621	archetype *at;	2596	archetype *at;
2622	object *tmp;	2597	object *tmp;
2623		2598
2624	if (save_life (op))	2599	if (save_life (op))
2625	return;	2600	return;
2626
2627		2601
2628	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2602	/* 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.	2603	* in cities ONLY!!! It is very important that this doesn't get abused.
2630	* Look at op_on_battleground() for more info --AndreasV	2604	* Look at op_on_battleground() for more info --AndreasV
2631	*/	2605	*/
…		…
2647	{	2621	{
2648	tmp->destroy ();	2622	tmp->destroy ();
2649	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2623	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2650	}	2624	}
2651		2625
2652	cure_disease (op, 0); /* remove any disease */	2626	cure_disease (op, 0, 0); /* remove any disease */
2653	op->stats.hp = op->stats.maxhp;	2627	op->stats.hp = op->stats.maxhp;
2654	if (op->stats.food <= 0)	2628	if (op->stats.food <= 0)
2655	op->stats.food = 999;	2629	op->stats.food = 999;
2656		2630
2657	/* create a bodypart-trophy to make the winner happy */	2631	/* create a bodypart-trophy to make the winner happy */
2658	if (object *tmp = arch_to_object (archetype::find ("finger")))	2632	if (object *tmp = arch_to_object (archetype::find ("finger")))
2659	{	2633	{
2660	sprintf (buf, "%s's finger", &op->name);	2634	tmp->name = format ("%s's finger" , &op->name);
2661	tmp->name = buf;	2635	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;	2636	tmp->msg = format (
		2637	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2638	&op->name, op->contr->title,
		2639	(int)op->level,
		2640	op->contr->killer_name ()
		2641	);
2666	tmp->value = 0, tmp->type = 0;	2642	tmp->value = 0, tmp->type = 0;
2667	tmp->materialname = "organics";	2643	tmp->materialname = "organics";
2668	tmp->insert_at (op, tmp);	2644	tmp->insert_at (op, tmp);
2669	}	2645	}
2670		2646
…		…
2676		2652
2677	INVOKE_PLAYER (DEATH, op->contr);	2653	INVOKE_PLAYER (DEATH, op->contr);
2678		2654
2679	command_kill_pets (op, 0);	2655	command_kill_pets (op, 0);
2680		2656
2681	if (op->stats.food < 0)	2657	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		2658
2691	/* save the map location for corpse, gravestone */	2659	/* save the map location for corpse, gravestone */
2692	x = op->x;	2660	x = op->x;
2693	y = op->y;	2661	y = op->y;
2694	map = op->map;	2662	map = op->map;
…		…
2801	lost_a_stat = 1;	2769	lost_a_stat = 1;
2802	}	2770	}
2803	}	2771	}
2804	}	2772	}
2805	}	2773	}
		2774
2806	/* If no stat lost, tell the player. */	2775	/* If no stat lost, tell the player. */
2807	if (!lost_a_stat)	2776	if (!lost_a_stat)
2808	{	2777	{
2809	/* determine_god() seems to not work sometimes... why is this?	2778	/* determine_god() seems to not work sometimes... why is this?
2810	Should I be using something else? GD */	2779	Should I be using something else? GD */
…		…
2814	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2783	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2815	else	2784	else
2816	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2817	}	2786	}
2818	#else	2787	#else
2819	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2820	#endif	2789	#endif
2821		2790
2822	/* Put a gravestone up where the character 'almost' died. List the	2791	/* Put a gravestone up where the character 'almost' died. List the
2823	* exp loss on the stone.	2792	* exp loss on the stone.
2824	*/	2793	*/
2825	tmp = arch_to_object (archetype::find ("gravestone"));	2794	tmp = arch_to_object (archetype::find ("gravestone"));
2826	sprintf (buf, "%s's gravestone", &op->name);	2795	tmp->name = format ("%s's gravestone", &op->name);
2827	tmp->name = buf;	2796	tmp->name_pl = format ("%s's gravestones", &op->name);
2828	sprintf (buf, "%s's gravestones", &op->name);
2829	tmp->name_pl = buf;
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);	2797	tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2831	tmp->msg = buf;
2832	tmp->x = op->x, tmp->y = op->y;	2798	tmp->x = op->x, tmp->y = op->y;
2833	insert_ob_in_map (tmp, op->map, NULL, 0);	2799	insert_ob_in_map (tmp, op->map, NULL, 0);
2834		2800
2835	/**************************************/	2801	/**************************************/
2836	/* */	2802	/* */
…		…
2857	{	2823	{
2858	tmp->destroy ();	2824	tmp->destroy ();
2859	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2825	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2860	}	2826	}
2861		2827
2862	cure_disease (op, 0); /* remove any disease */	2828	cure_disease (op, 0, 0); /* remove any disease */
		2829
		2830	// remove all spell effects that are active
		2831	// to avoid long-term effects such as word-of-recall
		2832	for (object *item = op->inv; item; )
		2833	{
		2834	object *next = item->below;
		2835
		2836	if (item->type == SPELL_EFFECT && item->active)
		2837	item->destroy ();
		2838
		2839	item = next;
		2840	}
2863		2841
2864	/*add_exp(op, (op->stats.exp * -0.20)); */	2842	/*add_exp(op, (op->stats.exp * -0.20)); */
2865	apply_death_exp_penalty (op);	2843	apply_death_exp_penalty (op);
		2844
2866	if (op->stats.food < 100)	2845	if (op->stats.food < 100)
2867	op->stats.food = 900;	2846	op->stats.food = 900;
		2847
2868	op->stats.hp = op->stats.maxhp;	2848	op->stats.hp = op->stats.maxhp;
2869	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2849	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2870	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2850	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2871		2851
2872	/*	2852	/*
2873	* Check to see if the player has any unpaid items. If so, remove them	2853	* Check to see if the player has any unpaid items. If so, remove them
2874	* and put them back in the map.	2854	* and put them back in the map.
2875	*/	2855	*/
2876	remove_unpaid_objects (op->inv, op);	2856	op->drop_unpaid_items ();
2877		2857
2878	/****************************************/	2858	/****************************************/
2879	/* */	2859	/* */
2880	/* Move player to his current respawn- */	2860	/* Move player to his current respawn- */
2881	/* position (usually last savebed) */	2861	/* position (usually last savebed) */
…		…
2940		2920
2941	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2921	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2942	{	2922	{
2943	if (tmp->nrof > 1)	2923	if (tmp->nrof > 1)
2944	{	2924	{
2945	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2925	tmp->decrease (rndm (1, tmp->nrof - 1));
2946	tmp2->destroy ();
2947	insert_ob_in_map (tmp, op->map, NULL, 0);	2926	insert_ob_in_map (tmp, op->map, NULL, 0);
2948	}	2927	}
2949	else	2928	else
2950	tmp->destroy ();	2929	tmp->destroy ();
2951	}	2930	}
…		…
2962	void	2941	void
2963	fix_weight (void)	2942	fix_weight (void)
2964	{	2943	{
2965	for_all_players (pl)	2944	for_all_players (pl)
2966	{	2945	{
2967	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2946	sint32 old = pl->ob->carrying;
2968		2947
2969	if (old == sum)	2948	pl->ob->update_weight ();
2970	continue;	2949
		2950	if (old != pl->ob->carrying)
		2951	{
2971	pl->ob->update_stats ();	2952	pl->ob->update_stats ();
2972	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2953	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2954	}
2973	}	2955	}
2974	}	2956	}
2975		2957
2976	void	2958	void
2977	fix_luck (void)	2959	fix_luck (void)
…		…
3021	void	3003	void
3022	make_visible (object *op)	3004	make_visible (object *op)
3023	{	3005	{
3024	op->hide = 0;	3006	op->hide = 0;
3025	op->invisible = 0;	3007	op->invisible = 0;
		3008
3026	if (op->type == PLAYER)	3009	if (op->type == PLAYER)
3027	{	3010	{
3028	op->contr->tmp_invis = 0;	3011	op->contr->tmp_invis = 0;
3029	op->contr->invis_race = 0;	3012	op->contr->invis_race = 0;
3030	}	3013	}
…		…
3033	}	3016	}
3034		3017
3035	int	3018	int
3036	is_true_undead (object *op)	3019	is_true_undead (object *op)
3037	{	3020	{
3038	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3021	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3039	return 1;	3022	return 1;
3040		3023
3041	return 0;	3024	return 0;
3042	}	3025	}
3043		3026
3044	/* look at the surrounding terrain to determine	3027	/* look at the surrounding terrain to determine
3045	* the hideability of this object. Positive levels	3028	* the hideability of this object. Positive levels
3046	* indicate greater hideability.	3029	* indicate greater hideability.
3047	*/	3030	*/
3048
3049	int	3031	int
3050	hideability (object *ob)	3032	hideability (object *ob)
3051	{	3033	{
3052	int i, level = 0, mflag;	3034	int i, level = 0, mflag;
3053	sint16 x, y;	3035	sint16 x, y;
…		…
3063	* as bad as carrying a light on a pitch dark map */	3045	* as bad as carrying a light on a pitch dark map */
3064	if (has_carried_lights (ob))	3046	if (has_carried_lights (ob))
3065	level = -(10 + (2 * ob->map->darkness));	3047	level = -(10 + (2 * ob->map->darkness));
3066		3048
3067	/* scan through all nearby squares for terrain to hide in */	3049	/* 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])	3050	for (i = 0, x = ob->x, y = ob->y;
		3051	i <= SIZEOFFREE1;
		3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3069	{	3053	{
3070	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3054	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3071	if (mflag & P_OUT_OF_MAP)	3055	if (mflag & P_OUT_OF_MAP)
3072	{
3073	continue;	3056	continue;
3074	}	3057
3075	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3058	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3076	level += 2;	3059	level += 2;
3077	else /* open terrain! */	3060	else /* open terrain! */
3078	level -= 1;	3061	level -= 1;
3079	}	3062	}
…		…
3090	* spot (surrounded by clear terrain in broad daylight). -b.t.	3073	* spot (surrounded by clear terrain in broad daylight). -b.t.
3091	*/	3074	*/
3092	void	3075	void
3093	do_hidden_move (object *op)	3076	do_hidden_move (object *op)
3094	{	3077	{
3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3078	int hide = 0;
3096	object *skop;
3097		3079
3098	if (!op || !op->map)	3080	if (!op || !op->map)
3099	return;	3081	return;
3100		3082
3101	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3083	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3084	int num = random_roll (0, 19, op, PREFER_LOW);
3102		3085
3103	/* its *extremely* hard to run and sneak/hide at the same time! */	3086	/* its *extremely* hard to run and sneak/hide at the same time! */
3104	if (op->type == PLAYER && op->contr->run_on)	3087	if (op->type == PLAYER && op->contr->run_on)
3105	if (!skop || num >= skop->level)	3088	if (!skop || num >= skop->level)
3106	{	3089	{
…		…
3116	num -= hide;	3099	num -= hide;
3117		3100
3118	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3101	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3119	{	3102	{
3120	make_visible (op);	3103	make_visible (op);
		3104
3121	if (op->type == PLAYER)	3105	if (op->type == PLAYER)
3122	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3106	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3123	}	3107	}
3124	else if (op->type == PLAYER && skop)	3108	else if (op->type == PLAYER && skop)
3125	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3109	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3178	* object op. This function works fine for monsters,	3162	* object op. This function works fine for monsters,
3179	* but we dont worry if the object isnt the top one in	3163	* but we dont worry if the object isnt the top one in
3180	* a pile (say a coin under a table would return "viewable"	3164	* a pile (say a coin under a table would return "viewable"
3181	* by this routine). Another question, should we be	3165	* by this routine). Another question, should we be
3182	* concerned with the direction the player is looking	3166	* concerned with the direction the player is looking
3183	* in? Realistically, most of use cant see stuff behind	3167	* in? Realistically, most of us can't see stuff behind
3184	* our backs...on the other hand, does the "facing" direction	3168	* our backs...on the other hand, does the "facing" direction
3185	* imply the way your head, or body is facing? Its possible	3169	* 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.	3170	* for them to differ. Sigh, this fctn could get a bit more complex.
3187	* -b.t.	3171	* -b.t.
3188	* This function is now map tiling safe.	3172	* This function is now map tiling safe.
3189	*/	3173	*/
3190
3191	int	3174	int
3192	player_can_view (object *pl, object *op)	3175	player_can_view (object *pl, object *op)
3193	{	3176	{
3194	rv_vector rv;	3177	rv_vector rv;
3195	int dx, dy;	3178	int dx, dy;
…		…
3207		3190
3208	get_rangevector (pl, op, &rv, 0x1);	3191	get_rangevector (pl, op, &rv, 0x1);
3209		3192
3210	/* starting with the 'head' part, lets loop	3193	/* starting with the 'head' part, lets loop
3211	* through the object and find if it has any	3194	* through the object and find if it has any
3212	* part that is in the los array but isnt on	3195	* part that is in the los array but isn't on
3213	* a blocked los square.	3196	* a blocked los square.
3214	* we use the archetype to figure out offsets.	3197	* we use the archetype to figure out offsets.
3215	*/	3198	*/
3216	while (op)	3199	while (op)
3217	{	3200	{
3218	dx = rv.distance_x + op->arch->clone.x;	3201	dx = rv.distance_x + op->arch->x;
3219	dy = rv.distance_y + op->arch->clone.y;	3202	dy = rv.distance_y + op->arch->y;
3220		3203
3221	/* only the viewable area the player sees is updated by LOS	3204	/* only the viewable area the player sees is updated by LOS
3222	* code, so we need to restrict ourselves to that range of values	3205	* code, so we need to restrict ourselves to that range of values
3223	* for any meaningful values.	3206	* for any meaningful values.
3224	*/	3207	*/
3225	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3208	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3226	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3209	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3227	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3210	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3228	return 1;	3211	return 1;
		3212
3229	op = op->more;	3213	op = op->more;
3230	}	3214	}
		3215
3231	return 0;	3216	return 0;
3232	}	3217	}
3233		3218
3234	/* routine for both players and monsters. We call this when	3219	/* routine for both players and monsters. We call this when
3235	* there is a possibility for our action distrubing our hiding	3220	* there is a possibility for our action distrubing our hiding
…		…
3238	* return 0.	3223	* return 0.
3239	*/	3224	*/
3240	int	3225	int
3241	action_makes_visible (object *op)	3226	action_makes_visible (object *op)
3242	{	3227	{
3243
3244	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3228	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3245	{	3229	{
3246	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3230	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3247	return 0;	3231	return 0;
3248		3232
…		…
3254	{	3238	{
3255	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3239	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3256	return 1;	3240	return 1;
3257	}	3241	}
3258	}	3242	}
		3243
3259	return 0;	3244	return 0;
3260	}	3245	}
3261		3246
3262	/* op_on_battleground - checks if the given object op (usually	3247	/* op_on_battleground - checks if the given object op (usually
3263	* a player) is standing on a valid battleground-tile,	3248	* 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	3253	* Default is to do the same as before, so only people wanting to have different points need worry about this
3269	*/	3254	*/
3270	int	3255	int
3271	op_on_battleground (object *op, int *x, int *y)	3256	op_on_battleground (object *op, int *x, int *y)
3272	{	3257	{
3273	object *tmp;
3274
3275	/* A battleground-tile needs the following attributes to be valid:	3258	/* 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),	3259	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3277	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3260	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3278	* and the exit-coordinates sp/hp must both be > 0.	3261	* and the exit-coordinates sp/hp must both be > 0.
3279	* => The intention here is to prevent abuse of the battleground-	3262	* => The intention here is to prevent abuse of the battleground-
3280	* feature (like pickable or hidden battleground tiles). */	3263	* feature (like pickable or hidden battleground tiles). */
3281	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3264	for (object *tmp = op->below; tmp; tmp = tmp->below)
3282	{	3265	{
3283	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3266	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3284	{	3267	{
3285	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3268	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3286	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3269	&& tmp->type == BATTLEGROUND
		3270	&& tmp->name == shstr_battleground
		3271	&& EXIT_X (tmp) && EXIT_Y (tmp))
3287	{	3272	{
3288	/*before we assign the exit, check if this is a teambattle */	3273	/* before we assign the exit, check if this is a teambattle */
3289	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3274	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3290	{	3275	{
3291	object *invtmp;
3292
3293	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3276	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3294	{	3277	{
3295	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3278	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3296	{	3279	{
3297	if (x != NULL && y != NULL)	3280	if (x && y)
3298	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3281	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3282
3299	return 1;	3283	return 1;
3300	}	3284	}
3301	}	3285	}
3302	}	3286	}
		3287
3303	if (x != NULL && y != NULL)	3288	if (x && y)
3304	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3289	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3290
3305	return 1;	3291	return 1;
3306	}	3292	}
3307	}	3293	}
3308	}	3294	}
		3295
3309	/* If we got here, did not find a battleground */	3296	/* If we got here, did not find a battleground */
3310	return 0;	3297	return 0;
3311	}	3298	}
3312		3299
3313	/*	3300	/*
…		…
3329	char buf[MAX_BUF]; /* tmp. string buffer */	3316	char buf[MAX_BUF]; /* tmp. string buffer */
3330	int i = 0, j = 0;	3317	int i = 0, j = 0;
3331		3318
3332	/* get the appropriate treasurelist */	3319	/* get the appropriate treasurelist */
3333	if (atnr == ATNR_FIRE)	3320	if (atnr == ATNR_FIRE)
3334	trlist = treasurelist::find ("dragon_ability_fire");	3321	trlist = treasurelist::find (shstr_dragon_ability_fire);
3335	else if (atnr == ATNR_COLD)	3322	else if (atnr == ATNR_COLD)
3336	trlist = treasurelist::find ("dragon_ability_cold");	3323	trlist = treasurelist::find (shstr_dragon_ability_cold);
3337	else if (atnr == ATNR_ELECTRICITY)	3324	else if (atnr == ATNR_ELECTRICITY)
3338	trlist = treasurelist::find ("dragon_ability_elec");	3325	trlist = treasurelist::find (shstr_dragon_ability_elec);
3339	else if (atnr == ATNR_POISON)	3326	else if (atnr == ATNR_POISON)
3340	trlist = treasurelist::find ("dragon_ability_poison");	3327	trlist = treasurelist::find (shstr_dragon_ability_poison);
3341		3328
3342	if (trlist == NULL || who->type != PLAYER)	3329	if (trlist == NULL || who->type != PLAYER)
3343	return;	3330	return;
3344		3331
3345	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3332	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]); */	3336	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3350	return;	3337	return;
3351	}	3338	}
3352		3339
3353	/* everything seems okay - now bring on the gift: */	3340	/* everything seems okay - now bring on the gift: */
3354	item = &(tr->item->clone);	3341	item = tr->item;
3355		3342
3356	if (item->type == SPELL)	3343	if (item->type == SPELL)
3357	{	3344	{
3358	if (check_spell_known (who, item->name))	3345	if (check_spell_known (who, item->name))
3359	return;	3346	return;
…		…
3418	{	3405	{
3419	/* forces in the treasurelist can alter the player's stats */	3406	/* forces in the treasurelist can alter the player's stats */
3420	object *skin;	3407	object *skin;
3421		3408
3422	/* first get the dragon skin force */	3409	/* 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)	3410	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3425	;	3411	;
3426		3412
3427	if (!skin)	3413	if (!skin)
3428	return;	3414	return;
3429		3415
…		…
3464	else	3450	else
3465	{	3451	{
3466	/* generate misc. treasure */	3452	/* generate misc. treasure */
3467	tmp = arch_to_object (tr->item);	3453	tmp = arch_to_object (tr->item);
3468	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3454	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);	3455	who->insert (tmp);
3470	if (who->type == PLAYER)
3471	esrv_send_item (who, tmp);
3472	}	3456	}
3473	}	3457	}
3474		3458
3475	/**	3459	/**
3476	* Unready an object for a player. This function does nothing if the object was	3460	* Unready an object for a player. This function does nothing if the object was
…		…
3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3489	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3506	return 0;	3490	return 0;
3507		3491
3508	return 100 - blocked_los [x][y];	3492	return 100 - blocked_los [x][y];
3509	}	3493	}
		3494
		3495	void
		3496	player::infobox (const char *title, const char *msg, int color)
		3497	{
		3498	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3499	}
		3500
		3501	void
		3502	player::statusmsg (const char *msg, int color)
		3503	{
		3504	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3505	}
		3506
		3507	void
		3508	player::failmsg (const char *msg, int color)
		3509	{
		3510	play_sound (sound_find ("generic_failure"));
		3511	statusmsg (msg, color);
		3512	}
		3513

Diff Legend

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