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.158 by root, Mon Aug 13 15:46:45 2007 UTC vs.
Revision 1.195 by root, Mon May 5 15:21:50 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
…		…
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <sproto.h>	25	#include <sproto.h>
26	#include <sounds.h>	26	#include <sounds.h>
…		…
183		183
184	if (ob->map)	184	if (ob->map)
185	maplevel = ob->map->path;	185	maplevel = ob->map->path;
186		186
187	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
188	ob->map = 0;	189	ob->map = 0;
189	party = 0;	190	party = 0;
190		191
191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192		193
…		…
214		215
215	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->race;	218	ob->race = ob->arch->race;
218		219
219	ob->carrying = sum_weight (ob);	220	ob->update_weight ();
220	link_player_skills (ob);	221	link_player_skills (ob);
221		222
222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223		224
224	assign (title, ob->arch->object::name);	225	assign (title, ob->arch->object::name);
…		…
238	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
239	}	240	}
240		241
241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
242		243
243	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this);
		245
		246	ob->update_stats ();
		247
		248	ns->floorbox_update ();
		249	esrv_send_inventory (ob, ob);
		250	esrv_add_spells (this, 0);
		251
		252	activate ();
		253
		254	send_rules (ob);
		255	send_news (ob);
		256	display_motd (ob);
		257
		258	INVOKE_PLAYER (CONNECT, this);
		259	INVOKE_PLAYER (LOGIN, this);
		260	}
		261
		262	void
		263	player::disconnect ()
		264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
		271	if (ns)
		272	{
		273	if (active)
		274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		275
		276	INVOKE_PLAYER (DISCONNECT, this);
		277
		278	ns->reset_stats ();
		279	ns->pl = 0;
		280	ns = 0;
		281	}
		282
		283	observe = ob;
		284
		285	deactivate ();
		286	}
		287
		288	// the need for this function can be explained
		289	// by load_object not returning the object
		290	void
		291	player::set_object (object *op)
		292	{
		293	ob = observe = op;
		294	ob->contr = this; /* this aren't yet in archetype */
		295
		296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
		299	ob->direction = 5; /* So player faces south */
244		300
245	ob->flag [FLAG_READY_WEAPON] = false;	301	ob->flag [FLAG_READY_WEAPON] = false;
246	ob->flag [FLAG_READY_SKILL] = false;	302	ob->flag [FLAG_READY_SKILL] = false;
247	ob->flag [FLAG_READY_BOW] = false;	303	ob->flag [FLAG_READY_BOW] = false;
248		304
…		…
265	combat_ob = op;	321	combat_ob = op;
266	break;	322	break;
267	}	323	}
268		324
269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
270	ob->update_stats ();	326	ob->deactivate (); // change_Weapon activates, fix this better
271
272	ns->floorbox_update ();
273	esrv_send_inventory (ob, ob);
274	esrv_add_spells (this, 0);
275
276	activate ();
277
278	send_rules (ob);
279	send_news (ob);
280	display_motd (ob);
281
282	INVOKE_PLAYER (CONNECT, this);
283	INVOKE_PLAYER (LOGIN, this);
284	}
285
286	void
287	player::disconnect ()
288	{
289	if (ns)
290	{
291	if (active)
292	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
293
294	INVOKE_PLAYER (DISCONNECT, this);
295
296	ns->reset_stats ();
297	ns->pl = 0;
298	ns = 0;
299	}
300
301	if (ob)
302	{
303	ob->close_container (); //TODO: client-specific
304	ob->drop_unpaid_items ();
305	}
306
307	observe = ob;
308
309	deactivate ();
310	}
311
312	// the need for this function can be explained
313	// by load_object not returning the object
314	void
315	player::set_object (object *op)
316	{
317	ob = observe = op;
318	ob->contr = this; /* this aren't yet in archetype */
319
320	ob->speed = 1.0f;
321	ob->speed_left = 0.5f;
322
323	ob->direction = 5; /* So player faces south */
324	}	327	}
325		328
326	void	329	void
327	player::set_observe (object *op)	330	player::set_observe (object *op)
328	{	331	{
…		…
401	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
402	*/	405	*/
403	archetype *	406	archetype *
404	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
405	{	408	{
		409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	415	archvec::iterator i = archetypes.find (nat);
407		416
408	for (;;)	417	for (;;)
409	{	418	{
410	if (++i == archetypes.end ())	419	if (++i == archetypes.end ())
411	i = archetypes.begin ();	420	i = archetypes.begin ();
…		…
425	unsigned lastdist;	434	unsigned lastdist;
426	rv_vector rv;	435	rv_vector rv;
427		436
428	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429	{	438	{
430	/* We should not find free objects on this friendly list, but it
431	* does periodically happen. Given that, lets deal with it.
432	* While unlikely, it is possible the next object on the friendly
433	* list is also free, so encapsulate this in a while loop.
434	*/
435	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436	{
437	object *tmp = ol->ob;
438
439	/* Can't do much more other than log the fact, because the object
440	* itself will have been cleared.
441	*/
442	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443	tmp->debug_desc ());
444	ol = ol->next;
445	remove_friendly_object (tmp);
446	if (!ol)
447	return op;
448	}
449
450	/* Remove special check for player from this. First, it looks to cause
451	* some crashes (ol->ob->contr not set properly?), but secondly, a more
452	* complicated method of state checking would be needed in any case -
453	* as it was, a clever player could type quit, and the function would
454	* skip them over while waiting for confirmation. Remove
455	* on_same_map check, as can_detect_enemy also does this
456	*/
457	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
458	continue;	440	continue;
459		441
460	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
461	{	443	{
…		…
656		638
657	return firstdir;	639	return firstdir;
658	}	640	}
659		641
660	void	642	void
661	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
662	{	644	{
663	object *op, *next = NULL;
664
665	if (pl->randomitems != NULL)	645	if (pl->randomitems)
666	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667		647
668	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
669	{	649	{
670	next = op->below;	650	next = op->below;
671		651
672	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
673	* flag "neutral" set. Sorry but I can't think of a better way	653	* flag "neutral" set. Sorry but I can't think of a better way
…		…
678	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
679	* by this player due to race restrictions	659	* by this player due to race restrictions
680	*/	660	*/
681	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
682	{	662	{
683	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
684	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
685	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
686	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
687	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	669	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
688	{	670	{
689	op->destroy ();	671	op->destroy ();
690	continue;	672	continue;
691	}	673	}
692	}	674	}
…		…
715	if (op->nrof > 1)	697	if (op->nrof > 1)
716	op->nrof = 1;	698	op->nrof = 1;
717	}	699	}
718		700
719	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
720	{
721	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722	}
723		703
724	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
725	* items. Just don't identify gold or silver, or it won't be	705	* items. Just don't identify gold or silver, or it won't be
726	* merged properly.	706	* merged properly.
727	*/	707	*/
728	if (need_identify (op))	708	if (need_identify (op))
729	{	709	{
730	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
731	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
732	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
733	}	713	}
		714
734	if (op->type == SPELL)	715	if (op->type == SPELL)
735	{	716	{
736	op->destroy ();	717	op->destroy ();
737	continue;	718	continue;
738	}	719	}
…		…
740	{	721	{
741	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
742	op->stats.exp = 0;	723	op->stats.exp = 0;
743	op->level = 1;	724	op->level = 1;
744	}	725	}
745	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
746	else
747	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
748	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
749		729
750	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
751	link_player_skills (pl);	731	link_player_skills (pl);
…		…
857	static void	837	static void
858	start_info (object *op)	838	start_info (object *op)
859	{	839	{
860	char buf[MAX_BUF];	840	char buf[MAX_BUF];
861		841
862	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
864	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865	//new_draw_info (NDI_UNIQUE, 0, op, " ");
866	}	844	}
867		845
868	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
869	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
873	*/	851	*/
874	void	852	void
875	player::chargen_race_done ()	853	player::chargen_race_done ()
876	{	854	{
877	/* this must before then initial items are given */	855	/* this must before then initial items are given */
878	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
879		857
880	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
881	if (tl)	859	if (tl)
882	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
883		861
…		…
1033	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1034	return 1;	1012	return 1;
1035		1013
1036	next = op->below;	1014	next = op->below;
1037		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1038	/* loop while there are items on the floor that are not marked as	1019	/* loop while there are items on the floor that are not marked as
1039	* destroyed */	1020	* destroyed */
1040	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1041	{	1022	{
1042	tmp = next;	1023	tmp = next;
1043	next = tmp->below;	1024	next = tmp->below;
1044		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1045	if (op->destroyed ())	1032	if (op->destroyed ())
1046	return 0;	1033	return 0;
1047		1034
1048	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1049	continue;	1036	continue;
1050		1037
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	1039	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1055	continue;	1042	continue;
1056	}	1043	}
1057		1044
1058	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1059	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1061	switch (op->contr->mode)	1048	switch (op->contr->mode)
1062	{	1049	{
1063	case 0:	1050	case 0:
1064	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1065	case 1:	1052	case 1:
1066	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1067	return 1;	1054	return 1;
1068	case 2:	1055	case 2:
1069	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1070	return 0;	1057	return 0;
1071	case 3:	1058	case 3:
1072	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1073	case 4:	1060	case 4:
1074	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1075	break;	1062	break;
1076	case 5:	1063	case 5:
1077	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1078	stop = 1;	1065	stop = 1;
1079	break;	1066	break;
1080	case 6:	1067	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1083	break;	1071	break;
1084		1072
1085	case 7:	1073	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1088	break;	1076	break;
1089		1077
1090	default:	1078	default:
1091	/* use value density */	1079	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1081	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1095	}	1083	}
1096	}	1084	}
1097	else	1085	else
1098	{ /* old model */	1086	{ /* old model */
1099	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1154	/* all food and drink if desired */	1142	/* all food and drink if desired */
1155	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1156	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1157	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1158	{	1146	{
1159	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1160	continue;	1148	continue;
1161	}	1149	}
1162		1150
1163	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1164	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1152	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1165	{	1153	{
1166	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1167	continue;	1155	continue;
1168	}	1156	}
1169		1157
1170	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1171	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1172	{	1160	{
1173	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1174	continue;	1162	continue;
1175	}	1163	}
1176		1164
1177	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1180	{	1168	{
1181	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1182	continue;	1170	continue;
1183	}	1171	}
1184		1172
1185	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1187	{	1175	{
1188	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1189	continue;	1177	continue;
1190	}	1178	}
1191		1179
1192	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194	{	1182	{
1195	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1196	continue;	1184	continue;
1197	}	1185	}
1198		1186
1199	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{	1190	{
1203	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1204	continue;	1192	continue;
1205	}	1193	}
1206		1194
1207	/* pick up all magical items */	1195	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1197	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1210	{	1198	{
1211	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1212	continue;	1200	continue;
1213	}	1201	}
1214		1202
1215	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1216	{	1204	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1218	{	1206	{
1219	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1220	continue;	1208	continue;
1221	}	1209	}
1222	}	1210	}
1223		1211
1224	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1227	{	1215	{
1228	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1229	continue;	1217	continue;
1230	}	1218	}
1231		1219
1232	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1235	{	1223	{
1236	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1237	continue;	1225	continue;
1238	}	1226	}
1239		1227
1240	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1243	{	1231	{
1244	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1245	continue;	1233	continue;
1246	}	1234	}
1247		1235
1248	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1250	{	1238	{
1251	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1252	continue;	1240	continue;
1253	}	1241	}
1254		1242
1255	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1258	{	1246	{
1259	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1260	continue;	1248	continue;
1261	}	1249	}
1262		1250
1263	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1265	{	1253	{
1266	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1267	continue;	1255	continue;
1268	}	1256	}
1269		1257
1270	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1272	{	1260	{
1273	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1274	continue;	1262	continue;
1275	}	1263	}
1276		1264
1277	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1279	{	1267	{
1280	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1281	continue;	1269	continue;
1282	}	1270	}
1283		1271
1284	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1286	{	1274	{
1287	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1288	continue;	1276	continue;
1289	}	1277	}
1290		1278
1291	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1293	{	1281	{
1294	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1295	continue;	1283	continue;
1296	}	1284	}
1297		1285
1298	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{	1289	{
1302	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1303	continue;	1291	continue;
1304	}	1292	}
1305		1293
1306	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
…		…
1309	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{	1298	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&	1299	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{	1301	{
1314	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1315	continue;	1303	continue;
1316	}	1304	}
1317	}	1305	}
1318		1306
1319	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{	1308	{
1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)	1309	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1310	{
1323	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1324	continue;	1312	continue;
1325	}	1313	}
1326	}	1314	}
1327	}	1315	}
1328		1316
1329	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{	1320	{
1333	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1334	continue;	1322	continue;
1335	}	1323	}
1336		1324
1337	/* any of the last 4 bits set means we use the ratio for value	1325	/* any of the last 4 bits set means we use the ratio for value
1338	* pickups */	1326	* pickups */
…		…
1343	/* >=7 is the old standard setting. Now we take the last 4 bits	1331	/* >=7 is the old standard setting. Now we take the last 4 bits
1344	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1346	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1334	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347	{	1335	{
1348	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1349	#if 0	1337	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1352	{	1340	{
1353	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
…		…
1372	* found object is returned.	1360	* found object is returned.
1373	*/	1361	*/
1374	object *	1362	object *
1375	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1376	{	1364	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381	tmp = find_arrow (op, type);
1382	else if (op->type == ARROW && op->race == type)	1366	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1367	return splay (tmp);
		1368
		1369	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1370	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1371	if (object *arrow = find_arrow (tmp, type))
		1372	{
		1373	splay (tmp);
1383	return op;	1374	return arrow;
		1375	}
1384		1376
1385	return tmp;	1377	return 0;
1386	}	1378	}
1387		1379
1388	/*	1380	/*
1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1381	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1390	* against the target. A full test is not performed, simply a basic test	1382	* against the target. A full test is not performed, simply a basic test
…		…
1413	}	1405	}
1414	}	1406	}
1415	else if (arrow->type == ARROW && arrow->race == type)	1407	else if (arrow->type == ARROW && arrow->race == type)
1416	{	1408	{
1417	/* allways prefer assasination/slaying */	1409	/* allways prefer assasination/slaying */
1418	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1410	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1419	{	1411	{
1420	if (arrow->attacktype & AT_DEATH)	1412	if (arrow->attacktype & AT_DEATH)
1421	{	1413	{
1422	*better = 100;	1414	*better = 100;
1423	return arrow;	1415	return arrow;
…		…
1451	betterby = 1 + arrow->magic + arrow->stats.dam;	1443	betterby = 1 + arrow->magic + arrow->stats.dam;
1452	}	1444	}
1453	}	1445	}
1454	}	1446	}
1455	}	1447	}
		1448
1456	if (tmp == NULL && arrow == NULL)	1449	if (tmp == NULL && arrow == NULL)
1457	return find_arrow (op, type);	1450	return find_arrow (op, type);
1458		1451
1459	*better = betterby;	1452	*better = betterby;
1460	return tmp;	1453	return tmp;
…		…
1611	arrow->destroy ();	1604	arrow->destroy ();
1612	return 0;	1605	return 0;
1613	}	1606	}
1614		1607
1615	left = arrow; /* these are arrows left to the player */	1608	left = arrow; /* these are arrows left to the player */
1616	arrow = get_split_ob (arrow, 1);	1609	arrow = arrow->split ();
1617	if (!arrow)	1610	if (!arrow)
1618	{	1611	{
1619	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1612	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1620	return 0;	1613	return 0;
1621	}	1614	}
…		…
1688	op->play_sound (sound_find ("fire_arrow"));	1681	op->play_sound (sound_find ("fire_arrow"));
1689	m->insert (arrow, sx, sy, op);	1682	m->insert (arrow, sx, sy, op);
1690		1683
1691	if (!arrow->destroyed ())	1684	if (!arrow->destroyed ())
1692	move_arrow (arrow);	1685	move_arrow (arrow);
1693
1694	if (op->type == PLAYER)
1695	{
1696	if (left->destroyed ())
1697	esrv_del_item (op->contr, left->count);
1698	else
1699	esrv_send_item (op, left);
1700	}
1701		1686
1702	return 1;	1687	return 1;
1703	}	1688	}
1704		1689
1705	/* Special fire code for players - this takes into	1690	/* Special fire code for players - this takes into
…		…
1779	return;	1764	return;
1780	}	1765	}
1781	}	1766	}
1782	else if (item->type == ROD || item->type == HORN)	1767	else if (item->type == ROD || item->type == HORN)
1783	{	1768	{
1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1769	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1770
		1771	// using the maximum of the rods charge allows at least one spell cast
		1772	// for a rod or horn, this fixes some broken rods.
		1773	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1785	{	1774	{
1786	op->contr->play_sound (sound_find ("wand_poof"));	1775	op->contr->play_sound (sound_find ("wand_poof"));
1787		1776
1788	if (item->type == ROD)	1777	if (item->type == ROD)
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1778	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1808	CLEAR_FLAG (item, FLAG_ANIMATE);	1797	CLEAR_FLAG (item, FLAG_ANIMATE);
1809	item->face = item->arch->face;	1798	item->face = item->arch->face;
1810	item->set_speed (0);	1799	item->set_speed (0);
1811	}	1800	}
1812		1801
1813	if ((tmp = item->in_player ()))	1802	if (object *pl = item->visible_to ())
1814	esrv_update_item (UPD_ANIM, tmp, item);	1803	esrv_update_item (UPD_ANIM, pl, item);
1815	}	1804	}
1816	}	1805	}
1817	else if (item->type == ROD || item->type == HORN)	1806	else if (item->type == ROD || item->type == HORN)
1818	drain_rod_charge (item);	1807	drain_rod_charge (item);
1819	}	1808	}
…		…
1990		1979
1991	if (door->type == DOOR)	1980	if (door->type == DOOR)
1992	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1993	else if (door->type == LOCKED_DOOR)	1982	else if (door->type == LOCKED_DOOR)
1994	{	1983	{
1995	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1984	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1996	remove_door2 (door); /* remove door without violence ;-) */	1985	remove_door2 (door); /* remove door without violence ;-) */
1997	}	1986	}
1998		1987
1999	/* Do this after we print the message */	1988	/* Do this after we print the message */
2000	decrease_ob (key); /* Use up one of the keys */	1989	key->decrease (); /* Use up one of the keys */
2001	/* Need to update the weight the container the key was in */
2002	if (container != op)
2003	esrv_update_item (UPD_WEIGHT, op, container);
2004		1990
2005	return 1; /* Nothing more to do below */	1991	return 1; /* Nothing more to do below */
2006	}	1992	}
2007	else if (door->type == LOCKED_DOOR)	1993	else if (door->type == LOCKED_DOOR)
2008	{	1994	{
2009	/* Might as well return now - no other way to open this */	1995	/* Might as well return now - no other way to open this */
2010	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1996	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2011	return 1;	1997	return 1;
2012	}	1998	}
2013		1999
2014	return 0;	2000	return 0;
2015	}	2001	}
…		…
2135	{	2121	{
2136	op->play_sound (sound_find ("push_player"));	2122	op->play_sound (sound_find ("push_player"));
2137	push_ob (mon, dir, op);	2123	push_ob (mon, dir, op);
2138	}	2124	}
2139	else	2125	else
2140	new_draw_info (0, 0, op, "You withhold your attack");	2126	op->statusmsg ("You withhold your attack");
2141		2127
2142	if (op->contr->tmp_invis || op->hide)	2128	if (op->contr->tmp_invis || op->hide)
2143	make_visible (op);	2129	make_visible (op);
2144		2130
2145	return true;	2131	return true;
…		…
2189	bool	2175	bool
2190	move_player (object *op, int dir)	2176	move_player (object *op, int dir)
2191	{	2177	{
2192	int pick;	2178	int pick;
2193		2179
2194	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2180	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2195	return 0;	2181	return 0;
2196		2182
2197	/* Sanity check: make sure dir is valid */	2183	/* Sanity check: make sure dir is valid */
2198	if ((dir < 0) || (dir >= 9))	2184	if ((dir < 0) || (dir >= 9))
2199	{	2185	{
…		…
2287	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2273	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2288	{	2274	{
2289	op->play_sound (sound_find ("ob_evaporate"));	2275	op->play_sound (sound_find ("ob_evaporate"));
2290	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2276	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2291		2277
2292	if (op->contr)
2293	esrv_del_item (op->contr, tmp->count);
2294
2295	tmp->destroy ();	2278	tmp->destroy ();
2296	CLEAR_FLAG (op, FLAG_LIFESAVE);	2279	CLEAR_FLAG (op, FLAG_LIFESAVE);
2297		2280
2298	if (op->stats.hp < 0)	2281	if (op->stats.hp < 0)
2299	op->stats.hp = op->stats.maxhp;	2282	op->stats.hp = op->stats.maxhp;
…		…
2311	return 0;	2294	return 0;
2312	}	2295	}
2313		2296
2314	/* This goes throws the inventory and removes unpaid objects, and puts them	2297	/* This goes throws the inventory and removes unpaid objects, and puts them
2315	* back in the map (location and map determined by values of env). This	2298	* back in the map (location and map determined by values of env). This
2316	* function will descend into containers. op is the object to start the search	2299	* function will descend into containers. op is the object to start the search
2317	* from.	2300	* from.
2318	*/	2301	*/
2319	static void	2302	static void
2320	drop_unpaid_items (object *op, object *env)	2303	drop_unpaid_items (object *op, object *env)
2321	{	2304	{
2322	while (op)	2305	while (op)
2323	{	2306	{
2324	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2307	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2325		2308
2326	if (QUERY_FLAG (op, FLAG_UNPAID))	2309	if (QUERY_FLAG (op, FLAG_UNPAID))
2327	{
2328	if (env->type == PLAYER)
2329	esrv_del_item (env->contr, op->count);
2330
2331	op->insert_at (env);	2310	op->insert_at (env);
2332	}
2333	else if (op->inv)	2311	else if (op->inv)
2334	drop_unpaid_items (op->inv, env);	2312	drop_unpaid_items (op->inv, env);
2335		2313
2336	op = next;	2314	op = next;
2337	}	2315	}
…		…
2349	* Moved from apply.c to player.c - player.c is what	2327	* Moved from apply.c to player.c - player.c is what
2350	* actually uses this function. player.c may not be quite the	2328	* actually uses this function. player.c may not be quite the
2351	* best, a misc file for object actions is probably better,	2329	* best, a misc file for object actions is probably better,
2352	* but there isn't one in the server directory.	2330	* but there isn't one in the server directory.
2353	*/	2331	*/
2354	char *	2332	const char *
2355	gravestone_text (object *op)	2333	gravestone_text (object *op)
2356	{	2334	{
2357	static char buf2[MAX_BUF];	2335	static dynbuf_text buf;
2358	char buf[MAX_BUF];
2359	time_t now = time (NULL);
2360		2336
2361	strcpy (buf2, " R.I.P.\n\n");	2337	buf << "---- R.I.P. ----\n\n";
		2338	op->name;
		2339
2362	if (op->type == PLAYER)	2340	if (op->type == PLAYER)
2363	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2341	buf << " the " << op->contr->title;
2364	else
2365	sprintf (buf, "%s\n", &op->name);
2366		2342
2367	strncat (buf2, " ", 20 - strlen (buf) / 2);	2343	buf << "\n\n";
2368	strcat (buf2, buf);	2344
		2345	buf << "who was level ";
		2346	buf << (sint32)op->level << "\n\n" // OO breakdown
		2347	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2348
2369	if (op->type == PLAYER)	2349	if (op->type == PLAYER)
2370	sprintf (buf, "who was in level %d when killed\n", op->level);	2350	buf << "by " << op->contr->killer_name () << ".\n\n";
2371	else
2372	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2373		2351
2374	strncat (buf2, " ", 20 - strlen (buf) / 2);
2375	strcat (buf2, buf);
2376	if (op->type == PLAYER)
2377	{	2352	{
2378	sprintf (buf, "by %s.\n\n", op->contr->killer);	2353	static char buf2[128];
2379	strncat (buf2, " ", 21 - strlen (buf) / 2);	2354	time_t now = time (NULL);
2380	strcat (buf2, buf);
2381	}
2382
2383	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2355	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2384	strncat (buf2, " ", 20 - strlen (buf) / 2);	2356	buf << buf2;
2385	strcat (buf2, buf);	2357	}
2386		2358
2387	return buf2;	2359	return buf;
2388	}	2360	}
2389		2361
2390	void	2362	void
2391	do_some_living (object *op)	2363	do_some_living (object *op)
2392	{	2364	{
…		…
2444	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2416	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2445	else	2417	else
2446	{	2418	{
2447	gen_grace = op->stats.maxgrace;	2419	gen_grace = op->stats.maxgrace;
2448	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2420	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2449	}
2450
2451	/* Regenerate Spell Points */
2452	if (!op->contr->golem && --op->last_sp < 0)
2453	{
2454	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2455	if (op->stats.sp < op->stats.maxsp)
2456	{
2457	op->stats.sp++;
2458	/* dms do not consume food */
2459	if (!QUERY_FLAG (op, FLAG_WIZ))
2460	{
2461	op->stats.food--;
2462	if (op->contr->digestion < 0)
2463	op->stats.food += op->contr->digestion;
2464	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2465	op->stats.food = last_food;
2466	}
2467	}
2468
2469	if (max_sp > 1)
2470	{
2471	over_sp = (gen_sp + 10) / rate_sp;
2472	if (over_sp > 0)
2473	{
2474	if (op->stats.sp < op->stats.maxsp)
2475	{
2476	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2477
2478	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2479	op->stats.sp--;
2480
2481	if (op->stats.sp > op->stats.maxsp)
2482	op->stats.sp = op->stats.maxsp;
2483	}
2484	op->last_sp = 0;
2485	}
2486	else
2487	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2488	}
2489	else
2490	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2491	}	2421	}
2492		2422
2493	/* Regenerate Grace */	2423	/* Regenerate Grace */
2494	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2424	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2495	if (--op->last_grace < 0)	2425	if (--op->last_grace < 0)
…		…
2516	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2446	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2517	}	2447	}
2518	/* wearing stuff doesn't detract from grace generation. */	2448	/* wearing stuff doesn't detract from grace generation. */
2519	}	2449	}
2520		2450
		2451	if (op->stats.food > 0)
		2452	{
2521	/* Regenerate Hit Points */	2453	/* Regenerate Spell Points */
2522	if (--op->last_heal < 0)	2454	if (!op->contr->golem && --op->last_sp < 0)
2523	{
2524	if (op->stats.hp < op->stats.maxhp)
2525	{	2455	{
2526	op->stats.hp++;	2456	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2527	/* dms do not consume food */	2457
2528	if (!QUERY_FLAG (op, FLAG_WIZ))	2458	if (op->stats.sp < op->stats.maxsp)
2529	{	2459	{
		2460	op->stats.sp++;
		2461
		2462	/* dms do not consume food */
		2463	if (!QUERY_FLAG (op, FLAG_WIZ))
		2464	{
2530	op->stats.food--;	2465	op->stats.food--;
		2466
2531	if (op->contr->digestion < 0)	2467	if (op->contr->digestion < 0)
2532	op->stats.food += op->contr->digestion;	2468	op->stats.food += op->contr->digestion;
2533	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2469	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2534	op->stats.food = last_food;	2470	op->stats.food = last_food;
		2471	}
2535	}	2472	}
2536	}
2537		2473
2538	if (max_hp > 1)	2474	if (max_sp > 1)
2539	{
2540	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2541	if (over_hp > 0)
2542	{	2475	{
2543	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2476	over_sp = (gen_sp + 10) / rate_sp;
		2477	if (over_sp > 0)
		2478	{
		2479	if (op->stats.sp < op->stats.maxsp)
		2480	{
		2481	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2482
		2483	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2484	op->stats.sp--;
		2485
		2486	if (op->stats.sp > op->stats.maxsp)
		2487	op->stats.sp = op->stats.maxsp;
		2488	}
		2489
2544	op->last_heal = 0;	2490	op->last_sp = 0;
		2491	}
		2492	else
		2493	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2545	}	2494	}
2546	else	2495	else
		2496	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2497	}
		2498
		2499	/* Regenerate Hit Points */
		2500	if (--op->last_heal < 0)
		2501	{
		2502	if (op->stats.hp < op->stats.maxhp)
2547	{	2503	{
2548	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2504	op->stats.hp++;
		2505
		2506	/* dms do not consume food */
		2507	if (!QUERY_FLAG (op, FLAG_WIZ))
		2508	{
		2509	op->stats.food--;
		2510
		2511	if (op->contr->digestion < 0)
		2512	op->stats.food += op->contr->digestion;
		2513	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2514	op->stats.food = last_food;
		2515	}
2549	}	2516	}
		2517
		2518	if (max_hp > 1)
		2519	{
		2520	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2521
		2522	if (over_hp > 0)
		2523	{
		2524	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2525	op->last_heal = 0;
		2526	}
		2527	else
		2528	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2550	}	2529	}
2551	else	2530	else
2552	{
2553	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2531	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2554	}	2532	}
2555	}	2533	}
2556		2534
2557	/* Digestion */	2535	/* Digestion */
2558	if (--op->last_eat < 0)	2536	if (--op->last_eat < 0)
…		…
2595	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2573	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2596	manual_apply (op, flesh, 0);	2574	manual_apply (op, flesh, 0);
2597	}	2575	}
2598	}	2576	}
2599		2577
2600	while (op->stats.food < 0 && op->stats.hp >= 0)	2578	if (op->stats.food < 0 && op->stats.hp >= -op->stats.food)
2601	op->stats.food++, op->stats.hp--;	2579	{
		2580	op->stats.hp += op->stats.food;
		2581	op->stats.food = 0;
		2582	}
2602		2583
2603	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2584	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2604	kill_player (op);	2585	kill_player (op);
2605	}	2586	}
2606	}	2587	}
…		…
2611	* file.	2592	* file.
2612	*/	2593	*/
2613	void	2594	void
2614	kill_player (object *op)	2595	kill_player (object *op)
2615	{	2596	{
		2597	int x, y;
2616	char buf[MAX_BUF];	2598	char buf[MAX_BUF];
2617	int x, y;
2618
2619	//int i;
2620	maptile *map; /* this is for resurrection */	2599	maptile *map; /* this is for resurrection */
2621
2622	/* int z;
2623	int num_stats_lose;
2624	int lost_a_stat;
2625	int lose_this_stat;
2626	int this_stat; */
2627	int will_kill_again;	2600	int will_kill_again;
2628	archetype *at;	2601	archetype *at;
2629	object *tmp;	2602	object *tmp;
2630		2603
2631	if (save_life (op))	2604	if (save_life (op))
…		…
2653	{	2626	{
2654	tmp->destroy ();	2627	tmp->destroy ();
2655	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2628	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2656	}	2629	}
2657		2630
2658	cure_disease (op, 0); /* remove any disease */	2631	cure_disease (op, 0, 0); /* remove any disease */
2659	op->stats.hp = op->stats.maxhp;	2632	op->stats.hp = op->stats.maxhp;
2660	if (op->stats.food <= 0)	2633	if (op->stats.food <= 0)
2661	op->stats.food = 999;	2634	op->stats.food = 999;
2662		2635
2663	/* create a bodypart-trophy to make the winner happy */	2636	/* create a bodypart-trophy to make the winner happy */
2664	if (object *tmp = arch_to_object (archetype::find ("finger")))	2637	if (object *tmp = arch_to_object (archetype::find ("finger")))
2665	{	2638	{
2666	sprintf (buf, "%s's finger", &op->name);	2639	tmp->name = format ("%s's finger" , &op->name);
2667	tmp->name = buf;	2640	tmp->name_pl = format ("%s's fingers", &op->name);
2668	sprintf (buf, " This finger has been cut off %s\n"
2669	" the %s, when he was defeated at\n level %d by %s.\n",
2670	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2671	tmp->msg = buf;	2641	tmp->msg = format (
		2642	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2643	&op->name, op->contr->title,
		2644	(int)op->level,
		2645	op->contr->killer_name ()
		2646	);
2672	tmp->value = 0, tmp->type = 0;	2647	tmp->value = 0, tmp->type = 0;
2673	tmp->materialname = "organics";	2648	tmp->materialname = "organics";
2674	tmp->insert_at (op, tmp);	2649	tmp->insert_at (op, tmp);
2675	}	2650	}
2676		2651
…		…
2684		2659
2685	command_kill_pets (op, 0);	2660	command_kill_pets (op, 0);
2686		2661
2687	if (op->stats.food < 0)	2662	if (op->stats.food < 0)
2688	{	2663	{
2689	sprintf (buf, "%s starved to death.", &op->name);	2664	op->contr->killer = archetype::get ("killer_starvation");
2690	strcpy (op->contr->killer, "starvation");	2665	op->contr->killer->destroy ();
2691	}	2666	}
2692	else
2693	sprintf (buf, "%s died.", &op->name);
2694		2667
2695	op->contr->play_sound (sound_find ("player_dies"));	2668	op->contr->play_sound (sound_find ("player_dies"));
2696		2669
2697	/* save the map location for corpse, gravestone */	2670	/* save the map location for corpse, gravestone */
2698	x = op->x;	2671	x = op->x;
…		…
2807	lost_a_stat = 1;	2780	lost_a_stat = 1;
2808	}	2781	}
2809	}	2782	}
2810	}	2783	}
2811	}	2784	}
		2785
2812	/* If no stat lost, tell the player. */	2786	/* If no stat lost, tell the player. */
2813	if (!lost_a_stat)	2787	if (!lost_a_stat)
2814	{	2788	{
2815	/* determine_god() seems to not work sometimes... why is this?	2789	/* determine_god() seems to not work sometimes... why is this?
2816	Should I be using something else? GD */	2790	Should I be using something else? GD */
…		…
2820	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2794	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2821	else	2795	else
2822	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2796	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2823	}	2797	}
2824	#else	2798	#else
2825	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2799	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2826	#endif	2800	#endif
2827		2801
2828	/* Put a gravestone up where the character 'almost' died. List the	2802	/* Put a gravestone up where the character 'almost' died. List the
2829	* exp loss on the stone.	2803	* exp loss on the stone.
2830	*/	2804	*/
2831	tmp = arch_to_object (archetype::find ("gravestone"));	2805	tmp = arch_to_object (archetype::find ("gravestone"));
2832	sprintf (buf, "%s's gravestone", &op->name);	2806	tmp->name = format ("%s's gravestone", &op->name);
2833	tmp->name = buf;	2807	tmp->name_pl = format ("%s's gravestones", &op->name);
2834	sprintf (buf, "%s's gravestones", &op->name);
2835	tmp->name_pl = buf;
2836	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2808	tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2837	tmp->msg = buf;
2838	tmp->x = op->x, tmp->y = op->y;	2809	tmp->x = op->x, tmp->y = op->y;
2839	insert_ob_in_map (tmp, op->map, NULL, 0);	2810	insert_ob_in_map (tmp, op->map, NULL, 0);
2840		2811
2841	/**************************************/	2812	/**************************************/
2842	/* */	2813	/* */
…		…
2863	{	2834	{
2864	tmp->destroy ();	2835	tmp->destroy ();
2865	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2836	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2866	}	2837	}
2867		2838
2868	cure_disease (op, 0); /* remove any disease */	2839	cure_disease (op, 0, 0); /* remove any disease */
		2840
		2841	// remove all spell effects that are active
		2842	// to avoid long-term effects such as word-of-recall
		2843	for (object *item = op->inv; item; )
		2844	{
		2845	object *next = item->below;
		2846
		2847	if (item->type == SPELL_EFFECT && item->active)
		2848	item->destroy ();
		2849
		2850	item = next;
		2851	}
2869		2852
2870	/*add_exp(op, (op->stats.exp * -0.20)); */	2853	/*add_exp(op, (op->stats.exp * -0.20)); */
2871	apply_death_exp_penalty (op);	2854	apply_death_exp_penalty (op);
		2855
2872	if (op->stats.food < 100)	2856	if (op->stats.food < 100)
2873	op->stats.food = 900;	2857	op->stats.food = 900;
		2858
2874	op->stats.hp = op->stats.maxhp;	2859	op->stats.hp = op->stats.maxhp;
2875	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2860	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2876	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2861	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2877		2862
2878	/*	2863	/*
…		…
2946		2931
2947	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2932	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2948	{	2933	{
2949	if (tmp->nrof > 1)	2934	if (tmp->nrof > 1)
2950	{	2935	{
2951	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2936	tmp->decrease (rndm (1, tmp->nrof - 1));
2952	tmp2->destroy ();
2953	insert_ob_in_map (tmp, op->map, NULL, 0);	2937	insert_ob_in_map (tmp, op->map, NULL, 0);
2954	}	2938	}
2955	else	2939	else
2956	tmp->destroy ();	2940	tmp->destroy ();
2957	}	2941	}
…		…
2968	void	2952	void
2969	fix_weight (void)	2953	fix_weight (void)
2970	{	2954	{
2971	for_all_players (pl)	2955	for_all_players (pl)
2972	{	2956	{
2973	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2957	sint32 old = pl->ob->carrying;
2974		2958
2975	if (old == sum)	2959	pl->ob->update_weight ();
2976	continue;	2960
		2961	if (old != pl->ob->carrying)
		2962	{
2977	pl->ob->update_stats ();	2963	pl->ob->update_stats ();
2978	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2964	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2965	}
2979	}	2966	}
2980	}	2967	}
2981		2968
2982	void	2969	void
2983	fix_luck (void)	2970	fix_luck (void)
…		…
3027	void	3014	void
3028	make_visible (object *op)	3015	make_visible (object *op)
3029	{	3016	{
3030	op->hide = 0;	3017	op->hide = 0;
3031	op->invisible = 0;	3018	op->invisible = 0;
		3019
3032	if (op->type == PLAYER)	3020	if (op->type == PLAYER)
3033	{	3021	{
3034	op->contr->tmp_invis = 0;	3022	op->contr->tmp_invis = 0;
3035	op->contr->invis_race = 0;	3023	op->contr->invis_race = 0;
3036	}	3024	}
…		…
3049		3037
3050	/* look at the surrounding terrain to determine	3038	/* look at the surrounding terrain to determine
3051	* the hideability of this object. Positive levels	3039	* the hideability of this object. Positive levels
3052	* indicate greater hideability.	3040	* indicate greater hideability.
3053	*/	3041	*/
3054
3055	int	3042	int
3056	hideability (object *ob)	3043	hideability (object *ob)
3057	{	3044	{
3058	int i, level = 0, mflag;	3045	int i, level = 0, mflag;
3059	sint16 x, y;	3046	sint16 x, y;
…		…
3069	* as bad as carrying a light on a pitch dark map */	3056	* as bad as carrying a light on a pitch dark map */
3070	if (has_carried_lights (ob))	3057	if (has_carried_lights (ob))
3071	level = -(10 + (2 * ob->map->darkness));	3058	level = -(10 + (2 * ob->map->darkness));
3072		3059
3073	/* scan through all nearby squares for terrain to hide in */	3060	/* scan through all nearby squares for terrain to hide in */
3074	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3061	for (i = 0, x = ob->x, y = ob->y;
		3062	i <= SIZEOFFREE1;
		3063	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3075	{	3064	{
3076	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3065	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3077	if (mflag & P_OUT_OF_MAP)	3066	if (mflag & P_OUT_OF_MAP)
3078	{
3079	continue;	3067	continue;
3080	}	3068
3081	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3069	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3082	level += 2;	3070	level += 2;
3083	else /* open terrain! */	3071	else /* open terrain! */
3084	level -= 1;	3072	level -= 1;
3085	}	3073	}
…		…
3096	* spot (surrounded by clear terrain in broad daylight). -b.t.	3084	* spot (surrounded by clear terrain in broad daylight). -b.t.
3097	*/	3085	*/
3098	void	3086	void
3099	do_hidden_move (object *op)	3087	do_hidden_move (object *op)
3100	{	3088	{
3101	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3089	int hide = 0;
3102	object *skop;
3103		3090
3104	if (!op || !op->map)	3091	if (!op || !op->map)
3105	return;	3092	return;
3106		3093
3107	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3094	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3095	int num = random_roll (0, 19, op, PREFER_LOW);
3108		3096
3109	/* its *extremely* hard to run and sneak/hide at the same time! */	3097	/* its *extremely* hard to run and sneak/hide at the same time! */
3110	if (op->type == PLAYER && op->contr->run_on)	3098	if (op->type == PLAYER && op->contr->run_on)
3111	if (!skop || num >= skop->level)	3099	if (!skop || num >= skop->level)
3112	{	3100	{
…		…
3122	num -= hide;	3110	num -= hide;
3123		3111
3124	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3112	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3125	{	3113	{
3126	make_visible (op);	3114	make_visible (op);
		3115
3127	if (op->type == PLAYER)	3116	if (op->type == PLAYER)
3128	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3117	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3129	}	3118	}
3130	else if (op->type == PLAYER && skop)	3119	else if (op->type == PLAYER && skop)
3131	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3120	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3184	* object op. This function works fine for monsters,	3173	* object op. This function works fine for monsters,
3185	* but we dont worry if the object isnt the top one in	3174	* but we dont worry if the object isnt the top one in
3186	* a pile (say a coin under a table would return "viewable"	3175	* a pile (say a coin under a table would return "viewable"
3187	* by this routine). Another question, should we be	3176	* by this routine). Another question, should we be
3188	* concerned with the direction the player is looking	3177	* concerned with the direction the player is looking
3189	* in? Realistically, most of use cant see stuff behind	3178	* in? Realistically, most of us can't see stuff behind
3190	* our backs...on the other hand, does the "facing" direction	3179	* our backs...on the other hand, does the "facing" direction
3191	* imply the way your head, or body is facing? Its possible	3180	* imply the way your head, or body is facing? It's possible
3192	* for them to differ. Sigh, this fctn could get a bit more complex.	3181	* for them to differ. Sigh, this fctn could get a bit more complex.
3193	* -b.t.	3182	* -b.t.
3194	* This function is now map tiling safe.	3183	* This function is now map tiling safe.
3195	*/	3184	*/
3196
3197	int	3185	int
3198	player_can_view (object *pl, object *op)	3186	player_can_view (object *pl, object *op)
3199	{	3187	{
3200	rv_vector rv;	3188	rv_vector rv;
3201	int dx, dy;	3189	int dx, dy;
…		…
3213		3201
3214	get_rangevector (pl, op, &rv, 0x1);	3202	get_rangevector (pl, op, &rv, 0x1);
3215		3203
3216	/* starting with the 'head' part, lets loop	3204	/* starting with the 'head' part, lets loop
3217	* through the object and find if it has any	3205	* through the object and find if it has any
3218	* part that is in the los array but isnt on	3206	* part that is in the los array but isn't on
3219	* a blocked los square.	3207	* a blocked los square.
3220	* we use the archetype to figure out offsets.	3208	* we use the archetype to figure out offsets.
3221	*/	3209	*/
3222	while (op)	3210	while (op)
3223	{	3211	{
…		…
3226		3214
3227	/* only the viewable area the player sees is updated by LOS	3215	/* only the viewable area the player sees is updated by LOS
3228	* code, so we need to restrict ourselves to that range of values	3216	* code, so we need to restrict ourselves to that range of values
3229	* for any meaningful values.	3217	* for any meaningful values.
3230	*/	3218	*/
3231	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3219	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3232	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3220	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3233	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3221	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3234	return 1;	3222	return 1;
		3223
3235	op = op->more;	3224	op = op->more;
3236	}	3225	}
		3226
3237	return 0;	3227	return 0;
3238	}	3228	}
3239		3229
3240	/* routine for both players and monsters. We call this when	3230	/* routine for both players and monsters. We call this when
3241	* there is a possibility for our action distrubing our hiding	3231	* there is a possibility for our action distrubing our hiding
…		…
3244	* return 0.	3234	* return 0.
3245	*/	3235	*/
3246	int	3236	int
3247	action_makes_visible (object *op)	3237	action_makes_visible (object *op)
3248	{	3238	{
3249
3250	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3239	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3251	{	3240	{
3252	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3241	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3253	return 0;	3242	return 0;
3254		3243
…		…
3260	{	3249	{
3261	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3250	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3262	return 1;	3251	return 1;
3263	}	3252	}
3264	}	3253	}
		3254
3265	return 0;	3255	return 0;
3266	}	3256	}
3267		3257
3268	/* op_on_battleground - checks if the given object op (usually	3258	/* op_on_battleground - checks if the given object op (usually
3269	* a player) is standing on a valid battleground-tile,	3259	* a player) is standing on a valid battleground-tile,
…		…
3274	* Default is to do the same as before, so only people wanting to have different points need worry about this	3264	* Default is to do the same as before, so only people wanting to have different points need worry about this
3275	*/	3265	*/
3276	int	3266	int
3277	op_on_battleground (object *op, int *x, int *y)	3267	op_on_battleground (object *op, int *x, int *y)
3278	{	3268	{
3279	object *tmp;
3280
3281	/* A battleground-tile needs the following attributes to be valid:	3269	/* A battleground-tile needs the following attributes to be valid:
3282	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3270	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3283	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3271	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3284	* and the exit-coordinates sp/hp must both be > 0.	3272	* and the exit-coordinates sp/hp must both be > 0.
3285	* => The intention here is to prevent abuse of the battleground-	3273	* => The intention here is to prevent abuse of the battleground-
3286	* feature (like pickable or hidden battleground tiles). */	3274	* feature (like pickable or hidden battleground tiles). */
3287	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3275	for (object *tmp = op->below; tmp; tmp = tmp->below)
3288	{	3276	{
3289	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3277	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3290	{	3278	{
3291	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3279	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3292	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3280	&& tmp->type == BATTLEGROUND
		3281	&& tmp->name == shstr_battleground
		3282	&& EXIT_X (tmp) && EXIT_Y (tmp))
3293	{	3283	{
3294	/*before we assign the exit, check if this is a teambattle */	3284	/* before we assign the exit, check if this is a teambattle */
3295	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3285	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3296	{	3286	{
3297	object *invtmp;
3298
3299	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3287	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3300	{	3288	{
3301	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3289	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3302	{	3290	{
3303	if (x != NULL && y != NULL)	3291	if (x && y)
3304	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3292	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3293
3305	return 1;	3294	return 1;
3306	}	3295	}
3307	}	3296	}
3308	}	3297	}
		3298
3309	if (x != NULL && y != NULL)	3299	if (x && y)
3310	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3300	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3301
3311	return 1;	3302	return 1;
3312	}	3303	}
3313	}	3304	}
3314	}	3305	}
		3306
3315	/* If we got here, did not find a battleground */	3307	/* If we got here, did not find a battleground */
3316	return 0;	3308	return 0;
3317	}	3309	}
3318		3310
3319	/*	3311	/*
…		…
3335	char buf[MAX_BUF]; /* tmp. string buffer */	3327	char buf[MAX_BUF]; /* tmp. string buffer */
3336	int i = 0, j = 0;	3328	int i = 0, j = 0;
3337		3329
3338	/* get the appropriate treasurelist */	3330	/* get the appropriate treasurelist */
3339	if (atnr == ATNR_FIRE)	3331	if (atnr == ATNR_FIRE)
3340	trlist = treasurelist::find ("dragon_ability_fire");	3332	trlist = treasurelist::find (shstr_dragon_ability_fire);
3341	else if (atnr == ATNR_COLD)	3333	else if (atnr == ATNR_COLD)
3342	trlist = treasurelist::find ("dragon_ability_cold");	3334	trlist = treasurelist::find (shstr_dragon_ability_cold);
3343	else if (atnr == ATNR_ELECTRICITY)	3335	else if (atnr == ATNR_ELECTRICITY)
3344	trlist = treasurelist::find ("dragon_ability_elec");	3336	trlist = treasurelist::find (shstr_dragon_ability_elec);
3345	else if (atnr == ATNR_POISON)	3337	else if (atnr == ATNR_POISON)
3346	trlist = treasurelist::find ("dragon_ability_poison");	3338	trlist = treasurelist::find (shstr_dragon_ability_poison);
3347		3339
3348	if (trlist == NULL || who->type != PLAYER)	3340	if (trlist == NULL || who->type != PLAYER)
3349	return;	3341	return;
3350		3342
3351	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3343	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3469	else	3461	else
3470	{	3462	{
3471	/* generate misc. treasure */	3463	/* generate misc. treasure */
3472	tmp = arch_to_object (tr->item);	3464	tmp = arch_to_object (tr->item);
3473	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3465	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3474	tmp = insert_ob_in_ob (tmp, who);	3466	who->insert (tmp);
3475	if (who->type == PLAYER)
3476	esrv_send_item (who, tmp);
3477	}	3467	}
3478	}	3468	}
3479		3469
3480	/**	3470	/**
3481	* Unready an object for a player. This function does nothing if the object was	3471	* Unready an object for a player. This function does nothing if the object was
…		…
3510	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3500	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3511	return 0;	3501	return 0;
3512		3502
3513	return 100 - blocked_los [x][y];	3503	return 100 - blocked_los [x][y];
3514	}	3504	}
		3505
		3506	void
		3507	player::infobox (const char *title, const char *msg, int color)
		3508	{
		3509	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3510	}
		3511
		3512	void
		3513	player::statusmsg (const char *msg, int color)
		3514	{
		3515	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3516	}
		3517
		3518	void
		3519	player::failmsg (const char *msg, int color)
		3520	{
		3521	play_sound (sound_find ("generic_failure"));
		3522	statusmsg (msg, color);
		3523	}
		3524

Diff Legend

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