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.120 by root, Thu May 3 09:39:56 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 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
…		…
880		864
881	ob->contr->ns->state = ST_PLAYING;	865	ob->contr->ns->state = ST_PLAYING;
882		866
883	if (ob->msg)	867	if (ob->msg)
884	ob->msg = 0;	868	ob->msg = 0;
885
886	/* We create this now because some of the unique maps will need it
887	* to save here.
888	*/
889	{
890	char buf[MAX_BUF];
891	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
892	make_path_to_file (buf);
893	}
894		869
895	start_info (ob);	870	start_info (ob);
896	CLEAR_FLAG (ob, FLAG_WIZ);	871	CLEAR_FLAG (ob, FLAG_WIZ);
897	give_initial_items (ob, ob->randomitems);	872	give_initial_items (ob, ob->randomitems);
898	link_player_skills (ob);	873	link_player_skills (ob);
…		…
901		876
902	/* This moves the player to a different start map, if there	877	/* This moves the player to a different start map, if there
903	* is one for this race	878	* is one for this race
904	*/	879	*/
905	if (*first_map_ext_path)	880	if (*first_map_ext_path)
906	{	881	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
907	object *tmp;
908	char mapname[MAX_BUF];
909
910	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
911	tmp = object::create ();
912	EXIT_PATH (tmp) = mapname;
913	EXIT_X (tmp) = ob->x;
914	EXIT_Y (tmp) = ob->y;
915	ob->enter_exit (tmp); /* we don't really care if it succeeded;
916	* if the map isn't there, then stay on the
917	* default initial map */
918	tmp->destroy ();
919	}
920	else	882	else
921	LOG (llevDebug, "first_map_ext_path not set\n");	883	LOG (llevDebug, "first_map_ext_path not set\n");
922	}	884	}
923		885
924	void	886	void
…		…
934	int x = ob->x, y = ob->y;	896	int x = ob->x, y = ob->y;
935		897
936	ob->remove_statbonus ();	898	ob->remove_statbonus ();
937	ob->remove ();	899	ob->remove ();
938	ob->arch = get_player_archetype (ob->arch);	900	ob->arch = get_player_archetype (ob->arch);
939	ob->arch->clone.copy_to (ob);	901	ob->arch->copy_to (ob);
940	ob->instantiate ();	902	ob->instantiate ();
941	ob->stats = ob->contr->orig_stats;	903	ob->stats = ob->contr->orig_stats;
942	ob->name = ob->name_pl = name;	904	ob->name = ob->name_pl = name;
943	ob->x = x;	905	ob->x = x;
944	ob->y = y;	906	ob->y = y;
945	SET_ANIMATION (ob, 2); /* So player faces south */	907	SET_ANIMATION (ob, 2); /* So player faces south */
946	insert_ob_in_map (ob, ob->map, ob, 0);	908	insert_ob_in_map (ob, ob->map, ob, 0);
947	assign (ob->contr->title, ob->arch->clone.name);	909	assign (ob->contr->title, ob->arch->object::name);
948	ob->add_statbonus ();	910	ob->add_statbonus ();
949	}	911	}
950	while (!allowed_class (ob));	912	while (!allowed_class (ob));
951		913
952	update_object (ob, UP_OBJ_FACE);	914	update_object (ob, UP_OBJ_FACE);
…		…
1009	/* Cornered, get rid of scared */	971	/* Cornered, get rid of scared */
1010	CLEAR_FLAG (op, FLAG_SCARED);	972	CLEAR_FLAG (op, FLAG_SCARED);
1011	op->enemy = NULL;	973	op->enemy = NULL;
1012	}	974	}
1013		975
1014
1015	/* check_pick sees if there is stuff to be picked up/picks up stuff.	976	/* 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	977	* It returns 1 if the player should keep on moving, 0 if he should
1017	* stop.	978	* stop.
1018	*/	979	*/
1019	int	980	int
1020	check_pick (object *op)	981	check_pick (object *op)
1021	{	982	{
…		…
1028	if (op->move_type & MOVE_FLYING)	989	if (op->move_type & MOVE_FLYING)
1029	return 1;	990	return 1;
1030		991
1031	next = op->below;	992	next = op->below;
1032		993
		994	int cnt = MAX_ITEM_PER_DROP;
		995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		996
1033	/* loop while there are items on the floor that are not marked as	997	/* loop while there are items on the floor that are not marked as
1034	* destroyed */	998	* destroyed */
1035	while (next && !next->destroyed ())	999	while (next && !next->destroyed ())
1036	{	1000	{
1037	tmp = next;	1001	tmp = next;
1038	next = tmp->below;	1002	next = tmp->below;
1039		1003
		1004	if (cnt <= 0)
		1005	{
		1006	op->failmsg ("Couldn't pickup all items at once.");
		1007	return 0;
		1008	}
		1009
1040	if (op->destroyed ())	1010	if (op->destroyed ())
1041	return 0;	1011	return 0;
1042		1012
1043	if (!can_pick (op, tmp))	1013	if (!can_pick (op, tmp))
1044	continue;	1014	continue;
1045		1015
1046	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1047	{	1017	{
1048	if (item_matched_string (op, tmp, op->contr->search_str))	1018	if (item_matched_string (op, tmp, op->contr->search_str))
1049	pick_up (op, tmp);	1019	CHK_PICK_PICKUP;
1050	continue;	1020	continue;
1051	}	1021	}
1052		1022
1053	/* high not bit set? We're using the old autopickup model */	1023	/* high not bit set? We're using the old autopickup model */
1054	if (!(op->contr->mode & PU_NEWMODE))	1024	if (!(op->contr->mode & PU_NEWMODE))
…		…
1056	switch (op->contr->mode)	1026	switch (op->contr->mode)
1057	{	1027	{
1058	case 0:	1028	case 0:
1059	return 1; /* don't pick up */	1029	return 1; /* don't pick up */
1060	case 1:	1030	case 1:
1061	pick_up (op, tmp);	1031	CHK_PICK_PICKUP;
1062	return 1;	1032	return 1;
1063	case 2:	1033	case 2:
1064	pick_up (op, tmp);	1034	CHK_PICK_PICKUP;
1065	return 0;	1035	return 0;
1066	case 3:	1036	case 3:
1067	return 0; /* stop before pickup */	1037	return 0; /* stop before pickup */
1068	case 4:	1038	case 4:
1069	pick_up (op, tmp);	1039	CHK_PICK_PICKUP;
1070	break;	1040	break;
1071	case 5:	1041	case 5:
1072	pick_up (op, tmp);	1042	CHK_PICK_PICKUP;
1073	stop = 1;	1043	stop = 1;
1074	break;	1044	break;
1075	case 6:	1045	case 6:
1076	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1077	pick_up (op, tmp);	1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1048	CHK_PICK_PICKUP;
1078	break;	1049	break;
1079		1050
1080	case 7:	1051	case 7:
1081	if (tmp->type == MONEY || tmp->type == GEM)	1052	if (tmp->type == MONEY || tmp->type == GEM)
1082	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1083	break;	1054	break;
1084		1055
1085	default:	1056	default:
1086	/* use value density */	1057	/* use value density */
1087	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1088	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1059	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1089	pick_up (op, tmp);	1060	CHK_PICK_PICKUP;
1090	}	1061	}
1091	}	1062	}
1092	else	1063	else
1093	{ /* old model */	1064	{ /* old model */
1094	/* NEW pickup handling */	1065	/* NEW pickup handling */
…		…
1098	if (tmp->name != NULL)	1069	if (tmp->name != NULL)
1099	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1070	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))));	1071	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1101	else	1072	else
1102	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1073	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))));	1074	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1104		1075
1105	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1076	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1106	}	1077	}
1107		1078
1108	/* philosophy:	1079	/* philosophy:
…		…
1149	/* all food and drink if desired */	1120	/* all food and drink if desired */
1150	/* question: don't pick up known-poisonous stuff? */	1121	/* question: don't pick up known-poisonous stuff? */
1151	if (op->contr->mode & PU_FOOD)	1122	if (op->contr->mode & PU_FOOD)
1152	if (tmp->type == FOOD)	1123	if (tmp->type == FOOD)
1153	{	1124	{
1154	pick_up (op, tmp);	1125	CHK_PICK_PICKUP;
1155	continue;	1126	continue;
1156	}	1127	}
1157		1128
1158	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_DRINK)
1159	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1130	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1160	{	1131	{
1161	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1162	continue;	1133	continue;
1163	}	1134	}
1164		1135
1165	if (op->contr->mode & PU_POTION)	1136	if (op->contr->mode & PU_POTION)
1166	if (tmp->type == POTION)	1137	if (tmp->type == POTION)
1167	{	1138	{
1168	pick_up (op, tmp);	1139	CHK_PICK_PICKUP;
1169	continue;	1140	continue;
1170	}	1141	}
1171		1142
1172	/* spellbooks, skillscrolls and normal books/scrolls */	1143	/* spellbooks, skillscrolls and normal books/scrolls */
1173	if (op->contr->mode & PU_SPELLBOOK)	1144	if (op->contr->mode & PU_SPELLBOOK)
1174	if (tmp->type == SPELLBOOK)	1145	if (tmp->type == SPELLBOOK)
1175	{	1146	{
1176	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1177	continue;	1148	continue;
1178	}	1149	}
1179		1150
1180	if (op->contr->mode & PU_SKILLSCROLL)	1151	if (op->contr->mode & PU_SKILLSCROLL)
1181	if (tmp->type == SKILLSCROLL)	1152	if (tmp->type == SKILLSCROLL)
1182	{	1153	{
1183	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1184	continue;	1155	continue;
1185	}	1156	}
1186		1157
1187	if (op->contr->mode & PU_READABLES)	1158	if (op->contr->mode & PU_READABLES)
1188	if (tmp->type == BOOK || tmp->type == SCROLL)	1159	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1189	{	1160	{
1190	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1191	continue;	1162	continue;
1192	}	1163	}
1193		1164
1194	/* wands/staves/rods/horns */	1165	/* wands/staves/rods/horns */
1195	if (op->contr->mode & PU_MAGIC_DEVICE)	1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1196	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1167	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1197	{	1168	{
1198	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1199	continue;	1170	continue;
1200	}	1171	}
1201		1172
1202	/* pick up all magical items */	1173	/* pick up all magical items */
1203	if (op->contr->mode & PU_MAGICAL)	1174	if (op->contr->mode & PU_MAGICAL)
1204	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1175	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1205	{	1176	{
1206	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1207	continue;	1178	continue;
1208	}	1179	}
1209		1180
1210	if (op->contr->mode & PU_VALUABLES)	1181	if (op->contr->mode & PU_VALUABLES)
1211	{	1182	{
1212	if (tmp->type == MONEY || tmp->type == GEM)	1183	if (tmp->type == MONEY || tmp->type == GEM)
1213	{	1184	{
1214	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1215	continue;	1186	continue;
1216	}	1187	}
1217	}	1188	}
1218		1189
1219	/* rings & amulets - talismans seems to be typed AMULET */	1190	/* rings & amulets - talismans seems to be typed AMULET */
1220	if (op->contr->mode & PU_JEWELS)	1191	if (op->contr->mode & PU_JEWELS)
1221	if (tmp->type == RING || tmp->type == AMULET)	1192	if (tmp->type == RING || tmp->type == AMULET)
1222	{	1193	{
1223	pick_up (op, tmp);	1194	CHK_PICK_PICKUP;
1224	continue;	1195	continue;
1225	}	1196	}
1226		1197
1227	/* we don't forget dragon food */	1198	/* we don't forget dragon food */
1228	if (op->contr->mode & PU_FLESH)	1199	if (op->contr->mode & PU_FLESH)
1229	if (tmp->type == FLESH)	1200	if (tmp->type == FLESH)
1230	{	1201	{
1231	pick_up (op, tmp);	1202	CHK_PICK_PICKUP;
1232	continue;	1203	continue;
1233	}	1204	}
1234		1205
1235	/* bows and arrows. Bows are good for selling! */	1206	/* bows and arrows. Bows are good for selling! */
1236	if (op->contr->mode & PU_BOW)	1207	if (op->contr->mode & PU_BOW)
1237	if (tmp->type == BOW)	1208	if (tmp->type == BOW)
1238	{	1209	{
1239	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1240	continue;	1211	continue;
1241	}	1212	}
1242		1213
1243	if (op->contr->mode & PU_ARROW)	1214	if (op->contr->mode & PU_ARROW)
1244	if (tmp->type == ARROW)	1215	if (tmp->type == ARROW)
1245	{	1216	{
1246	pick_up (op, tmp);	1217	CHK_PICK_PICKUP;
1247	continue;	1218	continue;
1248	}	1219	}
1249		1220
1250	/* all kinds of armor etc. */	1221	/* all kinds of armor etc. */
1251	if (op->contr->mode & PU_ARMOUR)	1222	if (op->contr->mode & PU_ARMOUR)
1252	if (tmp->type == ARMOUR)	1223	if (tmp->type == ARMOUR)
1253	{	1224	{
1254	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1255	continue;	1226	continue;
1256	}	1227	}
1257		1228
1258	if (op->contr->mode & PU_HELMET)	1229	if (op->contr->mode & PU_HELMET)
1259	if (tmp->type == HELMET)	1230	if (tmp->type == HELMET)
1260	{	1231	{
1261	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1262	continue;	1233	continue;
1263	}	1234	}
1264		1235
1265	if (op->contr->mode & PU_SHIELD)	1236	if (op->contr->mode & PU_SHIELD)
1266	if (tmp->type == SHIELD)	1237	if (tmp->type == SHIELD)
1267	{	1238	{
1268	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1269	continue;	1240	continue;
1270	}	1241	}
1271		1242
1272	if (op->contr->mode & PU_BOOTS)	1243	if (op->contr->mode & PU_BOOTS)
1273	if (tmp->type == BOOTS)	1244	if (tmp->type == BOOTS)
1274	{	1245	{
1275	pick_up (op, tmp);	1246	CHK_PICK_PICKUP;
1276	continue;	1247	continue;
1277	}	1248	}
1278		1249
1279	if (op->contr->mode & PU_GLOVES)	1250	if (op->contr->mode & PU_GLOVES)
1280	if (tmp->type == GLOVES)	1251	if (tmp->type == GLOVES)
1281	{	1252	{
1282	pick_up (op, tmp);	1253	CHK_PICK_PICKUP;
1283	continue;	1254	continue;
1284	}	1255	}
1285		1256
1286	if (op->contr->mode & PU_CLOAK)	1257	if (op->contr->mode & PU_CLOAK)
1287	if (tmp->type == CLOAK)	1258	if (tmp->type == CLOAK)
1288	{	1259	{
1289	pick_up (op, tmp);	1260	CHK_PICK_PICKUP;
1290	continue;	1261	continue;
1291	}	1262	}
1292		1263
1293	/* hoping to catch throwing daggers here */	1264	/* hoping to catch throwing daggers here */
1294	if (op->contr->mode & PU_MISSILEWEAPON)	1265	if (op->contr->mode & PU_MISSILEWEAPON)
1295	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1296	{	1267	{
1297	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1298	continue;	1269	continue;
1299	}	1270	}
1300		1271
1301	/* careful: chairs and tables are weapons! */	1272	/* careful: chairs and tables are weapons! */
1302	if (op->contr->mode & PU_ALLWEAPON)	1273	if (op->contr->mode & PU_ALLWEAPON)
1303	{	1274	{
1304	if (tmp->type == WEAPON && tmp->name != NULL)	1275	if (tmp->type == WEAPON && tmp->name != NULL)
1305	{	1276	{
1306	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1277	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1307	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1308	{	1279	{
1309	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1310	continue;	1281	continue;
1311	}	1282	}
1312	}	1283	}
1313		1284
1314	if (tmp->type == WEAPON && tmp->name == NULL)	1285	if (tmp->type == WEAPON && tmp->name == NULL)
1315	{	1286	{
1316	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1287	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1317	{	1288	{
1318	pick_up (op, tmp);	1289	CHK_PICK_PICKUP;
1319	continue;	1290	continue;
1320	}	1291	}
1321	}	1292	}
1322	}	1293	}
1323		1294
1324	/* misc stuff that's useful */	1295	/* misc stuff that's useful */
1325	if (op->contr->mode & PU_KEY)	1296	if (op->contr->mode & PU_KEY)
1326	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1297	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1327	{	1298	{
1328	pick_up (op, tmp);	1299	CHK_PICK_PICKUP;
1329	continue;	1300	continue;
1330	}	1301	}
1331		1302
1332	/* any of the last 4 bits set means we use the ratio for value	1303	/* any of the last 4 bits set means we use the ratio for value
1333	* pickups */	1304	* pickups */
…		…
1338	/* >=7 is the old standard setting. Now we take the last 4 bits	1309	/* >=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 */	1310	* and multiply them by 5, giving 0..15*5== 5..75 */
1340	wvratio = (op->contr->mode & PU_RATIO) * 5;	1311	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)	1312	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1342	{	1313	{
1343	pick_up (op, tmp);	1314	CHK_PICK_PICKUP;
1344	#if 0	1315	#if 0
1345	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1346	if (tmp->name != NULL)	1317	if (tmp->name != NULL)
1347	{	1318	{
1348	fprintf (stderr, "%s", tmp->name);	1319	fprintf (stderr, "%s", tmp->name);
1349	}	1320	}
1350	else	1321	else
1351	fprintf (stderr, "%s", tmp->arch->name);	1322	fprintf (stderr, "%s", tmp->arch->archname);
1352	fprintf (stderr, ",%d] = ", tmp->type);	1323	fprintf (stderr, ",%d] = ", tmp->type);
1353	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1324	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1354	#endif	1325	#endif
1355	continue;	1326	continue;
1356	}	1327	}
…		…
1367	* found object is returned.	1338	* found object is returned.
1368	*/	1339	*/
1369	object *	1340	object *
1370	find_arrow (object *op, const char *type)	1341	find_arrow (object *op, const char *type)
1371	{	1342	{
1372	object *tmp = 0;
1373
1374	for (op = op->inv; op; op = op->below)	1343	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)	1344	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1345	return splay (tmp);
		1346
		1347	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1348	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1349	if (object *arrow = find_arrow (tmp, type))
		1350	{
		1351	splay (tmp);
1378	return op;	1352	return arrow;
		1353	}
1379		1354
1380	return tmp;	1355	return 0;
1381	}	1356	}
1382		1357
1383	/*	1358	/*
1384	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1359	* 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	1360	* against the target. A full test is not performed, simply a basic test
…		…
1408	}	1383	}
1409	}	1384	}
1410	else if (arrow->type == ARROW && arrow->race == type)	1385	else if (arrow->type == ARROW && arrow->race == type)
1411	{	1386	{
1412	/* allways prefer assasination/slaying */	1387	/* allways prefer assasination/slaying */
1413	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1414	{	1389	{
1415	if (arrow->attacktype & AT_DEATH)	1390	if (arrow->attacktype & AT_DEATH)
1416	{	1391	{
1417	*better = 100;	1392	*better = 100;
1418	return arrow;	1393	return arrow;
…		…
1426	else	1401	else
1427	{	1402	{
1428	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1403	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1429	{	1404	{
1430	attacktype = 1 << attacknum;	1405	attacktype = 1 << attacknum;
1431	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1406	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1432	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1407	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1433	{	1408	{
1434	tmp = arrow;	1409	tmp = arrow;
1435	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1410	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1436	}	1411	}
1437	}	1412	}
1438	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1413	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1439	{	1414	{
1440	tmp = arrow;	1415	tmp = arrow;
…		…
1446	betterby = 1 + arrow->magic + arrow->stats.dam;	1421	betterby = 1 + arrow->magic + arrow->stats.dam;
1447	}	1422	}
1448	}	1423	}
1449	}	1424	}
1450	}	1425	}
		1426
1451	if (tmp == NULL && arrow == NULL)	1427	if (tmp == NULL && arrow == NULL)
1452	return find_arrow (op, type);	1428	return find_arrow (op, type);
1453		1429
1454	*better = betterby;	1430	*better = betterby;
1455	return tmp;	1431	return tmp;
…		…
1533	*/	1509	*/
1534	int	1510	int
1535	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1511	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1536	{	1512	{
1537	object *left, *bow;	1513	object *left, *bow;
1538	int bowspeed, mflags;	1514	int mflags;
1539	maptile *m;	1515	maptile *m;
1540		1516
1541	if (!dir)	1517	if (!dir)
1542	{	1518	{
1543	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1519	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1544	return 0;	1520	return 0;
1545	}	1521	}
1546		1522
1547	if (player *pl = op->contr)	1523	if (op->contr)
1548	{	1524	bow = op->current_weapon;
1549	bow = pl->ranged_ob;
1550
1551	if (op->current_weapon != pl->ranged_ob)
1552	{
1553	op->current_weapon = pl->ranged_ob;
1554	new_draw_info_format (NDI_UNIQUE, 0, op, "You switch to your %s.", &op->current_weapon->name);
1555	op->update_stats ();
1556	}
1557	}
1558	else	1525	else
1559	{	1526	{
1560	for (bow = op->inv; bow; bow = bow->below)	1527	for (bow = op->inv; bow; bow = bow->below)
1561	/* Don't check for applied - monsters don't apply bows - in that way, they	1528	/* Don't check for applied - monsters don't apply bows - in that way, they
1562	* don't need to switch back and forth between bows and weapons.	1529	* don't need to switch back and forth between bows and weapons.
…		…
1583	{	1550	{
1584	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1551	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1585	return 0;	1552	return 0;
1586	}	1553	}
1587		1554
1588	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1589
1590	/* penalize ROF for bestarrow */
1591	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1592	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1593
1594	if (bowspeed < 1)
1595	bowspeed = 1;
1596
1597	if (arrow == NULL)	1555	if (arrow == NULL)
1598	{	1556	{
1599	if ((arrow = find_arrow (op, bow->race)) == NULL)	1557	if ((arrow = find_arrow (op, bow->race)) == NULL)
1600	{	1558	{
1601	if (op->type == PLAYER)	1559	if (op->type == PLAYER)
…		…
1624	arrow->destroy ();	1582	arrow->destroy ();
1625	return 0;	1583	return 0;
1626	}	1584	}
1627		1585
1628	left = arrow; /* these are arrows left to the player */	1586	left = arrow; /* these are arrows left to the player */
1629	arrow = get_split_ob (arrow, 1);	1587	arrow = arrow->split ();
1630	if (!arrow)	1588	if (!arrow)
1631	{	1589	{
1632	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1633	return 0;	1591	return 0;
1634	}	1592	}
1635		1593
1636	arrow->set_owner (op);	1594	arrow->set_owner (op);
1637	arrow->skill = bow->skill;	1595	arrow->skill = bow->skill;
1638	arrow->direction = dir;	1596	arrow->direction = dir;
1639		1597
1640	if (op->type == PLAYER)
1641	{
1642	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1643	op->update_stats ();
1644	}
1645
1646	SET_ANIMATION (arrow, arrow->direction);
1647
1648	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1598	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1649	arrow->stats.hp = arrow->stats.dam;	1599	arrow->stats.hp = arrow->stats.dam;
1650	arrow->stats.grace = arrow->attacktype;	1600	arrow->stats.grace = arrow->attacktype;
1651		1601
1652	if (arrow->slaying)	1602	if (arrow->slaying)
1653	arrow->spellarg = strdup (arrow->slaying);	1603	arrow->spellarg = strdup (arrow->slaying);
1654		1604
1655	arrow->stats.dam += op->stats.dam + arrow->magic;	1605	#if 0
		1606	if (player *pl = op->contr)
		1607	{
		1608	float speed = pl->weapon_sp;
		1609
		1610	/* penalize ROF for bestarrow */
		1611	if (pl->bowtype == bow_bestarrow)
		1612	speed *= .9f;
		1613	else
		1614	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1615
		1616	op->speed_left += speed - op->speed;
		1617	}
		1618	#endif
		1619
		1620	SET_ANIMATION (arrow, arrow->direction);
1656		1621
1657	/* update the speed */	1622	/* update the speed */
1658	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1623	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1659	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1624	+ bow->stats.dam / 7.f;
1660		1625
1661	arrow->set_speed (max (arrow->speed, 1.0));	1626	arrow->set_speed (max (arrow->speed, 2.f));
1662	arrow->speed_left = 0;	1627	arrow->speed_left = 0;
1663		1628
1664	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1629	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1665		1630
1666	if (op->type == PLAYER)	1631	if (op->type == PLAYER)
1667	{	1632	{
1668	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1633	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1669	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1634	wc -= dex_bonus[op->stats.Dex];
1670		1635
1671	if (!arrow->slaying)	1636	if (!arrow->slaying)
1672	arrow->slaying = op->slaying;	1637	arrow->slaying = op->slaying;
		1638
		1639	arrow->attacktype |= op->attacktype;
1673	}	1640	}
1674	else	1641	else
1675	{	1642	{
1676	arrow->level = op->level;	1643	arrow->level = op->level;
1677	arrow->stats.wc -= bow->magic;	1644	arrow->stats.wc -= bow->magic;
1678		1645
1679	if (!arrow->slaying)	1646	if (!arrow->slaying)
1680	arrow->slaying = bow->slaying;	1647	arrow->slaying = bow->slaying;
1681	}
1682		1648
1683	arrow->stats.wc -= arrow->level;
1684
1685	arrow->attacktype |= bow->attacktype;	1649	arrow->attacktype |= bow->attacktype;
		1650	}
1686		1651
		1652	wc -= arrow->level;
		1653	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1654
		1655	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1656	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1657	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689		1658
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1659	op->play_sound (sound_find ("fire_arrow"));
1691	m->insert (arrow, sx, sy, op);	1660	m->insert (arrow, sx, sy, op);
1692		1661
1693	if (!arrow->destroyed ())	1662	if (!arrow->destroyed ())
1694	move_arrow (arrow);	1663	move_arrow (arrow);
1695
1696	if (op->type == PLAYER)
1697	{
1698	if (left->destroyed ())
1699	esrv_del_item (op->contr, left->count);
1700	else
1701	esrv_send_item (op, left);
1702	}
1703		1664
1704	return 1;	1665	return 1;
1705	}	1666	}
1706		1667
1707	/* Special fire code for players - this takes into	1668	/* Special fire code for players - this takes into
…		…
1736	else if (op->contr->bowtype == bow_spreadshot)	1697	else if (op->contr->bowtype == bow_spreadshot)
1737	{	1698	{
1738	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1699	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1739	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1700	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1740	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1701	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1741
1742	}	1702	}
1743	else	1703	else
1744	{	1704	{
1745	/* Simple case */	1705	/* Simple case */
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1706	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747	}	1707	}
		1708
1748	return ret;	1709	return ret;
1749	}	1710	}
1750
1751		1711
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1712	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1713	* Broken apart from 'fire' to keep it more readable.
1754	*/	1714	*/
1755	void	1715	void
…		…
1767	{	1727	{
1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1728	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769	return;	1729	return;
1770	}	1730	}
1771		1731
		1732	if (!op->change_weapon (item))
		1733	return;
		1734
1772	if (item->type == WAND)	1735	if (item->type == WAND)
1773	{	1736	{
1774	if (item->stats.food <= 0)	1737	if (item->stats.food <= 0)
1775	{	1738	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1739	op->contr->play_sound (sound_find ("wand_poof"));
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1740	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1741
1778	return;	1742	return;
1779	}	1743	}
1780	}	1744	}
1781	else if (item->type == ROD || item->type == HORN)	1745	else if (item->type == ROD || item->type == HORN)
1782	{	1746	{
1783	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1747	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1748
		1749	// using the maximum of the rods charge allows at least one spell cast
		1750	// for a rod or horn, this fixes some broken rods.
		1751	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1784	{	1752	{
1785	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1753	op->contr->play_sound (sound_find ("wand_poof"));
		1754
1786	if (item->type == ROD)	1755	if (item->type == ROD)
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1756	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1788	else	1757	else
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1758	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1759
1790	return;	1760	return;
1791	}	1761	}
1792	}	1762	}
1793		1763
1794	if (cast_spell (op, item, dir, item->inv, NULL))	1764	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1801	object *tmp;	1771	object *tmp;
1802		1772
1803	if (item->arch)	1773	if (item->arch)
1804	{	1774	{
1805	CLEAR_FLAG (item, FLAG_ANIMATE);	1775	CLEAR_FLAG (item, FLAG_ANIMATE);
1806	item->face = item->arch->clone.face;	1776	item->face = item->arch->face;
1807	item->set_speed (0);	1777	item->set_speed (0);
1808	}	1778	}
1809		1779
1810	if ((tmp = item->in_player ()))	1780	if (object *pl = item->visible_to ())
1811	esrv_update_item (UPD_ANIM, tmp, item);	1781	esrv_update_item (UPD_ANIM, pl, item);
1812	}	1782	}
1813	}	1783	}
1814	else if (item->type == ROD || item->type == HORN)	1784	else if (item->type == ROD || item->type == HORN)
1815	drain_rod_charge (item);	1785	drain_rod_charge (item);
1816	}	1786	}
1817	}	1787	}
1818		1788
1819	/* Received a fire command for the player - go and do it.	1789	/* Received a fire command for the player - go and do it.
1820	*/	1790	*/
1821	void	1791	bool
1822	fire (object *op, int dir)	1792	fire (object *op, int dir)
1823	{	1793	{
1824	int spellcost = 0;	1794	int spellcost = 0;
1825		1795
1826	/* check for loss of invisiblity/hide */	1796	/* check for loss of invisiblity/hide */
…		…
1830	player *pl = op->contr;	1800	player *pl = op->contr;
1831		1801
1832	if (pl->golem)	1802	if (pl->golem)
1833	{	1803	{
1834	control_golem (op->contr->golem, dir);	1804	control_golem (op->contr->golem, dir);
1835	return;	1805	return false;
1836	}	1806	}
1837		1807
1838	object *ob = pl->ranged_ob;	1808	object *ob = pl->ranged_ob;
1839		1809
1840	if (!ob)	1810	if (!ob)
1841	return;	1811	return false;
		1812
		1813	if (!op->change_weapon (ob))
		1814	return false;
		1815
		1816	if (op->speed_left > 0.f)
		1817	--op->speed_left;
		1818	else
		1819	return false;
1842		1820
1843	switch (ob->type)	1821	switch (ob->type)
1844	{	1822	{
1845	case BOW:	1823	case BOW:
1846	player_fire_bow (op, dir);	1824	player_fire_bow (op, dir);
…		…
1853	case BUILDER:	1831	case BUILDER:
1854	apply_map_builder (op, dir);	1832	apply_map_builder (op, dir);
1855	break;	1833	break;
1856		1834
1857	case SKILL:	1835	case SKILL:
1858	case SKILL_TOOL:
1859	do_skill (op, op, ob, dir, 0);	1836	do_skill (op, op, ob, dir, 0);
1860	break;	1837	break;
1861		1838
1862	default:	1839	default:
1863	fire_misc_object (op, dir);	1840	fire_misc_object (op, dir);
1864	break;	1841	break;
1865	}	1842	}
		1843
		1844	return true;
1866	}	1845	}
1867		1846
1868	/* find_key	1847	/* find_key
1869	* We try to find a key for the door as passed. If we find a key	1848	* We try to find a key for the door as passed. If we find a key
1870	* and successfully use it, we return the key, otherwise NULL	1849	* and successfully use it, we return the key, otherwise NULL
…		…
1957	* 0 otherwise	1936	* 0 otherwise
1958	*/	1937	*/
1959	static int	1938	static int
1960	player_attack_door (object *op, object *door)	1939	player_attack_door (object *op, object *door)
1961	{	1940	{
1962	/* If its a door, try to find a use a key. If we do destroy the door,	1941	/* If its a door, try to find a key. If we do destroy the door,
1963	* might as well return immediately as there is nothing more to do -	1942	* might as well return immediately as there is nothing more to do -
1964	* otherwise, we fall through to the rest of the code.	1943	* otherwise, we fall through to the rest of the code.
1965	*/	1944	*/
1966	object *key = find_key (op, op, door);	1945	object *key = find_key (op, op, door);
1967		1946
1968	/* IF we found a key, do some extra work */	1947	/* If we found a key, do some extra work */
1969	if (key)	1948	if (key)
1970	{	1949	{
1971	object *container = key->env;	1950	object *container = key->env;
1972
1973	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1974		1951
1975	if (action_makes_visible (op))	1952	if (action_makes_visible (op))
1976	make_visible (op);	1953	make_visible (op);
1977		1954
1978	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1955	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1980		1957
1981	if (door->type == DOOR)	1958	if (door->type == DOOR)
1982	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1959	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1983	else if (door->type == LOCKED_DOOR)	1960	else if (door->type == LOCKED_DOOR)
1984	{	1961	{
1985	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1962	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1986	remove_door2 (door); /* remove door without violence ;-) */	1963	remove_door2 (door); /* remove door without violence ;-) */
1987	}	1964	}
1988		1965
1989	/* Do this after we print the message */	1966	/* Do this after we print the message */
1990	decrease_ob (key); /* Use up one of the keys */	1967	key->decrease (); /* Use up one of the keys */
1991	/* Need to update the weight the container the key was in */
1992	if (container != op)
1993	esrv_update_item (UPD_WEIGHT, op, container);
1994		1968
1995	return 1; /* Nothing more to do below */	1969	return 1; /* Nothing more to do below */
1996	}	1970	}
1997	else if (door->type == LOCKED_DOOR)	1971	else if (door->type == LOCKED_DOOR)
1998	{	1972	{
1999	/* Might as well return now - no other way to open this */	1973	/* Might as well return now - no other way to open this */
2000	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1974	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2001	return 1;	1975	return 1;
2002	}	1976	}
2003		1977
2004	return 0;	1978	return 0;
2005	}	1979	}
…		…
2008	* It should keep the code cleaner.	1982	* It should keep the code cleaner.
2009	* When this is called, the players direction has been updated	1983	* When this is called, the players direction has been updated
2010	* (taking into account confusion.) The player is also actually	1984	* (taking into account confusion.) The player is also actually
2011	* going to try and move (not fire weapons).	1985	* going to try and move (not fire weapons).
2012	*/	1986	*/
2013	void	1987	bool
2014	move_player_attack (object *op, int dir)	1988	move_player_attack (object *op, int dir)
2015	{	1989	{
2016	object *tmp, *mon;
2017	int on_battleground;	1990	int on_battleground;
2018	maptile *m;
2019		1991
2020	sint16 nx = freearr_x[dir] + op->x;	1992	sint16 nx = freearr_x[dir] + op->x;
2021	sint16 ny = freearr_y[dir] + op->y;	1993	sint16 ny = freearr_y[dir] + op->y;
2022		1994
2023	on_battleground = op_on_battleground (op, 0, 0);	1995	on_battleground = op_on_battleground (op, 0, 0);
		1996
		1997	if (out_of_map (op->map, nx, ny))
		1998	return false;
		1999
		2000	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2001	{
		2002	--op->speed_left;
		2003	return true;
		2004	}
2024		2005
2025	/* If braced, or can't move to the square, and it is not out of the	2006	/* If braced, or can't move to the square, and it is not out of the
2026	* map, attack it. Note order of if statement is important - don't	2007	* map, attack it. Note order of if statement is important - don't
2027	* want to be calling move_ob if braced, because move_ob will move the	2008	* want to be calling move_ob if braced, because move_ob will move the
2028	* player. This is a pretty nasty hack, because if we could	2009	* player. This is a pretty nasty hack, because if we could
2029	* move to some space, it then means that if we are braced, we should	2010	* move to some space, it then means that if we are braced, we should
2030	* do nothing at all. As it is, if we are braced, we go through	2011	* do nothing at all. As it is, if we are braced, we go through
2031	* quite a bit of processing. However, it probably is less than what	2012	* quite a bit of processing. However, it probably is less than what
2032	* move_ob uses.	2013	* move_ob uses.
2033	*/	2014	*/
2034	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2035	{
2036	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2037	{
2038	m = op->map->xy_find (nx, ny);	2015	maptile *m = op->map->xy_find (nx, ny);
2039	if (!m)
2040	return; /* Don't think this should happen */
2041	}
2042	else
2043	m = op->map;
2044		2016
2045	if (!(tmp = m->at (nx, ny).bot))
2046	return;
2047
2048	mon = 0;
2049	/* Go through all the objects, and find ones of interest. Only stop if	2017	/* Go through all the objects, and find ones of interest. Only stop if
2050	* we find a monster - that is something we know we want to attack.	2018	* we find a monster - that is something we know we want to attack.
2051	* if its a door or barrel (can roll) see if there may be monsters	2019	* if its a door or barrel (can roll) see if there may be monsters
2052	* on the space	2020	* on the space
2053	*/	2021	*/
2054	while (tmp)	2022	object *mon;
2055	{	2023	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2056	if (tmp == op)	2024	{
2057	{	2025	if ((mon->flag [FLAG_ALIVE]
2058	tmp = tmp->above;	2026	|| mon->type == LOCKED_DOOR
2059	continue;	2027	|| mon->flag [FLAG_CAN_ROLL])
2060	}
2061
2062	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2063	{
2064	mon = tmp;	2028	&& mon != op)
2065	break;	2029	break;
2066	}	2030	}
2067		2031
2068	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2069	mon = tmp;
2070
2071	tmp = tmp->above;
2072	}
2073
2074	if (!mon) /* This happens anytime the player tries to move */	2032	if (!mon) /* This happens anytime the player tries to move */
2075	return; /* into a wall */	2033	return false; /* into a wall */
2076		2034
2077	if (mon->head)
2078	mon = mon->head;	2035	mon = mon->head_ ();
2079		2036
2080	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2037	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2038	if (op->contr->weapon_sp_left > 0.f)
2081	if (player_attack_door (op, mon))	2039	if (player_attack_door (op, mon))
		2040	{
		2041	--op->contr->weapon_sp_left;
2082	return;	2042	return true;
		2043	}
2083		2044
2084	/* The following deals with possibly attacking peaceful	2045	/* The following deals with possibly attacking peaceful
2085	* or frienddly creatures. Basically, all players are considered	2046	* or friendly creatures. Basically, all players are considered
2086	* unaggressive. If the moving player has peaceful set, then the	2047	* unaggressive. If the moving player has peaceful set, then the
2087	* object should be pushed instead of attacked. It is assumed that	2048	* object should be pushed instead of attacked. It is assumed that
2088	* if you are braced, you will not attack friends accidently,	2049	* if you are braced, you will not attack friends accidently,
2089	* and thus will not push them.	2050	* and thus will not push them.
2090	*/	2051	*/
2091		2052
2092	/* If the creature is a pet, push it even if the player is not	2053	/* If the creature is a pet, push it even if the player is not
2093	* peaceful. Our assumption is the creature is a pet if the	2054	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2055	* player owns it and it is either friendly or unagressive.
2095	*/	2056	*/
2096	if ((op->type == PLAYER)	2057	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2058	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2059	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2060	|| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2061	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2062	{
2106	/* If we're braced, we don't want to switch places with it */	2063	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced)	2064	if (op->contr->braced)
2108	return;	2065	return false;
2109		2066
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2067	if (op->speed_left > 0.f)
		2068	{
		2069	--op->speed_left;
		2070
		2071	op->play_sound (sound_find ("push_player"));
2111	push_ob (mon, dir, op);	2072	push_ob (mon, dir, op);
		2073
2112	if (op->contr->tmp_invis || op->hide)	2074	if (op->contr->tmp_invis || op->hide)
2113	make_visible (op);	2075	make_visible (op);
2114		2076
2115	return;	2077	return true;
2116	}	2078	}
		2079	else
		2080	return false;
		2081	}
2117		2082
2118	/* in certain circumstances, you shouldn't attack friendly	2083	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2084	* creatures. Note that if you are braced, you can't push
2120	* someone, but put it inside this loop so that you won't	2085	* someone, but put it inside this loop so that you won't
2121	* attack them either.	2086	* attack them either.
2122	*/	2087	*/
2123	if ((mon->type == PLAYER || mon->enemy != op) &&	2088	if ((mon->type == PLAYER || mon->enemy != op)
2124	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2089	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2090	&& ((op->contr->peaceful
2127	|| (mon->type == PLAYER	2091	|| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2092	&& !on_battleground))
		2093	{
		2094	if (op->speed_left > 0.f)
2134	{	2095	{
		2096	--op->speed_left;
		2097
2135	if (!op->contr->braced)	2098	if (!op->contr->braced)
2136	{	2099	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2100	op->play_sound (sound_find ("push_player"));
2138	push_ob (mon, dir, op);	2101	push_ob (mon, dir, op);
2139	}	2102	}
2140	else	2103	else
2141	new_draw_info (0, 0, op, "You withhold your attack");	2104	op->statusmsg ("You withhold your attack");
2142		2105
2143	if (op->contr->tmp_invis || op->hide)	2106	if (op->contr->tmp_invis || op->hide)
2144	make_visible (op);	2107	make_visible (op);
2145	}
2146		2108
		2109	return true;
		2110	}
		2111	}
2147	/* If the object is a boulder or other rollable object, then	2112	/* If the object is a boulder or other rollable object, then
2148	* roll it if not braced. You can't roll it if you are braced.	2113	* roll it if not braced. You can't roll it if you are braced.
2149	*/	2114	*/
2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2115	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2116	{
		2117	if (op->speed_left > 0.f)
2151	{	2118	{
		2119	--op->speed_left;
		2120
2152	recursive_roll (mon, dir, op);	2121	recursive_roll (mon, dir, op);
2153	if (action_makes_visible (op))	2122	if (action_makes_visible (op))
2154	make_visible (op);	2123	make_visible (op);
2155	}
2156		2124
		2125	return true;
		2126	}
		2127	}
2157	/* Any generic living creature. Including things like doors.	2128	/* Any generic living creature. Including things like doors.
2158	* Way it works is like this: First, it must have some hit points	2129	* Way it works is like this: First, it must have some hit points
2159	* and be living. Then, it must be one of the following:	2130	* and be living. Then, it must be one of the following:
2160	* 1) Not a player, 2) A player, but of a different party. Note	2131	* 1) Not a player, 2) A player, but of a different party. Note
2161	* that party_number -1 is no party, so attacks can still happen.	2132	* that party_number -1 is no party, so attacks can still happen.
2162	*/	2133	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2134	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2164	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2135	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2165	{	2136	{
2166		2137	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2167	/* If the player hasn't hit something this tick, and does
2168	* so, give them speed boost based on weapon speed. Doing
2169	* it here is better than process_players2, which basically
2170	* incurred a 1 tick offset.
2171	*/
2172	if (!op->contr->has_hit)
2173	{	2138	{
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2139	--op->contr->weapon_sp_left;
2175
2176	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2177	}
2178		2140
2179	skill_attack (mon, op, 0, 0, 0);	2141	skill_attack (mon, op, 0, 0, 0);
2180
2181	/* If attacking another player, that player gets automatic
2182	* hitback, and doesn't loose luck either.
2183	* Disable hitback on the battleground or if the target is
2184	* the wiz.
2185	*/
2186	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2187	{
2188	short luck = mon->stats.luck;
2189
2190	mon->contr->has_hit = 1;
2191	skill_attack (op, mon, 0, 0, 0);
2192	mon->stats.luck = luck;
2193	}
2194		2142
2195	if (action_makes_visible (op))	2143	if (action_makes_visible (op))
2196	make_visible (op);	2144	make_visible (op);
2197	}
2198	} /* if player should attack something */
2199	}
2200		2145
2201	int	2146	return true;
		2147	}
		2148	}
		2149
		2150	return false;
		2151	}
		2152
		2153	bool
2202	move_player (object *op, int dir)	2154	move_player (object *op, int dir)
2203	{	2155	{
2204	int pick;	2156	int pick;
2205		2157
2206	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2158	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2207	return 0;	2159	return 0;
2208		2160
2209	/* Sanity check: make sure dir is valid */	2161	/* Sanity check: make sure dir is valid */
2210	if ((dir < 0) || (dir >= 9))	2162	if ((dir < 0) || (dir >= 9))
2211	{	2163	{
…		…
2220	op->facing = dir;	2172	op->facing = dir;
2221		2173
2222	if (op->hide)	2174	if (op->hide)
2223	do_hidden_move (op);	2175	do_hidden_move (op);
2224		2176
		2177	bool retval;
		2178
2225	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2179	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2226	/*nop */ ;	2180	retval = RESULT_INT (0);
2227	else if (op->contr->fire_on)	2181	else if (op->contr->fire_on)
2228	fire (op, dir);	2182	retval = fire (op, dir);
2229	else	2183	else
2230	{	2184	{
2231	move_player_attack (op, dir);	2185	retval = move_player_attack (op, dir);
2232	pick = check_pick (op);	2186	pick = check_pick (op);
2233	}	2187	}
2234		2188
2235	/* Add special check for newcs players and fire on - this way, the	2189	/* Add special check for newcs players and fire on - this way, the
2236	* server can handle repeat firing.	2190	* server can handle repeat firing.
…		…
2243	/* Update how the player looks. Use the facing, so direction may	2197	/* Update how the player looks. Use the facing, so direction may
2244	* get reset to zero. This allows for full animation capabilities	2198	* get reset to zero. This allows for full animation capabilities
2245	* for players.	2199	* for players.
2246	*/	2200	*/
2247	animate_object (op, op->facing);	2201	animate_object (op, op->facing);
2248	return 0;	2202
		2203	return retval;
2249	}	2204	}
2250		2205
2251	/* This is similar to handle_player, below, but is only used by the	2206	/* This is similar to handle_player, below, but is only used by the
2252	* new client/server stuff.	2207	* new client/server stuff.
2253	* This is sort of special, in that the new client/server actually uses	2208	* This is sort of special, in that the new client/server actually uses
2254	* the new speed values for commands.	2209	* the new speed values for commands.
2255	*	2210	*
2256	* Returns true if there are more actions we can do.	2211	* Returns true if there are more actions we can do. Should not do
		2212	* many actions in a row, as that would be too unfair to other
		2213	* players.
2257	*/	2214	*/
2258	int	2215	bool
2259	handle_newcs_player (object *op)	2216	handle_newcs_player (object *op)
2260	{	2217	{
2261	if (QUERY_FLAG (op, FLAG_SCARED))	2218	if (QUERY_FLAG (op, FLAG_SCARED))
2262	{	2219	{
2263	flee_player (op);	2220	if (op->speed_left > 0.f)
2264	/* If player is still scared, that is his action for this tick */
2265	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2221	{
2267	op->speed_left--;	2222	--op->speed_left;
		2223	flee_player (op);
		2224
2268	return 0;	2225	return true;
2269	}	2226	}
		2227	else
		2228	return false;
2270	}	2229	}
2271		2230
2272	/* call this here - we also will call this in do_ericserver, but	2231	/* call this here - we also will call this in do_ericserver, but
2273	* the players time has been increased when doericserver has been	2232	* the players time has been increased when doericserver has been
2274	* called, so we recheck it here.	2233	* called, so we recheck it here.
2275	*/	2234	*/
2276	if (op->contr->ns->handle_command ())	2235	if (op->contr->ns->handle_command ())
2277	return 1;	2236	return true;
2278		2237
2279	if (op->speed_left > 0)
2280	{
2281	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2238	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2282	{
2283	/* All move commands take 1 tick, at least for now */
2284	op->speed_left--;
2285
2286	/* Instead of all the stuff below, let move_player take care
2287	* of it. Also, some of the skill stuff is only put in
2288	* there, as well as the confusion stuff.
2289	*/
2290	move_player (op, op->direction);	2239	return move_player (op, op->direction);
2291		2240
2292	return op->speed_left > 0;
2293	}
2294	}
2295
2296	return 0;	2241	return false;
2297	}	2242	}
2298		2243
2299	int	2244	int
2300	save_life (object *op)	2245	save_life (object *op)
2301	{	2246	{
…		…
2303	return 0;	2248	return 0;
2304		2249
2305	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2250	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2306	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2251	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2307	{	2252	{
2308	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2253	op->play_sound (sound_find ("ob_evaporate"));
2309	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2254	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2310
2311	if (op->contr)
2312	esrv_del_item (op->contr, tmp->count);
2313		2255
2314	tmp->destroy ();	2256	tmp->destroy ();
2315	CLEAR_FLAG (op, FLAG_LIFESAVE);	2257	CLEAR_FLAG (op, FLAG_LIFESAVE);
2316		2258
2317	if (op->stats.hp < 0)	2259	if (op->stats.hp < 0)
…		…
2330	return 0;	2272	return 0;
2331	}	2273	}
2332		2274
2333	/* This goes throws the inventory and removes unpaid objects, and puts them	2275	/* This goes throws the inventory and removes unpaid objects, and puts them
2334	* back in the map (location and map determined by values of env). This	2276	* back in the map (location and map determined by values of env). This
2335	* function will descend into containers. op is the object to start the search	2277	* function will descend into containers. op is the object to start the search
2336	* from.	2278	* from.
2337	*/	2279	*/
		2280	static void
		2281	drop_unpaid_items (object *op, object *env)
		2282	{
		2283	while (op)
		2284	{
		2285	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2286
		2287	if (QUERY_FLAG (op, FLAG_UNPAID))
		2288	op->insert_at (env);
		2289	else if (op->inv)
		2290	drop_unpaid_items (op->inv, env);
		2291
		2292	op = next;
		2293	}
		2294	}
		2295
2338	void	2296	void
2339	remove_unpaid_objects (object *op, object *env)	2297	object::drop_unpaid_items ()
2340	{	2298	{
2341	while (op)	2299	if (!flag [FLAG_REMOVED])
2342	{	2300	::drop_unpaid_items (inv, this);
2343	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2344
2345	if (QUERY_FLAG (op, FLAG_UNPAID))
2346	{
2347	if (env->type == PLAYER)
2348	esrv_del_item (env->contr, op->count);
2349
2350	op->insert_at (env);
2351	}
2352	else if (op->inv)
2353	remove_unpaid_objects (op->inv, env);
2354
2355	op = next;
2356	}
2357	}	2301	}
2358		2302
2359	/*	2303	/*
2360	* Returns pointer a static string containing gravestone text	2304	* Returns pointer a static string containing gravestone text
2361	* Moved from apply.c to player.c - player.c is what	2305	* Moved from apply.c to player.c - player.c is what
2362	* actually uses this function. player.c may not be quite the	2306	* actually uses this function. player.c may not be quite the
2363	* best, a misc file for object actions is probably better,	2307	* best, a misc file for object actions is probably better,
2364	* but there isn't one in the server directory.	2308	* but there isn't one in the server directory.
2365	*/	2309	*/
2366	char *	2310	const char *
2367	gravestone_text (object *op)	2311	gravestone_text (object *op)
2368	{	2312	{
2369	static char buf2[MAX_BUF];	2313	static dynbuf_text buf;
2370	char buf[MAX_BUF];
2371	time_t now = time (NULL);
2372		2314
2373	strcpy (buf2, " R.I.P.\n\n");	2315	buf << "---- R.I.P. ----\n\n";
		2316	op->name;
		2317
2374	if (op->type == PLAYER)	2318	if (op->type == PLAYER)
2375	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2319	buf << " the " << op->contr->title;
2376	else
2377	sprintf (buf, "%s\n", &op->name);
2378		2320
2379	strncat (buf2, " ", 20 - strlen (buf) / 2);	2321	buf << "\n\n";
2380	strcat (buf2, buf);	2322
		2323	buf << "who was level ";
		2324	buf << (sint32)op->level << "\n\n" // OO breakdown
		2325	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2326
2381	if (op->type == PLAYER)	2327	if (op->type == PLAYER)
2382	sprintf (buf, "who was in level %d when killed\n", op->level);	2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2383	else
2384	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2385		2329
2386	strncat (buf2, " ", 20 - strlen (buf) / 2);
2387	strcat (buf2, buf);
2388	if (op->type == PLAYER)
2389	{	2330	{
2390	sprintf (buf, "by %s.\n\n", op->contr->killer);	2331	static char buf2[128];
2391	strncat (buf2, " ", 21 - strlen (buf) / 2);	2332	time_t now = time (NULL);
2392	strcat (buf2, buf);
2393	}
2394
2395	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2396	strncat (buf2, " ", 20 - strlen (buf) / 2);	2334	buf << buf2;
2397	strcat (buf2, buf);	2335	}
2398		2336
2399	return buf2;	2337	return buf;
2400	}	2338	}
2401		2339
2402	void	2340	void
2403	do_some_living (object *op)	2341	do_some_living (object *op)
2404	{	2342	{
…		…
2456	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2394	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2457	else	2395	else
2458	{	2396	{
2459	gen_grace = op->stats.maxgrace;	2397	gen_grace = op->stats.maxgrace;
2460	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2398	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2461	}
2462
2463	/* Regenerate Spell Points */
2464	if (!op->contr->golem && --op->last_sp < 0)
2465	{
2466	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2467	if (op->stats.sp < op->stats.maxsp)
2468	{
2469	op->stats.sp++;
2470	/* dms do not consume food */
2471	if (!QUERY_FLAG (op, FLAG_WIZ))
2472	{
2473	op->stats.food--;
2474	if (op->contr->digestion < 0)
2475	op->stats.food += op->contr->digestion;
2476	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2477	op->stats.food = last_food;
2478	}
2479	}
2480
2481	if (max_sp > 1)
2482	{
2483	over_sp = (gen_sp + 10) / rate_sp;
2484	if (over_sp > 0)
2485	{
2486	if (op->stats.sp < op->stats.maxsp)
2487	{
2488	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2489
2490	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2491	op->stats.sp--;
2492
2493	if (op->stats.sp > op->stats.maxsp)
2494	op->stats.sp = op->stats.maxsp;
2495	}
2496	op->last_sp = 0;
2497	}
2498	else
2499	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2500	}
2501	else
2502	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2503	}	2399	}
2504		2400
2505	/* Regenerate Grace */	2401	/* Regenerate Grace */
2506	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2402	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2507	if (--op->last_grace < 0)	2403	if (--op->last_grace < 0)
…		…
2528	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2424	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2529	}	2425	}
2530	/* wearing stuff doesn't detract from grace generation. */	2426	/* wearing stuff doesn't detract from grace generation. */
2531	}	2427	}
2532		2428
		2429	if (op->stats.food > 0)
		2430	{
2533	/* Regenerate Hit Points */	2431	/* Regenerate Spell Points */
2534	if (--op->last_heal < 0)	2432	if (!op->contr->golem && --op->last_sp < 0)
2535	{
2536	if (op->stats.hp < op->stats.maxhp)
2537	{	2433	{
2538	op->stats.hp++;	2434	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539	/* dms do not consume food */	2435
2540	if (!QUERY_FLAG (op, FLAG_WIZ))	2436	if (op->stats.sp < op->stats.maxsp)
2541	{	2437	{
		2438	op->stats.sp++;
		2439
		2440	/* dms do not consume food */
		2441	if (!QUERY_FLAG (op, FLAG_WIZ))
		2442	{
2542	op->stats.food--;	2443	op->stats.food--;
		2444
2543	if (op->contr->digestion < 0)	2445	if (op->contr->digestion < 0)
2544	op->stats.food += op->contr->digestion;	2446	op->stats.food += op->contr->digestion;
2545	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2447	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2546	op->stats.food = last_food;	2448	op->stats.food = last_food;
		2449	}
2547	}	2450	}
2548	}
2549		2451
2550	if (max_hp > 1)	2452	if (max_sp > 1)
2551	{
2552	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2553	if (over_hp > 0)
2554	{	2453	{
2555	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2454	over_sp = (gen_sp + 10) / rate_sp;
		2455	if (over_sp > 0)
		2456	{
		2457	if (op->stats.sp < op->stats.maxsp)
		2458	{
		2459	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2460
		2461	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2462	op->stats.sp--;
		2463
		2464	if (op->stats.sp > op->stats.maxsp)
		2465	op->stats.sp = op->stats.maxsp;
		2466	}
		2467
2556	op->last_heal = 0;	2468	op->last_sp = 0;
		2469	}
		2470	else
		2471	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2557	}	2472	}
2558	else	2473	else
		2474	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2475	}
		2476
		2477	/* Regenerate Hit Points */
		2478	if (--op->last_heal < 0)
		2479	{
		2480	if (op->stats.hp < op->stats.maxhp)
2559	{	2481	{
2560	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2482	op->stats.hp++;
		2483
		2484	/* dms do not consume food */
		2485	if (!QUERY_FLAG (op, FLAG_WIZ))
		2486	{
		2487	op->stats.food--;
		2488
		2489	if (op->contr->digestion < 0)
		2490	op->stats.food += op->contr->digestion;
		2491	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2492	op->stats.food = last_food;
		2493	}
2561	}	2494	}
		2495
		2496	if (max_hp > 1)
		2497	{
		2498	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2499
		2500	if (over_hp > 0)
		2501	{
		2502	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2503	op->last_heal = 0;
		2504	}
		2505	else
		2506	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2562	}	2507	}
2563	else	2508	else
2564	{
2565	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2509	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2566	}	2510	}
2567	}	2511	}
2568		2512
2569	/* Digestion */	2513	/* Digestion */
2570	if (--op->last_eat < 0)	2514	if (--op->last_eat < 0)
2571	{	2515	{
2572	#ifdef COZY_SERVER	2516	int bonus = max (0, op->contr->digestion),
2573	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2517	penalty = max (0, -op->contr->digestion);
2574	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2575	#else
2576	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2577	#endif
2578		2518
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2519	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2581	else
2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2583		2520
2584	/* dms do not consume food */	2521	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2522	if (!QUERY_FLAG (op, FLAG_WIZ))
2586	op->stats.food--;	2523	op->stats.food--;
2587	}	2524	}
2588		2525
2589	if (op->stats.food < 0 && op->stats.hp >= 0)	2526	if (op->stats.food < 0 && op->stats.hp >= 0)
2590	{	2527	{
2591	object *tmp, *flesh = 0;	2528	object *flesh = 0;
2592		2529
2593	for (tmp = op->inv; tmp; tmp = tmp->below)	2530	for_inv_removable (op, tmp)
2594	{	2531	{
2595	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2532	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2533	continue;
		2534
		2535	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2596	{	2536	{
2597	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2537	op->statusmsg ("You blindly grab for a bite of food. "
2598	{	2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2599	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2600	manual_apply (op, tmp, 0);	2539	manual_apply (op, tmp, 0);
		2540
2601	if (op->stats.food >= 0 || op->stats.hp < 0)	2541	if (op->stats.food >= 0 || op->stats.hp < 0)
2602	break;	2542	break;
2603	}	2543	}
2604	else if (tmp->type == FLESH)	2544	else if (tmp->type == FLESH)
2605	flesh = tmp;	2545	flesh = tmp;
2606	} /* End if paid for object */	2546	}
2607	} /* end of for loop */
2608		2547
2609	/* If player is still starving, it means they don't have any food, so	2548	/* If player is still starving, it means they don't have any food, so
2610	* eat flesh instead.	2549	* eat flesh instead.
2611	*/	2550	*/
2612	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2551	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2613	{	2552	{
2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2553	op->statusmsg ("You blindly grab for a bite of food. "
		2554	"H<To prevent you from starving, you ate some random item from your backpack.>");
2615	manual_apply (op, flesh, 0);	2555	manual_apply (op, flesh, 0);
2616	}	2556	}
		2557
		2558	// If player is still starving, alert him!
		2559	if (op->stats.food < 0)
		2560	op->failmsg ("You are starving! "
		2561	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2562	}
		2563
		2564	if (op->stats.food < 0)
2617	}	2565	{
2618		2566	op->stats.hp += op->stats.food;
2619	while (op->stats.food < 0 && op->stats.hp >= 0)	2567	op->stats.food = 0;
2620	op->stats.food++, op->stats.hp--;	2568	}
2621		2569
2622	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2623	kill_player (op);	2571	kill_player (op);
2624	}	2572	}
2625	}	2573	}
…		…
2630	* file.	2578	* file.
2631	*/	2579	*/
2632	void	2580	void
2633	kill_player (object *op)	2581	kill_player (object *op)
2634	{	2582	{
		2583	int x, y;
2635	char buf[MAX_BUF];	2584	char buf[MAX_BUF];
2636	int x, y;
2637
2638	//int i;
2639	maptile *map; /* this is for resurrection */	2585	maptile *map; /* this is for resurrection */
2640
2641	/* int z;
2642	int num_stats_lose;
2643	int lost_a_stat;
2644	int lose_this_stat;
2645	int this_stat; */
2646	int will_kill_again;	2586	int will_kill_again;
2647	archetype *at;	2587	archetype *at;
2648	object *tmp;	2588	object *tmp;
2649		2589
2650	if (save_life (op))	2590	if (save_life (op))
2651	return;	2591	return;
2652
2653		2592
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2593	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2655	* in cities ONLY!!! It is very important that this doesn't get abused.	2594	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2595	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2596	*/
…		…
2673	{	2612	{
2674	tmp->destroy ();	2613	tmp->destroy ();
2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2614	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2676	}	2615	}
2677		2616
2678	cure_disease (op, 0); /* remove any disease */	2617	cure_disease (op, 0, 0); /* remove any disease */
2679	op->stats.hp = op->stats.maxhp;	2618	op->stats.hp = op->stats.maxhp;
2680	if (op->stats.food <= 0)	2619	if (op->stats.food <= 0)
2681	op->stats.food = 999;	2620	op->stats.food = 999;
2682		2621
2683	/* create a bodypart-trophy to make the winner happy */	2622	/* create a bodypart-trophy to make the winner happy */
2684	if (object *tmp = arch_to_object (archetype::find ("finger")))	2623	if (object *tmp = arch_to_object (archetype::find ("finger")))
2685	{	2624	{
2686	sprintf (buf, "%s's finger", &op->name);	2625	tmp->name = format ("%s's finger" , &op->name);
2687	tmp->name = buf;	2626	tmp->name_pl = format ("%s's fingers", &op->name);
2688	sprintf (buf, " This finger has been cut off %s\n"
2689	" the %s, when he was defeated at\n level %d by %s.\n",
2690	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2691	tmp->msg = buf;	2627	tmp->msg = format (
		2628	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2629	&op->name, op->contr->title,
		2630	(int)op->level,
		2631	op->contr->killer_name ()
		2632	);
2692	tmp->value = 0, tmp->type = 0;	2633	tmp->value = 0, tmp->type = 0;
2693	tmp->materialname = "organics";	2634	tmp->materialname = "organics";
2694	tmp->insert_at (op, tmp);	2635	tmp->insert_at (op, tmp);
2695	}	2636	}
2696		2637
…		…
2704		2645
2705	command_kill_pets (op, 0);	2646	command_kill_pets (op, 0);
2706		2647
2707	if (op->stats.food < 0)	2648	if (op->stats.food < 0)
2708	{	2649	{
2709	sprintf (buf, "%s starved to death.", &op->name);	2650	op->contr->killer = archetype::get ("killer_starvation");
2710	strcpy (op->contr->killer, "starvation");	2651	op->contr->killer->destroy ();
2711	}	2652	}
2712	else
2713	sprintf (buf, "%s died.", &op->name);
2714		2653
2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2654	op->contr->play_sound (sound_find ("player_dies"));
2716		2655
2717	/* save the map location for corpse, gravestone */	2656	/* save the map location for corpse, gravestone */
2718	x = op->x;	2657	x = op->x;
2719	y = op->y;	2658	y = op->y;
2720	map = op->map;	2659	map = op->map;
…		…
2827	lost_a_stat = 1;	2766	lost_a_stat = 1;
2828	}	2767	}
2829	}	2768	}
2830	}	2769	}
2831	}	2770	}
		2771
2832	/* If no stat lost, tell the player. */	2772	/* If no stat lost, tell the player. */
2833	if (!lost_a_stat)	2773	if (!lost_a_stat)
2834	{	2774	{
2835	/* determine_god() seems to not work sometimes... why is this?	2775	/* determine_god() seems to not work sometimes... why is this?
2836	Should I be using something else? GD */	2776	Should I be using something else? GD */
…		…
2840	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2780	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2841	else	2781	else
2842	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2782	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2843	}	2783	}
2844	#else	2784	#else
2845	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2846	#endif	2786	#endif
2847		2787
2848	/* Put a gravestone up where the character 'almost' died. List the	2788	/* Put a gravestone up where the character 'almost' died. List the
2849	* exp loss on the stone.	2789	* exp loss on the stone.
2850	*/	2790	*/
2851	tmp = arch_to_object (archetype::find ("gravestone"));	2791	tmp = arch_to_object (archetype::find ("gravestone"));
2852	sprintf (buf, "%s's gravestone", &op->name);	2792	tmp->name = format ("%s's gravestone", &op->name);
2853	tmp->name = buf;	2793	tmp->name_pl = format ("%s's gravestones", &op->name);
2854	sprintf (buf, "%s's gravestones", &op->name);
2855	tmp->name_pl = buf;
2856	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);	2794	tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2857	tmp->msg = buf;
2858	tmp->x = op->x, tmp->y = op->y;	2795	tmp->x = op->x, tmp->y = op->y;
2859	insert_ob_in_map (tmp, op->map, NULL, 0);	2796	insert_ob_in_map (tmp, op->map, NULL, 0);
2860		2797
2861	/**************************************/	2798	/**************************************/
2862	/* */	2799	/* */
…		…
2883	{	2820	{
2884	tmp->destroy ();	2821	tmp->destroy ();
2885	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2886	}	2823	}
2887		2824
2888	cure_disease (op, 0); /* remove any disease */	2825	cure_disease (op, 0, 0); /* remove any disease */
		2826
		2827	// remove all spell effects that are active
		2828	// to avoid long-term effects such as word-of-recall
		2829	for (object *item = op->inv; item; )
		2830	{
		2831	object *next = item->below;
		2832
		2833	if (item->type == SPELL_EFFECT && item->active)
		2834	item->destroy ();
		2835
		2836	item = next;
		2837	}
2889		2838
2890	/*add_exp(op, (op->stats.exp * -0.20)); */	2839	/*add_exp(op, (op->stats.exp * -0.20)); */
2891	apply_death_exp_penalty (op);	2840	apply_death_exp_penalty (op);
		2841
2892	if (op->stats.food < 100)	2842	if (op->stats.food < 100)
2893	op->stats.food = 900;	2843	op->stats.food = 900;
		2844
2894	op->stats.hp = op->stats.maxhp;	2845	op->stats.hp = op->stats.maxhp;
2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2897		2848
2898	/*	2849	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2850	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2851	* and put them back in the map.
2901	*/	2852	*/
2902	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2903		2854
2904	/****************************************/	2855	/****************************************/
2905	/* */	2856	/* */
2906	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
2927	object *force;	2878	object *force;
2928	int at;	2879	int at;
2929		2880
2930	force = get_archetype (FORCE_NAME);	2881	force = get_archetype (FORCE_NAME);
2931	/* 50 ticks should be enough time for the spell to abate */	2882	/* 50 ticks should be enough time for the spell to abate */
2932	force->speed = 0.1;	2883	force->speed = 0.1f;
2933	force->speed_left = -5.0;	2884	force->speed_left = -5.f;
2934	SET_FLAG (force, FLAG_APPLIED);	2885	SET_FLAG (force, FLAG_APPLIED);
2935	for (at = 0; at < NROFATTACKS; at++)	2886	for (at = 0; at < NROFATTACKS; at++)
2936	if (will_kill_again & (1 << at))	2887	if (will_kill_again & (1 << at))
2937	force->resist[at] = 100;	2888	force->resist[at] = 100;
2938		2889
…		…
2966		2917
2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2918	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2968	{	2919	{
2969	if (tmp->nrof > 1)	2920	if (tmp->nrof > 1)
2970	{	2921	{
2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2922	tmp->decrease (rndm (1, tmp->nrof - 1));
2972	tmp2->destroy ();
2973	insert_ob_in_map (tmp, op->map, NULL, 0);	2923	insert_ob_in_map (tmp, op->map, NULL, 0);
2974	}	2924	}
2975	else	2925	else
2976	tmp->destroy ();	2926	tmp->destroy ();
2977	}	2927	}
…		…
2988	void	2938	void
2989	fix_weight (void)	2939	fix_weight (void)
2990	{	2940	{
2991	for_all_players (pl)	2941	for_all_players (pl)
2992	{	2942	{
2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2943	sint32 old = pl->ob->carrying;
2994		2944
2995	if (old == sum)	2945	pl->ob->update_weight ();
2996	continue;	2946
		2947	if (old != pl->ob->carrying)
		2948	{
2997	pl->ob->update_stats ();	2949	pl->ob->update_stats ();
2998	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2950	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2951	}
2999	}	2952	}
3000	}	2953	}
3001		2954
3002	void	2955	void
3003	fix_luck (void)	2956	fix_luck (void)
…		…
3047	void	3000	void
3048	make_visible (object *op)	3001	make_visible (object *op)
3049	{	3002	{
3050	op->hide = 0;	3003	op->hide = 0;
3051	op->invisible = 0;	3004	op->invisible = 0;
		3005
3052	if (op->type == PLAYER)	3006	if (op->type == PLAYER)
3053	{	3007	{
3054	op->contr->tmp_invis = 0;	3008	op->contr->tmp_invis = 0;
3055	op->contr->invis_race = 0;	3009	op->contr->invis_race = 0;
3056	}	3010	}
…		…
3059	}	3013	}
3060		3014
3061	int	3015	int
3062	is_true_undead (object *op)	3016	is_true_undead (object *op)
3063	{	3017	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3018	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3065	return 1;	3019	return 1;
3066		3020
3067	return 0;	3021	return 0;
3068	}	3022	}
3069		3023
3070	/* look at the surrounding terrain to determine	3024	/* look at the surrounding terrain to determine
3071	* the hideability of this object. Positive levels	3025	* the hideability of this object. Positive levels
3072	* indicate greater hideability.	3026	* indicate greater hideability.
3073	*/	3027	*/
3074
3075	int	3028	int
3076	hideability (object *ob)	3029	hideability (object *ob)
3077	{	3030	{
3078	int i, level = 0, mflag;	3031	int i, level = 0, mflag;
3079	sint16 x, y;	3032	sint16 x, y;
…		…
3089	* as bad as carrying a light on a pitch dark map */	3042	* as bad as carrying a light on a pitch dark map */
3090	if (has_carried_lights (ob))	3043	if (has_carried_lights (ob))
3091	level = -(10 + (2 * ob->map->darkness));	3044	level = -(10 + (2 * ob->map->darkness));
3092		3045
3093	/* scan through all nearby squares for terrain to hide in */	3046	/* scan through all nearby squares for terrain to hide in */
3094	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3047	for (i = 0, x = ob->x, y = ob->y;
		3048	i <= SIZEOFFREE1;
		3049	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3095	{	3050	{
3096	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3051	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3097	if (mflag & P_OUT_OF_MAP)	3052	if (mflag & P_OUT_OF_MAP)
3098	{
3099	continue;	3053	continue;
3100	}	3054
3101	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3055	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3102	level += 2;	3056	level += 2;
3103	else /* open terrain! */	3057	else /* open terrain! */
3104	level -= 1;	3058	level -= 1;
3105	}	3059	}
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	3067	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	3068	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	3069	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	3070	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	3071	*/
3118
3119	void	3072	void
3120	do_hidden_move (object *op)	3073	do_hidden_move (object *op)
3121	{	3074	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3075	int hide = 0;
3123	object *skop;
3124		3076
3125	if (!op || !op->map)	3077	if (!op || !op->map)
3126	return;	3078	return;
3127		3079
3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3080	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3081	int num = random_roll (0, 19, op, PREFER_LOW);
3129		3082
3130	/* its *extremely* hard to run and sneak/hide at the same time! */	3083	/* its *extremely* hard to run and sneak/hide at the same time! */
3131	if (op->type == PLAYER && op->contr->run_on)	3084	if (op->type == PLAYER && op->contr->run_on)
3132	if (!skop || num >= skop->level)	3085	if (!skop || num >= skop->level)
3133	{	3086	{
…		…
3143	num -= hide;	3096	num -= hide;
3144		3097
3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3098	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3146	{	3099	{
3147	make_visible (op);	3100	make_visible (op);
		3101
3148	if (op->type == PLAYER)	3102	if (op->type == PLAYER)
3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3103	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3150	}	3104	}
3151	else if (op->type == PLAYER && skop)	3105	else if (op->type == PLAYER && skop)
3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3106	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3205	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3206	* 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
3207	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3208	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3209	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3210	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3211	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3212	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3213	* 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.
3214	* -b.t.	3168	* -b.t.
3215	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3216	*/	3170	*/
3217
3218	int	3171	int
3219	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3220	{	3173	{
3221	rv_vector rv;	3174	rv_vector rv;
3222	int dx, dy;	3175	int dx, dy;
…		…
3234		3187
3235	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3236		3189
3237	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3238	* through the object and find if it has any	3191	* through the object and find if it has any
3239	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3240	* a blocked los square.	3193	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3242	*/	3195	*/
3243	while (op)	3196	while (op)
3244	{	3197	{
3245	dx = rv.distance_x + op->arch->clone.x;	3198	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3199	dy = rv.distance_y + op->arch->y;
3247		3200
3248	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3249	* 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
3250	* for any meaningful values.	3203	* for any meaningful values.
3251	*/	3204	*/
3252	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3253	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3254	!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)])
3255	return 1;	3208	return 1;
		3209
3256	op = op->more;	3210	op = op->more;
3257	}	3211	}
		3212
3258	return 0;	3213	return 0;
3259	}	3214	}
3260		3215
3261	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3262	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3265	* return 0.	3220	* return 0.
3266	*/	3221	*/
3267	int	3222	int
3268	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3269	{	3224	{
3270
3271	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3272	{	3226	{
3273	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3274	return 0;	3228	return 0;
3275		3229
…		…
3281	{	3235	{
3282	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");
3283	return 1;	3237	return 1;
3284	}	3238	}
3285	}	3239	}
		3240
3286	return 0;	3241	return 0;
3287	}	3242	}
3288		3243
3289	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3290	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3295	* 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
3296	*/	3251	*/
3297	int	3252	int
3298	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3299	{	3254	{
3300	object *tmp;
3301
3302	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3303	* 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),
3304	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3305	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3306	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3307	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3308	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3309	{	3262	{
3310	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3311	{	3264	{
3312	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3313	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))
3314	{	3269	{
3315	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3316	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))
3317	{	3272	{
3318	object *invtmp;
3319
3320	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3321	{	3274	{
3322	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3323	{	3276	{
3324	if (x != NULL && y != NULL)	3277	if (x && y)
3325	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3326	return 1;	3280	return 1;
3327	}	3281	}
3328	}	3282	}
3329	}	3283	}
		3284
3330	if (x != NULL && y != NULL)	3285	if (x && y)
3331	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3332	return 1;	3288	return 1;
3333	}	3289	}
3334	}	3290	}
3335	}	3291	}
		3292
3336	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3337	return 0;	3294	return 0;
3338	}	3295	}
3339		3296
3340	/*	3297	/*
…		…
3356	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3357	int i = 0, j = 0;	3314	int i = 0, j = 0;
3358		3315
3359	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3360	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3361	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3362	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3363	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3364	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3365	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3366	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3367	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3368		3325
3369	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3370	return;	3327	return;
3371		3328
3372	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++);
…		…
3376	/* 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]); */
3377	return;	3334	return;
3378	}	3335	}
3379		3336
3380	/* everything seems okay - now bring on the gift: */	3337	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3338	item = tr->item;
3382		3339
3383	if (item->type == SPELL)	3340	if (item->type == SPELL)
3384	{	3341	{
3385	if (check_spell_known (who, item->name))	3342	if (check_spell_known (who, item->name))
3386	return;	3343	return;
…		…
3445	{	3402	{
3446	/* forces in the treasurelist can alter the player's stats */	3403	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3404	object *skin;
3448		3405
3449	/* first get the dragon skin force */	3406	/* first get the dragon skin force */
3450	shstr_cmp dragon_skin_force ("dragon_skin_force");
3451	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)
3452	;	3408	;
3453		3409
3454	if (!skin)	3410	if (!skin)
3455	return;	3411	return;
3456		3412
…		…
3491	else	3447	else
3492	{	3448	{
3493	/* generate misc. treasure */	3449	/* generate misc. treasure */
3494	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3495	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));
3496	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3497	if (who->type == PLAYER)
3498	esrv_send_item (who, tmp);
3499	}	3453	}
3500	}	3454	}
3501		3455
3502	/**	3456	/**
3503	* 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
…		…
3532	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))
3533	return 0;	3487	return 0;
3534		3488
3535	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3536	}	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