ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.239 by root, Fri Nov 6 12:27:06 2009 UTC vs.
Revision 1.278 by root, Sun May 9 22:33:29 2010 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 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.
…		…
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->set_speed (1.0f);
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, mflags, blocked;
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	}
…		…
588	if (op->nrof > 1)	554	if (op->nrof > 1)
589	op->nrof = 1;	555	op->nrof = 1;
590	}	556	}
591		557
592	if (op->type == SPELLBOOK && op->inv)	558	if (op->type == SPELLBOOK && op->inv)
593	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	559	op->inv->clr_flag (FLAG_STARTEQUIP);
594		560
595	/* Give starting characters identified, uncursed, and undamned	561	/* Give starting characters identified, uncursed, and undamned
596	* items. Just don't identify gold or silver, or it won't be	562	* items. Just don't identify gold or silver, or it won't be
597	* merged properly.	563	* merged properly.
598	*/	564	*/
599	if (need_identify (op))	565	if (op->need_identify ())
600	{	566	{
601	SET_FLAG (op, FLAG_IDENTIFIED);	567	op->set_flag (FLAG_IDENTIFIED);
602	CLEAR_FLAG (op, FLAG_CURSED);	568	op->clr_flag (FLAG_CURSED);
603	CLEAR_FLAG (op, FLAG_DAMNED);	569	op->clr_flag (FLAG_DAMNED);
604	}	570	}
605		571
606	if (op->type == SPELL)	572	if (op->type == SPELL)
607	{	573	{
608	op->destroy ();	574	op->destroy ();
609	continue;	575	continue;
610	}	576	}
611	else if (op->type == SKILL)	577	else if (op->type == SKILL)
612	{	578	{
613	SET_FLAG (op, FLAG_CAN_USE_SKILL);	579	op->set_flag (FLAG_CAN_USE_SKILL);
614	op->stats.exp = 0;	580	op->stats.exp = 0;
615	op->level = 1;	581	op->level = 1;
616	}	582	}
617	else /* lock all 'normal items by default */	583	else /* lock all 'normal items by default */
618	SET_FLAG (op, FLAG_INV_LOCKED);	584	op->set_flag (FLAG_INV_LOCKED);
619	} /* for loop of objects in player inv */	585	} /* for loop of objects in player inv */
620		586
621	/* Need to set up the skill pointers */	587	/* Need to set up the skill pointers */
622	pl->contr->link_skills ();	588	pl->contr->link_skills ();
623	}	589	}
…		…
637	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	603	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
638	}	604	}
639		605
640	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	606	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
641	static int	607	static int
642	roll_stat (void)	608	roll_stat ()
643	{	609	{
644	int a[4], i, j, k;	610	int a[4], i, j, k;
645		611
646	for (i = 0; i < 4; i++)	612	for (i = 0; i < 4; i++)
647	a[i] = (int) rndm (6) + 1;	613	a[i] = rndm (1, 6);
648		614
649	for (i = 0, j = 0, k = 7; i < 4; i++)	615	for (i = 0, j = 0, k = 7; i < 4; i++)
650	if (a[i] < k)	616	if (a[i] < k)
651	k = a[i], j = i;	617	k = a[i], j = i;
652		618
…		…
744	player::chargen_race_done ()	710	player::chargen_race_done ()
745	{	711	{
746	/* this must before then initial items are given */	712	/* this must before then initial items are given */
747	esrv_new_player (ob->contr);	713	esrv_new_player (ob->contr);
748		714
749	treasurelist *tl = treasurelist::find ("starting_wealth");	715	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
750	if (tl)	716	if (tl)
751	create_treasure (tl, ob, 0, 0, 0);	717	create_treasure (tl, ob, 0, 0, 0);
752		718
753	INVOKE_PLAYER (BIRTH, ob->contr);	719	INVOKE_PLAYER (BIRTH, ob->contr);
754	INVOKE_PLAYER (LOGIN, ob->contr);
755		720
756	ob->contr->ns->state = ST_PLAYING;	721	ob->contr->ns->state = ST_PLAYING;
757		722
758	if (ob->msg)	723	if (ob->msg)
759	ob->msg = 0;	724	ob->msg = 0;
760		725
761	start_info (ob);	726	start_info (ob);
762	CLEAR_FLAG (ob, FLAG_WIZ);	727	ob->clr_flag (FLAG_WIZ);
763	give_initial_items (ob, ob->randomitems);	728	give_initial_items (ob, ob->randomitems);
764	esrv_send_inventory (ob, ob);	729	esrv_send_inventory (ob, ob);
765	ob->update_stats ();	730	ob->update_stats ();
766		731
767	/* This moves the player to a different start map, if there	732	/* This moves the player to a different start map, if there
…		…
807	ob->stats.hp = ob->stats.maxhp;	772	ob->stats.hp = ob->stats.maxhp;
808	ob->stats.sp = ob->stats.maxsp;	773	ob->stats.sp = ob->stats.maxsp;
809	ob->stats.grace = 0;	774	ob->stats.grace = 0;
810	}	775	}
811		776
812	void	777	static void
813	flee_player (object *op)	778	flee_player (object *op)
814	{	779	{
815	int dir, diff;	780	int dir, diff;
816	rv_vector rv;	781	rv_vector rv;
817		782
818	if (op->stats.hp < 0)	783	if (op->stats.hp < 0)
819	{	784	{
820	LOG (llevDebug, "Fleeing player is dead.\n");	785	LOG (llevDebug, "Fleeing player is dead.\n");
821	CLEAR_FLAG (op, FLAG_SCARED);	786	op->clr_flag (FLAG_SCARED);
822	return;	787	return;
823	}	788	}
824		789
825	if (!op->enemy)	790	if (!op->enemy)
826	{	791	{
827	LOG (llevDebug, "Fleeing player had no enemy.\n");	792	LOG (llevDebug, "Fleeing player had no enemy.\n");
828	CLEAR_FLAG (op, FLAG_SCARED);	793	op->clr_flag (FLAG_SCARED);
829	return;	794	return;
830	}	795	}
831		796
832	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	797	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
833	{	798	{
834	op->enemy = NULL;	799	op->enemy = NULL;
835	CLEAR_FLAG (op, FLAG_SCARED);	800	op->clr_flag (FLAG_SCARED);
836	return;	801	return;
837	}	802	}
838		803
839	get_rangevector (op, op->enemy, &rv, 0);	804	get_rangevector (op, op->enemy, &rv, 0);
840		805
841	dir = absdir (4 + rv.direction);	806	dir = absdir (4 + rv.direction);
842	for (diff = 0; diff < 3; diff++)	807	for (diff = 0; diff < 3; diff++)
843	{	808	{
844	int m = 1 - rndm (2) * 2;	809	int m = 1 - rndm (2) * 2;
845		810
846	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	811	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
847	return;	812	return;
848	}	813	}
849		814
850	/* Cornered, get rid of scared */	815	/* Cornered, get rid of scared */
851	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
852	op->enemy = NULL;	817	op->enemy = NULL;
853	}	818	}
854		819
855	/* check_pick sees if there is stuff to be picked up/picks up stuff.	820	/* 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	821	* It returns 1 if the player should keep on moving, 0 if he should
…		…
861	{	826	{
862	object *tmp, *next;	827	object *tmp, *next;
863	int stop = 0;	828	int stop = 0;
864	int wvratio;	829	int wvratio;
865		830
866	/* if you're flying, you cna't pick up anything */	831	/* if you're flying, you can't pick up anything */
867	if (op->move_type & MOVE_FLYING)	832	if (op->move_type & MOVE_FLYING)
868	return 1;	833	return 1;
869		834
870	next = op->below;	835	next = op->below;
871		836
872	int cnt = MAX_ITEM_PER_DROP;	837	int cnt = MAX_ITEM_PER_ACTION;
873	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	838	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
874		839
875	/* loop while there are items on the floor that are not marked as	840	/* loop while there are items on the floor that are not marked as
876	* destroyed */	841	* destroyed */
877	while (next && !next->destroyed ())	842	while (next && !next->destroyed ())
…		…
903	if (op->contr->mode & PU_DEBUG)	868	if (op->contr->mode & PU_DEBUG)
904	{	869	{
905	/* some debugging code to figure out item information */	870	/* some debugging code to figure out item information */
906	const char *str = tmp->name	871	const char *str = tmp->name
907	? format ("item name: %s item type: %d weight/value: %d",	872	? format ("item name: %s item type: %d weight/value: %d",
908	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	873	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
909	: format ("item name: %s item type: %d weight/value: %d",	874	: format ("item name: %s item type: %d weight/value: %d",
910	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	875	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
911		876
912	new_draw_info (NDI_UNIQUE, 0, op, str);	877	new_draw_info (NDI_UNIQUE, 0, op, str);
913	}	878	}
914		879
915	if (op->contr->mode & PU_INHIBIT)	880	if (op->contr->mode & PU_INHIBIT)
…		…
948	* fighting */	913	* fighting */
949	if (op->contr->mode & PU_INHIBIT)	914	if (op->contr->mode & PU_INHIBIT)
950	return 1;	915	return 1;
951		916
952	/* prevent us from turning into auto-thieves :) */	917	/* prevent us from turning into auto-thieves :) */
953	if (QUERY_FLAG (tmp, FLAG_UNPAID))	918	if (tmp->flag [FLAG_UNPAID])
954	continue;	919	continue;
955		920
956	/* ignore known cursed objects */	921	/* ignore known cursed objects */
957	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	922	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
958	continue;	923	continue;
959		924
960	/* all food and drink if desired */	925	/* all food and drink if desired */
961	/* question: don't pick up known-poisonous stuff? */	926	/* question: don't pick up known-poisonous stuff? */
962	if (op->contr->mode & PU_FOOD)	927	if (op->contr->mode & PU_FOOD)
…		…
965	CHK_PICK_PICKUP;	930	CHK_PICK_PICKUP;
966	continue;	931	continue;
967	}	932	}
968		933
969	if (op->contr->mode & PU_DRINK)	934	if (op->contr->mode & PU_DRINK)
970	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	935	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
971	{	936	{
972	CHK_PICK_PICKUP;	937	CHK_PICK_PICKUP;
973	continue;	938	continue;
974	}	939	}
975		940
…		…
1002	continue;	967	continue;
1003	}	968	}
1004		969
1005	/* wands/staves/rods/horns */	970	/* wands/staves/rods/horns */
1006	if (op->contr->mode & PU_MAGIC_DEVICE)	971	if (op->contr->mode & PU_MAGIC_DEVICE)
1007	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	972	if (tmp->type == WAND
		973	|| tmp->type == ROD
		974	|| tmp->type == HORN
		975	|| tmp->type == POWER_CRYSTAL)
1008	{	976	{
1009	CHK_PICK_PICKUP;	977	CHK_PICK_PICKUP;
1010	continue;	978	continue;
1011	}	979	}
1012		980
1013	/* pick up all magical items */	981	/* pick up all magical items */
1014	if (op->contr->mode & PU_MAGICAL)	982	if (op->contr->mode & PU_MAGICAL)
1015	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	983	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		984	&& !tmp->flag [FLAG_KNOWN_CURSED])
1016	{	985	{
1017	CHK_PICK_PICKUP;	986	CHK_PICK_PICKUP;
1018	continue;	987	continue;
1019	}	988	}
1020		989
…		…
1027	}	996	}
1028	}	997	}
1029		998
1030	/* rings & amulets - talismans seems to be typed AMULET */	999	/* rings & amulets - talismans seems to be typed AMULET */
1031	if (op->contr->mode & PU_JEWELS)	1000	if (op->contr->mode & PU_JEWELS)
1032	if (tmp->type == RING || tmp->type == AMULET)	1001	if (tmp->type == RING
		1002	|| tmp->type == AMULET
		1003	|| tmp->type == GIRDLE
		1004	|| tmp->type == SKILL_TOOL)
1033	{	1005	{
1034	CHK_PICK_PICKUP;	1006	CHK_PICK_PICKUP;
1035	continue;	1007	continue;
1036	}	1008	}
1037		1009
…		…
1086	CHK_PICK_PICKUP;	1058	CHK_PICK_PICKUP;
1087	continue;	1059	continue;
1088	}	1060	}
1089		1061
1090	if (op->contr->mode & PU_GLOVES)	1062	if (op->contr->mode & PU_GLOVES)
1091	if (tmp->type == GLOVES)	1063	if (tmp->type == GLOVES || tmp->type == BRACERS)
1092	{	1064	{
1093	CHK_PICK_PICKUP;	1065	CHK_PICK_PICKUP;
1094	continue;	1066	continue;
1095	}	1067	}
1096		1068
…		…
1101	continue;	1073	continue;
1102	}	1074	}
1103		1075
1104	/* hoping to catch throwing daggers here */	1076	/* hoping to catch throwing daggers here */
1105	if (op->contr->mode & PU_MISSILEWEAPON)	1077	if (op->contr->mode & PU_MISSILEWEAPON)
1106	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1078	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1107	{	1079	{
1108	CHK_PICK_PICKUP;	1080	CHK_PICK_PICKUP;
1109	continue;	1081	continue;
1110	}	1082	}
1111		1083
…		…
1146	fprintf (stderr, "%s", tmp->name);	1118	fprintf (stderr, "%s", tmp->name);
1147	}	1119	}
1148	else	1120	else
1149	fprintf (stderr, "%s", tmp->arch->archname);	1121	fprintf (stderr, "%s", tmp->arch->archname);
1150	fprintf (stderr, ",%d] = ", tmp->type);	1122	fprintf (stderr, ",%d] = ", tmp->type);
1151	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1123	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1152	#endif	1124	#endif
1153	CHK_PICK_PICKUP;	1125	CHK_PICK_PICKUP;
1154	continue;	1126	continue;
1155	}	1127	}
1156	} /* the new pickup model */	1128	} /* the new pickup model */
…		…
1163	* there is a possibility for our action distrubing our hiding	1135	* there is a possibility for our action distrubing our hiding
1164	* place or invisiblity spell. Artefact invisiblity causes	1136	* place or invisiblity spell. Artefact invisiblity causes
1165	* "noise" instead. If we arent invisible to begin with, we	1137	* "noise" instead. If we arent invisible to begin with, we
1166	* return 0.	1138	* return 0.
1167	*/	1139	*/
1168	int	1140	static int
1169	action_makes_visible (object *op)	1141	action_makes_visible (object *op)
1170	{	1142	{
1171	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	1143	if (op->invisible && op->flag [FLAG_ALIVE])
1172	{	1144	{
1173	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	1145	if (op->flag [FLAG_MAKE_INVIS])
1174	{	1146	{
1175	// artefact invisibility is permanent, but we still make noise	1147	// artefact invisibility is permanent, but we still make noise
1176	// this is important for game-balance.	1148	// this is important for game-balance.
1177	if (op->contr)	1149	if (op->contr)
1178	op->make_noise ();	1150	op->make_noise ();
…		…
1197	/*	1169	/*
1198	* Find an arrow in the inventory and after that	1170	* Find an arrow in the inventory and after that
1199	* in the right type container (quiver). Pointer to the	1171	* in the right type container (quiver). Pointer to the
1200	* found object is returned.	1172	* found object is returned.
1201	*/	1173	*/
1202	object *	1174	static object *
1203	find_arrow (object *op, const char *type)	1175	find_arrow (object *op, const char *type)
1204	{	1176	{
1205	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1177	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1206	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1178	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1207	return splay (tmp);	1179	return splay (tmp);
1208		1180
1209	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1181	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1210	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1182	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1211	if (object *arrow = find_arrow (tmp, type))	1183	if (object *arrow = find_arrow (tmp, type))
1212	{	1184	{
1213	splay (tmp);	1185	splay (tmp);
1214	return arrow;	1186	return arrow;
1215	}	1187	}
…		…
1221	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1193	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1222	* against the target. A full test is not performed, simply a basic test	1194	* against the target. A full test is not performed, simply a basic test
1223	* of resistances. The archer is making a quick guess at what he sees down	1195	* of resistances. The archer is making a quick guess at what he sees down
1224	* the hall. Failing that it does it's best to pick the highest plus arrow.	1196	* the hall. Failing that it does it's best to pick the highest plus arrow.
1225	*/	1197	*/
1226	object *	1198	static object *
1227	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1199	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1228	{	1200	{
1229	object *tmp = NULL, *arrow, *ntmp;	1201	object *tmp = NULL, *arrow, *ntmp;
1230	int attacknum, attacktype, betterby = 0, i;	1202	int attacknum, attacktype, betterby = 0, i;
1231		1203
1232	if (!type)	1204	if (!type)
1233	return NULL;	1205	return NULL;
1234		1206
1235	for (arrow = op->inv; arrow; arrow = arrow->below)	1207	for (arrow = op->inv; arrow; arrow = arrow->below)
1236	{	1208	{
1237	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1209	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1238	{	1210	{
1239	i = 0;	1211	i = 0;
1240	ntmp = find_better_arrow (arrow, target, type, &i);	1212	ntmp = find_better_arrow (arrow, target, type, &i);
1241		1213
1242	if (i > betterby)	1214	if (i > betterby)
…		…
1300	* find_better_arrow to find a decent arrow to use.	1272	* find_better_arrow to find a decent arrow to use.
1301	* op = the shooter	1273	* op = the shooter
1302	* type = bow->race	1274	* type = bow->race
1303	* dir = fire direction	1275	* dir = fire direction
1304	*/	1276	*/
1305	object *	1277	static object *
1306	pick_arrow_target (object *op, shstr_cmp type, int dir)	1278	pick_arrow_target (object *op, shstr_cmp type, int dir)
1307	{	1279	{
1308	object *tmp = NULL;	1280	object *tmp = NULL;
1309	maptile *m;	1281	maptile *m;
1310	int i, mflags, found, number;	1282	int i, mflags, found, number;
…		…
1343	break;	1315	break;
1344	}	1316	}
1345		1317
1346	if (mflags & P_IS_ALIVE)	1318	if (mflags & P_IS_ALIVE)
1347	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1319	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1348	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1320	if (tmp->flag [FLAG_ALIVE])
1349	break;	1321	break;
1350	}	1322	}
1351		1323
1352	if (!tmp)	1324	if (!tmp)
1353	return find_arrow (op, type);	1325	return find_arrow (op, type);
…		…
1414	{	1386	{
1415	if (op->type == PLAYER)	1387	if (op->type == PLAYER)
1416	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1388	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 */	1389	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1418	else	1390	else
1419	CLEAR_FLAG (op, FLAG_READY_BOW);	1391	op->clr_flag (FLAG_READY_BOW);
1420		1392
1421	return 0;	1393	return 0;
1422	}	1394	}
1423	}	1395	}
1424		1396
…		…
1473	#endif	1445	#endif
1474		1446
1475	SET_ANIMATION (arrow, arrow->direction);	1447	SET_ANIMATION (arrow, arrow->direction);
1476		1448
1477	/* update the speed */	1449	/* 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		1450
1481	arrow->set_speed (max (arrow->speed, 2.f));
1482	arrow->speed_left = 0;	1451	arrow->speed_left = 0;
		1452	arrow->set_speed (max (2.f,
		1453	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1454	+ bow->stats.dam / 7.f
		1455	));
1483		1456
1484	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1457	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1485		1458
1486	if (op->type == PLAYER)	1459	if (op->type == PLAYER)
1487	{	1460	{
…		…
1525	* but monsters can't. Putting that code here	1498	* but monsters can't. Putting that code here
1526	* makes the fire_bow code much cleaner.	1499	* makes the fire_bow code much cleaner.
1527	* this function should only be called if 'op' is a player,	1500	* this function should only be called if 'op' is a player,
1528	* hence the function name.	1501	* hence the function name.
1529	*/	1502	*/
1530	int	1503	static int
1531	player_fire_bow (object *op, int dir)	1504	player_fire_bow (object *op, int dir)
1532	{	1505	{
1533	int ret;	1506	int ret;
1534		1507
1535	if (op->contr->bowtype == bow_bestarrow)	1508	if (op->contr->bowtype == bow_bestarrow)
…		…
1563	}	1536	}
1564		1537
1565	/* Fires a misc (wand/rod/horn) object in 'dir'.	1538	/* Fires a misc (wand/rod/horn) object in 'dir'.
1566	* Broken apart from 'fire' to keep it more readable.	1539	* Broken apart from 'fire' to keep it more readable.
1567	*/	1540	*/
1568	void	1541	static void
1569	fire_misc_object (object *op, int dir)	1542	fire_misc_object (object *op, int dir)
1570	{	1543	{
1571	object *item = op->contr->ranged_ob;	1544	object *item = op->contr->ranged_ob;
1572		1545
1573	if (!item)	1546	if (!item)
…		…
1580	{	1553	{
1581	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1554	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1582	return;	1555	return;
1583	}	1556	}
1584		1557
1585	if (!op->change_weapon (item))	1558	if (!op->apply (item))
1586	return;	1559	return;
1587		1560
1588	if (item->type == WAND)	1561	if (item->type == WAND)
1589	{	1562	{
1590	if (item->stats.food <= 0)	1563	if (item->stats.food <= 0)
…		…
1595	return;	1568	return;
1596	}	1569	}
1597	}	1570	}
1598	else if (item->type == ROD || item->type == HORN)	1571	else if (item->type == ROD || item->type == HORN)
1599	{	1572	{
1600	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1573	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1601		1574
1602	// using the maximum of the rods charge allows at least one spell cast	1575	// using the maximum of the rods charge allows at least one spell cast
1603	// for a rod or horn, this fixes some broken rods.	1576	// for a rod or horn, this fixes some broken rods.
1604	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1577	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1605	{	1578	{
1606	op->contr->play_sound (sound_find ("wand_poof"));	1579	op->contr->play_sound (sound_find ("wand_poof"));
1607		1580
1608	if (item->type == ROD)	1581	if (item->type == ROD)
1609	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1582	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1624	{	1597	{
1625	object *tmp;	1598	object *tmp;
1626		1599
1627	if (item->arch)	1600	if (item->arch)
1628	{	1601	{
1629	CLEAR_FLAG (item, FLAG_ANIMATE);	1602	item->clr_flag (FLAG_ANIMATE);
1630	item->face = item->arch->face;	1603	item->face = item->arch->face;
1631	item->set_speed (0);	1604	item->set_speed (0);
1632	}	1605	}
1633		1606
1634	if (object *pl = item->visible_to ())	1607	if (object *pl = item->visible_to ())
…		…
1641	}	1614	}
1642		1615
1643	/* Received a fire command for the player - go and do it.	1616	/* Received a fire command for the player - go and do it.
1644	*/	1617	*/
1645	bool	1618	bool
1646	fire (object *op, int dir)	1619	fire (object *who, int dir)
1647	{	1620	{
1648	int spellcost = 0;	1621	int spellcost = 0;
1649		1622
1650	player *pl = op->contr;	1623	player *pl = who->contr;
1651		1624
1652	if (pl->golem)	1625	if (pl->golem)
1653	{	1626	{
1654	control_golem (op->contr->golem, dir);	1627	control_golem (who->contr->golem, dir);
1655	return false;	1628	return false;
1656	}	1629	}
1657		1630
1658	object *ob = pl->ranged_ob;	1631	object *ob = pl->ranged_ob;
1659		1632
1660	if (!ob)	1633	if (!ob)
1661	return false;	1634	return false;
1662		1635
1663	if (op->speed_left > 0.f)	1636	if (who->speed_left > 0.f)
1664	--op->speed_left;	1637	--who->speed_left;
1665	else	1638	else
1666	return false;	1639	return false;
1667		1640
1668	if (!op->change_weapon (ob))	1641	if (!who->apply (ob))
1669	return false;	1642	return false;
1670		1643
1671	/* check for loss of invisiblity/hide */	1644	/* check for loss of invisiblity/hide */
1672	if (action_makes_visible (op))	1645	if (action_makes_visible (who))
1673	make_visible (op);	1646	make_visible (who);
1674		1647
1675	switch (ob->type)	1648	switch (ob->type)
1676	{	1649	{
1677	case BOW:	1650	case BOW:
1678	player_fire_bow (op, dir);	1651	player_fire_bow (who, dir);
1679	break;	1652	break;
1680		1653
1681	case SPELL:	1654	case SPELL:
1682	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1655	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1683	break;	1656	break;
1684		1657
1685	case BUILDER:	1658	case BUILDER:
1686	apply_map_builder (op, dir);	1659	apply_map_builder (who, dir);
1687	break;	1660	break;
1688		1661
1689	case SKILL:	1662	case SKILL:
1690	do_skill (op, op, ob, dir, 0);	1663	do_skill (who, who, ob, dir, 0);
1691	break;	1664	break;
1692		1665
		1666	case RANGED:
		1667	do_skill (who, ob, who->chosen_skill, dir, 0);
		1668	break;
		1669
1693	default:	1670	default:
1694	fire_misc_object (op, dir);	1671	fire_misc_object (who, dir);
1695	break;	1672	break;
1696	}	1673	}
1697		1674
1698	return true;	1675	return true;
1699	}	1676	}
…		…
1758	*	1735	*
1759	* Change the color so that the message doesn't disappear with	1736	* Change the color so that the message doesn't disappear with
1760	* all the others.	1737	* all the others.
1761	*/	1738	*/
1762	if (pl->contr->usekeys == key_inventory	1739	if (pl->contr->usekeys == key_inventory
1763	|| !QUERY_FLAG (container, FLAG_APPLIED)	1740	|| !container->flag [FLAG_APPLIED]
1764	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1741	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1765	{	1742	{
1766	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1743	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));	1744	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1768	return NULL;	1745	return NULL;
…		…
1852	* going to try and move (not fire weapons).	1829	* going to try and move (not fire weapons).
1853	*/	1830	*/
1854	bool	1831	bool
1855	move_player_attack (object *op, int dir)	1832	move_player_attack (object *op, int dir)
1856	{	1833	{
1857	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1834	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1858	{	1835	{
1859	--op->speed_left;	1836	--op->speed_left;
1860	return true;	1837	return true;
1861	}	1838	}
1862		1839
1863	int on_battleground;
1864
1865	sint16 nx = freearr_x[dir] + op->x;	1840	sint16 nx = freearr_x[dir] + op->x;
1866	sint16 ny = freearr_y[dir] + op->y;	1841	sint16 ny = freearr_y[dir] + op->y;
1867
1868	on_battleground = op_on_battleground (op, 0, 0);
1869		1842
1870	if (out_of_map (op->map, nx, ny))	1843	if (out_of_map (op->map, nx, ny))
1871	return false;	1844	return false;
1872		1845
1873	/* If braced, or can't move to the square, and it is not out of the	1846	/* If braced, or can't move to the square, and it is not out of the
…		…
1923	*/	1896	*/
1924	if (op->type == PLAYER	1897	if (op->type == PLAYER
1925	&& ((mon->owner && mon->owner->contr	1898	&& ((mon->owner && mon->owner->contr
1926	&& same_party (mon->owner->contr->party, op->contr->party))	1899	&& same_party (mon->owner->contr->party, op->contr->party))
1927	|| mon->owner == op)	1900	|| mon->owner == op)
1928	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1901	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1929	{	1902	{
1930	/* If we're braced, we don't want to switch places with it */	1903	/* If we're braced, we don't want to switch places with it */
1931	if (op->contr->braced)	1904	if (op->contr->braced)
1932	return false;	1905	return false;
1933		1906
…		…
1944	return true;	1917	return true;
1945	}	1918	}
1946	else	1919	else
1947	return false;	1920	return false;
1948	}	1921	}
		1922
		1923	bool on_battleground = op_on_battleground (op, 0, 0);
1949		1924
1950	/* in certain circumstances, you shouldn't attack friendly	1925	/* in certain circumstances, you shouldn't attack friendly
1951	* creatures. Note that if you are braced, you can't push	1926	* creatures. Note that if you are braced, you can't push
1952	* someone, but put it inside this loop so that you won't	1927	* someone, but put it inside this loop so that you won't
1953	* attack them either.	1928	* attack them either.
1954	*/	1929	*/
1955	if ((mon->type == PLAYER || mon->enemy != op)	1930	if ((mon->type == PLAYER || mon->enemy != op)
1956	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1931	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1957	&& ((op->contr->peaceful	1932	&& ((op->contr->peaceful
1958	|| (mon->type == PLAYER && mon->contr->peaceful))	1933	|| (mon->type == PLAYER && mon->contr->peaceful))
1959	&& !on_battleground))	1934	&& !on_battleground))
1960	{	1935	{
1961	if (op->speed_left > 0.f)	1936	if (op->speed_left > 0.f)
…		…
1977	}	1952	}
1978	}	1953	}
1979	/* If the object is a boulder or other rollable object, then	1954	/* 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.	1955	* roll it if not braced. You can't roll it if you are braced.
1981	*/	1956	*/
1982	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1957	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1983	{	1958	{
1984	if (op->speed_left > 0.f)	1959	if (op->speed_left > 0.f)
1985	{	1960	{
1986	--op->speed_left;	1961	--op->speed_left;
1987		1962
…		…
1996	* Way it works is like this: First, it must have some hit points	1971	* 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:	1972	* 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	1973	* 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.	1974	* that party_number -1 is no party, so attacks can still happen.
2000	*/	1975	*/
2001	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	1976	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2002	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	1977	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2003	{	1978	{
2004	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	1979	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2005	{	1980	{
2006	--op->contr->weapon_sp_left;	1981	--op->contr->weapon_sp_left;
…		…
2018	}	1993	}
2019		1994
2020	bool	1995	bool
2021	move_player (object *op, int dir)	1996	move_player (object *op, int dir)
2022	{	1997	{
2023	int pick;
2024
2025	if (!op->map || op->map->in_memory != MAP_ACTIVE)	1998	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2026	return 0;	1999	return 0;
2027		2000
2028	/* Sanity check: make sure dir is valid */	2001	/* Sanity check: make sure dir is valid */
2029	if ((dir < 0) || (dir >= 9))	2002	if (dir < 0 || dir > 8)
2030	{	2003	{
2031	LOG (llevError, "move_player: invalid direction %d\n", dir);	2004	LOG (llevError, "move_player: invalid direction %d\n", dir);
2032	return 0;	2005	return 0;
2033	}	2006	}
2034		2007
2035	/* peterm: added following line */	2008	/* peterm: added following line */
2036	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2009	if (op->flag [FLAG_CONFUSED] && dir)
2037	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2010	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2038		2011
2039	op->facing = dir;	2012	op->facing = dir;
2040		2013
2041	if (op->flag [FLAG_HIDDEN])	2014	if (op->flag [FLAG_HIDDEN])
2042	do_hidden_move (op);	2015	do_hidden_move (op);
2043		2016
2044	bool retval;	2017	bool retval;
		2018	int pick = 0;
2045		2019
2046	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2020	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2047	retval = RESULT_INT (0);	2021	retval = RESULT_INT (0);
2048	else if (op->contr->fire_on)	2022	else if (op->contr->fire_on)
2049	retval = fire (op, dir);	2023	retval = fire (op, dir);
…		…
2080	* players.	2054	* players.
2081	*/	2055	*/
2082	bool	2056	bool
2083	handle_newcs_player (object *op)	2057	handle_newcs_player (object *op)
2084	{	2058	{
2085	if (QUERY_FLAG (op, FLAG_SCARED))	2059	if (op->flag [FLAG_SCARED])
2086	{	2060	{
2087	if (op->speed_left > 0.f)	2061	if (op->speed_left > 0.f)
2088	{	2062	{
2089	--op->speed_left;	2063	--op->speed_left;
2090	flee_player (op);	2064	flee_player (op);
…		…
2106	return move_player (op, op->direction);	2080	return move_player (op, op->direction);
2107		2081
2108	return false;	2082	return false;
2109	}	2083	}
2110		2084
2111	int	2085	static int
2112	save_life (object *op)	2086	save_life (object *op)
2113	{	2087	{
2114	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2088	if (!op->flag [FLAG_LIFESAVE])
2115	return 0;	2089	return 0;
2116		2090
2117	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2091	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2118	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2092	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2119	{	2093	{
2120	op->play_sound (sound_find ("ob_evaporate"));	2094	op->play_sound (sound_find ("ob_evaporate"));
2121	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2095	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2122		2096
2123	tmp->destroy ();	2097	tmp->destroy ();
2124	CLEAR_FLAG (op, FLAG_LIFESAVE);	2098	op->clr_flag (FLAG_LIFESAVE);
2125		2099
2126	if (op->stats.hp < 0)	2100	if (op->stats.hp < 0)
2127	op->stats.hp = op->stats.maxhp;	2101	op->stats.hp = op->stats.maxhp;
2128		2102
2129	if (op->stats.food < 0)	2103	if (op->stats.food < 0)
2130	op->stats.food = 999;	2104	op->stats.food = MAX_FOOD;
2131		2105
2132	op->update_stats ();	2106	op->update_stats ();
2133	return 1;	2107	return 1;
2134	}	2108	}
2135		2109
2136	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2110	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2137	CLEAR_FLAG (op, FLAG_LIFESAVE);	2111	op->clr_flag (FLAG_LIFESAVE);
2138	enter_player_savebed (op); /* bring him home. */	2112	enter_player_savebed (op); /* bring him home. */
2139	return 0;	2113	return 0;
2140	}	2114	}
2141		2115
2142	/* This goes throws the inventory and removes unpaid objects, and puts them	2116	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2149	{	2123	{
2150	while (op)	2124	while (op)
2151	{	2125	{
2152	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2126	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2153		2127
2154	if (QUERY_FLAG (op, FLAG_UNPAID))	2128	if (op->flag [FLAG_UNPAID])
2155	op->insert_at (env);	2129	op->insert_at (env);
2156	else if (op->inv)	2130	else if (op->inv)
2157	drop_unpaid_items (op->inv, env);	2131	drop_unpaid_items (op->inv, env);
2158		2132
2159	op = next;	2133	op = next;
…		…
2165	{	2139	{
2166	if (!flag [FLAG_REMOVED])	2140	if (!flag [FLAG_REMOVED])
2167	::drop_unpaid_items (inv, this);	2141	::drop_unpaid_items (inv, this);
2168	}	2142	}
2169		2143
2170	/*
2171	* Returns pointer a static string containing gravestone text
2172	* Moved from apply.c to player.c - player.c is what
2173	* actually uses this function. player.c may not be quite the
2174	* best, a misc file for object actions is probably better,
2175	* but there isn't one in the server directory.
2176	*/
2177	const char *
2178	gravestone_text (object *op)
2179	{
2180	static dynbuf_text buf;
2181
2182	buf << "---- R.I.P. ----\n\n"
2183	<< op->name;
2184
2185	if (op->type == PLAYER)
2186	buf << " the " << op->contr->title;
2187
2188	buf << "\n\n";
2189
2190	buf << "who was level ";
2191	buf << (sint32)op->level << "\n\n" // OO breakdown
2192	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2193
2194	if (op->type == PLAYER)
2195	buf << "by " << op->contr->killer_name () << ".\n\n";
2196
2197	{
2198	static char buf2[128];
2199	time_t now = time (NULL);
2200	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2201	buf << buf2;
2202	}
2203
2204	return buf;
2205	}
2206
2207	void	2144	void
2208	do_some_living (object *op)	2145	do_some_living (object *op)
2209	{	2146	{
2210	int last_food = op->stats.food;	2147	int last_food = op->stats.food;
2211	int gen_hp, gen_sp, gen_grace;	2148	int gen_hp, gen_sp, gen_grace;
2212	int over_hp, over_sp, over_grace;
2213	int i;	2149	int i;
2214	int rate_hp = 1200;	2150	int rate_hp = 1200;
2215	int rate_sp = 2500;	2151	int rate_sp = 2500;
2216	int rate_grace = 2000;	2152	int rate_grace = 2000;
2217	const int max_hp = 1;	2153	const int max_hp = 1;
…		…
2226	* alternate it here for it to work correctly.	2162	* alternate it here for it to work correctly.
2227	*/	2163	*/
2228	if (pticks & 2)	2164	if (pticks & 2)
2229	op->invisible--;	2165	op->invisible--;
2230	}	2166	}
2231	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2167	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2232	{	2168	{
2233	if (!op->invisible--)	2169	if (!op->invisible--)
2234	{	2170	{
2235	make_visible (op);	2171	make_visible (op);
2236	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2172	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2270	if (--op->last_grace < 0)	2206	if (--op->last_grace < 0)
2271	{	2207	{
2272	if (op->stats.grace < op->stats.maxgrace / 2)	2208	if (op->stats.grace < op->stats.maxgrace / 2)
2273	op->stats.grace++; /* no penalty in food for regaining grace */	2209	op->stats.grace++; /* no penalty in food for regaining grace */
2274		2210
		2211	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2212
2275	if (max_grace > 1)	2213	if (max_grace > 1)
2276	{	2214	{
2277	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2215	int over_grace = temp / rate_grace;
		2216
2278	if (over_grace > 0)	2217	if (over_grace > 0)
2279	{	2218	{
2280	op->stats.sp += over_grace	2219	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2281	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2282	op->last_grace = 0;	2220	op->last_grace = 0;
2283	}	2221	}
2284	else	2222	else
2285	{	2223	op->last_grace = rate_grace / temp;
2286	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2287	}
2288	}	2224	}
2289	else	2225	else
2290	{	2226	op->last_grace = rate_grace / temp;
2291	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2227
2292	}
2293	/* wearing stuff doesn't detract from grace generation. */	2228	/* wearing stuff doesn't detract from grace generation. */
2294	}	2229	}
2295		2230
2296	if (op->stats.food > 0)	2231	if (op->stats.food > 0)
2297	{	2232	{
…		…
2303	if (op->stats.sp < op->stats.maxsp)	2238	if (op->stats.sp < op->stats.maxsp)
2304	{	2239	{
2305	op->stats.sp++;	2240	op->stats.sp++;
2306		2241
2307	/* dms do not consume food */	2242	/* dms do not consume food */
2308	if (!QUERY_FLAG (op, FLAG_WIZ))	2243	if (!op->flag [FLAG_WIZ])
2309	{	2244	{
2310	op->stats.food--;	2245	op->stats.food--;
2311		2246
2312	if (op->contr->digestion < 0)	2247	if (op->contr->digestion < 0)
2313	op->stats.food += op->contr->digestion;	2248	op->stats.food += op->contr->digestion;
…		…
2316	}	2251	}
2317	}	2252	}
2318		2253
2319	if (max_sp > 1)	2254	if (max_sp > 1)
2320	{	2255	{
2321	over_sp = (gen_sp + 10) / rate_sp;	2256	int over_sp = (gen_sp + 10) / rate_sp;
2322	if (over_sp > 0)	2257	if (over_sp > 0)
2323	{	2258	{
2324	if (op->stats.sp < op->stats.maxsp)	2259	if (op->stats.sp < op->stats.maxsp)
2325	{	2260	{
2326	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2261	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2347	if (op->stats.hp < op->stats.maxhp)	2282	if (op->stats.hp < op->stats.maxhp)
2348	{	2283	{
2349	op->stats.hp++;	2284	op->stats.hp++;
2350		2285
2351	/* dms do not consume food */	2286	/* dms do not consume food */
2352	if (!QUERY_FLAG (op, FLAG_WIZ))	2287	if (!op->flag [FLAG_WIZ])
2353	{	2288	{
2354	op->stats.food--;	2289	op->stats.food--;
2355		2290
2356	if (op->contr->digestion < 0)	2291	if (op->contr->digestion < 0)
2357	op->stats.food += op->contr->digestion;	2292	op->stats.food += op->contr->digestion;
2358	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2293	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2359	op->stats.food = last_food;	2294	op->stats.food = last_food;
2360	}	2295	}
2361	}	2296	}
2362		2297
		2298	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2299
2363	if (max_hp > 1)	2300	if (max_hp > 1)
2364	{	2301	{
2365	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2302	int over_hp = temp / rate_hp;
2366		2303
2367	if (over_hp > 0)	2304	if (over_hp > 0)
2368	{	2305	{
2369	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2306	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2370	op->last_heal = 0;	2307	op->last_heal = 0;
2371	}	2308	}
2372	else	2309	else
2373	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2310	op->last_heal = rate_hp / temp;
2374	}	2311	}
2375	else	2312	else
2376	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2313	op->last_heal = rate_hp / temp;
2377	}	2314	}
2378	}	2315	}
2379		2316
2380	/* Digestion */	2317	/* Digestion */
2381	if (--op->last_eat < 0)	2318	if (--op->last_eat < 0)
…		…
2384	penalty = max (0, -op->contr->digestion);	2321	penalty = max (0, -op->contr->digestion);
2385		2322
2386	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2323	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2387		2324
2388	/* dms do not consume food */	2325	/* dms do not consume food */
2389	if (!QUERY_FLAG (op, FLAG_WIZ))	2326	if (!op->flag [FLAG_WIZ])
2390	op->stats.food--;	2327	op->stats.food--;
2391	}	2328	}
2392		2329
2393	if (op->stats.food < 0 && op->stats.hp >= 0)	2330	if (op->stats.food < 0 && op->stats.hp >= 0)
2394	{	2331	{
2395	object *flesh = 0;	2332	object *flesh = 0;
2396		2333
2397	for_inv_removable (op, tmp)	2334	for_inv_removable (op, tmp)
2398	{	2335	{
2399	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2336	if (tmp->flag [FLAG_UNPAID])
2400	continue;	2337	continue;
2401		2338
2402	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2339	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2403	{	2340	{
2404	op->statusmsg ("You blindly grab for a bite of food. "	2341	op->statusmsg ("You blindly grab for a bite of food. "
2405	"H<To prevent you from starving, you ate some random item from your backpack.>");	2342	"H<To prevent you from starving, you ate some random item from your backpack.>");
2406	manual_apply (op, tmp, 0);	2343	op->apply (tmp);
2407		2344
2408	if (op->stats.food >= 0 || op->stats.hp < 0)	2345	if (op->stats.food >= 0 || op->stats.hp < 0)
2409	break;	2346	break;
2410	}	2347	}
2411	else if (tmp->type == FLESH)	2348	else if (tmp->type == FLESH)
…		…
2417	*/	2354	*/
2418	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2355	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2419	{	2356	{
2420	op->statusmsg ("You blindly grab for a bite of food. "	2357	op->statusmsg ("You blindly grab for a bite of food. "
2421	"H<To prevent you from starving, you ate some random item from your backpack.>");	2358	"H<To prevent you from starving, you ate some random item from your backpack.>");
2422	manual_apply (op, flesh, 0);	2359	op->apply (flesh);
2423	}	2360	}
2424		2361
2425	// If player is still starving, alert him!	2362	// If player is still starving, alert him!
2426	if (op->stats.food < 0)	2363	if (op->stats.food < 0)
2427	op->failmsg ("You are starving! "	2364	op->failmsg ("You are starving! "
…		…
2439	op->contr->killer->destroy ();	2376	op->contr->killer->destroy ();
2440	}	2377	}
2441	}	2378	}
2442		2379
2443	/* killer should be set here already */	2380	/* killer should be set here already */
2444	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2381	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2445	kill_player (op);	2382	kill_player (op);
2446	}	2383	}
2447	}	2384	}
2448		2385
2449	/* If the player should die (lack of hp, food, etc), we call this.	2386	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2464	return;	2401	return;
2465		2402
2466	dynbuf_text deathtab;	2403	dynbuf_text deathtab;
2467		2404
2468	/* restore player */	2405	/* restore player */
2469	at = archetype::find ("poisoning");	2406	at = archetype::find (shstr_poisoning);
2470	if (object *tmp = present_arch_in_ob (at, op))	2407	if (object *tmp = present_arch_in_ob (at, op))
2471	{	2408	{
2472	tmp->destroy ();	2409	tmp->destroy ();
2473	deathtab << "Your body feels cleansed...\r";	2410	deathtab << "Your body feels cleansed...\r";
2474	}	2411	}
2475		2412
2476	at = archetype::find ("confusion");	2413	at = archetype::find (shstr_confusion);
2477	if (object *tmp = present_arch_in_ob (at, op))	2414	if (object *tmp = present_arch_in_ob (at, op))
2478	{	2415	{
2479	tmp->destroy ();	2416	tmp->destroy ();
2480	deathtab << "Your mind feels clearer...\r";	2417	deathtab << "Your mind feels clearer...\r";
2481	}	2418	}
…		…
2483	cure_disease (op, 0, 0); /* remove any disease */	2420	cure_disease (op, 0, 0); /* remove any disease */
2484		2421
2485	max_it (op->stats.hp , op->stats.maxhp);	2422	max_it (op->stats.hp , op->stats.maxhp);
2486	max_it (op->stats.sp , op->stats.maxsp);	2423	max_it (op->stats.sp , op->stats.maxsp);
2487	max_it (op->stats.grace, op->stats.maxgrace);	2424	max_it (op->stats.grace, op->stats.maxgrace);
2488
2489	if (op->stats.food <= 0)	2425	max_it (op->stats.food , 200);
2490	op->stats.food = 999;
2491		2426
2492	// remove all spell effects that are active	2427	// remove all spell effects that are active
2493	// to avoid long-term effects such as word-of-recall	2428	// to avoid long-term effects such as word-of-recall
2494	for (object *item = op->inv; item; )	2429	for (object *item = op->inv; item; )
2495	{	2430	{
…		…
2508	if (op_on_battleground (op, &x, &y))	2443	if (op_on_battleground (op, &x, &y))
2509	{	2444	{
2510	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2445	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2511		2446
2512	/* create a bodypart-trophy to make the winner happy */	2447	/* create a bodypart-trophy to make the winner happy */
2513	if (object *tmp = arch_to_object (archetype::find ("finger")))	2448	object *tmp = archetype::find (shstr_finger)->instance ();
2514	{	2449
2515	tmp->name = format ("%s's finger" , &op->name);	2450	tmp->name = format ("%s's finger" , &op->name);
2516	tmp->name_pl = format ("%s's fingers", &op->name);	2451	tmp->name_pl = format ("%s's fingers", &op->name);
2517	tmp->msg = format (	2452	tmp->msg = format (
2518	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2453	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2519	&op->name, op->contr->title,	2454	&op->name, op->contr->title,
2520	(int)op->level,	2455	(int)op->level,
2521	op->contr->killer_name ()	2456	op->contr->killer_name ()
2522	);	2457	);
2523	tmp->value = 0, tmp->type = 0;	2458	tmp->value = 0, tmp->type = 0;
2524	tmp->materialname = "organics";	2459	tmp->material = name_to_material (shstr_organic);
2525	tmp->insert_at (op, tmp);	2460	tmp->insert_at (op, tmp);
2526	}
2527		2461
2528	/* teleport defeated player to new destination */	2462	/* teleport defeated player to new destination */
2529	transfer_ob (op, x, y, 0, NULL);	2463	transfer_ob (op, x, y, 0, NULL);
2530	op->contr->braced = 0;	2464	op->contr->braced = 0;
2531		2465
…		…
2593	lost_a_stat = 1;	2527	lost_a_stat = 1;
2594	}	2528	}
2595	else	2529	else
2596	{	2530	{
2597	/* deplete a stat */	2531	/* deplete a stat */
2598	archetype *deparch = archetype::find ("depletion");	2532	archetype *deparch = archetype::find (shstr_depletion);
2599	object *dep;	2533	object *dep;
2600		2534
2601	dep = present_arch_in_ob (deparch, op);	2535	dep = present_arch_in_ob (deparch, op);
2602	if (!dep)	2536	if (!dep)
2603	{	2537	{
2604	dep = arch_to_object (deparch);	2538	dep = deparch->instance ();
2605	insert_ob_in_ob (dep, op);	2539	insert_ob_in_ob (dep, op);
2606	}	2540	}
2607	lose_this_stat = 1;	2541	lose_this_stat = 1;
2608	if (settings.balanced_stat_loss)	2542	if (settings.balanced_stat_loss)
2609	{	2543	{
…		…
2647	* difference.	2581	* difference.
2648	*/	2582	*/
2649	if (this_stat >= -50)	2583	if (this_stat >= -50)
2650	{	2584	{
2651	change_attr_value (&(dep->stats), i, -1);	2585	change_attr_value (&(dep->stats), i, -1);
2652	SET_FLAG (dep, FLAG_APPLIED);	2586	dep->set_flag (FLAG_APPLIED);
2653	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2587	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2654	op->update_stats ();	2588	op->update_stats ();
2655	lost_a_stat = 1;	2589	lost_a_stat = 1;
2656	}	2590	}
2657	}	2591	}
…		…
2675	#endif	2609	#endif
2676		2610
2677	/* Put a gravestone up where the character 'almost' died. List the	2611	/* Put a gravestone up where the character 'almost' died. List the
2678	* exp loss on the stone.	2612	* exp loss on the stone.
2679	*/	2613	*/
2680	tmp = arch_to_object (archetype::find ("gravestone"));	2614	tmp = archetype::find (shstr_gravestone)->instance ();
2681	tmp->name = format ("%s's gravestone", &op->name);	2615	tmp->name = format ("%s's gravestone", &op->name);
2682	tmp->name_pl = format ("%s's gravestones", &op->name);	2616	tmp->name_pl = format ("%s's gravestones", &op->name);
2683	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2617	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2684	&op->name, op->contr->title, op->contr->killer_name ());	2618	&op->name, op->contr->title, op->contr->killer_name ());
2685	tmp->x = op->x, tmp->y = op->y;	2619	tmp->x = op->x, tmp->y = op->y;
…		…
2726	object *force;	2660	object *force;
2727	int at;	2661	int at;
2728		2662
2729	force = get_archetype (FORCE_NAME);	2663	force = get_archetype (FORCE_NAME);
2730	/* 50 ticks should be enough time for the spell to abate */	2664	/* 50 ticks should be enough time for the spell to abate */
2731	force->speed = 0.1f;
2732	force->speed_left = -5.f;	2665	force->speed_left = -5.f;
2733	SET_FLAG (force, FLAG_APPLIED);	2666	force->set_speed (0.1f);
		2667	force->set_flag (FLAG_APPLIED);
		2668
2734	for (at = 0; at < NROFATTACKS; at++)	2669	for (at = 0; at < NROFATTACKS; at++)
2735	if (will_kill_again & (1 << at))	2670	if (will_kill_again & (1 << at))
2736	force->resist[at] = 100;	2671	force->resist[at] = 100;
2737		2672
2738	insert_ob_in_ob (force, op);	2673	insert_ob_in_ob (force, op);
…		…
2740	}	2675	}
2741		2676
2742	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2743	}	2678	}
2744		2679
2745	void	2680	static void
2746	loot_object (object *op)	2681	loot_object (object *op)
2747	{ /* Grab and destroy some treasure */	2682	{ /* Grab and destroy some treasure */
2748	object *tmp, *tmp2, *next;	2683	object *tmp, *tmp2, *next;
2749		2684
2750	op->close_container (); /* close open sack first */	2685	op->close_container (); /* close open sack first */
…		…
2760	tmp->x = op->x, tmp->y = op->y;	2695	tmp->x = op->x, tmp->y = op->y;
2761		2696
2762	if (tmp->type == CONTAINER)	2697	if (tmp->type == CONTAINER)
2763	loot_object (tmp); /* empty container to ground */	2698	loot_object (tmp); /* empty container to ground */
2764		2699
2765	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2700	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2766	{	2701	{
2767	if (tmp->nrof > 1)	2702	if (tmp->nrof > 1)
2768	{	2703	{
2769	tmp->decrease (rndm (1, tmp->nrof - 1));	2704	tmp->decrease (rndm (1, tmp->nrof - 1));
2770	insert_ob_in_map (tmp, op->map, NULL, 0);	2705	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2781	* fix_weight(): Check recursively the weight of all players, and fix	2716	* fix_weight(): Check recursively the weight of all players, and fix
2782	* what needs to be fixed. Refresh windows and fix speed if anything	2717	* what needs to be fixed. Refresh windows and fix speed if anything
2783	* was changed.	2718	* was changed.
2784	*/	2719	*/
2785	void	2720	void
2786	fix_weight (void)	2721	fix_weight ()
2787	{	2722	{
2788	for_all_players (pl)	2723	for_all_players (pl)
2789	{	2724	{
2790	sint32 old = pl->ob->carrying;	2725	sint32 old = pl->ob->carrying;
2791		2726
…		…
2798	}	2733	}
2799	}	2734	}
2800	}	2735	}
2801		2736
2802	void	2737	void
2803	fix_luck (void)	2738	fix_luck ()
2804	{	2739	{
2805	for_all_players (pl)	2740	for_all_players (pl)
2806	if (!pl->ob->contr->ns->state)	2741	if (!pl->ob->contr->ns->state)
2807	pl->ob->change_luck (0);	2742	pl->ob->change_luck (0);
2808	}	2743	}
…		…
2860	}	2795	}
2861		2796
2862	int	2797	int
2863	is_true_undead (object *op)	2798	is_true_undead (object *op)
2864	{	2799	{
2865	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2800	if (op->arch->flag [FLAG_UNDEAD])
2866	return 1;	2801	return 1;
2867		2802
2868	return 0;	2803	return 0;
2869	}	2804	}
2870		2805
…		…
2968		2903
2969	if (who->type == PLAYER)	2904	if (who->type == PLAYER)
2970	player = 1;	2905	player = 1;
2971		2906
2972	else	2907	else
2973	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2908	friendly = who->flag [FLAG_FRIENDLY];
2974		2909
2975	/* search adjacent squares */	2910	/* search adjacent squares */
2976	for (i = 1; i < 9; i++)	2911	for (i = 1; i < 9; i++)
2977	{	2912	{
2978	x = who->x + freearr_x[i];	2913	x = who->x + freearr_x[i];
…		…
2987	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2922	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2988	continue;	2923	continue;
2989		2924
2990	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2925	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2991	{	2926	{
2992	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2927	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2993	return 1;	2928	return 1;
2994	else if (tmp->type == PLAYER)	2929	else if (tmp->type == PLAYER)
2995	{	2930	{
2996	/*don't let a hidden DM prevent you from hiding */	2931	/*don't let a hidden DM prevent you from hiding */
2997	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	2932	if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2998	return 1;	2933	return 1;
2999	}	2934	}
3000	}	2935	}
3001	}	2936	}
3002	return 0;	2937	return 0;
…		…
3071	* and the exit-coordinates sp/hp must both be > 0.	3006	* and the exit-coordinates sp/hp must both be > 0.
3072	* => The intention here is to prevent abuse of the battleground-	3007	* => The intention here is to prevent abuse of the battleground-
3073	* feature (like pickable or hidden battleground tiles). */	3008	* feature (like pickable or hidden battleground tiles). */
3074	for (object *tmp = op->below; tmp; tmp = tmp->below)	3009	for (object *tmp = op->below; tmp; tmp = tmp->below)
3075	{	3010	{
3076	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3011	if (tmp->flag [FLAG_IS_FLOOR])
3077	{	3012	{
3078	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3013	if (tmp->flag [FLAG_NO_PICK]
3079	&& tmp->type == BATTLEGROUND	3014	&& tmp->type == BATTLEGROUND
3080	&& tmp->name == shstr_battleground	3015	&& tmp->name == shstr_battleground
3081	&& EXIT_X (tmp) && EXIT_Y (tmp))	3016	&& EXIT_X (tmp) && EXIT_Y (tmp))
3082	{	3017	{
3083	/* before we assign the exit, check if this is a teambattle */	3018	/* before we assign the exit, check if this is a teambattle */
3084	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3019	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3085	{
3086	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3020	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3021	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3087	{	3022	{
3088	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3089	{
3090	if (x && y)	3023	if (x && y)
3091	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3024	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3092		3025
3093	return 1;	3026	return 1;
3094	}
3095	}	3027	}
3096	}
3097		3028
3098	if (x && y)	3029	if (x && y)
3099	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3030	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3100		3031
3101	return 1;	3032	return 1;
…		…
3239	else	3170	else
3240	j = 1;	3171	j = 1;
3241	strcat (buf, spellpathnames[i]);	3172	strcat (buf, spellpathnames[i]);
3242	}	3173	}
3243	}	3174	}
		3175
3244	strcat (buf, ".");	3176	strcat (buf, ".");
3245	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3177	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3246	}	3178	}
3247		3179
3248	/* evtl. adding flags: */	3180	/* evtl. adding flags: */
3249	if (QUERY_FLAG (item, FLAG_XRAYS))	3181	if (item->flag [FLAG_XRAYS])
3250	SET_FLAG (skin, FLAG_XRAYS);	3182	skin->set_flag (FLAG_XRAYS);
3251	if (QUERY_FLAG (item, FLAG_STEALTH))	3183	if (item->flag [FLAG_STEALTH])
3252	SET_FLAG (skin, FLAG_STEALTH);	3184	skin->set_flag (FLAG_STEALTH);
3253	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3185	if (item->flag [FLAG_SEE_IN_DARK])
3254	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3186	skin->set_flag (FLAG_SEE_IN_DARK);
3255		3187
3256	/* print message if there is one */	3188	/* print message if there is one */
3257	if (item->msg != NULL)	3189	if (item->msg != NULL)
3258	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3190	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3259	}	3191	}
3260	else	3192	else
3261	{	3193	{
3262	/* generate misc. treasure */	3194	/* generate misc. treasure */
3263	tmp = arch_to_object (tr->item);	3195	tmp = tr->item->instance ();
3264	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3196	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3265	who->insert (tmp);	3197	who->insert (tmp);
3266	}	3198	}
3267	}
3268
3269	/**
3270	* Unready an object for a player. This function does nothing if the object was
3271	* not readied.
3272	*/
3273	void
3274	player_unready_range_ob (player *pl, object *ob)
3275	{
3276	if (pl->ob->current_weapon == ob)
3277	pl->ob->current_weapon = 0;
3278
3279	if (pl->combat_ob == ob)
3280	pl->combat_ob = 0;
3281
3282	if (pl->ranged_ob == ob)
3283	pl->ranged_ob = 0;
3284	}	3199	}
3285		3200
3286	//-GPL	3201	//-GPL
3287		3202
3288	sint8	3203	sint8
…		…
3318	{	3233	{
3319	play_sound (sound_find ("generic_failure"));	3234	play_sound (sound_find ("generic_failure"));
3320	statusmsg (msg, color);	3235	statusmsg (msg, color);
3321	}	3236	}
3322		3237
		3238	void
		3239	object::failmsgf (const char *format, ...)
		3240	{
		3241	if (!contr)
		3242	return;
		3243
		3244	va_list ap;
		3245	va_start (ap, format);
		3246	contr->failmsg (vformat (format, ap));
		3247	va_end (ap);
		3248	}
		3249
		3250	void
		3251	player::failmsgf (const char *format, ...)
		3252	{
		3253	va_list ap;
		3254	va_start (ap, format);
		3255	failmsg (vformat (format, ap));
		3256	va_end (ap);
		3257	}
		3258

Diff Legend

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