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.117 by root, Sun Apr 29 21:44:35 2007 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 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 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 <pwd.h>
27	#include <sproto.h>	25	#include <sproto.h>
28	#include <sounds.h>	26	#include <sounds.h>
29	#include <living.h>	27	#include <living.h>
30	#include <object.h>	28	#include <object.h>
31	#include <spells.h>	29	#include <spells.h>
…		…
158	op->x = -1;	156	op->x = -1;
159	op->y = -1;	157	op->y = -1;
160	}	158	}
161		159
162	void	160	void
163	player::enter_map ()
164	{
165	object *tmp = object::create ();
166
167	EXIT_PATH (tmp) = maplevel;
168	EXIT_X (tmp) = ob->x;
169	EXIT_Y (tmp) = ob->y;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}
174
175	void
176	player::activate ()	161	player::activate ()
177	{	162	{
178	if (active)	163	if (active)
179	return;	164	return;
180		165
…		…
182	ob->remove ();	167	ob->remove ();
183	ob->map = 0;	168	ob->map = 0;
184	ob->activate_recursive ();	169	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	171	add_friendly_object (ob);
187	enter_map ();
188	}	172	}
189		173
190	void	174	void
191	player::deactivate ()	175	player::deactivate ()
192	{	176	{
…		…
199		183
200	if (ob->map)	184	if (ob->map)
201	maplevel = ob->map->path;	185	maplevel = ob->map->path;
202		186
203	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
204	ob->map = 0;	189	ob->map = 0;
205	party = 0;	190	party = 0;
206		191
207	// for weird reasons, this is often "ob", keeping a circular reference	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208	ranges [range_skill] = 0;
209		193
210	players.erase (this);	194	players.erase (this);
211	}	195	}
212		196
213	// connect the player with a specific client	197	// connect the player with a specific client
214	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
215	void	199	void
216	player::connect (client *ns)	200	player::connect (client *ns)
217	{	201	{
218	this->ns = ns;	202	this->ns = ns;
219	ns->pl = this;	203	ns->pl = this;
…		…
223	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
224		208
225	ns->update_look = 0;	209	ns->update_look = 0;
226	ns->look_position = 0;	210	ns->look_position = 0;
227		211
228	clear_los (ob);	212	clear_los (this);
229		213
230	ns->reset_stats ();	214	ns->reset_stats ();
231		215
232	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
233	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
234	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
235		219
236	if (!legal_range (shoottype))	220	ob->update_weight ();
237	shoottype = range_none;
238
239	ob->carrying = sum_weight (ob);
240	link_player_skills (ob);	221	link_player_skills (ob);
241		222
242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243		224
244	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
245		226
246	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
247	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
248	{	229	{
249	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
250		231
251	shstr_cmp dragon_ability_force ("dragon_ability_force");
252	shstr_cmp dragon_skin_force ("dragon_skin_force");
253
254	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
255	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
256	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
257	abil = tmp;	235	abil = tmp;
258	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
259	skin = tmp;	237	skin = tmp;
260		238
261	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
262	}	240	}
263		241
264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265		243
266	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this, ob->weight + ob->carrying);
267		245
268	ob->update_stats ();	246	ob->update_stats ();
		247
269	ns->floorbox_update ();	248	ns->floorbox_update ();
270
271	esrv_send_inventory (ob, ob);	249	esrv_send_inventory (ob, ob);
272	esrv_add_spells (this, 0);	250	esrv_add_spells (this, 0);
273		251
274	activate ();	252	activate ();
275		253
…		…
282	}	260	}
283		261
284	void	262	void
285	player::disconnect ()	263	player::disconnect ()
286	{	264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
287	if (ns)	271	if (ns)
288	{	272	{
289	if (active)	273	if (active)
290	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
291		275
…		…
294	ns->reset_stats ();	278	ns->reset_stats ();
295	ns->pl = 0;	279	ns->pl = 0;
296	ns = 0;	280	ns = 0;
297	}	281	}
298		282
299	if (ob)	283	observe = ob;
300	ob->close_container (); //TODO: client-specific
301		284
302	deactivate ();	285	deactivate ();
303	}	286	}
304		287
305	// the need for this function can be explained	288	// the need for this function can be explained
306	// by load_object not returning the object	289	// by load_object not returning the object
307	void	290	void
308	player::set_object (object *op)	291	player::set_object (object *op)
309	{	292	{
310	ob = op;	293	ob = observe = op;
311	ob->contr = this; /* this aren't yet in archetype */	294	ob->contr = this; /* this aren't yet in archetype */
312		295
313	ob->speed_left = 0.5;
314	ob->speed = 1.0;	296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
315	ob->direction = 5; /* So player faces south */	299	ob->direction = 5; /* So player faces south */
		300
		301	ob->flag [FLAG_READY_WEAPON] = false;
		302	ob->flag [FLAG_READY_SKILL] = false;
		303	ob->flag [FLAG_READY_BOW] = false;
		304
		305	for (object *op = ob->inv; op; op = op->below)
		306	if (op->flag [FLAG_APPLIED])
		307	switch (op->type)
		308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
		313	case WAND:
		314	case ROD:
		315	case HORN:
		316	case BOW:
		317	ranged_ob = op;
		318	break;
		319
		320	case WEAPON:
		321	combat_ob = op;
		322	break;
		323	}
		324
		325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
		326	ob->deactivate (); // change_Weapon activates, fix this better
		327	}
		328
		329	void
		330	player::set_observe (object *op)
		331	{
		332	observe = op ? op : ob;
		333	do_los = 1;
316	}	334	}
317		335
318	player::player ()	336	player::player ()
319	{	337	{
320	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
325	unapply = unapply_nochoice;	343	unapply = unapply_nochoice;
326		344
327	savebed_map = first_map_path; /* Init. respawn position */	345	savebed_map = first_map_path; /* Init. respawn position */
328		346
329	gen_sp_armour = 10;	347	gen_sp_armour = 10;
330	shoottype = range_none;
331	bowtype = bow_normal;	348	bowtype = bow_normal;
332	petmode = pet_normal;	349	petmode = pet_normal;
333	listening = 10;	350	listening = 10;
334	usekeys = containers;	351	usekeys = containers;
335	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
336	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
337	}	357	}
338		358
339	void	359	void
340	player::do_destroy ()	360	player::do_destroy ()
341	{	361	{
…		…
346	if (ob)	366	if (ob)
347	{	367	{
348	ob->destroy_inv (false);	368	ob->destroy_inv (false);
349	ob->destroy ();	369	ob->destroy ();
350	}	370	}
		371
		372	ob = observe = 0;
351	}	373	}
352		374
353	player::~player ()	375	player::~player ()
354	{	376	{
355	/* Clear item stack */	377	/* Clear item stack */
…		…
382	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
383	*/	405	*/
384	archetype *	406	archetype *
385	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
386	{	408	{
387	archetype *start = at;	409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
		415	archvec::iterator i = archetypes.find (nat);
388		416
389	for (;;)	417	for (;;)
390	{	418	{
391	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
392	at = first_archetype;	420	i = archetypes.begin ();
393	else	421	else if (*i == at)
394	at = at->next;	422	cleanup ("not a single player archetype found");
395		423
396	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
397	return at;	425	return *i;
398
399	if (at == start)
400	{
401	LOG (llevError, "No Player archetypes\n");
402	exit (-1);
403	}
404	}	426	}
405	}	427	}
406		428
407	object *	429	object *
408	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
412	unsigned lastdist;	434	unsigned lastdist;
413	rv_vector rv;	435	rv_vector rv;
414		436
415	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
416	{	438	{
417	/* We should not find free objects on this friendly list, but it
418	* does periodically happen. Given that, lets deal with it.
419	* While unlikely, it is possible the next object on the friendly
420	* list is also free, so encapsulate this in a while loop.
421	*/
422	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
423	{
424	object *tmp = ol->ob;
425
426	/* Can't do much more other than log the fact, because the object
427	* itself will have been cleared.
428	*/
429	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430	tmp->debug_desc ());
431	ol = ol->next;
432	remove_friendly_object (tmp);
433	if (!ol)
434	return op;
435	}
436
437	/* Remove special check for player from this. First, it looks to cause
438	* some crashes (ol->ob->contr not set properly?), but secondly, a more
439	* complicated method of state checking would be needed in any case -
440	* as it was, a clever player could type quit, and the function would
441	* skip them over while waiting for confirmation. Remove
442	* on_same_map check, as can_detect_enemy also does this
443	*/
444	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
445	continue;	440	continue;
446		441
447	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
448	{	443	{
…		…
643		638
644	return firstdir;	639	return firstdir;
645	}	640	}
646		641
647	void	642	void
648	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
649	{	644	{
650	object *op, *next = NULL;
651
652	if (pl->randomitems != NULL)	645	if (pl->randomitems)
653	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
654		647
655	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
656	{	649	{
657	next = op->below;	650	next = op->below;
658		651
659	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
660	* flag "neutral" set. Sorry but I can't think of a better way	653	* flag "neutral" set. Sorry but I can't think of a better way
…		…
665	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
666	* by this player due to race restrictions	659	* by this player due to race restrictions
667	*/	660	*/
668	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
669	{	662	{
670	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
671	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
672	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
673	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
674	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	669	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
675	{	670	{
676	op->destroy ();	671	op->destroy ();
677	continue;	672	continue;
678	}	673	}
679	}	674	}
…		…
702	if (op->nrof > 1)	697	if (op->nrof > 1)
703	op->nrof = 1;	698	op->nrof = 1;
704	}	699	}
705		700
706	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
707	{
708	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
709	}
710		703
711	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
712	* items. Just don't identify gold or silver, or it won't be	705	* items. Just don't identify gold or silver, or it won't be
713	* merged properly.	706	* merged properly.
714	*/	707	*/
715	if (need_identify (op))	708	if (need_identify (op))
716	{	709	{
717	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
718	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
719	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
720	}	713	}
		714
721	if (op->type == SPELL)	715	if (op->type == SPELL)
722	{	716	{
723	op->destroy ();	717	op->destroy ();
724	continue;	718	continue;
725	}	719	}
…		…
727	{	721	{
728	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
729	op->stats.exp = 0;	723	op->stats.exp = 0;
730	op->level = 1;	724	op->level = 1;
731	}	725	}
732	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
733	else
734	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
735	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
736		729
737	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
738	link_player_skills (pl);	731	link_player_skills (pl);
…		…
774	}	767	}
775		768
776	void	769	void
777	object::roll_stats ()	770	object::roll_stats ()
778	{	771	{
779	int statsort [7];	772	int statsort [NUM_STATS];
780		773
781	for (;;)	774	for (;;)
782	{	775	{
783	int sum = 0;	776	int sum = 0;
784	for (int i = 7; i--; )	777	for (int i = NUM_STATS; i--; )
785	sum += statsort [i] = roll_stat ();	778	sum += statsort [i] = roll_stat ();
786		779
787	if (sum >= 82 && sum <= 116)	780	if (sum >= 82 && sum <= 116)
788	break;	781	break;
789	}	782	}
790		783
791	// Sort the stats so that rerolling is easier...	784	// Sort the stats so that rerolling is easier...
792	std::sort (statsort, statsort + 7, std::greater<int>());	785	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
793		786
		787	for (int i = 0; i < NUM_STATS; ++i)
794	stats.Str = statsort[0];	788	stats.stat (i) = statsort [i];
795	stats.Dex = statsort[1];
796	stats.Con = statsort[2];
797	stats.Int = statsort[3];
798	stats.Wis = statsort[4];
799	stats.Pow = statsort[5];
800	stats.Cha = statsort[6];
801		789
802	stats.exp = 0;	790	stats.exp = 0;
803	stats.ac = 0;	791	stats.ac = 0;
804		792
805	stats.hp = stats.maxhp;	793	stats.hp = stats.maxhp;
…		…
817	}	805	}
818		806
819	void	807	void
820	object::swap_stats (int a, int b)	808	object::swap_stats (int a, int b)
821	{	809	{
822	int tmp = get_attr_value (&contr->orig_stats, a);	810	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
823	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
824	set_attr_value (&contr->orig_stats, b, tmp);
825		811
		812	for (int i = 0; i < NUM_STATS; ++i)
826	stats.Str = contr->orig_stats.Str;	813	stats.stat (i) = contr->orig_stats.stat (i);
827	stats.Dex = contr->orig_stats.Dex;
828	stats.Con = contr->orig_stats.Con;
829	stats.Int = contr->orig_stats.Int;
830	stats.Wis = contr->orig_stats.Wis;
831	stats.Pow = contr->orig_stats.Pow;
832	stats.Cha = contr->orig_stats.Cha;
833		814
834	//TODO: the following code looks so borked and should, at the very least,	815	//TODO: the following code looks so borked and should, at the very least,
835	// be merged with the similar code in roll_stats	816	// be merged with the similar code in roll_stats
836	stats.ac = 0;	817	stats.ac = 0;
837		818
…		…
856	static void	837	static void
857	start_info (object *op)	838	start_info (object *op)
858	{	839	{
859	char buf[MAX_BUF];	840	char buf[MAX_BUF];
860		841
861	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
862	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
863	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
864	//new_draw_info (NDI_UNIQUE, 0, op, " ");
865	}	844	}
866		845
867	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
868	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
869	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
910	if (*first_map_ext_path)	889	if (*first_map_ext_path)
911	{	890	{
912	object *tmp;	891	object *tmp;
913	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
914		893
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	894	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916	tmp = object::create ();	895	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
920	ob->enter_exit (tmp); /* we don't really care if it succeeded;	899	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
939	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
940		919
941	ob->remove_statbonus ();	920	ob->remove_statbonus ();
942	ob->remove ();	921	ob->remove ();
943	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
944	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
945	ob->instantiate ();	924	ob->instantiate ();
946	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
947	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
948	ob->x = x;	927	ob->x = x;
949	ob->y = y;	928	ob->y = y;
950	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
953	ob->add_statbonus ();	932	ob->add_statbonus ();
954	}	933	}
955	while (!allowed_class (ob));	934	while (!allowed_class (ob));
956		935
957	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1014	/* Cornered, get rid of scared */	993	/* Cornered, get rid of scared */
1015	CLEAR_FLAG (op, FLAG_SCARED);	994	CLEAR_FLAG (op, FLAG_SCARED);
1016	op->enemy = NULL;	995	op->enemy = NULL;
1017	}	996	}
1018		997
1019
1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.	998	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1021	* IT returns 1 if the player should keep on moving, 0 if he should	999	* It returns 1 if the player should keep on moving, 0 if he should
1022	* stop.	1000	* stop.
1023	*/	1001	*/
1024	int	1002	int
1025	check_pick (object *op)	1003	check_pick (object *op)
1026	{	1004	{
…		…
1033	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1034	return 1;	1012	return 1;
1035		1013
1036	next = op->below;	1014	next = op->below;
1037		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1038	/* loop while there are items on the floor that are not marked as	1019	/* loop while there are items on the floor that are not marked as
1039	* destroyed */	1020	* destroyed */
1040	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1041	{	1022	{
1042	tmp = next;	1023	tmp = next;
1043	next = tmp->below;	1024	next = tmp->below;
1044		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1045	if (op->destroyed ())	1032	if (op->destroyed ())
1046	return 0;	1033	return 0;
1047		1034
1048	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1049	continue;	1036	continue;
1050		1037
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	1039	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1055	continue;	1042	continue;
1056	}	1043	}
1057		1044
1058	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1059	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1061	switch (op->contr->mode)	1048	switch (op->contr->mode)
1062	{	1049	{
1063	case 0:	1050	case 0:
1064	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1065	case 1:	1052	case 1:
1066	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1067	return 1;	1054	return 1;
1068	case 2:	1055	case 2:
1069	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1070	return 0;	1057	return 0;
1071	case 3:	1058	case 3:
1072	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1073	case 4:	1060	case 4:
1074	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1075	break;	1062	break;
1076	case 5:	1063	case 5:
1077	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1078	stop = 1;	1065	stop = 1;
1079	break;	1066	break;
1080	case 6:	1067	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1083	break;	1071	break;
1084		1072
1085	case 7:	1073	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1088	break;	1076	break;
1089		1077
1090	default:	1078	default:
1091	/* use value density */	1079	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1081	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1095	}	1083	}
1096	}	1084	}
1097	else	1085	else
1098	{ /* old model */	1086	{ /* old model */
1099	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1103	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1093	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106	else	1094	else
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1096	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109		1097
1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111	}	1099	}
1112		1100
1113	/* philosophy:	1101	/* philosophy:
…		…
1154	/* all food and drink if desired */	1142	/* all food and drink if desired */
1155	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1156	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1157	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1158	{	1146	{
1159	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1160	continue;	1148	continue;
1161	}	1149	}
1162		1150
1163	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1164	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1152	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1165	{	1153	{
1166	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1167	continue;	1155	continue;
1168	}	1156	}
1169		1157
1170	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1171	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1172	{	1160	{
1173	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1174	continue;	1162	continue;
1175	}	1163	}
1176		1164
1177	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1180	{	1168	{
1181	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1182	continue;	1170	continue;
1183	}	1171	}
1184		1172
1185	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1187	{	1175	{
1188	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1189	continue;	1177	continue;
1190	}	1178	}
1191		1179
1192	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194	{	1182	{
1195	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1196	continue;	1184	continue;
1197	}	1185	}
1198		1186
1199	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{	1190	{
1203	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1204	continue;	1192	continue;
1205	}	1193	}
1206		1194
1207	/* pick up all magical items */	1195	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1197	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1210	{	1198	{
1211	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1212	continue;	1200	continue;
1213	}	1201	}
1214		1202
1215	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1216	{	1204	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1218	{	1206	{
1219	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1220	continue;	1208	continue;
1221	}	1209	}
1222	}	1210	}
1223		1211
1224	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1227	{	1215	{
1228	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1229	continue;	1217	continue;
1230	}	1218	}
1231		1219
1232	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1235	{	1223	{
1236	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1237	continue;	1225	continue;
1238	}	1226	}
1239		1227
1240	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1243	{	1231	{
1244	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1245	continue;	1233	continue;
1246	}	1234	}
1247		1235
1248	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1250	{	1238	{
1251	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1252	continue;	1240	continue;
1253	}	1241	}
1254		1242
1255	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1258	{	1246	{
1259	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1260	continue;	1248	continue;
1261	}	1249	}
1262		1250
1263	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1265	{	1253	{
1266	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1267	continue;	1255	continue;
1268	}	1256	}
1269		1257
1270	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1272	{	1260	{
1273	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1274	continue;	1262	continue;
1275	}	1263	}
1276		1264
1277	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1279	{	1267	{
1280	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1281	continue;	1269	continue;
1282	}	1270	}
1283		1271
1284	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1286	{	1274	{
1287	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1288	continue;	1276	continue;
1289	}	1277	}
1290		1278
1291	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1293	{	1281	{
1294	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1295	continue;	1283	continue;
1296	}	1284	}
1297		1285
1298	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{	1289	{
1302	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1303	continue;	1291	continue;
1304	}	1292	}
1305		1293
1306	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1308	{	1296	{
1309	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{	1298	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1299	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{	1301	{
1314	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1315	continue;	1303	continue;
1316	}	1304	}
1317	}	1305	}
1318		1306
1319	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{	1308	{
1321	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1309	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1310	{
1323	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1324	continue;	1312	continue;
1325	}	1313	}
1326	}	1314	}
1327	}	1315	}
1328		1316
1329	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{	1320	{
1333	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1334	continue;	1322	continue;
1335	}	1323	}
1336		1324
1337	/* any of the last 4 bits set means we use the ratio for value	1325	/* any of the last 4 bits set means we use the ratio for value
1338	* pickups */	1326	* pickups */
…		…
1343	/* >=7 is the old standard setting. Now we take the last 4 bits	1331	/* >=7 is the old standard setting. Now we take the last 4 bits
1344	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1346	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1334	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347	{	1335	{
1348	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1349	#if 0	1337	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1352	{	1340	{
1353	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1354	}	1342	}
1355	else	1343	else
1356	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1357	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1346	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1359	#endif	1347	#endif
1360	continue;	1348	continue;
1361	}	1349	}
…		…
1372	* found object is returned.	1360	* found object is returned.
1373	*/	1361	*/
1374	object *	1362	object *
1375	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1376	{	1364	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381	tmp = find_arrow (op, type);
1382	else if (op->type == ARROW && op->race == type)	1366	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1367	return splay (tmp);
		1368
		1369	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1370	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1371	if (object *arrow = find_arrow (tmp, type))
		1372	{
		1373	splay (tmp);
1383	return op;	1374	return arrow;
		1375	}
1384		1376
1385	return tmp;	1377	return 0;
1386	}	1378	}
1387		1379
1388	/*	1380	/*
1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1381	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1390	* against the target. A full test is not performed, simply a basic test	1382	* against the target. A full test is not performed, simply a basic test
…		…
1431	else	1423	else
1432	{	1424	{
1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1434	{	1426	{
1435	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1436	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1437	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1429	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1438	{	1430	{
1439	tmp = arrow;	1431	tmp = arrow;
1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1432	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1441	}	1433	}
1442	}	1434	}
1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1444	{	1436	{
1445	tmp = arrow;	1437	tmp = arrow;
…		…
1464	* find_better_arrow to find a decent arrow to use.	1456	* find_better_arrow to find a decent arrow to use.
1465	* op = the shooter	1457	* op = the shooter
1466	* type = bow->race	1458	* type = bow->race
1467	* dir = fire direction	1459	* dir = fire direction
1468	*/	1460	*/
1469
1470	object *	1461	object *
1471	pick_arrow_target (object *op, const char *type, int dir)	1462	pick_arrow_target (object *op, const char *type, int dir)
1472	{	1463	{
1473	object *tmp = NULL;	1464	object *tmp = NULL;
1474	maptile *m;	1465	maptile *m;
…		…
1539	*/	1530	*/
1540	int	1531	int
1541	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1532	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1542	{	1533	{
1543	object *left, *bow;	1534	object *left, *bow;
1544	int bowspeed, mflags;	1535	int mflags;
1545	maptile *m;	1536	maptile *m;
1546		1537
1547	if (!dir)	1538	if (!dir)
1548	{	1539	{
1549	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1540	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1550	return 0;	1541	return 0;
1551	}	1542	}
1552		1543
1553	if (op->type == PLAYER)	1544	if (op->contr)
1554	bow = op->contr->ranges[range_bow];	1545	bow = op->current_weapon;
1555	else	1546	else
1556	{	1547	{
1557	for (bow = op->inv; bow; bow = bow->below)	1548	for (bow = op->inv; bow; bow = bow->below)
1558	/* Don't check for applied - monsters don't apply bows - in that way, they	1549	/* Don't check for applied - monsters don't apply bows - in that way, they
1559	* don't need to switch back and forth between bows and weapons.	1550	* don't need to switch back and forth between bows and weapons.
…		…
1564	if (!bow)	1555	if (!bow)
1565	{	1556	{
1566	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1557	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567	return 0;	1558	return 0;
1568	}	1559	}
		1560
		1561	// optimisation: move object to top so we will find it quickly again
		1562	if (bow->below)
		1563	{
		1564	bow->remove ();
		1565	op->insert (bow);
		1566	}
		1567
1569	}	1568	}
1570		1569
1571	if (!bow->race || !bow->skill)	1570	if (!bow->race || !bow->skill)
1572	{	1571	{
1573	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1572	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1574	return 0;	1573	return 0;
1575	}	1574	}
1576
1577	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1578
1579	/* penalize ROF for bestarrow */
1580	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1581	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1582
1583	if (bowspeed < 1)
1584	bowspeed = 1;
1585		1575
1586	if (arrow == NULL)	1576	if (arrow == NULL)
1587	{	1577	{
1588	if ((arrow = find_arrow (op, bow->race)) == NULL)	1578	if ((arrow = find_arrow (op, bow->race)) == NULL)
1589	{	1579	{
…		…
1613	arrow->destroy ();	1603	arrow->destroy ();
1614	return 0;	1604	return 0;
1615	}	1605	}
1616		1606
1617	left = arrow; /* these are arrows left to the player */	1607	left = arrow; /* these are arrows left to the player */
1618	arrow = get_split_ob (arrow, 1);	1608	arrow = arrow->split ();
1619	if (!arrow)	1609	if (!arrow)
1620	{	1610	{
1621	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1611	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1622	return 0;	1612	return 0;
1623	}	1613	}
1624		1614
1625	arrow->set_owner (op);	1615	arrow->set_owner (op);
1626	arrow->skill = bow->skill;	1616	arrow->skill = bow->skill;
1627	arrow->direction = dir;	1617	arrow->direction = dir;
1628		1618
1629	if (op->type == PLAYER)
1630	{
1631	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1632	op->update_stats ();
1633	}
1634
1635	SET_ANIMATION (arrow, arrow->direction);
1636
1637	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1619	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1638	arrow->stats.hp = arrow->stats.dam;	1620	arrow->stats.hp = arrow->stats.dam;
1639	arrow->stats.grace = arrow->attacktype;	1621	arrow->stats.grace = arrow->attacktype;
1640		1622
1641	if (arrow->slaying)	1623	if (arrow->slaying)
1642	arrow->spellarg = strdup (arrow->slaying);	1624	arrow->spellarg = strdup (arrow->slaying);
1643		1625
1644	arrow->stats.dam += op->stats.dam + arrow->magic;	1626	#if 0
		1627	if (player *pl = op->contr)
		1628	{
		1629	float speed = pl->weapon_sp;
		1630
		1631	/* penalize ROF for bestarrow */
		1632	if (pl->bowtype == bow_bestarrow)
		1633	speed *= .9f;
		1634	else
		1635	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1636
		1637	op->speed_left += speed - op->speed;
		1638	}
		1639	#endif
		1640
		1641	SET_ANIMATION (arrow, arrow->direction);
1645		1642
1646	/* update the speed */	1643	/* update the speed */
1647	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1644	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1648	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1645	+ bow->stats.dam / 7.f;
1649		1646
1650	arrow->set_speed (max (arrow->speed, 1.0));	1647	arrow->set_speed (max (arrow->speed, 2.f));
1651	arrow->speed_left = 0;	1648	arrow->speed_left = 0;
1652		1649
1653	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1650	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654		1651
1655	if (op->type == PLAYER)	1652	if (op->type == PLAYER)
1656	{	1653	{
1657	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1654	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1658	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1655	wc -= dex_bonus[op->stats.Dex];
1659		1656
1660	if (!arrow->slaying)	1657	if (!arrow->slaying)
1661	arrow->slaying = op->slaying;	1658	arrow->slaying = op->slaying;
		1659
		1660	arrow->attacktype |= op->attacktype;
1662	}	1661	}
1663	else	1662	else
1664	{	1663	{
1665	arrow->level = op->level;	1664	arrow->level = op->level;
1666	arrow->stats.wc -= bow->magic;	1665	arrow->stats.wc -= bow->magic;
1667		1666
1668	if (!arrow->slaying)	1667	if (!arrow->slaying)
1669	arrow->slaying = bow->slaying;	1668	arrow->slaying = bow->slaying;
1670	}
1671		1669
1672	arrow->stats.wc -= arrow->level;
1673
1674	arrow->attacktype |= bow->attacktype;	1670	arrow->attacktype |= bow->attacktype;
		1671	}
1675		1672
		1673	wc -= arrow->level;
		1674	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1675
		1676	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1676	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1677	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1678		1679
1679	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	op->play_sound (sound_find ("fire_arrow"));
1680	m->insert (arrow, sx, sy, op);	1681	m->insert (arrow, sx, sy, op);
1681		1682
1682	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1683	move_arrow (arrow);	1684	move_arrow (arrow);
1684
1685	if (op->type == PLAYER)
1686	{
1687	if (left->destroyed ())
1688	esrv_del_item (op->contr, left->count);
1689	else
1690	esrv_send_item (op, left);
1691	}
1692		1685
1693	return 1;	1686	return 1;
1694	}	1687	}
1695		1688
1696	/* Special fire code for players - this takes into	1689	/* Special fire code for players - this takes into
…		…
1705	{	1698	{
1706	int ret = 0, wcmod = 0;	1699	int ret = 0, wcmod = 0;
1707		1700
1708	if (op->contr->bowtype == bow_bestarrow)	1701	if (op->contr->bowtype == bow_bestarrow)
1709	{	1702	{
1710	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1703	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1711	}	1704	}
1712	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1705	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1713	{	1706	{
1714	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1707	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1715	wcmod = -1;	1708	wcmod = -1;
…		…
1725	else if (op->contr->bowtype == bow_spreadshot)	1718	else if (op->contr->bowtype == bow_spreadshot)
1726	{	1719	{
1727	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1720	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1728	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1721	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1729	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1722	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1730
1731	}	1723	}
1732	else	1724	else
1733	{	1725	{
1734	/* Simple case */	1726	/* Simple case */
1735	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1727	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1736	}	1728	}
		1729
1737	return ret;	1730	return ret;
1738	}	1731	}
1739
1740		1732
1741	/* Fires a misc (wand/rod/horn) object in 'dir'.	1733	/* Fires a misc (wand/rod/horn) object in 'dir'.
1742	* Broken apart from 'fire' to keep it more readable.	1734	* Broken apart from 'fire' to keep it more readable.
1743	*/	1735	*/
1744	void	1736	void
1745	fire_misc_object (object *op, int dir)	1737	fire_misc_object (object *op, int dir)
1746	{	1738	{
1747	object *item;	1739	object *item = op->contr->ranged_ob;
1748		1740
1749	if (!op->contr->ranges[range_misc])	1741	if (!item)
1750	{	1742	{
1751	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1743	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1752	return;	1744	return;
1753	}	1745	}
1754		1746
1755	item = op->contr->ranges[range_misc];
1756	if (!item->inv)	1747	if (!item->inv)
1757	{	1748	{
1758	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1749	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1759	return;	1750	return;
1760	}	1751	}
		1752
		1753	if (!op->change_weapon (item))
		1754	return;
		1755
1761	if (item->type == WAND)	1756	if (item->type == WAND)
1762	{	1757	{
1763	if (item->stats.food <= 0)	1758	if (item->stats.food <= 0)
1764	{	1759	{
1765	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1760	op->contr->play_sound (sound_find ("wand_poof"));
1766	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1761	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1762
1767	return;	1763	return;
1768	}	1764	}
1769	}	1765	}
1770	else if (item->type == ROD || item->type == HORN)	1766	else if (item->type == ROD || item->type == HORN)
1771	{	1767	{
1772	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1768	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1773	{	1769	{
1774	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1770	op->contr->play_sound (sound_find ("wand_poof"));
		1771
1775	if (item->type == ROD)	1772	if (item->type == ROD)
1776	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1777	else	1774	else
1778	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1775	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1776
1779	return;	1777	return;
1780	}	1778	}
1781	}	1779	}
1782		1780
1783	if (cast_spell (op, item, dir, item->inv, NULL))	1781	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1790	object *tmp;	1788	object *tmp;
1791		1789
1792	if (item->arch)	1790	if (item->arch)
1793	{	1791	{
1794	CLEAR_FLAG (item, FLAG_ANIMATE);	1792	CLEAR_FLAG (item, FLAG_ANIMATE);
1795	item->face = item->arch->clone.face;	1793	item->face = item->arch->face;
1796	item->set_speed (0);	1794	item->set_speed (0);
1797	}	1795	}
1798		1796
1799	if ((tmp = item->in_player ()))	1797	if ((tmp = item->in_player ()))
1800	esrv_update_item (UPD_ANIM, tmp, item);	1798	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1805	}	1803	}
1806	}	1804	}
1807		1805
1808	/* Received a fire command for the player - go and do it.	1806	/* Received a fire command for the player - go and do it.
1809	*/	1807	*/
1810	void	1808	bool
1811	fire (object *op, int dir)	1809	fire (object *op, int dir)
1812	{	1810	{
1813	int spellcost = 0;	1811	int spellcost = 0;
1814		1812
1815	/* check for loss of invisiblity/hide */	1813	/* check for loss of invisiblity/hide */
1816	if (action_makes_visible (op))	1814	if (action_makes_visible (op))
1817	make_visible (op);	1815	make_visible (op);
1818		1816
1819	switch (op->contr->shoottype)	1817	player *pl = op->contr;
		1818
		1819	if (pl->golem)
		1820	{
		1821	control_golem (op->contr->golem, dir);
		1822	return false;
1820	{	1823	}
1821	case range_none:
1822	return;
1823		1824
1824	case range_bow:	1825	object *ob = pl->ranged_ob;
		1826
		1827	if (!ob)
		1828	return false;
		1829
		1830	if (!op->change_weapon (ob))
		1831	return false;
		1832
		1833	if (op->speed_left > 0.f)
		1834	--op->speed_left;
		1835	else
		1836	return false;
		1837
		1838	switch (ob->type)
		1839	{
		1840	case BOW:
1825	player_fire_bow (op, dir);	1841	player_fire_bow (op, dir);
1826	return;	1842	break;
1827		1843
1828	case range_magic: /* Casting spells */	1844	case SPELL:
1829	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1845	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1830	return;	1846	break;
1831		1847
1832	case range_misc:	1848	case BUILDER:
		1849	apply_map_builder (op, dir);
		1850	break;
		1851
		1852	case SKILL:
		1853	do_skill (op, op, ob, dir, 0);
		1854	break;
		1855
		1856	default:
1833	fire_misc_object (op, dir);	1857	fire_misc_object (op, dir);
1834	return;	1858	break;
1835
1836	case range_golem: /* Control summoned monsters from scrolls */
1837	control_golem (op->contr->ranges[range_golem], dir);
1838	return;
1839
1840	case range_skill:
1841	if (!op->chosen_skill)
1842	{
1843	if (op->type == PLAYER)
1844	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
1846	return;
1847	}
1848
1849	do_skill (op, op, op->chosen_skill, dir, NULL);
1850	return;
1851	case range_builder:
1852	apply_map_builder (op, dir);
1853	return;
1854	default:
1855	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1856	return;
1857	}	1859	}
		1860
		1861	return true;
1858	}	1862	}
1859		1863
1860	/* find_key	1864	/* find_key
1861	* We try to find a key for the door as passed. If we find a key	1865	* We try to find a key for the door as passed. If we find a key
1862	* and successfully use it, we return the key, otherwise NULL	1866	* and successfully use it, we return the key, otherwise NULL
…		…
1949	* 0 otherwise	1953	* 0 otherwise
1950	*/	1954	*/
1951	static int	1955	static int
1952	player_attack_door (object *op, object *door)	1956	player_attack_door (object *op, object *door)
1953	{	1957	{
1954	/* If its a door, try to find a use a key. If we do destroy the door,	1958	/* If its a door, try to find a key. If we do destroy the door,
1955	* might as well return immediately as there is nothing more to do -	1959	* might as well return immediately as there is nothing more to do -
1956	* otherwise, we fall through to the rest of the code.	1960	* otherwise, we fall through to the rest of the code.
1957	*/	1961	*/
1958	object *key = find_key (op, op, door);	1962	object *key = find_key (op, op, door);
1959		1963
1960	/* IF we found a key, do some extra work */	1964	/* If we found a key, do some extra work */
1961	if (key)	1965	if (key)
1962	{	1966	{
1963	object *container = key->env;	1967	object *container = key->env;
1964
1965	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1966		1968
1967	if (action_makes_visible (op))	1969	if (action_makes_visible (op))
1968	make_visible (op);	1970	make_visible (op);
1969		1971
1970	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1972	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1972		1974
1973	if (door->type == DOOR)	1975	if (door->type == DOOR)
1974	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1976	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1975	else if (door->type == LOCKED_DOOR)	1977	else if (door->type == LOCKED_DOOR)
1976	{	1978	{
1977	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1979	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1978	remove_door2 (door); /* remove door without violence ;-) */	1980	remove_door2 (door); /* remove door without violence ;-) */
1979	}	1981	}
1980		1982
1981	/* Do this after we print the message */	1983	/* Do this after we print the message */
1982	decrease_ob (key); /* Use up one of the keys */	1984	key->decrease (); /* Use up one of the keys */
1983	/* Need to update the weight the container the key was in */	1985	/* Need to update the weight the container the key was in */
1984	if (container != op)	1986	if (container != op)
1985	esrv_update_item (UPD_WEIGHT, op, container);	1987	esrv_update_item (UPD_WEIGHT, op, container);
1986		1988
1987	return 1; /* Nothing more to do below */	1989	return 1; /* Nothing more to do below */
1988	}	1990	}
1989	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
1990	{	1992	{
1991	/* Might as well return now - no other way to open this */	1993	/* Might as well return now - no other way to open this */
1992	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1994	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
1993	return 1;	1995	return 1;
1994	}	1996	}
1995		1997
1996	return 0;	1998	return 0;
1997	}	1999	}
…		…
2000	* It should keep the code cleaner.	2002	* It should keep the code cleaner.
2001	* When this is called, the players direction has been updated	2003	* When this is called, the players direction has been updated
2002	* (taking into account confusion.) The player is also actually	2004	* (taking into account confusion.) The player is also actually
2003	* going to try and move (not fire weapons).	2005	* going to try and move (not fire weapons).
2004	*/	2006	*/
2005	void	2007	bool
2006	move_player_attack (object *op, int dir)	2008	move_player_attack (object *op, int dir)
2007	{	2009	{
2008	object *tmp, *mon;
2009	int on_battleground;	2010	int on_battleground;
2010	maptile *m;
2011		2011
2012	sint16 nx = freearr_x[dir] + op->x;	2012	sint16 nx = freearr_x[dir] + op->x;
2013	sint16 ny = freearr_y[dir] + op->y;	2013	sint16 ny = freearr_y[dir] + op->y;
2014		2014
2015	on_battleground = op_on_battleground (op, 0, 0);	2015	on_battleground = op_on_battleground (op, 0, 0);
		2016
		2017	if (out_of_map (op->map, nx, ny))
		2018	return false;
		2019
		2020	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2021	{
		2022	--op->speed_left;
		2023	return true;
		2024	}
2016		2025
2017	/* If braced, or can't move to the square, and it is not out of the	2026	/* If braced, or can't move to the square, and it is not out of the
2018	* map, attack it. Note order of if statement is important - don't	2027	* map, attack it. Note order of if statement is important - don't
2019	* want to be calling move_ob if braced, because move_ob will move the	2028	* want to be calling move_ob if braced, because move_ob will move the
2020	* player. This is a pretty nasty hack, because if we could	2029	* player. This is a pretty nasty hack, because if we could
2021	* move to some space, it then means that if we are braced, we should	2030	* move to some space, it then means that if we are braced, we should
2022	* do nothing at all. As it is, if we are braced, we go through	2031	* do nothing at all. As it is, if we are braced, we go through
2023	* quite a bit of processing. However, it probably is less than what	2032	* quite a bit of processing. However, it probably is less than what
2024	* move_ob uses.	2033	* move_ob uses.
2025	*/	2034	*/
2026	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2027	{
2028	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2029	{
2030	m = op->map->xy_find (nx, ny);	2035	maptile *m = op->map->xy_find (nx, ny);
2031	if (!m)
2032	return; /* Don't think this should happen */
2033	}
2034	else
2035	m = op->map;
2036		2036
2037	if (!(tmp = m->at (nx, ny).bot))
2038	return;
2039
2040	mon = 0;
2041	/* Go through all the objects, and find ones of interest. Only stop if	2037	/* Go through all the objects, and find ones of interest. Only stop if
2042	* we find a monster - that is something we know we want to attack.	2038	* we find a monster - that is something we know we want to attack.
2043	* if its a door or barrel (can roll) see if there may be monsters	2039	* if its a door or barrel (can roll) see if there may be monsters
2044	* on the space	2040	* on the space
2045	*/	2041	*/
2046	while (tmp)	2042	object *mon;
2047	{	2043	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2048	if (tmp == op)	2044	{
2049	{	2045	if ((mon->flag [FLAG_ALIVE]
2050	tmp = tmp->above;	2046	|| mon->type == LOCKED_DOOR
2051	continue;	2047	|| mon->flag [FLAG_CAN_ROLL])
2052	}
2053
2054	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2055	{
2056	mon = tmp;	2048	&& mon != op)
2057	break;	2049	break;
2058	}	2050	}
2059		2051
2060	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2061	mon = tmp;
2062
2063	tmp = tmp->above;
2064	}
2065
2066	if (!mon) /* This happens anytime the player tries to move */	2052	if (!mon) /* This happens anytime the player tries to move */
2067	return; /* into a wall */	2053	return false; /* into a wall */
2068		2054
2069	if (mon->head)
2070	mon = mon->head;	2055	mon = mon->head_ ();
2071		2056
2072	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2057	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2058	if (op->contr->weapon_sp_left > 0.f)
2073	if (player_attack_door (op, mon))	2059	if (player_attack_door (op, mon))
		2060	{
		2061	--op->contr->weapon_sp_left;
2074	return;	2062	return true;
		2063	}
2075		2064
2076	/* The following deals with possibly attacking peaceful	2065	/* The following deals with possibly attacking peaceful
2077	* or frienddly creatures. Basically, all players are considered	2066	* or friendly creatures. Basically, all players are considered
2078	* unaggressive. If the moving player has peaceful set, then the	2067	* unaggressive. If the moving player has peaceful set, then the
2079	* object should be pushed instead of attacked. It is assumed that	2068	* object should be pushed instead of attacked. It is assumed that
2080	* if you are braced, you will not attack friends accidently,	2069	* if you are braced, you will not attack friends accidently,
2081	* and thus will not push them.	2070	* and thus will not push them.
2082	*/	2071	*/
2083		2072
2084	/* If the creature is a pet, push it even if the player is not	2073	/* If the creature is a pet, push it even if the player is not
2085	* peaceful. Our assumption is the creature is a pet if the	2074	* peaceful. Our assumption is the creature is a pet if the
2086	* player owns it and it is either friendly or unagressive.	2075	* player owns it and it is either friendly or unagressive.
2087	*/	2076	*/
2088	if ((op->type == PLAYER)	2077	if (op->type == PLAYER
2089	#if COZY_SERVER
2090	&&
2091	((mon->owner && mon->owner->contr	2078	&& ((mon->owner && mon->owner->contr
2092	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2079	&& same_party (mon->owner->contr->party, op->contr->party))
2093	#else
2094	&& mon->owner == op	2080	|| mon->owner == op)
2095	#endif
2096	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2081	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2097	{	2082	{
2098	/* If we're braced, we don't want to switch places with it */	2083	/* If we're braced, we don't want to switch places with it */
2099	if (op->contr->braced)	2084	if (op->contr->braced)
2100	return;	2085	return false;
2101		2086
2102	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2087	if (op->speed_left > 0.f)
		2088	{
		2089	--op->speed_left;
		2090
		2091	op->play_sound (sound_find ("push_player"));
2103	push_ob (mon, dir, op);	2092	push_ob (mon, dir, op);
		2093
2104	if (op->contr->tmp_invis || op->hide)	2094	if (op->contr->tmp_invis || op->hide)
2105	make_visible (op);	2095	make_visible (op);
2106		2096
2107	return;	2097	return true;
2108	}	2098	}
		2099	else
		2100	return false;
		2101	}
2109		2102
2110	/* in certain circumstances, you shouldn't attack friendly	2103	/* in certain circumstances, you shouldn't attack friendly
2111	* creatures. Note that if you are braced, you can't push	2104	* creatures. Note that if you are braced, you can't push
2112	* someone, but put it inside this loop so that you won't	2105	* someone, but put it inside this loop so that you won't
2113	* attack them either.	2106	* attack them either.
2114	*/	2107	*/
2115	if ((mon->type == PLAYER || mon->enemy != op) &&	2108	if ((mon->type == PLAYER || mon->enemy != op)
2116	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2109	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2117	#ifdef PROHIBIT_PLAYERKILL
2118	(op->contr->peaceful	2110	&& ((op->contr->peaceful
2119	|| (mon->type == PLAYER	2111	|| (mon->type == PLAYER && mon->contr->peaceful))
2120	&& mon->contr->
2121	peaceful)) &&
2122	#else
2123	op->contr->peaceful &&
2124	#endif
2125	!on_battleground))	2112	&& !on_battleground))
		2113	{
		2114	if (op->speed_left > 0.f)
2126	{	2115	{
		2116	--op->speed_left;
		2117
2127	if (!op->contr->braced)	2118	if (!op->contr->braced)
2128	{	2119	{
2129	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2120	op->play_sound (sound_find ("push_player"));
2130	push_ob (mon, dir, op);	2121	push_ob (mon, dir, op);
2131	}	2122	}
2132	else	2123	else
2133	new_draw_info (0, 0, op, "You withhold your attack");	2124	op->statusmsg ("You withhold your attack");
2134		2125
2135	if (op->contr->tmp_invis || op->hide)	2126	if (op->contr->tmp_invis || op->hide)
2136	make_visible (op);	2127	make_visible (op);
2137	}
2138		2128
		2129	return true;
		2130	}
		2131	}
2139	/* If the object is a boulder or other rollable object, then	2132	/* If the object is a boulder or other rollable object, then
2140	* roll it if not braced. You can't roll it if you are braced.	2133	* roll it if not braced. You can't roll it if you are braced.
2141	*/	2134	*/
2142	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2135	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2136	{
		2137	if (op->speed_left > 0.f)
2143	{	2138	{
		2139	--op->speed_left;
		2140
2144	recursive_roll (mon, dir, op);	2141	recursive_roll (mon, dir, op);
2145	if (action_makes_visible (op))	2142	if (action_makes_visible (op))
2146	make_visible (op);	2143	make_visible (op);
2147	}
2148		2144
		2145	return true;
		2146	}
		2147	}
2149	/* Any generic living creature. Including things like doors.	2148	/* Any generic living creature. Including things like doors.
2150	* Way it works is like this: First, it must have some hit points	2149	* Way it works is like this: First, it must have some hit points
2151	* and be living. Then, it must be one of the following:	2150	* and be living. Then, it must be one of the following:
2152	* 1) Not a player, 2) A player, but of a different party. Note	2151	* 1) Not a player, 2) A player, but of a different party. Note
2153	* that party_number -1 is no party, so attacks can still happen.	2152	* that party_number -1 is no party, so attacks can still happen.
2154	*/	2153	*/
2155	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2154	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2156	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2155	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2157	{	2156	{
2158		2157	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2159	/* If the player hasn't hit something this tick, and does
2160	* so, give them speed boost based on weapon speed. Doing
2161	* it here is better than process_players2, which basically
2162	* incurred a 1 tick offset.
2163	*/
2164	if (!op->contr->has_hit)
2165	{	2158	{
2166	op->speed_left += op->speed / op->contr->weapon_sp;	2159	--op->contr->weapon_sp_left;
2167
2168	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2169	}
2170		2160
2171	skill_attack (mon, op, 0, 0, 0);	2161	skill_attack (mon, op, 0, 0, 0);
2172
2173	/* If attacking another player, that player gets automatic
2174	* hitback, and doesn't loose luck either.
2175	* Disable hitback on the battleground or if the target is
2176	* the wiz.
2177	*/
2178	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2179	{
2180	short luck = mon->stats.luck;
2181
2182	mon->contr->has_hit = 1;
2183	skill_attack (op, mon, 0, 0, 0);
2184	mon->stats.luck = luck;
2185	}
2186		2162
2187	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2188	make_visible (op);	2164	make_visible (op);
2189	}
2190	} /* if player should attack something */
2191	}
2192		2165
2193	int	2166	return true;
		2167	}
		2168	}
		2169
		2170	return false;
		2171	}
		2172
		2173	bool
2194	move_player (object *op, int dir)	2174	move_player (object *op, int dir)
2195	{	2175	{
2196	int pick;	2176	int pick;
2197		2177
2198	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2178	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2199	return 0;	2179	return 0;
2200		2180
2201	/* Sanity check: make sure dir is valid */	2181	/* Sanity check: make sure dir is valid */
2202	if ((dir < 0) || (dir >= 9))	2182	if ((dir < 0) || (dir >= 9))
2203	{	2183	{
…		…
2212	op->facing = dir;	2192	op->facing = dir;
2213		2193
2214	if (op->hide)	2194	if (op->hide)
2215	do_hidden_move (op);	2195	do_hidden_move (op);
2216		2196
		2197	bool retval;
		2198
2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2199	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2218	/*nop */ ;	2200	retval = RESULT_INT (0);
2219	else if (op->contr->fire_on)	2201	else if (op->contr->fire_on)
2220	fire (op, dir);	2202	retval = fire (op, dir);
2221	else	2203	else
2222	{	2204	{
2223	move_player_attack (op, dir);	2205	retval = move_player_attack (op, dir);
2224	pick = check_pick (op);	2206	pick = check_pick (op);
2225	}	2207	}
2226		2208
2227	/* Add special check for newcs players and fire on - this way, the	2209	/* Add special check for newcs players and fire on - this way, the
2228	* server can handle repeat firing.	2210	* server can handle repeat firing.
…		…
2235	/* Update how the player looks. Use the facing, so direction may	2217	/* Update how the player looks. Use the facing, so direction may
2236	* get reset to zero. This allows for full animation capabilities	2218	* get reset to zero. This allows for full animation capabilities
2237	* for players.	2219	* for players.
2238	*/	2220	*/
2239	animate_object (op, op->facing);	2221	animate_object (op, op->facing);
2240	return 0;	2222
		2223	return retval;
2241	}	2224	}
2242		2225
2243	/* This is similar to handle_player, below, but is only used by the	2226	/* This is similar to handle_player, below, but is only used by the
2244	* new client/server stuff.	2227	* new client/server stuff.
2245	* This is sort of special, in that the new client/server actually uses	2228	* This is sort of special, in that the new client/server actually uses
2246	* the new speed values for commands.	2229	* the new speed values for commands.
2247	*	2230	*
2248	* Returns true if there are more actions we can do.	2231	* Returns true if there are more actions we can do. Should not do
		2232	* many actions in a row, as that would be too unfair to other
		2233	* players.
2249	*/	2234	*/
2250	int	2235	bool
2251	handle_newcs_player (object *op)	2236	handle_newcs_player (object *op)
2252	{	2237	{
2253	if (QUERY_FLAG (op, FLAG_SCARED))	2238	if (QUERY_FLAG (op, FLAG_SCARED))
2254	{	2239	{
2255	flee_player (op);	2240	if (op->speed_left > 0.f)
2256	/* If player is still scared, that is his action for this tick */
2257	if (QUERY_FLAG (op, FLAG_SCARED))
2258	{	2241	{
2259	op->speed_left--;	2242	--op->speed_left;
		2243	flee_player (op);
		2244
2260	return 0;	2245	return true;
2261	}	2246	}
		2247	else
		2248	return false;
2262	}	2249	}
2263		2250
2264	/* call this here - we also will call this in do_ericserver, but	2251	/* call this here - we also will call this in do_ericserver, but
2265	* the players time has been increased when doericserver has been	2252	* the players time has been increased when doericserver has been
2266	* called, so we recheck it here.	2253	* called, so we recheck it here.
2267	*/	2254	*/
2268	if (op->contr->ns->handle_command ())	2255	if (op->contr->ns->handle_command ())
2269	return 1;	2256	return true;
2270		2257
2271	if (op->speed_left > 0)
2272	{
2273	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2258	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2274	{
2275	/* All move commands take 1 tick, at least for now */
2276	op->speed_left--;
2277
2278	/* Instead of all the stuff below, let move_player take care
2279	* of it. Also, some of the skill stuff is only put in
2280	* there, as well as the confusion stuff.
2281	*/
2282	move_player (op, op->direction);	2259	return move_player (op, op->direction);
2283		2260
2284	return op->speed_left > 0;
2285	}
2286	}
2287
2288	return 0;	2261	return false;
2289	}	2262	}
2290		2263
2291	int	2264	int
2292	save_life (object *op)	2265	save_life (object *op)
2293	{	2266	{
…		…
2295	return 0;	2268	return 0;
2296		2269
2297	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2270	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2298	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2271	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2299	{	2272	{
2300	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2273	op->play_sound (sound_find ("ob_evaporate"));
2301	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2274	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2302		2275
2303	if (op->contr)	2276	if (op->contr)
2304	esrv_del_item (op->contr, tmp->count);	2277	esrv_del_item (op->contr, tmp->count);
2305		2278
…		…
2325	/* This goes throws the inventory and removes unpaid objects, and puts them	2298	/* This goes throws the inventory and removes unpaid objects, and puts them
2326	* back in the map (location and map determined by values of env). This	2299	* back in the map (location and map determined by values of env). This
2327	* function will descend into containers. op is the object to start the search	2300	* function will descend into containers. op is the object to start the search
2328	* from.	2301	* from.
2329	*/	2302	*/
2330	void	2303	static void
2331	remove_unpaid_objects (object *op, object *env)	2304	drop_unpaid_items (object *op, object *env)
2332	{	2305	{
2333	while (op)	2306	while (op)
2334	{	2307	{
2335	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2308	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2336		2309
…		…
2340	esrv_del_item (env->contr, op->count);	2313	esrv_del_item (env->contr, op->count);
2341		2314
2342	op->insert_at (env);	2315	op->insert_at (env);
2343	}	2316	}
2344	else if (op->inv)	2317	else if (op->inv)
2345	remove_unpaid_objects (op->inv, env);	2318	drop_unpaid_items (op->inv, env);
2346		2319
2347	op = next;	2320	op = next;
2348	}	2321	}
		2322	}
		2323
		2324	void
		2325	object::drop_unpaid_items ()
		2326	{
		2327	if (!flag [FLAG_REMOVED])
		2328	::drop_unpaid_items (inv, this);
2349	}	2329	}
2350		2330
2351	/*	2331	/*
2352	* Returns pointer a static string containing gravestone text	2332	* Returns pointer a static string containing gravestone text
2353	* Moved from apply.c to player.c - player.c is what	2333	* Moved from apply.c to player.c - player.c is what
…		…
2448	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2428	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2449	else	2429	else
2450	{	2430	{
2451	gen_grace = op->stats.maxgrace;	2431	gen_grace = op->stats.maxgrace;
2452	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2432	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2453	}
2454
2455	/* Regenerate Spell Points */
2456	if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2457	{
2458	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2459	if (op->stats.sp < op->stats.maxsp)
2460	{
2461	op->stats.sp++;
2462	/* dms do not consume food */
2463	if (!QUERY_FLAG (op, FLAG_WIZ))
2464	{
2465	op->stats.food--;
2466	if (op->contr->digestion < 0)
2467	op->stats.food += op->contr->digestion;
2468	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2469	op->stats.food = last_food;
2470	}
2471	}
2472
2473	if (max_sp > 1)
2474	{
2475	over_sp = (gen_sp + 10) / rate_sp;
2476	if (over_sp > 0)
2477	{
2478	if (op->stats.sp < op->stats.maxsp)
2479	{
2480	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2481
2482	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2483	op->stats.sp--;
2484
2485	if (op->stats.sp > op->stats.maxsp)
2486	op->stats.sp = op->stats.maxsp;
2487	}
2488	op->last_sp = 0;
2489	}
2490	else
2491	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2492	}
2493	else
2494	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2495	}	2433	}
2496		2434
2497	/* Regenerate Grace */	2435	/* Regenerate Grace */
2498	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2436	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2499	if (--op->last_grace < 0)	2437	if (--op->last_grace < 0)
…		…
2520	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2458	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2521	}	2459	}
2522	/* wearing stuff doesn't detract from grace generation. */	2460	/* wearing stuff doesn't detract from grace generation. */
2523	}	2461	}
2524		2462
		2463	if (op->stats.food > 0)
		2464	{
2525	/* Regenerate Hit Points */	2465	/* Regenerate Spell Points */
2526	if (--op->last_heal < 0)	2466	if (!op->contr->golem && --op->last_sp < 0)
2527	{
2528	if (op->stats.hp < op->stats.maxhp)
2529	{	2467	{
2530	op->stats.hp++;	2468	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2531	/* dms do not consume food */	2469
2532	if (!QUERY_FLAG (op, FLAG_WIZ))	2470	if (op->stats.sp < op->stats.maxsp)
2533	{	2471	{
		2472	op->stats.sp++;
		2473
		2474	/* dms do not consume food */
		2475	if (!QUERY_FLAG (op, FLAG_WIZ))
		2476	{
2534	op->stats.food--;	2477	op->stats.food--;
		2478
2535	if (op->contr->digestion < 0)	2479	if (op->contr->digestion < 0)
2536	op->stats.food += op->contr->digestion;	2480	op->stats.food += op->contr->digestion;
2537	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2481	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2538	op->stats.food = last_food;	2482	op->stats.food = last_food;
		2483	}
2539	}	2484	}
2540	}
2541		2485
2542	if (max_hp > 1)	2486	if (max_sp > 1)
2543	{
2544	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2545	if (over_hp > 0)
2546	{	2487	{
2547	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2488	over_sp = (gen_sp + 10) / rate_sp;
		2489	if (over_sp > 0)
		2490	{
		2491	if (op->stats.sp < op->stats.maxsp)
		2492	{
		2493	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2494
		2495	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2496	op->stats.sp--;
		2497
		2498	if (op->stats.sp > op->stats.maxsp)
		2499	op->stats.sp = op->stats.maxsp;
		2500	}
		2501
2548	op->last_heal = 0;	2502	op->last_sp = 0;
		2503	}
		2504	else
		2505	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2549	}	2506	}
2550	else	2507	else
		2508	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2509	}
		2510
		2511	/* Regenerate Hit Points */
		2512	if (--op->last_heal < 0)
		2513	{
		2514	if (op->stats.hp < op->stats.maxhp)
2551	{	2515	{
2552	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2516	op->stats.hp++;
		2517
		2518	/* dms do not consume food */
		2519	if (!QUERY_FLAG (op, FLAG_WIZ))
		2520	{
		2521	op->stats.food--;
		2522
		2523	if (op->contr->digestion < 0)
		2524	op->stats.food += op->contr->digestion;
		2525	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2526	op->stats.food = last_food;
		2527	}
2553	}	2528	}
		2529
		2530	if (max_hp > 1)
		2531	{
		2532	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2533
		2534	if (over_hp > 0)
		2535	{
		2536	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2537	op->last_heal = 0;
		2538	}
		2539	else
		2540	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2554	}	2541	}
2555	else	2542	else
2556	{
2557	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2543	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2558	}	2544	}
2559	}	2545	}
2560		2546
2561	/* Digestion */	2547	/* Digestion */
2562	if (--op->last_eat < 0)	2548	if (--op->last_eat < 0)
2563	{	2549	{
2564	#ifdef COZY_SERVER	2550	int bonus = max (0, op->contr->digestion),
2565	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2551	penalty = max (0, -op->contr->digestion);
2566	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2567	#else
2568	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2569	#endif
2570		2552
2571	if (op->contr->gen_hp > 0)
2572	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2553	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2573	else
2574	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2575		2554
2576	/* dms do not consume food */	2555	/* dms do not consume food */
2577	if (!QUERY_FLAG (op, FLAG_WIZ))	2556	if (!QUERY_FLAG (op, FLAG_WIZ))
2578	op->stats.food--;	2557	op->stats.food--;
2579	}	2558	}
…		…
2606	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2585	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2607	manual_apply (op, flesh, 0);	2586	manual_apply (op, flesh, 0);
2608	}	2587	}
2609	}	2588	}
2610		2589
2611	while (op->stats.food < 0 && op->stats.hp >= 0)	2590	if (op->stats.food < 0)
2612	op->stats.food++, op->stats.hp--;	2591	{
		2592	op->stats.hp += op->stats.food;
		2593	op->stats.food = 0;
		2594	}
2613		2595
2614	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2615	kill_player (op);	2597	kill_player (op);
2616	}	2598	}
2617	}	2599	}
…		…
2622	* file.	2604	* file.
2623	*/	2605	*/
2624	void	2606	void
2625	kill_player (object *op)	2607	kill_player (object *op)
2626	{	2608	{
		2609	int x, y;
2627	char buf[MAX_BUF];	2610	char buf[MAX_BUF];
2628	int x, y;
2629
2630	//int i;
2631	maptile *map; /* this is for resurrection */	2611	maptile *map; /* this is for resurrection */
2632
2633	/* int z;
2634	int num_stats_lose;
2635	int lost_a_stat;
2636	int lose_this_stat;
2637	int this_stat; */
2638	int will_kill_again;	2612	int will_kill_again;
2639	archetype *at;	2613	archetype *at;
2640	object *tmp;	2614	object *tmp;
2641		2615
2642	if (save_life (op))	2616	if (save_life (op))
2643	return;	2617	return;
2644
2645		2618
2646	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2619	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2647	* in cities ONLY!!! It is very important that this doesn't get abused.	2620	* in cities ONLY!!! It is very important that this doesn't get abused.
2648	* Look at op_on_battleground() for more info --AndreasV	2621	* Look at op_on_battleground() for more info --AndreasV
2649	*/	2622	*/
…		…
2665	{	2638	{
2666	tmp->destroy ();	2639	tmp->destroy ();
2667	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2640	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2668	}	2641	}
2669		2642
2670	cure_disease (op, 0); /* remove any disease */	2643	cure_disease (op, 0, 0); /* remove any disease */
2671	op->stats.hp = op->stats.maxhp;	2644	op->stats.hp = op->stats.maxhp;
2672	if (op->stats.food <= 0)	2645	if (op->stats.food <= 0)
2673	op->stats.food = 999;	2646	op->stats.food = 999;
2674		2647
2675	/* create a bodypart-trophy to make the winner happy */	2648	/* create a bodypart-trophy to make the winner happy */
2676	if (object *tmp = arch_to_object (archetype::find ("finger")))	2649	if (object *tmp = arch_to_object (archetype::find ("finger")))
2677	{	2650	{
2678	sprintf (buf, "%s's finger", &op->name);	2651	tmp->name = format ("%s's finger" , &op->name);
2679	tmp->name = buf;	2652	tmp->name_pl = format ("%s's fingers", &op->name);
2680	sprintf (buf, " This finger has been cut off %s\n"	2653	tmp->msg = format (
2681	" the %s, when he was defeated at\n level %d by %s.\n",	2654	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2682	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2655	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2683	tmp->msg = buf;	2656	);
2684	tmp->value = 0, tmp->type = 0;	2657	tmp->value = 0, tmp->type = 0;
2685	tmp->materialname = "organics";	2658	tmp->materialname = "organics";
2686	tmp->insert_at (op, tmp);	2659	tmp->insert_at (op, tmp);
2687	}	2660	}
2688		2661
…		…
2695	INVOKE_PLAYER (DEATH, op->contr);	2668	INVOKE_PLAYER (DEATH, op->contr);
2696		2669
2697	command_kill_pets (op, 0);	2670	command_kill_pets (op, 0);
2698		2671
2699	if (op->stats.food < 0)	2672	if (op->stats.food < 0)
2700	{
2701	sprintf (buf, "%s starved to death.", &op->name);
2702	strcpy (op->contr->killer, "starvation");	2673	strcpy (op->contr->killer, "starvation");
2703	}
2704	else
2705	sprintf (buf, "%s died.", &op->name);
2706		2674
2707	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2675	op->contr->play_sound (sound_find ("player_dies"));
2708		2676
2709	/* save the map location for corpse, gravestone */	2677	/* save the map location for corpse, gravestone */
2710	x = op->x;	2678	x = op->x;
2711	y = op->y;	2679	y = op->y;
2712	map = op->map;	2680	map = op->map;
…		…
2875	{	2843	{
2876	tmp->destroy ();	2844	tmp->destroy ();
2877	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2845	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2878	}	2846	}
2879		2847
2880	cure_disease (op, 0); /* remove any disease */	2848	cure_disease (op, 0, 0); /* remove any disease */
2881		2849
2882	/*add_exp(op, (op->stats.exp * -0.20)); */	2850	/*add_exp(op, (op->stats.exp * -0.20)); */
2883	apply_death_exp_penalty (op);	2851	apply_death_exp_penalty (op);
2884	if (op->stats.food < 100)	2852	if (op->stats.food < 100)
2885	op->stats.food = 900;	2853	op->stats.food = 900;
…		…
2889		2857
2890	/*	2858	/*
2891	* Check to see if the player has any unpaid items. If so, remove them	2859	* Check to see if the player has any unpaid items. If so, remove them
2892	* and put them back in the map.	2860	* and put them back in the map.
2893	*/	2861	*/
2894	remove_unpaid_objects (op->inv, op);	2862	op->drop_unpaid_items ();
2895		2863
2896	/****************************************/	2864	/****************************************/
2897	/* */	2865	/* */
2898	/* Move player to his current respawn- */	2866	/* Move player to his current respawn- */
2899	/* position (usually last savebed) */	2867	/* position (usually last savebed) */
…		…
2919	object *force;	2887	object *force;
2920	int at;	2888	int at;
2921		2889
2922	force = get_archetype (FORCE_NAME);	2890	force = get_archetype (FORCE_NAME);
2923	/* 50 ticks should be enough time for the spell to abate */	2891	/* 50 ticks should be enough time for the spell to abate */
2924	force->speed = 0.1;	2892	force->speed = 0.1f;
2925	force->speed_left = -5.0;	2893	force->speed_left = -5.f;
2926	SET_FLAG (force, FLAG_APPLIED);	2894	SET_FLAG (force, FLAG_APPLIED);
2927	for (at = 0; at < NROFATTACKS; at++)	2895	for (at = 0; at < NROFATTACKS; at++)
2928	if (will_kill_again & (1 << at))	2896	if (will_kill_again & (1 << at))
2929	force->resist[at] = 100;	2897	force->resist[at] = 100;
2930		2898
…		…
2958		2926
2959	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2927	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2960	{	2928	{
2961	if (tmp->nrof > 1)	2929	if (tmp->nrof > 1)
2962	{	2930	{
2963	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2931	tmp->decrease (rndm (1, tmp->nrof - 1));
2964	tmp2->destroy ();
2965	insert_ob_in_map (tmp, op->map, NULL, 0);	2932	insert_ob_in_map (tmp, op->map, NULL, 0);
2966	}	2933	}
2967	else	2934	else
2968	tmp->destroy ();	2935	tmp->destroy ();
2969	}	2936	}
…		…
2980	void	2947	void
2981	fix_weight (void)	2948	fix_weight (void)
2982	{	2949	{
2983	for_all_players (pl)	2950	for_all_players (pl)
2984	{	2951	{
2985	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2952	sint32 old = pl->ob->carrying;
2986		2953
2987	if (old == sum)	2954	pl->ob->update_weight ();
2988	continue;	2955
		2956	if (old != pl->ob->carrying)
		2957	{
2989	pl->ob->update_stats ();	2958	pl->ob->update_stats ();
2990	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2959	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2960	}
2991	}	2961	}
2992	}	2962	}
2993		2963
2994	void	2964	void
2995	fix_luck (void)	2965	fix_luck (void)
…		…
3039	void	3009	void
3040	make_visible (object *op)	3010	make_visible (object *op)
3041	{	3011	{
3042	op->hide = 0;	3012	op->hide = 0;
3043	op->invisible = 0;	3013	op->invisible = 0;
		3014
3044	if (op->type == PLAYER)	3015	if (op->type == PLAYER)
3045	{	3016	{
3046	op->contr->tmp_invis = 0;	3017	op->contr->tmp_invis = 0;
3047	op->contr->invis_race = 0;	3018	op->contr->invis_race = 0;
3048	}	3019	}
…		…
3051	}	3022	}
3052		3023
3053	int	3024	int
3054	is_true_undead (object *op)	3025	is_true_undead (object *op)
3055	{	3026	{
3056	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3027	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3057	return 1;	3028	return 1;
3058		3029
3059	return 0;	3030	return 0;
3060	}	3031	}
3061		3032
3062	/* look at the surrounding terrain to determine	3033	/* look at the surrounding terrain to determine
3063	* the hideability of this object. Positive levels	3034	* the hideability of this object. Positive levels
3064	* indicate greater hideability.	3035	* indicate greater hideability.
3065	*/	3036	*/
3066
3067	int	3037	int
3068	hideability (object *ob)	3038	hideability (object *ob)
3069	{	3039	{
3070	int i, level = 0, mflag;	3040	int i, level = 0, mflag;
3071	sint16 x, y;	3041	sint16 x, y;
…		…
3081	* as bad as carrying a light on a pitch dark map */	3051	* as bad as carrying a light on a pitch dark map */
3082	if (has_carried_lights (ob))	3052	if (has_carried_lights (ob))
3083	level = -(10 + (2 * ob->map->darkness));	3053	level = -(10 + (2 * ob->map->darkness));
3084		3054
3085	/* scan through all nearby squares for terrain to hide in */	3055	/* scan through all nearby squares for terrain to hide in */
3086	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3056	for (i = 0, x = ob->x, y = ob->y;
		3057	i <= SIZEOFFREE1;
		3058	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3087	{	3059	{
3088	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3060	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3089	if (mflag & P_OUT_OF_MAP)	3061	if (mflag & P_OUT_OF_MAP)
3090	{
3091	continue;	3062	continue;
3092	}	3063
3093	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3064	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3094	level += 2;	3065	level += 2;
3095	else /* open terrain! */	3066	else /* open terrain! */
3096	level -= 1;	3067	level -= 1;
3097	}	3068	}
…		…
3105	/* For Hidden creatures - a chance of becoming 'unhidden'	3076	/* For Hidden creatures - a chance of becoming 'unhidden'
3106	* every time they move - as we subtract off 'invisibility'	3077	* every time they move - as we subtract off 'invisibility'
3107	* AND, for players, if they move into a ridiculously unhideable	3078	* AND, for players, if they move into a ridiculously unhideable
3108	* spot (surrounded by clear terrain in broad daylight). -b.t.	3079	* spot (surrounded by clear terrain in broad daylight). -b.t.
3109	*/	3080	*/
3110
3111	void	3081	void
3112	do_hidden_move (object *op)	3082	do_hidden_move (object *op)
3113	{	3083	{
3114	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3084	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3115	object *skop;	3085	object *skop;
…		…
3197	* object op. This function works fine for monsters,	3167	* object op. This function works fine for monsters,
3198	* but we dont worry if the object isnt the top one in	3168	* but we dont worry if the object isnt the top one in
3199	* a pile (say a coin under a table would return "viewable"	3169	* a pile (say a coin under a table would return "viewable"
3200	* by this routine). Another question, should we be	3170	* by this routine). Another question, should we be
3201	* concerned with the direction the player is looking	3171	* concerned with the direction the player is looking
3202	* in? Realistically, most of use cant see stuff behind	3172	* in? Realistically, most of us can't see stuff behind
3203	* our backs...on the other hand, does the "facing" direction	3173	* our backs...on the other hand, does the "facing" direction
3204	* imply the way your head, or body is facing? Its possible	3174	* imply the way your head, or body is facing? It's possible
3205	* for them to differ. Sigh, this fctn could get a bit more complex.	3175	* for them to differ. Sigh, this fctn could get a bit more complex.
3206	* -b.t.	3176	* -b.t.
3207	* This function is now map tiling safe.	3177	* This function is now map tiling safe.
3208	*/	3178	*/
3209
3210	int	3179	int
3211	player_can_view (object *pl, object *op)	3180	player_can_view (object *pl, object *op)
3212	{	3181	{
3213	rv_vector rv;	3182	rv_vector rv;
3214	int dx, dy;	3183	int dx, dy;
…		…
3226		3195
3227	get_rangevector (pl, op, &rv, 0x1);	3196	get_rangevector (pl, op, &rv, 0x1);
3228		3197
3229	/* starting with the 'head' part, lets loop	3198	/* starting with the 'head' part, lets loop
3230	* through the object and find if it has any	3199	* through the object and find if it has any
3231	* part that is in the los array but isnt on	3200	* part that is in the los array but isn't on
3232	* a blocked los square.	3201	* a blocked los square.
3233	* we use the archetype to figure out offsets.	3202	* we use the archetype to figure out offsets.
3234	*/	3203	*/
3235	while (op)	3204	while (op)
3236	{	3205	{
3237	dx = rv.distance_x + op->arch->clone.x;	3206	dx = rv.distance_x + op->arch->x;
3238	dy = rv.distance_y + op->arch->clone.y;	3207	dy = rv.distance_y + op->arch->y;
3239		3208
3240	/* only the viewable area the player sees is updated by LOS	3209	/* only the viewable area the player sees is updated by LOS
3241	* code, so we need to restrict ourselves to that range of values	3210	* code, so we need to restrict ourselves to that range of values
3242	* for any meaningful values.	3211	* for any meaningful values.
3243	*/	3212	*/
3244	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3213	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3245	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3214	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3246	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3215	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3247	return 1;	3216	return 1;
		3217
3248	op = op->more;	3218	op = op->more;
3249	}	3219	}
		3220
3250	return 0;	3221	return 0;
3251	}	3222	}
3252		3223
3253	/* routine for both players and monsters. We call this when	3224	/* routine for both players and monsters. We call this when
3254	* there is a possibility for our action distrubing our hiding	3225	* there is a possibility for our action distrubing our hiding
…		…
3257	* return 0.	3228	* return 0.
3258	*/	3229	*/
3259	int	3230	int
3260	action_makes_visible (object *op)	3231	action_makes_visible (object *op)
3261	{	3232	{
3262
3263	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3233	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3264	{	3234	{
3265	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3235	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3266	return 0;	3236	return 0;
3267		3237
…		…
3273	{	3243	{
3274	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3244	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3275	return 1;	3245	return 1;
3276	}	3246	}
3277	}	3247	}
		3248
3278	return 0;	3249	return 0;
3279	}	3250	}
3280		3251
3281	/* op_on_battleground - checks if the given object op (usually	3252	/* op_on_battleground - checks if the given object op (usually
3282	* a player) is standing on a valid battleground-tile,	3253	* a player) is standing on a valid battleground-tile,
…		…
3287	* Default is to do the same as before, so only people wanting to have different points need worry about this	3258	* Default is to do the same as before, so only people wanting to have different points need worry about this
3288	*/	3259	*/
3289	int	3260	int
3290	op_on_battleground (object *op, int *x, int *y)	3261	op_on_battleground (object *op, int *x, int *y)
3291	{	3262	{
3292	object *tmp;
3293
3294	/* A battleground-tile needs the following attributes to be valid:	3263	/* A battleground-tile needs the following attributes to be valid:
3295	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3264	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3296	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3265	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3297	* and the exit-coordinates sp/hp must both be > 0.	3266	* and the exit-coordinates sp/hp must both be > 0.
3298	* => The intention here is to prevent abuse of the battleground-	3267	* => The intention here is to prevent abuse of the battleground-
3299	* feature (like pickable or hidden battleground tiles). */	3268	* feature (like pickable or hidden battleground tiles). */
3300	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3269	for (object *tmp = op->below; tmp; tmp = tmp->below)
3301	{	3270	{
3302	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3271	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3303	{	3272	{
3304	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3273	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3305	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3274	&& tmp->type == BATTLEGROUND
		3275	&& tmp->name == shstr_battleground
		3276	&& EXIT_X (tmp) && EXIT_Y (tmp))
3306	{	3277	{
3307	/*before we assign the exit, check if this is a teambattle */	3278	/* before we assign the exit, check if this is a teambattle */
3308	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3279	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3309	{	3280	{
3310	object *invtmp;
3311
3312	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3281	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3313	{	3282	{
3314	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3283	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3315	{	3284	{
3316	if (x != NULL && y != NULL)	3285	if (x && y)
3317	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3286	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3287
3318	return 1;	3288	return 1;
3319	}	3289	}
3320	}	3290	}
3321	}	3291	}
		3292
3322	if (x != NULL && y != NULL)	3293	if (x && y)
3323	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3294	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3295
3324	return 1;	3296	return 1;
3325	}	3297	}
3326	}	3298	}
3327	}	3299	}
		3300
3328	/* If we got here, did not find a battleground */	3301	/* If we got here, did not find a battleground */
3329	return 0;	3302	return 0;
3330	}	3303	}
3331		3304
3332	/*	3305	/*
…		…
3348	char buf[MAX_BUF]; /* tmp. string buffer */	3321	char buf[MAX_BUF]; /* tmp. string buffer */
3349	int i = 0, j = 0;	3322	int i = 0, j = 0;
3350		3323
3351	/* get the appropriate treasurelist */	3324	/* get the appropriate treasurelist */
3352	if (atnr == ATNR_FIRE)	3325	if (atnr == ATNR_FIRE)
3353	trlist = treasurelist::find ("dragon_ability_fire");	3326	trlist = treasurelist::find (shstr_dragon_ability_fire);
3354	else if (atnr == ATNR_COLD)	3327	else if (atnr == ATNR_COLD)
3355	trlist = treasurelist::find ("dragon_ability_cold");	3328	trlist = treasurelist::find (shstr_dragon_ability_cold);
3356	else if (atnr == ATNR_ELECTRICITY)	3329	else if (atnr == ATNR_ELECTRICITY)
3357	trlist = treasurelist::find ("dragon_ability_elec");	3330	trlist = treasurelist::find (shstr_dragon_ability_elec);
3358	else if (atnr == ATNR_POISON)	3331	else if (atnr == ATNR_POISON)
3359	trlist = treasurelist::find ("dragon_ability_poison");	3332	trlist = treasurelist::find (shstr_dragon_ability_poison);
3360		3333
3361	if (trlist == NULL || who->type != PLAYER)	3334	if (trlist == NULL || who->type != PLAYER)
3362	return;	3335	return;
3363		3336
3364	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3337	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3368	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3341	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3369	return;	3342	return;
3370	}	3343	}
3371		3344
3372	/* everything seems okay - now bring on the gift: */	3345	/* everything seems okay - now bring on the gift: */
3373	item = &(tr->item->clone);	3346	item = tr->item;
3374		3347
3375	if (item->type == SPELL)	3348	if (item->type == SPELL)
3376	{	3349	{
3377	if (check_spell_known (who, item->name))	3350	if (check_spell_known (who, item->name))
3378	return;	3351	return;
…		…
3437	{	3410	{
3438	/* forces in the treasurelist can alter the player's stats */	3411	/* forces in the treasurelist can alter the player's stats */
3439	object *skin;	3412	object *skin;
3440		3413
3441	/* first get the dragon skin force */	3414	/* first get the dragon skin force */
3442	shstr_cmp dragon_skin_force ("dragon_skin_force");
3443	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3415	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3444	;	3416	;
3445		3417
3446	if (!skin)	3418	if (!skin)
3447	return;	3419	return;
3448		3420
…		…
3496	* not readied.	3468	* not readied.
3497	*/	3469	*/
3498	void	3470	void
3499	player_unready_range_ob (player *pl, object *ob)	3471	player_unready_range_ob (player *pl, object *ob)
3500	{	3472	{
3501	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3473	if (pl->ob->current_weapon == ob)
		3474	pl->ob->current_weapon = 0;
		3475
		3476	if (pl->combat_ob == ob)
		3477	pl->combat_ob = 0;
		3478
3502	if (pl->ranges[i] == ob)	3479	if (pl->ranged_ob == ob)
3503	{
3504	pl->ranges[i] = 0;	3480	pl->ranged_ob = 0;
3505	if (pl->shoottype == i)
3506	pl->shoottype = range_none;
3507	}
3508	}	3481	}
3509		3482
3510	sint8	3483	sint8
3511	player::visibility_at (maptile *map, int x, int y) const	3484	player::visibility_at (maptile *map, int x, int y) const
3512	{	3485	{
…		…
3523	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3496	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3524	return 0;	3497	return 0;
3525		3498
3526	return 100 - blocked_los [x][y];	3499	return 100 - blocked_los [x][y];
3527	}	3500	}
		3501
		3502	void
		3503	player::infobox (const char *title, const char *msg, int color)
		3504	{
		3505	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3506	}
		3507
		3508	void
		3509	player::statusmsg (const char *msg, int color)
		3510	{
		3511	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3512	}
		3513
		3514	void
		3515	player::failmsg (const char *msg, int color)
		3516	{
		3517	play_sound (sound_find ("generic_failure"));
		3518	statusmsg (msg, color);
		3519	}
		3520

Diff Legend

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