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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.290 by root, Mon Oct 29 23:55:55 2012 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 (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* 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	9	* 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	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* 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 Affero GNU General Public License	18	* 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	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	//+GPL	25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
26		29
27	#include <global.h>	30	#include <global.h>
28	#include <sproto.h>	31	#include <sproto.h>
29	#include <sounds.h>	32	#include <sounds.h>
30	#include <living.h>	33	#include <living.h>
31	#include <object.h>	34	#include <object.h>
32	#include <spells.h>	35	#include <spells.h>
33	#include <skills.h>	36	#include <skills.h>
34		37
35	#include <algorithm>
36	#include <functional>
37
38	playervec players;	38	playervec players;
39		39
40	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
41	static void	41	static void
42	set_first_map (object *op)	42	set_first_map (object *op)
54		54
55	players.insert (this);	55	players.insert (this);
56	ob->remove ();	56	ob->remove ();
57	ob->map = 0;	57	ob->map = 0;
58	ob->activate_recursive ();	58	ob->activate_recursive ();
59	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
60	add_friendly_object (ob);	60	add_friendly_object (ob);
61	}	61	}
62		62
63	void	63	void
64	player::deactivate ()	64	player::deactivate ()
…		…
76	ob->remove ();	76	ob->remove ();
77	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
78	ob->map = 0;	78	ob->map = 0;
79	party = 0;	79	party = 0;
80		80
81	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
82
83	players.erase (this);	81	players.erase (this);
84	}	82	}
85		83
86	// connect the player with a specific client	84	// connect the player with a specific client
87	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
107	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
108		106
109	ob->update_weight ();	107	ob->update_weight ();
110	link_skills ();	108	link_skills ();
111		109
112	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
113
114	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
115		111
116	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
117	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
118	{	114	{
119	object tmp, abil = 0, *skin = 0;	115	object tmp, abil = 0, *skin = 0;
120		116
121	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
122	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
130		126
131	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
132		128
133	esrv_new_player (this);	129	esrv_new_player (this);
134		130
		131	ob->flag [FLAG_READY_WEAPON] = false;
		132	ob->flag [FLAG_READY_SKILL] = false;
		133	ob->flag [FLAG_READY_RANGE] = false;
		134	ob->flag [FLAG_READY_BOW] = false;
		135
135	ob->update_stats ();	136	ob->update_stats ();
136		137
137	ns->floorbox_update ();	138	ns->floorbox_update ();
138	esrv_send_inventory (ob, ob);	139	esrv_send_inventory (ob, ob);
139	esrv_add_spells (this, 0);	140	esrv_add_spells (this, 0);
…		…
180	player::set_object (object *op)	181	player::set_object (object *op)
181	{	182	{
182	ob = observe = viewpoint = op;	183	ob = observe = viewpoint = op;
183	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
184		185
185	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
186	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
187		188
188	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
189
190	ob->flag [FLAG_READY_WEAPON] = false;
191	ob->flag [FLAG_READY_SKILL] = false;
192	ob->flag [FLAG_READY_BOW] = false;
193
194	for (object *op = ob->inv; op; op = op->below)
195	if (op->flag [FLAG_APPLIED])
196	switch (op->type)
197	{
198	case SKILL:
199	ob->flag [FLAG_APPLIED] = false;
200	break;
201
202	case WAND:
203	case ROD:
204	case HORN:
205	case BOW:
206	ranged_ob = op;
207	break;
208
209	case WEAPON:
210	combat_ob = op;
211	break;
212	}
213
214	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
215	ob->deactivate (); // change_weapon activates, fix this better
216	}	190	}
217		191
218	void	192	void
219	player::set_observe (object *op)	193	player::set_observe (object *op)
220	{	194	{
…		…
259	disconnect ();	233	disconnect ();
260		234
261	attachable::do_destroy ();	235	attachable::do_destroy ();
262		236
263	if (ob)	237	if (ob)
264	{
265	ob->destroy_inv (false);
266	ob->destroy ();	238	ob->destroy ();
267	}
268		239
269	ob = observe = viewpoint = 0;	240	ob = observe = viewpoint = 0;
270	}	241	}
271		242
272	player::~player ()	243	player::~player ()
…		…
310	player *	281	player *
311	player::create ()	282	player::create ()
312	{	283	{
313	player *pl = new player;	284	player *pl = new player;
314		285
315	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
316		287
317	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
318	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
319	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
320		291
…		…
402	*/	373	*/
403	int	374	int
404	path_to_player (object mon, object pl, unsigned mindiff)	375	path_to_player (object mon, object pl, unsigned mindiff)
405	{	376	{
406	rv_vector rv;	377	rv_vector rv;
407	sint16 x, y;
408	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	378	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
409	maptile m, lastmap;
410		379
411	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
412		381
413	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
414	return 0;	383	return 0;
415		384
416	x = mon->x;	385	mapxy pos (mon);
417	y = mon->y;
418	m = mon->map;
419	dir = rv.direction;	386	dir = rv.direction;
420	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	387	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
421	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
422		389
423	/* If we can't solve it within the search distance, return now. */	390	/* If we can't solve it within the search distance, return now. */
424	if (diff > max)	391	if (diff > max)
425	return 0;	392	return 0;
426		393
427	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
428	{	395	{
429	lastx = x;	396	mapxy lastpos = pos;
430	lasty = y;
431	lastmap = m;
432	x = lastx + freearr_x[dir];
433	y = lasty + freearr_y[dir];
434		397
435	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
436	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
437		399
438	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
439	if ((mflags & P_OUT_OF_MAP) \|\| ((OB_TYPE_MOVE_BLOCK (mon, blocked) \|\| (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
440	&& (m == mon->map && blocked_link (mon, m, x, y))))	402	\|\| (((pos->flags () & P_BLOCKSVIEW) \|\| OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		403	&& blocked_link (mon, pos.m, pos.x, pos.y)))
441	{	404	{
442	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
443	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
444	*/	407	*/
445	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
446	if (rv.direction != dir)	409	if (rv.direction != dir)
447	{	410	{
448	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
449	* the values so it will try again.	412	* the values so it will try again.
450	*/	413	*/
451	x = lastx;
452	y = lasty;
453	m = lastmap;	414	pos = lastpos;
454	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
455	}	416	}
456	else	417	else
457	{	418	{
458	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
465	*/	426	*/
466	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
467	{	428	{
468	if (i == 0)	429	if (i == 0)
469	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
470	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
471	* since the direction that the creature should move in	433	* since the direction that the creature should move in
472	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
473	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
474	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
476	* can't do that, but now finds it can move east, and	438	* can't do that, but now finds it can move east, and
477	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
478	* the last direction the creature has successfully	440	* the last direction the creature has successfully
479	* moved.	441	* moved.
480	*/	442	*/
481
482	x = lastx + freearr_x[absdir (lastdir + i)];
483	y = lasty + freearr_y[absdir (lastdir + i)];
484	m = lastmap;	443	pos = lastpos;
485	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
486	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
487	continue;	447	continue;
488	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
489	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
490	continue;	452	continue;
491	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
492	continue;	455	continue;
493		456
494	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
495	break;	458	break;
496	}	459	}
		460
497	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
498	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
499	*/	463	*/
500	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
501	return 0;	465	return 0;
		466
502	diff--;	467	diff--;
503	lastdir = dir;	468	lastdir = dir;
504	max--;	469	max--;
505	if (!firstdir)	470	if (!firstdir)
506	firstdir = dir + i;	471	firstdir = dir + i;
…		…
510	{	475	{
511	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
512	diff--;	477	diff--;
513	max--;	478	max--;
514	lastdir = dir;	479	lastdir = dir;
		480
515	if (!firstdir)	481	if (!firstdir)
516	firstdir = dir;	482	firstdir = dir;
517	}	483	}
518		484
519	if (diff <= 1)	485	if (diff <= 1)
520	{	486	{
521	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
522	* headed toward player for entire distance.	488	* headed toward player for entire distance.
523	*/	489	*/
524	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
525	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
526	}	492	}
527		493
528	if (diff > max)	494	if (diff > max)
529	return 0;	495	return 0;
…		…
547	next = op->below;	513	next = op->below;
548		514
549	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
550	* flag "neutral" set. Sorry but I can't think of a better way	516	* flag "neutral" set. Sorry but I can't think of a better way
551	*/	517	*/
552	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
553	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
554		520
555	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
556	* by this player due to race restrictions	522	* by this player due to race restrictions
557	*/	523	*/
558	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
559	{	525	{
560	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	526	if ((!pl->flag [FLAG_USE_ARMOUR]
561	&&	527	&&
562	(op->type == ARMOUR \|\| op->type == BOOTS	528	(op->type == ARMOUR \|\| op->type == BOOTS
563	\|\| op->type == CLOAK \|\| op->type == HELMET	529	\|\| op->type == CLOAK \|\| op->type == HELMET
564	\|\| op->type == SHIELD \|\| op->type == GLOVES	530	\|\| op->type == SHIELD \|\| op->type == GLOVES
565	\|\| op->type == BRACERS \|\| op->type == GIRDLE))	531	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
566	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	532	\|\| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
567	{	533	{
568	op->destroy ();	534	op->destroy ();
569	continue;	535	continue;
570	}	536	}
571	}	537	}
572		538
573	/* Here we remove duplicated skills (as duplicated spell objects have	539	/* Here we remove duplicated skills (as duplicated spell objects have
574	* _very_ confusing effects for players), which could for instance be	540	* _very_ confusing effects for players), which could for instance be
575	* generated by bad treasurelists. - elmex	541	* generated by multiple treasurelists specifying the same skills.
576	*/	542	*/
577	if (op->type == SKILL)	543	if (op->type == SKILL)
578	{	544	{
579	for (object *tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
580	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
581	{	547	{
582	op->destroy ();	548	op->destroy ();
583	LOG (llevError,
584	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
585	break;	549	break;
586	}	550	}
587		551
588	if (op->nrof > 1)	552	if (op->nrof > 1)
589	op->nrof = 1;	553	op->nrof = 1;
590	}	554	}
591		555
592	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
593	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	557	op->inv->clr_flag (FLAG_STARTEQUIP);
594		558
595	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
596	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
597	* merged properly.	561	* merged properly.
598	*/	562	*/
599	if (need_identify (op))	563	if (op->need_identify ())
600	{	564	{
601	SET_FLAG (op, FLAG_IDENTIFIED);	565	op->set_flag (FLAG_IDENTIFIED);
602	CLEAR_FLAG (op, FLAG_CURSED);	566	op->clr_flag (FLAG_CURSED);
603	CLEAR_FLAG (op, FLAG_DAMNED);	567	op->clr_flag (FLAG_DAMNED);
604	}	568	}
605		569
606	if (op->type == SPELL)	570	if (op->type == SPELL)
607	{	571	{
608	op->destroy ();	572	op->destroy ();
609	continue;	573	continue;
610	}	574	}
611	else if (op->type == SKILL)	575	else if (op->type == SKILL)
612	{	576	{
613	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
614	op->stats.exp = 0;	578	op->stats.exp = 0;
615	op->level = 1;	579	op->level = 1;
616	}	580	}
617	else /* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
618	SET_FLAG (op, FLAG_INV_LOCKED);	582	op->set_flag (FLAG_INV_LOCKED);
619	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
620		584
621	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
622	pl->contr->link_skills ();	586	pl->contr->link_skills ();
623	}	587	}
…		…
637	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	601	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
638	}	602	}
639		603
640	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	604	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
641	static int	605	static int
642	roll_stat (void)	606	roll_stat ()
643	{	607	{
644	int a[4], i, j, k;	608	int a[4], i, j, k;
645		609
646	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
647	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
648		612
649	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
650	if (a[i] < k)	614	if (a[i] < k)
651	k = a[i], j = i;	615	k = a[i], j = i;
652		616
…		…
749	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
750	if (tl)	714	if (tl)
751	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
752		716
753	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
754	INVOKE_PLAYER (LOGIN, ob->contr);
755		718
756	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
757		720
758	if (ob->msg)	721	if (ob->msg)
759	ob->msg = 0;	722	ob->msg = 0;
760		723
761	start_info (ob);	724	start_info (ob);
762	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
763	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
764	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
765	ob->update_stats ();	728	ob->update_stats ();
766		729
767	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
…		…
816	rv_vector rv;	779	rv_vector rv;
817		780
818	if (op->stats.hp < 0)	781	if (op->stats.hp < 0)
819	{	782	{
820	LOG (llevDebug, "Fleeing player is dead.\n");	783	LOG (llevDebug, "Fleeing player is dead.\n");
821	CLEAR_FLAG (op, FLAG_SCARED);	784	op->clr_flag (FLAG_SCARED);
822	return;	785	return;
823	}	786	}
824		787
825	if (!op->enemy)	788	if (!op->enemy)
826	{	789	{
827	LOG (llevDebug, "Fleeing player had no enemy.\n");	790	LOG (llevDebug, "Fleeing player had no enemy.\n");
828	CLEAR_FLAG (op, FLAG_SCARED);	791	op->clr_flag (FLAG_SCARED);
829	return;	792	return;
830	}	793	}
831		794
832	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	795	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
833	{	796	{
834	op->enemy = NULL;	797	op->enemy = NULL;
835	CLEAR_FLAG (op, FLAG_SCARED);	798	op->clr_flag (FLAG_SCARED);
836	return;	799	return;
837	}	800	}
838		801
839	get_rangevector (op, op->enemy, &rv, 0);	802	get_rangevector (op, op->enemy, &rv, 0);
840		803
841	dir = absdir (4 + rv.direction);	804	dir = absdir (4 + rv.direction);
842	for (diff = 0; diff < 3; diff++)	805	for (diff = 0; diff < 3; diff++)
843	{	806	{
844	int m = 1 - rndm (2) * 2;	807	int m = 1 - rndm (2) * 2;
845		808
846	if (move_ob (op, absdir (dir + diff * m), op) \|\| (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	809	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))
847	return;	810	return;
848	}	811	}
849		812
850	/* Cornered, get rid of scared */	813	/* Cornered, get rid of scared */
851	CLEAR_FLAG (op, FLAG_SCARED);	814	op->clr_flag (FLAG_SCARED);
852	op->enemy = NULL;	815	op->enemy = NULL;
853	}	816	}
854		817
855	/* check_pick sees if there is stuff to be picked up/picks up stuff.	818	/* check_pick sees if there is stuff to be picked up/picks up stuff.
856	* It returns 1 if the player should keep on moving, 0 if he should	819	* It returns 1 if the player should keep on moving, 0 if he should
…		…
861	{	824	{
862	object tmp, next;	825	object tmp, next;
863	int stop = 0;	826	int stop = 0;
864	int wvratio;	827	int wvratio;
865		828
866	/* if you're flying, you cna't pick up anything */	829	/* if you're flying, you can't pick up anything */
867	if (op->move_type & MOVE_FLYING)	830	if (op->move_type & MOVE_FLYING)
868	return 1;	831	return 1;
869		832
870	next = op->below;	833	next = op->below;
871		834
872	int cnt = MAX_ITEM_PER_DROP;	835	int cnt = MAX_ITEM_PER_ACTION;
873	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	836	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
874		837
875	/* loop while there are items on the floor that are not marked as	838	/* loop while there are items on the floor that are not marked as
876	* destroyed */	839	* destroyed */
877	while (next && !next->destroyed ())	840	while (next && !next->destroyed ())
…		…
948	* fighting */	911	* fighting */
949	if (op->contr->mode & PU_INHIBIT)	912	if (op->contr->mode & PU_INHIBIT)
950	return 1;	913	return 1;
951		914
952	/* prevent us from turning into auto-thieves :) */	915	/* prevent us from turning into auto-thieves :) */
953	if (QUERY_FLAG (tmp, FLAG_UNPAID))	916	if (tmp->flag [FLAG_UNPAID])
954	continue;	917	continue;
955		918
956	/* ignore known cursed objects */	919	/* ignore known cursed objects */
957	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	920	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
958	continue;	921	continue;
959		922
960	/* all food and drink if desired */	923	/* all food and drink if desired */
961	/* question: don't pick up known-poisonous stuff? */	924	/* question: don't pick up known-poisonous stuff? */
962	if (op->contr->mode & PU_FOOD)	925	if (op->contr->mode & PU_FOOD)
…		…
965	CHK_PICK_PICKUP;	928	CHK_PICK_PICKUP;
966	continue;	929	continue;
967	}	930	}
968		931
969	if (op->contr->mode & PU_DRINK)	932	if (op->contr->mode & PU_DRINK)
970	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	933	if (tmp->type == DRINK \|\| (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
971	{	934	{
972	CHK_PICK_PICKUP;	935	CHK_PICK_PICKUP;
973	continue;	936	continue;
974	}	937	}
975		938
…		…
1002	continue;	965	continue;
1003	}	966	}
1004		967
1005	/* wands/staves/rods/horns */	968	/* wands/staves/rods/horns */
1006	if (op->contr->mode & PU_MAGIC_DEVICE)	969	if (op->contr->mode & PU_MAGIC_DEVICE)
1007	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	970	if (tmp->type == WAND
		971	\|\| tmp->type == ROD
		972	\|\| tmp->type == HORN
		973	\|\| tmp->type == POWER_CRYSTAL)
1008	{	974	{
1009	CHK_PICK_PICKUP;	975	CHK_PICK_PICKUP;
1010	continue;	976	continue;
1011	}	977	}
1012		978
1013	/* pick up all magical items */	979	/* pick up all magical items */
1014	if (op->contr->mode & PU_MAGICAL)	980	if (op->contr->mode & PU_MAGICAL)
1015	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	981	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		982	&& !tmp->flag [FLAG_KNOWN_CURSED])
1016	{	983	{
1017	CHK_PICK_PICKUP;	984	CHK_PICK_PICKUP;
1018	continue;	985	continue;
1019	}	986	}
1020		987
…		…
1027	}	994	}
1028	}	995	}
1029		996
1030	/* rings & amulets - talismans seems to be typed AMULET */	997	/* rings & amulets - talismans seems to be typed AMULET */
1031	if (op->contr->mode & PU_JEWELS)	998	if (op->contr->mode & PU_JEWELS)
1032	if (tmp->type == RING \|\| tmp->type == AMULET)	999	if (tmp->type == RING
		1000	\|\| tmp->type == AMULET
		1001	\|\| tmp->type == GIRDLE
		1002	\|\| tmp->type == SKILL_TOOL)
1033	{	1003	{
1034	CHK_PICK_PICKUP;	1004	CHK_PICK_PICKUP;
1035	continue;	1005	continue;
1036	}	1006	}
1037		1007
…		…
1086	CHK_PICK_PICKUP;	1056	CHK_PICK_PICKUP;
1087	continue;	1057	continue;
1088	}	1058	}
1089		1059
1090	if (op->contr->mode & PU_GLOVES)	1060	if (op->contr->mode & PU_GLOVES)
1091	if (tmp->type == GLOVES)	1061	if (tmp->type == GLOVES \|\| tmp->type == BRACERS)
1092	{	1062	{
1093	CHK_PICK_PICKUP;	1063	CHK_PICK_PICKUP;
1094	continue;	1064	continue;
1095	}	1065	}
1096		1066
…		…
1101	continue;	1071	continue;
1102	}	1072	}
1103		1073
1104	/* hoping to catch throwing daggers here */	1074	/* hoping to catch throwing daggers here */
1105	if (op->contr->mode & PU_MISSILEWEAPON)	1075	if (op->contr->mode & PU_MISSILEWEAPON)
1106	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1076	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1107	{	1077	{
1108	CHK_PICK_PICKUP;	1078	CHK_PICK_PICKUP;
1109	continue;	1079	continue;
1110	}	1080	}
1111		1081
…		…
1166	* return 0.	1136	* return 0.
1167	*/	1137	*/
1168	static int	1138	static int
1169	action_makes_visible (object *op)	1139	action_makes_visible (object *op)
1170	{	1140	{
1171	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	1141	if (op->invisible && op->flag [FLAG_ALIVE])
1172	{	1142	{
1173	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	1143	if (op->flag [FLAG_MAKE_INVIS])
1174	{	1144	{
1175	// artefact invisibility is permanent, but we still make noise	1145	// artefact invisibility is permanent, but we still make noise
1176	// this is important for game-balance.	1146	// this is important for game-balance.
1177	if (op->contr)	1147	if (op->contr)
1178	op->make_noise ();	1148	op->make_noise ();
…		…
1205	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1175	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1206	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1176	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1207	return splay (tmp);	1177	return splay (tmp);
1208		1178
1209	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1179	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1210	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1180	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1211	if (object *arrow = find_arrow (tmp, type))	1181	if (object *arrow = find_arrow (tmp, type))
1212	{	1182	{
1213	splay (tmp);	1183	splay (tmp);
1214	return arrow;	1184	return arrow;
1215	}	1185	}
…		…
1232	if (!type)	1202	if (!type)
1233	return NULL;	1203	return NULL;
1234		1204
1235	for (arrow = op->inv; arrow; arrow = arrow->below)	1205	for (arrow = op->inv; arrow; arrow = arrow->below)
1236	{	1206	{
1237	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1207	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1238	{	1208	{
1239	i = 0;	1209	i = 0;
1240	ntmp = find_better_arrow (arrow, target, type, &i);	1210	ntmp = find_better_arrow (arrow, target, type, &i);
1241		1211
1242	if (i > betterby)	1212	if (i > betterby)
…		…
1343	break;	1313	break;
1344	}	1314	}
1345		1315
1346	if (mflags & P_IS_ALIVE)	1316	if (mflags & P_IS_ALIVE)
1347	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1317	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1348	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1318	if (tmp->flag [FLAG_ALIVE])
1349	break;	1319	break;
1350	}	1320	}
1351		1321
1352	if (!tmp)	1322	if (!tmp)
1353	return find_arrow (op, type);	1323	return find_arrow (op, type);
…		…
1414	{	1384	{
1415	if (op->type == PLAYER)	1385	if (op->type == PLAYER)
1416	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1386	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1417	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1387	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1418	else	1388	else
1419	CLEAR_FLAG (op, FLAG_READY_BOW);	1389	op->clr_flag (FLAG_READY_BOW);
1420		1390
1421	return 0;	1391	return 0;
1422	}	1392	}
1423	}	1393	}
1424		1394
…		…
1473	#endif	1443	#endif
1474		1444
1475	SET_ANIMATION (arrow, arrow->direction);	1445	SET_ANIMATION (arrow, arrow->direction);
1476		1446
1477	/* update the speed */	1447	/* update the speed */
1478	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1479	+ bow->stats.dam / 7.f;
1480		1448
1481	arrow->set_speed (max (arrow->speed, 2.f));
1482	arrow->speed_left = 0;	1449	arrow->speed_left = 0;
		1450	arrow->set_speed (max (2.f,
		1451	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1452	+ bow->stats.dam / 7.f
		1453	));
1483		1454
1484	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1455	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1485		1456
1486	if (op->type == PLAYER)	1457	if (op->type == PLAYER)
1487	{	1458	{
…		…
1580	{	1551	{
1581	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1552	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1582	return;	1553	return;
1583	}	1554	}
1584		1555
1585	if (!op->change_weapon (item))	1556	if (!op->apply (item))
1586	return;	1557	return;
1587		1558
1588	if (item->type == WAND)	1559	if (item->type == WAND)
1589	{	1560	{
1590	if (item->stats.food <= 0)	1561	if (item->stats.food <= 0)
…		…
1620		1591
1621	if (item->type == WAND)	1592	if (item->type == WAND)
1622	{	1593	{
1623	if (!(--item->stats.food))	1594	if (!(--item->stats.food))
1624	{	1595	{
1625	object *tmp;
1626
1627	if (item->arch)	1596	if (item->arch)
1628	{	1597	{
1629	CLEAR_FLAG (item, FLAG_ANIMATE);	1598	item->clr_flag (FLAG_ANIMATE);
1630	item->face = item->arch->face;	1599	item->face = item->arch->face;
1631	item->set_speed (0);	1600	item->set_speed (0);
1632	}	1601	}
1633		1602
1634	if (object *pl = item->visible_to ())	1603	if (object *pl = item->visible_to ())
…		…
1641	}	1610	}
1642		1611
1643	/* Received a fire command for the player - go and do it.	1612	/* Received a fire command for the player - go and do it.
1644	*/	1613	*/
1645	bool	1614	bool
1646	fire (object *op, int dir)	1615	fire (object *who, int dir)
1647	{	1616	{
1648	int spellcost = 0;	1617	int spellcost = 0;
1649		1618
1650	player *pl = op->contr;	1619	player *pl = who->contr;
1651		1620
1652	if (pl->golem)	1621	if (pl->golem)
1653	{	1622	{
1654	control_golem (op->contr->golem, dir);	1623	control_golem (who->contr->golem, dir);
1655	return false;	1624	return false;
1656	}	1625	}
1657		1626
1658	object *ob = pl->ranged_ob;	1627	object *ob = pl->ranged_ob;
1659		1628
1660	if (!ob)	1629	if (!ob)
1661	return false;	1630	return false;
1662		1631
1663	if (op->speed_left > 0.f)	1632	if (who->speed_left > 0.f)
1664	--op->speed_left;	1633	--who->speed_left;
1665	else	1634	else
1666	return false;	1635	return false;
1667		1636
1668	if (!op->change_weapon (ob))	1637	if (!who->apply (ob))
1669	return false;	1638	return false;
1670		1639
1671	/* check for loss of invisiblity/hide */	1640	/* check for loss of invisiblity/hide */
1672	if (action_makes_visible (op))	1641	if (action_makes_visible (who))
1673	make_visible (op);	1642	make_visible (who);
1674		1643
1675	switch (ob->type)	1644	switch (ob->type)
1676	{	1645	{
1677	case BOW:	1646	case BOW:
1678	player_fire_bow (op, dir);	1647	player_fire_bow (who, dir);
1679	break;	1648	break;
1680		1649
1681	case SPELL:	1650	case SPELL:
1682	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1651	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1683	break;	1652	break;
1684		1653
1685	case BUILDER:	1654	case BUILDER:
1686	apply_map_builder (op, dir);	1655	apply_map_builder (who, dir);
1687	break;	1656	break;
1688		1657
1689	case SKILL:	1658	case SKILL:
1690	do_skill (op, op, ob, dir, 0);	1659	do_skill (who, who, ob, dir, 0);
1691	break;	1660	break;
1692		1661
		1662	case RANGED:
		1663	do_skill (who, ob, who->chosen_skill, dir, 0);
		1664	break;
		1665
1693	default:	1666	default:
1694	fire_misc_object (op, dir);	1667	fire_misc_object (who, dir);
1695	break;	1668	break;
1696	}	1669	}
1697		1670
1698	return true;	1671	return true;
1699	}	1672	}
…		…
1758	*	1731	*
1759	* Change the color so that the message doesn't disappear with	1732	* Change the color so that the message doesn't disappear with
1760	* all the others.	1733	* all the others.
1761	*/	1734	*/
1762	if (pl->contr->usekeys == key_inventory	1735	if (pl->contr->usekeys == key_inventory
1763	\|\| !QUERY_FLAG (container, FLAG_APPLIED)	1736	\|\| !container->flag [FLAG_APPLIED]
1764	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1737	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1765	{	1738	{
1766	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1739	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1767	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1740	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1768	return NULL;	1741	return NULL;
…		…
1852	* going to try and move (not fire weapons).	1825	* going to try and move (not fire weapons).
1853	*/	1826	*/
1854	bool	1827	bool
1855	move_player_attack (object *op, int dir)	1828	move_player_attack (object *op, int dir)
1856	{	1829	{
1857	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1830	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1858	{	1831	{
1859	--op->speed_left;	1832	--op->speed_left;
1860	return true;	1833	return true;
1861	}	1834	}
1862		1835
1863	int on_battleground;
1864
1865	sint16 nx = freearr_x[dir] + op->x;	1836	sint16 nx = freearr_x[dir] + op->x;
1866	sint16 ny = freearr_y[dir] + op->y;	1837	sint16 ny = freearr_y[dir] + op->y;
1867
1868	on_battleground = op_on_battleground (op, 0, 0);
1869		1838
1870	if (out_of_map (op->map, nx, ny))	1839	if (out_of_map (op->map, nx, ny))
1871	return false;	1840	return false;
1872		1841
1873	/* If braced, or can't move to the square, and it is not out of the	1842	/* If braced, or can't move to the square, and it is not out of the
…		…
1894	\|\| mon->flag [FLAG_CAN_ROLL])	1863	\|\| mon->flag [FLAG_CAN_ROLL])
1895	&& mon != op)	1864	&& mon != op)
1896	break;	1865	break;
1897	}	1866	}
1898		1867
1899	if (!mon) /* This happens anytime the player tries to move */	1868	/* no monster == player tries to move into a wall or so */
1900	return false; /* into a wall */	1869	if (!mon)
		1870	{
		1871	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1872	if (op->move_type & ob->move_block)
		1873	{
		1874	if (ob->move_block == MOVE_ALL)
		1875	move_into_wall (op, ob);
		1876	else
		1877	{
		1878	if (op->contr->ns->bumpmsg)
		1879	{
		1880	op->play_sound (sound_find ("blocked_move"));
		1881
		1882	op->statusmsg (ob->invisible
		1883	? "Something blocks you."
		1884	: format ("Something blocks you from entering the %s.", query_name (ob))
		1885	);
		1886	}
		1887	}
		1888
		1889	break;
		1890	}
		1891
		1892	return false;
		1893	}
1901		1894
1902	mon = mon->head_ ();	1895	mon = mon->head_ ();
1903		1896
1904	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	1897	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
1905	if (op->contr->weapon_sp_left > 0.f)	1898	if (op->contr->weapon_sp_left > 0.f)
…		…
1923	*/	1916	*/
1924	if (op->type == PLAYER	1917	if (op->type == PLAYER
1925	&& ((mon->owner && mon->owner->contr	1918	&& ((mon->owner && mon->owner->contr
1926	&& same_party (mon->owner->contr->party, op->contr->party))	1919	&& same_party (mon->owner->contr->party, op->contr->party))
1927	\|\| mon->owner == op)	1920	\|\| mon->owner == op)
1928	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	1921	&& (mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY]))
1929	{	1922	{
1930	/* If we're braced, we don't want to switch places with it */	1923	/* If we're braced, we don't want to switch places with it */
1931	if (op->contr->braced)	1924	if (op->contr->braced)
1932	return false;	1925	return false;
1933		1926
…		…
1944	return true;	1937	return true;
1945	}	1938	}
1946	else	1939	else
1947	return false;	1940	return false;
1948	}	1941	}
		1942
		1943	bool on_battleground = op_on_battleground (op, 0, 0);
1949		1944
1950	/* in certain circumstances, you shouldn't attack friendly	1945	/* in certain circumstances, you shouldn't attack friendly
1951	* creatures. Note that if you are braced, you can't push	1946	* creatures. Note that if you are braced, you can't push
1952	* someone, but put it inside this loop so that you won't	1947	* someone, but put it inside this loop so that you won't
1953	* attack them either.	1948	* attack them either.
1954	*/	1949	*/
1955	if ((mon->type == PLAYER \|\| mon->enemy != op)	1950	if ((mon->type == PLAYER \|\| mon->enemy != op)
1956	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	1951	&& (mon->type == PLAYER \|\| mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY])
1957	&& ((op->contr->peaceful	1952	&& ((op->contr->peaceful
1958	\|\| (mon->type == PLAYER && mon->contr->peaceful))	1953	\|\| (mon->type == PLAYER && mon->contr->peaceful))
1959	&& !on_battleground))	1954	&& !on_battleground))
1960	{	1955	{
1961	if (op->speed_left > 0.f)	1956	if (op->speed_left > 0.f)
…		…
1977	}	1972	}
1978	}	1973	}
1979	/* If the object is a boulder or other rollable object, then	1974	/* If the object is a boulder or other rollable object, then
1980	* roll it if not braced. You can't roll it if you are braced.	1975	* roll it if not braced. You can't roll it if you are braced.
1981	*/	1976	*/
1982	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1977	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1983	{	1978	{
1984	if (op->speed_left > 0.f)	1979	if (op->speed_left > 0.f)
1985	{	1980	{
1986	--op->speed_left;	1981	--op->speed_left;
1987		1982
…		…
1996	* Way it works is like this: First, it must have some hit points	1991	* Way it works is like this: First, it must have some hit points
1997	* and be living. Then, it must be one of the following:	1992	* and be living. Then, it must be one of the following:
1998	* 1) Not a player, 2) A player, but of a different party. Note	1993	* 1) Not a player, 2) A player, but of a different party. Note
1999	* that party_number -1 is no party, so attacks can still happen.	1994	* that party_number -1 is no party, so attacks can still happen.
2000	*/	1995	*/
2001	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	1996	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2002	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	1997	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2003	{	1998	{
2004	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	1999	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2005	{	2000	{
2006	--op->contr->weapon_sp_left;	2001	--op->contr->weapon_sp_left;
…		…
2018	}	2013	}
2019		2014
2020	bool	2015	bool
2021	move_player (object *op, int dir)	2016	move_player (object *op, int dir)
2022	{	2017	{
2023	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2018	if (!op->map \|\| op->map->state != MAP_ACTIVE)
2024	return 0;	2019	return 0;
2025		2020
2026	/* Sanity check: make sure dir is valid */	2021	/* Sanity check: make sure dir is valid */
2027	if ((dir < 0) \|\| (dir >= 9))	2022	if (dir < 0 \|\| dir > 8)
2028	{	2023	{
2029	LOG (llevError, "move_player: invalid direction %d\n", dir);	2024	LOG (llevError, "move_player: invalid direction %d\n", dir);
2030	return 0;	2025	return 0;
2031	}	2026	}
2032		2027
2033	/* peterm: added following line */	2028	/* peterm: added following line */
2034	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2029	if (op->flag [FLAG_CONFUSED] && dir)
2035	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2030	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2036		2031
2037	op->facing = dir;	2032	op->facing = dir;
2038		2033
2039	if (op->flag [FLAG_HIDDEN])	2034	if (op->flag [FLAG_HIDDEN])
…		…
2079	* players.	2074	* players.
2080	*/	2075	*/
2081	bool	2076	bool
2082	handle_newcs_player (object *op)	2077	handle_newcs_player (object *op)
2083	{	2078	{
2084	if (QUERY_FLAG (op, FLAG_SCARED))	2079	if (op->flag [FLAG_SCARED])
2085	{	2080	{
2086	if (op->speed_left > 0.f)	2081	if (op->speed_left > 0.f)
2087	{	2082	{
2088	--op->speed_left;	2083	--op->speed_left;
2089	flee_player (op);	2084	flee_player (op);
…		…
2108	}	2103	}
2109		2104
2110	static int	2105	static int
2111	save_life (object *op)	2106	save_life (object *op)
2112	{	2107	{
2113	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2108	if (!op->flag [FLAG_LIFESAVE])
2114	return 0;	2109	return 0;
2115		2110
2116	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2111	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2117	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2112	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2118	{	2113	{
2119	op->play_sound (sound_find ("ob_evaporate"));	2114	op->play_sound (sound_find ("ob_evaporate"));
2120	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2115	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2121		2116
2122	tmp->destroy ();	2117	tmp->destroy ();
2123	CLEAR_FLAG (op, FLAG_LIFESAVE);	2118	op->clr_flag (FLAG_LIFESAVE);
2124		2119
2125	if (op->stats.hp < 0)	2120	if (op->stats.hp < 0)
2126	op->stats.hp = op->stats.maxhp;	2121	op->stats.hp = op->stats.maxhp;
2127		2122
2128	if (op->stats.food < 0)	2123	if (op->stats.food < 0)
2129	op->stats.food = 999;	2124	op->stats.food = MAX_FOOD;
2130		2125
2131	op->update_stats ();	2126	op->update_stats ();
2132	return 1;	2127	return 1;
2133	}	2128	}
2134		2129
2135	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2130	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2136	CLEAR_FLAG (op, FLAG_LIFESAVE);	2131	op->clr_flag (FLAG_LIFESAVE);
2137	enter_player_savebed (op); /* bring him home. */	2132	enter_player_savebed (op); /* bring him home. */
2138	return 0;	2133	return 0;
2139	}	2134	}
2140		2135
2141	/* This goes throws the inventory and removes unpaid objects, and puts them	2136	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2148	{	2143	{
2149	while (op)	2144	while (op)
2150	{	2145	{
2151	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2146	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2152		2147
2153	if (QUERY_FLAG (op, FLAG_UNPAID))	2148	if (op->flag [FLAG_UNPAID])
2154	op->insert_at (env);	2149	op->insert_at (env);
2155	else if (op->inv)	2150	else if (op->inv)
2156	drop_unpaid_items (op->inv, env);	2151	drop_unpaid_items (op->inv, env);
2157		2152
2158	op = next;	2153	op = next;
…		…
2169	void	2164	void
2170	do_some_living (object *op)	2165	do_some_living (object *op)
2171	{	2166	{
2172	int last_food = op->stats.food;	2167	int last_food = op->stats.food;
2173	int gen_hp, gen_sp, gen_grace;	2168	int gen_hp, gen_sp, gen_grace;
2174	int over_hp, over_sp, over_grace;
2175	int i;
2176	int rate_hp = 1200;	2169	int rate_hp = 1200;
2177	int rate_sp = 2500;	2170	int rate_sp = 2500;
2178	int rate_grace = 2000;	2171	int rate_grace = 2000;
2179	const int max_hp = 1;	2172	const int max_hp = 1;
2180	const int max_sp = 1;	2173	const int max_sp = 1;
…		…
2185	op->invisible = 1000;	2178	op->invisible = 1000;
2186	/* the socket code flashes the player visible/invisible	2179	/* the socket code flashes the player visible/invisible
2187	* depending on the value of invisible, so we need to	2180	* depending on the value of invisible, so we need to
2188	* alternate it here for it to work correctly.	2181	* alternate it here for it to work correctly.
2189	*/	2182	*/
2190	if (pticks & 2)	2183	if (server_tick & 2)
2191	op->invisible--;	2184	op->invisible--;
2192	}	2185	}
2193	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2186	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2194	{	2187	{
2195	if (!op->invisible--)	2188	if (!op->invisible--)
2196	{	2189	{
2197	make_visible (op);	2190	make_visible (op);
2198	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2191	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2232	if (--op->last_grace < 0)	2225	if (--op->last_grace < 0)
2233	{	2226	{
2234	if (op->stats.grace < op->stats.maxgrace / 2)	2227	if (op->stats.grace < op->stats.maxgrace / 2)
2235	op->stats.grace++; /* no penalty in food for regaining grace */	2228	op->stats.grace++; /* no penalty in food for regaining grace */
2236		2229
		2230	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2231
2237	if (max_grace > 1)	2232	if (max_grace > 1)
2238	{	2233	{
2239	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2234	int over_grace = temp / rate_grace;
		2235
2240	if (over_grace > 0)	2236	if (over_grace > 0)
2241	{	2237	{
2242	op->stats.sp += over_grace	2238	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2243	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2244	op->last_grace = 0;	2239	op->last_grace = 0;
2245	}	2240	}
2246	else	2241	else
2247	{	2242	op->last_grace = rate_grace / temp;
2248	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2249	}
2250	}	2243	}
2251	else	2244	else
2252	{	2245	op->last_grace = rate_grace / temp;
2253	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2246
2254	}
2255	/* wearing stuff doesn't detract from grace generation. */	2247	/* wearing stuff doesn't detract from grace generation. */
2256	}	2248	}
2257		2249
2258	if (op->stats.food > 0)	2250	if (op->stats.food > 0)
2259	{	2251	{
…		…
2265	if (op->stats.sp < op->stats.maxsp)	2257	if (op->stats.sp < op->stats.maxsp)
2266	{	2258	{
2267	op->stats.sp++;	2259	op->stats.sp++;
2268		2260
2269	/* dms do not consume food */	2261	/* dms do not consume food */
2270	if (!QUERY_FLAG (op, FLAG_WIZ))	2262	if (!op->flag [FLAG_WIZ])
2271	{	2263	{
2272	op->stats.food--;	2264	op->stats.food--;
2273		2265
2274	if (op->contr->digestion < 0)	2266	if (op->contr->digestion < 0)
2275	op->stats.food += op->contr->digestion;	2267	op->stats.food += op->contr->digestion;
…		…
2278	}	2270	}
2279	}	2271	}
2280		2272
2281	if (max_sp > 1)	2273	if (max_sp > 1)
2282	{	2274	{
2283	over_sp = (gen_sp + 10) / rate_sp;	2275	int over_sp = (gen_sp + 10) / rate_sp;
2284	if (over_sp > 0)	2276	if (over_sp > 0)
2285	{	2277	{
2286	if (op->stats.sp < op->stats.maxsp)	2278	if (op->stats.sp < op->stats.maxsp)
2287	{	2279	{
2288	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2280	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2309	if (op->stats.hp < op->stats.maxhp)	2301	if (op->stats.hp < op->stats.maxhp)
2310	{	2302	{
2311	op->stats.hp++;	2303	op->stats.hp++;
2312		2304
2313	/* dms do not consume food */	2305	/* dms do not consume food */
2314	if (!QUERY_FLAG (op, FLAG_WIZ))	2306	if (!op->flag [FLAG_WIZ])
2315	{	2307	{
2316	op->stats.food--;	2308	op->stats.food--;
2317		2309
2318	if (op->contr->digestion < 0)	2310	if (op->contr->digestion < 0)
2319	op->stats.food += op->contr->digestion;	2311	op->stats.food += op->contr->digestion;
2320	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2312	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2321	op->stats.food = last_food;	2313	op->stats.food = last_food;
2322	}	2314	}
2323	}	2315	}
2324		2316
		2317	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2318
2325	if (max_hp > 1)	2319	if (max_hp > 1)
2326	{	2320	{
2327	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2321	int over_hp = temp / rate_hp;
2328		2322
2329	if (over_hp > 0)	2323	if (over_hp > 0)
2330	{	2324	{
2331	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2325	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2332	op->last_heal = 0;	2326	op->last_heal = 0;
2333	}	2327	}
2334	else	2328	else
2335	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2329	op->last_heal = rate_hp / temp;
2336	}	2330	}
2337	else	2331	else
2338	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2332	op->last_heal = rate_hp / temp;
2339	}	2333	}
2340	}	2334	}
2341		2335
2342	/* Digestion */	2336	/* Digestion */
2343	if (--op->last_eat < 0)	2337	if (--op->last_eat < 0)
…		…
2346	penalty = max (0, -op->contr->digestion);	2340	penalty = max (0, -op->contr->digestion);
2347		2341
2348	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2342	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2349		2343
2350	/* dms do not consume food */	2344	/* dms do not consume food */
2351	if (!QUERY_FLAG (op, FLAG_WIZ))	2345	if (!op->flag [FLAG_WIZ])
2352	op->stats.food--;	2346	op->stats.food--;
2353	}	2347	}
2354		2348
2355	if (op->stats.food < 0 && op->stats.hp >= 0)	2349	if (op->stats.food < 0 && op->stats.hp >= 0)
2356	{	2350	{
2357	object *flesh = 0;	2351	object *flesh = 0;
2358		2352
2359	for_inv_removable (op, tmp)	2353	for_inv_removable (op, tmp)
2360	{	2354	{
2361	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2355	if (tmp->flag [FLAG_UNPAID])
2362	continue;	2356	continue;
2363		2357
2364	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2358	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2365	{	2359	{
2366	op->statusmsg ("You blindly grab for a bite of food. "	2360	op->statusmsg ("You blindly grab for a bite of food. "
2367	"H<To prevent you from starving, you ate some random item from your backpack.>");	2361	"H<To prevent you from starving, you ate some random item from your backpack.>");
2368	manual_apply (op, tmp, 0);	2362	op->apply (tmp);
2369		2363
2370	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2364	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2371	break;	2365	break;
2372	}	2366	}
2373	else if (tmp->type == FLESH)	2367	else if (tmp->type == FLESH)
…		…
2379	*/	2373	*/
2380	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2374	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2381	{	2375	{
2382	op->statusmsg ("You blindly grab for a bite of food. "	2376	op->statusmsg ("You blindly grab for a bite of food. "
2383	"H<To prevent you from starving, you ate some random item from your backpack.>");	2377	"H<To prevent you from starving, you ate some random item from your backpack.>");
2384	manual_apply (op, flesh, 0);	2378	op->apply (flesh);
2385	}	2379	}
2386		2380
2387	// If player is still starving, alert him!	2381	// If player is still starving, alert him!
2388	if (op->stats.food < 0)	2382	if (op->stats.food < 0)
2389	op->failmsg ("You are starving! "	2383	op->failmsg ("You are starving! "
…		…
2401	op->contr->killer->destroy ();	2395	op->contr->killer->destroy ();
2402	}	2396	}
2403	}	2397	}
2404		2398
2405	/* killer should be set here already */	2399	/* killer should be set here already */
2406	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2400	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2407	kill_player (op);	2401	kill_player (op);
2408	}	2402	}
2409	}	2403	}
2410		2404
2411	/* If the player should die (lack of hp, food, etc), we call this.	2405	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2445	cure_disease (op, 0, 0); /* remove any disease */	2439	cure_disease (op, 0, 0); /* remove any disease */
2446		2440
2447	max_it (op->stats.hp , op->stats.maxhp);	2441	max_it (op->stats.hp , op->stats.maxhp);
2448	max_it (op->stats.sp , op->stats.maxsp);	2442	max_it (op->stats.sp , op->stats.maxsp);
2449	max_it (op->stats.grace, op->stats.maxgrace);	2443	max_it (op->stats.grace, op->stats.maxgrace);
2450
2451	if (op->stats.food <= 0)	2444	max_it (op->stats.food , 200);
2452	op->stats.food = 999;
2453		2445
2454	// remove all spell effects that are active	2446	// remove all spell effects that are active
2455	// to avoid long-term effects such as word-of-recall	2447	// to avoid long-term effects such as word-of-recall
2456	for (object *item = op->inv; item; )	2448	for (object *item = op->inv; item; )
2457	{	2449	{
…		…
2470	if (op_on_battleground (op, &x, &y))	2462	if (op_on_battleground (op, &x, &y))
2471	{	2463	{
2472	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2464	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2473		2465
2474	/* create a bodypart-trophy to make the winner happy */	2466	/* create a bodypart-trophy to make the winner happy */
2475	if (object *tmp = arch_to_object (archetype::find (shstr_finger)))	2467	object *tmp = archetype::find (shstr_finger)->instance ();
2476	{	2468
2477	tmp->name = format ("%s's finger" , &op->name);	2469	tmp->name = format ("%s's finger" , &op->name);
2478	tmp->name_pl = format ("%s's fingers", &op->name);	2470	tmp->name_pl = format ("%s's fingers", &op->name);
2479	tmp->msg = format (	2471	tmp->msg = format (
2480	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2472	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2481	&op->name, op->contr->title,	2473	&op->name, op->contr->title,
2482	(int)op->level,	2474	(int)op->level,
2483	op->contr->killer_name ()	2475	op->contr->killer_name ()
2484	);	2476	);
2485	tmp->value = 0, tmp->type = 0;	2477	tmp->value = 0, tmp->type = 0;
2486	tmp->materialname = "organics";	2478	tmp->material = name_to_material (shstr_organic);
2487	tmp->insert_at (op, tmp);	2479	tmp->insert_at (op, tmp);
2488	}
2489		2480
2490	/* teleport defeated player to new destination */	2481	/* teleport defeated player to new destination */
2491	transfer_ob (op, x, y, 0, NULL);	2482	transfer_ob (op, x, y, 0, NULL);
2492	op->contr->braced = 0;	2483	op->contr->braced = 0;
2493		2484
…		…
2561	object *dep;	2552	object *dep;
2562		2553
2563	dep = present_arch_in_ob (deparch, op);	2554	dep = present_arch_in_ob (deparch, op);
2564	if (!dep)	2555	if (!dep)
2565	{	2556	{
2566	dep = arch_to_object (deparch);	2557	dep = deparch->instance ();
2567	insert_ob_in_ob (dep, op);	2558	insert_ob_in_ob (dep, op);
2568	}	2559	}
2569	lose_this_stat = 1;	2560	lose_this_stat = 1;
2570	if (settings.balanced_stat_loss)	2561	if (settings.balanced_stat_loss)
2571	{	2562	{
…		…
2609	* difference.	2600	* difference.
2610	*/	2601	*/
2611	if (this_stat >= -50)	2602	if (this_stat >= -50)
2612	{	2603	{
2613	change_attr_value (&(dep->stats), i, -1);	2604	change_attr_value (&(dep->stats), i, -1);
2614	SET_FLAG (dep, FLAG_APPLIED);	2605	dep->set_flag (FLAG_APPLIED);
2615	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2606	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2616	op->update_stats ();	2607	op->update_stats ();
2617	lost_a_stat = 1;	2608	lost_a_stat = 1;
2618	}	2609	}
2619	}	2610	}
…		…
2637	#endif	2628	#endif
2638		2629
2639	/* Put a gravestone up where the character 'almost' died. List the	2630	/* Put a gravestone up where the character 'almost' died. List the
2640	* exp loss on the stone.	2631	* exp loss on the stone.
2641	*/	2632	*/
2642	tmp = arch_to_object (archetype::find (shstr_gravestone));	2633	tmp = archetype::find (shstr_gravestone)->instance ();
2643	tmp->name = format ("%s's gravestone", &op->name);	2634	tmp->name = format ("%s's gravestone", &op->name);
2644	tmp->name_pl = format ("%s's gravestones", &op->name);	2635	tmp->name_pl = format ("%s's gravestones", &op->name);
2645	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2636	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2646	&op->name, op->contr->title, op->contr->killer_name ());	2637	&op->name, op->contr->title, op->contr->killer_name ());
2647	tmp->x = op->x, tmp->y = op->y;	2638	tmp->x = op->x, tmp->y = op->y;
…		…
2686	if (will_kill_again)	2677	if (will_kill_again)
2687	{	2678	{
2688	object *force;	2679	object *force;
2689	int at;	2680	int at;
2690		2681
2691	force = get_archetype (FORCE_NAME);	2682	force = archetype::get (FORCE_NAME);
2692	/* 50 ticks should be enough time for the spell to abate */	2683	/* 50 ticks should be enough time for the spell to abate */
2693	force->speed = 0.1f;
2694	force->speed_left = -5.f;	2684	force->speed_left = -5.f;
2695	SET_FLAG (force, FLAG_APPLIED);	2685	force->set_speed (0.1f);
		2686	force->set_flag (FLAG_APPLIED);
		2687
2696	for (at = 0; at < NROFATTACKS; at++)	2688	for (at = 0; at < NROFATTACKS; at++)
2697	if (will_kill_again & (1 << at))	2689	if (will_kill_again & (1 << at))
2698	force->resist[at] = 100;	2690	force->resist[at] = 100;
2699		2691
2700	insert_ob_in_ob (force, op);	2692	insert_ob_in_ob (force, op);
…		…
2705	}	2697	}
2706		2698
2707	static void	2699	static void
2708	loot_object (object *op)	2700	loot_object (object *op)
2709	{ /* Grab and destroy some treasure */	2701	{ /* Grab and destroy some treasure */
2710	object tmp, tmp2, *next;	2702	object tmp, next;
2711		2703
2712	op->close_container (); /* close open sack first */	2704	op->close_container (); /* close open sack first */
2713		2705
2714	for (tmp = op->inv; tmp; tmp = next)	2706	for (tmp = op->inv; tmp; tmp = next)
2715	{	2707	{
…		…
2722	tmp->x = op->x, tmp->y = op->y;	2714	tmp->x = op->x, tmp->y = op->y;
2723		2715
2724	if (tmp->type == CONTAINER)	2716	if (tmp->type == CONTAINER)
2725	loot_object (tmp); /* empty container to ground */	2717	loot_object (tmp); /* empty container to ground */
2726		2718
2727	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))	2719	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] \|\| tmp->flag [FLAG_NO_DROP] \|\| !(rndm (3))))
2728	{	2720	{
2729	if (tmp->nrof > 1)	2721	if (tmp->nrof > 1)
2730	{	2722	{
2731	tmp->decrease (rndm (1, tmp->nrof - 1));	2723	tmp->decrease (rndm (1, tmp->nrof - 1));
2732	insert_ob_in_map (tmp, op->map, NULL, 0);	2724	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2743	* fix_weight(): Check recursively the weight of all players, and fix	2735	* fix_weight(): Check recursively the weight of all players, and fix
2744	* what needs to be fixed. Refresh windows and fix speed if anything	2736	* what needs to be fixed. Refresh windows and fix speed if anything
2745	* was changed.	2737	* was changed.
2746	*/	2738	*/
2747	void	2739	void
2748	fix_weight (void)	2740	fix_weight ()
2749	{	2741	{
2750	for_all_players (pl)	2742	for_all_players (pl)
2751	{	2743	{
2752	sint32 old = pl->ob->carrying;	2744	sint32 old = pl->ob->carrying;
2753		2745
…		…
2760	}	2752	}
2761	}	2753	}
2762	}	2754	}
2763		2755
2764	void	2756	void
2765	fix_luck (void)	2757	fix_luck ()
2766	{	2758	{
2767	for_all_players (pl)	2759	for_all_players (pl)
2768	if (!pl->ob->contr->ns->state)	2760	if (!pl->ob->contr->ns->state)
2769	pl->ob->change_luck (0);	2761	pl->ob->change_luck (0);
2770	}	2762	}
…		…
2822	}	2814	}
2823		2815
2824	int	2816	int
2825	is_true_undead (object *op)	2817	is_true_undead (object *op)
2826	{	2818	{
2827	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2819	if (op->arch->flag [FLAG_UNDEAD])
2828	return 1;	2820	return 1;
2829		2821
2830	return 0;	2822	return 0;
2831	}	2823	}
2832		2824
…		…
2930		2922
2931	if (who->type == PLAYER)	2923	if (who->type == PLAYER)
2932	player = 1;	2924	player = 1;
2933		2925
2934	else	2926	else
2935	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2927	friendly = who->flag [FLAG_FRIENDLY];
2936		2928
2937	/* search adjacent squares */	2929	/* search adjacent squares */
2938	for (i = 1; i < 9; i++)	2930	for (i = 1; i < 9; i++)
2939	{	2931	{
2940	x = who->x + freearr_x[i];	2932	x = who->x + freearr_x[i];
…		…
2949	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2941	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2950	continue;	2942	continue;
2951		2943
2952	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2944	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2953	{	2945	{
2954	if ((player \|\|friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2946	if ((player \|\|friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2955	return 1;	2947	return 1;
2956	else if (tmp->type == PLAYER)	2948	else if (tmp->type == PLAYER)
2957	{	2949	{
2958	/don't let a hidden DM prevent you from hiding /	2950	/don't let a hidden DM prevent you from hiding /
2959	if (!QUERY_FLAG (tmp, FLAG_WIZ) \|\| tmp->contr->hidden == 0)	2951	if (!tmp->flag [FLAG_WIZ] \|\| tmp->contr->hidden == 0)
2960	return 1;	2952	return 1;
2961	}	2953	}
2962	}	2954	}
2963	}	2955	}
2964	return 0;	2956	return 0;
…		…
3033	* and the exit-coordinates sp/hp must both be > 0.	3025	* and the exit-coordinates sp/hp must both be > 0.
3034	* => The intention here is to prevent abuse of the battleground-	3026	* => The intention here is to prevent abuse of the battleground-
3035	* feature (like pickable or hidden battleground tiles). */	3027	* feature (like pickable or hidden battleground tiles). */
3036	for (object *tmp = op->below; tmp; tmp = tmp->below)	3028	for (object *tmp = op->below; tmp; tmp = tmp->below)
3037	{	3029	{
3038	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3030	if (tmp->flag [FLAG_IS_FLOOR])
3039	{	3031	{
3040	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3032	if (tmp->flag [FLAG_NO_PICK]
3041	&& tmp->type == BATTLEGROUND	3033	&& tmp->type == BATTLEGROUND
3042	&& tmp->name == shstr_battleground	3034	&& tmp->name == shstr_battleground
3043	&& EXIT_X (tmp) && EXIT_Y (tmp))	3035	&& EXIT_X (tmp) && EXIT_Y (tmp))
3044	{	3036	{
3045	/* before we assign the exit, check if this is a teambattle */	3037	/* before we assign the exit, check if this is a teambattle */
3046	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3038	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3047	{
3048	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3039	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3040	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3049	{	3041	{
3050	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3051	{
3052	if (x && y)	3042	if (x && y)
3053	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);	3043	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);
3054		3044
3055	return 1;	3045	return 1;
3056	}
3057	}	3046	}
3058	}
3059		3047
3060	if (x && y)	3048	if (x && y)
3061	x = EXIT_X (tmp), y = EXIT_Y (tmp);	3049	x = EXIT_X (tmp), y = EXIT_Y (tmp);
3062		3050
3063	return 1;	3051	return 1;
…		…
3201	else	3189	else
3202	j = 1;	3190	j = 1;
3203	strcat (buf, spellpathnames[i]);	3191	strcat (buf, spellpathnames[i]);
3204	}	3192	}
3205	}	3193	}
		3194
3206	strcat (buf, ".");	3195	strcat (buf, ".");
3207	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);	3196	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);
3208	}	3197	}
3209		3198
3210	/* evtl. adding flags: */	3199	/* evtl. adding flags: */
3211	if (QUERY_FLAG (item, FLAG_XRAYS))	3200	if (item->flag [FLAG_XRAYS])
3212	SET_FLAG (skin, FLAG_XRAYS);	3201	skin->set_flag (FLAG_XRAYS);
3213	if (QUERY_FLAG (item, FLAG_STEALTH))	3202	if (item->flag [FLAG_STEALTH])
3214	SET_FLAG (skin, FLAG_STEALTH);	3203	skin->set_flag (FLAG_STEALTH);
3215	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3204	if (item->flag [FLAG_SEE_IN_DARK])
3216	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3205	skin->set_flag (FLAG_SEE_IN_DARK);
3217		3206
3218	/* print message if there is one */	3207	/* print message if there is one */
3219	if (item->msg != NULL)	3208	if (item->msg != NULL)
3220	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3209	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3221	}	3210	}
3222	else	3211	else
3223	{	3212	{
3224	/* generate misc. treasure */	3213	/* generate misc. treasure */
3225	tmp = arch_to_object (tr->item);	3214	tmp = tr->item->instance ();
3226	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3215	new_draw_info_format (NDI_UNIQUE \| NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3227	who->insert (tmp);	3216	who->insert (tmp);
3228	}	3217	}
3229	}
3230
3231	/**
3232	* Unready an object for a player. This function does nothing if the object was
3233	* not readied.
3234	*/
3235	void
3236	player_unready_range_ob (player pl, object ob)
3237	{
3238	if (pl->ob->current_weapon == ob)
3239	pl->ob->current_weapon = 0;
3240
3241	if (pl->combat_ob == ob)
3242	pl->combat_ob = 0;
3243
3244	if (pl->ranged_ob == ob)
3245	pl->ranged_ob = 0;
3246	}	3218	}
3247		3219
3248	//-GPL	3220	//-GPL
3249		3221
3250	sint8	3222	sint8
…		…
3280	{	3252	{
3281	play_sound (sound_find ("generic_failure"));	3253	play_sound (sound_find ("generic_failure"));
3282	statusmsg (msg, color);	3254	statusmsg (msg, color);
3283	}	3255	}
3284		3256
		3257	void
		3258	object::failmsgf (const char *format, ...)
		3259	{
		3260	if (!contr)
		3261	return;
		3262
		3263	va_list ap;
		3264	va_start (ap, format);
		3265	contr->failmsg (vformat (format, ap));
		3266	va_end (ap);
		3267	}
		3268
		3269	void
		3270	player::failmsgf (const char *format, ...)
		3271	{
		3272	va_list ap;
		3273	va_start (ap, format);
		3274	failmsg (vformat (format, ap));
		3275	va_end (ap);
		3276	}
		3277

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC vs. Revision 1.290 by root, Mon Oct 29 23:55:55 2012 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC vs.
Revision 1.290 by root, Mon Oct 29 23:55:55 2012 UTC