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.111 by root, Mon Apr 23 11:43:22 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	// for weird reasons, this is often "ob", keeping a circular reference	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208	ranges [range_skill] = 0;
209		193
210	players.erase (this);	194	players.erase (this);
211	}	195	}
212		196
213	// connect the player with a specific client	197	// connect the player with a specific client
214	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
215	void	199	void
216	player::connect (client *ns)	200	player::connect (client *ns)
217	{	201	{
218	this->ns = ns;	202	this->ns = ns;
219	ns->pl = this;	203	ns->pl = this;
…		…
223	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
224		208
225	ns->update_look = 0;	209	ns->update_look = 0;
226	ns->look_position = 0;	210	ns->look_position = 0;
227		211
228	clear_los (ob);	212	clear_los (this);
229		213
230	ns->reset_stats ();	214	ns->reset_stats ();
231		215
232	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
233	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
234	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
235		219
236	if (!legal_range (ob, shoottype))	220	ob->update_weight ();
237	shoottype = range_none;
238
239	ob->carrying = sum_weight (ob);
240	link_player_skills (ob);	221	link_player_skills (ob);
241		222
242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
243		224
244	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
245		226
246	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
247	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
248	{	229	{
249	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
250		231
251	shstr_cmp dragon_ability_force ("dragon_ability_force");
252	shstr_cmp dragon_skin_force ("dragon_skin_force");
253
254	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
255	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
256	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
257	abil = tmp;	235	abil = tmp;
258	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
259	skin = tmp;	237	skin = tmp;
260		238
261	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
262	}	240	}
263		241
264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265		243
266	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this);
267		245
268	ob->update_stats ();	246	ob->update_stats ();
		247
269	ns->floorbox_update ();	248	ns->floorbox_update ();
270
271	esrv_send_inventory (ob, ob);	249	esrv_send_inventory (ob, ob);
272	esrv_add_spells (this, 0);	250	esrv_add_spells (this, 0);
273		251
274	activate ();	252	activate ();
275		253
…		…
282	}	260	}
283		261
284	void	262	void
285	player::disconnect ()	263	player::disconnect ()
286	{	264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
287	if (ns)	271	if (ns)
288	{	272	{
289	if (active)	273	if (active)
290	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
291		275
292	INVOKE_PLAYER (DISCONNECT, this);	276	INVOKE_PLAYER (DISCONNECT, this);
293		277
294	ns->reset_stats ();	278	ns->reset_stats ();
295	ns->pl = 0;	279	ns->pl = 0;
296	this->ns = 0;	280	ns = 0;
297	}	281	}
298		282
299	if (ob)	283	observe = ob;
300	ob->close_container (); //TODO: client-specific
301		284
302	deactivate ();	285	deactivate ();
303	}	286	}
304		287
305	// the need for this function can be explained	288	// the need for this function can be explained
306	// by load_object not returning the object	289	// by load_object not returning the object
307	void	290	void
308	player::set_object (object *op)	291	player::set_object (object *op)
309	{	292	{
310	ob = op;	293	ob = observe = op;
311	ob->contr = this; /* this aren't yet in archetype */	294	ob->contr = this; /* this aren't yet in archetype */
312		295
313	ob->speed_left = 0.5;
314	ob->speed = 1.0;	296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
315	ob->direction = 5; /* So player faces south */	299	ob->direction = 5; /* So player faces south */
		300
		301	ob->flag [FLAG_READY_WEAPON] = false;
		302	ob->flag [FLAG_READY_SKILL] = false;
		303	ob->flag [FLAG_READY_BOW] = false;
		304
		305	for (object *op = ob->inv; op; op = op->below)
		306	if (op->flag [FLAG_APPLIED])
		307	switch (op->type)
		308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
		313	case WAND:
		314	case ROD:
		315	case HORN:
		316	case BOW:
		317	ranged_ob = op;
		318	break;
		319
		320	case WEAPON:
		321	combat_ob = op;
		322	break;
		323	}
		324
		325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
		326	ob->deactivate (); // change_weapon activates, fix this better
		327	}
		328
		329	void
		330	player::set_observe (object *op)
		331	{
		332	observe = op ? op : ob;
		333	do_los = 1;
316	}	334	}
317		335
318	player::player ()	336	player::player ()
319	{	337	{
320	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
321	* we deal with that below this point.	339	* we deal with that below this point.
322	*/	340	*/
323	outputs_sync = 6; /* Every 2 seconds */	341	outputs_sync = 4;
324	outputs_count = 10; /* Keeps present behaviour */	342	outputs_count = 4;
325	unapply = unapply_nochoice;	343	unapply = unapply_nochoice;
326		344
327	savebed_map = first_map_path; /* Init. respawn position */	345	savebed_map = first_map_path; /* Init. respawn position */
328		346
329	gen_sp_armour = 10;	347	gen_sp_armour = 10;
330	shoottype = range_none;
331	bowtype = bow_normal;	348	bowtype = bow_normal;
332	petmode = pet_normal;	349	petmode = pet_normal;
333	listening = 10;	350	listening = 10;
334	usekeys = containers;	351	usekeys = containers;
335	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
336	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
337	}	357	}
338		358
339	void	359	void
340	player::do_destroy ()	360	player::do_destroy ()
341	{	361	{
…		…
346	if (ob)	366	if (ob)
347	{	367	{
348	ob->destroy_inv (false);	368	ob->destroy_inv (false);
349	ob->destroy ();	369	ob->destroy ();
350	}	370	}
		371
		372	ob = observe = 0;
351	}	373	}
352		374
353	player::~player ()	375	player::~player ()
354	{	376	{
355	/* Clear item stack */	377	/* Clear item stack */
…		…
382	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
383	*/	405	*/
384	archetype *	406	archetype *
385	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
386	{	408	{
387	archetype *start = at;	409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
		415	archvec::iterator i = archetypes.find (nat);
388		416
389	for (;;)	417	for (;;)
390	{	418	{
391	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
392	at = first_archetype;	420	i = archetypes.begin ();
393	else	421	else if (*i == at)
394	at = at->next;	422	cleanup ("not a single player archetype found");
395		423
396	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
397	return at;	425	return *i;
398
399	if (at == start)
400	{
401	LOG (llevError, "No Player archetypes\n");
402	exit (-1);
403	}
404	}	426	}
405	}	427	}
406		428
407	object *	429	object *
408	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
412	unsigned lastdist;	434	unsigned lastdist;
413	rv_vector rv;	435	rv_vector rv;
414		436
415	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
416	{	438	{
417	/* We should not find free objects on this friendly list, but it
418	* does periodically happen. Given that, lets deal with it.
419	* While unlikely, it is possible the next object on the friendly
420	* list is also free, so encapsulate this in a while loop.
421	*/
422	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
423	{
424	object *tmp = ol->ob;
425
426	/* Can't do much more other than log the fact, because the object
427	* itself will have been cleared.
428	*/
429	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430	tmp->debug_desc ());
431	ol = ol->next;
432	remove_friendly_object (tmp);
433	if (!ol)
434	return op;
435	}
436
437	/* Remove special check for player from this. First, it looks to cause
438	* some crashes (ol->ob->contr not set properly?), but secondly, a more
439	* complicated method of state checking would be needed in any case -
440	* as it was, a clever player could type quit, and the function would
441	* skip them over while waiting for confirmation. Remove
442	* on_same_map check, as can_detect_enemy also does this
443	*/
444	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
445	continue;	440	continue;
446		441
447	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
448	{	443	{
…		…
643		638
644	return firstdir;	639	return firstdir;
645	}	640	}
646		641
647	void	642	void
648	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
649	{	644	{
650	object *op, *next = NULL;
651
652	if (pl->randomitems != NULL)	645	if (pl->randomitems)
653	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
654		647
655	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
656	{	649	{
657	next = op->below;	650	next = op->below;
658		651
659	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
660	* flag "neutral" set. Sorry but I can't think of a better way	653	* flag "neutral" set. Sorry but I can't think of a better way
…		…
665	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
666	* by this player due to race restrictions	659	* by this player due to race restrictions
667	*/	660	*/
668	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
669	{	662	{
670	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
671	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
672	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
673	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
674	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	669	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
675	{	670	{
676	op->destroy ();	671	op->destroy ();
677	continue;	672	continue;
678	}	673	}
679	}	674	}
…		…
702	if (op->nrof > 1)	697	if (op->nrof > 1)
703	op->nrof = 1;	698	op->nrof = 1;
704	}	699	}
705		700
706	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
707	{
708	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
709	}
710		703
711	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
712	* items. Just don't identify gold or silver, or it won't be	705	* items. Just don't identify gold or silver, or it won't be
713	* merged properly.	706	* merged properly.
714	*/	707	*/
715	if (need_identify (op))	708	if (need_identify (op))
716	{	709	{
717	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
718	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
719	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
720	}	713	}
		714
721	if (op->type == SPELL)	715	if (op->type == SPELL)
722	{	716	{
723	op->destroy ();	717	op->destroy ();
724	continue;	718	continue;
725	}	719	}
…		…
727	{	721	{
728	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
729	op->stats.exp = 0;	723	op->stats.exp = 0;
730	op->level = 1;	724	op->level = 1;
731	}	725	}
732	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
733	else
734	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
735	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
736		729
737	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
738	link_player_skills (pl);	731	link_player_skills (pl);
…		…
774	}	767	}
775		768
776	void	769	void
777	object::roll_stats ()	770	object::roll_stats ()
778	{	771	{
779	int statsort [7];	772	int statsort [NUM_STATS];
780		773
781	for (;;)	774	for (;;)
782	{	775	{
783	int sum = 0;	776	int sum = 0;
784	for (int i = 7; i--; )	777	for (int i = NUM_STATS; i--; )
785	sum += statsort [i] = roll_stat ();	778	sum += statsort [i] = roll_stat ();
786		779
787	if (sum >= 82 && sum <= 116)	780	if (sum >= 82 && sum <= 116)
788	break;	781	break;
789	}	782	}
790		783
791	// Sort the stats so that rerolling is easier...	784	// Sort the stats so that rerolling is easier...
792	std::sort (statsort, statsort + 7, std::greater<int>());	785	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
793		786
		787	for (int i = 0; i < NUM_STATS; ++i)
794	stats.Str = statsort[0];	788	stats.stat (i) = statsort [i];
795	stats.Dex = statsort[1];
796	stats.Con = statsort[2];
797	stats.Int = statsort[3];
798	stats.Wis = statsort[4];
799	stats.Pow = statsort[5];
800	stats.Cha = statsort[6];
801		789
802	stats.exp = 0;	790	stats.exp = 0;
803	stats.ac = 0;	791	stats.ac = 0;
804		792
805	stats.hp = stats.maxhp;	793	stats.hp = stats.maxhp;
…		…
817	}	805	}
818		806
819	void	807	void
820	object::swap_stats (int a, int b)	808	object::swap_stats (int a, int b)
821	{	809	{
822	int tmp = get_attr_value (&contr->orig_stats, a);	810	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
823	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
824	set_attr_value (&contr->orig_stats, b, tmp);
825		811
		812	for (int i = 0; i < NUM_STATS; ++i)
826	stats.Str = contr->orig_stats.Str;	813	stats.stat (i) = contr->orig_stats.stat (i);
827	stats.Dex = contr->orig_stats.Dex;
828	stats.Con = contr->orig_stats.Con;
829	stats.Int = contr->orig_stats.Int;
830	stats.Wis = contr->orig_stats.Wis;
831	stats.Pow = contr->orig_stats.Pow;
832	stats.Cha = contr->orig_stats.Cha;
833		814
834	//TODO: the following code looks so borked and should, at the very least,	815	//TODO: the following code looks so borked and should, at the very least,
835	// be merged with the similar code in roll_stats	816	// be merged with the similar code in roll_stats
836	stats.ac = 0;	817	stats.ac = 0;
837		818
…		…
856	static void	837	static void
857	start_info (object *op)	838	start_info (object *op)
858	{	839	{
859	char buf[MAX_BUF];	840	char buf[MAX_BUF];
860		841
861	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
862	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
863	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
864	//new_draw_info (NDI_UNIQUE, 0, op, " ");
865	}	844	}
866		845
867	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
868	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
869	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
870	* separate race and class; this actually changes the RACE,	849	* separate race and class; this actually changes the RACE,
871	* not the class.	850	* not the class.
872	*/	851	*/
873	int	852	void
874	key_change_class (object *op, char key)	853	player::chargen_race_done ()
875	{	854	{
876	int tmp_loop;
877
878	if (key == 'd' || key == 'D')
879	{
880	char buf[MAX_BUF];
881
882	/* this must before then initial items are given */	855	/* this must before then initial items are given */
883	esrv_new_player (op->contr, op->weight + op->carrying);	856	esrv_new_player (ob->contr);
884		857
885	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
886	if (tl)	859	if (tl)
887	create_treasure (tl, op, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
888		861
889	INVOKE_PLAYER (BIRTH, op->contr);	862	INVOKE_PLAYER (BIRTH, ob->contr);
890	INVOKE_PLAYER (LOGIN, op->contr);	863	INVOKE_PLAYER (LOGIN, ob->contr);
891		864
892	op->contr->ns->state = ST_PLAYING;	865	ob->contr->ns->state = ST_PLAYING;
893		866
894	if (op->msg)	867	if (ob->msg)
895	op->msg = NULL;	868	ob->msg = 0;
896		869
897	/* We create this now because some of the unique maps will need it
898	* to save here.
899	*/
900	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
901	make_path_to_file (buf);
902
903	start_info (op);	870	start_info (ob);
904	CLEAR_FLAG (op, FLAG_WIZ);	871	CLEAR_FLAG (ob, FLAG_WIZ);
905	give_initial_items (op, op->randomitems);	872	give_initial_items (ob, ob->randomitems);
906	link_player_skills (op);	873	link_player_skills (ob);
907	esrv_send_inventory (op, op);	874	esrv_send_inventory (ob, ob);
908	op->update_stats ();	875	ob->update_stats ();
909		876
910	/* This moves the player to a different start map, if there	877	/* This moves the player to a different start map, if there
911	* is one for this race	878	* is one for this race
912	*/	879	*/
913	if (*first_map_ext_path)	880	if (*first_map_ext_path)
914	{	881	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
915	object *tmp;
916	char mapname[MAX_BUF];
917
918	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
919	tmp = object::create ();
920	EXIT_PATH (tmp) = mapname;
921	EXIT_X (tmp) = op->x;
922	EXIT_Y (tmp) = op->y;
923	op->enter_exit (tmp); /* we don't really care if it succeeded;
924	* if the map isn't there, then stay on the
925	* default initial map */
926	tmp->destroy ();
927	}
928	else	882	else
929	LOG (llevDebug, "first_map_ext_path not set\n");	883	LOG (llevDebug, "first_map_ext_path not set\n");
		884	}
930		885
931	return 0;	886	void
932	}	887	player::chargen_race_next ()
933		888	{
934	/* Following actually changes the race - this is the default command	889	/* Following actually changes the race - this is the default command
935	* if we don't match with one of the options above.	890	* if we don't match with one of the options above.
936	*/	891	*/
937		892
938	tmp_loop = 0;	893	do
939	while (!tmp_loop)
940	{	894	{
941	shstr name = op->name;	895	shstr name = ob->name;
942	int x = op->x, y = op->y;	896	int x = ob->x, y = ob->y;
943		897
944	op->remove_statbonus ();	898	ob->remove_statbonus ();
945	op->remove ();	899	ob->remove ();
946	op->arch = get_player_archetype (op->arch);	900	ob->arch = get_player_archetype (ob->arch);
947	op->arch->clone.copy_to (op);	901	ob->arch->copy_to (ob);
948	op->instantiate ();	902	ob->instantiate ();
949	op->stats = op->contr->orig_stats;	903	ob->stats = ob->contr->orig_stats;
950	op->name = op->name_pl = name;	904	ob->name = ob->name_pl = name;
951	op->x = x;	905	ob->x = x;
952	op->y = y;	906	ob->y = y;
953	SET_ANIMATION (op, 2); /* So player faces south */	907	SET_ANIMATION (ob, 2); /* So player faces south */
954	insert_ob_in_map (op, op->map, op, 0);	908	insert_ob_in_map (ob, ob->map, ob, 0);
955	assign (op->contr->title, op->arch->clone.name);	909	assign (ob->contr->title, ob->arch->object::name);
956	op->add_statbonus ();	910	ob->add_statbonus ();
957	tmp_loop = allowed_class (op);
958	}	911	}
		912	while (!allowed_class (ob));
959		913
960	update_object (op, UP_OBJ_FACE);	914	update_object (ob, UP_OBJ_FACE);
961	esrv_update_item (UPD_FACE, op, op);	915	esrv_update_item (UPD_FACE, ob, ob);
962	op->update_stats ();	916	ob->update_stats ();
963	op->stats.hp = op->stats.maxhp;	917	ob->stats.hp = ob->stats.maxhp;
964	op->stats.sp = op->stats.maxsp;	918	ob->stats.sp = ob->stats.maxsp;
965	op->stats.grace = 0;	919	ob->stats.grace = 0;
966
967	if (op->msg)
968	new_draw_info (NDI_BLUE, 0, op, op->msg);
969
970	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
971	return 0;
972	}	920	}
973		921
974	void	922	void
975	flee_player (object *op)	923	flee_player (object *op)
976	{	924	{
…		…
1023	/* Cornered, get rid of scared */	971	/* Cornered, get rid of scared */
1024	CLEAR_FLAG (op, FLAG_SCARED);	972	CLEAR_FLAG (op, FLAG_SCARED);
1025	op->enemy = NULL;	973	op->enemy = NULL;
1026	}	974	}
1027		975
1028
1029	/* 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.
1030	* 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
1031	* stop.	978	* stop.
1032	*/	979	*/
1033	int	980	int
1034	check_pick (object *op)	981	check_pick (object *op)
1035	{	982	{
…		…
1042	if (op->move_type & MOVE_FLYING)	989	if (op->move_type & MOVE_FLYING)
1043	return 1;	990	return 1;
1044		991
1045	next = op->below;	992	next = op->below;
1046		993
		994	int cnt = MAX_ITEM_PER_DROP;
		995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		996
1047	/* 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
1048	* destroyed */	998	* destroyed */
1049	while (next && !next->destroyed ())	999	while (next && !next->destroyed ())
1050	{	1000	{
1051	tmp = next;	1001	tmp = next;
1052	next = tmp->below;	1002	next = tmp->below;
1053		1003
		1004	if (cnt <= 0)
		1005	{
		1006	op->failmsg ("Couldn't pickup all items at once.");
		1007	return 0;
		1008	}
		1009
1054	if (op->destroyed ())	1010	if (op->destroyed ())
1055	return 0;	1011	return 0;
1056		1012
1057	if (!can_pick (op, tmp))	1013	if (!can_pick (op, tmp))
1058	continue;	1014	continue;
1059		1015
1060	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1061	{	1017	{
1062	if (item_matched_string (op, tmp, op->contr->search_str))	1018	if (item_matched_string (op, tmp, op->contr->search_str))
1063	pick_up (op, tmp);	1019	CHK_PICK_PICKUP;
1064	continue;	1020	continue;
1065	}	1021	}
1066		1022
1067	/* high not bit set? We're using the old autopickup model */	1023	/* high not bit set? We're using the old autopickup model */
1068	if (!(op->contr->mode & PU_NEWMODE))	1024	if (!(op->contr->mode & PU_NEWMODE))
…		…
1070	switch (op->contr->mode)	1026	switch (op->contr->mode)
1071	{	1027	{
1072	case 0:	1028	case 0:
1073	return 1; /* don't pick up */	1029	return 1; /* don't pick up */
1074	case 1:	1030	case 1:
1075	pick_up (op, tmp);	1031	CHK_PICK_PICKUP;
1076	return 1;	1032	return 1;
1077	case 2:	1033	case 2:
1078	pick_up (op, tmp);	1034	CHK_PICK_PICKUP;
1079	return 0;	1035	return 0;
1080	case 3:	1036	case 3:
1081	return 0; /* stop before pickup */	1037	return 0; /* stop before pickup */
1082	case 4:	1038	case 4:
1083	pick_up (op, tmp);	1039	CHK_PICK_PICKUP;
1084	break;	1040	break;
1085	case 5:	1041	case 5:
1086	pick_up (op, tmp);	1042	CHK_PICK_PICKUP;
1087	stop = 1;	1043	stop = 1;
1088	break;	1044	break;
1089	case 6:	1045	case 6:
1090	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1091	pick_up (op, tmp);	1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1048	CHK_PICK_PICKUP;
1092	break;	1049	break;
1093		1050
1094	case 7:	1051	case 7:
1095	if (tmp->type == MONEY || tmp->type == GEM)	1052	if (tmp->type == MONEY || tmp->type == GEM)
1096	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1097	break;	1054	break;
1098		1055
1099	default:	1056	default:
1100	/* use value density */	1057	/* use value density */
1101	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1102	&& (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)
1103	pick_up (op, tmp);	1060	CHK_PICK_PICKUP;
1104	}	1061	}
1105	}	1062	}
1106	else	1063	else
1107	{ /* old model */	1064	{ /* old model */
1108	/* NEW pickup handling */	1065	/* NEW pickup handling */
…		…
1112	if (tmp->name != NULL)	1069	if (tmp->name != NULL)
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1070	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&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))));
1115	else	1072	else
1116	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1073	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117	&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))));
1118		1075
1119	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1076	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1120	}	1077	}
1121		1078
1122	/* philosophy:	1079	/* philosophy:
…		…
1163	/* all food and drink if desired */	1120	/* all food and drink if desired */
1164	/* question: don't pick up known-poisonous stuff? */	1121	/* question: don't pick up known-poisonous stuff? */
1165	if (op->contr->mode & PU_FOOD)	1122	if (op->contr->mode & PU_FOOD)
1166	if (tmp->type == FOOD)	1123	if (tmp->type == FOOD)
1167	{	1124	{
1168	pick_up (op, tmp);	1125	CHK_PICK_PICKUP;
1169	continue;	1126	continue;
1170	}	1127	}
1171		1128
1172	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_DRINK)
1173	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)))
1174	{	1131	{
1175	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1176	continue;	1133	continue;
1177	}	1134	}
1178		1135
1179	if (op->contr->mode & PU_POTION)	1136	if (op->contr->mode & PU_POTION)
1180	if (tmp->type == POTION)	1137	if (tmp->type == POTION)
1181	{	1138	{
1182	pick_up (op, tmp);	1139	CHK_PICK_PICKUP;
1183	continue;	1140	continue;
1184	}	1141	}
1185		1142
1186	/* spellbooks, skillscrolls and normal books/scrolls */	1143	/* spellbooks, skillscrolls and normal books/scrolls */
1187	if (op->contr->mode & PU_SPELLBOOK)	1144	if (op->contr->mode & PU_SPELLBOOK)
1188	if (tmp->type == SPELLBOOK)	1145	if (tmp->type == SPELLBOOK)
1189	{	1146	{
1190	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1191	continue;	1148	continue;
1192	}	1149	}
1193		1150
1194	if (op->contr->mode & PU_SKILLSCROLL)	1151	if (op->contr->mode & PU_SKILLSCROLL)
1195	if (tmp->type == SKILLSCROLL)	1152	if (tmp->type == SKILLSCROLL)
1196	{	1153	{
1197	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1198	continue;	1155	continue;
1199	}	1156	}
1200		1157
1201	if (op->contr->mode & PU_READABLES)	1158	if (op->contr->mode & PU_READABLES)
1202	if (tmp->type == BOOK || tmp->type == SCROLL)	1159	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1203	{	1160	{
1204	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1205	continue;	1162	continue;
1206	}	1163	}
1207		1164
1208	/* wands/staves/rods/horns */	1165	/* wands/staves/rods/horns */
1209	if (op->contr->mode & PU_MAGIC_DEVICE)	1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1210	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1167	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1211	{	1168	{
1212	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1213	continue;	1170	continue;
1214	}	1171	}
1215		1172
1216	/* pick up all magical items */	1173	/* pick up all magical items */
1217	if (op->contr->mode & PU_MAGICAL)	1174	if (op->contr->mode & PU_MAGICAL)
1218	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))
1219	{	1176	{
1220	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1221	continue;	1178	continue;
1222	}	1179	}
1223		1180
1224	if (op->contr->mode & PU_VALUABLES)	1181	if (op->contr->mode & PU_VALUABLES)
1225	{	1182	{
1226	if (tmp->type == MONEY || tmp->type == GEM)	1183	if (tmp->type == MONEY || tmp->type == GEM)
1227	{	1184	{
1228	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1229	continue;	1186	continue;
1230	}	1187	}
1231	}	1188	}
1232		1189
1233	/* rings & amulets - talismans seems to be typed AMULET */	1190	/* rings & amulets - talismans seems to be typed AMULET */
1234	if (op->contr->mode & PU_JEWELS)	1191	if (op->contr->mode & PU_JEWELS)
1235	if (tmp->type == RING || tmp->type == AMULET)	1192	if (tmp->type == RING || tmp->type == AMULET)
1236	{	1193	{
1237	pick_up (op, tmp);	1194	CHK_PICK_PICKUP;
1238	continue;	1195	continue;
1239	}	1196	}
1240		1197
1241	/* we don't forget dragon food */	1198	/* we don't forget dragon food */
1242	if (op->contr->mode & PU_FLESH)	1199	if (op->contr->mode & PU_FLESH)
1243	if (tmp->type == FLESH)	1200	if (tmp->type == FLESH)
1244	{	1201	{
1245	pick_up (op, tmp);	1202	CHK_PICK_PICKUP;
1246	continue;	1203	continue;
1247	}	1204	}
1248		1205
1249	/* bows and arrows. Bows are good for selling! */	1206	/* bows and arrows. Bows are good for selling! */
1250	if (op->contr->mode & PU_BOW)	1207	if (op->contr->mode & PU_BOW)
1251	if (tmp->type == BOW)	1208	if (tmp->type == BOW)
1252	{	1209	{
1253	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1254	continue;	1211	continue;
1255	}	1212	}
1256		1213
1257	if (op->contr->mode & PU_ARROW)	1214	if (op->contr->mode & PU_ARROW)
1258	if (tmp->type == ARROW)	1215	if (tmp->type == ARROW)
1259	{	1216	{
1260	pick_up (op, tmp);	1217	CHK_PICK_PICKUP;
1261	continue;	1218	continue;
1262	}	1219	}
1263		1220
1264	/* all kinds of armor etc. */	1221	/* all kinds of armor etc. */
1265	if (op->contr->mode & PU_ARMOUR)	1222	if (op->contr->mode & PU_ARMOUR)
1266	if (tmp->type == ARMOUR)	1223	if (tmp->type == ARMOUR)
1267	{	1224	{
1268	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1269	continue;	1226	continue;
1270	}	1227	}
1271		1228
1272	if (op->contr->mode & PU_HELMET)	1229	if (op->contr->mode & PU_HELMET)
1273	if (tmp->type == HELMET)	1230	if (tmp->type == HELMET)
1274	{	1231	{
1275	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1276	continue;	1233	continue;
1277	}	1234	}
1278		1235
1279	if (op->contr->mode & PU_SHIELD)	1236	if (op->contr->mode & PU_SHIELD)
1280	if (tmp->type == SHIELD)	1237	if (tmp->type == SHIELD)
1281	{	1238	{
1282	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1283	continue;	1240	continue;
1284	}	1241	}
1285		1242
1286	if (op->contr->mode & PU_BOOTS)	1243	if (op->contr->mode & PU_BOOTS)
1287	if (tmp->type == BOOTS)	1244	if (tmp->type == BOOTS)
1288	{	1245	{
1289	pick_up (op, tmp);	1246	CHK_PICK_PICKUP;
1290	continue;	1247	continue;
1291	}	1248	}
1292		1249
1293	if (op->contr->mode & PU_GLOVES)	1250	if (op->contr->mode & PU_GLOVES)
1294	if (tmp->type == GLOVES)	1251	if (tmp->type == GLOVES)
1295	{	1252	{
1296	pick_up (op, tmp);	1253	CHK_PICK_PICKUP;
1297	continue;	1254	continue;
1298	}	1255	}
1299		1256
1300	if (op->contr->mode & PU_CLOAK)	1257	if (op->contr->mode & PU_CLOAK)
1301	if (tmp->type == CLOAK)	1258	if (tmp->type == CLOAK)
1302	{	1259	{
1303	pick_up (op, tmp);	1260	CHK_PICK_PICKUP;
1304	continue;	1261	continue;
1305	}	1262	}
1306		1263
1307	/* hoping to catch throwing daggers here */	1264	/* hoping to catch throwing daggers here */
1308	if (op->contr->mode & PU_MISSILEWEAPON)	1265	if (op->contr->mode & PU_MISSILEWEAPON)
1309	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1310	{	1267	{
1311	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1312	continue;	1269	continue;
1313	}	1270	}
1314		1271
1315	/* careful: chairs and tables are weapons! */	1272	/* careful: chairs and tables are weapons! */
1316	if (op->contr->mode & PU_ALLWEAPON)	1273	if (op->contr->mode & PU_ALLWEAPON)
1317	{	1274	{
1318	if (tmp->type == WEAPON && tmp->name != NULL)	1275	if (tmp->type == WEAPON && tmp->name != NULL)
1319	{	1276	{
1320	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 &&
1321	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1279	{
1323	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1324	continue;	1281	continue;
1325	}	1282	}
1326	}	1283	}
1327		1284
1328	if (tmp->type == WEAPON && tmp->name == NULL)	1285	if (tmp->type == WEAPON && tmp->name == NULL)
1329	{	1286	{
1330	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)
1331	{	1288	{
1332	pick_up (op, tmp);	1289	CHK_PICK_PICKUP;
1333	continue;	1290	continue;
1334	}	1291	}
1335	}	1292	}
1336	}	1293	}
1337		1294
1338	/* misc stuff that's useful */	1295	/* misc stuff that's useful */
1339	if (op->contr->mode & PU_KEY)	1296	if (op->contr->mode & PU_KEY)
1340	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1297	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1341	{	1298	{
1342	pick_up (op, tmp);	1299	CHK_PICK_PICKUP;
1343	continue;	1300	continue;
1344	}	1301	}
1345		1302
1346	/* 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
1347	* pickups */	1304	* pickups */
…		…
1352	/* >=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
1353	* and multiply them by 5, giving 0..15*5== 5..75 */	1310	* and multiply them by 5, giving 0..15*5== 5..75 */
1354	wvratio = (op->contr->mode & PU_RATIO) * 5;	1311	wvratio = (op->contr->mode & PU_RATIO) * 5;
1355	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)
1356	{	1313	{
1357	pick_up (op, tmp);	1314	CHK_PICK_PICKUP;
1358	#if 0	1315	#if 0
1359	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1360	if (tmp->name != NULL)	1317	if (tmp->name != NULL)
1361	{	1318	{
1362	fprintf (stderr, "%s", tmp->name);	1319	fprintf (stderr, "%s", tmp->name);
1363	}	1320	}
1364	else	1321	else
1365	fprintf (stderr, "%s", tmp->arch->name);	1322	fprintf (stderr, "%s", tmp->arch->archname);
1366	fprintf (stderr, ",%d] = ", tmp->type);	1323	fprintf (stderr, ",%d] = ", tmp->type);
1367	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))));
1368	#endif	1325	#endif
1369	continue;	1326	continue;
1370	}	1327	}
…		…
1381	* found object is returned.	1338	* found object is returned.
1382	*/	1339	*/
1383	object *	1340	object *
1384	find_arrow (object *op, const char *type)	1341	find_arrow (object *op, const char *type)
1385	{	1342	{
1386	object *tmp = 0;
1387
1388	for (op = op->inv; op; op = op->below)	1343	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1389	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1390	tmp = find_arrow (op, type);
1391	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);
1392	return op;	1352	return arrow;
		1353	}
1393		1354
1394	return tmp;	1355	return 0;
1395	}	1356	}
1396		1357
1397	/*	1358	/*
1398	* 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
1399	* 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
…		…
1422	}	1383	}
1423	}	1384	}
1424	else if (arrow->type == ARROW && arrow->race == type)	1385	else if (arrow->type == ARROW && arrow->race == type)
1425	{	1386	{
1426	/* allways prefer assasination/slaying */	1387	/* allways prefer assasination/slaying */
1427	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1428	{	1389	{
1429	if (arrow->attacktype & AT_DEATH)	1390	if (arrow->attacktype & AT_DEATH)
1430	{	1391	{
1431	*better = 100;	1392	*better = 100;
1432	return arrow;	1393	return arrow;
…		…
1440	else	1401	else
1441	{	1402	{
1442	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1403	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1443	{	1404	{
1444	attacktype = 1 << attacknum;	1405	attacktype = 1 << attacknum;
1445	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1406	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1446	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)
1447	{	1408	{
1448	tmp = arrow;	1409	tmp = arrow;
1449	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;
1450	}	1411	}
1451	}	1412	}
1452	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1413	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1453	{	1414	{
1454	tmp = arrow;	1415	tmp = arrow;
…		…
1460	betterby = 1 + arrow->magic + arrow->stats.dam;	1421	betterby = 1 + arrow->magic + arrow->stats.dam;
1461	}	1422	}
1462	}	1423	}
1463	}	1424	}
1464	}	1425	}
		1426
1465	if (tmp == NULL && arrow == NULL)	1427	if (tmp == NULL && arrow == NULL)
1466	return find_arrow (op, type);	1428	return find_arrow (op, type);
1467		1429
1468	*better = betterby;	1430	*better = betterby;
1469	return tmp;	1431	return tmp;
…		…
1473	* find_better_arrow to find a decent arrow to use.	1435	* find_better_arrow to find a decent arrow to use.
1474	* op = the shooter	1436	* op = the shooter
1475	* type = bow->race	1437	* type = bow->race
1476	* dir = fire direction	1438	* dir = fire direction
1477	*/	1439	*/
1478
1479	object *	1440	object *
1480	pick_arrow_target (object *op, const char *type, int dir)	1441	pick_arrow_target (object *op, const char *type, int dir)
1481	{	1442	{
1482	object *tmp = NULL;	1443	object *tmp = NULL;
1483	maptile *m;	1444	maptile *m;
…		…
1548	*/	1509	*/
1549	int	1510	int
1550	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)
1551	{	1512	{
1552	object *left, *bow;	1513	object *left, *bow;
1553	int bowspeed, mflags;	1514	int mflags;
1554	maptile *m;	1515	maptile *m;
1555		1516
1556	if (!dir)	1517	if (!dir)
1557	{	1518	{
1558	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!");
1559	return 0;	1520	return 0;
1560	}	1521	}
1561		1522
1562	if (op->type == PLAYER)	1523	if (op->contr)
1563	bow = op->contr->ranges[range_bow];	1524	bow = op->current_weapon;
1564	else	1525	else
1565	{	1526	{
1566	for (bow = op->inv; bow; bow = bow->below)	1527	for (bow = op->inv; bow; bow = bow->below)
1567	/* 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
1568	* 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.
…		…
1573	if (!bow)	1534	if (!bow)
1574	{	1535	{
1575	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1536	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1576	return 0;	1537	return 0;
1577	}	1538	}
		1539
		1540	// optimisation: move object to top so we will find it quickly again
		1541	if (bow->below)
		1542	{
		1543	bow->remove ();
		1544	op->insert (bow);
		1545	}
		1546
1578	}	1547	}
1579		1548
1580	if (!bow->race || !bow->skill)	1549	if (!bow->race || !bow->skill)
1581	{	1550	{
1582	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);
1583	return 0;	1552	return 0;
1584	}	1553	}
1585
1586	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1587
1588	/* penalize ROF for bestarrow */
1589	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1590	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1591
1592	if (bowspeed < 1)
1593	bowspeed = 1;
1594		1554
1595	if (arrow == NULL)	1555	if (arrow == NULL)
1596	{	1556	{
1597	if ((arrow = find_arrow (op, bow->race)) == NULL)	1557	if ((arrow = find_arrow (op, bow->race)) == NULL)
1598	{	1558	{
1599	if (op->type == PLAYER)	1559	if (op->type == PLAYER)
1600	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1560	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1601	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1561	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1602	else	1562	else
1603	CLEAR_FLAG (op, FLAG_READY_BOW);	1563	CLEAR_FLAG (op, FLAG_READY_BOW);
		1564
1604	return 0;	1565	return 0;
1605	}	1566	}
1606	}	1567	}
1607		1568
1608	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1569	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1621	arrow->destroy ();	1582	arrow->destroy ();
1622	return 0;	1583	return 0;
1623	}	1584	}
1624		1585
1625	left = arrow; /* these are arrows left to the player */	1586	left = arrow; /* these are arrows left to the player */
1626	arrow = get_split_ob (arrow, 1);	1587	arrow = arrow->split ();
1627	if (!arrow)	1588	if (!arrow)
1628	{	1589	{
1629	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);
1630	return 0;	1591	return 0;
1631	}	1592	}
1632		1593
1633	arrow->set_owner (op);	1594	arrow->set_owner (op);
1634	arrow->skill = bow->skill;	1595	arrow->skill = bow->skill;
1635	arrow->direction = dir;	1596	arrow->direction = dir;
1636		1597
		1598	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1599	arrow->stats.hp = arrow->stats.dam;
		1600	arrow->stats.grace = arrow->attacktype;
		1601
		1602	if (arrow->slaying)
		1603	arrow->spellarg = strdup (arrow->slaying);
		1604
		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);
		1621
		1622	/* update the speed */
		1623	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1624	+ bow->stats.dam / 7.f;
		1625
		1626	arrow->set_speed (max (arrow->speed, 2.f));
		1627	arrow->speed_left = 0;
		1628
		1629	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1630
1637	if (op->type == PLAYER)	1631	if (op->type == PLAYER)
1638	{	1632	{
1639	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1640	op->update_stats ();
1641	}
1642
1643	SET_ANIMATION (arrow, arrow->direction);
1644	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1645	arrow->stats.hp = arrow->stats.dam;
1646	arrow->stats.grace = arrow->attacktype;
1647	if (arrow->slaying != NULL)
1648	arrow->spellarg = strdup (arrow->slaying);
1649
1650	/* Note that this was different for monsters - they got their level
1651	* added to the damage. I think the strength bonus is more proper.
1652	*/
1653
1654	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1655
1656	/* update the speed */
1657	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1658	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1659
1660	arrow->set_speed (max (arrow->speed, 1.0));
1661	arrow->speed_left = 0;
1662
1663	if (op->type == PLAYER)
1664	{
1665	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1666	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1667	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1668
1669	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1633	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1634	wc -= dex_bonus[op->stats.Dex];
		1635
		1636	if (!arrow->slaying)
		1637	arrow->slaying = op->slaying;
		1638
		1639	arrow->attacktype |= op->attacktype;
1670	}	1640	}
1671	else	1641	else
1672	{	1642	{
1673	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1674	arrow->level = op->level;	1643	arrow->level = op->level;
1675	}	1644	arrow->stats.wc -= bow->magic;
1676		1645
1677	if (arrow->attacktype == AT_PHYSICAL)	1646	if (!arrow->slaying)
		1647	arrow->slaying = bow->slaying;
		1648
1678	arrow->attacktype |= bow->attacktype;	1649	arrow->attacktype |= bow->attacktype;
		1650	}
1679		1651
1680	if (bow->slaying)	1652	wc -= arrow->level;
1681	arrow->slaying = bow->slaying;	1653	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1682		1654
		1655	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1683	arrow->move_type = MOVE_FLY_LOW;	1656	arrow->move_type = MOVE_FLY_LOW;
1684	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1657	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1685		1658
1686	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1659	op->play_sound (sound_find ("fire_arrow"));
1687	m->insert (arrow, sx, sy, op);	1660	m->insert (arrow, sx, sy, op);
1688		1661
1689	if (!arrow->destroyed ())	1662	if (!arrow->destroyed ())
1690	move_arrow (arrow);	1663	move_arrow (arrow);
1691
1692	if (op->type == PLAYER)
1693	{
1694	if (left->destroyed ())
1695	esrv_del_item (op->contr, left->count);
1696	else
1697	esrv_send_item (op, left);
1698	}
1699		1664
1700	return 1;	1665	return 1;
1701	}	1666	}
1702		1667
1703	/* Special fire code for players - this takes into	1668	/* Special fire code for players - this takes into
…		…
1712	{	1677	{
1713	int ret = 0, wcmod = 0;	1678	int ret = 0, wcmod = 0;
1714		1679
1715	if (op->contr->bowtype == bow_bestarrow)	1680	if (op->contr->bowtype == bow_bestarrow)
1716	{	1681	{
1717	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1682	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1718	}	1683	}
1719	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1684	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1720	{	1685	{
1721	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1686	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1722	wcmod = -1;	1687	wcmod = -1;
…		…
1732	else if (op->contr->bowtype == bow_spreadshot)	1697	else if (op->contr->bowtype == bow_spreadshot)
1733	{	1698	{
1734	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);
1735	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);
1736	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);
1737
1738	}	1702	}
1739	else	1703	else
1740	{	1704	{
1741	/* Simple case */	1705	/* Simple case */
1742	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);
1743	}	1707	}
		1708
1744	return ret;	1709	return ret;
1745	}	1710	}
1746
1747		1711
1748	/* Fires a misc (wand/rod/horn) object in 'dir'.	1712	/* Fires a misc (wand/rod/horn) object in 'dir'.
1749	* Broken apart from 'fire' to keep it more readable.	1713	* Broken apart from 'fire' to keep it more readable.
1750	*/	1714	*/
1751	void	1715	void
1752	fire_misc_object (object *op, int dir)	1716	fire_misc_object (object *op, int dir)
1753	{	1717	{
1754	object *item;	1718	object *item = op->contr->ranged_ob;
1755		1719
1756	if (!op->contr->ranges[range_misc])	1720	if (!item)
1757	{	1721	{
1758	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1722	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1759	return;	1723	return;
1760	}	1724	}
1761		1725
1762	item = op->contr->ranges[range_misc];
1763	if (!item->inv)	1726	if (!item->inv)
1764	{	1727	{
1765	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1728	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1766	return;	1729	return;
1767	}	1730	}
		1731
		1732	if (!op->change_weapon (item))
		1733	return;
		1734
1768	if (item->type == WAND)	1735	if (item->type == WAND)
1769	{	1736	{
1770	if (item->stats.food <= 0)	1737	if (item->stats.food <= 0)
1771	{	1738	{
1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1739	op->contr->play_sound (sound_find ("wand_poof"));
1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1740	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1741
1774	return;	1742	return;
1775	}	1743	}
1776	}	1744	}
1777	else if (item->type == ROD || item->type == HORN)	1745	else if (item->type == ROD || item->type == HORN)
1778	{	1746	{
1779	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))
1780	{	1752	{
1781	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1753	op->contr->play_sound (sound_find ("wand_poof"));
		1754
1782	if (item->type == ROD)	1755	if (item->type == ROD)
1783	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));
1784	else	1757	else
1785	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
1786	return;	1760	return;
1787	}	1761	}
1788	}	1762	}
1789		1763
1790	if (cast_spell (op, item, dir, item->inv, NULL))	1764	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1797	object *tmp;	1771	object *tmp;
1798		1772
1799	if (item->arch)	1773	if (item->arch)
1800	{	1774	{
1801	CLEAR_FLAG (item, FLAG_ANIMATE);	1775	CLEAR_FLAG (item, FLAG_ANIMATE);
1802	item->face = item->arch->clone.face;	1776	item->face = item->arch->face;
1803	item->set_speed (0);	1777	item->set_speed (0);
1804	}	1778	}
1805		1779
1806	if ((tmp = item->in_player ()))	1780	if (object *pl = item->visible_to ())
1807	esrv_update_item (UPD_ANIM, tmp, item);	1781	esrv_update_item (UPD_ANIM, pl, item);
1808	}	1782	}
1809	}	1783	}
1810	else if (item->type == ROD || item->type == HORN)	1784	else if (item->type == ROD || item->type == HORN)
1811	drain_rod_charge (item);	1785	drain_rod_charge (item);
1812	}	1786	}
1813	}	1787	}
1814		1788
1815	/* Received a fire command for the player - go and do it.	1789	/* Received a fire command for the player - go and do it.
1816	*/	1790	*/
1817	void	1791	bool
1818	fire (object *op, int dir)	1792	fire (object *op, int dir)
1819	{	1793	{
1820	int spellcost = 0;	1794	int spellcost = 0;
1821		1795
1822	/* check for loss of invisiblity/hide */	1796	/* check for loss of invisiblity/hide */
1823	if (action_makes_visible (op))	1797	if (action_makes_visible (op))
1824	make_visible (op);	1798	make_visible (op);
1825		1799
1826	switch (op->contr->shoottype)	1800	player *pl = op->contr;
		1801
		1802	if (pl->golem)
		1803	{
		1804	control_golem (op->contr->golem, dir);
		1805	return false;
1827	{	1806	}
1828	case range_none:
1829	return;
1830		1807
1831	case range_bow:	1808	object *ob = pl->ranged_ob;
		1809
		1810	if (!ob)
		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;
		1820
		1821	switch (ob->type)
		1822	{
		1823	case BOW:
1832	player_fire_bow (op, dir);	1824	player_fire_bow (op, dir);
1833	return;	1825	break;
1834		1826
1835	case range_magic: /* Casting spells */	1827	case SPELL:
1836	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1828	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1837	return;	1829	break;
1838		1830
1839	case range_misc:	1831	case BUILDER:
		1832	apply_map_builder (op, dir);
		1833	break;
		1834
		1835	case SKILL:
		1836	do_skill (op, op, ob, dir, 0);
		1837	break;
		1838
		1839	default:
1840	fire_misc_object (op, dir);	1840	fire_misc_object (op, dir);
1841	return;	1841	break;
1842
1843	case range_golem: /* Control summoned monsters from scrolls */
1844	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1845	{
1846	op->contr->ranges[range_golem] = 0;
1847	op->contr->shoottype = range_none;
1848	}
1849	else
1850	control_golem (op->contr->ranges[range_golem], dir);
1851	return;
1852
1853	case range_skill:
1854	if (!op->chosen_skill)
1855	{
1856	if (op->type == PLAYER)
1857	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1858	return;
1859	}
1860
1861	do_skill (op, op, op->chosen_skill, dir, NULL);
1862	return;
1863	case range_builder:
1864	apply_map_builder (op, dir);
1865	return;
1866	default:
1867	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1868	return;
1869	}	1842	}
		1843
		1844	return true;
1870	}	1845	}
1871		1846
1872	/* find_key	1847	/* find_key
1873	* 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
1874	* and successfully use it, we return the key, otherwise NULL	1849	* and successfully use it, we return the key, otherwise NULL
…		…
1961	* 0 otherwise	1936	* 0 otherwise
1962	*/	1937	*/
1963	static int	1938	static int
1964	player_attack_door (object *op, object *door)	1939	player_attack_door (object *op, object *door)
1965	{	1940	{
1966	/* 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,
1967	* 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 -
1968	* otherwise, we fall through to the rest of the code.	1943	* otherwise, we fall through to the rest of the code.
1969	*/	1944	*/
1970	object *key = find_key (op, op, door);	1945	object *key = find_key (op, op, door);
1971		1946
1972	/* IF we found a key, do some extra work */	1947	/* If we found a key, do some extra work */
1973	if (key)	1948	if (key)
1974	{	1949	{
1975	object *container = key->env;	1950	object *container = key->env;
1976		1951
1977	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1978	if (action_makes_visible (op))	1952	if (action_makes_visible (op))
1979	make_visible (op);	1953	make_visible (op);
		1954
1980	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1955	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1981	spring_trap (door->inv, op);	1956	spring_trap (door->inv, op);
1982		1957
1983	if (door->type == DOOR)	1958	if (door->type == DOOR)
1984	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 */
1985	else if (door->type == LOCKED_DOOR)	1960	else if (door->type == LOCKED_DOOR)
1986	{	1961	{
1987	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);
1988	remove_door2 (door); /* remove door without violence ;-) */	1963	remove_door2 (door); /* remove door without violence ;-) */
1989	}	1964	}
1990		1965
1991	/* Do this after we print the message */	1966	/* Do this after we print the message */
1992	decrease_ob (key); /* Use up one of the keys */	1967	key->decrease (); /* Use up one of the keys */
1993	/* Need to update the weight the container the key was in */
1994	if (container != op)
1995	esrv_update_item (UPD_WEIGHT, op, container);
1996		1968
1997	return 1; /* Nothing more to do below */	1969	return 1; /* Nothing more to do below */
1998	}	1970	}
1999	else if (door->type == LOCKED_DOOR)	1971	else if (door->type == LOCKED_DOOR)
2000	{	1972	{
2001	/* Might as well return now - no other way to open this */	1973	/* Might as well return now - no other way to open this */
2002	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...");
2003	return 1;	1975	return 1;
2004	}	1976	}
2005		1977
2006	return 0;	1978	return 0;
2007	}	1979	}
…		…
2010	* It should keep the code cleaner.	1982	* It should keep the code cleaner.
2011	* When this is called, the players direction has been updated	1983	* When this is called, the players direction has been updated
2012	* (taking into account confusion.) The player is also actually	1984	* (taking into account confusion.) The player is also actually
2013	* going to try and move (not fire weapons).	1985	* going to try and move (not fire weapons).
2014	*/	1986	*/
2015	void	1987	bool
2016	move_player_attack (object *op, int dir)	1988	move_player_attack (object *op, int dir)
2017	{	1989	{
2018	object *tmp, *mon;
2019	sint16 nx, ny;
2020	int on_battleground;	1990	int on_battleground;
2021	maptile *m;
2022		1991
2023	nx = freearr_x[dir] + op->x;	1992	sint16 nx = freearr_x[dir] + op->x;
2024	ny = freearr_y[dir] + op->y;	1993	sint16 ny = freearr_y[dir] + op->y;
2025		1994
2026	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	}
2027		2005
2028	/* 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
2029	* 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
2030	* 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
2031	* player. This is a pretty nasty hack, because if we could	2009	* player. This is a pretty nasty hack, because if we could
2032	* 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
2033	* 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
2034	* 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
2035	* move_ob uses.	2013	* move_ob uses.
2036	*/	2014	*/
2037	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2038	{
2039	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2040	{
2041	m = op->map->xy_find (nx, ny);	2015	maptile *m = op->map->xy_find (nx, ny);
2042	if (!m)
2043	return; /* Don't think this should happen */
2044	}
2045	else
2046	m = op->map;
2047		2016
2048	if (!(tmp = m->at (nx, ny).bot))
2049	return;
2050
2051	mon = 0;
2052	/* 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
2053	* 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.
2054	* 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
2055	* on the space	2020	* on the space
2056	*/	2021	*/
2057	while (tmp)	2022	object *mon;
2058	{	2023	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2059	if (tmp == op)	2024	{
2060	{	2025	if ((mon->flag [FLAG_ALIVE]
2061	tmp = tmp->above;	2026	|| mon->type == LOCKED_DOOR
2062	continue;	2027	|| mon->flag [FLAG_CAN_ROLL])
2063	}
2064
2065	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2066	{
2067	mon = tmp;	2028	&& mon != op)
2068	break;	2029	break;
2069	}	2030	}
2070		2031
2071	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2072	mon = tmp;
2073
2074	tmp = tmp->above;
2075	}
2076
2077	if (!mon) /* This happens anytime the player tries to move */	2032	if (!mon) /* This happens anytime the player tries to move */
2078	return; /* into a wall */	2033	return false; /* into a wall */
2079		2034
2080	if (mon->head)
2081	mon = mon->head;	2035	mon = mon->head_ ();
2082		2036
2083	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)
2084	if (player_attack_door (op, mon))	2039	if (player_attack_door (op, mon))
		2040	{
		2041	--op->contr->weapon_sp_left;
2085	return;	2042	return true;
		2043	}
2086		2044
2087	/* The following deals with possibly attacking peaceful	2045	/* The following deals with possibly attacking peaceful
2088	* or frienddly creatures. Basically, all players are considered	2046	* or friendly creatures. Basically, all players are considered
2089	* unaggressive. If the moving player has peaceful set, then the	2047	* unaggressive. If the moving player has peaceful set, then the
2090	* object should be pushed instead of attacked. It is assumed that	2048	* object should be pushed instead of attacked. It is assumed that
2091	* if you are braced, you will not attack friends accidently,	2049	* if you are braced, you will not attack friends accidently,
2092	* and thus will not push them.	2050	* and thus will not push them.
2093	*/	2051	*/
2094		2052
2095	/* 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
2096	* peaceful. Our assumption is the creature is a pet if the	2054	* peaceful. Our assumption is the creature is a pet if the
2097	* player owns it and it is either friendly or unagressive.	2055	* player owns it and it is either friendly or unagressive.
2098	*/	2056	*/
2099	if ((op->type == PLAYER)	2057	if (op->type == PLAYER
2100	#if COZY_SERVER
2101	&&
2102	((mon->owner && mon->owner->contr	2058	&& ((mon->owner && mon->owner->contr
2103	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2059	&& same_party (mon->owner->contr->party, op->contr->party))
2104	#else
2105	&& mon->owner == op	2060	|| mon->owner == op)
2106	#endif
2107	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2061	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108	{	2062	{
2109	/* 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 */
2110	if (op->contr->braced)	2064	if (op->contr->braced)
2111	return;	2065	return false;
2112		2066
2113	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"));
2114	(void) push_ob (mon, dir, op);	2072	push_ob (mon, dir, op);
		2073
2115	if (op->contr->tmp_invis || op->hide)	2074	if (op->contr->tmp_invis || op->hide)
2116	make_visible (op);	2075	make_visible (op);
2117		2076
2118	return;	2077	return true;
2119	}	2078	}
		2079	else
		2080	return false;
		2081	}
2120		2082
2121	/* in certain circumstances, you shouldn't attack friendly	2083	/* in certain circumstances, you shouldn't attack friendly
2122	* creatures. Note that if you are braced, you can't push	2084	* creatures. Note that if you are braced, you can't push
2123	* 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
2124	* attack them either.	2086	* attack them either.
2125	*/	2087	*/
2126	if ((mon->type == PLAYER || mon->enemy != op) &&	2088	if ((mon->type == PLAYER || mon->enemy != op)
2127	(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))
2128	#ifdef PROHIBIT_PLAYERKILL
2129	(op->contr->peaceful	2090	&& ((op->contr->peaceful
2130	|| (mon->type == PLAYER	2091	|| (mon->type == PLAYER && mon->contr->peaceful))
2131	&& mon->contr->
2132	peaceful)) &&
2133	#else
2134	op->contr->peaceful &&
2135	#endif
2136	!on_battleground))	2092	&& !on_battleground))
		2093	{
		2094	if (op->speed_left > 0.f)
2137	{	2095	{
		2096	--op->speed_left;
		2097
2138	if (!op->contr->braced)	2098	if (!op->contr->braced)
2139	{	2099	{
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2100	op->play_sound (sound_find ("push_player"));
2141	push_ob (mon, dir, op);	2101	push_ob (mon, dir, op);
2142	}	2102	}
2143	else	2103	else
2144	new_draw_info (0, 0, op, "You withhold your attack");	2104	op->statusmsg ("You withhold your attack");
2145		2105
2146	if (op->contr->tmp_invis || op->hide)	2106	if (op->contr->tmp_invis || op->hide)
2147	make_visible (op);	2107	make_visible (op);
2148	}
2149		2108
		2109	return true;
		2110	}
		2111	}
2150	/* If the object is a boulder or other rollable object, then	2112	/* If the object is a boulder or other rollable object, then
2151	* 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.
2152	*/	2114	*/
2153	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)
2154	{	2118	{
		2119	--op->speed_left;
		2120
2155	recursive_roll (mon, dir, op);	2121	recursive_roll (mon, dir, op);
2156	if (action_makes_visible (op))	2122	if (action_makes_visible (op))
2157	make_visible (op);	2123	make_visible (op);
2158	}
2159		2124
		2125	return true;
		2126	}
		2127	}
2160	/* Any generic living creature. Including things like doors.	2128	/* Any generic living creature. Including things like doors.
2161	* 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
2162	* and be living. Then, it must be one of the following:	2130	* and be living. Then, it must be one of the following:
2163	* 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
2164	* 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.
2165	*/	2133	*/
2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2134	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167	((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)))
2168	{	2136	{
2169		2137	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2170	/* If the player hasn't hit something this tick, and does
2171	* so, give them speed boost based on weapon speed. Doing
2172	* it here is better than process_players2, which basically
2173	* incurred a 1 tick offset.
2174	*/
2175	if (!op->contr->has_hit)
2176	{	2138	{
2177	op->speed_left += op->speed / op->contr->weapon_sp;	2139	--op->contr->weapon_sp_left;
2178
2179	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180	}
2181		2140
2182	skill_attack (mon, op, 0, 0, 0);	2141	skill_attack (mon, op, 0, 0, 0);
2183
2184	/* If attacking another player, that player gets automatic
2185	* hitback, and doesn't loose luck either.
2186	* Disable hitback on the battleground or if the target is
2187	* the wiz.
2188	*/
2189	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2190	{
2191	short luck = mon->stats.luck;
2192
2193	mon->contr->has_hit = 1;
2194	skill_attack (op, mon, 0, 0, 0);
2195	mon->stats.luck = luck;
2196	}
2197		2142
2198	if (action_makes_visible (op))	2143	if (action_makes_visible (op))
2199	make_visible (op);	2144	make_visible (op);
2200	}
2201	} /* if player should attack something */
2202	}
2203		2145
2204	int	2146	return true;
		2147	}
		2148	}
		2149
		2150	return false;
		2151	}
		2152
		2153	bool
2205	move_player (object *op, int dir)	2154	move_player (object *op, int dir)
2206	{	2155	{
2207	int pick;	2156	int pick;
2208		2157
2209	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2158	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2210	return 0;	2159	return 0;
2211		2160
2212	/* Sanity check: make sure dir is valid */	2161	/* Sanity check: make sure dir is valid */
2213	if ((dir < 0) || (dir >= 9))	2162	if ((dir < 0) || (dir >= 9))
2214	{	2163	{
…		…
2223	op->facing = dir;	2172	op->facing = dir;
2224		2173
2225	if (op->hide)	2174	if (op->hide)
2226	do_hidden_move (op);	2175	do_hidden_move (op);
2227		2176
		2177	bool retval;
		2178
2228	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2179	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2229	/*nop */ ;	2180	retval = RESULT_INT (0);
2230	else if (op->contr->fire_on)	2181	else if (op->contr->fire_on)
2231	fire (op, dir);	2182	retval = fire (op, dir);
2232	else	2183	else
2233	{	2184	{
2234	move_player_attack (op, dir);	2185	retval = move_player_attack (op, dir);
2235	pick = check_pick (op);	2186	pick = check_pick (op);
2236	}	2187	}
2237		2188
2238	/* 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
2239	* server can handle repeat firing.	2190	* server can handle repeat firing.
…		…
2246	/* Update how the player looks. Use the facing, so direction may	2197	/* Update how the player looks. Use the facing, so direction may
2247	* get reset to zero. This allows for full animation capabilities	2198	* get reset to zero. This allows for full animation capabilities
2248	* for players.	2199	* for players.
2249	*/	2200	*/
2250	animate_object (op, op->facing);	2201	animate_object (op, op->facing);
2251	return 0;	2202
		2203	return retval;
2252	}	2204	}
2253		2205
2254	/* 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
2255	* new client/server stuff.	2207	* new client/server stuff.
2256	* 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
2257	* the new speed values for commands.	2209	* the new speed values for commands.
2258	*	2210	*
2259	* 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.
2260	*/	2214	*/
2261	int	2215	bool
2262	handle_newcs_player (object *op)	2216	handle_newcs_player (object *op)
2263	{	2217	{
2264	if (QUERY_FLAG (op, FLAG_SCARED))	2218	if (QUERY_FLAG (op, FLAG_SCARED))
2265	{	2219	{
2266	flee_player (op);	2220	if (op->speed_left > 0.f)
2267	/* If player is still scared, that is his action for this tick */
2268	if (QUERY_FLAG (op, FLAG_SCARED))
2269	{	2221	{
2270	op->speed_left--;	2222	--op->speed_left;
		2223	flee_player (op);
		2224
2271	return 0;	2225	return true;
2272	}	2226	}
		2227	else
		2228	return false;
2273	}	2229	}
2274
2275	/* I've been seeing crashes where the golem has been destroyed, but
2276	* the player object still points to the defunct golem. The code that
2277	* destroys the golem looks correct, and it doesn't always happen, so
2278	* put this in a a workaround to clean up the golem pointer.
2279	*/
2280	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2281	op->contr->ranges[range_golem] = 0;
2282		2230
2283	/* 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
2284	* the players time has been increased when doericserver has been	2232	* the players time has been increased when doericserver has been
2285	* called, so we recheck it here.	2233	* called, so we recheck it here.
2286	*/	2234	*/
2287	if (op->contr->ns->handle_command ())	2235	if (op->contr->ns->handle_command ())
2288	return 1;	2236	return true;
2289		2237
2290	if (op->speed_left > 0)
2291	{
2292	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2238	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2293	{
2294	/* All move commands take 1 tick, at least for now */
2295	op->speed_left--;
2296
2297	/* Instead of all the stuff below, let move_player take care
2298	* of it. Also, some of the skill stuff is only put in
2299	* there, as well as the confusion stuff.
2300	*/
2301	move_player (op, op->direction);	2239	return move_player (op, op->direction);
2302		2240
2303	return op->speed_left > 0;
2304	}
2305	}
2306
2307	return 0;	2241	return false;
2308	}	2242	}
2309		2243
2310	int	2244	int
2311	save_life (object *op)	2245	save_life (object *op)
2312	{	2246	{
…		…
2314	return 0;	2248	return 0;
2315		2249
2316	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2250	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2317	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2251	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2318	{	2252	{
2319	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2253	op->play_sound (sound_find ("ob_evaporate"));
2320	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));
2321
2322	if (op->contr)
2323	esrv_del_item (op->contr, tmp->count);
2324		2255
2325	tmp->destroy ();	2256	tmp->destroy ();
2326	CLEAR_FLAG (op, FLAG_LIFESAVE);	2257	CLEAR_FLAG (op, FLAG_LIFESAVE);
2327		2258
2328	if (op->stats.hp < 0)	2259	if (op->stats.hp < 0)
…		…
2341	return 0;	2272	return 0;
2342	}	2273	}
2343		2274
2344	/* 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
2345	* 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
2346	* 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
2347	* from.	2278	* from.
2348	*/	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
2349	void	2296	void
2350	remove_unpaid_objects (object *op, object *env)	2297	object::drop_unpaid_items ()
2351	{	2298	{
2352	while (op)	2299	if (!flag [FLAG_REMOVED])
2353	{	2300	::drop_unpaid_items (inv, this);
2354	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2355
2356	if (QUERY_FLAG (op, FLAG_UNPAID))
2357	{
2358	if (env->type == PLAYER)
2359	esrv_del_item (env->contr, op->count);
2360
2361	op->insert_at (env);
2362	}
2363	else if (op->inv)
2364	remove_unpaid_objects (op->inv, env);
2365
2366	op = next;
2367	}
2368	}	2301	}
2369		2302
2370	/*	2303	/*
2371	* Returns pointer a static string containing gravestone text	2304	* Returns pointer a static string containing gravestone text
2372	* Moved from apply.c to player.c - player.c is what	2305	* Moved from apply.c to player.c - player.c is what
2373	* actually uses this function. player.c may not be quite the	2306	* actually uses this function. player.c may not be quite the
2374	* best, a misc file for object actions is probably better,	2307	* best, a misc file for object actions is probably better,
2375	* but there isn't one in the server directory.	2308	* but there isn't one in the server directory.
2376	*/	2309	*/
2377	char *	2310	const char *
2378	gravestone_text (object *op)	2311	gravestone_text (object *op)
2379	{	2312	{
2380	static char buf2[MAX_BUF];	2313	static dynbuf_text buf;
2381	char buf[MAX_BUF];
2382	time_t now = time (NULL);
2383		2314
2384	strcpy (buf2, " R.I.P.\n\n");	2315	buf << "---- R.I.P. ----\n\n";
		2316	op->name;
		2317
2385	if (op->type == PLAYER)	2318	if (op->type == PLAYER)
2386	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2319	buf << " the " << op->contr->title;
2387	else
2388	sprintf (buf, "%s\n", &op->name);
2389		2320
2390	strncat (buf2, " ", 20 - strlen (buf) / 2);	2321	buf << "\n\n";
2391	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
2392	if (op->type == PLAYER)	2327	if (op->type == PLAYER)
2393	sprintf (buf, "who was in level %d when killed\n", op->level);	2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2394	else
2395	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2396		2329
2397	strncat (buf2, " ", 20 - strlen (buf) / 2);
2398	strcat (buf2, buf);
2399	if (op->type == PLAYER)
2400	{	2330	{
2401	sprintf (buf, "by %s.\n\n", op->contr->killer);	2331	static char buf2[128];
2402	strncat (buf2, " ", 21 - strlen (buf) / 2);	2332	time_t now = time (NULL);
2403	strcat (buf2, buf);
2404	}
2405
2406	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2407	strncat (buf2, " ", 20 - strlen (buf) / 2);	2334	buf << buf2;
2408	strcat (buf2, buf);	2335	}
2409		2336
2410	return buf2;	2337	return buf;
2411	}	2338	}
2412		2339
2413	void	2340	void
2414	do_some_living (object *op)	2341	do_some_living (object *op)
2415	{	2342	{
…		…
2441	make_visible (op);	2368	make_visible (op);
2442	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2369	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2443	}	2370	}
2444	}	2371	}
2445		2372
2446	if (op->contr->outputs_sync)
2447	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2448	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2449	flush_output_element (op, &op->contr->outputs[i]);
2450
2451	if (op->contr->ns->state == ST_PLAYING)	2373	if (op->contr->ns->state == ST_PLAYING)
2452	{	2374	{
2453	/* these next three if clauses make it possible to SLOW DOWN	2375	/* these next three if clauses make it possible to SLOW DOWN
2454	hp/grace/spellpoint regeneration. */	2376	hp/grace/spellpoint regeneration. */
2455	if (op->contr->gen_hp >= 0)	2377	if (op->contr->gen_hp >= 0)
…		…
2472	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2394	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2473	else	2395	else
2474	{	2396	{
2475	gen_grace = op->stats.maxgrace;	2397	gen_grace = op->stats.maxgrace;
2476	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2398	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477	}
2478
2479	/* Regenerate Spell Points */
2480	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2481	{
2482	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483	if (op->stats.sp < op->stats.maxsp)
2484	{
2485	op->stats.sp++;
2486	/* dms do not consume food */
2487	if (!QUERY_FLAG (op, FLAG_WIZ))
2488	{
2489	op->stats.food--;
2490	if (op->contr->digestion < 0)
2491	op->stats.food += op->contr->digestion;
2492	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2493	op->stats.food = last_food;
2494	}
2495	}
2496
2497	if (max_sp > 1)
2498	{
2499	over_sp = (gen_sp + 10) / rate_sp;
2500	if (over_sp > 0)
2501	{
2502	if (op->stats.sp < op->stats.maxsp)
2503	{
2504	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2505
2506	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2507	op->stats.sp--;
2508
2509	if (op->stats.sp > op->stats.maxsp)
2510	op->stats.sp = op->stats.maxsp;
2511	}
2512	op->last_sp = 0;
2513	}
2514	else
2515	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2516	}
2517	else
2518	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2519	}	2399	}
2520		2400
2521	/* Regenerate Grace */	2401	/* Regenerate Grace */
2522	/* 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. */
2523	if (--op->last_grace < 0)	2403	if (--op->last_grace < 0)
…		…
2544	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);
2545	}	2425	}
2546	/* wearing stuff doesn't detract from grace generation. */	2426	/* wearing stuff doesn't detract from grace generation. */
2547	}	2427	}
2548		2428
		2429	if (op->stats.food > 0)
		2430	{
2549	/* Regenerate Hit Points */	2431	/* Regenerate Spell Points */
2550	if (--op->last_heal < 0)	2432	if (!op->contr->golem && --op->last_sp < 0)
2551	{
2552	if (op->stats.hp < op->stats.maxhp)
2553	{	2433	{
2554	op->stats.hp++;	2434	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2555	/* dms do not consume food */	2435
2556	if (!QUERY_FLAG (op, FLAG_WIZ))	2436	if (op->stats.sp < op->stats.maxsp)
2557	{	2437	{
		2438	op->stats.sp++;
		2439
		2440	/* dms do not consume food */
		2441	if (!QUERY_FLAG (op, FLAG_WIZ))
		2442	{
2558	op->stats.food--;	2443	op->stats.food--;
		2444
2559	if (op->contr->digestion < 0)	2445	if (op->contr->digestion < 0)
2560	op->stats.food += op->contr->digestion;	2446	op->stats.food += op->contr->digestion;
2561	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))
2562	op->stats.food = last_food;	2448	op->stats.food = last_food;
		2449	}
2563	}	2450	}
2564	}
2565		2451
2566	if (max_hp > 1)	2452	if (max_sp > 1)
2567	{
2568	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2569	if (over_hp > 0)
2570	{	2453	{
2571	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
2572	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);
2573	}	2472	}
2574	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)
2575	{	2481	{
2576	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	}
2577	}	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);
2578	}	2507	}
2579	else	2508	else
2580	{
2581	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);
2582	}	2510	}
2583	}	2511	}
2584		2512
2585	/* Digestion */	2513	/* Digestion */
2586	if (--op->last_eat < 0)	2514	if (--op->last_eat < 0)
2587	{	2515	{
2588	#ifdef COZY_SERVER	2516	int bonus = max (0, op->contr->digestion),
2589	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2517	penalty = max (0, -op->contr->digestion);
2590	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2591	#else
2592	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2593	#endif
2594		2518
2595	if (op->contr->gen_hp > 0)
2596	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);
2597	else
2598	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2599		2520
2600	/* dms do not consume food */	2521	/* dms do not consume food */
2601	if (!QUERY_FLAG (op, FLAG_WIZ))	2522	if (!QUERY_FLAG (op, FLAG_WIZ))
2602	op->stats.food--;	2523	op->stats.food--;
2603	}	2524	}
2604		2525
2605	if (op->stats.food < 0 && op->stats.hp >= 0)	2526	if (op->stats.food < 0 && op->stats.hp >= 0)
2606	{	2527	{
2607	object *tmp, *flesh = 0;	2528	object *flesh = 0;
2608		2529
2609	for (tmp = op->inv; tmp; tmp = tmp->below)	2530	for_inv_removable (op, tmp)
2610	{	2531	{
2611	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)
2612	{	2536	{
2613	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2537	op->statusmsg ("You blindly grab for a bite of food. "
2614	{	2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2615	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2616	manual_apply (op, tmp, 0);	2539	manual_apply (op, tmp, 0);
		2540
2617	if (op->stats.food >= 0 || op->stats.hp < 0)	2541	if (op->stats.food >= 0 || op->stats.hp < 0)
2618	break;	2542	break;
2619	}	2543	}
2620	else if (tmp->type == FLESH)	2544	else if (tmp->type == FLESH)
2621	flesh = tmp;	2545	flesh = tmp;
2622	} /* End if paid for object */	2546	}
2623	} /* end of for loop */
2624		2547
2625	/* 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
2626	* eat flesh instead.	2549	* eat flesh instead.
2627	*/	2550	*/
2628	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2551	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2629	{	2552	{
2630	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.>");
2631	manual_apply (op, flesh, 0);	2555	manual_apply (op, flesh, 0);
2632	}	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)
2633	}	2565	{
2634		2566	op->stats.hp += op->stats.food;
2635	while (op->stats.food < 0 && op->stats.hp >= 0)	2567	op->stats.food = 0;
2636	op->stats.food++, op->stats.hp--;	2568	}
2637		2569
2638	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2639	kill_player (op);	2571	kill_player (op);
2640	}	2572	}
2641	}	2573	}
…		…
2646	* file.	2578	* file.
2647	*/	2579	*/
2648	void	2580	void
2649	kill_player (object *op)	2581	kill_player (object *op)
2650	{	2582	{
		2583	int x, y;
2651	char buf[MAX_BUF];	2584	char buf[MAX_BUF];
2652	int x, y;
2653
2654	//int i;
2655	maptile *map; /* this is for resurrection */	2585	maptile *map; /* this is for resurrection */
2656
2657	/* int z;
2658	int num_stats_lose;
2659	int lost_a_stat;
2660	int lose_this_stat;
2661	int this_stat; */
2662	int will_kill_again;	2586	int will_kill_again;
2663	archetype *at;	2587	archetype *at;
2664	object *tmp;	2588	object *tmp;
2665		2589
2666	if (save_life (op))	2590	if (save_life (op))
2667	return;	2591	return;
2668
2669		2592
2670	/* 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
2671	* 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.
2672	* Look at op_on_battleground() for more info --AndreasV	2595	* Look at op_on_battleground() for more info --AndreasV
2673	*/	2596	*/
…		…
2689	{	2612	{
2690	tmp->destroy ();	2613	tmp->destroy ();
2691	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2614	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2692	}	2615	}
2693		2616
2694	cure_disease (op, 0); /* remove any disease */	2617	cure_disease (op, 0, 0); /* remove any disease */
2695	op->stats.hp = op->stats.maxhp;	2618	op->stats.hp = op->stats.maxhp;
2696	if (op->stats.food <= 0)	2619	if (op->stats.food <= 0)
2697	op->stats.food = 999;	2620	op->stats.food = 999;
2698		2621
2699	/* create a bodypart-trophy to make the winner happy */	2622	/* create a bodypart-trophy to make the winner happy */
2700	if (object *tmp = arch_to_object (archetype::find ("finger")))	2623	if (object *tmp = arch_to_object (archetype::find ("finger")))
2701	{	2624	{
2702	sprintf (buf, "%s's finger", &op->name);	2625	tmp->name = format ("%s's finger" , &op->name);
2703	tmp->name = buf;	2626	tmp->name_pl = format ("%s's fingers", &op->name);
2704	sprintf (buf, " This finger has been cut off %s\n"
2705	" the %s, when he was defeated at\n level %d by %s.\n",
2706	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2707	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	);
2708	tmp->value = 0, tmp->type = 0;	2633	tmp->value = 0, tmp->type = 0;
2709	tmp->materialname = "organics";	2634	tmp->materialname = "organics";
2710	tmp->insert_at (op, tmp);	2635	tmp->insert_at (op, tmp);
2711	}	2636	}
2712		2637
…		…
2720		2645
2721	command_kill_pets (op, 0);	2646	command_kill_pets (op, 0);
2722		2647
2723	if (op->stats.food < 0)	2648	if (op->stats.food < 0)
2724	{	2649	{
2725	sprintf (buf, "%s starved to death.", &op->name);	2650	op->contr->killer = archetype::get ("killer_starvation");
2726	strcpy (op->contr->killer, "starvation");	2651	op->contr->killer->destroy ();
2727	}	2652	}
2728	else
2729	sprintf (buf, "%s died.", &op->name);
2730		2653
2731	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2654	op->contr->play_sound (sound_find ("player_dies"));
2732		2655
2733	/* save the map location for corpse, gravestone */	2656	/* save the map location for corpse, gravestone */
2734	x = op->x;	2657	x = op->x;
2735	y = op->y;	2658	y = op->y;
2736	map = op->map;	2659	map = op->map;
…		…
2843	lost_a_stat = 1;	2766	lost_a_stat = 1;
2844	}	2767	}
2845	}	2768	}
2846	}	2769	}
2847	}	2770	}
		2771
2848	/* If no stat lost, tell the player. */	2772	/* If no stat lost, tell the player. */
2849	if (!lost_a_stat)	2773	if (!lost_a_stat)
2850	{	2774	{
2851	/* determine_god() seems to not work sometimes... why is this?	2775	/* determine_god() seems to not work sometimes... why is this?
2852	Should I be using something else? GD */	2776	Should I be using something else? GD */
…		…
2856	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);
2857	else	2781	else
2858	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.");
2859	}	2783	}
2860	#else	2784	#else
2861	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.");
2862	#endif	2786	#endif
2863		2787
2864	/* Put a gravestone up where the character 'almost' died. List the	2788	/* Put a gravestone up where the character 'almost' died. List the
2865	* exp loss on the stone.	2789	* exp loss on the stone.
2866	*/	2790	*/
2867	tmp = arch_to_object (archetype::find ("gravestone"));	2791	tmp = arch_to_object (archetype::find ("gravestone"));
2868	sprintf (buf, "%s's gravestone", &op->name);	2792	tmp->name = format ("%s's gravestone", &op->name);
2869	tmp->name = buf;	2793	tmp->name_pl = format ("%s's gravestones", &op->name);
2870	sprintf (buf, "%s's gravestones", &op->name);
2871	tmp->name_pl = buf;
2872	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 ());
2873	tmp->msg = buf;
2874	tmp->x = op->x, tmp->y = op->y;	2795	tmp->x = op->x, tmp->y = op->y;
2875	insert_ob_in_map (tmp, op->map, NULL, 0);	2796	insert_ob_in_map (tmp, op->map, NULL, 0);
2876		2797
2877	/**************************************/	2798	/**************************************/
2878	/* */	2799	/* */
…		…
2899	{	2820	{
2900	tmp->destroy ();	2821	tmp->destroy ();
2901	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2902	}	2823	}
2903		2824
2904	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	}
2905		2838
2906	/*add_exp(op, (op->stats.exp * -0.20)); */	2839	/*add_exp(op, (op->stats.exp * -0.20)); */
2907	apply_death_exp_penalty (op);	2840	apply_death_exp_penalty (op);
		2841
2908	if (op->stats.food < 100)	2842	if (op->stats.food < 100)
2909	op->stats.food = 900;	2843	op->stats.food = 900;
		2844
2910	op->stats.hp = op->stats.maxhp;	2845	op->stats.hp = op->stats.maxhp;
2911	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913		2848
2914	/*	2849	/*
2915	* 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
2916	* and put them back in the map.	2851	* and put them back in the map.
2917	*/	2852	*/
2918	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2919		2854
2920	/****************************************/	2855	/****************************************/
2921	/* */	2856	/* */
2922	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2923	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
2943	object *force;	2878	object *force;
2944	int at;	2879	int at;
2945		2880
2946	force = get_archetype (FORCE_NAME);	2881	force = get_archetype (FORCE_NAME);
2947	/* 50 ticks should be enough time for the spell to abate */	2882	/* 50 ticks should be enough time for the spell to abate */
2948	force->speed = 0.1;	2883	force->speed = 0.1f;
2949	force->speed_left = -5.0;	2884	force->speed_left = -5.f;
2950	SET_FLAG (force, FLAG_APPLIED);	2885	SET_FLAG (force, FLAG_APPLIED);
2951	for (at = 0; at < NROFATTACKS; at++)	2886	for (at = 0; at < NROFATTACKS; at++)
2952	if (will_kill_again & (1 << at))	2887	if (will_kill_again & (1 << at))
2953	force->resist[at] = 100;	2888	force->resist[at] = 100;
2954		2889
…		…
2982		2917
2983	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))))
2984	{	2919	{
2985	if (tmp->nrof > 1)	2920	if (tmp->nrof > 1)
2986	{	2921	{
2987	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2922	tmp->decrease (rndm (1, tmp->nrof - 1));
2988	tmp2->destroy ();
2989	insert_ob_in_map (tmp, op->map, NULL, 0);	2923	insert_ob_in_map (tmp, op->map, NULL, 0);
2990	}	2924	}
2991	else	2925	else
2992	tmp->destroy ();	2926	tmp->destroy ();
2993	}	2927	}
…		…
3004	void	2938	void
3005	fix_weight (void)	2939	fix_weight (void)
3006	{	2940	{
3007	for_all_players (pl)	2941	for_all_players (pl)
3008	{	2942	{
3009	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2943	sint32 old = pl->ob->carrying;
3010		2944
3011	if (old == sum)	2945	pl->ob->update_weight ();
3012	continue;	2946
		2947	if (old != pl->ob->carrying)
		2948	{
3013	pl->ob->update_stats ();	2949	pl->ob->update_stats ();
3014	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	}
3015	}	2952	}
3016	}	2953	}
3017		2954
3018	void	2955	void
3019	fix_luck (void)	2956	fix_luck (void)
…		…
3063	void	3000	void
3064	make_visible (object *op)	3001	make_visible (object *op)
3065	{	3002	{
3066	op->hide = 0;	3003	op->hide = 0;
3067	op->invisible = 0;	3004	op->invisible = 0;
		3005
3068	if (op->type == PLAYER)	3006	if (op->type == PLAYER)
3069	{	3007	{
3070	op->contr->tmp_invis = 0;	3008	op->contr->tmp_invis = 0;
3071	op->contr->invis_race = 0;	3009	op->contr->invis_race = 0;
3072	}	3010	}
…		…
3075	}	3013	}
3076		3014
3077	int	3015	int
3078	is_true_undead (object *op)	3016	is_true_undead (object *op)
3079	{	3017	{
3080	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3018	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3081	return 1;	3019	return 1;
3082		3020
3083	return 0;	3021	return 0;
3084	}	3022	}
3085		3023
3086	/* look at the surrounding terrain to determine	3024	/* look at the surrounding terrain to determine
3087	* the hideability of this object. Positive levels	3025	* the hideability of this object. Positive levels
3088	* indicate greater hideability.	3026	* indicate greater hideability.
3089	*/	3027	*/
3090
3091	int	3028	int
3092	hideability (object *ob)	3029	hideability (object *ob)
3093	{	3030	{
3094	int i, level = 0, mflag;	3031	int i, level = 0, mflag;
3095	sint16 x, y;	3032	sint16 x, y;
…		…
3105	* as bad as carrying a light on a pitch dark map */	3042	* as bad as carrying a light on a pitch dark map */
3106	if (has_carried_lights (ob))	3043	if (has_carried_lights (ob))
3107	level = -(10 + (2 * ob->map->darkness));	3044	level = -(10 + (2 * ob->map->darkness));
3108		3045
3109	/* scan through all nearby squares for terrain to hide in */	3046	/* scan through all nearby squares for terrain to hide in */
3110	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])
3111	{	3050	{
3112	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3051	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3113	if (mflag & P_OUT_OF_MAP)	3052	if (mflag & P_OUT_OF_MAP)
3114	{
3115	continue;	3053	continue;
3116	}	3054
3117	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3055	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3118	level += 2;	3056	level += 2;
3119	else /* open terrain! */	3057	else /* open terrain! */
3120	level -= 1;	3058	level -= 1;
3121	}	3059	}
…		…
3129	/* For Hidden creatures - a chance of becoming 'unhidden'	3067	/* For Hidden creatures - a chance of becoming 'unhidden'
3130	* every time they move - as we subtract off 'invisibility'	3068	* every time they move - as we subtract off 'invisibility'
3131	* AND, for players, if they move into a ridiculously unhideable	3069	* AND, for players, if they move into a ridiculously unhideable
3132	* spot (surrounded by clear terrain in broad daylight). -b.t.	3070	* spot (surrounded by clear terrain in broad daylight). -b.t.
3133	*/	3071	*/
3134
3135	void	3072	void
3136	do_hidden_move (object *op)	3073	do_hidden_move (object *op)
3137	{	3074	{
3138	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3075	int hide = 0;
3139	object *skop;
3140		3076
3141	if (!op || !op->map)	3077	if (!op || !op->map)
3142	return;	3078	return;
3143		3079
3144	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);
3145		3082
3146	/* 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! */
3147	if (op->type == PLAYER && op->contr->run_on)	3084	if (op->type == PLAYER && op->contr->run_on)
3148	if (!skop || num >= skop->level)	3085	if (!skop || num >= skop->level)
3149	{	3086	{
…		…
3159	num -= hide;	3096	num -= hide;
3160		3097
3161	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3098	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3162	{	3099	{
3163	make_visible (op);	3100	make_visible (op);
		3101
3164	if (op->type == PLAYER)	3102	if (op->type == PLAYER)
3165	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!");
3166	}	3104	}
3167	else if (op->type == PLAYER && skop)	3105	else if (op->type == PLAYER && skop)
3168	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);
…		…
3221	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3222	* 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
3223	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3224	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3225	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3226	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3227	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3228	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3229	* 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.
3230	* -b.t.	3168	* -b.t.
3231	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3232	*/	3170	*/
3233
3234	int	3171	int
3235	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3236	{	3173	{
3237	rv_vector rv;	3174	rv_vector rv;
3238	int dx, dy;	3175	int dx, dy;
…		…
3250		3187
3251	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3252		3189
3253	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3254	* through the object and find if it has any	3191	* through the object and find if it has any
3255	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3256	* a blocked los square.	3193	* a blocked los square.
3257	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3258	*/	3195	*/
3259	while (op)	3196	while (op)
3260	{	3197	{
3261	dx = rv.distance_x + op->arch->clone.x;	3198	dx = rv.distance_x + op->arch->x;
3262	dy = rv.distance_y + op->arch->clone.y;	3199	dy = rv.distance_y + op->arch->y;
3263		3200
3264	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3265	* 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
3266	* for any meaningful values.	3203	* for any meaningful values.
3267	*/	3204	*/
3268	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3269	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3270	!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)])
3271	return 1;	3208	return 1;
		3209
3272	op = op->more;	3210	op = op->more;
3273	}	3211	}
		3212
3274	return 0;	3213	return 0;
3275	}	3214	}
3276		3215
3277	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3278	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3281	* return 0.	3220	* return 0.
3282	*/	3221	*/
3283	int	3222	int
3284	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3285	{	3224	{
3286
3287	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3288	{	3226	{
3289	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3290	return 0;	3228	return 0;
3291		3229
…		…
3297	{	3235	{
3298	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");
3299	return 1;	3237	return 1;
3300	}	3238	}
3301	}	3239	}
		3240
3302	return 0;	3241	return 0;
3303	}	3242	}
3304		3243
3305	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3306	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3311	* 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
3312	*/	3251	*/
3313	int	3252	int
3314	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3315	{	3254	{
3316	object *tmp;
3317
3318	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3319	* 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),
3320	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3321	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3322	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3323	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3324	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3325	{	3262	{
3326	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3327	{	3264	{
3328	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3329	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))
3330	{	3269	{
3331	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3332	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))
3333	{	3272	{
3334	object *invtmp;
3335
3336	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3337	{	3274	{
3338	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3339	{	3276	{
3340	if (x != NULL && y != NULL)	3277	if (x && y)
3341	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3342	return 1;	3280	return 1;
3343	}	3281	}
3344	}	3282	}
3345	}	3283	}
		3284
3346	if (x != NULL && y != NULL)	3285	if (x && y)
3347	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3348	return 1;	3288	return 1;
3349	}	3289	}
3350	}	3290	}
3351	}	3291	}
		3292
3352	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3353	return 0;	3294	return 0;
3354	}	3295	}
3355		3296
3356	/*	3297	/*
…		…
3372	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3373	int i = 0, j = 0;	3314	int i = 0, j = 0;
3374		3315
3375	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3376	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3377	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3378	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3379	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3380	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3381	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3382	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3383	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3384		3325
3385	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3386	return;	3327	return;
3387		3328
3388	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++);
…		…
3392	/* 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]); */
3393	return;	3334	return;
3394	}	3335	}
3395		3336
3396	/* everything seems okay - now bring on the gift: */	3337	/* everything seems okay - now bring on the gift: */
3397	item = &(tr->item->clone);	3338	item = tr->item;
3398		3339
3399	if (item->type == SPELL)	3340	if (item->type == SPELL)
3400	{	3341	{
3401	if (check_spell_known (who, item->name))	3342	if (check_spell_known (who, item->name))
3402	return;	3343	return;
…		…
3461	{	3402	{
3462	/* forces in the treasurelist can alter the player's stats */	3403	/* forces in the treasurelist can alter the player's stats */
3463	object *skin;	3404	object *skin;
3464		3405
3465	/* first get the dragon skin force */	3406	/* first get the dragon skin force */
3466	shstr_cmp dragon_skin_force ("dragon_skin_force");
3467	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)
3468	;	3408	;
3469		3409
3470	if (!skin)	3410	if (!skin)
3471	return;	3411	return;
3472		3412
…		…
3507	else	3447	else
3508	{	3448	{
3509	/* generate misc. treasure */	3449	/* generate misc. treasure */
3510	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3511	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));
3512	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3513	if (who->type == PLAYER)
3514	esrv_send_item (who, tmp);
3515	}	3453	}
3516	}	3454	}
3517		3455
3518	/**	3456	/**
3519	* 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
3520	* not readied.	3458	* not readied.
3521	*/	3459	*/
3522	void	3460	void
3523	player_unready_range_ob (player *pl, object *ob)	3461	player_unready_range_ob (player *pl, object *ob)
3524	{	3462	{
3525	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3463	if (pl->ob->current_weapon == ob)
		3464	pl->ob->current_weapon = 0;
		3465
		3466	if (pl->combat_ob == ob)
		3467	pl->combat_ob = 0;
		3468
3526	if (pl->ranges[i] == ob)	3469	if (pl->ranged_ob == ob)
3527	{
3528	pl->ranges[i] = 0;	3470	pl->ranged_ob = 0;
3529	if (pl->shoottype == i)
3530	pl->shoottype = range_none;
3531	}
3532	}	3471	}
3533		3472
3534	sint8	3473	sint8
3535	player::visibility_at (maptile *map, int x, int y) const	3474	player::visibility_at (maptile *map, int x, int y) const
3536	{	3475	{
…		…
3547	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))
3548	return 0;	3487	return 0;
3549		3488
3550	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3551	}	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