[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	9	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	10	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the Affero GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	20	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	21	* <http://www.gnu.org/licenses/>.
21	*	22	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	//+GPL	26	//+GPL
		27
		28	#include <algorithm>
		29	#include <functional>
26		30
27	#include <global.h>	31	#include <global.h>
28	#include <sproto.h>	32	#include <sproto.h>
29	#include <sounds.h>	33	#include <sounds.h>
30	#include <living.h>	34	#include <living.h>
31	#include <object.h>	35	#include <object.h>
32	#include <spells.h>	36	#include <spells.h>
33	#include <skills.h>	37	#include <skills.h>
34		38
35	#include <algorithm>
36	#include <functional>
37
38	playervec players;	39	playervec players;
39		40
40	/* This loads the first map an puts the player on it. */	41	/* This loads the first map an puts the player on it. */
41	static void	42	static void
42	set_first_map (object *op)	43	set_first_map (object *op)
54		55
55	players.insert (this);	56	players.insert (this);
56	ob->remove ();	57	ob->remove ();
57	ob->map = 0;	58	ob->map = 0;
58	ob->activate_recursive ();	59	ob->activate_recursive ();
59	CLEAR_FLAG (ob, FLAG_FRIENDLY);	60	ob->clr_flag (FLAG_FRIENDLY);
60	add_friendly_object (ob);	61	add_friendly_object (ob);
61	}	62	}
62		63
63	void	64	void
64	player::deactivate ()	65	player::deactivate ()
…		…
75		76
76	ob->remove ();	77	ob->remove ();
77	ob->enemy = 0; // sometimes keeps an extra refcount on itself	78	ob->enemy = 0; // sometimes keeps an extra refcount on itself
78	ob->map = 0;	79	ob->map = 0;
79	party = 0;	80	party = 0;
80
81	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82		81
83	players.erase (this);	82	players.erase (this);
84	}	83	}
85		84
86	// connect the player with a specific client	85	// connect the player with a specific client
…		…
128		127
129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	128	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
130		129
131	esrv_new_player (this);	130	esrv_new_player (this);
132		131
133	ob->update_stats ();
134
135	ns->floorbox_update ();
136	esrv_send_inventory (ob, ob);
137	esrv_add_spells (this, 0);
138
139	ob->flag [FLAG_READY_WEAPON] = false;	132	ob->flag [FLAG_READY_WEAPON] = false;
140	ob->flag [FLAG_READY_SKILL] = false;	133	ob->flag [FLAG_READY_SKILL] = false;
141	ob->flag [FLAG_READY_RANGE] = false;	134	ob->flag [FLAG_READY_RANGE] = false;
142	ob->flag [FLAG_READY_BOW] = false;	135	ob->flag [FLAG_READY_BOW] = false;
143		136
144	for (object *op = ob->inv; op; op = op->below)	137	ob->update_stats ();
145	if (op->flag [FLAG_APPLIED])
146	switch (op->type)
147	{
148	case SKILL:
149	op->flag [FLAG_APPLIED] = false;
150	break;
151		138
152	case WAND:	139	ns->floorbox_update ();
153	case ROD:	140	esrv_send_inventory (ob, ob);
154	case HORN:	141	esrv_add_spells (this, 0);
155	case BOW:
156	ranged_ob = op;
157	break;
158		142
159	case WEAPON:	143	activate ();
160	combat_ob = op;
161	break;
162	}
163
164	ob->current_weapon = 0;
165	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
166	activate (); // change_weapon also activates, but this doesn't hurt
167		144
168	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
169	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
170	}	147	}
171		148
…		…
205	player::set_object (object *op)	182	player::set_object (object *op)
206	{	183	{
207	ob = observe = viewpoint = op;	184	ob = observe = viewpoint = op;
208	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
209		186
210	ob->speed = 1.0f;	187	ob->speed = 1.0f; // object still inactive, keep it that way
211	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
212		189
213	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
214	}	191	}
215		192
…		…
258		235
259	attachable::do_destroy ();	236	attachable::do_destroy ();
260		237
261	if (ob)	238	if (ob)
262	{	239	{
263	ob->destroy_inv (false);	240	// potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault.
		241	// temporarily backed out patchset 4025 to see if THIS change causes crashes
		242	//ob->contr = 0;
264	ob->destroy ();	243	ob->destroy ();
265	}	244	}
266		245
267	ob = observe = viewpoint = 0;	246	ob = observe = viewpoint = 0;
268	}	247	}
…		…
354	#endif	333	#endif
355	return op;	334	return op;
356	}	335	}
357		336
358	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	337	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
359	* result in a monster paths backtracking. It basically determines how large a	338	* result in a monster paths backtracking. It basically determines how large a
360	* detour a monster will take from the direction path when looking	339	* detour a monster will take from the direction path when looking
361	* for a path to the player. The values are in the amount of direction	340	* for a path to the player. The values are in the amount of direction
362	* the deviation is	341	* the deviation is
363	*/	342	*/
364	#define DETOUR_AMOUNT 2	343	#define DETOUR_AMOUNT 2
…		…
400	*/	379	*/
401	int	380	int
402	path_to_player (object mon, object pl, unsigned mindiff)	381	path_to_player (object mon, object pl, unsigned mindiff)
403	{	382	{
404	rv_vector rv;	383	rv_vector rv;
405	sint16 x, y;
406	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	384	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
407	maptile m, lastmap;
408		385
409	get_rangevector (mon, pl, &rv, 0);	386	get_rangevector (mon, pl, &rv, 0);
410		387
411	if (rv.distance < mindiff)	388	if (rv.distance < mindiff)
412	return 0;	389	return 0;
413		390
414	x = mon->x;	391	mapxy pos (mon);
415	y = mon->y;
416	m = mon->map;
417	dir = rv.direction;	392	dir = rv.direction;
418	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	393	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
419	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	394	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
420		395
421	/* If we can't solve it within the search distance, return now. */	396	/* If we can't solve it within the search distance, return now. */
422	if (diff > max)	397	if (diff > max)
423	return 0;	398	return 0;
424		399
425	while (diff > 1 && max > 0)	400	while (diff > 1 && max > 0)
426	{	401	{
427	lastx = x;	402	mapxy lastpos = pos;
428	lasty = y;
429	lastmap = m;
430	x = lastx + freearr_x[dir];
431	y = lasty + freearr_y[dir];
432		403
433	mflags = get_map_flags (m, &m, x, y, &x, &y);	404	pos.move (dir);
434	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
435		405
436	/* Space is blocked - try changing direction a little */	406	/* Space is blocked - try changing direction a little */
437	if ((mflags & P_OUT_OF_MAP) \|\| ((OB_TYPE_MOVE_BLOCK (mon, blocked) \|\| (mflags & P_BLOCKSVIEW))	407	if (!pos.normalise ()
438	&& (m == mon->map && blocked_link (mon, m, x, y))))	408	\|\| (((pos->flags () & P_BLOCKSVIEW) \|\| OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		409	&& blocked_link (mon, pos.m, pos.x, pos.y)))
439	{	410	{
440	/* recalculate direction from last good location. Possible	411	/* recalculate direction from last good location. Possible
441	* we were not traversing ideal location before.	412	* we were not traversing ideal location before.
442	*/	413	*/
443	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	414	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
444	if (rv.direction != dir)	415	if (rv.direction != dir)
445	{	416	{
446	/* OK - says direction should be different - lets reset the	417	/* OK - says direction should be different - lets reset the
447	* the values so it will try again.	418	* the values so it will try again.
448	*/	419	*/
449	x = lastx;
450	y = lasty;
451	m = lastmap;	420	pos = lastpos;
452	dir = firstdir = rv.direction;	421	dir = firstdir = rv.direction;
453	}	422	}
454	else	423	else
455	{	424	{
456	/* direct path is blocked - try taking a side step to	425	/* direct path is blocked - try taking a side step to
457	* either the left or right.	426	* either the left or right.
458	* Note increase the values in the loop below to be	427	* Note increase the values in the loop below to be
459	* more than -1/1 respectively will mean the monster takes	428	* more than -1/1 respectively will mean the monster takes
460	* bigger detour. Have to be careful about these values getting	429	* bigger detour. Have to be careful about these values getting
461	* too big (3 or maybe 4 or higher) as the monster may just try	430	* too big (3 or maybe 4 or higher) as the monster may just try
462	* stepping back and forth	431	* stepping back and forth
463	*/	432	*/
464	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	433	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
465	{	434	{
466	if (i == 0)	435	if (i == 0)
467	continue; /* already did this, so skip it */	436	continue; /* already did this, so skip it */
		437
468	/* Use lastdir here - otherwise,	438	/* Use lastdir here - otherwise,
469	* since the direction that the creature should move in	439	* since the direction that the creature should move in
470	* may change, you could get infinite loops.	440	* may change, you could get infinite loops.
471	* ie, player is northwest, but monster can only	441	* ie, player is northwest, but monster can only
472	* move west, so it does that. It goes some distance,	442	* move west, so it does that. It goes some distance,
…		…
474	* can't do that, but now finds it can move east, and	444	* can't do that, but now finds it can move east, and
475	* gets back to its original point. lastdir contains	445	* gets back to its original point. lastdir contains
476	* the last direction the creature has successfully	446	* the last direction the creature has successfully
477	* moved.	447	* moved.
478	*/	448	*/
479
480	x = lastx + freearr_x[absdir (lastdir + i)];
481	y = lasty + freearr_y[absdir (lastdir + i)];
482	m = lastmap;	449	pos = lastpos;
483	mflags = get_map_flags (m, &m, x, y, &x, &y);	450	pos.move (absdir (lastdir + i));
484	if (mflags & P_OUT_OF_MAP)	451
		452	if (!pos.normalise ())
485	continue;	453	continue;
486	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	454
487	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	455	mapspace &ms = *pos;
		456
		457	if (ms.flags () & P_BLOCKSVIEW)
488	continue;	458	continue;
489	if (mflags & P_BLOCKSVIEW)	459
		460	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
490	continue;	461	continue;
491		462
492	if (m == mon->map && blocked_link (mon, m, x, y))	463	if (blocked_link (mon, pos.m, pos.x, pos.y))
493	break;	464	break;
494	}	465	}
		466
495	/* go through entire loop without finding a valid	467	/* go through entire loop without finding a valid
496	* sidestep to take - thus, no valid path.	468	* sidestep to take - thus, no valid path.
497	*/	469	*/
498	if (i == (DETOUR_AMOUNT + 1))	470	if (i == DETOUR_AMOUNT + 1)
499	return 0;	471	return 0;
		472
500	diff--;	473	diff--;
501	lastdir = dir;	474	lastdir = dir;
502	max--;	475	max--;
503	if (!firstdir)	476	if (!firstdir)
504	firstdir = dir + i;	477	firstdir = dir + i;
…		…
508	{	481	{
509	/* we moved towards creature, so diff is less */	482	/* we moved towards creature, so diff is less */
510	diff--;	483	diff--;
511	max--;	484	max--;
512	lastdir = dir;	485	lastdir = dir;
		486
513	if (!firstdir)	487	if (!firstdir)
514	firstdir = dir;	488	firstdir = dir;
515	}	489	}
516		490
517	if (diff <= 1)	491	if (diff <= 1)
518	{	492	{
519	/* Recalculate diff (distance) because we may not have actually	493	/* Recalculate diff (distance) because we may not have actually
520	* headed toward player for entire distance.	494	* headed toward player for entire distance.
521	*/	495	*/
522	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	496	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
523	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
524	}	498	}
525		499
526	if (diff > max)	500	if (diff > max)
527	return 0;	501	return 0;
…		…
543	for (object next, op = pl->inv; op; op = next)	517	for (object next, op = pl->inv; op; op = next)
544	{	518	{
545	next = op->below;	519	next = op->below;
546		520
547	/* Forces get applied per default, unless they have the	521	/* Forces get applied per default, unless they have the
548	* flag "neutral" set. Sorry but I can't think of a better way	522	* flag "neutral" set. Sorry but I can't think of a better way
549	*/	523	*/
550	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	524	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
551	SET_FLAG (op, FLAG_APPLIED);	525	op->set_flag (FLAG_APPLIED);
552		526
553	/* we never give weapons/armour if these cannot be used	527	/* we never give weapons/armour if these cannot be used
554	* by this player due to race restrictions	528	* by this player due to race restrictions
555	*/	529	*/
556	if (pl->type == PLAYER)	530	if (pl->type == PLAYER)
557	{	531	{
558	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	532	if ((!pl->flag [FLAG_USE_ARMOUR]
559	&&	533	&&
560	(op->type == ARMOUR \|\| op->type == BOOTS	534	(op->type == ARMOUR \|\| op->type == BOOTS
561	\|\| op->type == CLOAK \|\| op->type == HELMET	535	\|\| op->type == CLOAK \|\| op->type == HELMET
562	\|\| op->type == SHIELD \|\| op->type == GLOVES	536	\|\| op->type == SHIELD \|\| op->type == GLOVES
563	\|\| op->type == BRACERS \|\| op->type == GIRDLE))	537	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
564	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	538	\|\| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
565	{	539	{
566	op->destroy ();	540	op->destroy ();
567	continue;	541	continue;
568	}	542	}
569	}	543	}
570		544
571	/* Here we remove duplicated skills (as duplicated spell objects have	545	/* Here we remove duplicated skills (as duplicated spell objects have
572	* _very_ confusing effects for players), which could for instance be	546	* _very_ confusing effects for players), which could for instance be
573	* generated by bad treasurelists. - elmex	547	* generated by multiple treasurelists specifying the same skills.
574	*/	548	*/
575	if (op->type == SKILL)	549	if (op->type == SKILL)
576	{	550	{
577	for (object *tmp = op->below; tmp; tmp = tmp->below)	551	for (object *tmp = op->below; tmp; tmp = tmp->below)
578	if (tmp->type == op->type && tmp->name == op->name)	552	if (tmp->type == op->type && tmp->name == op->name)
579	{	553	{
580	op->destroy ();	554	op->destroy ();
581	LOG (llevError,
582	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
583	break;	555	break;
584	}	556	}
585		557
586	if (op->nrof > 1)	558	if (op->nrof > 1)
587	op->nrof = 1;	559	op->nrof = 1;
588	}	560	}
589		561
590	if (op->type == SPELLBOOK && op->inv)	562	if (op->type == SPELLBOOK && op->inv)
591	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	563	op->inv->clr_flag (FLAG_STARTEQUIP);
592		564
593	/* Give starting characters identified, uncursed, and undamned	565	/* Give starting characters identified, uncursed, and undamned
594	* items. Just don't identify gold or silver, or it won't be	566	* items. Just don't identify gold or silver, or it won't be
595	* merged properly.	567	* merged properly.
596	*/	568	*/
597	if (need_identify (op))	569	if (op->need_identify ())
598	{	570	{
599	SET_FLAG (op, FLAG_IDENTIFIED);	571	op->set_flag (FLAG_IDENTIFIED);
600	CLEAR_FLAG (op, FLAG_CURSED);	572	op->clr_flag (FLAG_CURSED);
601	CLEAR_FLAG (op, FLAG_DAMNED);	573	op->clr_flag (FLAG_DAMNED);
602	}	574	}
603		575
604	if (op->type == SPELL)	576	if (op->type == SPELL)
605	{	577	{
606	op->destroy ();	578	op->destroy ();
607	continue;	579	continue;
608	}	580	}
609	else if (op->type == SKILL)	581	else if (op->type == SKILL)
610	{	582	{
611	SET_FLAG (op, FLAG_CAN_USE_SKILL);	583	op->set_flag (FLAG_CAN_USE_SKILL);
612	op->stats.exp = 0;	584	op->stats.exp = 0;
613	op->level = 1;	585	op->level = 1;
614	}	586	}
615	else /* lock all 'normal items by default */	587	else /* lock all 'normal items by default */
616	SET_FLAG (op, FLAG_INV_LOCKED);	588	op->set_flag (FLAG_INV_LOCKED);
617	} /* for loop of objects in player inv */	589	} /* for loop of objects in player inv */
618		590
619	/* Need to set up the skill pointers */	591	/* Need to set up the skill pointers */
620	pl->contr->link_skills ();	592	pl->contr->link_skills ();
621	}	593	}
…		…
640	roll_stat ()	612	roll_stat ()
641	{	613	{
642	int a[4], i, j, k;	614	int a[4], i, j, k;
643		615
644	for (i = 0; i < 4; i++)	616	for (i = 0; i < 4; i++)
645	a[i] = (int) rndm (6) + 1;	617	a[i] = rndm (1, 6);
646		618
647	for (i = 0, j = 0, k = 7; i < 4; i++)	619	for (i = 0, j = 0, k = 7; i < 4; i++)
648	if (a[i] < k)	620	if (a[i] < k)
649	k = a[i], j = i;	621	k = a[i], j = i;
650		622
…		…
747	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	719	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
748	if (tl)	720	if (tl)
749	create_treasure (tl, ob, 0, 0, 0);	721	create_treasure (tl, ob, 0, 0, 0);
750		722
751	INVOKE_PLAYER (BIRTH, ob->contr);	723	INVOKE_PLAYER (BIRTH, ob->contr);
752	INVOKE_PLAYER (LOGIN, ob->contr);
753		724
754	ob->contr->ns->state = ST_PLAYING;	725	ob->contr->ns->state = ST_PLAYING;
755		726
756	if (ob->msg)	727	if (ob->msg)
757	ob->msg = 0;	728	ob->msg = 0;
758		729
759	start_info (ob);	730	start_info (ob);
760	CLEAR_FLAG (ob, FLAG_WIZ);	731	ob->clr_flag (FLAG_WIZ);
761	give_initial_items (ob, ob->randomitems);	732	give_initial_items (ob, ob->randomitems);
762	esrv_send_inventory (ob, ob);	733	esrv_send_inventory (ob, ob);
763	ob->update_stats ();	734	ob->update_stats ();
764		735
765	/* This moves the player to a different start map, if there	736	/* This moves the player to a different start map, if there
…		…
767	*/	738	*/
768	if (*first_map_ext_path)	739	if (*first_map_ext_path)
769	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	740	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
770	else	741	else
771	LOG (llevDebug, "first_map_ext_path not set\n");	742	LOG (llevDebug, "first_map_ext_path not set\n");
		743	}
		744
		745	/*
		746	* Returns true if the given player is a legal class.
		747	* The function to add and remove class-bonuses to the stats doesn't
		748	* check if the stat becomes negative, thus this function
		749	* merely checks that all stats are 1 or more, and returns
		750	* false otherwise.
		751	*/
		752	static int
		753	allowed_class (const object *op)
		754	{
		755	return op->stats.Dex > 0
		756	&& op->stats.Str > 0
		757	&& op->stats.Con > 0
		758	&& op->stats.Int > 0
		759	&& op->stats.Wis > 0
		760	&& op->stats.Pow > 0
		761	&& op->stats.Cha > 0;
772	}	762	}
773		763
774	void	764	void
775	player::chargen_race_next ()	765	player::chargen_race_next ()
776	{	766	{
…		…
814	rv_vector rv;	804	rv_vector rv;
815		805
816	if (op->stats.hp < 0)	806	if (op->stats.hp < 0)
817	{	807	{
818	LOG (llevDebug, "Fleeing player is dead.\n");	808	LOG (llevDebug, "Fleeing player is dead.\n");
819	CLEAR_FLAG (op, FLAG_SCARED);	809	op->clr_flag (FLAG_SCARED);
820	return;	810	return;
821	}	811	}
822		812
823	if (!op->enemy)	813	if (!op->enemy)
824	{	814	{
825	LOG (llevDebug, "Fleeing player had no enemy.\n");	815	LOG (llevDebug, "Fleeing player had no enemy.\n");
826	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
827	return;	817	return;
828	}	818	}
829		819
830	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	820	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
831	{	821	{
832	op->enemy = NULL;	822	op->enemy = NULL;
833	CLEAR_FLAG (op, FLAG_SCARED);	823	op->clr_flag (FLAG_SCARED);
834	return;	824	return;
835	}	825	}
836		826
837	get_rangevector (op, op->enemy, &rv, 0);	827	get_rangevector (op, op->enemy, &rv, 0);
838		828
…		…
844	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))	834	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))
845	return;	835	return;
846	}	836	}
847		837
848	/* Cornered, get rid of scared */	838	/* Cornered, get rid of scared */
849	CLEAR_FLAG (op, FLAG_SCARED);	839	op->clr_flag (FLAG_SCARED);
850	op->enemy = NULL;	840	op->enemy = NULL;
851	}	841	}
852		842
853	/* check_pick sees if there is stuff to be picked up/picks up stuff.	843	/* check_pick sees if there is stuff to be picked up/picks up stuff.
854	* It returns 1 if the player should keep on moving, 0 if he should	844	* It returns 1 if the player should keep on moving, 0 if he should
…		…
946	* fighting */	936	* fighting */
947	if (op->contr->mode & PU_INHIBIT)	937	if (op->contr->mode & PU_INHIBIT)
948	return 1;	938	return 1;
949		939
950	/* prevent us from turning into auto-thieves :) */	940	/* prevent us from turning into auto-thieves :) */
951	if (QUERY_FLAG (tmp, FLAG_UNPAID))	941	if (tmp->flag [FLAG_UNPAID])
952	continue;	942	continue;
953		943
954	/* ignore known cursed objects */	944	/* ignore known cursed objects */
955	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	945	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
956	continue;	946	continue;
957		947
958	/* all food and drink if desired */	948	/* all food and drink if desired */
959	/* question: don't pick up known-poisonous stuff? */	949	/* question: don't pick up known-poisonous stuff? */
960	if (op->contr->mode & PU_FOOD)	950	if (op->contr->mode & PU_FOOD)
…		…
963	CHK_PICK_PICKUP;	953	CHK_PICK_PICKUP;
964	continue;	954	continue;
965	}	955	}
966		956
967	if (op->contr->mode & PU_DRINK)	957	if (op->contr->mode & PU_DRINK)
968	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	958	if (tmp->type == DRINK \|\| (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
969	{	959	{
970	CHK_PICK_PICKUP;	960	CHK_PICK_PICKUP;
971	continue;	961	continue;
972	}	962	}
973		963
…		…
1011	continue;	1001	continue;
1012	}	1002	}
1013		1003
1014	/* pick up all magical items */	1004	/* pick up all magical items */
1015	if (op->contr->mode & PU_MAGICAL)	1005	if (op->contr->mode & PU_MAGICAL)
1016	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)	1006	if (tmp->flag [FLAG_KNOWN_MAGICAL]
1017	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1007	&& !tmp->flag [FLAG_KNOWN_CURSED])
1018	{	1008	{
1019	CHK_PICK_PICKUP;	1009	CHK_PICK_PICKUP;
1020	continue;	1010	continue;
1021	}	1011	}
1022		1012
…		…
1106	continue;	1096	continue;
1107	}	1097	}
1108		1098
1109	/* hoping to catch throwing daggers here */	1099	/* hoping to catch throwing daggers here */
1110	if (op->contr->mode & PU_MISSILEWEAPON)	1100	if (op->contr->mode & PU_MISSILEWEAPON)
1111	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1101	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1112	{	1102	{
1113	CHK_PICK_PICKUP;	1103	CHK_PICK_PICKUP;
1114	continue;	1104	continue;
1115	}	1105	}
1116		1106
…		…
1165	}	1155	}
1166		1156
1167	/* routine for both players and monsters. We call this when	1157	/* routine for both players and monsters. We call this when
1168	* there is a possibility for our action distrubing our hiding	1158	* there is a possibility for our action distrubing our hiding
1169	* place or invisiblity spell. Artefact invisiblity causes	1159	* place or invisiblity spell. Artefact invisiblity causes
1170	* "noise" instead. If we arent invisible to begin with, we	1160	* "noise" instead. If we arent invisible to begin with, we
1171	* return 0.	1161	* return 0.
1172	*/	1162	*/
1173	static int	1163	static int
1174	action_makes_visible (object *op)	1164	action_makes_visible (object *op)
1175	{	1165	{
1176	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	1166	if (op->invisible && op->flag [FLAG_ALIVE])
1177	{	1167	{
1178	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	1168	if (op->flag [FLAG_MAKE_INVIS])
1179	{	1169	{
1180	// artefact invisibility is permanent, but we still make noise	1170	// artefact invisibility is permanent, but we still make noise
1181	// this is important for game-balance.	1171	// this is important for game-balance.
1182	if (op->contr)	1172	if (op->contr)
1183	op->make_noise ();	1173	op->make_noise ();
…		…
1199	return 0;	1189	return 0;
1200	}	1190	}
1201		1191
1202	/*	1192	/*
1203	* Find an arrow in the inventory and after that	1193	* Find an arrow in the inventory and after that
1204	* in the right type container (quiver). Pointer to the	1194	* in the right type container (quiver). Pointer to the
1205	* found object is returned.	1195	* found object is returned.
1206	*/	1196	*/
1207	static object *	1197	static object *
1208	find_arrow (object op, const char type)	1198	find_arrow (object op, const char type)
1209	{	1199	{
1210	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1200	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1211	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1201	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1212	return splay (tmp);	1202	return splay (tmp);
1213		1203
1214	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1204	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1215	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1205	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1216	if (object *arrow = find_arrow (tmp, type))	1206	if (object *arrow = find_arrow (tmp, type))
1217	{	1207	{
1218	splay (tmp);	1208	splay (tmp);
1219	return arrow;	1209	return arrow;
1220	}	1210	}
…		…
1237	if (!type)	1227	if (!type)
1238	return NULL;	1228	return NULL;
1239		1229
1240	for (arrow = op->inv; arrow; arrow = arrow->below)	1230	for (arrow = op->inv; arrow; arrow = arrow->below)
1241	{	1231	{
1242	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1232	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1243	{	1233	{
1244	i = 0;	1234	i = 0;
1245	ntmp = find_better_arrow (arrow, target, type, &i);	1235	ntmp = find_better_arrow (arrow, target, type, &i);
1246		1236
1247	if (i > betterby)	1237	if (i > betterby)
…		…
1328	y = op->y;	1318	y = op->y;
1329		1319
1330	/* find the first target */	1320	/* find the first target */
1331	for (i = 0, found = 0; i < 20; i++)	1321	for (i = 0, found = 0; i < 20; i++)
1332	{	1322	{
1333	x += freearr_x[dir];	1323	x += DIRX (dir);
1334	y += freearr_y[dir];	1324	y += DIRY (dir);
1335	mflags = get_map_flags (m, &m, x, y, &x, &y);	1325	mflags = get_map_flags (m, &m, x, y, &x, &y);
1336		1326
1337	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)	1327	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)
1338	{	1328	{
1339	tmp = 0;	1329	tmp = 0;
…		…
1348	break;	1338	break;
1349	}	1339	}
1350		1340
1351	if (mflags & P_IS_ALIVE)	1341	if (mflags & P_IS_ALIVE)
1352	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1342	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1353	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1343	if (tmp->flag [FLAG_ALIVE])
1354	break;	1344	break;
1355	}	1345	}
1356		1346
1357	if (!tmp)	1347	if (!tmp)
1358	return find_arrow (op, type);	1348	return find_arrow (op, type);
…		…
1362		1352
1363	return find_better_arrow (op, tmp, type, &i);	1353	return find_better_arrow (op, tmp, type, &i);
1364	}	1354	}
1365		1355
1366	/*	1356	/*
1367	* Creature fires a bow - op can be monster or player. Returns	1357	* Creature fires a bow - op can be monster or player. Returns
1368	* 1 if bow was actually fired, 0 otherwise.	1358	* 1 if bow was actually fired, 0 otherwise.
1369	* op is the object firing the bow.	1359	* op is the object firing the bow.
1370	* part is for multipart creatures - the part firing the bow.	1360	* part is for multipart creatures - the part firing the bow.
1371	* dir is the direction of fire.	1361	* dir is the direction of fire.
1372	* wc_mod is any special modifier to give (used in special player fire modes)	1362	* wc_mod is any special modifier to give (used in special player fire modes)
…		…
1419	{	1409	{
1420	if (op->type == PLAYER)	1410	if (op->type == PLAYER)
1421	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1422	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1412	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1423	else	1413	else
1424	CLEAR_FLAG (op, FLAG_READY_BOW);	1414	op->clr_flag (FLAG_READY_BOW);
1425		1415
1426	return 0;	1416	return 0;
1427	}	1417	}
1428	}	1418	}
1429		1419
…		…
1478	#endif	1468	#endif
1479		1469
1480	SET_ANIMATION (arrow, arrow->direction);	1470	SET_ANIMATION (arrow, arrow->direction);
1481		1471
1482	/* update the speed */	1472	/* update the speed */
1483	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1484	+ bow->stats.dam / 7.f;
1485		1473
1486	arrow->set_speed (max (arrow->speed, 2.f));
1487	arrow->speed_left = 0;	1474	arrow->speed_left = 0;
		1475	arrow->set_speed (max (2.f,
		1476	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1477	+ bow->stats.dam / 7.f
		1478	));
1488		1479
1489	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1480	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1490		1481
1491	if (op->type == PLAYER)	1482	if (op->type == PLAYER)
1492	{	1483	{
…		…
1513	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1504	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1514		1505
1515	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1506	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1516	arrow->move_type = MOVE_FLY_LOW;	1507	arrow->move_type = MOVE_FLY_LOW;
1517	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1508	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
		1509	arrow->set_flag (FLAG_NO_PICK);
1518		1510
1519	op->play_sound (sound_find ("fire_arrow"));	1511	op->play_sound (sound_find ("fire_arrow"));
1520	m->insert (arrow, sx, sy, op);	1512	m->insert (arrow, sx, sy, op);
1521		1513
1522	if (!arrow->destroyed ())	1514	if (!arrow->destroyed ())
…		…
1547	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1539	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1548	}	1540	}
1549	else if (op->contr->bowtype == bow_threewide)	1541	else if (op->contr->bowtype == bow_threewide)
1550	{	1542	{
1551	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1543	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1552	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1544	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir + 2)), op->y + DIRY (absdir (dir + 2)));
1553	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1545	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir - 2)), op->y + DIRY (absdir (dir - 2)));
1554	}	1546	}
1555	else if (op->contr->bowtype == bow_spreadshot)	1547	else if (op->contr->bowtype == bow_spreadshot)
1556	{	1548	{
1557	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1549	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1558	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1550	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
…		…
1585	{	1577	{
1586	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1578	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1587	return;	1579	return;
1588	}	1580	}
1589		1581
1590	if (!op->change_weapon (item))	1582	if (!op->apply (item))
1591	return;	1583	return;
1592		1584
1593	if (item->type == WAND)	1585	if (item->type == WAND)
1594	{	1586	{
1595	if (item->stats.food <= 0)	1587	if (item->stats.food <= 0)
…		…
1625		1617
1626	if (item->type == WAND)	1618	if (item->type == WAND)
1627	{	1619	{
1628	if (!(--item->stats.food))	1620	if (!(--item->stats.food))
1629	{	1621	{
1630	object *tmp;
1631
1632	if (item->arch)	1622	if (item->arch)
1633	{	1623	{
1634	CLEAR_FLAG (item, FLAG_ANIMATE);	1624	item->clr_flag (FLAG_ANIMATE);
1635	item->face = item->arch->face;	1625	item->face = item->arch->face;
1636	item->set_speed (0);	1626	item->set_speed (0);
1637	}	1627	}
1638		1628
1639	if (object *pl = item->visible_to ())	1629	if (object *pl = item->visible_to ())
…		…
1646	}	1636	}
1647		1637
1648	/* Received a fire command for the player - go and do it.	1638	/* Received a fire command for the player - go and do it.
1649	*/	1639	*/
1650	bool	1640	bool
1651	fire (object *op, int dir)	1641	fire (object *who, int dir)
1652	{	1642	{
1653	int spellcost = 0;	1643	int spellcost = 0;
1654		1644
1655	player *pl = op->contr;	1645	player *pl = who->contr;
1656		1646
1657	if (pl->golem)	1647	if (pl->golem)
1658	{	1648	{
1659	control_golem (op->contr->golem, dir);	1649	control_golem (who->contr->golem, dir);
1660	return false;	1650	return false;
1661	}	1651	}
1662		1652
1663	object *ob = pl->ranged_ob;	1653	object *ob = pl->ranged_ob;
1664		1654
1665	if (!ob)	1655	if (!ob)
1666	return false;	1656	return false;
1667		1657
1668	if (op->speed_left > 0.f)	1658	if (who->speed_left > 0.f)
1669	--op->speed_left;	1659	--who->speed_left;
1670	else	1660	else
1671	return false;	1661	return false;
1672		1662
1673	if (!op->change_weapon (ob))	1663	if (!who->apply (ob))
1674	return false;	1664	return false;
1675		1665
1676	/* check for loss of invisiblity/hide */	1666	/* check for loss of invisiblity/hide */
1677	if (action_makes_visible (op))	1667	if (action_makes_visible (who))
1678	make_visible (op);	1668	make_visible (who);
1679		1669
1680	switch (ob->type)	1670	switch (ob->type)
1681	{	1671	{
1682	case BOW:	1672	case BOW:
1683	player_fire_bow (op, dir);	1673	player_fire_bow (who, dir);
1684	break;	1674	break;
1685		1675
1686	case SPELL:	1676	case SPELL:
1687	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1677	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1688	break;	1678	break;
1689		1679
1690	case BUILDER:	1680	case BUILDER:
1691	apply_map_builder (op, dir);	1681	apply_map_builder (who, dir);
1692	break;	1682	break;
1693		1683
1694	case SKILL:	1684	case SKILL:
1695	do_skill (op, op, ob, dir, 0);	1685	do_skill (who, who, ob, dir, 0);
1696	break;	1686	break;
1697		1687
1698	case SKILL_TOOL:	1688	case RANGED:
1699	// change_weapon ensures that chosen_skill is uptodate
1700	do_skill (op, op, op->chosen_skill, dir, 0);	1689	do_skill (who, ob, who->chosen_skill, dir, 0);
1701	break;	1690	break;
1702		1691
1703	default:	1692	default:
1704	fire_misc_object (op, dir);	1693	fire_misc_object (who, dir);
1705	break;	1694	break;
1706	}	1695	}
1707		1696
1708	return true;	1697	return true;
1709	}	1698	}
…		…
1721	for (tmp = container->inv; tmp; tmp = tmp->below)	1710	for (tmp = container->inv; tmp; tmp = tmp->below)
1722	{	1711	{
1723	if (door->type == DOOR && tmp->type == KEY)	1712	if (door->type == DOOR && tmp->type == KEY)
1724	break;	1713	break;
1725		1714
1726	/* For sanity, we should really check door type, but other stuff	1715	/* For sanity, we should really check door type, but other stuff
1727	* (like containers) can be locked with special keys	1716	* (like containers) can be locked with special keys
1728	*/	1717	*/
1729	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1718	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1730	break;	1719	break;
1731	}	1720	}
…		…
1768	*	1757	*
1769	* Change the color so that the message doesn't disappear with	1758	* Change the color so that the message doesn't disappear with
1770	* all the others.	1759	* all the others.
1771	*/	1760	*/
1772	if (pl->contr->usekeys == key_inventory	1761	if (pl->contr->usekeys == key_inventory
1773	\|\| !QUERY_FLAG (container, FLAG_APPLIED)	1762	\|\| !container->flag [FLAG_APPLIED]
1774	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1763	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1775	{	1764	{
1776	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1765	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1777	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1766	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1778	return NULL;	1767	return NULL;
…		…
1785	/* find_key	1774	/* find_key
1786	* We try to find a key for the door as passed. If we find a key	1775	* We try to find a key for the door as passed. If we find a key
1787	* and successfully use it, we return the key, otherwise NULL	1776	* and successfully use it, we return the key, otherwise NULL
1788	* This function merges both normal and locked door, since the logic	1777	* This function merges both normal and locked door, since the logic
1789	* for both is the same - just the specific key is different.	1778	* for both is the same - just the specific key is different.
1790	* pl is the player,	1779	* pl is the player,
1791	* inv is the objects inventory to searched	1780	* inv is the objects inventory to searched
1792	* door is the door we are trying to match against.	1781	* door is the door we are trying to match against.
1793	* This function can be called recursively to search containers.	1782	* This function can be called recursively to search containers.
1794	*/	1783	*/
1795	object *	1784	object *
1796	find_key (object pl, object container, object *door)	1785	find_key (object pl, object container, object *door)
…		…
1868	{	1857	{
1869	--op->speed_left;	1858	--op->speed_left;
1870	return true;	1859	return true;
1871	}	1860	}
1872		1861
1873	sint16 nx = freearr_x[dir] + op->x;	1862	sint16 nx = DIRX (dir) + op->x;
1874	sint16 ny = freearr_y[dir] + op->y;	1863	sint16 ny = DIRY (dir) + op->y;
1875		1864
1876	if (out_of_map (op->map, nx, ny))	1865	if (out_of_map (op->map, nx, ny))
1877	return false;	1866	return false;
1878		1867
1879	/* If braced, or can't move to the square, and it is not out of the	1868	/* If braced, or can't move to the square, and it is not out of the
…		…
1900	\|\| mon->flag [FLAG_CAN_ROLL])	1889	\|\| mon->flag [FLAG_CAN_ROLL])
1901	&& mon != op)	1890	&& mon != op)
1902	break;	1891	break;
1903	}	1892	}
1904		1893
1905	if (!mon) /* This happens anytime the player tries to move */	1894	/* no monster == player tries to move into a wall or so */
1906	return false; /* into a wall */	1895	if (!mon)
		1896	{
		1897	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1898	if (op->move_type & ob->move_block)
		1899	{
		1900	if (ob->move_block == MOVE_ALL)
		1901	move_into_wall (op, ob);
		1902	else
		1903	{
		1904	if (op->contr->ns->bumpmsg)
		1905	{
		1906	op->play_sound (sound_find ("blocked_move"));
		1907
		1908	op->statusmsg (ob->invisible
		1909	? "Something blocks you."
		1910	: format ("Something blocks you from entering the %s.", query_name (ob))
		1911	);
		1912	}
		1913	}
		1914
		1915	break;
		1916	}
		1917
		1918	return false;
		1919	}
1907		1920
1908	mon = mon->head_ ();	1921	mon = mon->head_ ();
1909		1922
1910	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	1923	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
1911	if (op->contr->weapon_sp_left > 0.f)	1924	if (op->contr->weapon_sp_left > 0.f)
…		…
1929	*/	1942	*/
1930	if (op->type == PLAYER	1943	if (op->type == PLAYER
1931	&& ((mon->owner && mon->owner->contr	1944	&& ((mon->owner && mon->owner->contr
1932	&& same_party (mon->owner->contr->party, op->contr->party))	1945	&& same_party (mon->owner->contr->party, op->contr->party))
1933	\|\| mon->owner == op)	1946	\|\| mon->owner == op)
1934	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	1947	&& (mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY]))
1935	{	1948	{
1936	/* If we're braced, we don't want to switch places with it */	1949	/* If we're braced, we don't want to switch places with it */
1937	if (op->contr->braced)	1950	if (op->contr->braced)
1938	return false;	1951	return false;
1939		1952
…		…
1959	* creatures. Note that if you are braced, you can't push	1972	* creatures. Note that if you are braced, you can't push
1960	* someone, but put it inside this loop so that you won't	1973	* someone, but put it inside this loop so that you won't
1961	* attack them either.	1974	* attack them either.
1962	*/	1975	*/
1963	if ((mon->type == PLAYER \|\| mon->enemy != op)	1976	if ((mon->type == PLAYER \|\| mon->enemy != op)
1964	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	1977	&& (mon->type == PLAYER \|\| mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY])
1965	&& ((op->contr->peaceful	1978	&& ((op->contr->peaceful
1966	\|\| (mon->type == PLAYER && mon->contr->peaceful))	1979	\|\| (mon->type == PLAYER && mon->contr->peaceful))
1967	&& !on_battleground))	1980	&& !on_battleground))
1968	{	1981	{
1969	if (op->speed_left > 0.f)	1982	if (op->speed_left > 0.f)
…		…
1985	}	1998	}
1986	}	1999	}
1987	/* If the object is a boulder or other rollable object, then	2000	/* If the object is a boulder or other rollable object, then
1988	* roll it if not braced. You can't roll it if you are braced.	2001	* roll it if not braced. You can't roll it if you are braced.
1989	*/	2002	*/
1990	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2003	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1991	{	2004	{
1992	if (op->speed_left > 0.f)	2005	if (op->speed_left > 0.f)
1993	{	2006	{
1994	--op->speed_left;	2007	--op->speed_left;
1995		2008
…		…
2004	* Way it works is like this: First, it must have some hit points	2017	* Way it works is like this: First, it must have some hit points
2005	* and be living. Then, it must be one of the following:	2018	* and be living. Then, it must be one of the following:
2006	* 1) Not a player, 2) A player, but of a different party. Note	2019	* 1) Not a player, 2) A player, but of a different party. Note
2007	* that party_number -1 is no party, so attacks can still happen.	2020	* that party_number -1 is no party, so attacks can still happen.
2008	*/	2021	*/
2009	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2022	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2010	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2023	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2011	{	2024	{
2012	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2025	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2013	{	2026	{
2014	--op->contr->weapon_sp_left;	2027	--op->contr->weapon_sp_left;
…		…
2026	}	2039	}
2027		2040
2028	bool	2041	bool
2029	move_player (object *op, int dir)	2042	move_player (object *op, int dir)
2030	{	2043	{
2031	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2044	if (!op->map \|\| op->map->state != MAP_ACTIVE)
2032	return 0;	2045	return 0;
2033		2046
2034	/* Sanity check: make sure dir is valid */	2047	/* Sanity check: make sure dir is valid */
2035	if (dir < 0 \|\| dir >= 9)	2048	if (dir < 0 \|\| dir > 8)
2036	{	2049	{
2037	LOG (llevError, "move_player: invalid direction %d\n", dir);	2050	LOG (llevError, "move_player: invalid direction %d\n", dir);
2038	return 0;	2051	return 0;
2039	}	2052	}
2040		2053
2041	/* peterm: added following line */	2054	/* peterm: added following line */
2042	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2055	if (op->flag [FLAG_CONFUSED] && dir)
2043	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2056	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2044		2057
2045	op->facing = dir;	2058	op->facing = dir;
2046		2059
2047	if (op->flag [FLAG_HIDDEN])	2060	if (op->flag [FLAG_HIDDEN])
…		…
2087	* players.	2100	* players.
2088	*/	2101	*/
2089	bool	2102	bool
2090	handle_newcs_player (object *op)	2103	handle_newcs_player (object *op)
2091	{	2104	{
2092	if (QUERY_FLAG (op, FLAG_SCARED))	2105	if (op->flag [FLAG_SCARED])
2093	{	2106	{
2094	if (op->speed_left > 0.f)	2107	if (op->speed_left > 0.f)
2095	{	2108	{
2096	--op->speed_left;	2109	--op->speed_left;
2097	flee_player (op);	2110	flee_player (op);
…		…
2116	}	2129	}
2117		2130
2118	static int	2131	static int
2119	save_life (object *op)	2132	save_life (object *op)
2120	{	2133	{
2121	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2134	if (!op->flag [FLAG_LIFESAVE])
2122	return 0;	2135	return 0;
2123		2136
2124	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2137	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2125	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2138	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2126	{	2139	{
2127	op->play_sound (sound_find ("ob_evaporate"));	2140	op->play_sound (sound_find ("ob_evaporate"));
2128	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2141	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2129		2142
2130	tmp->destroy ();	2143	tmp->destroy ();
2131	CLEAR_FLAG (op, FLAG_LIFESAVE);	2144	op->clr_flag (FLAG_LIFESAVE);
2132		2145
2133	if (op->stats.hp < 0)	2146	if (op->stats.hp < 0)
2134	op->stats.hp = op->stats.maxhp;	2147	op->stats.hp = op->stats.maxhp;
2135		2148
2136	if (op->stats.food < 0)	2149	if (op->stats.food < 0)
2137	op->stats.food = 999;	2150	op->stats.food = MAX_FOOD;
2138		2151
2139	op->update_stats ();	2152	op->update_stats ();
2140	return 1;	2153	return 1;
2141	}	2154	}
2142		2155
2143	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2156	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2144	CLEAR_FLAG (op, FLAG_LIFESAVE);	2157	op->clr_flag (FLAG_LIFESAVE);
2145	enter_player_savebed (op); /* bring him home. */	2158	enter_player_savebed (op); /* bring him home. */
2146	return 0;	2159	return 0;
2147	}	2160	}
2148		2161
2149	/* This goes throws the inventory and removes unpaid objects, and puts them	2162	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2156	{	2169	{
2157	while (op)	2170	while (op)
2158	{	2171	{
2159	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2172	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2160		2173
2161	if (QUERY_FLAG (op, FLAG_UNPAID))	2174	if (op->flag [FLAG_UNPAID])
2162	op->insert_at (env);	2175	op->insert_at (env);
2163	else if (op->inv)	2176	else if (op->inv)
2164	drop_unpaid_items (op->inv, env);	2177	drop_unpaid_items (op->inv, env);
2165		2178
2166	op = next;	2179	op = next;
…		…
2177	void	2190	void
2178	do_some_living (object *op)	2191	do_some_living (object *op)
2179	{	2192	{
2180	int last_food = op->stats.food;	2193	int last_food = op->stats.food;
2181	int gen_hp, gen_sp, gen_grace;	2194	int gen_hp, gen_sp, gen_grace;
2182	int over_hp, over_sp, over_grace;
2183	int i;
2184	int rate_hp = 1200;	2195	int rate_hp = 1200;
2185	int rate_sp = 2500;	2196	int rate_sp = 2500;
2186	int rate_grace = 2000;	2197	int rate_grace = 2000;
2187	const int max_hp = 1;	2198	const int max_hp = 1;
2188	const int max_sp = 1;	2199	const int max_sp = 1;
2189	const int max_grace = 1;	2200	const int max_grace = 1;
2190		2201
		2202	#if 0
2191	if (op->contr->hidden)	2203	if (op->contr->hidden)
2192	{	2204	{
2193	op->invisible = 1000;	2205	op->invisible = 1000;
2194	/* the socket code flashes the player visible/invisible	2206	/* the socket code flashes the player visible/invisible
2195	* depending on the value of invisible, so we need to	2207	* depending on the value of invisible, so we need to
2196	* alternate it here for it to work correctly.	2208	* alternate it here for it to work correctly.
2197	*/	2209	*/
2198	if (pticks & 2)	2210	if (server_tick & 2)
2199	op->invisible--;	2211	op->invisible--;
2200	}	2212	}
		2213	else
		2214	#endif
2201	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2215	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2202	{	2216	{
2203	if (!op->invisible--)	2217	if (!op->invisible--)
2204	{	2218	{
2205	make_visible (op);	2219	make_visible (op);
2206	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2220	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2240	if (--op->last_grace < 0)	2254	if (--op->last_grace < 0)
2241	{	2255	{
2242	if (op->stats.grace < op->stats.maxgrace / 2)	2256	if (op->stats.grace < op->stats.maxgrace / 2)
2243	op->stats.grace++; /* no penalty in food for regaining grace */	2257	op->stats.grace++; /* no penalty in food for regaining grace */
2244		2258
		2259	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2260
2245	if (max_grace > 1)	2261	if (max_grace > 1)
2246	{	2262	{
2247	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2263	int over_grace = temp / rate_grace;
		2264
2248	if (over_grace > 0)	2265	if (over_grace > 0)
2249	{	2266	{
2250	op->stats.sp += over_grace	2267	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2251	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2252	op->last_grace = 0;	2268	op->last_grace = 0;
2253	}	2269	}
2254	else	2270	else
2255	{	2271	op->last_grace = rate_grace / temp;
2256	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2257	}
2258	}	2272	}
2259	else	2273	else
2260	{	2274	op->last_grace = rate_grace / temp;
2261	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2275
2262	}
2263	/* wearing stuff doesn't detract from grace generation. */	2276	/* wearing stuff doesn't detract from grace generation. */
2264	}	2277	}
2265		2278
2266	if (op->stats.food > 0)	2279	if (op->stats.food > 0)
2267	{	2280	{
…		…
2273	if (op->stats.sp < op->stats.maxsp)	2286	if (op->stats.sp < op->stats.maxsp)
2274	{	2287	{
2275	op->stats.sp++;	2288	op->stats.sp++;
2276		2289
2277	/* dms do not consume food */	2290	/* dms do not consume food */
2278	if (!QUERY_FLAG (op, FLAG_WIZ))	2291	if (!op->flag [FLAG_WIZ])
2279	{	2292	{
2280	op->stats.food--;	2293	op->stats.food--;
2281		2294
2282	if (op->contr->digestion < 0)	2295	if (op->contr->digestion < 0)
2283	op->stats.food += op->contr->digestion;	2296	op->stats.food += op->contr->digestion;
…		…
2286	}	2299	}
2287	}	2300	}
2288		2301
2289	if (max_sp > 1)	2302	if (max_sp > 1)
2290	{	2303	{
2291	over_sp = (gen_sp + 10) / rate_sp;	2304	int over_sp = (gen_sp + 10) / rate_sp;
2292	if (over_sp > 0)	2305	if (over_sp > 0)
2293	{	2306	{
2294	if (op->stats.sp < op->stats.maxsp)	2307	if (op->stats.sp < op->stats.maxsp)
2295	{	2308	{
2296	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2309	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2317	if (op->stats.hp < op->stats.maxhp)	2330	if (op->stats.hp < op->stats.maxhp)
2318	{	2331	{
2319	op->stats.hp++;	2332	op->stats.hp++;
2320		2333
2321	/* dms do not consume food */	2334	/* dms do not consume food */
2322	if (!QUERY_FLAG (op, FLAG_WIZ))	2335	if (!op->flag [FLAG_WIZ])
2323	{	2336	{
2324	op->stats.food--;	2337	op->stats.food--;
2325		2338
2326	if (op->contr->digestion < 0)	2339	if (op->contr->digestion < 0)
2327	op->stats.food += op->contr->digestion;	2340	op->stats.food += op->contr->digestion;
2328	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2341	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2329	op->stats.food = last_food;	2342	op->stats.food = last_food;
2330	}	2343	}
2331	}	2344	}
2332		2345
		2346	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2347
2333	if (max_hp > 1)	2348	if (max_hp > 1)
2334	{	2349	{
2335	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2350	int over_hp = temp / rate_hp;
2336		2351
2337	if (over_hp > 0)	2352	if (over_hp > 0)
2338	{	2353	{
2339	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2354	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2340	op->last_heal = 0;	2355	op->last_heal = 0;
2341	}	2356	}
2342	else	2357	else
2343	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2358	op->last_heal = rate_hp / temp;
2344	}	2359	}
2345	else	2360	else
2346	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2361	op->last_heal = rate_hp / temp;
2347	}	2362	}
2348	}	2363	}
2349		2364
2350	/* Digestion */	2365	/* Digestion */
2351	if (--op->last_eat < 0)	2366	if (--op->last_eat < 0)
…		…
2354	penalty = max (0, -op->contr->digestion);	2369	penalty = max (0, -op->contr->digestion);
2355		2370
2356	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2371	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2357		2372
2358	/* dms do not consume food */	2373	/* dms do not consume food */
2359	if (!QUERY_FLAG (op, FLAG_WIZ))	2374	if (!op->flag [FLAG_WIZ])
2360	op->stats.food--;	2375	op->stats.food--;
2361	}	2376	}
2362		2377
2363	if (op->stats.food < 0 && op->stats.hp >= 0)	2378	if (op->stats.food < 0 && op->stats.hp >= 0)
2364	{	2379	{
2365	object *flesh = 0;	2380	object *flesh = 0;
2366		2381
2367	for_inv_removable (op, tmp)	2382	for_inv_removable (op, tmp)
2368	{	2383	{
2369	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2384	if (tmp->flag [FLAG_UNPAID])
2370	continue;	2385	continue;
2371		2386
2372	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2387	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2373	{	2388	{
2374	op->statusmsg ("You blindly grab for a bite of food. "	2389	op->statusmsg ("You blindly grab for a bite of food. "
2375	"H<To prevent you from starving, you ate some random item from your backpack.>");	2390	"H<To prevent you from starving, you ate some random item from your backpack.>");
2376	manual_apply (op, tmp, 0);	2391	op->apply (tmp);
2377		2392
2378	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2393	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2379	break;	2394	break;
2380	}	2395	}
2381	else if (tmp->type == FLESH)	2396	else if (tmp->type == FLESH)
…		…
2387	*/	2402	*/
2388	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2403	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2389	{	2404	{
2390	op->statusmsg ("You blindly grab for a bite of food. "	2405	op->statusmsg ("You blindly grab for a bite of food. "
2391	"H<To prevent you from starving, you ate some random item from your backpack.>");	2406	"H<To prevent you from starving, you ate some random item from your backpack.>");
2392	manual_apply (op, flesh, 0);	2407	op->apply (flesh);
2393	}	2408	}
2394		2409
2395	// If player is still starving, alert him!	2410	// If player is still starving, alert him!
2396	if (op->stats.food < 0)	2411	if (op->stats.food < 0)
2397	op->failmsg ("You are starving! "	2412	op->failmsg ("You are starving! "
…		…
2409	op->contr->killer->destroy ();	2424	op->contr->killer->destroy ();
2410	}	2425	}
2411	}	2426	}
2412		2427
2413	/* killer should be set here already */	2428	/* killer should be set here already */
2414	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2429	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2415	kill_player (op);	2430	kill_player (op);
2416	}	2431	}
2417	}	2432	}
2418		2433
2419	/* If the player should die (lack of hp, food, etc), we call this.	2434	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2453	cure_disease (op, 0, 0); /* remove any disease */	2468	cure_disease (op, 0, 0); /* remove any disease */
2454		2469
2455	max_it (op->stats.hp , op->stats.maxhp);	2470	max_it (op->stats.hp , op->stats.maxhp);
2456	max_it (op->stats.sp , op->stats.maxsp);	2471	max_it (op->stats.sp , op->stats.maxsp);
2457	max_it (op->stats.grace, op->stats.maxgrace);	2472	max_it (op->stats.grace, op->stats.maxgrace);
2458
2459	if (op->stats.food <= 0)	2473	max_it (op->stats.food , 200);
2460	op->stats.food = 999;
2461		2474
2462	// remove all spell effects that are active	2475	// remove all spell effects that are active
2463	// to avoid long-term effects such as word-of-recall	2476	// to avoid long-term effects such as word-of-recall
2464	for (object *item = op->inv; item; )	2477	for (object *item = op->inv; item; )
2465	{	2478	{
…		…
2590		2603
2591	/* There is a maximum depletion total per level. */	2604	/* There is a maximum depletion total per level. */
2592	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)	2605	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
2593	{	2606	{
2594	lose_this_stat = 0;	2607	lose_this_stat = 0;
2595	/* Take loss chance vs keep chance to see if we	2608	/* Take loss chance vs keep chance to see if we
2596	retain the stat. */	2609	retain the stat. */
2597	}	2610	}
2598	else	2611	else
2599	{	2612	{
2600	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)	2613	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
…		…
2616	* difference.	2629	* difference.
2617	*/	2630	*/
2618	if (this_stat >= -50)	2631	if (this_stat >= -50)
2619	{	2632	{
2620	change_attr_value (&(dep->stats), i, -1);	2633	change_attr_value (&(dep->stats), i, -1);
2621	SET_FLAG (dep, FLAG_APPLIED);	2634	dep->set_flag (FLAG_APPLIED);
2622	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2635	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2623	op->update_stats ();	2636	op->update_stats ();
2624	lost_a_stat = 1;	2637	lost_a_stat = 1;
2625	}	2638	}
2626	}	2639	}
…		…
2693	if (will_kill_again)	2706	if (will_kill_again)
2694	{	2707	{
2695	object *force;	2708	object *force;
2696	int at;	2709	int at;
2697		2710
2698	force = get_archetype (FORCE_NAME);	2711	force = archetype::get (FORCE_NAME);
2699	/* 50 ticks should be enough time for the spell to abate */	2712	/* 50 ticks should be enough time for the spell to abate */
2700	force->speed = 0.1f;
2701	force->speed_left = -5.f;	2713	force->speed_left = -5.f;
2702	SET_FLAG (force, FLAG_APPLIED);	2714	force->set_speed (0.1f);
		2715	force->set_flag (FLAG_APPLIED);
		2716
2703	for (at = 0; at < NROFATTACKS; at++)	2717	for (at = 0; at < NROFATTACKS; at++)
2704	if (will_kill_again & (1 << at))	2718	if (will_kill_again & (1 << at))
2705	force->resist[at] = 100;	2719	force->resist[at] = 100;
2706		2720
2707	insert_ob_in_ob (force, op);	2721	insert_ob_in_ob (force, op);
…		…
2712	}	2726	}
2713		2727
2714	static void	2728	static void
2715	loot_object (object *op)	2729	loot_object (object *op)
2716	{ /* Grab and destroy some treasure */	2730	{ /* Grab and destroy some treasure */
2717	object tmp, tmp2, *next;	2731	object tmp, next;
2718		2732
2719	op->close_container (); /* close open sack first */	2733	op->close_container (); /* close open sack first */
2720		2734
2721	for (tmp = op->inv; tmp; tmp = next)	2735	for (tmp = op->inv; tmp; tmp = next)
2722	{	2736	{
…		…
2729	tmp->x = op->x, tmp->y = op->y;	2743	tmp->x = op->x, tmp->y = op->y;
2730		2744
2731	if (tmp->type == CONTAINER)	2745	if (tmp->type == CONTAINER)
2732	loot_object (tmp); /* empty container to ground */	2746	loot_object (tmp); /* empty container to ground */
2733		2747
2734	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))	2748	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] \|\| tmp->flag [FLAG_NO_DROP] \|\| !(rndm (3))))
2735	{	2749	{
2736	if (tmp->nrof > 1)	2750	if (tmp->nrof > 1)
2737	{	2751	{
2738	tmp->decrease (rndm (1, tmp->nrof - 1));	2752	tmp->decrease (rndm (1, tmp->nrof - 1));
2739	insert_ob_in_map (tmp, op->map, NULL, 0);	2753	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2754	void	2768	void
2755	fix_weight ()	2769	fix_weight ()
2756	{	2770	{
2757	for_all_players (pl)	2771	for_all_players (pl)
2758	{	2772	{
2759	sint32 old = pl->ob->carrying;	2773	weight_t old = pl->ob->carrying;
2760		2774
2761	pl->ob->update_weight ();	2775	pl->ob->update_weight ();
2762		2776
2763	if (old != pl->ob->carrying)	2777	if (old != pl->ob->carrying)
2764	{	2778	{
…		…
2829	}	2843	}
2830		2844
2831	int	2845	int
2832	is_true_undead (object *op)	2846	is_true_undead (object *op)
2833	{	2847	{
2834	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2848	if (op->arch->flag [FLAG_UNDEAD])
2835	return 1;	2849	return 1;
2836		2850
2837	return 0;	2851	return 0;
2838	}	2852	}
2839		2853
…		…
2860	level = -(10 + (2 * ob->map->darklevel ()));	2874	level = -(10 + (2 * ob->map->darklevel ()));
2861		2875
2862	/* scan through all nearby squares for terrain to hide in */	2876	/* scan through all nearby squares for terrain to hide in */
2863	for (i = 0, x = ob->x, y = ob->y;	2877	for (i = 0, x = ob->x, y = ob->y;
2864	i <= SIZEOFFREE1;	2878	i <= SIZEOFFREE1;
2865	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2879	i++, x = ob->x + DIRX (i), y = ob->y + DIRY (i))
2866	{	2880	{
2867	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2881	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
2868	if (mflag & P_OUT_OF_MAP)	2882	if (mflag & P_OUT_OF_MAP)
2869	continue;	2883	continue;
2870		2884
…		…
2937		2951
2938	if (who->type == PLAYER)	2952	if (who->type == PLAYER)
2939	player = 1;	2953	player = 1;
2940		2954
2941	else	2955	else
2942	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2956	friendly = who->flag [FLAG_FRIENDLY];
2943		2957
2944	/* search adjacent squares */	2958	/* search adjacent squares */
2945	for (i = 1; i < 9; i++)	2959	for (i = 1; i < 9; i++)
2946	{	2960	{
2947	x = who->x + freearr_x[i];	2961	x = who->x + DIRX (i);
2948	y = who->y + freearr_y[i];	2962	y = who->y + DIRY (i);
2949	m = who->map;	2963	m = who->map;
2950	mflags = get_map_flags (m, &m, x, y, &x, &y);	2964	mflags = get_map_flags (m, &m, x, y, &x, &y);
2951	/* space must be blocked if there is a monster. If not	2965	/* space must be blocked if there is a monster. If not
2952	* blocked, don't need to check this space.	2966	* blocked, don't need to check this space.
2953	*/	2967	*/
…		…
2956	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2970	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2957	continue;	2971	continue;
2958		2972
2959	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2973	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2960	{	2974	{
2961	if ((player \|\|friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2975	if ((player \|\|friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2962	return 1;	2976	return 1;
2963	else if (tmp->type == PLAYER)	2977	else if (tmp->type == PLAYER)
2964	{
2965	/don't let a hidden DM prevent you from hiding /
2966	if (!QUERY_FLAG (tmp, FLAG_WIZ) \|\| tmp->contr->hidden == 0)
2967	return 1;	2978	return 1;
2968	}
2969	}	2979	}
2970	}	2980	}
2971	return 0;	2981	return 0;
2972	}	2982	}
2973		2983
2974	/* check the player los field for viewability of the	2984	/* check the player los field for viewability of the
2975	* object op. This function works fine for monsters,	2985	* object op. This function works fine for monsters,
2976	* but we dont worry if the object isnt the top one in	2986	* but we dont worry if the object isnt the top one in
2977	* a pile (say a coin under a table would return "viewable"	2987	* a pile (say a coin under a table would return "viewable"
2978	* by this routine). Another question, should we be	2988	* by this routine). Another question, should we be
2979	* concerned with the direction the player is looking	2989	* concerned with the direction the player is looking
2980	* in? Realistically, most of us can't see stuff behind	2990	* in? Realistically, most of us can't see stuff behind
2981	* our backs...on the other hand, does the "facing" direction	2991	* our backs...on the other hand, does the "facing" direction
2982	* imply the way your head, or body is facing? It's possible	2992	* imply the way your head, or body is facing? It's possible
2983	* for them to differ. Sigh, this fctn could get a bit more complex.	2993	* for them to differ. Sigh, this fctn could get a bit more complex.
2984	* -b.t.	2994	* -b.t.
2985	* This function is now map tiling safe.	2995	* This function is now map tiling safe.
2986	*/	2996	*/
2987	int	2997	int
2988	player_can_view (object pl, object op)	2998	player_can_view (object pl, object op)
2989	{	2999	{
…		…
3003		3013
3004	get_rangevector (pl, op, &rv, 0x1);	3014	get_rangevector (pl, op, &rv, 0x1);
3005		3015
3006	/* starting with the 'head' part, lets loop	3016	/* starting with the 'head' part, lets loop
3007	* through the object and find if it has any	3017	* through the object and find if it has any
3008	* part that is in the los array but isn't on	3018	* part that is in the los array but isn't on
3009	* a blocked los square.	3019	* a blocked los square.
3010	* we use the archetype to figure out offsets.	3020	* we use the archetype to figure out offsets.
3011	*/	3021	*/
3012	while (op)	3022	while (op)
3013	{	3023	{
…		…
3040	* and the exit-coordinates sp/hp must both be > 0.	3050	* and the exit-coordinates sp/hp must both be > 0.
3041	* => The intention here is to prevent abuse of the battleground-	3051	* => The intention here is to prevent abuse of the battleground-
3042	* feature (like pickable or hidden battleground tiles). */	3052	* feature (like pickable or hidden battleground tiles). */
3043	for (object *tmp = op->below; tmp; tmp = tmp->below)	3053	for (object *tmp = op->below; tmp; tmp = tmp->below)
3044	{	3054	{
3045	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3055	if (tmp->flag [FLAG_IS_FLOOR])
3046	{	3056	{
3047	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3057	if (tmp->flag [FLAG_NO_PICK]
3048	&& tmp->type == BATTLEGROUND	3058	&& tmp->type == BATTLEGROUND
3049	&& tmp->name == shstr_battleground	3059	&& tmp->name == shstr_battleground
3050	&& EXIT_X (tmp) && EXIT_Y (tmp))	3060	&& EXIT_X (tmp) && EXIT_Y (tmp))
3051	{	3061	{
3052	/* before we assign the exit, check if this is a teambattle */	3062	/* before we assign the exit, check if this is a teambattle */
…		…
3204	else	3214	else
3205	j = 1;	3215	j = 1;
3206	strcat (buf, spellpathnames[i]);	3216	strcat (buf, spellpathnames[i]);
3207	}	3217	}
3208	}	3218	}
		3219
3209	strcat (buf, ".");	3220	strcat (buf, ".");
3210	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);	3221	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);
3211	}	3222	}
3212		3223
3213	/* evtl. adding flags: */	3224	/* evtl. adding flags: */
3214	if (QUERY_FLAG (item, FLAG_XRAYS))	3225	if (item->flag [FLAG_XRAYS])
3215	SET_FLAG (skin, FLAG_XRAYS);	3226	skin->set_flag (FLAG_XRAYS);
3216	if (QUERY_FLAG (item, FLAG_STEALTH))	3227	if (item->flag [FLAG_STEALTH])
3217	SET_FLAG (skin, FLAG_STEALTH);	3228	skin->set_flag (FLAG_STEALTH);
3218	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3229	if (item->flag [FLAG_SEE_IN_DARK])
3219	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3230	skin->set_flag (FLAG_SEE_IN_DARK);
3220		3231
3221	/* print message if there is one */	3232	/* print message if there is one */
3222	if (item->msg != NULL)	3233	if (item->msg != NULL)
3223	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3234	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3224	}	3235	}
…		…
3229	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3240	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3230	who->insert (tmp);	3241	who->insert (tmp);
3231	}	3242	}
3232	}	3243	}
3233		3244
3234	/**
3235	* Unready an object for a player. This function does nothing if the object was
3236	* not readied.
3237	*/
3238	void
3239	player_unready_range_ob (player pl, object ob)
3240	{
3241	if (pl->ob->current_weapon == ob)
3242	pl->ob->change_weapon (0);
3243
3244	if (pl->combat_ob == ob)
3245	pl->combat_ob = 0;
3246
3247	if (pl->ranged_ob == ob)
3248	pl->ranged_ob = 0;
3249	}
3250
3251	//-GPL	3245	//-GPL
3252		3246
3253	sint8	3247	sint8
3254	player::darkness_at (maptile *map, int x, int y) const	3248	player::darkness_at (maptile *map, int x, int y) const
3255	{	3249	{
…		…
3283	{	3277	{
3284	play_sound (sound_find ("generic_failure"));	3278	play_sound (sound_find ("generic_failure"));
3285	statusmsg (msg, color);	3279	statusmsg (msg, color);
3286	}	3280	}
3287		3281
		3282	void
		3283	object::failmsgf (const char *format, ...)
		3284	{
		3285	if (!contr)
		3286	return;
		3287
		3288	va_list ap;
		3289	va_start (ap, format);
		3290	contr->failmsg (vformat (format, ap));
		3291	va_end (ap);
		3292	}
		3293
		3294	void
		3295	player::failmsgf (const char *format, ...)
		3296	{
		3297	va_list ap;
		3298	va_start (ap, format);
		3299	failmsg (vformat (format, ap));
		3300	va_end (ap);
		3301	}
		3302

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC vs. Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.259 by root, Sun Mar 28 02:53:46 2010 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC