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.234 by root, Thu Oct 15 21:40:42 2009 UTC vs.
Revision 1.274 by root, Wed Apr 21 06:40:57 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.
…		…
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
		26
25	#include <global.h>	27	#include <global.h>
26	#include <sproto.h>	28	#include <sproto.h>
27	#include <sounds.h>	29	#include <sounds.h>
28	#include <living.h>	30	#include <living.h>
29	#include <object.h>	31	#include <object.h>
…		…
52		54
53	players.insert (this);	55	players.insert (this);
54	ob->remove ();	56	ob->remove ();
55	ob->map = 0;	57	ob->map = 0;
56	ob->activate_recursive ();	58	ob->activate_recursive ();
57	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
58	add_friendly_object (ob);	60	add_friendly_object (ob);
59	}	61	}
60		62
61	void	63	void
62	player::deactivate ()	64	player::deactivate ()
…		…
74	ob->remove ();	76	ob->remove ();
75	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
76	ob->map = 0;	78	ob->map = 0;
77	party = 0;	79	party = 0;
78		80
79	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
80
81	players.erase (this);	81	players.erase (this);
82	}	82	}
83		83
84	// connect the player with a specific client	84	// connect the player with a specific client
85	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
105	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
106		106
107	ob->update_weight ();	107	ob->update_weight ();
108	link_skills ();	108	link_skills ();
109		109
110	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
111
112	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
113		111
114	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
115	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
116	{	114	{
117	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
118		116
119	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
120	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
134		132
135	ns->floorbox_update ();	133	ns->floorbox_update ();
136	esrv_send_inventory (ob, ob);	134	esrv_send_inventory (ob, ob);
137	esrv_add_spells (this, 0);	135	esrv_add_spells (this, 0);
138		136
		137	ob->flag [FLAG_READY_WEAPON] = false;
		138	ob->flag [FLAG_READY_SKILL] = false;
		139	ob->flag [FLAG_READY_RANGE] = false;
		140	ob->flag [FLAG_READY_BOW] = false;
		141
		142	ob->update_stats (); // we unapplied stuff above
139	activate ();	143	activate ();
140		144
141	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
142	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
143	}	147	}
…		…
161	ns->reset_stats ();	165	ns->reset_stats ();
162	ns->pl = 0;	166	ns->pl = 0;
163	ns = 0;	167	ns = 0;
164	}	168	}
165		169
166	observe = ob;	170	// this is important for the player scheduler to get the correct refcount
		171	// when ns = 0
		172	observe = viewpoint = ob;
167		173
168	deactivate ();	174	deactivate ();
169	}	175	}
		176
		177	//-GPL
170		178
171	// the need for this function can be explained	179	// the need for this function can be explained
172	// by load_object not returning the object	180	// by load_object not returning the object
173	void	181	void
174	player::set_object (object *op)	182	player::set_object (object *op)
175	{	183	{
176	ob = observe = op;	184	ob = observe = viewpoint = op;
177	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
178		186
179	ob->speed = 1.0f;	187	ob->speed = 1.0f;
180	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
181		189
182	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
183
184	ob->flag [FLAG_READY_WEAPON] = false;
185	ob->flag [FLAG_READY_SKILL] = false;
186	ob->flag [FLAG_READY_BOW] = false;
187
188	for (object *op = ob->inv; op; op = op->below)
189	if (op->flag [FLAG_APPLIED])
190	switch (op->type)
191	{
192	case SKILL:
193	ob->flag [FLAG_APPLIED] = false;
194	break;
195
196	case WAND:
197	case ROD:
198	case HORN:
199	case BOW:
200	ranged_ob = op;
201	break;
202
203	case WEAPON:
204	combat_ob = op;
205	break;
206	}
207
208	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
209	ob->deactivate (); // change_weapon activates, fix this better
210	}	191	}
211		192
212	void	193	void
213	player::set_observe (object *op)	194	player::set_observe (object *op)
214	{	195	{
215	observe = op ? op : ob;	196	observe = viewpoint = op ? op : ob;
216	do_los = 1;	197	do_los = 1;
217	}	198	}
		199
		200	void
		201	player::set_viewpoint (object *op)
		202	{
		203	viewpoint = op ? op : (object *)observe;
		204	do_los = 1;
		205	}
		206
		207	//+GPL
218		208
219	player::player ()	209	player::player ()
220	{	210	{
221	/* There are some elements we want initialised to non zero value -	211	/* There are some elements we want initialised to non zero value -
222	* we deal with that below this point.	212	* we deal with that below this point.
…		…
244	disconnect ();	234	disconnect ();
245		235
246	attachable::do_destroy ();	236	attachable::do_destroy ();
247		237
248	if (ob)	238	if (ob)
249	{
250	ob->destroy_inv (false);
251	ob->destroy ();	239	ob->destroy ();
252	}
253		240
254	ob = observe = 0;	241	ob = observe = viewpoint = 0;
255	}	242	}
256		243
257	player::~player ()	244	player::~player ()
258	{	245	{
259	/* Clear item stack */	246	/* Clear item stack */
260	free (stack_items);	247	free (stack_items);
		248	}
		249
		250	/*
		251	* get_player_archetype() return next player archetype from archetype
		252	* list. Not very efficient routine, but used only creating new players.
		253	* Note: there MUST be at least one player archetype!
		254	*/
		255	static archetype *
		256	get_player_archetype (archetype *at)
		257	{
		258	// archetypes could have been reloaded
		259	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		260
		261	if (!nat)
		262	return at;
		263
		264	archvec::iterator i = archetypes.find (nat);
		265
		266	for (;;)
		267	{
		268	if (++i == archetypes.end ())
		269	i = archetypes.begin ();
		270	else if (*i == at)
		271	cleanup ("not a single player archetype found");
		272
		273	if ((*i)->type == PLAYER)
		274	return *i;
		275	}
261	}	276	}
262		277
263	/* Tries to add player on the connection passed in ns.	278	/* Tries to add player on the connection passed in ns.
264	* All we can really get in this is some settings like host and display	279	* All we can really get in this is some settings like host and display
265	* mode.	280	* mode.
…		…
267	player *	282	player *
268	player::create ()	283	player::create ()
269	{	284	{
270	player *pl = new player;	285	player *pl = new player;
271		286
272	pl->set_object (arch_to_object (get_player_archetype (0)));	287	pl->set_object (get_player_archetype (0)->instance ());
273		288
274	pl->ob->roll_stats ();	289	pl->ob->roll_stats ();
275	pl->ob->stats.wc = 2;	290	pl->ob->stats.wc = 2;
276	pl->ob->run_away = 25; /* Then we panick... */	291	pl->ob->run_away = 25; /* Then we panick... */
277		292
278	set_first_map (pl->ob);	293	set_first_map (pl->ob);
279		294
280	return pl;	295	return pl;
281	}
282
283	/*
284	* get_player_archetype() return next player archetype from archetype
285	* list. Not very efficient routine, but used only creating new players.
286	* Note: there MUST be at least one player archetype!
287	*/
288	archetype *
289	get_player_archetype (archetype *at)
290	{
291	// archetypes could have been reloaded
292	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
293
294	if (!nat)
295	return at;
296
297	archvec::iterator i = archetypes.find (nat);
298
299	for (;;)
300	{
301	if (++i == archetypes.end ())
302	i = archetypes.begin ();
303	else if (*i == at)
304	cleanup ("not a single player archetype found");
305
306	if ((*i)->type == PLAYER)
307	return *i;
308	}
309	}	296	}
310		297
311	object *	298	object *
312	get_nearest_player (object *mon)	299	get_nearest_player (object *mon)
313	{	300	{
…		…
387	*/	374	*/
388	int	375	int
389	path_to_player (object *mon, object *pl, unsigned mindiff)	376	path_to_player (object *mon, object *pl, unsigned mindiff)
390	{	377	{
391	rv_vector rv;	378	rv_vector rv;
392	sint16 x, y;
393	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	379	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
394	maptile *m, *lastmap;
395		380
396	get_rangevector (mon, pl, &rv, 0);	381	get_rangevector (mon, pl, &rv, 0);
397		382
398	if (rv.distance < mindiff)	383	if (rv.distance < mindiff)
399	return 0;	384	return 0;
400		385
401	x = mon->x;	386	mapxy pos (mon);
402	y = mon->y;
403	m = mon->map;
404	dir = rv.direction;	387	dir = rv.direction;
405	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	388	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
406	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	389	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
407		390
408	/* If we can't solve it within the search distance, return now. */	391	/* If we can't solve it within the search distance, return now. */
409	if (diff > max)	392	if (diff > max)
410	return 0;	393	return 0;
411		394
412	while (diff > 1 && max > 0)	395	while (diff > 1 && max > 0)
413	{	396	{
414	lastx = x;	397	mapxy lastpos = pos;
415	lasty = y;
416	lastmap = m;
417	x = lastx + freearr_x[dir];
418	y = lasty + freearr_y[dir];
419		398
420	mflags = get_map_flags (m, &m, x, y, &x, &y);	399	pos.move (dir);
421	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
422		400
423	/* Space is blocked - try changing direction a little */	401	/* Space is blocked - try changing direction a little */
424	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	402	if (!pos.normalise ()
425	&& (m == mon->map && blocked_link (mon, m, x, y))))	403	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		404	&& blocked_link (mon, pos.m, pos.x, pos.y)))
426	{	405	{
427	/* recalculate direction from last good location. Possible	406	/* recalculate direction from last good location. Possible
428	* we were not traversing ideal location before.	407	* we were not traversing ideal location before.
429	*/	408	*/
430	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	409	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
431	if (rv.direction != dir)	410	if (rv.direction != dir)
432	{	411	{
433	/* OK - says direction should be different - lets reset the	412	/* OK - says direction should be different - lets reset the
434	* the values so it will try again.	413	* the values so it will try again.
435	*/	414	*/
436	x = lastx;
437	y = lasty;
438	m = lastmap;	415	pos = lastpos;
439	dir = firstdir = rv.direction;	416	dir = firstdir = rv.direction;
440	}	417	}
441	else	418	else
442	{	419	{
443	/* direct path is blocked - try taking a side step to	420	/* direct path is blocked - try taking a side step to
…		…
450	*/	427	*/
451	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	428	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
452	{	429	{
453	if (i == 0)	430	if (i == 0)
454	continue; /* already did this, so skip it */	431	continue; /* already did this, so skip it */
		432
455	/* Use lastdir here - otherwise,	433	/* Use lastdir here - otherwise,
456	* since the direction that the creature should move in	434	* since the direction that the creature should move in
457	* may change, you could get infinite loops.	435	* may change, you could get infinite loops.
458	* ie, player is northwest, but monster can only	436	* ie, player is northwest, but monster can only
459	* move west, so it does that. It goes some distance,	437	* move west, so it does that. It goes some distance,
…		…
461	* can't do that, but now finds it can move east, and	439	* can't do that, but now finds it can move east, and
462	* gets back to its original point. lastdir contains	440	* gets back to its original point. lastdir contains
463	* the last direction the creature has successfully	441	* the last direction the creature has successfully
464	* moved.	442	* moved.
465	*/	443	*/
466
467	x = lastx + freearr_x[absdir (lastdir + i)];
468	y = lasty + freearr_y[absdir (lastdir + i)];
469	m = lastmap;	444	pos = lastpos;
470	mflags = get_map_flags (m, &m, x, y, &x, &y);	445	pos.move (absdir (lastdir + i));
471	if (mflags & P_OUT_OF_MAP)	446
		447	if (!pos.normalise ())
472	continue;	448	continue;
473	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	449
474	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	450	mapspace &ms = *pos;
		451
		452	if (ms.flags () & P_BLOCKSVIEW)
475	continue;	453	continue;
476	if (mflags & P_BLOCKSVIEW)	454
		455	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
477	continue;	456	continue;
478		457
479	if (m == mon->map && blocked_link (mon, m, x, y))	458	if (blocked_link (mon, pos.m, pos.x, pos.y))
480	break;	459	break;
481	}	460	}
		461
482	/* go through entire loop without finding a valid	462	/* go through entire loop without finding a valid
483	* sidestep to take - thus, no valid path.	463	* sidestep to take - thus, no valid path.
484	*/	464	*/
485	if (i == (DETOUR_AMOUNT + 1))	465	if (i == DETOUR_AMOUNT + 1)
486	return 0;	466	return 0;
		467
487	diff--;	468	diff--;
488	lastdir = dir;	469	lastdir = dir;
489	max--;	470	max--;
490	if (!firstdir)	471	if (!firstdir)
491	firstdir = dir + i;	472	firstdir = dir + i;
…		…
495	{	476	{
496	/* we moved towards creature, so diff is less */	477	/* we moved towards creature, so diff is less */
497	diff--;	478	diff--;
498	max--;	479	max--;
499	lastdir = dir;	480	lastdir = dir;
		481
500	if (!firstdir)	482	if (!firstdir)
501	firstdir = dir;	483	firstdir = dir;
502	}	484	}
503		485
504	if (diff <= 1)	486	if (diff <= 1)
505	{	487	{
506	/* Recalculate diff (distance) because we may not have actually	488	/* Recalculate diff (distance) because we may not have actually
507	* headed toward player for entire distance.	489	* headed toward player for entire distance.
508	*/	490	*/
509	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	491	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
510	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	492	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
511	}	493	}
512		494
513	if (diff > max)	495	if (diff > max)
514	return 0;	496	return 0;
…		…
532	next = op->below;	514	next = op->below;
533		515
534	/* Forces get applied per default, unless they have the	516	/* Forces get applied per default, unless they have the
535	* flag "neutral" set. Sorry but I can't think of a better way	517	* flag "neutral" set. Sorry but I can't think of a better way
536	*/	518	*/
537	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	519	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
538	SET_FLAG (op, FLAG_APPLIED);	520	op->set_flag (FLAG_APPLIED);
539		521
540	/* we never give weapons/armour if these cannot be used	522	/* we never give weapons/armour if these cannot be used
541	* by this player due to race restrictions	523	* by this player due to race restrictions
542	*/	524	*/
543	if (pl->type == PLAYER)	525	if (pl->type == PLAYER)
544	{	526	{
545	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	527	if ((!pl->flag [FLAG_USE_ARMOUR]
546	&&	528	&&
547	(op->type == ARMOUR || op->type == BOOTS	529	(op->type == ARMOUR || op->type == BOOTS
548	|| op->type == CLOAK || op->type == HELMET	530	|| op->type == CLOAK || op->type == HELMET
549	|| op->type == SHIELD || op->type == GLOVES	531	|| op->type == SHIELD || op->type == GLOVES
550	|| op->type == BRACERS || op->type == GIRDLE))	532	|| op->type == BRACERS || op->type == GIRDLE))
551	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	533	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
552	{	534	{
553	op->destroy ();	535	op->destroy ();
554	continue;	536	continue;
555	}	537	}
556	}	538	}
…		…
573	if (op->nrof > 1)	555	if (op->nrof > 1)
574	op->nrof = 1;	556	op->nrof = 1;
575	}	557	}
576		558
577	if (op->type == SPELLBOOK && op->inv)	559	if (op->type == SPELLBOOK && op->inv)
578	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	560	op->inv->clr_flag (FLAG_STARTEQUIP);
579		561
580	/* Give starting characters identified, uncursed, and undamned	562	/* Give starting characters identified, uncursed, and undamned
581	* items. Just don't identify gold or silver, or it won't be	563	* items. Just don't identify gold or silver, or it won't be
582	* merged properly.	564	* merged properly.
583	*/	565	*/
584	if (need_identify (op))	566	if (op->need_identify ())
585	{	567	{
586	SET_FLAG (op, FLAG_IDENTIFIED);	568	op->set_flag (FLAG_IDENTIFIED);
587	CLEAR_FLAG (op, FLAG_CURSED);	569	op->clr_flag (FLAG_CURSED);
588	CLEAR_FLAG (op, FLAG_DAMNED);	570	op->clr_flag (FLAG_DAMNED);
589	}	571	}
590		572
591	if (op->type == SPELL)	573	if (op->type == SPELL)
592	{	574	{
593	op->destroy ();	575	op->destroy ();
594	continue;	576	continue;
595	}	577	}
596	else if (op->type == SKILL)	578	else if (op->type == SKILL)
597	{	579	{
598	SET_FLAG (op, FLAG_CAN_USE_SKILL);	580	op->set_flag (FLAG_CAN_USE_SKILL);
599	op->stats.exp = 0;	581	op->stats.exp = 0;
600	op->level = 1;	582	op->level = 1;
601	}	583	}
602	else /* lock all 'normal items by default */	584	else /* lock all 'normal items by default */
603	SET_FLAG (op, FLAG_INV_LOCKED);	585	op->set_flag (FLAG_INV_LOCKED);
604	} /* for loop of objects in player inv */	586	} /* for loop of objects in player inv */
605		587
606	/* Need to set up the skill pointers */	588	/* Need to set up the skill pointers */
607	pl->contr->link_skills ();	589	pl->contr->link_skills ();
608	}	590	}
…		…
622	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	604	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
623	}	605	}
624		606
625	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	607	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
626	static int	608	static int
627	roll_stat (void)	609	roll_stat ()
628	{	610	{
629	int a[4], i, j, k;	611	int a[4], i, j, k;
630		612
631	for (i = 0; i < 4; i++)	613	for (i = 0; i < 4; i++)
632	a[i] = (int) rndm (6) + 1;	614	a[i] = (int) rndm (6) + 1;
…		…
729	player::chargen_race_done ()	711	player::chargen_race_done ()
730	{	712	{
731	/* this must before then initial items are given */	713	/* this must before then initial items are given */
732	esrv_new_player (ob->contr);	714	esrv_new_player (ob->contr);
733		715
734	treasurelist *tl = treasurelist::find ("starting_wealth");	716	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
735	if (tl)	717	if (tl)
736	create_treasure (tl, ob, 0, 0, 0);	718	create_treasure (tl, ob, 0, 0, 0);
737		719
738	INVOKE_PLAYER (BIRTH, ob->contr);	720	INVOKE_PLAYER (BIRTH, ob->contr);
739	INVOKE_PLAYER (LOGIN, ob->contr);	721	INVOKE_PLAYER (LOGIN, ob->contr);
…		…
742		724
743	if (ob->msg)	725	if (ob->msg)
744	ob->msg = 0;	726	ob->msg = 0;
745		727
746	start_info (ob);	728	start_info (ob);
747	CLEAR_FLAG (ob, FLAG_WIZ);	729	ob->clr_flag (FLAG_WIZ);
748	give_initial_items (ob, ob->randomitems);	730	give_initial_items (ob, ob->randomitems);
749	esrv_send_inventory (ob, ob);	731	esrv_send_inventory (ob, ob);
750	ob->update_stats ();	732	ob->update_stats ();
751		733
752	/* This moves the player to a different start map, if there	734	/* This moves the player to a different start map, if there
…		…
792	ob->stats.hp = ob->stats.maxhp;	774	ob->stats.hp = ob->stats.maxhp;
793	ob->stats.sp = ob->stats.maxsp;	775	ob->stats.sp = ob->stats.maxsp;
794	ob->stats.grace = 0;	776	ob->stats.grace = 0;
795	}	777	}
796		778
797	void	779	static void
798	flee_player (object *op)	780	flee_player (object *op)
799	{	781	{
800	int dir, diff;	782	int dir, diff;
801	rv_vector rv;	783	rv_vector rv;
802		784
803	if (op->stats.hp < 0)	785	if (op->stats.hp < 0)
804	{	786	{
805	LOG (llevDebug, "Fleeing player is dead.\n");	787	LOG (llevDebug, "Fleeing player is dead.\n");
806	CLEAR_FLAG (op, FLAG_SCARED);	788	op->clr_flag (FLAG_SCARED);
807	return;	789	return;
808	}	790	}
809		791
810	if (!op->enemy)	792	if (!op->enemy)
811	{	793	{
812	LOG (llevDebug, "Fleeing player had no enemy.\n");	794	LOG (llevDebug, "Fleeing player had no enemy.\n");
813	CLEAR_FLAG (op, FLAG_SCARED);	795	op->clr_flag (FLAG_SCARED);
814	return;	796	return;
815	}	797	}
816		798
817	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	799	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
818	{	800	{
819	op->enemy = NULL;	801	op->enemy = NULL;
820	CLEAR_FLAG (op, FLAG_SCARED);	802	op->clr_flag (FLAG_SCARED);
821	return;	803	return;
822	}	804	}
823		805
824	get_rangevector (op, op->enemy, &rv, 0);	806	get_rangevector (op, op->enemy, &rv, 0);
825		807
826	dir = absdir (4 + rv.direction);	808	dir = absdir (4 + rv.direction);
827	for (diff = 0; diff < 3; diff++)	809	for (diff = 0; diff < 3; diff++)
828	{	810	{
829	int m = 1 - rndm (2) * 2;	811	int m = 1 - rndm (2) * 2;
830		812
831	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	813	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
832	return;	814	return;
833	}	815	}
834		816
835	/* Cornered, get rid of scared */	817	/* Cornered, get rid of scared */
836	CLEAR_FLAG (op, FLAG_SCARED);	818	op->clr_flag (FLAG_SCARED);
837	op->enemy = NULL;	819	op->enemy = NULL;
838	}	820	}
839		821
840	/* check_pick sees if there is stuff to be picked up/picks up stuff.	822	/* check_pick sees if there is stuff to be picked up/picks up stuff.
841	* It returns 1 if the player should keep on moving, 0 if he should	823	* It returns 1 if the player should keep on moving, 0 if he should
…		…
846	{	828	{
847	object *tmp, *next;	829	object *tmp, *next;
848	int stop = 0;	830	int stop = 0;
849	int wvratio;	831	int wvratio;
850		832
851	/* if you're flying, you cna't pick up anything */	833	/* if you're flying, you can't pick up anything */
852	if (op->move_type & MOVE_FLYING)	834	if (op->move_type & MOVE_FLYING)
853	return 1;	835	return 1;
854		836
855	next = op->below;	837	next = op->below;
856		838
857	int cnt = MAX_ITEM_PER_DROP;	839	int cnt = MAX_ITEM_PER_ACTION;
858	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	840	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
859		841
860	/* loop while there are items on the floor that are not marked as	842	/* loop while there are items on the floor that are not marked as
861	* destroyed */	843	* destroyed */
862	while (next && !next->destroyed ())	844	while (next && !next->destroyed ())
…		…
888	if (op->contr->mode & PU_DEBUG)	870	if (op->contr->mode & PU_DEBUG)
889	{	871	{
890	/* some debugging code to figure out item information */	872	/* some debugging code to figure out item information */
891	const char *str = tmp->name	873	const char *str = tmp->name
892	? format ("item name: %s item type: %d weight/value: %d",	874	? format ("item name: %s item type: %d weight/value: %d",
893	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	875	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
894	: format ("item name: %s item type: %d weight/value: %d",	876	: format ("item name: %s item type: %d weight/value: %d",
895	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	877	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
896		878
897	new_draw_info (NDI_UNIQUE, 0, op, str);	879	new_draw_info (NDI_UNIQUE, 0, op, str);
898	}	880	}
899		881
900	if (op->contr->mode & PU_INHIBIT)	882	if (op->contr->mode & PU_INHIBIT)
…		…
933	* fighting */	915	* fighting */
934	if (op->contr->mode & PU_INHIBIT)	916	if (op->contr->mode & PU_INHIBIT)
935	return 1;	917	return 1;
936		918
937	/* prevent us from turning into auto-thieves :) */	919	/* prevent us from turning into auto-thieves :) */
938	if (QUERY_FLAG (tmp, FLAG_UNPAID))	920	if (tmp->flag [FLAG_UNPAID])
939	continue;	921	continue;
940		922
941	/* ignore known cursed objects */	923	/* ignore known cursed objects */
942	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	924	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
943	continue;	925	continue;
944		926
945	/* all food and drink if desired */	927	/* all food and drink if desired */
946	/* question: don't pick up known-poisonous stuff? */	928	/* question: don't pick up known-poisonous stuff? */
947	if (op->contr->mode & PU_FOOD)	929	if (op->contr->mode & PU_FOOD)
…		…
950	CHK_PICK_PICKUP;	932	CHK_PICK_PICKUP;
951	continue;	933	continue;
952	}	934	}
953		935
954	if (op->contr->mode & PU_DRINK)	936	if (op->contr->mode & PU_DRINK)
955	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	937	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
956	{	938	{
957	CHK_PICK_PICKUP;	939	CHK_PICK_PICKUP;
958	continue;	940	continue;
959	}	941	}
960		942
…		…
987	continue;	969	continue;
988	}	970	}
989		971
990	/* wands/staves/rods/horns */	972	/* wands/staves/rods/horns */
991	if (op->contr->mode & PU_MAGIC_DEVICE)	973	if (op->contr->mode & PU_MAGIC_DEVICE)
992	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	974	if (tmp->type == WAND
		975	|| tmp->type == ROD
		976	|| tmp->type == HORN
		977	|| tmp->type == POWER_CRYSTAL)
993	{	978	{
994	CHK_PICK_PICKUP;	979	CHK_PICK_PICKUP;
995	continue;	980	continue;
996	}	981	}
997		982
998	/* pick up all magical items */	983	/* pick up all magical items */
999	if (op->contr->mode & PU_MAGICAL)	984	if (op->contr->mode & PU_MAGICAL)
1000	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	985	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		986	&& !tmp->flag [FLAG_KNOWN_CURSED])
1001	{	987	{
1002	CHK_PICK_PICKUP;	988	CHK_PICK_PICKUP;
1003	continue;	989	continue;
1004	}	990	}
1005		991
…		…
1012	}	998	}
1013	}	999	}
1014		1000
1015	/* rings & amulets - talismans seems to be typed AMULET */	1001	/* rings & amulets - talismans seems to be typed AMULET */
1016	if (op->contr->mode & PU_JEWELS)	1002	if (op->contr->mode & PU_JEWELS)
1017	if (tmp->type == RING || tmp->type == AMULET)	1003	if (tmp->type == RING
		1004	|| tmp->type == AMULET
		1005	|| tmp->type == GIRDLE
		1006	|| tmp->type == SKILL_TOOL)
1018	{	1007	{
1019	CHK_PICK_PICKUP;	1008	CHK_PICK_PICKUP;
1020	continue;	1009	continue;
1021	}	1010	}
1022		1011
…		…
1071	CHK_PICK_PICKUP;	1060	CHK_PICK_PICKUP;
1072	continue;	1061	continue;
1073	}	1062	}
1074		1063
1075	if (op->contr->mode & PU_GLOVES)	1064	if (op->contr->mode & PU_GLOVES)
1076	if (tmp->type == GLOVES)	1065	if (tmp->type == GLOVES || tmp->type == BRACERS)
1077	{	1066	{
1078	CHK_PICK_PICKUP;	1067	CHK_PICK_PICKUP;
1079	continue;	1068	continue;
1080	}	1069	}
1081		1070
…		…
1086	continue;	1075	continue;
1087	}	1076	}
1088		1077
1089	/* hoping to catch throwing daggers here */	1078	/* hoping to catch throwing daggers here */
1090	if (op->contr->mode & PU_MISSILEWEAPON)	1079	if (op->contr->mode & PU_MISSILEWEAPON)
1091	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1080	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1092	{	1081	{
1093	CHK_PICK_PICKUP;	1082	CHK_PICK_PICKUP;
1094	continue;	1083	continue;
1095	}	1084	}
1096		1085
…		…
1131	fprintf (stderr, "%s", tmp->name);	1120	fprintf (stderr, "%s", tmp->name);
1132	}	1121	}
1133	else	1122	else
1134	fprintf (stderr, "%s", tmp->arch->archname);	1123	fprintf (stderr, "%s", tmp->arch->archname);
1135	fprintf (stderr, ",%d] = ", tmp->type);	1124	fprintf (stderr, ",%d] = ", tmp->type);
1136	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1125	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1137	#endif	1126	#endif
1138	CHK_PICK_PICKUP;	1127	CHK_PICK_PICKUP;
1139	continue;	1128	continue;
1140	}	1129	}
1141	} /* the new pickup model */	1130	} /* the new pickup model */
1142	}	1131	}
1143		1132
1144	return !stop;	1133	return !stop;
1145	}	1134	}
1146		1135
		1136	/* routine for both players and monsters. We call this when
		1137	* there is a possibility for our action distrubing our hiding
		1138	* place or invisiblity spell. Artefact invisiblity causes
		1139	* "noise" instead. If we arent invisible to begin with, we
		1140	* return 0.
		1141	*/
		1142	static int
		1143	action_makes_visible (object *op)
		1144	{
		1145	if (op->invisible && op->flag [FLAG_ALIVE])
		1146	{
		1147	if (op->flag [FLAG_MAKE_INVIS])
		1148	{
		1149	// artefact invisibility is permanent, but we still make noise
		1150	// this is important for game-balance.
		1151	if (op->contr)
		1152	op->make_noise ();
		1153
		1154	return 0;
		1155	}
		1156
		1157	if (op->contr && op->contr->tmp_invis == 0)
		1158	return 0;
		1159
		1160	/* If monsters, they should become visible */
		1161	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1162	{
		1163	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1164	return 1;
		1165	}
		1166	}
		1167
		1168	return 0;
		1169	}
		1170
1147	/*	1171	/*
1148	* Find an arrow in the inventory and after that	1172	* Find an arrow in the inventory and after that
1149	* in the right type container (quiver). Pointer to the	1173	* in the right type container (quiver). Pointer to the
1150	* found object is returned.	1174	* found object is returned.
1151	*/	1175	*/
1152	object *	1176	static object *
1153	find_arrow (object *op, const char *type)	1177	find_arrow (object *op, const char *type)
1154	{	1178	{
1155	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1179	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1156	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1180	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1157	return splay (tmp);	1181	return splay (tmp);
1158		1182
1159	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1183	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1160	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1184	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1161	if (object *arrow = find_arrow (tmp, type))	1185	if (object *arrow = find_arrow (tmp, type))
1162	{	1186	{
1163	splay (tmp);	1187	splay (tmp);
1164	return arrow;	1188	return arrow;
1165	}	1189	}
…		…
1171	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1195	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1172	* against the target. A full test is not performed, simply a basic test	1196	* against the target. A full test is not performed, simply a basic test
1173	* of resistances. The archer is making a quick guess at what he sees down	1197	* of resistances. The archer is making a quick guess at what he sees down
1174	* the hall. Failing that it does it's best to pick the highest plus arrow.	1198	* the hall. Failing that it does it's best to pick the highest plus arrow.
1175	*/	1199	*/
1176	object *	1200	static object *
1177	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1201	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1178	{	1202	{
1179	object *tmp = NULL, *arrow, *ntmp;	1203	object *tmp = NULL, *arrow, *ntmp;
1180	int attacknum, attacktype, betterby = 0, i;	1204	int attacknum, attacktype, betterby = 0, i;
1181		1205
1182	if (!type)	1206	if (!type)
1183	return NULL;	1207	return NULL;
1184		1208
1185	for (arrow = op->inv; arrow; arrow = arrow->below)	1209	for (arrow = op->inv; arrow; arrow = arrow->below)
1186	{	1210	{
1187	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1211	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1188	{	1212	{
1189	i = 0;	1213	i = 0;
1190	ntmp = find_better_arrow (arrow, target, type, &i);	1214	ntmp = find_better_arrow (arrow, target, type, &i);
1191		1215
1192	if (i > betterby)	1216	if (i > betterby)
…		…
1250	* find_better_arrow to find a decent arrow to use.	1274	* find_better_arrow to find a decent arrow to use.
1251	* op = the shooter	1275	* op = the shooter
1252	* type = bow->race	1276	* type = bow->race
1253	* dir = fire direction	1277	* dir = fire direction
1254	*/	1278	*/
1255	object *	1279	static object *
1256	pick_arrow_target (object *op, shstr_cmp type, int dir)	1280	pick_arrow_target (object *op, shstr_cmp type, int dir)
1257	{	1281	{
1258	object *tmp = NULL;	1282	object *tmp = NULL;
1259	maptile *m;	1283	maptile *m;
1260	int i, mflags, found, number;	1284	int i, mflags, found, number;
…		…
1293	break;	1317	break;
1294	}	1318	}
1295		1319
1296	if (mflags & P_IS_ALIVE)	1320	if (mflags & P_IS_ALIVE)
1297	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1321	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1298	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1322	if (tmp->flag [FLAG_ALIVE])
1299	break;	1323	break;
1300	}	1324	}
1301		1325
1302	if (!tmp)	1326	if (!tmp)
1303	return find_arrow (op, type);	1327	return find_arrow (op, type);
…		…
1364	{	1388	{
1365	if (op->type == PLAYER)	1389	if (op->type == PLAYER)
1366	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1390	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1367	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1391	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1368	else	1392	else
1369	CLEAR_FLAG (op, FLAG_READY_BOW);	1393	op->clr_flag (FLAG_READY_BOW);
1370		1394
1371	return 0;	1395	return 0;
1372	}	1396	}
1373	}	1397	}
1374		1398
…		…
1475	* but monsters can't. Putting that code here	1499	* but monsters can't. Putting that code here
1476	* makes the fire_bow code much cleaner.	1500	* makes the fire_bow code much cleaner.
1477	* this function should only be called if 'op' is a player,	1501	* this function should only be called if 'op' is a player,
1478	* hence the function name.	1502	* hence the function name.
1479	*/	1503	*/
1480	int	1504	static int
1481	player_fire_bow (object *op, int dir)	1505	player_fire_bow (object *op, int dir)
1482	{	1506	{
1483	int ret;	1507	int ret;
1484		1508
1485	if (op->contr->bowtype == bow_bestarrow)	1509	if (op->contr->bowtype == bow_bestarrow)
…		…
1513	}	1537	}
1514		1538
1515	/* Fires a misc (wand/rod/horn) object in 'dir'.	1539	/* Fires a misc (wand/rod/horn) object in 'dir'.
1516	* Broken apart from 'fire' to keep it more readable.	1540	* Broken apart from 'fire' to keep it more readable.
1517	*/	1541	*/
1518	void	1542	static void
1519	fire_misc_object (object *op, int dir)	1543	fire_misc_object (object *op, int dir)
1520	{	1544	{
1521	object *item = op->contr->ranged_ob;	1545	object *item = op->contr->ranged_ob;
1522		1546
1523	if (!item)	1547	if (!item)
…		…
1530	{	1554	{
1531	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1555	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1532	return;	1556	return;
1533	}	1557	}
1534		1558
1535	if (!op->change_weapon (item))	1559	if (!op->apply (item))
1536	return;	1560	return;
1537		1561
1538	if (item->type == WAND)	1562	if (item->type == WAND)
1539	{	1563	{
1540	if (item->stats.food <= 0)	1564	if (item->stats.food <= 0)
…		…
1545	return;	1569	return;
1546	}	1570	}
1547	}	1571	}
1548	else if (item->type == ROD || item->type == HORN)	1572	else if (item->type == ROD || item->type == HORN)
1549	{	1573	{
1550	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1574	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1551		1575
1552	// using the maximum of the rods charge allows at least one spell cast	1576	// using the maximum of the rods charge allows at least one spell cast
1553	// for a rod or horn, this fixes some broken rods.	1577	// for a rod or horn, this fixes some broken rods.
1554	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1578	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1555	{	1579	{
1556	op->contr->play_sound (sound_find ("wand_poof"));	1580	op->contr->play_sound (sound_find ("wand_poof"));
1557		1581
1558	if (item->type == ROD)	1582	if (item->type == ROD)
1559	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1574	{	1598	{
1575	object *tmp;	1599	object *tmp;
1576		1600
1577	if (item->arch)	1601	if (item->arch)
1578	{	1602	{
1579	CLEAR_FLAG (item, FLAG_ANIMATE);	1603	item->clr_flag (FLAG_ANIMATE);
1580	item->face = item->arch->face;	1604	item->face = item->arch->face;
1581	item->set_speed (0);	1605	item->set_speed (0);
1582	}	1606	}
1583		1607
1584	if (object *pl = item->visible_to ())	1608	if (object *pl = item->visible_to ())
…		…
1591	}	1615	}
1592		1616
1593	/* Received a fire command for the player - go and do it.	1617	/* Received a fire command for the player - go and do it.
1594	*/	1618	*/
1595	bool	1619	bool
1596	fire (object *op, int dir)	1620	fire (object *who, int dir)
1597	{	1621	{
1598	int spellcost = 0;	1622	int spellcost = 0;
1599		1623
1600	player *pl = op->contr;	1624	player *pl = who->contr;
1601		1625
1602	if (pl->golem)	1626	if (pl->golem)
1603	{	1627	{
1604	control_golem (op->contr->golem, dir);	1628	control_golem (who->contr->golem, dir);
1605	return false;	1629	return false;
1606	}	1630	}
1607		1631
1608	object *ob = pl->ranged_ob;	1632	object *ob = pl->ranged_ob;
1609		1633
1610	if (!ob)	1634	if (!ob)
1611	return false;	1635	return false;
1612		1636
1613	if (op->speed_left > 0.f)	1637	if (who->speed_left > 0.f)
1614	--op->speed_left;	1638	--who->speed_left;
1615	else	1639	else
1616	return false;	1640	return false;
1617		1641
1618	if (!op->change_weapon (ob))	1642	if (!who->apply (ob))
1619	return false;	1643	return false;
1620		1644
1621	/* check for loss of invisiblity/hide */	1645	/* check for loss of invisiblity/hide */
1622	if (action_makes_visible (op))	1646	if (action_makes_visible (who))
1623	make_visible (op);	1647	make_visible (who);
1624		1648
1625	switch (ob->type)	1649	switch (ob->type)
1626	{	1650	{
1627	case BOW:	1651	case BOW:
1628	player_fire_bow (op, dir);	1652	player_fire_bow (who, dir);
1629	break;	1653	break;
1630		1654
1631	case SPELL:	1655	case SPELL:
1632	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1656	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1633	break;	1657	break;
1634		1658
1635	case BUILDER:	1659	case BUILDER:
1636	apply_map_builder (op, dir);	1660	apply_map_builder (who, dir);
1637	break;	1661	break;
1638		1662
1639	case SKILL:	1663	case SKILL:
1640	do_skill (op, op, ob, dir, 0);	1664	do_skill (who, who, ob, dir, 0);
1641	break;	1665	break;
1642		1666
		1667	case RANGED:
		1668	do_skill (who, ob, who->chosen_skill, dir, 0);
		1669	break;
		1670
1643	default:	1671	default:
1644	fire_misc_object (op, dir);	1672	fire_misc_object (who, dir);
1645	break;	1673	break;
1646	}	1674	}
1647		1675
1648	return true;	1676	return true;
1649	}	1677	}
1650		1678
1651	/* find_key	1679	static object *
1652	* We try to find a key for the door as passed. If we find a key
1653	* and successfully use it, we return the key, otherwise NULL
1654	* This function merges both normal and locked door, since the logic
1655	* for both is the same - just the specific key is different.
1656	* pl is the player,
1657	* inv is the objects inventory to searched
1658	* door is the door we are trying to match against.
1659	* This function can be called recursively to search containers.
1660	*/
1661	object *
1662	find_key (object *pl, object *container, object *door)	1680	find_key_ (object *pl, object *container, object *door)
1663	{	1681	{
1664	object *tmp, *key;	1682	object *tmp, *key;
1665		1683
1666	/* Should not happen, but sanity checking is never bad */	1684	/* Should not happen, but sanity checking is never bad */
1667	if (!container->inv)	1685	if (!container->inv)
…		…
1688	if (!tmp)	1706	if (!tmp)
1689	{	1707	{
1690	for (tmp = container->inv; tmp; tmp = tmp->below)	1708	for (tmp = container->inv; tmp; tmp = tmp->below)
1691	/* No reason to search empty containers */	1709	/* No reason to search empty containers */
1692	if (tmp->type == CONTAINER && tmp->inv)	1710	if (tmp->type == CONTAINER && tmp->inv)
1693	if ((key = find_key (pl, tmp, door)))	1711	if ((key = find_key_ (pl, tmp, door)))
1694	return key;	1712	return key;
1695		1713
1696	if (!tmp)	1714	if (!tmp)
1697	return 0;	1715	return 0;
1698	}	1716	}
…		…
1717	* inv must have been an container and must have been active.	1735	* inv must have been an container and must have been active.
1718	*	1736	*
1719	* Change the color so that the message doesn't disappear with	1737	* Change the color so that the message doesn't disappear with
1720	* all the others.	1738	* all the others.
1721	*/	1739	*/
1722	if (pl->contr->usekeys == key_inventory ||	1740	if (pl->contr->usekeys == key_inventory
1723	!QUERY_FLAG (container, FLAG_APPLIED) ||	1741	|| !container->flag [FLAG_APPLIED]
1724	(pl->contr->usekeys == keyrings && container->race != shstr_keys))	1742	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1725	{	1743	{
1726	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1744	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1727	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1745	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1728	return NULL;	1746	return NULL;
1729	}	1747	}
1730	}	1748	}
1731		1749
1732	return tmp;	1750	return tmp;
		1751	}
		1752
		1753	/* find_key
		1754	* We try to find a key for the door as passed. If we find a key
		1755	* and successfully use it, we return the key, otherwise NULL
		1756	* This function merges both normal and locked door, since the logic
		1757	* for both is the same - just the specific key is different.
		1758	* pl is the player,
		1759	* inv is the objects inventory to searched
		1760	* door is the door we are trying to match against.
		1761	* This function can be called recursively to search containers.
		1762	*/
		1763	object *
		1764	find_key (object *pl, object *container, object *door)
		1765	{
		1766	if (door->slaying && is_match_expr (door->slaying))
		1767	{
		1768	// for match expressions, we try to find the key by applying the match
		1769	// to the op itself, which is supposed to find the "key", instead
		1770	// of searching through containers ourselves.
		1771
		1772	return match_one (door->slaying, container, door, pl, pl);
		1773	}
		1774	else
		1775	return find_key_ (pl, container, door);
1733	}	1776	}
1734		1777
1735	/* moved door processing out of move_player_attack.	1778	/* moved door processing out of move_player_attack.
1736	* returns 1 if player has opened the door with a key	1779	* returns 1 if player has opened the door with a key
1737	* such that the caller should not do anything more,	1780	* such that the caller should not do anything more,
…		…
1787	* going to try and move (not fire weapons).	1830	* going to try and move (not fire weapons).
1788	*/	1831	*/
1789	bool	1832	bool
1790	move_player_attack (object *op, int dir)	1833	move_player_attack (object *op, int dir)
1791	{	1834	{
1792	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1835	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1793	{	1836	{
1794	--op->speed_left;	1837	--op->speed_left;
1795	return true;	1838	return true;
1796	}	1839	}
1797		1840
1798	int on_battleground;
1799
1800	sint16 nx = freearr_x[dir] + op->x;	1841	sint16 nx = freearr_x[dir] + op->x;
1801	sint16 ny = freearr_y[dir] + op->y;	1842	sint16 ny = freearr_y[dir] + op->y;
1802
1803	on_battleground = op_on_battleground (op, 0, 0);
1804		1843
1805	if (out_of_map (op->map, nx, ny))	1844	if (out_of_map (op->map, nx, ny))
1806	return false;	1845	return false;
1807		1846
1808	/* If braced, or can't move to the square, and it is not out of the	1847	/* If braced, or can't move to the square, and it is not out of the
…		…
1858	*/	1897	*/
1859	if (op->type == PLAYER	1898	if (op->type == PLAYER
1860	&& ((mon->owner && mon->owner->contr	1899	&& ((mon->owner && mon->owner->contr
1861	&& same_party (mon->owner->contr->party, op->contr->party))	1900	&& same_party (mon->owner->contr->party, op->contr->party))
1862	|| mon->owner == op)	1901	|| mon->owner == op)
1863	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1902	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1864	{	1903	{
1865	/* If we're braced, we don't want to switch places with it */	1904	/* If we're braced, we don't want to switch places with it */
1866	if (op->contr->braced)	1905	if (op->contr->braced)
1867	return false;	1906	return false;
1868		1907
…		…
1879	return true;	1918	return true;
1880	}	1919	}
1881	else	1920	else
1882	return false;	1921	return false;
1883	}	1922	}
		1923
		1924	bool on_battleground = op_on_battleground (op, 0, 0);
1884		1925
1885	/* in certain circumstances, you shouldn't attack friendly	1926	/* in certain circumstances, you shouldn't attack friendly
1886	* creatures. Note that if you are braced, you can't push	1927	* creatures. Note that if you are braced, you can't push
1887	* someone, but put it inside this loop so that you won't	1928	* someone, but put it inside this loop so that you won't
1888	* attack them either.	1929	* attack them either.
1889	*/	1930	*/
1890	if ((mon->type == PLAYER || mon->enemy != op)	1931	if ((mon->type == PLAYER || mon->enemy != op)
1891	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1932	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1892	&& ((op->contr->peaceful	1933	&& ((op->contr->peaceful
1893	|| (mon->type == PLAYER && mon->contr->peaceful))	1934	|| (mon->type == PLAYER && mon->contr->peaceful))
1894	&& !on_battleground))	1935	&& !on_battleground))
1895	{	1936	{
1896	if (op->speed_left > 0.f)	1937	if (op->speed_left > 0.f)
…		…
1912	}	1953	}
1913	}	1954	}
1914	/* If the object is a boulder or other rollable object, then	1955	/* If the object is a boulder or other rollable object, then
1915	* roll it if not braced. You can't roll it if you are braced.	1956	* roll it if not braced. You can't roll it if you are braced.
1916	*/	1957	*/
1917	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1958	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1918	{	1959	{
1919	if (op->speed_left > 0.f)	1960	if (op->speed_left > 0.f)
1920	{	1961	{
1921	--op->speed_left;	1962	--op->speed_left;
1922		1963
…		…
1931	* Way it works is like this: First, it must have some hit points	1972	* Way it works is like this: First, it must have some hit points
1932	* and be living. Then, it must be one of the following:	1973	* and be living. Then, it must be one of the following:
1933	* 1) Not a player, 2) A player, but of a different party. Note	1974	* 1) Not a player, 2) A player, but of a different party. Note
1934	* that party_number -1 is no party, so attacks can still happen.	1975	* that party_number -1 is no party, so attacks can still happen.
1935	*/	1976	*/
1936	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	1977	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1937	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	1978	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
1938	{	1979	{
1939	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	1980	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
1940	{	1981	{
1941	--op->contr->weapon_sp_left;	1982	--op->contr->weapon_sp_left;
…		…
1953	}	1994	}
1954		1995
1955	bool	1996	bool
1956	move_player (object *op, int dir)	1997	move_player (object *op, int dir)
1957	{	1998	{
1958	int pick;
1959
1960	if (!op->map || op->map->in_memory != MAP_ACTIVE)	1999	if (!op->map || op->map->in_memory != MAP_ACTIVE)
1961	return 0;	2000	return 0;
1962		2001
1963	/* Sanity check: make sure dir is valid */	2002	/* Sanity check: make sure dir is valid */
1964	if ((dir < 0) || (dir >= 9))	2003	if (dir < 0 || dir > 8)
1965	{	2004	{
1966	LOG (llevError, "move_player: invalid direction %d\n", dir);	2005	LOG (llevError, "move_player: invalid direction %d\n", dir);
1967	return 0;	2006	return 0;
1968	}	2007	}
1969		2008
1970	/* peterm: added following line */	2009	/* peterm: added following line */
1971	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2010	if (op->flag [FLAG_CONFUSED] && dir)
1972	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2011	dir = absdir (dir + rndm (3) + rndm (3) - 2);
1973		2012
1974	op->facing = dir;	2013	op->facing = dir;
1975		2014
1976	if (op->flag [FLAG_HIDDEN])	2015	if (op->flag [FLAG_HIDDEN])
1977	do_hidden_move (op);	2016	do_hidden_move (op);
1978		2017
1979	bool retval;	2018	bool retval;
		2019	int pick = 0;
1980		2020
1981	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2021	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
1982	retval = RESULT_INT (0);	2022	retval = RESULT_INT (0);
1983	else if (op->contr->fire_on)	2023	else if (op->contr->fire_on)
1984	retval = fire (op, dir);	2024	retval = fire (op, dir);
…		…
2015	* players.	2055	* players.
2016	*/	2056	*/
2017	bool	2057	bool
2018	handle_newcs_player (object *op)	2058	handle_newcs_player (object *op)
2019	{	2059	{
2020	if (QUERY_FLAG (op, FLAG_SCARED))	2060	if (op->flag [FLAG_SCARED])
2021	{	2061	{
2022	if (op->speed_left > 0.f)	2062	if (op->speed_left > 0.f)
2023	{	2063	{
2024	--op->speed_left;	2064	--op->speed_left;
2025	flee_player (op);	2065	flee_player (op);
…		…
2041	return move_player (op, op->direction);	2081	return move_player (op, op->direction);
2042		2082
2043	return false;	2083	return false;
2044	}	2084	}
2045		2085
2046	int	2086	static int
2047	save_life (object *op)	2087	save_life (object *op)
2048	{	2088	{
2049	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2089	if (!op->flag [FLAG_LIFESAVE])
2050	return 0;	2090	return 0;
2051		2091
2052	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2092	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2053	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2093	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2054	{	2094	{
2055	op->play_sound (sound_find ("ob_evaporate"));	2095	op->play_sound (sound_find ("ob_evaporate"));
2056	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2096	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2057		2097
2058	tmp->destroy ();	2098	tmp->destroy ();
2059	CLEAR_FLAG (op, FLAG_LIFESAVE);	2099	op->clr_flag (FLAG_LIFESAVE);
2060		2100
2061	if (op->stats.hp < 0)	2101	if (op->stats.hp < 0)
2062	op->stats.hp = op->stats.maxhp;	2102	op->stats.hp = op->stats.maxhp;
2063		2103
2064	if (op->stats.food < 0)	2104	if (op->stats.food < 0)
2065	op->stats.food = 999;	2105	op->stats.food = MAX_FOOD;
2066		2106
2067	op->update_stats ();	2107	op->update_stats ();
2068	return 1;	2108	return 1;
2069	}	2109	}
2070		2110
2071	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2111	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2072	CLEAR_FLAG (op, FLAG_LIFESAVE);	2112	op->clr_flag (FLAG_LIFESAVE);
2073	enter_player_savebed (op); /* bring him home. */	2113	enter_player_savebed (op); /* bring him home. */
2074	return 0;	2114	return 0;
2075	}	2115	}
2076		2116
2077	/* This goes throws the inventory and removes unpaid objects, and puts them	2117	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2084	{	2124	{
2085	while (op)	2125	while (op)
2086	{	2126	{
2087	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2127	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2088		2128
2089	if (QUERY_FLAG (op, FLAG_UNPAID))	2129	if (op->flag [FLAG_UNPAID])
2090	op->insert_at (env);	2130	op->insert_at (env);
2091	else if (op->inv)	2131	else if (op->inv)
2092	drop_unpaid_items (op->inv, env);	2132	drop_unpaid_items (op->inv, env);
2093		2133
2094	op = next;	2134	op = next;
…		…
2098	void	2138	void
2099	object::drop_unpaid_items ()	2139	object::drop_unpaid_items ()
2100	{	2140	{
2101	if (!flag [FLAG_REMOVED])	2141	if (!flag [FLAG_REMOVED])
2102	::drop_unpaid_items (inv, this);	2142	::drop_unpaid_items (inv, this);
2103	}
2104
2105	/*
2106	* Returns pointer a static string containing gravestone text
2107	* Moved from apply.c to player.c - player.c is what
2108	* actually uses this function. player.c may not be quite the
2109	* best, a misc file for object actions is probably better,
2110	* but there isn't one in the server directory.
2111	*/
2112	const char *
2113	gravestone_text (object *op)
2114	{
2115	static dynbuf_text buf;
2116
2117	buf << "---- R.I.P. ----\n\n"
2118	<< op->name;
2119
2120	if (op->type == PLAYER)
2121	buf << " the " << op->contr->title;
2122
2123	buf << "\n\n";
2124
2125	buf << "who was level ";
2126	buf << (sint32)op->level << "\n\n" // OO breakdown
2127	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2128
2129	if (op->type == PLAYER)
2130	buf << "by " << op->contr->killer_name () << ".\n\n";
2131
2132	{
2133	static char buf2[128];
2134	time_t now = time (NULL);
2135	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2136	buf << buf2;
2137	}
2138
2139	return buf;
2140	}	2143	}
2141		2144
2142	void	2145	void
2143	do_some_living (object *op)	2146	do_some_living (object *op)
2144	{	2147	{
…		…
2161	* alternate it here for it to work correctly.	2164	* alternate it here for it to work correctly.
2162	*/	2165	*/
2163	if (pticks & 2)	2166	if (pticks & 2)
2164	op->invisible--;	2167	op->invisible--;
2165	}	2168	}
2166	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2169	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2167	{	2170	{
2168	if (!op->invisible--)	2171	if (!op->invisible--)
2169	{	2172	{
2170	make_visible (op);	2173	make_visible (op);
2171	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2174	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2238	if (op->stats.sp < op->stats.maxsp)	2241	if (op->stats.sp < op->stats.maxsp)
2239	{	2242	{
2240	op->stats.sp++;	2243	op->stats.sp++;
2241		2244
2242	/* dms do not consume food */	2245	/* dms do not consume food */
2243	if (!QUERY_FLAG (op, FLAG_WIZ))	2246	if (!op->flag [FLAG_WIZ])
2244	{	2247	{
2245	op->stats.food--;	2248	op->stats.food--;
2246		2249
2247	if (op->contr->digestion < 0)	2250	if (op->contr->digestion < 0)
2248	op->stats.food += op->contr->digestion;	2251	op->stats.food += op->contr->digestion;
…		…
2282	if (op->stats.hp < op->stats.maxhp)	2285	if (op->stats.hp < op->stats.maxhp)
2283	{	2286	{
2284	op->stats.hp++;	2287	op->stats.hp++;
2285		2288
2286	/* dms do not consume food */	2289	/* dms do not consume food */
2287	if (!QUERY_FLAG (op, FLAG_WIZ))	2290	if (!op->flag [FLAG_WIZ])
2288	{	2291	{
2289	op->stats.food--;	2292	op->stats.food--;
2290		2293
2291	if (op->contr->digestion < 0)	2294	if (op->contr->digestion < 0)
2292	op->stats.food += op->contr->digestion;	2295	op->stats.food += op->contr->digestion;
…		…
2319	penalty = max (0, -op->contr->digestion);	2322	penalty = max (0, -op->contr->digestion);
2320		2323
2321	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2324	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2322		2325
2323	/* dms do not consume food */	2326	/* dms do not consume food */
2324	if (!QUERY_FLAG (op, FLAG_WIZ))	2327	if (!op->flag [FLAG_WIZ])
2325	op->stats.food--;	2328	op->stats.food--;
2326	}	2329	}
2327		2330
2328	if (op->stats.food < 0 && op->stats.hp >= 0)	2331	if (op->stats.food < 0 && op->stats.hp >= 0)
2329	{	2332	{
2330	object *flesh = 0;	2333	object *flesh = 0;
2331		2334
2332	for_inv_removable (op, tmp)	2335	for_inv_removable (op, tmp)
2333	{	2336	{
2334	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2337	if (tmp->flag [FLAG_UNPAID])
2335	continue;	2338	continue;
2336		2339
2337	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2340	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2338	{	2341	{
2339	op->statusmsg ("You blindly grab for a bite of food. "	2342	op->statusmsg ("You blindly grab for a bite of food. "
2340	"H<To prevent you from starving, you ate some random item from your backpack.>");	2343	"H<To prevent you from starving, you ate some random item from your backpack.>");
2341	manual_apply (op, tmp, 0);	2344	op->apply (tmp);
2342		2345
2343	if (op->stats.food >= 0 || op->stats.hp < 0)	2346	if (op->stats.food >= 0 || op->stats.hp < 0)
2344	break;	2347	break;
2345	}	2348	}
2346	else if (tmp->type == FLESH)	2349	else if (tmp->type == FLESH)
…		…
2352	*/	2355	*/
2353	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2356	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2354	{	2357	{
2355	op->statusmsg ("You blindly grab for a bite of food. "	2358	op->statusmsg ("You blindly grab for a bite of food. "
2356	"H<To prevent you from starving, you ate some random item from your backpack.>");	2359	"H<To prevent you from starving, you ate some random item from your backpack.>");
2357	manual_apply (op, flesh, 0);	2360	op->apply (flesh);
2358	}	2361	}
2359		2362
2360	// If player is still starving, alert him!	2363	// If player is still starving, alert him!
2361	if (op->stats.food < 0)	2364	if (op->stats.food < 0)
2362	op->failmsg ("You are starving! "	2365	op->failmsg ("You are starving! "
…		…
2374	op->contr->killer->destroy ();	2377	op->contr->killer->destroy ();
2375	}	2378	}
2376	}	2379	}
2377		2380
2378	/* killer should be set here already */	2381	/* killer should be set here already */
2379	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2382	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2380	kill_player (op);	2383	kill_player (op);
2381	}	2384	}
2382	}	2385	}
2383		2386
2384	/* If the player should die (lack of hp, food, etc), we call this.	2387	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2399	return;	2402	return;
2400		2403
2401	dynbuf_text deathtab;	2404	dynbuf_text deathtab;
2402		2405
2403	/* restore player */	2406	/* restore player */
2404	at = archetype::find ("poisoning");	2407	at = archetype::find (shstr_poisoning);
2405	if (object *tmp = present_arch_in_ob (at, op))	2408	if (object *tmp = present_arch_in_ob (at, op))
2406	{	2409	{
2407	tmp->destroy ();	2410	tmp->destroy ();
2408	deathtab << "Your body feels cleansed...\r";	2411	deathtab << "Your body feels cleansed...\r";
2409	}	2412	}
2410		2413
2411	at = archetype::find ("confusion");	2414	at = archetype::find (shstr_confusion);
2412	if (object *tmp = present_arch_in_ob (at, op))	2415	if (object *tmp = present_arch_in_ob (at, op))
2413	{	2416	{
2414	tmp->destroy ();	2417	tmp->destroy ();
2415	deathtab << "Your mind feels clearer...\r";	2418	deathtab << "Your mind feels clearer...\r";
2416	}	2419	}
…		…
2418	cure_disease (op, 0, 0); /* remove any disease */	2421	cure_disease (op, 0, 0); /* remove any disease */
2419		2422
2420	max_it (op->stats.hp , op->stats.maxhp);	2423	max_it (op->stats.hp , op->stats.maxhp);
2421	max_it (op->stats.sp , op->stats.maxsp);	2424	max_it (op->stats.sp , op->stats.maxsp);
2422	max_it (op->stats.grace, op->stats.maxgrace);	2425	max_it (op->stats.grace, op->stats.maxgrace);
2423
2424	if (op->stats.food <= 0)	2426	max_it (op->stats.food , 200);
2425	op->stats.food = 999;
2426		2427
2427	// remove all spell effects that are active	2428	// remove all spell effects that are active
2428	// to avoid long-term effects such as word-of-recall	2429	// to avoid long-term effects such as word-of-recall
2429	for (object *item = op->inv; item; )	2430	for (object *item = op->inv; item; )
2430	{	2431	{
…		…
2443	if (op_on_battleground (op, &x, &y))	2444	if (op_on_battleground (op, &x, &y))
2444	{	2445	{
2445	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2446	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2446		2447
2447	/* create a bodypart-trophy to make the winner happy */	2448	/* create a bodypart-trophy to make the winner happy */
2448	if (object *tmp = arch_to_object (archetype::find ("finger")))	2449	object *tmp = archetype::find (shstr_finger)->instance ();
2449	{	2450
2450	tmp->name = format ("%s's finger" , &op->name);	2451	tmp->name = format ("%s's finger" , &op->name);
2451	tmp->name_pl = format ("%s's fingers", &op->name);	2452	tmp->name_pl = format ("%s's fingers", &op->name);
2452	tmp->msg = format (	2453	tmp->msg = format (
2453	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2454	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2454	&op->name, op->contr->title,	2455	&op->name, op->contr->title,
2455	(int)op->level,	2456	(int)op->level,
2456	op->contr->killer_name ()	2457	op->contr->killer_name ()
2457	);	2458	);
2458	tmp->value = 0, tmp->type = 0;	2459	tmp->value = 0, tmp->type = 0;
2459	tmp->materialname = "organics";	2460	tmp->material = name_to_material (shstr_organic);
2460	tmp->insert_at (op, tmp);	2461	tmp->insert_at (op, tmp);
2461	}
2462		2462
2463	/* teleport defeated player to new destination */	2463	/* teleport defeated player to new destination */
2464	transfer_ob (op, x, y, 0, NULL);	2464	transfer_ob (op, x, y, 0, NULL);
2465	op->contr->braced = 0;	2465	op->contr->braced = 0;
2466		2466
…		…
2528	lost_a_stat = 1;	2528	lost_a_stat = 1;
2529	}	2529	}
2530	else	2530	else
2531	{	2531	{
2532	/* deplete a stat */	2532	/* deplete a stat */
2533	archetype *deparch = archetype::find ("depletion");	2533	archetype *deparch = archetype::find (shstr_depletion);
2534	object *dep;	2534	object *dep;
2535		2535
2536	dep = present_arch_in_ob (deparch, op);	2536	dep = present_arch_in_ob (deparch, op);
2537	if (!dep)	2537	if (!dep)
2538	{	2538	{
2539	dep = arch_to_object (deparch);	2539	dep = deparch->instance ();
2540	insert_ob_in_ob (dep, op);	2540	insert_ob_in_ob (dep, op);
2541	}	2541	}
2542	lose_this_stat = 1;	2542	lose_this_stat = 1;
2543	if (settings.balanced_stat_loss)	2543	if (settings.balanced_stat_loss)
2544	{	2544	{
…		…
2582	* difference.	2582	* difference.
2583	*/	2583	*/
2584	if (this_stat >= -50)	2584	if (this_stat >= -50)
2585	{	2585	{
2586	change_attr_value (&(dep->stats), i, -1);	2586	change_attr_value (&(dep->stats), i, -1);
2587	SET_FLAG (dep, FLAG_APPLIED);	2587	dep->set_flag (FLAG_APPLIED);
2588	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2588	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2589	op->update_stats ();	2589	op->update_stats ();
2590	lost_a_stat = 1;	2590	lost_a_stat = 1;
2591	}	2591	}
2592	}	2592	}
…		…
2610	#endif	2610	#endif
2611		2611
2612	/* Put a gravestone up where the character 'almost' died. List the	2612	/* Put a gravestone up where the character 'almost' died. List the
2613	* exp loss on the stone.	2613	* exp loss on the stone.
2614	*/	2614	*/
2615	tmp = arch_to_object (archetype::find ("gravestone"));	2615	tmp = archetype::find (shstr_gravestone)->instance ();
2616	tmp->name = format ("%s's gravestone", &op->name);	2616	tmp->name = format ("%s's gravestone", &op->name);
2617	tmp->name_pl = format ("%s's gravestones", &op->name);	2617	tmp->name_pl = format ("%s's gravestones", &op->name);
2618	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2618	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2619	&op->name, op->contr->title, op->contr->killer_name ());	2619	&op->name, op->contr->title, op->contr->killer_name ());
2620	tmp->x = op->x, tmp->y = op->y;	2620	tmp->x = op->x, tmp->y = op->y;
…		…
2663		2663
2664	force = get_archetype (FORCE_NAME);	2664	force = get_archetype (FORCE_NAME);
2665	/* 50 ticks should be enough time for the spell to abate */	2665	/* 50 ticks should be enough time for the spell to abate */
2666	force->speed = 0.1f;	2666	force->speed = 0.1f;
2667	force->speed_left = -5.f;	2667	force->speed_left = -5.f;
2668	SET_FLAG (force, FLAG_APPLIED);	2668	force->set_flag (FLAG_APPLIED);
2669	for (at = 0; at < NROFATTACKS; at++)	2669	for (at = 0; at < NROFATTACKS; at++)
2670	if (will_kill_again & (1 << at))	2670	if (will_kill_again & (1 << at))
2671	force->resist[at] = 100;	2671	force->resist[at] = 100;
2672		2672
2673	insert_ob_in_ob (force, op);	2673	insert_ob_in_ob (force, op);
…		…
2675	}	2675	}
2676		2676
2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2678	}	2678	}
2679		2679
2680	void	2680	static void
2681	loot_object (object *op)	2681	loot_object (object *op)
2682	{ /* Grab and destroy some treasure */	2682	{ /* Grab and destroy some treasure */
2683	object *tmp, *tmp2, *next;	2683	object *tmp, *tmp2, *next;
2684		2684
2685	op->close_container (); /* close open sack first */	2685	op->close_container (); /* close open sack first */
…		…
2695	tmp->x = op->x, tmp->y = op->y;	2695	tmp->x = op->x, tmp->y = op->y;
2696		2696
2697	if (tmp->type == CONTAINER)	2697	if (tmp->type == CONTAINER)
2698	loot_object (tmp); /* empty container to ground */	2698	loot_object (tmp); /* empty container to ground */
2699		2699
2700	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))))
2701	{	2701	{
2702	if (tmp->nrof > 1)	2702	if (tmp->nrof > 1)
2703	{	2703	{
2704	tmp->decrease (rndm (1, tmp->nrof - 1));	2704	tmp->decrease (rndm (1, tmp->nrof - 1));
2705	insert_ob_in_map (tmp, op->map, NULL, 0);	2705	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2716	* fix_weight(): Check recursively the weight of all players, and fix	2716	* fix_weight(): Check recursively the weight of all players, and fix
2717	* 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
2718	* was changed.	2718	* was changed.
2719	*/	2719	*/
2720	void	2720	void
2721	fix_weight (void)	2721	fix_weight ()
2722	{	2722	{
2723	for_all_players (pl)	2723	for_all_players (pl)
2724	{	2724	{
2725	sint32 old = pl->ob->carrying;	2725	sint32 old = pl->ob->carrying;
2726		2726
…		…
2733	}	2733	}
2734	}	2734	}
2735	}	2735	}
2736		2736
2737	void	2737	void
2738	fix_luck (void)	2738	fix_luck ()
2739	{	2739	{
2740	for_all_players (pl)	2740	for_all_players (pl)
2741	if (!pl->ob->contr->ns->state)	2741	if (!pl->ob->contr->ns->state)
2742	pl->ob->change_luck (0);	2742	pl->ob->change_luck (0);
2743	}	2743	}
…		…
2795	}	2795	}
2796		2796
2797	int	2797	int
2798	is_true_undead (object *op)	2798	is_true_undead (object *op)
2799	{	2799	{
2800	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2800	if (op->arch->flag [FLAG_UNDEAD])
2801	return 1;	2801	return 1;
2802		2802
2803	return 0;	2803	return 0;
2804	}	2804	}
2805		2805
…		…
2903		2903
2904	if (who->type == PLAYER)	2904	if (who->type == PLAYER)
2905	player = 1;	2905	player = 1;
2906		2906
2907	else	2907	else
2908	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2908	friendly = who->flag [FLAG_FRIENDLY];
2909		2909
2910	/* search adjacent squares */	2910	/* search adjacent squares */
2911	for (i = 1; i < 9; i++)	2911	for (i = 1; i < 9; i++)
2912	{	2912	{
2913	x = who->x + freearr_x[i];	2913	x = who->x + freearr_x[i];
…		…
2922	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)))
2923	continue;	2923	continue;
2924		2924
2925	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)
2926	{	2926	{
2927	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])
2928	return 1;	2928	return 1;
2929	else if (tmp->type == PLAYER)	2929	else if (tmp->type == PLAYER)
2930	{	2930	{
2931	/*don't let a hidden DM prevent you from hiding */	2931	/*don't let a hidden DM prevent you from hiding */
2932	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	2932	if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2933	return 1;	2933	return 1;
2934	}	2934	}
2935	}	2935	}
2936	}	2936	}
2937	return 0;	2937	return 0;
…		…
2987	}	2987	}
2988		2988
2989	return 0;	2989	return 0;
2990	}	2990	}
2991		2991
2992	/* routine for both players and monsters. We call this when
2993	* there is a possibility for our action distrubing our hiding
2994	* place or invisiblity spell. Artefact invisiblity causes
2995	* "noise" instead. If we arent invisible to begin with, we
2996	* return 0.
2997	*/
2998	int
2999	action_makes_visible (object *op)
3000	{
3001	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3002	{
3003	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3004	{
3005	// artefact invisibility is permanent, but we still make noise
3006	// this is important for game-balance.
3007	if (op->contr)
3008	op->make_noise ();
3009
3010	return 0;
3011	}
3012
3013	if (op->contr && op->contr->tmp_invis == 0)
3014	return 0;
3015
3016	/* If monsters, they should become visible */
3017	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3018	{
3019	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3020	return 1;
3021	}
3022	}
3023
3024	return 0;
3025	}
3026
3027	/* op_on_battleground - checks if the given object op (usually	2992	/* op_on_battleground - checks if the given object op (usually
3028	* a player) is standing on a valid battleground-tile,	2993	* a player) is standing on a valid battleground-tile,
3029	* function returns TRUE/FALSE. If true x, y returns the battleground	2994	* function returns TRUE/FALSE. If true x, y returns the battleground
3030	* -exit-coord. (and if x, y not NULL)	2995	* -exit-coord. (and if x, y not NULL)
3031	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	2996	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
…		…
3041	* and the exit-coordinates sp/hp must both be > 0.	3006	* and the exit-coordinates sp/hp must both be > 0.
3042	* => The intention here is to prevent abuse of the battleground-	3007	* => The intention here is to prevent abuse of the battleground-
3043	* feature (like pickable or hidden battleground tiles). */	3008	* feature (like pickable or hidden battleground tiles). */
3044	for (object *tmp = op->below; tmp; tmp = tmp->below)	3009	for (object *tmp = op->below; tmp; tmp = tmp->below)
3045	{	3010	{
3046	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3011	if (tmp->flag [FLAG_IS_FLOOR])
3047	{	3012	{
3048	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3013	if (tmp->flag [FLAG_NO_PICK]
3049	&& tmp->type == BATTLEGROUND	3014	&& tmp->type == BATTLEGROUND
3050	&& tmp->name == shstr_battleground	3015	&& tmp->name == shstr_battleground
3051	&& EXIT_X (tmp) && EXIT_Y (tmp))	3016	&& EXIT_X (tmp) && EXIT_Y (tmp))
3052	{	3017	{
3053	/* before we assign the exit, check if this is a teambattle */	3018	/* before we assign the exit, check if this is a teambattle */
3054	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))
3055	{
3056	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)
3057	{	3022	{
3058	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3059	{
3060	if (x && y)	3023	if (x && y)
3061	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3024	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3062		3025
3063	return 1;	3026	return 1;
3064	}
3065	}	3027	}
3066	}
3067		3028
3068	if (x && y)	3029	if (x && y)
3069	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3030	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3070		3031
3071	return 1;	3032	return 1;
…		…
3209	else	3170	else
3210	j = 1;	3171	j = 1;
3211	strcat (buf, spellpathnames[i]);	3172	strcat (buf, spellpathnames[i]);
3212	}	3173	}
3213	}	3174	}
		3175
3214	strcat (buf, ".");	3176	strcat (buf, ".");
3215	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3177	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3216	}	3178	}
3217		3179
3218	/* evtl. adding flags: */	3180	/* evtl. adding flags: */
3219	if (QUERY_FLAG (item, FLAG_XRAYS))	3181	if (item->flag [FLAG_XRAYS])
3220	SET_FLAG (skin, FLAG_XRAYS);	3182	skin->set_flag (FLAG_XRAYS);
3221	if (QUERY_FLAG (item, FLAG_STEALTH))	3183	if (item->flag [FLAG_STEALTH])
3222	SET_FLAG (skin, FLAG_STEALTH);	3184	skin->set_flag (FLAG_STEALTH);
3223	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3185	if (item->flag [FLAG_SEE_IN_DARK])
3224	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3186	skin->set_flag (FLAG_SEE_IN_DARK);
3225		3187
3226	/* print message if there is one */	3188	/* print message if there is one */
3227	if (item->msg != NULL)	3189	if (item->msg != NULL)
3228	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3190	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3229	}	3191	}
3230	else	3192	else
3231	{	3193	{
3232	/* generate misc. treasure */	3194	/* generate misc. treasure */
3233	tmp = arch_to_object (tr->item);	3195	tmp = tr->item->instance ();
3234	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));
3235	who->insert (tmp);	3197	who->insert (tmp);
3236	}	3198	}
3237	}	3199	}
3238		3200
3239	/**	3201	//-GPL
3240	* Unready an object for a player. This function does nothing if the object was
3241	* not readied.
3242	*/
3243	void
3244	player_unready_range_ob (player *pl, object *ob)
3245	{
3246	if (pl->ob->current_weapon == ob)
3247	pl->ob->current_weapon = 0;
3248
3249	if (pl->combat_ob == ob)
3250	pl->combat_ob = 0;
3251
3252	if (pl->ranged_ob == ob)
3253	pl->ranged_ob = 0;
3254	}
3255		3202
3256	sint8	3203	sint8
3257	player::darkness_at (maptile *map, int x, int y) const	3204	player::darkness_at (maptile *map, int x, int y) const
3258	{	3205	{
3259	if (!ns)	3206	if (!ns)
…		…
3286	{	3233	{
3287	play_sound (sound_find ("generic_failure"));	3234	play_sound (sound_find ("generic_failure"));
3288	statusmsg (msg, color);	3235	statusmsg (msg, color);
3289	}	3236	}
3290		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