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.121 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.192 by root, Wed Apr 30 06:40:28 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <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	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208		193
209	players.erase (this);	194	players.erase (this);
210	}	195	}
211		196
212	// connect the player with a specific client	197	// connect the player with a specific client
213	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
214	void	199	void
215	player::connect (client *ns)	200	player::connect (client *ns)
216	{	201	{
217	this->ns = ns;	202	this->ns = ns;
218	ns->pl = this;	203	ns->pl = this;
…		…
222	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
223		208
224	ns->update_look = 0;	209	ns->update_look = 0;
225	ns->look_position = 0;	210	ns->look_position = 0;
226		211
227	clear_los (ob);	212	clear_los (this);
228		213
229	ns->reset_stats ();	214	ns->reset_stats ();
230		215
231	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
232	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
233	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
234		219
235	ob->carrying = sum_weight (ob);	220	ob->update_weight ();
236	link_player_skills (ob);	221	link_player_skills (ob);
237		222
238	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239		224
240	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
241		226
242	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
243	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
244	{	229	{
245	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
246		231
247	shstr_cmp dragon_ability_force ("dragon_ability_force");
248	shstr_cmp dragon_skin_force ("dragon_skin_force");
249
250	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
251	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
252	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
253	abil = tmp;	235	abil = tmp;
254	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
255	skin = tmp;	237	skin = tmp;
256		238
257	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
258	}	240	}
259		241
260	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
261		243
262	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this);
263		245
264	ob->update_stats ();	246	ob->update_stats ();
		247
265	ns->floorbox_update ();	248	ns->floorbox_update ();
266
267	esrv_send_inventory (ob, ob);	249	esrv_send_inventory (ob, ob);
268	esrv_add_spells (this, 0);	250	esrv_add_spells (this, 0);
269		251
270	activate ();	252	activate ();
271		253
…		…
278	}	260	}
279		261
280	void	262	void
281	player::disconnect ()	263	player::disconnect ()
282	{	264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
283	if (ns)	271	if (ns)
284	{	272	{
285	if (active)	273	if (active)
286	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
287		275
…		…
290	ns->reset_stats ();	278	ns->reset_stats ();
291	ns->pl = 0;	279	ns->pl = 0;
292	ns = 0;	280	ns = 0;
293	}	281	}
294		282
295	if (ob)	283	observe = ob;
296	ob->close_container (); //TODO: client-specific
297		284
298	deactivate ();	285	deactivate ();
299	}	286	}
300		287
301	// the need for this function can be explained	288	// the need for this function can be explained
302	// by load_object not returning the object	289	// by load_object not returning the object
303	void	290	void
304	player::set_object (object *op)	291	player::set_object (object *op)
305	{	292	{
306	ob = op;	293	ob = observe = op;
307	ob->contr = this; /* this aren't yet in archetype */	294	ob->contr = this; /* this aren't yet in archetype */
308		295
309	ob->speed_left = 0.5;
310	ob->speed = 1.0;	296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
311	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;
312	}	334	}
313		335
314	player::player ()	336	player::player ()
315	{	337	{
316	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
327	petmode = pet_normal;	349	petmode = pet_normal;
328	listening = 10;	350	listening = 10;
329	usekeys = containers;	351	usekeys = containers;
330	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
331	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
332	}	357	}
333		358
334	void	359	void
335	player::do_destroy ()	360	player::do_destroy ()
336	{	361	{
…		…
341	if (ob)	366	if (ob)
342	{	367	{
343	ob->destroy_inv (false);	368	ob->destroy_inv (false);
344	ob->destroy ();	369	ob->destroy ();
345	}	370	}
		371
		372	ob = observe = 0;
346	}	373	}
347		374
348	player::~player ()	375	player::~player ()
349	{	376	{
350	/* Clear item stack */	377	/* Clear item stack */
…		…
377	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
378	*/	405	*/
379	archetype *	406	archetype *
380	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
381	{	408	{
382	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);
383		416
384	for (;;)	417	for (;;)
385	{	418	{
386	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
387	at = first_archetype;	420	i = archetypes.begin ();
388	else	421	else if (*i == at)
389	at = at->next;	422	cleanup ("not a single player archetype found");
390		423
391	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
392	return at;	425	return *i;
393
394	if (at == start)
395	{
396	LOG (llevError, "No Player archetypes\n");
397	exit (-1);
398	}
399	}	426	}
400	}	427	}
401		428
402	object *	429	object *
403	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
407	unsigned lastdist;	434	unsigned lastdist;
408	rv_vector rv;	435	rv_vector rv;
409		436
410	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
411	{	438	{
412	/* We should not find free objects on this friendly list, but it
413	* does periodically happen. Given that, lets deal with it.
414	* While unlikely, it is possible the next object on the friendly
415	* list is also free, so encapsulate this in a while loop.
416	*/
417	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
418	{
419	object *tmp = ol->ob;
420
421	/* Can't do much more other than log the fact, because the object
422	* itself will have been cleared.
423	*/
424	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
425	tmp->debug_desc ());
426	ol = ol->next;
427	remove_friendly_object (tmp);
428	if (!ol)
429	return op;
430	}
431
432	/* Remove special check for player from this. First, it looks to cause
433	* some crashes (ol->ob->contr not set properly?), but secondly, a more
434	* complicated method of state checking would be needed in any case -
435	* as it was, a clever player could type quit, and the function would
436	* skip them over while waiting for confirmation. Remove
437	* on_same_map check, as can_detect_enemy also does this
438	*/
439	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
440	continue;	440	continue;
441		441
442	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
443	{	443	{
…		…
638		638
639	return firstdir;	639	return firstdir;
640	}	640	}
641		641
642	void	642	void
643	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
644	{	644	{
645	object *op, *next = NULL;
646
647	if (pl->randomitems != NULL)	645	if (pl->randomitems)
648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
649		647
650	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
651	{	649	{
652	next = op->below;	650	next = op->below;
653		651
654	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
655	* 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
…		…
660	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
661	* by this player due to race restrictions	659	* by this player due to race restrictions
662	*/	660	*/
663	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
664	{	662	{
665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
666	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
667	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
668	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
669	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))
670	{	670	{
671	op->destroy ();	671	op->destroy ();
672	continue;	672	continue;
673	}	673	}
674	}	674	}
…		…
697	if (op->nrof > 1)	697	if (op->nrof > 1)
698	op->nrof = 1;	698	op->nrof = 1;
699	}	699	}
700		700
701	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
702	{
703	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
704	}
705		703
706	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
707	* 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
708	* merged properly.	706	* merged properly.
709	*/	707	*/
710	if (need_identify (op))	708	if (need_identify (op))
711	{	709	{
712	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
713	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
714	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
715	}	713	}
		714
716	if (op->type == SPELL)	715	if (op->type == SPELL)
717	{	716	{
718	op->destroy ();	717	op->destroy ();
719	continue;	718	continue;
720	}	719	}
…		…
722	{	721	{
723	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
724	op->stats.exp = 0;	723	op->stats.exp = 0;
725	op->level = 1;	724	op->level = 1;
726	}	725	}
727	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
728	else
729	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
730	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
731		729
732	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
733	link_player_skills (pl);	731	link_player_skills (pl);
…		…
769	}	767	}
770		768
771	void	769	void
772	object::roll_stats ()	770	object::roll_stats ()
773	{	771	{
774	int statsort [7];	772	int statsort [NUM_STATS];
775		773
776	for (;;)	774	for (;;)
777	{	775	{
778	int sum = 0;	776	int sum = 0;
779	for (int i = 7; i--; )	777	for (int i = NUM_STATS; i--; )
780	sum += statsort [i] = roll_stat ();	778	sum += statsort [i] = roll_stat ();
781		779
782	if (sum >= 82 && sum <= 116)	780	if (sum >= 82 && sum <= 116)
783	break;	781	break;
784	}	782	}
785		783
786	// Sort the stats so that rerolling is easier...	784	// Sort the stats so that rerolling is easier...
787	std::sort (statsort, statsort + 7, std::greater<int>());	785	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
788		786
		787	for (int i = 0; i < NUM_STATS; ++i)
789	stats.Str = statsort[0];	788	stats.stat (i) = statsort [i];
790	stats.Dex = statsort[1];
791	stats.Con = statsort[2];
792	stats.Int = statsort[3];
793	stats.Wis = statsort[4];
794	stats.Pow = statsort[5];
795	stats.Cha = statsort[6];
796		789
797	stats.exp = 0;	790	stats.exp = 0;
798	stats.ac = 0;	791	stats.ac = 0;
799		792
800	stats.hp = stats.maxhp;	793	stats.hp = stats.maxhp;
…		…
812	}	805	}
813		806
814	void	807	void
815	object::swap_stats (int a, int b)	808	object::swap_stats (int a, int b)
816	{	809	{
817	int tmp = get_attr_value (&contr->orig_stats, a);	810	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
818	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
819	set_attr_value (&contr->orig_stats, b, tmp);
820		811
		812	for (int i = 0; i < NUM_STATS; ++i)
821	stats.Str = contr->orig_stats.Str;	813	stats.stat (i) = contr->orig_stats.stat (i);
822	stats.Dex = contr->orig_stats.Dex;
823	stats.Con = contr->orig_stats.Con;
824	stats.Int = contr->orig_stats.Int;
825	stats.Wis = contr->orig_stats.Wis;
826	stats.Pow = contr->orig_stats.Pow;
827	stats.Cha = contr->orig_stats.Cha;
828		814
829	//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,
830	// be merged with the similar code in roll_stats	816	// be merged with the similar code in roll_stats
831	stats.ac = 0;	817	stats.ac = 0;
832		818
…		…
851	static void	837	static void
852	start_info (object *op)	838	start_info (object *op)
853	{	839	{
854	char buf[MAX_BUF];	840	char buf[MAX_BUF];
855		841
856	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
857	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
858	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
859	//new_draw_info (NDI_UNIQUE, 0, op, " ");
860	}	844	}
861		845
862	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
863	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
864	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
867	*/	851	*/
868	void	852	void
869	player::chargen_race_done ()	853	player::chargen_race_done ()
870	{	854	{
871	/* this must before then initial items are given */	855	/* this must before then initial items are given */
872	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
873		857
874	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
875	if (tl)	859	if (tl)
876	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
877		861
…		…
905	if (*first_map_ext_path)	889	if (*first_map_ext_path)
906	{	890	{
907	object *tmp;	891	object *tmp;
908	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
909		893
910	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);
911	tmp = object::create ();	895	tmp = object::create ();
912	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
913	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
914	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
915	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;
…		…
934	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
935		919
936	ob->remove_statbonus ();	920	ob->remove_statbonus ();
937	ob->remove ();	921	ob->remove ();
938	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
939	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
940	ob->instantiate ();	924	ob->instantiate ();
941	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
942	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
943	ob->x = x;	927	ob->x = x;
944	ob->y = y;	928	ob->y = y;
945	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
946	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
947	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
948	ob->add_statbonus ();	932	ob->add_statbonus ();
949	}	933	}
950	while (!allowed_class (ob));	934	while (!allowed_class (ob));
951		935
952	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1009	/* Cornered, get rid of scared */	993	/* Cornered, get rid of scared */
1010	CLEAR_FLAG (op, FLAG_SCARED);	994	CLEAR_FLAG (op, FLAG_SCARED);
1011	op->enemy = NULL;	995	op->enemy = NULL;
1012	}	996	}
1013		997
1014
1015	/* 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.
1016	* 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
1017	* stop.	1000	* stop.
1018	*/	1001	*/
1019	int	1002	int
1020	check_pick (object *op)	1003	check_pick (object *op)
1021	{	1004	{
…		…
1028	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1029	return 1;	1012	return 1;
1030		1013
1031	next = op->below;	1014	next = op->below;
1032		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1033	/* 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
1034	* destroyed */	1020	* destroyed */
1035	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1036	{	1022	{
1037	tmp = next;	1023	tmp = next;
1038	next = tmp->below;	1024	next = tmp->below;
1039		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1040	if (op->destroyed ())	1032	if (op->destroyed ())
1041	return 0;	1033	return 0;
1042		1034
1043	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1044	continue;	1036	continue;
1045		1037
1046	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1047	{	1039	{
1048	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1049	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1050	continue;	1042	continue;
1051	}	1043	}
1052		1044
1053	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1054	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1056	switch (op->contr->mode)	1048	switch (op->contr->mode)
1057	{	1049	{
1058	case 0:	1050	case 0:
1059	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1060	case 1:	1052	case 1:
1061	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1062	return 1;	1054	return 1;
1063	case 2:	1055	case 2:
1064	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1065	return 0;	1057	return 0;
1066	case 3:	1058	case 3:
1067	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1068	case 4:	1060	case 4:
1069	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1070	break;	1062	break;
1071	case 5:	1063	case 5:
1072	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1073	stop = 1;	1065	stop = 1;
1074	break;	1066	break;
1075	case 6:	1067	case 6:
1076	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1077	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1078	break;	1071	break;
1079		1072
1080	case 7:	1073	case 7:
1081	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1082	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1083	break;	1076	break;
1084		1077
1085	default:	1078	default:
1086	/* use value density */	1079	/* use value density */
1087	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1088	&& (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)
1089	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1090	}	1083	}
1091	}	1084	}
1092	else	1085	else
1093	{ /* old model */	1086	{ /* old model */
1094	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1098	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1099	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1100	&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))));
1101	else	1094	else
1102	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1103	&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))));
1104		1097
1105	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1106	}	1099	}
1107		1100
1108	/* philosophy:	1101	/* philosophy:
…		…
1149	/* all food and drink if desired */	1142	/* all food and drink if desired */
1150	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1151	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1152	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1153	{	1146	{
1154	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1155	continue;	1148	continue;
1156	}	1149	}
1157		1150
1158	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1159	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)))
1160	{	1153	{
1161	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1162	continue;	1155	continue;
1163	}	1156	}
1164		1157
1165	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1166	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1167	{	1160	{
1168	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1169	continue;	1162	continue;
1170	}	1163	}
1171		1164
1172	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1173	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1174	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1175	{	1168	{
1176	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1177	continue;	1170	continue;
1178	}	1171	}
1179		1172
1180	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1181	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1182	{	1175	{
1183	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1184	continue;	1177	continue;
1185	}	1178	}
1186		1179
1187	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1188	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1189	{	1182	{
1190	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1191	continue;	1184	continue;
1192	}	1185	}
1193		1186
1194	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1195	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1196	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1197	{	1190	{
1198	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1199	continue;	1192	continue;
1200	}	1193	}
1201		1194
1202	/* pick up all magical items */	1195	/* pick up all magical items */
1203	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1204	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))
1205	{	1198	{
1206	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1207	continue;	1200	continue;
1208	}	1201	}
1209		1202
1210	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1211	{	1204	{
1212	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1213	{	1206	{
1214	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1215	continue;	1208	continue;
1216	}	1209	}
1217	}	1210	}
1218		1211
1219	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1220	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1221	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1222	{	1215	{
1223	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1224	continue;	1217	continue;
1225	}	1218	}
1226		1219
1227	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1228	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1229	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1230	{	1223	{
1231	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1232	continue;	1225	continue;
1233	}	1226	}
1234		1227
1235	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1236	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1237	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1238	{	1231	{
1239	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1240	continue;	1233	continue;
1241	}	1234	}
1242		1235
1243	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1244	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1245	{	1238	{
1246	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1247	continue;	1240	continue;
1248	}	1241	}
1249		1242
1250	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1251	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1252	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1253	{	1246	{
1254	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1255	continue;	1248	continue;
1256	}	1249	}
1257		1250
1258	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1259	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1260	{	1253	{
1261	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1262	continue;	1255	continue;
1263	}	1256	}
1264		1257
1265	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1266	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1267	{	1260	{
1268	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1269	continue;	1262	continue;
1270	}	1263	}
1271		1264
1272	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1273	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1274	{	1267	{
1275	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1276	continue;	1269	continue;
1277	}	1270	}
1278		1271
1279	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1280	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1281	{	1274	{
1282	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1283	continue;	1276	continue;
1284	}	1277	}
1285		1278
1286	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1287	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1288	{	1281	{
1289	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1290	continue;	1283	continue;
1291	}	1284	}
1292		1285
1293	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1294	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1295	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1296	{	1289	{
1297	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1298	continue;	1291	continue;
1299	}	1292	}
1300		1293
1301	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1302	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1303	{	1296	{
1304	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1305	{	1298	{
1306	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 &&
1307	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1308	{	1301	{
1309	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1310	continue;	1303	continue;
1311	}	1304	}
1312	}	1305	}
1313		1306
1314	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1315	{	1308	{
1316	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)
1317	{	1310	{
1318	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1319	continue;	1312	continue;
1320	}	1313	}
1321	}	1314	}
1322	}	1315	}
1323		1316
1324	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1325	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1326	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1327	{	1320	{
1328	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1329	continue;	1322	continue;
1330	}	1323	}
1331		1324
1332	/* 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
1333	* pickups */	1326	* pickups */
…		…
1338	/* >=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
1339	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1340	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1341	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)
1342	{	1335	{
1343	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1344	#if 0	1337	#if 0
1345	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1346	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1347	{	1340	{
1348	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1349	}	1342	}
1350	else	1343	else
1351	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1352	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1353	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))));
1354	#endif	1347	#endif
1355	continue;	1348	continue;
1356	}	1349	}
…		…
1367	* found object is returned.	1360	* found object is returned.
1368	*/	1361	*/
1369	object *	1362	object *
1370	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1371	{	1364	{
1372	object *tmp = 0;
1373
1374	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1375	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1376	tmp = find_arrow (op, type);
1377	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);
1378	return op;	1374	return arrow;
		1375	}
1379		1376
1380	return tmp;	1377	return 0;
1381	}	1378	}
1382		1379
1383	/*	1380	/*
1384	* 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
1385	* 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
…		…
1408	}	1405	}
1409	}	1406	}
1410	else if (arrow->type == ARROW && arrow->race == type)	1407	else if (arrow->type == ARROW && arrow->race == type)
1411	{	1408	{
1412	/* allways prefer assasination/slaying */	1409	/* allways prefer assasination/slaying */
1413	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1410	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1414	{	1411	{
1415	if (arrow->attacktype & AT_DEATH)	1412	if (arrow->attacktype & AT_DEATH)
1416	{	1413	{
1417	*better = 100;	1414	*better = 100;
1418	return arrow;	1415	return arrow;
…		…
1426	else	1423	else
1427	{	1424	{
1428	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1429	{	1426	{
1430	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1431	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1432	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)
1433	{	1430	{
1434	tmp = arrow;	1431	tmp = arrow;
1435	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;
1436	}	1433	}
1437	}	1434	}
1438	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1439	{	1436	{
1440	tmp = arrow;	1437	tmp = arrow;
…		…
1533	*/	1530	*/
1534	int	1531	int
1535	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)
1536	{	1533	{
1537	object *left, *bow;	1534	object *left, *bow;
1538	int bowspeed, mflags;	1535	int mflags;
1539	maptile *m;	1536	maptile *m;
1540		1537
1541	if (!dir)	1538	if (!dir)
1542	{	1539	{
1543	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!");
1544	return 0;	1541	return 0;
1545	}	1542	}
1546		1543
1547	if (player *pl = op->contr)	1544	if (op->contr)
1548	{	1545	bow = op->current_weapon;
1549	bow = pl->ranged_ob;
1550	op->set_weapon (bow);
1551	}
1552	else	1546	else
1553	{	1547	{
1554	for (bow = op->inv; bow; bow = bow->below)	1548	for (bow = op->inv; bow; bow = bow->below)
1555	/* 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
1556	* 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.
…		…
1577	{	1571	{
1578	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);
1579	return 0;	1573	return 0;
1580	}	1574	}
1581		1575
1582	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1583
1584	/* penalize ROF for bestarrow */
1585	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1586	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1587
1588	if (bowspeed < 1)
1589	bowspeed = 1;
1590
1591	if (arrow == NULL)	1576	if (arrow == NULL)
1592	{	1577	{
1593	if ((arrow = find_arrow (op, bow->race)) == NULL)	1578	if ((arrow = find_arrow (op, bow->race)) == NULL)
1594	{	1579	{
1595	if (op->type == PLAYER)	1580	if (op->type == PLAYER)
…		…
1618	arrow->destroy ();	1603	arrow->destroy ();
1619	return 0;	1604	return 0;
1620	}	1605	}
1621		1606
1622	left = arrow; /* these are arrows left to the player */	1607	left = arrow; /* these are arrows left to the player */
1623	arrow = get_split_ob (arrow, 1);	1608	arrow = arrow->split ();
1624	if (!arrow)	1609	if (!arrow)
1625	{	1610	{
1626	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);
1627	return 0;	1612	return 0;
1628	}	1613	}
1629		1614
1630	arrow->set_owner (op);	1615	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1616	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1617	arrow->direction = dir;
1633		1618
1634	if (op->type == PLAYER)
1635	{
1636	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1637	op->update_stats ();
1638	}
1639
1640	SET_ANIMATION (arrow, arrow->direction);
1641
1642	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 */
1643	arrow->stats.hp = arrow->stats.dam;	1620	arrow->stats.hp = arrow->stats.dam;
1644	arrow->stats.grace = arrow->attacktype;	1621	arrow->stats.grace = arrow->attacktype;
1645		1622
1646	if (arrow->slaying)	1623	if (arrow->slaying)
1647	arrow->spellarg = strdup (arrow->slaying);	1624	arrow->spellarg = strdup (arrow->slaying);
1648		1625
1649	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);
1650		1642
1651	/* update the speed */	1643	/* update the speed */
1652	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
1653	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1645	+ bow->stats.dam / 7.f;
1654		1646
1655	arrow->set_speed (max (arrow->speed, 1.0));	1647	arrow->set_speed (max (arrow->speed, 2.f));
1656	arrow->speed_left = 0;	1648	arrow->speed_left = 0;
1657		1649
1658	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;
1659		1651
1660	if (op->type == PLAYER)	1652	if (op->type == PLAYER)
1661	{	1653	{
1662	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1654	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1663	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1655	wc -= dex_bonus[op->stats.Dex];
1664		1656
1665	if (!arrow->slaying)	1657	if (!arrow->slaying)
1666	arrow->slaying = op->slaying;	1658	arrow->slaying = op->slaying;
		1659
		1660	arrow->attacktype |= op->attacktype;
1667	}	1661	}
1668	else	1662	else
1669	{	1663	{
1670	arrow->level = op->level;	1664	arrow->level = op->level;
1671	arrow->stats.wc -= bow->magic;	1665	arrow->stats.wc -= bow->magic;
1672		1666
1673	if (!arrow->slaying)	1667	if (!arrow->slaying)
1674	arrow->slaying = bow->slaying;	1668	arrow->slaying = bow->slaying;
1675	}
1676		1669
1677	arrow->stats.wc -= arrow->level;
1678
1679	arrow->attacktype |= bow->attacktype;	1670	arrow->attacktype |= bow->attacktype;
		1671	}
1680		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);
1681	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1682	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1683		1679
1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	op->play_sound (sound_find ("fire_arrow"));
1685	m->insert (arrow, sx, sy, op);	1681	m->insert (arrow, sx, sy, op);
1686		1682
1687	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1688	move_arrow (arrow);	1684	move_arrow (arrow);
1689
1690	if (op->type == PLAYER)
1691	{
1692	if (left->destroyed ())
1693	esrv_del_item (op->contr, left->count);
1694	else
1695	esrv_send_item (op, left);
1696	}
1697		1685
1698	return 1;	1686	return 1;
1699	}	1687	}
1700		1688
1701	/* Special fire code for players - this takes into	1689	/* Special fire code for players - this takes into
…		…
1740	}	1728	}
1741		1729
1742	return ret;	1730	return ret;
1743	}	1731	}
1744		1732
1745
1746	/* Fires a misc (wand/rod/horn) object in 'dir'.	1733	/* Fires a misc (wand/rod/horn) object in 'dir'.
1747	* Broken apart from 'fire' to keep it more readable.	1734	* Broken apart from 'fire' to keep it more readable.
1748	*/	1735	*/
1749	void	1736	void
1750	fire_misc_object (object *op, int dir)	1737	fire_misc_object (object *op, int dir)
…		…
1761	{	1748	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1749	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1750	return;
1764	}	1751	}
1765		1752
1766	op->set_weapon (item);	1753	if (!op->change_weapon (item))
		1754	return;
1767		1755
1768	if (item->type == WAND)	1756	if (item->type == WAND)
1769	{	1757	{
1770	if (item->stats.food <= 0)	1758	if (item->stats.food <= 0)
1771	{	1759	{
1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1760	op->contr->play_sound (sound_find ("wand_poof"));
1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1761	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774		1762
1775	return;	1763	return;
1776	}	1764	}
1777	}	1765	}
1778	else if (item->type == ROD || item->type == HORN)	1766	else if (item->type == ROD || item->type == HORN)
1779	{	1767	{
1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1768	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1769
		1770	// using the maximum of the rods charge allows at least one spell cast
		1771	// for a rod or horn, this fixes some broken rods.
		1772	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1781	{	1773	{
1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1774	op->contr->play_sound (sound_find ("wand_poof"));
1783		1775
1784	if (item->type == ROD)	1776	if (item->type == ROD)
1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1786	else	1778	else
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1779	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1800	object *tmp;	1792	object *tmp;
1801		1793
1802	if (item->arch)	1794	if (item->arch)
1803	{	1795	{
1804	CLEAR_FLAG (item, FLAG_ANIMATE);	1796	CLEAR_FLAG (item, FLAG_ANIMATE);
1805	item->face = item->arch->clone.face;	1797	item->face = item->arch->face;
1806	item->set_speed (0);	1798	item->set_speed (0);
1807	}	1799	}
1808		1800
1809	if ((tmp = item->in_player ()))	1801	if (object *pl = item->visible_to ())
1810	esrv_update_item (UPD_ANIM, tmp, item);	1802	esrv_update_item (UPD_ANIM, pl, item);
1811	}	1803	}
1812	}	1804	}
1813	else if (item->type == ROD || item->type == HORN)	1805	else if (item->type == ROD || item->type == HORN)
1814	drain_rod_charge (item);	1806	drain_rod_charge (item);
1815	}	1807	}
1816	}	1808	}
1817		1809
1818	/* Received a fire command for the player - go and do it.	1810	/* Received a fire command for the player - go and do it.
1819	*/	1811	*/
1820	void	1812	bool
1821	fire (object *op, int dir)	1813	fire (object *op, int dir)
1822	{	1814	{
1823	int spellcost = 0;	1815	int spellcost = 0;
1824		1816
1825	/* check for loss of invisiblity/hide */	1817	/* check for loss of invisiblity/hide */
…		…
1829	player *pl = op->contr;	1821	player *pl = op->contr;
1830		1822
1831	if (pl->golem)	1823	if (pl->golem)
1832	{	1824	{
1833	control_golem (op->contr->golem, dir);	1825	control_golem (op->contr->golem, dir);
1834	return;	1826	return false;
1835	}	1827	}
1836		1828
1837	object *ob = pl->ranged_ob;	1829	object *ob = pl->ranged_ob;
1838		1830
1839	if (!ob)	1831	if (!ob)
1840	return;	1832	return false;
		1833
		1834	if (!op->change_weapon (ob))
		1835	return false;
		1836
		1837	if (op->speed_left > 0.f)
		1838	--op->speed_left;
		1839	else
		1840	return false;
1841		1841
1842	switch (ob->type)	1842	switch (ob->type)
1843	{	1843	{
1844	case BOW:	1844	case BOW:
1845	player_fire_bow (op, dir);	1845	player_fire_bow (op, dir);
…		…
1852	case BUILDER:	1852	case BUILDER:
1853	apply_map_builder (op, dir);	1853	apply_map_builder (op, dir);
1854	break;	1854	break;
1855		1855
1856	case SKILL:	1856	case SKILL:
1857	case SKILL_TOOL:
1858	do_skill (op, op, ob, dir, 0);	1857	do_skill (op, op, ob, dir, 0);
1859	break;	1858	break;
1860		1859
1861	default:	1860	default:
1862	fire_misc_object (op, dir);	1861	fire_misc_object (op, dir);
1863	break;	1862	break;
1864	}	1863	}
		1864
		1865	return true;
1865	}	1866	}
1866		1867
1867	/* find_key	1868	/* find_key
1868	* We try to find a key for the door as passed. If we find a key	1869	* We try to find a key for the door as passed. If we find a key
1869	* and successfully use it, we return the key, otherwise NULL	1870	* and successfully use it, we return the key, otherwise NULL
…		…
1956	* 0 otherwise	1957	* 0 otherwise
1957	*/	1958	*/
1958	static int	1959	static int
1959	player_attack_door (object *op, object *door)	1960	player_attack_door (object *op, object *door)
1960	{	1961	{
1961	/* If its a door, try to find a use a key. If we do destroy the door,	1962	/* If its a door, try to find a key. If we do destroy the door,
1962	* might as well return immediately as there is nothing more to do -	1963	* might as well return immediately as there is nothing more to do -
1963	* otherwise, we fall through to the rest of the code.	1964	* otherwise, we fall through to the rest of the code.
1964	*/	1965	*/
1965	object *key = find_key (op, op, door);	1966	object *key = find_key (op, op, door);
1966		1967
1967	/* IF we found a key, do some extra work */	1968	/* If we found a key, do some extra work */
1968	if (key)	1969	if (key)
1969	{	1970	{
1970	object *container = key->env;	1971	object *container = key->env;
1971
1972	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1973		1972
1974	if (action_makes_visible (op))	1973	if (action_makes_visible (op))
1975	make_visible (op);	1974	make_visible (op);
1976		1975
1977	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1976	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1979		1978
1980	if (door->type == DOOR)	1979	if (door->type == DOOR)
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1980	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1982	else if (door->type == LOCKED_DOOR)	1981	else if (door->type == LOCKED_DOOR)
1983	{	1982	{
1984	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1983	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1985	remove_door2 (door); /* remove door without violence ;-) */	1984	remove_door2 (door); /* remove door without violence ;-) */
1986	}	1985	}
1987		1986
1988	/* Do this after we print the message */	1987	/* Do this after we print the message */
1989	decrease_ob (key); /* Use up one of the keys */	1988	key->decrease (); /* Use up one of the keys */
1990	/* Need to update the weight the container the key was in */
1991	if (container != op)
1992	esrv_update_item (UPD_WEIGHT, op, container);
1993		1989
1994	return 1; /* Nothing more to do below */	1990	return 1; /* Nothing more to do below */
1995	}	1991	}
1996	else if (door->type == LOCKED_DOOR)	1992	else if (door->type == LOCKED_DOOR)
1997	{	1993	{
1998	/* Might as well return now - no other way to open this */	1994	/* Might as well return now - no other way to open this */
1999	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1995	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2000	return 1;	1996	return 1;
2001	}	1997	}
2002		1998
2003	return 0;	1999	return 0;
2004	}	2000	}
…		…
2007	* It should keep the code cleaner.	2003	* It should keep the code cleaner.
2008	* When this is called, the players direction has been updated	2004	* When this is called, the players direction has been updated
2009	* (taking into account confusion.) The player is also actually	2005	* (taking into account confusion.) The player is also actually
2010	* going to try and move (not fire weapons).	2006	* going to try and move (not fire weapons).
2011	*/	2007	*/
2012	void	2008	bool
2013	move_player_attack (object *op, int dir)	2009	move_player_attack (object *op, int dir)
2014	{	2010	{
2015	object *tmp, *mon;
2016	int on_battleground;	2011	int on_battleground;
2017	maptile *m;
2018		2012
2019	sint16 nx = freearr_x[dir] + op->x;	2013	sint16 nx = freearr_x[dir] + op->x;
2020	sint16 ny = freearr_y[dir] + op->y;	2014	sint16 ny = freearr_y[dir] + op->y;
2021		2015
2022	on_battleground = op_on_battleground (op, 0, 0);	2016	on_battleground = op_on_battleground (op, 0, 0);
		2017
		2018	if (out_of_map (op->map, nx, ny))
		2019	return false;
		2020
		2021	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2022	{
		2023	--op->speed_left;
		2024	return true;
		2025	}
2023		2026
2024	/* If braced, or can't move to the square, and it is not out of the	2027	/* If braced, or can't move to the square, and it is not out of the
2025	* map, attack it. Note order of if statement is important - don't	2028	* map, attack it. Note order of if statement is important - don't
2026	* want to be calling move_ob if braced, because move_ob will move the	2029	* want to be calling move_ob if braced, because move_ob will move the
2027	* player. This is a pretty nasty hack, because if we could	2030	* player. This is a pretty nasty hack, because if we could
2028	* move to some space, it then means that if we are braced, we should	2031	* move to some space, it then means that if we are braced, we should
2029	* do nothing at all. As it is, if we are braced, we go through	2032	* do nothing at all. As it is, if we are braced, we go through
2030	* quite a bit of processing. However, it probably is less than what	2033	* quite a bit of processing. However, it probably is less than what
2031	* move_ob uses.	2034	* move_ob uses.
2032	*/	2035	*/
2033	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2034	{
2035	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2036	{
2037	m = op->map->xy_find (nx, ny);	2036	maptile *m = op->map->xy_find (nx, ny);
2038	if (!m)
2039	return; /* Don't think this should happen */
2040	}
2041	else
2042	m = op->map;
2043		2037
2044	if (!(tmp = m->at (nx, ny).bot))
2045	return;
2046
2047	mon = 0;
2048	/* Go through all the objects, and find ones of interest. Only stop if	2038	/* Go through all the objects, and find ones of interest. Only stop if
2049	* we find a monster - that is something we know we want to attack.	2039	* we find a monster - that is something we know we want to attack.
2050	* if its a door or barrel (can roll) see if there may be monsters	2040	* if its a door or barrel (can roll) see if there may be monsters
2051	* on the space	2041	* on the space
2052	*/	2042	*/
2053	while (tmp)	2043	object *mon;
2054	{	2044	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2055	if (tmp == op)	2045	{
2056	{	2046	if ((mon->flag [FLAG_ALIVE]
2057	tmp = tmp->above;	2047	|| mon->type == LOCKED_DOOR
2058	continue;	2048	|| mon->flag [FLAG_CAN_ROLL])
2059	}
2060
2061	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2062	{
2063	mon = tmp;	2049	&& mon != op)
2064	break;	2050	break;
2065	}	2051	}
2066		2052
2067	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2068	mon = tmp;
2069
2070	tmp = tmp->above;
2071	}
2072
2073	if (!mon) /* This happens anytime the player tries to move */	2053	if (!mon) /* This happens anytime the player tries to move */
2074	return; /* into a wall */	2054	return false; /* into a wall */
2075		2055
2076	if (mon->head)
2077	mon = mon->head;	2056	mon = mon->head_ ();
2078		2057
2079	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2058	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2059	if (op->contr->weapon_sp_left > 0.f)
2080	if (player_attack_door (op, mon))	2060	if (player_attack_door (op, mon))
		2061	{
		2062	--op->contr->weapon_sp_left;
2081	return;	2063	return true;
		2064	}
2082		2065
2083	/* The following deals with possibly attacking peaceful	2066	/* The following deals with possibly attacking peaceful
2084	* or frienddly creatures. Basically, all players are considered	2067	* or friendly creatures. Basically, all players are considered
2085	* unaggressive. If the moving player has peaceful set, then the	2068	* unaggressive. If the moving player has peaceful set, then the
2086	* object should be pushed instead of attacked. It is assumed that	2069	* object should be pushed instead of attacked. It is assumed that
2087	* if you are braced, you will not attack friends accidently,	2070	* if you are braced, you will not attack friends accidently,
2088	* and thus will not push them.	2071	* and thus will not push them.
2089	*/	2072	*/
2090		2073
2091	/* If the creature is a pet, push it even if the player is not	2074	/* If the creature is a pet, push it even if the player is not
2092	* peaceful. Our assumption is the creature is a pet if the	2075	* peaceful. Our assumption is the creature is a pet if the
2093	* player owns it and it is either friendly or unagressive.	2076	* player owns it and it is either friendly or unagressive.
2094	*/	2077	*/
2095	if ((op->type == PLAYER)	2078	if (op->type == PLAYER
2096	#if COZY_SERVER
2097	&&
2098	((mon->owner && mon->owner->contr	2079	&& ((mon->owner && mon->owner->contr
2099	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2080	&& same_party (mon->owner->contr->party, op->contr->party))
2100	#else
2101	&& mon->owner == op	2081	|| mon->owner == op)
2102	#endif
2103	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2082	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2104	{	2083	{
2105	/* If we're braced, we don't want to switch places with it */	2084	/* If we're braced, we don't want to switch places with it */
2106	if (op->contr->braced)	2085	if (op->contr->braced)
2107	return;	2086	return false;
2108		2087
2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2088	if (op->speed_left > 0.f)
		2089	{
		2090	--op->speed_left;
		2091
		2092	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	2093	push_ob (mon, dir, op);
		2094
2111	if (op->contr->tmp_invis || op->hide)	2095	if (op->contr->tmp_invis || op->hide)
2112	make_visible (op);	2096	make_visible (op);
2113		2097
2114	return;	2098	return true;
2115	}	2099	}
		2100	else
		2101	return false;
		2102	}
2116		2103
2117	/* in certain circumstances, you shouldn't attack friendly	2104	/* in certain circumstances, you shouldn't attack friendly
2118	* creatures. Note that if you are braced, you can't push	2105	* creatures. Note that if you are braced, you can't push
2119	* someone, but put it inside this loop so that you won't	2106	* someone, but put it inside this loop so that you won't
2120	* attack them either.	2107	* attack them either.
2121	*/	2108	*/
2122	if ((mon->type == PLAYER || mon->enemy != op) &&	2109	if ((mon->type == PLAYER || mon->enemy != op)
2123	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2110	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2124	#ifdef PROHIBIT_PLAYERKILL
2125	(op->contr->peaceful	2111	&& ((op->contr->peaceful
2126	|| (mon->type == PLAYER	2112	|| (mon->type == PLAYER && mon->contr->peaceful))
2127	&& mon->contr->
2128	peaceful)) &&
2129	#else
2130	op->contr->peaceful &&
2131	#endif
2132	!on_battleground))	2113	&& !on_battleground))
		2114	{
		2115	if (op->speed_left > 0.f)
2133	{	2116	{
		2117	--op->speed_left;
		2118
2134	if (!op->contr->braced)	2119	if (!op->contr->braced)
2135	{	2120	{
2136	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2121	op->play_sound (sound_find ("push_player"));
2137	push_ob (mon, dir, op);	2122	push_ob (mon, dir, op);
2138	}	2123	}
2139	else	2124	else
2140	new_draw_info (0, 0, op, "You withhold your attack");	2125	op->statusmsg ("You withhold your attack");
2141		2126
2142	if (op->contr->tmp_invis || op->hide)	2127	if (op->contr->tmp_invis || op->hide)
2143	make_visible (op);	2128	make_visible (op);
2144	}
2145		2129
		2130	return true;
		2131	}
		2132	}
2146	/* If the object is a boulder or other rollable object, then	2133	/* If the object is a boulder or other rollable object, then
2147	* roll it if not braced. You can't roll it if you are braced.	2134	* roll it if not braced. You can't roll it if you are braced.
2148	*/	2135	*/
2149	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2136	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2137	{
		2138	if (op->speed_left > 0.f)
2150	{	2139	{
		2140	--op->speed_left;
		2141
2151	recursive_roll (mon, dir, op);	2142	recursive_roll (mon, dir, op);
2152	if (action_makes_visible (op))	2143	if (action_makes_visible (op))
2153	make_visible (op);	2144	make_visible (op);
2154	}
2155		2145
		2146	return true;
		2147	}
		2148	}
2156	/* Any generic living creature. Including things like doors.	2149	/* Any generic living creature. Including things like doors.
2157	* Way it works is like this: First, it must have some hit points	2150	* Way it works is like this: First, it must have some hit points
2158	* and be living. Then, it must be one of the following:	2151	* and be living. Then, it must be one of the following:
2159	* 1) Not a player, 2) A player, but of a different party. Note	2152	* 1) Not a player, 2) A player, but of a different party. Note
2160	* that party_number -1 is no party, so attacks can still happen.	2153	* that party_number -1 is no party, so attacks can still happen.
2161	*/	2154	*/
2162	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2155	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2163	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2156	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2164	{	2157	{
2165		2158	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2166	/* If the player hasn't hit something this tick, and does
2167	* so, give them speed boost based on weapon speed. Doing
2168	* it here is better than process_players2, which basically
2169	* incurred a 1 tick offset.
2170	*/
2171	if (!op->contr->has_hit)
2172	{	2159	{
2173	op->speed_left += op->speed / op->contr->weapon_sp;	2160	--op->contr->weapon_sp_left;
2174
2175	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2176	}
2177		2161
2178	skill_attack (mon, op, 0, 0, 0);	2162	skill_attack (mon, op, 0, 0, 0);
2179
2180	/* If attacking another player, that player gets automatic
2181	* hitback, and doesn't loose luck either.
2182	* Disable hitback on the battleground or if the target is
2183	* the wiz.
2184	*/
2185	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2186	{
2187	short luck = mon->stats.luck;
2188
2189	mon->contr->has_hit = 1;
2190	skill_attack (op, mon, 0, 0, 0);
2191	mon->stats.luck = luck;
2192	}
2193		2163
2194	if (action_makes_visible (op))	2164	if (action_makes_visible (op))
2195	make_visible (op);	2165	make_visible (op);
2196	}
2197	} /* if player should attack something */
2198	}
2199		2166
2200	int	2167	return true;
		2168	}
		2169	}
		2170
		2171	return false;
		2172	}
		2173
		2174	bool
2201	move_player (object *op, int dir)	2175	move_player (object *op, int dir)
2202	{	2176	{
2203	int pick;	2177	int pick;
2204		2178
2205	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2179	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2206	return 0;	2180	return 0;
2207		2181
2208	/* Sanity check: make sure dir is valid */	2182	/* Sanity check: make sure dir is valid */
2209	if ((dir < 0) || (dir >= 9))	2183	if ((dir < 0) || (dir >= 9))
2210	{	2184	{
…		…
2219	op->facing = dir;	2193	op->facing = dir;
2220		2194
2221	if (op->hide)	2195	if (op->hide)
2222	do_hidden_move (op);	2196	do_hidden_move (op);
2223		2197
		2198	bool retval;
		2199
2224	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2200	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2225	/*nop */ ;	2201	retval = RESULT_INT (0);
2226	else if (op->contr->fire_on)	2202	else if (op->contr->fire_on)
2227	fire (op, dir);	2203	retval = fire (op, dir);
2228	else	2204	else
2229	{	2205	{
2230	move_player_attack (op, dir);	2206	retval = move_player_attack (op, dir);
2231	pick = check_pick (op);	2207	pick = check_pick (op);
2232	}	2208	}
2233		2209
2234	/* Add special check for newcs players and fire on - this way, the	2210	/* Add special check for newcs players and fire on - this way, the
2235	* server can handle repeat firing.	2211	* server can handle repeat firing.
…		…
2242	/* Update how the player looks. Use the facing, so direction may	2218	/* Update how the player looks. Use the facing, so direction may
2243	* get reset to zero. This allows for full animation capabilities	2219	* get reset to zero. This allows for full animation capabilities
2244	* for players.	2220	* for players.
2245	*/	2221	*/
2246	animate_object (op, op->facing);	2222	animate_object (op, op->facing);
2247	return 0;	2223
		2224	return retval;
2248	}	2225	}
2249		2226
2250	/* This is similar to handle_player, below, but is only used by the	2227	/* This is similar to handle_player, below, but is only used by the
2251	* new client/server stuff.	2228	* new client/server stuff.
2252	* This is sort of special, in that the new client/server actually uses	2229	* This is sort of special, in that the new client/server actually uses
2253	* the new speed values for commands.	2230	* the new speed values for commands.
2254	*	2231	*
2255	* Returns true if there are more actions we can do.	2232	* Returns true if there are more actions we can do. Should not do
		2233	* many actions in a row, as that would be too unfair to other
		2234	* players.
2256	*/	2235	*/
2257	int	2236	bool
2258	handle_newcs_player (object *op)	2237	handle_newcs_player (object *op)
2259	{	2238	{
2260	if (QUERY_FLAG (op, FLAG_SCARED))	2239	if (QUERY_FLAG (op, FLAG_SCARED))
2261	{	2240	{
2262	flee_player (op);	2241	if (op->speed_left > 0.f)
2263	/* If player is still scared, that is his action for this tick */
2264	if (QUERY_FLAG (op, FLAG_SCARED))
2265	{	2242	{
2266	op->speed_left--;	2243	--op->speed_left;
		2244	flee_player (op);
		2245
2267	return 0;	2246	return true;
2268	}	2247	}
		2248	else
		2249	return false;
2269	}	2250	}
2270		2251
2271	/* call this here - we also will call this in do_ericserver, but	2252	/* call this here - we also will call this in do_ericserver, but
2272	* the players time has been increased when doericserver has been	2253	* the players time has been increased when doericserver has been
2273	* called, so we recheck it here.	2254	* called, so we recheck it here.
2274	*/	2255	*/
2275	if (op->contr->ns->handle_command ())	2256	if (op->contr->ns->handle_command ())
2276	return 1;	2257	return true;
2277		2258
2278	if (op->speed_left > 0)
2279	{
2280	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2259	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2281	{
2282	/* All move commands take 1 tick, at least for now */
2283	op->speed_left--;
2284
2285	/* Instead of all the stuff below, let move_player take care
2286	* of it. Also, some of the skill stuff is only put in
2287	* there, as well as the confusion stuff.
2288	*/
2289	move_player (op, op->direction);	2260	return move_player (op, op->direction);
2290		2261
2291	return op->speed_left > 0;
2292	}
2293	}
2294
2295	return 0;	2262	return false;
2296	}	2263	}
2297		2264
2298	int	2265	int
2299	save_life (object *op)	2266	save_life (object *op)
2300	{	2267	{
…		…
2302	return 0;	2269	return 0;
2303		2270
2304	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2271	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2305	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2272	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2306	{	2273	{
2307	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2274	op->play_sound (sound_find ("ob_evaporate"));
2308	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2275	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2309
2310	if (op->contr)
2311	esrv_del_item (op->contr, tmp->count);
2312		2276
2313	tmp->destroy ();	2277	tmp->destroy ();
2314	CLEAR_FLAG (op, FLAG_LIFESAVE);	2278	CLEAR_FLAG (op, FLAG_LIFESAVE);
2315		2279
2316	if (op->stats.hp < 0)	2280	if (op->stats.hp < 0)
…		…
2329	return 0;	2293	return 0;
2330	}	2294	}
2331		2295
2332	/* This goes throws the inventory and removes unpaid objects, and puts them	2296	/* This goes throws the inventory and removes unpaid objects, and puts them
2333	* back in the map (location and map determined by values of env). This	2297	* back in the map (location and map determined by values of env). This
2334	* function will descend into containers. op is the object to start the search	2298	* function will descend into containers. op is the object to start the search
2335	* from.	2299	* from.
2336	*/	2300	*/
		2301	static void
		2302	drop_unpaid_items (object *op, object *env)
		2303	{
		2304	while (op)
		2305	{
		2306	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2307
		2308	if (QUERY_FLAG (op, FLAG_UNPAID))
		2309	op->insert_at (env);
		2310	else if (op->inv)
		2311	drop_unpaid_items (op->inv, env);
		2312
		2313	op = next;
		2314	}
		2315	}
		2316
2337	void	2317	void
2338	remove_unpaid_objects (object *op, object *env)	2318	object::drop_unpaid_items ()
2339	{	2319	{
2340	while (op)	2320	if (!flag [FLAG_REMOVED])
2341	{	2321	::drop_unpaid_items (inv, this);
2342	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2343
2344	if (QUERY_FLAG (op, FLAG_UNPAID))
2345	{
2346	if (env->type == PLAYER)
2347	esrv_del_item (env->contr, op->count);
2348
2349	op->insert_at (env);
2350	}
2351	else if (op->inv)
2352	remove_unpaid_objects (op->inv, env);
2353
2354	op = next;
2355	}
2356	}	2322	}
2357		2323
2358	/*	2324	/*
2359	* Returns pointer a static string containing gravestone text	2325	* Returns pointer a static string containing gravestone text
2360	* Moved from apply.c to player.c - player.c is what	2326	* Moved from apply.c to player.c - player.c is what
2361	* actually uses this function. player.c may not be quite the	2327	* actually uses this function. player.c may not be quite the
2362	* best, a misc file for object actions is probably better,	2328	* best, a misc file for object actions is probably better,
2363	* but there isn't one in the server directory.	2329	* but there isn't one in the server directory.
2364	*/	2330	*/
2365	char *	2331	const char *
2366	gravestone_text (object *op)	2332	gravestone_text (object *op)
2367	{	2333	{
2368	static char buf2[MAX_BUF];	2334	static dynbuf_text buf;
2369	char buf[MAX_BUF];
2370	time_t now = time (NULL);
2371		2335
2372	strcpy (buf2, " R.I.P.\n\n");	2336	buf << "---- R.I.P. ----\n\n";
		2337	op->name;
		2338
2373	if (op->type == PLAYER)	2339	if (op->type == PLAYER)
2374	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2340	buf << " the " << op->contr->title;
2375	else
2376	sprintf (buf, "%s\n", &op->name);
2377		2341
2378	strncat (buf2, " ", 20 - strlen (buf) / 2);	2342	buf << "\n\n";
2379	strcat (buf2, buf);	2343
		2344	buf << "who was level ";
		2345	buf << (sint32)op->level << "\n\n" // OO breakdown
		2346	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2347
2380	if (op->type == PLAYER)	2348	if (op->type == PLAYER)
2381	sprintf (buf, "who was in level %d when killed\n", op->level);	2349	buf << "by " << op->contr->killer_name () << ".\n\n";
2382	else
2383	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2384		2350
2385	strncat (buf2, " ", 20 - strlen (buf) / 2);
2386	strcat (buf2, buf);
2387	if (op->type == PLAYER)
2388	{	2351	{
2389	sprintf (buf, "by %s.\n\n", op->contr->killer);	2352	static char buf2[128];
2390	strncat (buf2, " ", 21 - strlen (buf) / 2);	2353	time_t now = time (NULL);
2391	strcat (buf2, buf);
2392	}
2393
2394	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2354	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2395	strncat (buf2, " ", 20 - strlen (buf) / 2);	2355	buf << buf2;
2396	strcat (buf2, buf);	2356	}
2397		2357
2398	return buf2;	2358	return buf;
2399	}	2359	}
2400		2360
2401	void	2361	void
2402	do_some_living (object *op)	2362	do_some_living (object *op)
2403	{	2363	{
…		…
2455	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2415	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2456	else	2416	else
2457	{	2417	{
2458	gen_grace = op->stats.maxgrace;	2418	gen_grace = op->stats.maxgrace;
2459	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2419	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2460	}
2461
2462	/* Regenerate Spell Points */
2463	if (!op->contr->golem && --op->last_sp < 0)
2464	{
2465	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2466	if (op->stats.sp < op->stats.maxsp)
2467	{
2468	op->stats.sp++;
2469	/* dms do not consume food */
2470	if (!QUERY_FLAG (op, FLAG_WIZ))
2471	{
2472	op->stats.food--;
2473	if (op->contr->digestion < 0)
2474	op->stats.food += op->contr->digestion;
2475	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2476	op->stats.food = last_food;
2477	}
2478	}
2479
2480	if (max_sp > 1)
2481	{
2482	over_sp = (gen_sp + 10) / rate_sp;
2483	if (over_sp > 0)
2484	{
2485	if (op->stats.sp < op->stats.maxsp)
2486	{
2487	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2488
2489	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2490	op->stats.sp--;
2491
2492	if (op->stats.sp > op->stats.maxsp)
2493	op->stats.sp = op->stats.maxsp;
2494	}
2495	op->last_sp = 0;
2496	}
2497	else
2498	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2499	}
2500	else
2501	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2502	}	2420	}
2503		2421
2504	/* Regenerate Grace */	2422	/* Regenerate Grace */
2505	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2423	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2506	if (--op->last_grace < 0)	2424	if (--op->last_grace < 0)
…		…
2527	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2445	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2528	}	2446	}
2529	/* wearing stuff doesn't detract from grace generation. */	2447	/* wearing stuff doesn't detract from grace generation. */
2530	}	2448	}
2531		2449
		2450	if (op->stats.food > 0)
		2451	{
2532	/* Regenerate Hit Points */	2452	/* Regenerate Spell Points */
2533	if (--op->last_heal < 0)	2453	if (!op->contr->golem && --op->last_sp < 0)
2534	{
2535	if (op->stats.hp < op->stats.maxhp)
2536	{	2454	{
2537	op->stats.hp++;	2455	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2538	/* dms do not consume food */	2456
2539	if (!QUERY_FLAG (op, FLAG_WIZ))	2457	if (op->stats.sp < op->stats.maxsp)
2540	{	2458	{
		2459	op->stats.sp++;
		2460
		2461	/* dms do not consume food */
		2462	if (!QUERY_FLAG (op, FLAG_WIZ))
		2463	{
2541	op->stats.food--;	2464	op->stats.food--;
		2465
2542	if (op->contr->digestion < 0)	2466	if (op->contr->digestion < 0)
2543	op->stats.food += op->contr->digestion;	2467	op->stats.food += op->contr->digestion;
2544	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2468	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2545	op->stats.food = last_food;	2469	op->stats.food = last_food;
		2470	}
2546	}	2471	}
2547	}
2548		2472
2549	if (max_hp > 1)	2473	if (max_sp > 1)
2550	{
2551	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2552	if (over_hp > 0)
2553	{	2474	{
2554	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	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
2555	op->last_heal = 0;	2489	op->last_sp = 0;
		2490	}
		2491	else
		2492	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2556	}	2493	}
2557	else	2494	else
		2495	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2496	}
		2497
		2498	/* Regenerate Hit Points */
		2499	if (--op->last_heal < 0)
		2500	{
		2501	if (op->stats.hp < op->stats.maxhp)
2558	{	2502	{
2559	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2503	op->stats.hp++;
		2504
		2505	/* dms do not consume food */
		2506	if (!QUERY_FLAG (op, FLAG_WIZ))
		2507	{
		2508	op->stats.food--;
		2509
		2510	if (op->contr->digestion < 0)
		2511	op->stats.food += op->contr->digestion;
		2512	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2513	op->stats.food = last_food;
		2514	}
2560	}	2515	}
		2516
		2517	if (max_hp > 1)
		2518	{
		2519	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2520
		2521	if (over_hp > 0)
		2522	{
		2523	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2524	op->last_heal = 0;
		2525	}
		2526	else
		2527	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2561	}	2528	}
2562	else	2529	else
2563	{
2564	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2530	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2565	}	2531	}
2566	}	2532	}
2567		2533
2568	/* Digestion */	2534	/* Digestion */
2569	if (--op->last_eat < 0)	2535	if (--op->last_eat < 0)
2570	{	2536	{
2571	#ifdef COZY_SERVER	2537	int bonus = max (0, op->contr->digestion),
2572	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2538	penalty = max (0, -op->contr->digestion);
2573	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2574	#else
2575	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2576	#endif
2577		2539
2578	if (op->contr->gen_hp > 0)
2579	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2540	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2580	else
2581	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2582		2541
2583	/* dms do not consume food */	2542	/* dms do not consume food */
2584	if (!QUERY_FLAG (op, FLAG_WIZ))	2543	if (!QUERY_FLAG (op, FLAG_WIZ))
2585	op->stats.food--;	2544	op->stats.food--;
2586	}	2545	}
…		…
2613	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2572	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2614	manual_apply (op, flesh, 0);	2573	manual_apply (op, flesh, 0);
2615	}	2574	}
2616	}	2575	}
2617		2576
2618	while (op->stats.food < 0 && op->stats.hp >= 0)	2577	if (op->stats.food < 0)
2619	op->stats.food++, op->stats.hp--;	2578	{
		2579	op->stats.hp += op->stats.food;
		2580	op->stats.food = 0;
		2581	}
2620		2582
2621	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2583	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2622	kill_player (op);	2584	kill_player (op);
2623	}	2585	}
2624	}	2586	}
…		…
2629	* file.	2591	* file.
2630	*/	2592	*/
2631	void	2593	void
2632	kill_player (object *op)	2594	kill_player (object *op)
2633	{	2595	{
		2596	int x, y;
2634	char buf[MAX_BUF];	2597	char buf[MAX_BUF];
2635	int x, y;
2636
2637	//int i;
2638	maptile *map; /* this is for resurrection */	2598	maptile *map; /* this is for resurrection */
2639
2640	/* int z;
2641	int num_stats_lose;
2642	int lost_a_stat;
2643	int lose_this_stat;
2644	int this_stat; */
2645	int will_kill_again;	2599	int will_kill_again;
2646	archetype *at;	2600	archetype *at;
2647	object *tmp;	2601	object *tmp;
2648		2602
2649	if (save_life (op))	2603	if (save_life (op))
2650	return;	2604	return;
2651
2652		2605
2653	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2606	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2654	* in cities ONLY!!! It is very important that this doesn't get abused.	2607	* in cities ONLY!!! It is very important that this doesn't get abused.
2655	* Look at op_on_battleground() for more info --AndreasV	2608	* Look at op_on_battleground() for more info --AndreasV
2656	*/	2609	*/
…		…
2672	{	2625	{
2673	tmp->destroy ();	2626	tmp->destroy ();
2674	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2627	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2675	}	2628	}
2676		2629
2677	cure_disease (op, 0); /* remove any disease */	2630	cure_disease (op, 0, 0); /* remove any disease */
2678	op->stats.hp = op->stats.maxhp;	2631	op->stats.hp = op->stats.maxhp;
2679	if (op->stats.food <= 0)	2632	if (op->stats.food <= 0)
2680	op->stats.food = 999;	2633	op->stats.food = 999;
2681		2634
2682	/* create a bodypart-trophy to make the winner happy */	2635	/* create a bodypart-trophy to make the winner happy */
2683	if (object *tmp = arch_to_object (archetype::find ("finger")))	2636	if (object *tmp = arch_to_object (archetype::find ("finger")))
2684	{	2637	{
2685	sprintf (buf, "%s's finger", &op->name);	2638	tmp->name = format ("%s's finger" , &op->name);
2686	tmp->name = buf;	2639	tmp->name_pl = format ("%s's fingers", &op->name);
2687	sprintf (buf, " This finger has been cut off %s\n"
2688	" the %s, when he was defeated at\n level %d by %s.\n",
2689	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2690	tmp->msg = buf;	2640	tmp->msg = format (
		2641	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2642	&op->name, op->contr->title,
		2643	(int)op->level,
		2644	op->contr->killer_name ()
		2645	);
2691	tmp->value = 0, tmp->type = 0;	2646	tmp->value = 0, tmp->type = 0;
2692	tmp->materialname = "organics";	2647	tmp->materialname = "organics";
2693	tmp->insert_at (op, tmp);	2648	tmp->insert_at (op, tmp);
2694	}	2649	}
2695		2650
…		…
2703		2658
2704	command_kill_pets (op, 0);	2659	command_kill_pets (op, 0);
2705		2660
2706	if (op->stats.food < 0)	2661	if (op->stats.food < 0)
2707	{	2662	{
2708	sprintf (buf, "%s starved to death.", &op->name);	2663	op->contr->killer = archetype::get ("killer_starvation");
2709	strcpy (op->contr->killer, "starvation");	2664	op->contr->killer->destroy ();
2710	}	2665	}
2711	else
2712	sprintf (buf, "%s died.", &op->name);
2713		2666
2714	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2667	op->contr->play_sound (sound_find ("player_dies"));
2715		2668
2716	/* save the map location for corpse, gravestone */	2669	/* save the map location for corpse, gravestone */
2717	x = op->x;	2670	x = op->x;
2718	y = op->y;	2671	y = op->y;
2719	map = op->map;	2672	map = op->map;
…		…
2850	tmp = arch_to_object (archetype::find ("gravestone"));	2803	tmp = arch_to_object (archetype::find ("gravestone"));
2851	sprintf (buf, "%s's gravestone", &op->name);	2804	sprintf (buf, "%s's gravestone", &op->name);
2852	tmp->name = buf;	2805	tmp->name = buf;
2853	sprintf (buf, "%s's gravestones", &op->name);	2806	sprintf (buf, "%s's gravestones", &op->name);
2854	tmp->name_pl = buf;	2807	tmp->name_pl = buf;
2855	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2808	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2856	tmp->msg = buf;	2809	tmp->msg = buf;
2857	tmp->x = op->x, tmp->y = op->y;	2810	tmp->x = op->x, tmp->y = op->y;
2858	insert_ob_in_map (tmp, op->map, NULL, 0);	2811	insert_ob_in_map (tmp, op->map, NULL, 0);
2859		2812
2860	/**************************************/	2813	/**************************************/
…		…
2882	{	2835	{
2883	tmp->destroy ();	2836	tmp->destroy ();
2884	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2837	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2885	}	2838	}
2886		2839
2887	cure_disease (op, 0); /* remove any disease */	2840	cure_disease (op, 0, 0); /* remove any disease */
2888		2841
2889	/*add_exp(op, (op->stats.exp * -0.20)); */	2842	/*add_exp(op, (op->stats.exp * -0.20)); */
2890	apply_death_exp_penalty (op);	2843	apply_death_exp_penalty (op);
2891	if (op->stats.food < 100)	2844	if (op->stats.food < 100)
2892	op->stats.food = 900;	2845	op->stats.food = 900;
…		…
2896		2849
2897	/*	2850	/*
2898	* Check to see if the player has any unpaid items. If so, remove them	2851	* Check to see if the player has any unpaid items. If so, remove them
2899	* and put them back in the map.	2852	* and put them back in the map.
2900	*/	2853	*/
2901	remove_unpaid_objects (op->inv, op);	2854	op->drop_unpaid_items ();
2902		2855
2903	/****************************************/	2856	/****************************************/
2904	/* */	2857	/* */
2905	/* Move player to his current respawn- */	2858	/* Move player to his current respawn- */
2906	/* position (usually last savebed) */	2859	/* position (usually last savebed) */
…		…
2926	object *force;	2879	object *force;
2927	int at;	2880	int at;
2928		2881
2929	force = get_archetype (FORCE_NAME);	2882	force = get_archetype (FORCE_NAME);
2930	/* 50 ticks should be enough time for the spell to abate */	2883	/* 50 ticks should be enough time for the spell to abate */
2931	force->speed = 0.1;	2884	force->speed = 0.1f;
2932	force->speed_left = -5.0;	2885	force->speed_left = -5.f;
2933	SET_FLAG (force, FLAG_APPLIED);	2886	SET_FLAG (force, FLAG_APPLIED);
2934	for (at = 0; at < NROFATTACKS; at++)	2887	for (at = 0; at < NROFATTACKS; at++)
2935	if (will_kill_again & (1 << at))	2888	if (will_kill_again & (1 << at))
2936	force->resist[at] = 100;	2889	force->resist[at] = 100;
2937		2890
…		…
2965		2918
2966	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2919	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2967	{	2920	{
2968	if (tmp->nrof > 1)	2921	if (tmp->nrof > 1)
2969	{	2922	{
2970	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2923	tmp->decrease (rndm (1, tmp->nrof - 1));
2971	tmp2->destroy ();
2972	insert_ob_in_map (tmp, op->map, NULL, 0);	2924	insert_ob_in_map (tmp, op->map, NULL, 0);
2973	}	2925	}
2974	else	2926	else
2975	tmp->destroy ();	2927	tmp->destroy ();
2976	}	2928	}
…		…
2987	void	2939	void
2988	fix_weight (void)	2940	fix_weight (void)
2989	{	2941	{
2990	for_all_players (pl)	2942	for_all_players (pl)
2991	{	2943	{
2992	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2944	sint32 old = pl->ob->carrying;
2993		2945
2994	if (old == sum)	2946	pl->ob->update_weight ();
2995	continue;	2947
		2948	if (old != pl->ob->carrying)
		2949	{
2996	pl->ob->update_stats ();	2950	pl->ob->update_stats ();
2997	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2951	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2952	}
2998	}	2953	}
2999	}	2954	}
3000		2955
3001	void	2956	void
3002	fix_luck (void)	2957	fix_luck (void)
…		…
3046	void	3001	void
3047	make_visible (object *op)	3002	make_visible (object *op)
3048	{	3003	{
3049	op->hide = 0;	3004	op->hide = 0;
3050	op->invisible = 0;	3005	op->invisible = 0;
		3006
3051	if (op->type == PLAYER)	3007	if (op->type == PLAYER)
3052	{	3008	{
3053	op->contr->tmp_invis = 0;	3009	op->contr->tmp_invis = 0;
3054	op->contr->invis_race = 0;	3010	op->contr->invis_race = 0;
3055	}	3011	}
…		…
3058	}	3014	}
3059		3015
3060	int	3016	int
3061	is_true_undead (object *op)	3017	is_true_undead (object *op)
3062	{	3018	{
3063	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3019	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3064	return 1;	3020	return 1;
3065		3021
3066	return 0;	3022	return 0;
3067	}	3023	}
3068		3024
3069	/* look at the surrounding terrain to determine	3025	/* look at the surrounding terrain to determine
3070	* the hideability of this object. Positive levels	3026	* the hideability of this object. Positive levels
3071	* indicate greater hideability.	3027	* indicate greater hideability.
3072	*/	3028	*/
3073
3074	int	3029	int
3075	hideability (object *ob)	3030	hideability (object *ob)
3076	{	3031	{
3077	int i, level = 0, mflag;	3032	int i, level = 0, mflag;
3078	sint16 x, y;	3033	sint16 x, y;
…		…
3088	* as bad as carrying a light on a pitch dark map */	3043	* as bad as carrying a light on a pitch dark map */
3089	if (has_carried_lights (ob))	3044	if (has_carried_lights (ob))
3090	level = -(10 + (2 * ob->map->darkness));	3045	level = -(10 + (2 * ob->map->darkness));
3091		3046
3092	/* scan through all nearby squares for terrain to hide in */	3047	/* scan through all nearby squares for terrain to hide in */
3093	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3048	for (i = 0, x = ob->x, y = ob->y;
		3049	i <= SIZEOFFREE1;
		3050	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3094	{	3051	{
3095	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3052	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3096	if (mflag & P_OUT_OF_MAP)	3053	if (mflag & P_OUT_OF_MAP)
3097	{
3098	continue;	3054	continue;
3099	}	3055
3100	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3056	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3101	level += 2;	3057	level += 2;
3102	else /* open terrain! */	3058	else /* open terrain! */
3103	level -= 1;	3059	level -= 1;
3104	}	3060	}
…		…
3112	/* For Hidden creatures - a chance of becoming 'unhidden'	3068	/* For Hidden creatures - a chance of becoming 'unhidden'
3113	* every time they move - as we subtract off 'invisibility'	3069	* every time they move - as we subtract off 'invisibility'
3114	* AND, for players, if they move into a ridiculously unhideable	3070	* AND, for players, if they move into a ridiculously unhideable
3115	* spot (surrounded by clear terrain in broad daylight). -b.t.	3071	* spot (surrounded by clear terrain in broad daylight). -b.t.
3116	*/	3072	*/
3117
3118	void	3073	void
3119	do_hidden_move (object *op)	3074	do_hidden_move (object *op)
3120	{	3075	{
3121	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3076	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3122	object *skop;	3077	object *skop;
…		…
3204	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3205	* but we dont worry if the object isnt the top one in	3160	* but we dont worry if the object isnt the top one in
3206	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3207	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3208	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3209	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3210	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3211	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3212	* for them to differ. Sigh, this fctn could get a bit more complex.	3167	* for them to differ. Sigh, this fctn could get a bit more complex.
3213	* -b.t.	3168	* -b.t.
3214	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3215	*/	3170	*/
3216
3217	int	3171	int
3218	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3219	{	3173	{
3220	rv_vector rv;	3174	rv_vector rv;
3221	int dx, dy;	3175	int dx, dy;
…		…
3233		3187
3234	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3235		3189
3236	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3237	* through the object and find if it has any	3191	* through the object and find if it has any
3238	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3239	* a blocked los square.	3193	* a blocked los square.
3240	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3241	*/	3195	*/
3242	while (op)	3196	while (op)
3243	{	3197	{
3244	dx = rv.distance_x + op->arch->clone.x;	3198	dx = rv.distance_x + op->arch->x;
3245	dy = rv.distance_y + op->arch->clone.y;	3199	dy = rv.distance_y + op->arch->y;
3246		3200
3247	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3248	* code, so we need to restrict ourselves to that range of values	3202	* code, so we need to restrict ourselves to that range of values
3249	* for any meaningful values.	3203	* for any meaningful values.
3250	*/	3204	*/
3251	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3252	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3253	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3207	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3254	return 1;	3208	return 1;
		3209
3255	op = op->more;	3210	op = op->more;
3256	}	3211	}
		3212
3257	return 0;	3213	return 0;
3258	}	3214	}
3259		3215
3260	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3261	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3264	* return 0.	3220	* return 0.
3265	*/	3221	*/
3266	int	3222	int
3267	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3268	{	3224	{
3269
3270	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3271	{	3226	{
3272	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3273	return 0;	3228	return 0;
3274		3229
…		…
3280	{	3235	{
3281	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3236	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3282	return 1;	3237	return 1;
3283	}	3238	}
3284	}	3239	}
		3240
3285	return 0;	3241	return 0;
3286	}	3242	}
3287		3243
3288	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3289	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3294	* Default is to do the same as before, so only people wanting to have different points need worry about this	3250	* Default is to do the same as before, so only people wanting to have different points need worry about this
3295	*/	3251	*/
3296	int	3252	int
3297	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3298	{	3254	{
3299	object *tmp;
3300
3301	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3302	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3256	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3303	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3304	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3305	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3306	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3307	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3308	{	3262	{
3309	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3310	{	3264	{
3311	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3312	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3266	&& tmp->type == BATTLEGROUND
		3267	&& tmp->name == shstr_battleground
		3268	&& EXIT_X (tmp) && EXIT_Y (tmp))
3313	{	3269	{
3314	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3315	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3271	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3316	{	3272	{
3317	object *invtmp;
3318
3319	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3320	{	3274	{
3321	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3322	{	3276	{
3323	if (x != NULL && y != NULL)	3277	if (x && y)
3324	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3325	return 1;	3280	return 1;
3326	}	3281	}
3327	}	3282	}
3328	}	3283	}
		3284
3329	if (x != NULL && y != NULL)	3285	if (x && y)
3330	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3331	return 1;	3288	return 1;
3332	}	3289	}
3333	}	3290	}
3334	}	3291	}
		3292
3335	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3336	return 0;	3294	return 0;
3337	}	3295	}
3338		3296
3339	/*	3297	/*
…		…
3355	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3356	int i = 0, j = 0;	3314	int i = 0, j = 0;
3357		3315
3358	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3359	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3360	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3361	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3362	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3363	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3364	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3365	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3366	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3367		3325
3368	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3369	return;	3327	return;
3370		3328
3371	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3329	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3375	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3333	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3376	return;	3334	return;
3377	}	3335	}
3378		3336
3379	/* everything seems okay - now bring on the gift: */	3337	/* everything seems okay - now bring on the gift: */
3380	item = &(tr->item->clone);	3338	item = tr->item;
3381		3339
3382	if (item->type == SPELL)	3340	if (item->type == SPELL)
3383	{	3341	{
3384	if (check_spell_known (who, item->name))	3342	if (check_spell_known (who, item->name))
3385	return;	3343	return;
…		…
3444	{	3402	{
3445	/* forces in the treasurelist can alter the player's stats */	3403	/* forces in the treasurelist can alter the player's stats */
3446	object *skin;	3404	object *skin;
3447		3405
3448	/* first get the dragon skin force */	3406	/* first get the dragon skin force */
3449	shstr_cmp dragon_skin_force ("dragon_skin_force");
3450	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3407	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3451	;	3408	;
3452		3409
3453	if (!skin)	3410	if (!skin)
3454	return;	3411	return;
3455		3412
…		…
3490	else	3447	else
3491	{	3448	{
3492	/* generate misc. treasure */	3449	/* generate misc. treasure */
3493	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3494	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3451	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3495	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3496	if (who->type == PLAYER)
3497	esrv_send_item (who, tmp);
3498	}	3453	}
3499	}	3454	}
3500		3455
3501	/**	3456	/**
3502	* Unready an object for a player. This function does nothing if the object was	3457	* Unready an object for a player. This function does nothing if the object was
…		…
3531	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3486	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3532	return 0;	3487	return 0;
3533		3488
3534	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3535	}	3490	}
		3491
		3492	void
		3493	player::infobox (const char *title, const char *msg, int color)
		3494	{
		3495	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3496	}
		3497
		3498	void
		3499	player::statusmsg (const char *msg, int color)
		3500	{
		3501	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3502	}
		3503
		3504	void
		3505	player::failmsg (const char *msg, int color)
		3506	{
		3507	play_sound (sound_find ("generic_failure"));
		3508	statusmsg (msg, color);
		3509	}
		3510

Diff Legend

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