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.238 by root, Thu Nov 5 16:09:51 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 ()
273	{	244	{
274	/* Clear item stack */	245	/* Clear item stack */
275	free (stack_items);	246	free (stack_items);
		247	}
		248
		249	/*
		250	* get_player_archetype() return next player archetype from archetype
		251	* list. Not very efficient routine, but used only creating new players.
		252	* Note: there MUST be at least one player archetype!
		253	*/
		254	static archetype *
		255	get_player_archetype (archetype *at)
		256	{
		257	// archetypes could have been reloaded
		258	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		259
		260	if (!nat)
		261	return at;
		262
		263	archvec::iterator i = archetypes.find (nat);
		264
		265	for (;;)
		266	{
		267	if (++i == archetypes.end ())
		268	i = archetypes.begin ();
		269	else if (*i == at)
		270	cleanup ("not a single player archetype found");
		271
		272	if ((*i)->type == PLAYER)
		273	return *i;
		274	}
276	}	275	}
277		276
278	/* Tries to add player on the connection passed in ns.	277	/* Tries to add player on the connection passed in ns.
279	* All we can really get in this is some settings like host and display	278	* All we can really get in this is some settings like host and display
280	* mode.	279	* mode.
…		…
282	player *	281	player *
283	player::create ()	282	player::create ()
284	{	283	{
285	player *pl = new player;	284	player *pl = new player;
286		285
287	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
288		287
289	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
290	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
291	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
292		291
293	set_first_map (pl->ob);	292	set_first_map (pl->ob);
294		293
295	return pl;	294	return pl;
296	}
297
298	/*
299	* get_player_archetype() return next player archetype from archetype
300	* list. Not very efficient routine, but used only creating new players.
301	* Note: there MUST be at least one player archetype!
302	*/
303	archetype *
304	get_player_archetype (archetype *at)
305	{
306	// archetypes could have been reloaded
307	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
308
309	if (!nat)
310	return at;
311
312	archvec::iterator i = archetypes.find (nat);
313
314	for (;;)
315	{
316	if (++i == archetypes.end ())
317	i = archetypes.begin ();
318	else if (*i == at)
319	cleanup ("not a single player archetype found");
320
321	if ((*i)->type == PLAYER)
322	return *i;
323	}
324	}	295	}
325		296
326	object *	297	object *
327	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
328	{	299	{
…		…
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 */
1157	}	1129	}
1158		1130
1159	return !stop;	1131	return !stop;
1160	}	1132	}
1161		1133
		1134	/* routine for both players and monsters. We call this when
		1135	* there is a possibility for our action distrubing our hiding
		1136	* place or invisiblity spell. Artefact invisiblity causes
		1137	* "noise" instead. If we arent invisible to begin with, we
		1138	* return 0.
		1139	*/
		1140	static int
		1141	action_makes_visible (object *op)
		1142	{
		1143	if (op->invisible && op->flag [FLAG_ALIVE])
		1144	{
		1145	if (op->flag [FLAG_MAKE_INVIS])
		1146	{
		1147	// artefact invisibility is permanent, but we still make noise
		1148	// this is important for game-balance.
		1149	if (op->contr)
		1150	op->make_noise ();
		1151
		1152	return 0;
		1153	}
		1154
		1155	if (op->contr && op->contr->tmp_invis == 0)
		1156	return 0;
		1157
		1158	/* If monsters, they should become visible */
		1159	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1160	{
		1161	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1162	return 1;
		1163	}
		1164	}
		1165
		1166	return 0;
		1167	}
		1168
1162	/*	1169	/*
1163	* Find an arrow in the inventory and after that	1170	* Find an arrow in the inventory and after that
1164	* in the right type container (quiver). Pointer to the	1171	* in the right type container (quiver). Pointer to the
1165	* found object is returned.	1172	* found object is returned.
1166	*/	1173	*/
1167	object *	1174	static object *
1168	find_arrow (object *op, const char *type)	1175	find_arrow (object *op, const char *type)
1169	{	1176	{
1170	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1177	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1171	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1178	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1172	return splay (tmp);	1179	return splay (tmp);
1173		1180
1174	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1181	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1175	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))
1176	if (object *arrow = find_arrow (tmp, type))	1183	if (object *arrow = find_arrow (tmp, type))
1177	{	1184	{
1178	splay (tmp);	1185	splay (tmp);
1179	return arrow;	1186	return arrow;
1180	}	1187	}
…		…
1186	* 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
1187	* 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
1188	* 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
1189	* 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.
1190	*/	1197	*/
1191	object *	1198	static object *
1192	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)
1193	{	1200	{
1194	object *tmp = NULL, *arrow, *ntmp;	1201	object *tmp = NULL, *arrow, *ntmp;
1195	int attacknum, attacktype, betterby = 0, i;	1202	int attacknum, attacktype, betterby = 0, i;
1196		1203
1197	if (!type)	1204	if (!type)
1198	return NULL;	1205	return NULL;
1199		1206
1200	for (arrow = op->inv; arrow; arrow = arrow->below)	1207	for (arrow = op->inv; arrow; arrow = arrow->below)
1201	{	1208	{
1202	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1209	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1203	{	1210	{
1204	i = 0;	1211	i = 0;
1205	ntmp = find_better_arrow (arrow, target, type, &i);	1212	ntmp = find_better_arrow (arrow, target, type, &i);
1206		1213
1207	if (i > betterby)	1214	if (i > betterby)
…		…
1265	* find_better_arrow to find a decent arrow to use.	1272	* find_better_arrow to find a decent arrow to use.
1266	* op = the shooter	1273	* op = the shooter
1267	* type = bow->race	1274	* type = bow->race
1268	* dir = fire direction	1275	* dir = fire direction
1269	*/	1276	*/
1270	object *	1277	static object *
1271	pick_arrow_target (object *op, shstr_cmp type, int dir)	1278	pick_arrow_target (object *op, shstr_cmp type, int dir)
1272	{	1279	{
1273	object *tmp = NULL;	1280	object *tmp = NULL;
1274	maptile *m;	1281	maptile *m;
1275	int i, mflags, found, number;	1282	int i, mflags, found, number;
…		…
1308	break;	1315	break;
1309	}	1316	}
1310		1317
1311	if (mflags & P_IS_ALIVE)	1318	if (mflags & P_IS_ALIVE)
1312	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)
1313	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1320	if (tmp->flag [FLAG_ALIVE])
1314	break;	1321	break;
1315	}	1322	}
1316		1323
1317	if (!tmp)	1324	if (!tmp)
1318	return find_arrow (op, type);	1325	return find_arrow (op, type);
…		…
1379	{	1386	{
1380	if (op->type == PLAYER)	1387	if (op->type == PLAYER)
1381	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);
1382	/* 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 */
1383	else	1390	else
1384	CLEAR_FLAG (op, FLAG_READY_BOW);	1391	op->clr_flag (FLAG_READY_BOW);
1385		1392
1386	return 0;	1393	return 0;
1387	}	1394	}
1388	}	1395	}
1389		1396
…		…
1438	#endif	1445	#endif
1439		1446
1440	SET_ANIMATION (arrow, arrow->direction);	1447	SET_ANIMATION (arrow, arrow->direction);
1441		1448
1442	/* update the speed */	1449	/* update the speed */
1443	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1444	+ bow->stats.dam / 7.f;
1445		1450
1446	arrow->set_speed (max (arrow->speed, 2.f));
1447	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	));
1448		1456
1449	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;
1450		1458
1451	if (op->type == PLAYER)	1459	if (op->type == PLAYER)
1452	{	1460	{
…		…
1490	* but monsters can't. Putting that code here	1498	* but monsters can't. Putting that code here
1491	* makes the fire_bow code much cleaner.	1499	* makes the fire_bow code much cleaner.
1492	* this function should only be called if 'op' is a player,	1500	* this function should only be called if 'op' is a player,
1493	* hence the function name.	1501	* hence the function name.
1494	*/	1502	*/
1495	int	1503	static int
1496	player_fire_bow (object *op, int dir)	1504	player_fire_bow (object *op, int dir)
1497	{	1505	{
1498	int ret;	1506	int ret;
1499		1507
1500	if (op->contr->bowtype == bow_bestarrow)	1508	if (op->contr->bowtype == bow_bestarrow)
…		…
1528	}	1536	}
1529		1537
1530	/* Fires a misc (wand/rod/horn) object in 'dir'.	1538	/* Fires a misc (wand/rod/horn) object in 'dir'.
1531	* Broken apart from 'fire' to keep it more readable.	1539	* Broken apart from 'fire' to keep it more readable.
1532	*/	1540	*/
1533	void	1541	static void
1534	fire_misc_object (object *op, int dir)	1542	fire_misc_object (object *op, int dir)
1535	{	1543	{
1536	object *item = op->contr->ranged_ob;	1544	object *item = op->contr->ranged_ob;
1537		1545
1538	if (!item)	1546	if (!item)
…		…
1545	{	1553	{
1546	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1554	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1547	return;	1555	return;
1548	}	1556	}
1549		1557
1550	if (!op->change_weapon (item))	1558	if (!op->apply (item))
1551	return;	1559	return;
1552		1560
1553	if (item->type == WAND)	1561	if (item->type == WAND)
1554	{	1562	{
1555	if (item->stats.food <= 0)	1563	if (item->stats.food <= 0)
…		…
1560	return;	1568	return;
1561	}	1569	}
1562	}	1570	}
1563	else if (item->type == ROD || item->type == HORN)	1571	else if (item->type == ROD || item->type == HORN)
1564	{	1572	{
1565	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);
1566		1574
1567	// 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
1568	// for a rod or horn, this fixes some broken rods.	1576	// for a rod or horn, this fixes some broken rods.
1569	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1577	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1570	{	1578	{
1571	op->contr->play_sound (sound_find ("wand_poof"));	1579	op->contr->play_sound (sound_find ("wand_poof"));
1572		1580
1573	if (item->type == ROD)	1581	if (item->type == ROD)
1574	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));
…		…
1589	{	1597	{
1590	object *tmp;	1598	object *tmp;
1591		1599
1592	if (item->arch)	1600	if (item->arch)
1593	{	1601	{
1594	CLEAR_FLAG (item, FLAG_ANIMATE);	1602	item->clr_flag (FLAG_ANIMATE);
1595	item->face = item->arch->face;	1603	item->face = item->arch->face;
1596	item->set_speed (0);	1604	item->set_speed (0);
1597	}	1605	}
1598		1606
1599	if (object *pl = item->visible_to ())	1607	if (object *pl = item->visible_to ())
…		…
1606	}	1614	}
1607		1615
1608	/* Received a fire command for the player - go and do it.	1616	/* Received a fire command for the player - go and do it.
1609	*/	1617	*/
1610	bool	1618	bool
1611	fire (object *op, int dir)	1619	fire (object *who, int dir)
1612	{	1620	{
1613	int spellcost = 0;	1621	int spellcost = 0;
1614		1622
1615	player *pl = op->contr;	1623	player *pl = who->contr;
1616		1624
1617	if (pl->golem)	1625	if (pl->golem)
1618	{	1626	{
1619	control_golem (op->contr->golem, dir);	1627	control_golem (who->contr->golem, dir);
1620	return false;	1628	return false;
1621	}	1629	}
1622		1630
1623	object *ob = pl->ranged_ob;	1631	object *ob = pl->ranged_ob;
1624		1632
1625	if (!ob)	1633	if (!ob)
1626	return false;	1634	return false;
1627		1635
1628	if (op->speed_left > 0.f)	1636	if (who->speed_left > 0.f)
1629	--op->speed_left;	1637	--who->speed_left;
1630	else	1638	else
1631	return false;	1639	return false;
1632		1640
1633	if (!op->change_weapon (ob))	1641	if (!who->apply (ob))
1634	return false;	1642	return false;
1635		1643
1636	/* check for loss of invisiblity/hide */	1644	/* check for loss of invisiblity/hide */
1637	if (action_makes_visible (op))	1645	if (action_makes_visible (who))
1638	make_visible (op);	1646	make_visible (who);
1639		1647
1640	switch (ob->type)	1648	switch (ob->type)
1641	{	1649	{
1642	case BOW:	1650	case BOW:
1643	player_fire_bow (op, dir);	1651	player_fire_bow (who, dir);
1644	break;	1652	break;
1645		1653
1646	case SPELL:	1654	case SPELL:
1647	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);
1648	break;	1656	break;
1649		1657
1650	case BUILDER:	1658	case BUILDER:
1651	apply_map_builder (op, dir);	1659	apply_map_builder (who, dir);
1652	break;	1660	break;
1653		1661
1654	case SKILL:	1662	case SKILL:
1655	do_skill (op, op, ob, dir, 0);	1663	do_skill (who, who, ob, dir, 0);
1656	break;	1664	break;
1657		1665
		1666	case RANGED:
		1667	do_skill (who, ob, who->chosen_skill, dir, 0);
		1668	break;
		1669
1658	default:	1670	default:
1659	fire_misc_object (op, dir);	1671	fire_misc_object (who, dir);
1660	break;	1672	break;
1661	}	1673	}
1662		1674
1663	return true;	1675	return true;
1664	}	1676	}
…		…
1723	*	1735	*
1724	* Change the color so that the message doesn't disappear with	1736	* Change the color so that the message doesn't disappear with
1725	* all the others.	1737	* all the others.
1726	*/	1738	*/
1727	if (pl->contr->usekeys == key_inventory	1739	if (pl->contr->usekeys == key_inventory
1728	|| !QUERY_FLAG (container, FLAG_APPLIED)	1740	|| !container->flag [FLAG_APPLIED]
1729	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1741	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1730	{	1742	{
1731	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1743	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1732	"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));
1733	return NULL;	1745	return NULL;
…		…
1817	* going to try and move (not fire weapons).	1829	* going to try and move (not fire weapons).
1818	*/	1830	*/
1819	bool	1831	bool
1820	move_player_attack (object *op, int dir)	1832	move_player_attack (object *op, int dir)
1821	{	1833	{
1822	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))
1823	{	1835	{
1824	--op->speed_left;	1836	--op->speed_left;
1825	return true;	1837	return true;
1826	}	1838	}
1827		1839
1828	int on_battleground;
1829
1830	sint16 nx = freearr_x[dir] + op->x;	1840	sint16 nx = freearr_x[dir] + op->x;
1831	sint16 ny = freearr_y[dir] + op->y;	1841	sint16 ny = freearr_y[dir] + op->y;
1832
1833	on_battleground = op_on_battleground (op, 0, 0);
1834		1842
1835	if (out_of_map (op->map, nx, ny))	1843	if (out_of_map (op->map, nx, ny))
1836	return false;	1844	return false;
1837		1845
1838	/* 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
…		…
1888	*/	1896	*/
1889	if (op->type == PLAYER	1897	if (op->type == PLAYER
1890	&& ((mon->owner && mon->owner->contr	1898	&& ((mon->owner && mon->owner->contr
1891	&& same_party (mon->owner->contr->party, op->contr->party))	1899	&& same_party (mon->owner->contr->party, op->contr->party))
1892	|| mon->owner == op)	1900	|| mon->owner == op)
1893	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1901	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1894	{	1902	{
1895	/* 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 */
1896	if (op->contr->braced)	1904	if (op->contr->braced)
1897	return false;	1905	return false;
1898		1906
…		…
1909	return true;	1917	return true;
1910	}	1918	}
1911	else	1919	else
1912	return false;	1920	return false;
1913	}	1921	}
		1922
		1923	bool on_battleground = op_on_battleground (op, 0, 0);
1914		1924
1915	/* in certain circumstances, you shouldn't attack friendly	1925	/* in certain circumstances, you shouldn't attack friendly
1916	* creatures. Note that if you are braced, you can't push	1926	* creatures. Note that if you are braced, you can't push
1917	* 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
1918	* attack them either.	1928	* attack them either.
1919	*/	1929	*/
1920	if ((mon->type == PLAYER || mon->enemy != op)	1930	if ((mon->type == PLAYER || mon->enemy != op)
1921	&& (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])
1922	&& ((op->contr->peaceful	1932	&& ((op->contr->peaceful
1923	|| (mon->type == PLAYER && mon->contr->peaceful))	1933	|| (mon->type == PLAYER && mon->contr->peaceful))
1924	&& !on_battleground))	1934	&& !on_battleground))
1925	{	1935	{
1926	if (op->speed_left > 0.f)	1936	if (op->speed_left > 0.f)
…		…
1942	}	1952	}
1943	}	1953	}
1944	/* If the object is a boulder or other rollable object, then	1954	/* If the object is a boulder or other rollable object, then
1945	* 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.
1946	*/	1956	*/
1947	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1957	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1948	{	1958	{
1949	if (op->speed_left > 0.f)	1959	if (op->speed_left > 0.f)
1950	{	1960	{
1951	--op->speed_left;	1961	--op->speed_left;
1952		1962
…		…
1961	* 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
1962	* and be living. Then, it must be one of the following:	1972	* and be living. Then, it must be one of the following:
1963	* 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
1964	* 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.
1965	*/	1975	*/
1966	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	1976	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1967	((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)))
1968	{	1978	{
1969	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])
1970	{	1980	{
1971	--op->contr->weapon_sp_left;	1981	--op->contr->weapon_sp_left;
…		…
1983	}	1993	}
1984		1994
1985	bool	1995	bool
1986	move_player (object *op, int dir)	1996	move_player (object *op, int dir)
1987	{	1997	{
1988	int pick;
1989
1990	if (!op->map || op->map->in_memory != MAP_ACTIVE)	1998	if (!op->map || op->map->in_memory != MAP_ACTIVE)
1991	return 0;	1999	return 0;
1992		2000
1993	/* Sanity check: make sure dir is valid */	2001	/* Sanity check: make sure dir is valid */
1994	if ((dir < 0) || (dir >= 9))	2002	if (dir < 0 || dir > 8)
1995	{	2003	{
1996	LOG (llevError, "move_player: invalid direction %d\n", dir);	2004	LOG (llevError, "move_player: invalid direction %d\n", dir);
1997	return 0;	2005	return 0;
1998	}	2006	}
1999		2007
2000	/* peterm: added following line */	2008	/* peterm: added following line */
2001	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2009	if (op->flag [FLAG_CONFUSED] && dir)
2002	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2010	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2003		2011
2004	op->facing = dir;	2012	op->facing = dir;
2005		2013
2006	if (op->flag [FLAG_HIDDEN])	2014	if (op->flag [FLAG_HIDDEN])
2007	do_hidden_move (op);	2015	do_hidden_move (op);
2008		2016
2009	bool retval;	2017	bool retval;
		2018	int pick = 0;
2010		2019
2011	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2020	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2012	retval = RESULT_INT (0);	2021	retval = RESULT_INT (0);
2013	else if (op->contr->fire_on)	2022	else if (op->contr->fire_on)
2014	retval = fire (op, dir);	2023	retval = fire (op, dir);
…		…
2045	* players.	2054	* players.
2046	*/	2055	*/
2047	bool	2056	bool
2048	handle_newcs_player (object *op)	2057	handle_newcs_player (object *op)
2049	{	2058	{
2050	if (QUERY_FLAG (op, FLAG_SCARED))	2059	if (op->flag [FLAG_SCARED])
2051	{	2060	{
2052	if (op->speed_left > 0.f)	2061	if (op->speed_left > 0.f)
2053	{	2062	{
2054	--op->speed_left;	2063	--op->speed_left;
2055	flee_player (op);	2064	flee_player (op);
…		…
2071	return move_player (op, op->direction);	2080	return move_player (op, op->direction);
2072		2081
2073	return false;	2082	return false;
2074	}	2083	}
2075		2084
2076	int	2085	static int
2077	save_life (object *op)	2086	save_life (object *op)
2078	{	2087	{
2079	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2088	if (!op->flag [FLAG_LIFESAVE])
2080	return 0;	2089	return 0;
2081		2090
2082	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2091	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2083	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2092	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2084	{	2093	{
2085	op->play_sound (sound_find ("ob_evaporate"));	2094	op->play_sound (sound_find ("ob_evaporate"));
2086	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));
2087		2096
2088	tmp->destroy ();	2097	tmp->destroy ();
2089	CLEAR_FLAG (op, FLAG_LIFESAVE);	2098	op->clr_flag (FLAG_LIFESAVE);
2090		2099
2091	if (op->stats.hp < 0)	2100	if (op->stats.hp < 0)
2092	op->stats.hp = op->stats.maxhp;	2101	op->stats.hp = op->stats.maxhp;
2093		2102
2094	if (op->stats.food < 0)	2103	if (op->stats.food < 0)
2095	op->stats.food = 999;	2104	op->stats.food = MAX_FOOD;
2096		2105
2097	op->update_stats ();	2106	op->update_stats ();
2098	return 1;	2107	return 1;
2099	}	2108	}
2100		2109
2101	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2110	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2102	CLEAR_FLAG (op, FLAG_LIFESAVE);	2111	op->clr_flag (FLAG_LIFESAVE);
2103	enter_player_savebed (op); /* bring him home. */	2112	enter_player_savebed (op); /* bring him home. */
2104	return 0;	2113	return 0;
2105	}	2114	}
2106		2115
2107	/* 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
…		…
2114	{	2123	{
2115	while (op)	2124	while (op)
2116	{	2125	{
2117	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' */
2118		2127
2119	if (QUERY_FLAG (op, FLAG_UNPAID))	2128	if (op->flag [FLAG_UNPAID])
2120	op->insert_at (env);	2129	op->insert_at (env);
2121	else if (op->inv)	2130	else if (op->inv)
2122	drop_unpaid_items (op->inv, env);	2131	drop_unpaid_items (op->inv, env);
2123		2132
2124	op = next;	2133	op = next;
…		…
2130	{	2139	{
2131	if (!flag [FLAG_REMOVED])	2140	if (!flag [FLAG_REMOVED])
2132	::drop_unpaid_items (inv, this);	2141	::drop_unpaid_items (inv, this);
2133	}	2142	}
2134		2143
2135	/*
2136	* Returns pointer a static string containing gravestone text
2137	* Moved from apply.c to player.c - player.c is what
2138	* actually uses this function. player.c may not be quite the
2139	* best, a misc file for object actions is probably better,
2140	* but there isn't one in the server directory.
2141	*/
2142	const char *
2143	gravestone_text (object *op)
2144	{
2145	static dynbuf_text buf;
2146
2147	buf << "---- R.I.P. ----\n\n"
2148	<< op->name;
2149
2150	if (op->type == PLAYER)
2151	buf << " the " << op->contr->title;
2152
2153	buf << "\n\n";
2154
2155	buf << "who was level ";
2156	buf << (sint32)op->level << "\n\n" // OO breakdown
2157	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2158
2159	if (op->type == PLAYER)
2160	buf << "by " << op->contr->killer_name () << ".\n\n";
2161
2162	{
2163	static char buf2[128];
2164	time_t now = time (NULL);
2165	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2166	buf << buf2;
2167	}
2168
2169	return buf;
2170	}
2171
2172	void	2144	void
2173	do_some_living (object *op)	2145	do_some_living (object *op)
2174	{	2146	{
2175	int last_food = op->stats.food;	2147	int last_food = op->stats.food;
2176	int gen_hp, gen_sp, gen_grace;	2148	int gen_hp, gen_sp, gen_grace;
2177	int over_hp, over_sp, over_grace;
2178	int i;	2149	int i;
2179	int rate_hp = 1200;	2150	int rate_hp = 1200;
2180	int rate_sp = 2500;	2151	int rate_sp = 2500;
2181	int rate_grace = 2000;	2152	int rate_grace = 2000;
2182	const int max_hp = 1;	2153	const int max_hp = 1;
…		…
2191	* alternate it here for it to work correctly.	2162	* alternate it here for it to work correctly.
2192	*/	2163	*/
2193	if (pticks & 2)	2164	if (pticks & 2)
2194	op->invisible--;	2165	op->invisible--;
2195	}	2166	}
2196	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2167	else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2197	{	2168	{
2198	if (!op->invisible--)	2169	if (!op->invisible--)
2199	{	2170	{
2200	make_visible (op);	2171	make_visible (op);
2201	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.");
…		…
2235	if (--op->last_grace < 0)	2206	if (--op->last_grace < 0)
2236	{	2207	{
2237	if (op->stats.grace < op->stats.maxgrace / 2)	2208	if (op->stats.grace < op->stats.maxgrace / 2)
2238	op->stats.grace++; /* no penalty in food for regaining grace */	2209	op->stats.grace++; /* no penalty in food for regaining grace */
2239		2210
		2211	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2212
2240	if (max_grace > 1)	2213	if (max_grace > 1)
2241	{	2214	{
2242	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2215	int over_grace = temp / rate_grace;
		2216
2243	if (over_grace > 0)	2217	if (over_grace > 0)
2244	{	2218	{
2245	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;
2246	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2247	op->last_grace = 0;	2220	op->last_grace = 0;
2248	}	2221	}
2249	else	2222	else
2250	{	2223	op->last_grace = rate_grace / temp;
2251	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2252	}
2253	}	2224	}
2254	else	2225	else
2255	{	2226	op->last_grace = rate_grace / temp;
2256	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2227
2257	}
2258	/* wearing stuff doesn't detract from grace generation. */	2228	/* wearing stuff doesn't detract from grace generation. */
2259	}	2229	}
2260		2230
2261	if (op->stats.food > 0)	2231	if (op->stats.food > 0)
2262	{	2232	{
…		…
2268	if (op->stats.sp < op->stats.maxsp)	2238	if (op->stats.sp < op->stats.maxsp)
2269	{	2239	{
2270	op->stats.sp++;	2240	op->stats.sp++;
2271		2241
2272	/* dms do not consume food */	2242	/* dms do not consume food */
2273	if (!QUERY_FLAG (op, FLAG_WIZ))	2243	if (!op->flag [FLAG_WIZ])
2274	{	2244	{
2275	op->stats.food--;	2245	op->stats.food--;
2276		2246
2277	if (op->contr->digestion < 0)	2247	if (op->contr->digestion < 0)
2278	op->stats.food += op->contr->digestion;	2248	op->stats.food += op->contr->digestion;
…		…
2281	}	2251	}
2282	}	2252	}
2283		2253
2284	if (max_sp > 1)	2254	if (max_sp > 1)
2285	{	2255	{
2286	over_sp = (gen_sp + 10) / rate_sp;	2256	int over_sp = (gen_sp + 10) / rate_sp;
2287	if (over_sp > 0)	2257	if (over_sp > 0)
2288	{	2258	{
2289	if (op->stats.sp < op->stats.maxsp)	2259	if (op->stats.sp < op->stats.maxsp)
2290	{	2260	{
2291	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2261	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2312	if (op->stats.hp < op->stats.maxhp)	2282	if (op->stats.hp < op->stats.maxhp)
2313	{	2283	{
2314	op->stats.hp++;	2284	op->stats.hp++;
2315		2285
2316	/* dms do not consume food */	2286	/* dms do not consume food */
2317	if (!QUERY_FLAG (op, FLAG_WIZ))	2287	if (!op->flag [FLAG_WIZ])
2318	{	2288	{
2319	op->stats.food--;	2289	op->stats.food--;
2320		2290
2321	if (op->contr->digestion < 0)	2291	if (op->contr->digestion < 0)
2322	op->stats.food += op->contr->digestion;	2292	op->stats.food += op->contr->digestion;
2323	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))
2324	op->stats.food = last_food;	2294	op->stats.food = last_food;
2325	}	2295	}
2326	}	2296	}
2327		2297
		2298	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2299
2328	if (max_hp > 1)	2300	if (max_hp > 1)
2329	{	2301	{
2330	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2302	int over_hp = temp / rate_hp;
2331		2303
2332	if (over_hp > 0)	2304	if (over_hp > 0)
2333	{	2305	{
2334	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;
2335	op->last_heal = 0;	2307	op->last_heal = 0;
2336	}	2308	}
2337	else	2309	else
2338	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2310	op->last_heal = rate_hp / temp;
2339	}	2311	}
2340	else	2312	else
2341	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2313	op->last_heal = rate_hp / temp;
2342	}	2314	}
2343	}	2315	}
2344		2316
2345	/* Digestion */	2317	/* Digestion */
2346	if (--op->last_eat < 0)	2318	if (--op->last_eat < 0)
…		…
2349	penalty = max (0, -op->contr->digestion);	2321	penalty = max (0, -op->contr->digestion);
2350		2322
2351	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);
2352		2324
2353	/* dms do not consume food */	2325	/* dms do not consume food */
2354	if (!QUERY_FLAG (op, FLAG_WIZ))	2326	if (!op->flag [FLAG_WIZ])
2355	op->stats.food--;	2327	op->stats.food--;
2356	}	2328	}
2357		2329
2358	if (op->stats.food < 0 && op->stats.hp >= 0)	2330	if (op->stats.food < 0 && op->stats.hp >= 0)
2359	{	2331	{
2360	object *flesh = 0;	2332	object *flesh = 0;
2361		2333
2362	for_inv_removable (op, tmp)	2334	for_inv_removable (op, tmp)
2363	{	2335	{
2364	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2336	if (tmp->flag [FLAG_UNPAID])
2365	continue;	2337	continue;
2366		2338
2367	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2339	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2368	{	2340	{
2369	op->statusmsg ("You blindly grab for a bite of food. "	2341	op->statusmsg ("You blindly grab for a bite of food. "
2370	"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.>");
2371	manual_apply (op, tmp, 0);	2343	op->apply (tmp);
2372		2344
2373	if (op->stats.food >= 0 || op->stats.hp < 0)	2345	if (op->stats.food >= 0 || op->stats.hp < 0)
2374	break;	2346	break;
2375	}	2347	}
2376	else if (tmp->type == FLESH)	2348	else if (tmp->type == FLESH)
…		…
2382	*/	2354	*/
2383	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2355	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2384	{	2356	{
2385	op->statusmsg ("You blindly grab for a bite of food. "	2357	op->statusmsg ("You blindly grab for a bite of food. "
2386	"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.>");
2387	manual_apply (op, flesh, 0);	2359	op->apply (flesh);
2388	}	2360	}
2389		2361
2390	// If player is still starving, alert him!	2362	// If player is still starving, alert him!
2391	if (op->stats.food < 0)	2363	if (op->stats.food < 0)
2392	op->failmsg ("You are starving! "	2364	op->failmsg ("You are starving! "
…		…
2404	op->contr->killer->destroy ();	2376	op->contr->killer->destroy ();
2405	}	2377	}
2406	}	2378	}
2407		2379
2408	/* killer should be set here already */	2380	/* killer should be set here already */
2409	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2381	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2410	kill_player (op);	2382	kill_player (op);
2411	}	2383	}
2412	}	2384	}
2413		2385
2414	/* 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.
…		…
2429	return;	2401	return;
2430		2402
2431	dynbuf_text deathtab;	2403	dynbuf_text deathtab;
2432		2404
2433	/* restore player */	2405	/* restore player */
2434	at = archetype::find ("poisoning");	2406	at = archetype::find (shstr_poisoning);
2435	if (object *tmp = present_arch_in_ob (at, op))	2407	if (object *tmp = present_arch_in_ob (at, op))
2436	{	2408	{
2437	tmp->destroy ();	2409	tmp->destroy ();
2438	deathtab << "Your body feels cleansed...\r";	2410	deathtab << "Your body feels cleansed...\r";
2439	}	2411	}
2440		2412
2441	at = archetype::find ("confusion");	2413	at = archetype::find (shstr_confusion);
2442	if (object *tmp = present_arch_in_ob (at, op))	2414	if (object *tmp = present_arch_in_ob (at, op))
2443	{	2415	{
2444	tmp->destroy ();	2416	tmp->destroy ();
2445	deathtab << "Your mind feels clearer...\r";	2417	deathtab << "Your mind feels clearer...\r";
2446	}	2418	}
…		…
2448	cure_disease (op, 0, 0); /* remove any disease */	2420	cure_disease (op, 0, 0); /* remove any disease */
2449		2421
2450	max_it (op->stats.hp , op->stats.maxhp);	2422	max_it (op->stats.hp , op->stats.maxhp);
2451	max_it (op->stats.sp , op->stats.maxsp);	2423	max_it (op->stats.sp , op->stats.maxsp);
2452	max_it (op->stats.grace, op->stats.maxgrace);	2424	max_it (op->stats.grace, op->stats.maxgrace);
2453
2454	if (op->stats.food <= 0)	2425	max_it (op->stats.food , 200);
2455	op->stats.food = 999;
2456		2426
2457	// remove all spell effects that are active	2427	// remove all spell effects that are active
2458	// to avoid long-term effects such as word-of-recall	2428	// to avoid long-term effects such as word-of-recall
2459	for (object *item = op->inv; item; )	2429	for (object *item = op->inv; item; )
2460	{	2430	{
…		…
2473	if (op_on_battleground (op, &x, &y))	2443	if (op_on_battleground (op, &x, &y))
2474	{	2444	{
2475	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";
2476		2446
2477	/* create a bodypart-trophy to make the winner happy */	2447	/* create a bodypart-trophy to make the winner happy */
2478	if (object *tmp = arch_to_object (archetype::find ("finger")))	2448	object *tmp = archetype::find (shstr_finger)->instance ();
2479	{	2449
2480	tmp->name = format ("%s's finger" , &op->name);	2450	tmp->name = format ("%s's finger" , &op->name);
2481	tmp->name_pl = format ("%s's fingers", &op->name);	2451	tmp->name_pl = format ("%s's fingers", &op->name);
2482	tmp->msg = format (	2452	tmp->msg = format (
2483	"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",
2484	&op->name, op->contr->title,	2454	&op->name, op->contr->title,
2485	(int)op->level,	2455	(int)op->level,
2486	op->contr->killer_name ()	2456	op->contr->killer_name ()
2487	);	2457	);
2488	tmp->value = 0, tmp->type = 0;	2458	tmp->value = 0, tmp->type = 0;
2489	tmp->materialname = "organics";	2459	tmp->material = name_to_material (shstr_organic);
2490	tmp->insert_at (op, tmp);	2460	tmp->insert_at (op, tmp);
2491	}
2492		2461
2493	/* teleport defeated player to new destination */	2462	/* teleport defeated player to new destination */
2494	transfer_ob (op, x, y, 0, NULL);	2463	transfer_ob (op, x, y, 0, NULL);
2495	op->contr->braced = 0;	2464	op->contr->braced = 0;
2496		2465
…		…
2558	lost_a_stat = 1;	2527	lost_a_stat = 1;
2559	}	2528	}
2560	else	2529	else
2561	{	2530	{
2562	/* deplete a stat */	2531	/* deplete a stat */
2563	archetype *deparch = archetype::find ("depletion");	2532	archetype *deparch = archetype::find (shstr_depletion);
2564	object *dep;	2533	object *dep;
2565		2534
2566	dep = present_arch_in_ob (deparch, op);	2535	dep = present_arch_in_ob (deparch, op);
2567	if (!dep)	2536	if (!dep)
2568	{	2537	{
2569	dep = arch_to_object (deparch);	2538	dep = deparch->instance ();
2570	insert_ob_in_ob (dep, op);	2539	insert_ob_in_ob (dep, op);
2571	}	2540	}
2572	lose_this_stat = 1;	2541	lose_this_stat = 1;
2573	if (settings.balanced_stat_loss)	2542	if (settings.balanced_stat_loss)
2574	{	2543	{
…		…
2612	* difference.	2581	* difference.
2613	*/	2582	*/
2614	if (this_stat >= -50)	2583	if (this_stat >= -50)
2615	{	2584	{
2616	change_attr_value (&(dep->stats), i, -1);	2585	change_attr_value (&(dep->stats), i, -1);
2617	SET_FLAG (dep, FLAG_APPLIED);	2586	dep->set_flag (FLAG_APPLIED);
2618	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2587	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2619	op->update_stats ();	2588	op->update_stats ();
2620	lost_a_stat = 1;	2589	lost_a_stat = 1;
2621	}	2590	}
2622	}	2591	}
…		…
2640	#endif	2609	#endif
2641		2610
2642	/* Put a gravestone up where the character 'almost' died. List the	2611	/* Put a gravestone up where the character 'almost' died. List the
2643	* exp loss on the stone.	2612	* exp loss on the stone.
2644	*/	2613	*/
2645	tmp = arch_to_object (archetype::find ("gravestone"));	2614	tmp = archetype::find (shstr_gravestone)->instance ();
2646	tmp->name = format ("%s's gravestone", &op->name);	2615	tmp->name = format ("%s's gravestone", &op->name);
2647	tmp->name_pl = format ("%s's gravestones", &op->name);	2616	tmp->name_pl = format ("%s's gravestones", &op->name);
2648	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",
2649	&op->name, op->contr->title, op->contr->killer_name ());	2618	&op->name, op->contr->title, op->contr->killer_name ());
2650	tmp->x = op->x, tmp->y = op->y;	2619	tmp->x = op->x, tmp->y = op->y;
…		…
2691	object *force;	2660	object *force;
2692	int at;	2661	int at;
2693		2662
2694	force = get_archetype (FORCE_NAME);	2663	force = get_archetype (FORCE_NAME);
2695	/* 50 ticks should be enough time for the spell to abate */	2664	/* 50 ticks should be enough time for the spell to abate */
2696	force->speed = 0.1f;
2697	force->speed_left = -5.f;	2665	force->speed_left = -5.f;
2698	SET_FLAG (force, FLAG_APPLIED);	2666	force->set_speed (0.1f);
		2667	force->set_flag (FLAG_APPLIED);
		2668
2699	for (at = 0; at < NROFATTACKS; at++)	2669	for (at = 0; at < NROFATTACKS; at++)
2700	if (will_kill_again & (1 << at))	2670	if (will_kill_again & (1 << at))
2701	force->resist[at] = 100;	2671	force->resist[at] = 100;
2702		2672
2703	insert_ob_in_ob (force, op);	2673	insert_ob_in_ob (force, op);
…		…
2705	}	2675	}
2706		2676
2707	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2677	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2708	}	2678	}
2709		2679
2710	void	2680	static void
2711	loot_object (object *op)	2681	loot_object (object *op)
2712	{ /* Grab and destroy some treasure */	2682	{ /* Grab and destroy some treasure */
2713	object *tmp, *tmp2, *next;	2683	object *tmp, *tmp2, *next;
2714		2684
2715	op->close_container (); /* close open sack first */	2685	op->close_container (); /* close open sack first */
…		…
2725	tmp->x = op->x, tmp->y = op->y;	2695	tmp->x = op->x, tmp->y = op->y;
2726		2696
2727	if (tmp->type == CONTAINER)	2697	if (tmp->type == CONTAINER)
2728	loot_object (tmp); /* empty container to ground */	2698	loot_object (tmp); /* empty container to ground */
2729		2699
2730	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))))
2731	{	2701	{
2732	if (tmp->nrof > 1)	2702	if (tmp->nrof > 1)
2733	{	2703	{
2734	tmp->decrease (rndm (1, tmp->nrof - 1));	2704	tmp->decrease (rndm (1, tmp->nrof - 1));
2735	insert_ob_in_map (tmp, op->map, NULL, 0);	2705	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2746	* fix_weight(): Check recursively the weight of all players, and fix	2716	* fix_weight(): Check recursively the weight of all players, and fix
2747	* 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
2748	* was changed.	2718	* was changed.
2749	*/	2719	*/
2750	void	2720	void
2751	fix_weight (void)	2721	fix_weight ()
2752	{	2722	{
2753	for_all_players (pl)	2723	for_all_players (pl)
2754	{	2724	{
2755	sint32 old = pl->ob->carrying;	2725	sint32 old = pl->ob->carrying;
2756		2726
…		…
2763	}	2733	}
2764	}	2734	}
2765	}	2735	}
2766		2736
2767	void	2737	void
2768	fix_luck (void)	2738	fix_luck ()
2769	{	2739	{
2770	for_all_players (pl)	2740	for_all_players (pl)
2771	if (!pl->ob->contr->ns->state)	2741	if (!pl->ob->contr->ns->state)
2772	pl->ob->change_luck (0);	2742	pl->ob->change_luck (0);
2773	}	2743	}
…		…
2825	}	2795	}
2826		2796
2827	int	2797	int
2828	is_true_undead (object *op)	2798	is_true_undead (object *op)
2829	{	2799	{
2830	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2800	if (op->arch->flag [FLAG_UNDEAD])
2831	return 1;	2801	return 1;
2832		2802
2833	return 0;	2803	return 0;
2834	}	2804	}
2835		2805
…		…
2933		2903
2934	if (who->type == PLAYER)	2904	if (who->type == PLAYER)
2935	player = 1;	2905	player = 1;
2936		2906
2937	else	2907	else
2938	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2908	friendly = who->flag [FLAG_FRIENDLY];
2939		2909
2940	/* search adjacent squares */	2910	/* search adjacent squares */
2941	for (i = 1; i < 9; i++)	2911	for (i = 1; i < 9; i++)
2942	{	2912	{
2943	x = who->x + freearr_x[i];	2913	x = who->x + freearr_x[i];
…		…
2952	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)))
2953	continue;	2923	continue;
2954		2924
2955	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)
2956	{	2926	{
2957	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])
2958	return 1;	2928	return 1;
2959	else if (tmp->type == PLAYER)	2929	else if (tmp->type == PLAYER)
2960	{	2930	{
2961	/*don't let a hidden DM prevent you from hiding */	2931	/*don't let a hidden DM prevent you from hiding */
2962	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)	2932	if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0)
2963	return 1;	2933	return 1;
2964	}	2934	}
2965	}	2935	}
2966	}	2936	}
2967	return 0;	2937	return 0;
…		…
3017	}	2987	}
3018		2988
3019	return 0;	2989	return 0;
3020	}	2990	}
3021		2991
3022	/* routine for both players and monsters. We call this when
3023	* there is a possibility for our action distrubing our hiding
3024	* place or invisiblity spell. Artefact invisiblity causes
3025	* "noise" instead. If we arent invisible to begin with, we
3026	* return 0.
3027	*/
3028	int
3029	action_makes_visible (object *op)
3030	{
3031	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3032	{
3033	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3034	{
3035	// artefact invisibility is permanent, but we still make noise
3036	// this is important for game-balance.
3037	if (op->contr)
3038	op->make_noise ();
3039
3040	return 0;
3041	}
3042
3043	if (op->contr && op->contr->tmp_invis == 0)
3044	return 0;
3045
3046	/* If monsters, they should become visible */
3047	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3048	{
3049	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3050	return 1;
3051	}
3052	}
3053
3054	return 0;
3055	}
3056
3057	/* op_on_battleground - checks if the given object op (usually	2992	/* op_on_battleground - checks if the given object op (usually
3058	* a player) is standing on a valid battleground-tile,	2993	* a player) is standing on a valid battleground-tile,
3059	* function returns TRUE/FALSE. If true x, y returns the battleground	2994	* function returns TRUE/FALSE. If true x, y returns the battleground
3060	* -exit-coord. (and if x, y not NULL)	2995	* -exit-coord. (and if x, y not NULL)
3061	* 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
…		…
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