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.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.197 by root, Mon May 5 16:02:20 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	ob->close_container (); //TODO: client-specific
303
304	observe = ob;
305
306	deactivate ();
307	}
308
309	// the need for this function can be explained
310	// by load_object not returning the object
311	void
312	player::set_object (object *op)
313	{
314	ob = observe = op;
315	ob->contr = this; /* this aren't yet in archetype */
316
317	ob->speed = 1.0f;
318	ob->speed_left = 0.5f;
319
320	ob->direction = 5; /* So player faces south */
321	}	327	}
322		328
323	void	329	void
324	player::set_observe (object *op)	330	player::set_observe (object *op)
325	{	331	{
…		…
398	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
399	*/	405	*/
400	archetype *	406	archetype *
401	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
402	{	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
403	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	415	archvec::iterator i = archetypes.find (nat);
404		416
405	for (;;)	417	for (;;)
406	{	418	{
407	if (++i == archetypes.end ())	419	if (++i == archetypes.end ())
408	i = archetypes.begin ();	420	i = archetypes.begin ();
…		…
422	unsigned lastdist;	434	unsigned lastdist;
423	rv_vector rv;	435	rv_vector rv;
424		436
425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	438	{
427	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.
431	*/
432	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433	{
434	object *tmp = ol->ob;
435
436	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.
438	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440	tmp->debug_desc ());
441	ol = ol->next;
442	remove_friendly_object (tmp);
443	if (!ol)
444	return op;
445	}
446
447	/* Remove special check for player from this. First, it looks to cause
448	* some crashes (ol->ob->contr not set properly?), but secondly, a more
449	* complicated method of state checking would be needed in any case -
450	* as it was, a clever player could type quit, and the function would
451	* skip them over while waiting for confirmation. Remove
452	* on_same_map check, as can_detect_enemy also does this
453	*/
454	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
455	continue;	440	continue;
456		441
457	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
458	{	443	{
…		…
653		638
654	return firstdir;	639	return firstdir;
655	}	640	}
656		641
657	void	642	void
658	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
659	{	644	{
660	object *op, *next = NULL;
661
662	if (pl->randomitems != NULL)	645	if (pl->randomitems)
663	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664		647
665	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
666	{	649	{
667	next = op->below;	650	next = op->below;
668		651
669	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
670	* 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
…		…
675	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
676	* by this player due to race restrictions	659	* by this player due to race restrictions
677	*/	660	*/
678	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
679	{	662	{
680	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
681	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
682	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
683	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
684	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))
685	{	670	{
686	op->destroy ();	671	op->destroy ();
687	continue;	672	continue;
688	}	673	}
689	}	674	}
…		…
712	if (op->nrof > 1)	697	if (op->nrof > 1)
713	op->nrof = 1;	698	op->nrof = 1;
714	}	699	}
715		700
716	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
717	{
718	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719	}
720		703
721	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
722	* 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
723	* merged properly.	706	* merged properly.
724	*/	707	*/
725	if (need_identify (op))	708	if (need_identify (op))
726	{	709	{
727	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
728	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
729	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
730	}	713	}
		714
731	if (op->type == SPELL)	715	if (op->type == SPELL)
732	{	716	{
733	op->destroy ();	717	op->destroy ();
734	continue;	718	continue;
735	}	719	}
…		…
737	{	721	{
738	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
739	op->stats.exp = 0;	723	op->stats.exp = 0;
740	op->level = 1;	724	op->level = 1;
741	}	725	}
742	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
743	else
744	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
745	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
746		729
747	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
748	link_player_skills (pl);	731	link_player_skills (pl);
…		…
854	static void	837	static void
855	start_info (object *op)	838	start_info (object *op)
856	{	839	{
857	char buf[MAX_BUF];	840	char buf[MAX_BUF];
858		841
859	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
861	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862	//new_draw_info (NDI_UNIQUE, 0, op, " ");
863	}	844	}
864		845
865	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
866	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
867	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
870	*/	851	*/
871	void	852	void
872	player::chargen_race_done ()	853	player::chargen_race_done ()
873	{	854	{
874	/* this must before then initial items are given */	855	/* this must before then initial items are given */
875	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
876		857
877	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
878	if (tl)	859	if (tl)
879	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
880		861
…		…
883		864
884	ob->contr->ns->state = ST_PLAYING;	865	ob->contr->ns->state = ST_PLAYING;
885		866
886	if (ob->msg)	867	if (ob->msg)
887	ob->msg = 0;	868	ob->msg = 0;
888
889	/* We create this now because some of the unique maps will need it
890	* to save here.
891	*/
892	{
893	char buf[MAX_BUF];
894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895	make_path_to_file (buf);
896	}
897		869
898	start_info (ob);	870	start_info (ob);
899	CLEAR_FLAG (ob, FLAG_WIZ);	871	CLEAR_FLAG (ob, FLAG_WIZ);
900	give_initial_items (ob, ob->randomitems);	872	give_initial_items (ob, ob->randomitems);
901	link_player_skills (ob);	873	link_player_skills (ob);
…		…
904		876
905	/* This moves the player to a different start map, if there	877	/* This moves the player to a different start map, if there
906	* is one for this race	878	* is one for this race
907	*/	879	*/
908	if (*first_map_ext_path)	880	if (*first_map_ext_path)
909	{	881	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
910	object *tmp;
911	char mapname[MAX_BUF];
912
913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
914	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;
918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
919	* if the map isn't there, then stay on the
920	* default initial map */
921	tmp->destroy ();
922	}
923	else	882	else
924	LOG (llevDebug, "first_map_ext_path not set\n");	883	LOG (llevDebug, "first_map_ext_path not set\n");
925	}	884	}
926		885
927	void	886	void
…		…
1030	if (op->move_type & MOVE_FLYING)	989	if (op->move_type & MOVE_FLYING)
1031	return 1;	990	return 1;
1032		991
1033	next = op->below;	992	next = op->below;
1034		993
		994	int cnt = MAX_ITEM_PER_DROP;
		995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		996
1035	/* loop while there are items on the floor that are not marked as	997	/* loop while there are items on the floor that are not marked as
1036	* destroyed */	998	* destroyed */
1037	while (next && !next->destroyed ())	999	while (next && !next->destroyed ())
1038	{	1000	{
1039	tmp = next;	1001	tmp = next;
1040	next = tmp->below;	1002	next = tmp->below;
1041		1003
		1004	if (cnt <= 0)
		1005	{
		1006	op->failmsg ("Couldn't pickup all items at once.");
		1007	return 0;
		1008	}
		1009
1042	if (op->destroyed ())	1010	if (op->destroyed ())
1043	return 0;	1011	return 0;
1044		1012
1045	if (!can_pick (op, tmp))	1013	if (!can_pick (op, tmp))
1046	continue;	1014	continue;
1047		1015
1048	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049	{	1017	{
1050	if (item_matched_string (op, tmp, op->contr->search_str))	1018	if (item_matched_string (op, tmp, op->contr->search_str))
1051	pick_up (op, tmp);	1019	CHK_PICK_PICKUP;
1052	continue;	1020	continue;
1053	}	1021	}
1054		1022
1055	/* high not bit set? We're using the old autopickup model */	1023	/* high not bit set? We're using the old autopickup model */
1056	if (!(op->contr->mode & PU_NEWMODE))	1024	if (!(op->contr->mode & PU_NEWMODE))
…		…
1058	switch (op->contr->mode)	1026	switch (op->contr->mode)
1059	{	1027	{
1060	case 0:	1028	case 0:
1061	return 1; /* don't pick up */	1029	return 1; /* don't pick up */
1062	case 1:	1030	case 1:
1063	pick_up (op, tmp);	1031	CHK_PICK_PICKUP;
1064	return 1;	1032	return 1;
1065	case 2:	1033	case 2:
1066	pick_up (op, tmp);	1034	CHK_PICK_PICKUP;
1067	return 0;	1035	return 0;
1068	case 3:	1036	case 3:
1069	return 0; /* stop before pickup */	1037	return 0; /* stop before pickup */
1070	case 4:	1038	case 4:
1071	pick_up (op, tmp);	1039	CHK_PICK_PICKUP;
1072	break;	1040	break;
1073	case 5:	1041	case 5:
1074	pick_up (op, tmp);	1042	CHK_PICK_PICKUP;
1075	stop = 1;	1043	stop = 1;
1076	break;	1044	break;
1077	case 6:	1045	case 6:
1078	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079	pick_up (op, tmp);	1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1048	CHK_PICK_PICKUP;
1080	break;	1049	break;
1081		1050
1082	case 7:	1051	case 7:
1083	if (tmp->type == MONEY || tmp->type == GEM)	1052	if (tmp->type == MONEY || tmp->type == GEM)
1084	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1085	break;	1054	break;
1086		1055
1087	default:	1056	default:
1088	/* use value density */	1057	/* use value density */
1089	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1059	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091	pick_up (op, tmp);	1060	CHK_PICK_PICKUP;
1092	}	1061	}
1093	}	1062	}
1094	else	1063	else
1095	{ /* old model */	1064	{ /* old model */
1096	/* NEW pickup handling */	1065	/* NEW pickup handling */
…		…
1151	/* all food and drink if desired */	1120	/* all food and drink if desired */
1152	/* question: don't pick up known-poisonous stuff? */	1121	/* question: don't pick up known-poisonous stuff? */
1153	if (op->contr->mode & PU_FOOD)	1122	if (op->contr->mode & PU_FOOD)
1154	if (tmp->type == FOOD)	1123	if (tmp->type == FOOD)
1155	{	1124	{
1156	pick_up (op, tmp);	1125	CHK_PICK_PICKUP;
1157	continue;	1126	continue;
1158	}	1127	}
1159		1128
1160	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_DRINK)
1161	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1130	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162	{	1131	{
1163	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1164	continue;	1133	continue;
1165	}	1134	}
1166		1135
1167	if (op->contr->mode & PU_POTION)	1136	if (op->contr->mode & PU_POTION)
1168	if (tmp->type == POTION)	1137	if (tmp->type == POTION)
1169	{	1138	{
1170	pick_up (op, tmp);	1139	CHK_PICK_PICKUP;
1171	continue;	1140	continue;
1172	}	1141	}
1173		1142
1174	/* spellbooks, skillscrolls and normal books/scrolls */	1143	/* spellbooks, skillscrolls and normal books/scrolls */
1175	if (op->contr->mode & PU_SPELLBOOK)	1144	if (op->contr->mode & PU_SPELLBOOK)
1176	if (tmp->type == SPELLBOOK)	1145	if (tmp->type == SPELLBOOK)
1177	{	1146	{
1178	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1179	continue;	1148	continue;
1180	}	1149	}
1181		1150
1182	if (op->contr->mode & PU_SKILLSCROLL)	1151	if (op->contr->mode & PU_SKILLSCROLL)
1183	if (tmp->type == SKILLSCROLL)	1152	if (tmp->type == SKILLSCROLL)
1184	{	1153	{
1185	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1186	continue;	1155	continue;
1187	}	1156	}
1188		1157
1189	if (op->contr->mode & PU_READABLES)	1158	if (op->contr->mode & PU_READABLES)
1190	if (tmp->type == BOOK || tmp->type == SCROLL)	1159	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191	{	1160	{
1192	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1193	continue;	1162	continue;
1194	}	1163	}
1195		1164
1196	/* wands/staves/rods/horns */	1165	/* wands/staves/rods/horns */
1197	if (op->contr->mode & PU_MAGIC_DEVICE)	1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1198	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1167	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199	{	1168	{
1200	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1201	continue;	1170	continue;
1202	}	1171	}
1203		1172
1204	/* pick up all magical items */	1173	/* pick up all magical items */
1205	if (op->contr->mode & PU_MAGICAL)	1174	if (op->contr->mode & PU_MAGICAL)
1206	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1175	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207	{	1176	{
1208	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1209	continue;	1178	continue;
1210	}	1179	}
1211		1180
1212	if (op->contr->mode & PU_VALUABLES)	1181	if (op->contr->mode & PU_VALUABLES)
1213	{	1182	{
1214	if (tmp->type == MONEY || tmp->type == GEM)	1183	if (tmp->type == MONEY || tmp->type == GEM)
1215	{	1184	{
1216	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1217	continue;	1186	continue;
1218	}	1187	}
1219	}	1188	}
1220		1189
1221	/* rings & amulets - talismans seems to be typed AMULET */	1190	/* rings & amulets - talismans seems to be typed AMULET */
1222	if (op->contr->mode & PU_JEWELS)	1191	if (op->contr->mode & PU_JEWELS)
1223	if (tmp->type == RING || tmp->type == AMULET)	1192	if (tmp->type == RING || tmp->type == AMULET)
1224	{	1193	{
1225	pick_up (op, tmp);	1194	CHK_PICK_PICKUP;
1226	continue;	1195	continue;
1227	}	1196	}
1228		1197
1229	/* we don't forget dragon food */	1198	/* we don't forget dragon food */
1230	if (op->contr->mode & PU_FLESH)	1199	if (op->contr->mode & PU_FLESH)
1231	if (tmp->type == FLESH)	1200	if (tmp->type == FLESH)
1232	{	1201	{
1233	pick_up (op, tmp);	1202	CHK_PICK_PICKUP;
1234	continue;	1203	continue;
1235	}	1204	}
1236		1205
1237	/* bows and arrows. Bows are good for selling! */	1206	/* bows and arrows. Bows are good for selling! */
1238	if (op->contr->mode & PU_BOW)	1207	if (op->contr->mode & PU_BOW)
1239	if (tmp->type == BOW)	1208	if (tmp->type == BOW)
1240	{	1209	{
1241	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1242	continue;	1211	continue;
1243	}	1212	}
1244		1213
1245	if (op->contr->mode & PU_ARROW)	1214	if (op->contr->mode & PU_ARROW)
1246	if (tmp->type == ARROW)	1215	if (tmp->type == ARROW)
1247	{	1216	{
1248	pick_up (op, tmp);	1217	CHK_PICK_PICKUP;
1249	continue;	1218	continue;
1250	}	1219	}
1251		1220
1252	/* all kinds of armor etc. */	1221	/* all kinds of armor etc. */
1253	if (op->contr->mode & PU_ARMOUR)	1222	if (op->contr->mode & PU_ARMOUR)
1254	if (tmp->type == ARMOUR)	1223	if (tmp->type == ARMOUR)
1255	{	1224	{
1256	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1257	continue;	1226	continue;
1258	}	1227	}
1259		1228
1260	if (op->contr->mode & PU_HELMET)	1229	if (op->contr->mode & PU_HELMET)
1261	if (tmp->type == HELMET)	1230	if (tmp->type == HELMET)
1262	{	1231	{
1263	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1264	continue;	1233	continue;
1265	}	1234	}
1266		1235
1267	if (op->contr->mode & PU_SHIELD)	1236	if (op->contr->mode & PU_SHIELD)
1268	if (tmp->type == SHIELD)	1237	if (tmp->type == SHIELD)
1269	{	1238	{
1270	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1271	continue;	1240	continue;
1272	}	1241	}
1273		1242
1274	if (op->contr->mode & PU_BOOTS)	1243	if (op->contr->mode & PU_BOOTS)
1275	if (tmp->type == BOOTS)	1244	if (tmp->type == BOOTS)
1276	{	1245	{
1277	pick_up (op, tmp);	1246	CHK_PICK_PICKUP;
1278	continue;	1247	continue;
1279	}	1248	}
1280		1249
1281	if (op->contr->mode & PU_GLOVES)	1250	if (op->contr->mode & PU_GLOVES)
1282	if (tmp->type == GLOVES)	1251	if (tmp->type == GLOVES)
1283	{	1252	{
1284	pick_up (op, tmp);	1253	CHK_PICK_PICKUP;
1285	continue;	1254	continue;
1286	}	1255	}
1287		1256
1288	if (op->contr->mode & PU_CLOAK)	1257	if (op->contr->mode & PU_CLOAK)
1289	if (tmp->type == CLOAK)	1258	if (tmp->type == CLOAK)
1290	{	1259	{
1291	pick_up (op, tmp);	1260	CHK_PICK_PICKUP;
1292	continue;	1261	continue;
1293	}	1262	}
1294		1263
1295	/* hoping to catch throwing daggers here */	1264	/* hoping to catch throwing daggers here */
1296	if (op->contr->mode & PU_MISSILEWEAPON)	1265	if (op->contr->mode & PU_MISSILEWEAPON)
1297	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298	{	1267	{
1299	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1300	continue;	1269	continue;
1301	}	1270	}
1302		1271
1303	/* careful: chairs and tables are weapons! */	1272	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1273	if (op->contr->mode & PU_ALLWEAPON)
…		…
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1275	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1276	{
1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&	1277	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1279	{
1311	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1312	continue;	1281	continue;
1313	}	1282	}
1314	}	1283	}
1315		1284
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1285	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1286	{
1318	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)	1287	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1288	{
1320	pick_up (op, tmp);	1289	CHK_PICK_PICKUP;
1321	continue;	1290	continue;
1322	}	1291	}
1323	}	1292	}
1324	}	1293	}
1325		1294
1326	/* misc stuff that's useful */	1295	/* misc stuff that's useful */
1327	if (op->contr->mode & PU_KEY)	1296	if (op->contr->mode & PU_KEY)
1328	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1297	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329	{	1298	{
1330	pick_up (op, tmp);	1299	CHK_PICK_PICKUP;
1331	continue;	1300	continue;
1332	}	1301	}
1333		1302
1334	/* any of the last 4 bits set means we use the ratio for value	1303	/* any of the last 4 bits set means we use the ratio for value
1335	* pickups */	1304	* pickups */
…		…
1340	/* >=7 is the old standard setting. Now we take the last 4 bits	1309	/* >=7 is the old standard setting. Now we take the last 4 bits
1341	* and multiply them by 5, giving 0..15*5== 5..75 */	1310	* and multiply them by 5, giving 0..15*5== 5..75 */
1342	wvratio = (op->contr->mode & PU_RATIO) * 5;	1311	wvratio = (op->contr->mode & PU_RATIO) * 5;
1343	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1312	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1344	{	1313	{
1345	pick_up (op, tmp);	1314	CHK_PICK_PICKUP;
1346	#if 0	1315	#if 0
1347	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348	if (tmp->name != NULL)	1317	if (tmp->name != NULL)
1349	{	1318	{
1350	fprintf (stderr, "%s", tmp->name);	1319	fprintf (stderr, "%s", tmp->name);
…		…
1369	* found object is returned.	1338	* found object is returned.
1370	*/	1339	*/
1371	object *	1340	object *
1372	find_arrow (object *op, const char *type)	1341	find_arrow (object *op, const char *type)
1373	{	1342	{
1374	object *tmp = 0;
1375
1376	for (op = op->inv; op; op = op->below)	1343	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378	tmp = find_arrow (op, type);
1379	else if (op->type == ARROW && op->race == type)	1344	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1345	return splay (tmp);
		1346
		1347	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1348	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1349	if (object *arrow = find_arrow (tmp, type))
		1350	{
		1351	splay (tmp);
1380	return op;	1352	return arrow;
		1353	}
1381		1354
1382	return tmp;	1355	return 0;
1383	}	1356	}
1384		1357
1385	/*	1358	/*
1386	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1359	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1387	* against the target. A full test is not performed, simply a basic test	1360	* against the target. A full test is not performed, simply a basic test
…		…
1410	}	1383	}
1411	}	1384	}
1412	else if (arrow->type == ARROW && arrow->race == type)	1385	else if (arrow->type == ARROW && arrow->race == type)
1413	{	1386	{
1414	/* allways prefer assasination/slaying */	1387	/* allways prefer assasination/slaying */
1415	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1416	{	1389	{
1417	if (arrow->attacktype & AT_DEATH)	1390	if (arrow->attacktype & AT_DEATH)
1418	{	1391	{
1419	*better = 100;	1392	*better = 100;
1420	return arrow;	1393	return arrow;
…		…
1448	betterby = 1 + arrow->magic + arrow->stats.dam;	1421	betterby = 1 + arrow->magic + arrow->stats.dam;
1449	}	1422	}
1450	}	1423	}
1451	}	1424	}
1452	}	1425	}
		1426
1453	if (tmp == NULL && arrow == NULL)	1427	if (tmp == NULL && arrow == NULL)
1454	return find_arrow (op, type);	1428	return find_arrow (op, type);
1455		1429
1456	*better = betterby;	1430	*better = betterby;
1457	return tmp;	1431	return tmp;
…		…
1608	arrow->destroy ();	1582	arrow->destroy ();
1609	return 0;	1583	return 0;
1610	}	1584	}
1611		1585
1612	left = arrow; /* these are arrows left to the player */	1586	left = arrow; /* these are arrows left to the player */
1613	arrow = get_split_ob (arrow, 1);	1587	arrow = arrow->split ();
1614	if (!arrow)	1588	if (!arrow)
1615	{	1589	{
1616	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1617	return 0;	1591	return 0;
1618	}	1592	}
…		…
1680		1654
1681	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1655	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1682	arrow->move_type = MOVE_FLY_LOW;	1656	arrow->move_type = MOVE_FLY_LOW;
1683	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1657	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1684		1658
1685	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1659	op->play_sound (sound_find ("fire_arrow"));
1686	m->insert (arrow, sx, sy, op);	1660	m->insert (arrow, sx, sy, op);
1687		1661
1688	if (!arrow->destroyed ())	1662	if (!arrow->destroyed ())
1689	move_arrow (arrow);	1663	move_arrow (arrow);
1690
1691	if (op->type == PLAYER)
1692	{
1693	if (left->destroyed ())
1694	esrv_del_item (op->contr, left->count);
1695	else
1696	esrv_send_item (op, left);
1697	}
1698		1664
1699	return 1;	1665	return 1;
1700	}	1666	}
1701		1667
1702	/* Special fire code for players - this takes into	1668	/* Special fire code for players - this takes into
…		…
1768		1734
1769	if (item->type == WAND)	1735	if (item->type == WAND)
1770	{	1736	{
1771	if (item->stats.food <= 0)	1737	if (item->stats.food <= 0)
1772	{	1738	{
1773	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1739	op->contr->play_sound (sound_find ("wand_poof"));
1774	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1740	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1775		1741
1776	return;	1742	return;
1777	}	1743	}
1778	}	1744	}
1779	else if (item->type == ROD || item->type == HORN)	1745	else if (item->type == ROD || item->type == HORN)
1780	{	1746	{
1781	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1747	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1748
		1749	// using the maximum of the rods charge allows at least one spell cast
		1750	// for a rod or horn, this fixes some broken rods.
		1751	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1782	{	1752	{
1783	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1753	op->contr->play_sound (sound_find ("wand_poof"));
1784		1754
1785	if (item->type == ROD)	1755	if (item->type == ROD)
1786	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1756	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1787	else	1757	else
1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1758	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1805	CLEAR_FLAG (item, FLAG_ANIMATE);	1775	CLEAR_FLAG (item, FLAG_ANIMATE);
1806	item->face = item->arch->face;	1776	item->face = item->arch->face;
1807	item->set_speed (0);	1777	item->set_speed (0);
1808	}	1778	}
1809		1779
1810	if ((tmp = item->in_player ()))	1780	if (object *pl = item->visible_to ())
1811	esrv_update_item (UPD_ANIM, tmp, item);	1781	esrv_update_item (UPD_ANIM, pl, item);
1812	}	1782	}
1813	}	1783	}
1814	else if (item->type == ROD || item->type == HORN)	1784	else if (item->type == ROD || item->type == HORN)
1815	drain_rod_charge (item);	1785	drain_rod_charge (item);
1816	}	1786	}
…		…
1977	/* If we found a key, do some extra work */	1947	/* If we found a key, do some extra work */
1978	if (key)	1948	if (key)
1979	{	1949	{
1980	object *container = key->env;	1950	object *container = key->env;
1981		1951
1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
1984	if (action_makes_visible (op))	1952	if (action_makes_visible (op))
1985	make_visible (op);	1953	make_visible (op);
1986		1954
1987	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1955	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1988	spring_trap (door->inv, op);	1956	spring_trap (door->inv, op);
1989		1957
1990	if (door->type == DOOR)	1958	if (door->type == DOOR)
1991	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1959	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992	else if (door->type == LOCKED_DOOR)	1960	else if (door->type == LOCKED_DOOR)
1993	{	1961	{
1994	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1962	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1995	remove_door2 (door); /* remove door without violence ;-) */	1963	remove_door2 (door); /* remove door without violence ;-) */
1996	}	1964	}
1997		1965
1998	/* Do this after we print the message */	1966	/* Do this after we print the message */
1999	decrease_ob (key); /* Use up one of the keys */	1967	key->decrease (); /* Use up one of the keys */
2000	/* Need to update the weight the container the key was in */
2001	if (container != op)
2002	esrv_update_item (UPD_WEIGHT, op, container);
2003		1968
2004	return 1; /* Nothing more to do below */	1969	return 1; /* Nothing more to do below */
2005	}	1970	}
2006	else if (door->type == LOCKED_DOOR)	1971	else if (door->type == LOCKED_DOOR)
2007	{	1972	{
2008	/* Might as well return now - no other way to open this */	1973	/* Might as well return now - no other way to open this */
2009	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1974	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2010	return 1;	1975	return 1;
2011	}	1976	}
2012		1977
2013	return 0;	1978	return 0;
2014	}	1979	}
…		…
2101		2066
2102	if (op->speed_left > 0.f)	2067	if (op->speed_left > 0.f)
2103	{	2068	{
2104	--op->speed_left;	2069	--op->speed_left;
2105		2070
2106	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2071	op->play_sound (sound_find ("push_player"));
2107	push_ob (mon, dir, op);	2072	push_ob (mon, dir, op);
2108		2073
2109	if (op->contr->tmp_invis || op->hide)	2074	if (op->contr->tmp_invis || op->hide)
2110	make_visible (op);	2075	make_visible (op);
2111		2076
…		…
2130	{	2095	{
2131	--op->speed_left;	2096	--op->speed_left;
2132		2097
2133	if (!op->contr->braced)	2098	if (!op->contr->braced)
2134	{	2099	{
2135	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2100	op->play_sound (sound_find ("push_player"));
2136	push_ob (mon, dir, op);	2101	push_ob (mon, dir, op);
2137	}	2102	}
2138	else	2103	else
2139	new_draw_info (0, 0, op, "You withhold your attack");	2104	op->statusmsg ("You withhold your attack");
2140		2105
2141	if (op->contr->tmp_invis || op->hide)	2106	if (op->contr->tmp_invis || op->hide)
2142	make_visible (op);	2107	make_visible (op);
2143		2108
2144	return true;	2109	return true;
…		…
2188	bool	2153	bool
2189	move_player (object *op, int dir)	2154	move_player (object *op, int dir)
2190	{	2155	{
2191	int pick;	2156	int pick;
2192		2157
2193	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2158	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2194	return 0;	2159	return 0;
2195		2160
2196	/* Sanity check: make sure dir is valid */	2161	/* Sanity check: make sure dir is valid */
2197	if ((dir < 0) || (dir >= 9))	2162	if ((dir < 0) || (dir >= 9))
2198	{	2163	{
…		…
2283	return 0;	2248	return 0;
2284		2249
2285	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2250	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2286	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2251	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2287	{	2252	{
2288	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2253	op->play_sound (sound_find ("ob_evaporate"));
2289	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2254	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2290
2291	if (op->contr)
2292	esrv_del_item (op->contr, tmp->count);
2293		2255
2294	tmp->destroy ();	2256	tmp->destroy ();
2295	CLEAR_FLAG (op, FLAG_LIFESAVE);	2257	CLEAR_FLAG (op, FLAG_LIFESAVE);
2296		2258
2297	if (op->stats.hp < 0)	2259	if (op->stats.hp < 0)
…		…
2310	return 0;	2272	return 0;
2311	}	2273	}
2312		2274
2313	/* This goes throws the inventory and removes unpaid objects, and puts them	2275	/* This goes throws the inventory and removes unpaid objects, and puts them
2314	* back in the map (location and map determined by values of env). This	2276	* back in the map (location and map determined by values of env). This
2315	* function will descend into containers. op is the object to start the search	2277	* function will descend into containers. op is the object to start the search
2316	* from.	2278	* from.
2317	*/	2279	*/
		2280	static void
		2281	drop_unpaid_items (object *op, object *env)
		2282	{
		2283	while (op)
		2284	{
		2285	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2286
		2287	if (QUERY_FLAG (op, FLAG_UNPAID))
		2288	op->insert_at (env);
		2289	else if (op->inv)
		2290	drop_unpaid_items (op->inv, env);
		2291
		2292	op = next;
		2293	}
		2294	}
		2295
2318	void	2296	void
2319	remove_unpaid_objects (object *op, object *env)	2297	object::drop_unpaid_items ()
2320	{	2298	{
2321	while (op)	2299	if (!flag [FLAG_REMOVED])
2322	{	2300	::drop_unpaid_items (inv, this);
2323	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2324
2325	if (QUERY_FLAG (op, FLAG_UNPAID))
2326	{
2327	if (env->type == PLAYER)
2328	esrv_del_item (env->contr, op->count);
2329
2330	op->insert_at (env);
2331	}
2332	else if (op->inv)
2333	remove_unpaid_objects (op->inv, env);
2334
2335	op = next;
2336	}
2337	}	2301	}
2338		2302
2339	/*	2303	/*
2340	* Returns pointer a static string containing gravestone text	2304	* Returns pointer a static string containing gravestone text
2341	* Moved from apply.c to player.c - player.c is what	2305	* Moved from apply.c to player.c - player.c is what
2342	* actually uses this function. player.c may not be quite the	2306	* actually uses this function. player.c may not be quite the
2343	* best, a misc file for object actions is probably better,	2307	* best, a misc file for object actions is probably better,
2344	* but there isn't one in the server directory.	2308	* but there isn't one in the server directory.
2345	*/	2309	*/
2346	char *	2310	const char *
2347	gravestone_text (object *op)	2311	gravestone_text (object *op)
2348	{	2312	{
2349	static char buf2[MAX_BUF];	2313	static dynbuf_text buf;
2350	char buf[MAX_BUF];
2351	time_t now = time (NULL);
2352		2314
2353	strcpy (buf2, " R.I.P.\n\n");	2315	buf << "---- R.I.P. ----\n\n";
		2316	op->name;
		2317
2354	if (op->type == PLAYER)	2318	if (op->type == PLAYER)
2355	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2319	buf << " the " << op->contr->title;
2356	else
2357	sprintf (buf, "%s\n", &op->name);
2358		2320
2359	strncat (buf2, " ", 20 - strlen (buf) / 2);	2321	buf << "\n\n";
2360	strcat (buf2, buf);	2322
		2323	buf << "who was level ";
		2324	buf << (sint32)op->level << "\n\n" // OO breakdown
		2325	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2326
2361	if (op->type == PLAYER)	2327	if (op->type == PLAYER)
2362	sprintf (buf, "who was in level %d when killed\n", op->level);	2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2363	else
2364	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2365		2329
2366	strncat (buf2, " ", 20 - strlen (buf) / 2);
2367	strcat (buf2, buf);
2368	if (op->type == PLAYER)
2369	{	2330	{
2370	sprintf (buf, "by %s.\n\n", op->contr->killer);	2331	static char buf2[128];
2371	strncat (buf2, " ", 21 - strlen (buf) / 2);	2332	time_t now = time (NULL);
2372	strcat (buf2, buf);
2373	}
2374
2375	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2376	strncat (buf2, " ", 20 - strlen (buf) / 2);	2334	buf << buf2;
2377	strcat (buf2, buf);	2335	}
2378		2336
2379	return buf2;	2337	return buf;
2380	}	2338	}
2381		2339
2382	void	2340	void
2383	do_some_living (object *op)	2341	do_some_living (object *op)
2384	{	2342	{
…		…
2436	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2394	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2437	else	2395	else
2438	{	2396	{
2439	gen_grace = op->stats.maxgrace;	2397	gen_grace = op->stats.maxgrace;
2440	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2398	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2441	}
2442
2443	/* Regenerate Spell Points */
2444	if (!op->contr->golem && --op->last_sp < 0)
2445	{
2446	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2447	if (op->stats.sp < op->stats.maxsp)
2448	{
2449	op->stats.sp++;
2450	/* dms do not consume food */
2451	if (!QUERY_FLAG (op, FLAG_WIZ))
2452	{
2453	op->stats.food--;
2454	if (op->contr->digestion < 0)
2455	op->stats.food += op->contr->digestion;
2456	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2457	op->stats.food = last_food;
2458	}
2459	}
2460
2461	if (max_sp > 1)
2462	{
2463	over_sp = (gen_sp + 10) / rate_sp;
2464	if (over_sp > 0)
2465	{
2466	if (op->stats.sp < op->stats.maxsp)
2467	{
2468	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2469
2470	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2471	op->stats.sp--;
2472
2473	if (op->stats.sp > op->stats.maxsp)
2474	op->stats.sp = op->stats.maxsp;
2475	}
2476	op->last_sp = 0;
2477	}
2478	else
2479	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2480	}
2481	else
2482	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483	}	2399	}
2484		2400
2485	/* Regenerate Grace */	2401	/* Regenerate Grace */
2486	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2402	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2487	if (--op->last_grace < 0)	2403	if (--op->last_grace < 0)
…		…
2508	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2424	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2509	}	2425	}
2510	/* wearing stuff doesn't detract from grace generation. */	2426	/* wearing stuff doesn't detract from grace generation. */
2511	}	2427	}
2512		2428
		2429	if (op->stats.food > 0)
		2430	{
2513	/* Regenerate Hit Points */	2431	/* Regenerate Spell Points */
2514	if (--op->last_heal < 0)	2432	if (!op->contr->golem && --op->last_sp < 0)
2515	{
2516	if (op->stats.hp < op->stats.maxhp)
2517	{	2433	{
2518	op->stats.hp++;	2434	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2519	/* dms do not consume food */	2435
2520	if (!QUERY_FLAG (op, FLAG_WIZ))	2436	if (op->stats.sp < op->stats.maxsp)
2521	{	2437	{
		2438	op->stats.sp++;
		2439
		2440	/* dms do not consume food */
		2441	if (!QUERY_FLAG (op, FLAG_WIZ))
		2442	{
2522	op->stats.food--;	2443	op->stats.food--;
		2444
2523	if (op->contr->digestion < 0)	2445	if (op->contr->digestion < 0)
2524	op->stats.food += op->contr->digestion;	2446	op->stats.food += op->contr->digestion;
2525	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2447	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526	op->stats.food = last_food;	2448	op->stats.food = last_food;
		2449	}
2527	}	2450	}
2528	}
2529		2451
2530	if (max_hp > 1)	2452	if (max_sp > 1)
2531	{
2532	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533	if (over_hp > 0)
2534	{	2453	{
2535	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2454	over_sp = (gen_sp + 10) / rate_sp;
		2455	if (over_sp > 0)
		2456	{
		2457	if (op->stats.sp < op->stats.maxsp)
		2458	{
		2459	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2460
		2461	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2462	op->stats.sp--;
		2463
		2464	if (op->stats.sp > op->stats.maxsp)
		2465	op->stats.sp = op->stats.maxsp;
		2466	}
		2467
2536	op->last_heal = 0;	2468	op->last_sp = 0;
		2469	}
		2470	else
		2471	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2537	}	2472	}
2538	else	2473	else
		2474	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2475	}
		2476
		2477	/* Regenerate Hit Points */
		2478	if (--op->last_heal < 0)
		2479	{
		2480	if (op->stats.hp < op->stats.maxhp)
2539	{	2481	{
2540	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2482	op->stats.hp++;
		2483
		2484	/* dms do not consume food */
		2485	if (!QUERY_FLAG (op, FLAG_WIZ))
		2486	{
		2487	op->stats.food--;
		2488
		2489	if (op->contr->digestion < 0)
		2490	op->stats.food += op->contr->digestion;
		2491	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2492	op->stats.food = last_food;
		2493	}
2541	}	2494	}
		2495
		2496	if (max_hp > 1)
		2497	{
		2498	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2499
		2500	if (over_hp > 0)
		2501	{
		2502	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2503	op->last_heal = 0;
		2504	}
		2505	else
		2506	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2542	}	2507	}
2543	else	2508	else
2544	{
2545	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2509	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2546	}	2510	}
2547	}	2511	}
2548		2512
2549	/* Digestion */	2513	/* Digestion */
2550	if (--op->last_eat < 0)	2514	if (--op->last_eat < 0)
2551	{	2515	{
2552	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2516	int bonus = max (0, op->contr->digestion),
		2517	penalty = max (0, -op->contr->digestion);
2553		2518
2554	if (op->contr->gen_hp > 0)
2555	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2519	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2556	else
2557	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2558		2520
2559	/* dms do not consume food */	2521	/* dms do not consume food */
2560	if (!QUERY_FLAG (op, FLAG_WIZ))	2522	if (!QUERY_FLAG (op, FLAG_WIZ))
2561	op->stats.food--;	2523	op->stats.food--;
2562	}	2524	}
2563		2525
2564	if (op->stats.food < 0 && op->stats.hp >= 0)	2526	if (op->stats.food < 0 && op->stats.hp >= 0)
2565	{	2527	{
2566	object *tmp, *flesh = 0;	2528	object *flesh = 0;
2567		2529
2568	for (tmp = op->inv; tmp; tmp = tmp->below)	2530	for_inv_removable (op, tmp)
2569	{	2531	{
2570	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2532	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2533	continue;
		2534
		2535	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2571	{	2536	{
2572	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2537	op->statusmsg ("You blindly grab for a bite of food. "
2573	{	2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2574	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2575	manual_apply (op, tmp, 0);	2539	manual_apply (op, tmp, 0);
		2540
2576	if (op->stats.food >= 0 || op->stats.hp < 0)	2541	if (op->stats.food >= 0 || op->stats.hp < 0)
2577	break;	2542	break;
2578	}	2543	}
2579	else if (tmp->type == FLESH)	2544	else if (tmp->type == FLESH)
2580	flesh = tmp;	2545	flesh = tmp;
2581	} /* End if paid for object */	2546	}
2582	} /* end of for loop */
2583		2547
2584	/* If player is still starving, it means they don't have any food, so	2548	/* If player is still starving, it means they don't have any food, so
2585	* eat flesh instead.	2549	* eat flesh instead.
2586	*/	2550	*/
2587	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2551	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2588	{	2552	{
2589	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2553	op->statusmsg ("You blindly grab for a bite of food. "
		2554	"H<To prevent you from starving, you ate some random item from your backpack.>");
2590	manual_apply (op, flesh, 0);	2555	manual_apply (op, flesh, 0);
2591	}	2556	}
		2557
		2558	// If player is still starving, alert him!
		2559	if (op->stats.food < 0)
		2560	op->failmsg ("You are starving! "
		2561	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2562	}
		2563
		2564	if (op->stats.food < 0)
2592	}	2565	{
2593		2566	op->stats.hp += op->stats.food;
2594	while (op->stats.food < 0 && op->stats.hp >= 0)	2567	op->stats.food = 0;
2595	op->stats.food++, op->stats.hp--;	2568	}
2596		2569
2597	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2598	kill_player (op);	2571	kill_player (op);
2599	}	2572	}
2600	}	2573	}
…		…
2605	* file.	2578	* file.
2606	*/	2579	*/
2607	void	2580	void
2608	kill_player (object *op)	2581	kill_player (object *op)
2609	{	2582	{
		2583	int x, y;
2610	char buf[MAX_BUF];	2584	char buf[MAX_BUF];
2611	int x, y;
2612
2613	//int i;
2614	maptile *map; /* this is for resurrection */	2585	maptile *map; /* this is for resurrection */
2615
2616	/* int z;
2617	int num_stats_lose;
2618	int lost_a_stat;
2619	int lose_this_stat;
2620	int this_stat; */
2621	int will_kill_again;	2586	int will_kill_again;
2622	archetype *at;	2587	archetype *at;
2623	object *tmp;	2588	object *tmp;
2624		2589
2625	if (save_life (op))	2590	if (save_life (op))
2626	return;	2591	return;
2627
2628		2592
2629	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2593	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2630	* in cities ONLY!!! It is very important that this doesn't get abused.	2594	* in cities ONLY!!! It is very important that this doesn't get abused.
2631	* Look at op_on_battleground() for more info --AndreasV	2595	* Look at op_on_battleground() for more info --AndreasV
2632	*/	2596	*/
…		…
2648	{	2612	{
2649	tmp->destroy ();	2613	tmp->destroy ();
2650	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2614	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2651	}	2615	}
2652		2616
2653	cure_disease (op, 0); /* remove any disease */	2617	cure_disease (op, 0, 0); /* remove any disease */
2654	op->stats.hp = op->stats.maxhp;	2618	op->stats.hp = op->stats.maxhp;
2655	if (op->stats.food <= 0)	2619	if (op->stats.food <= 0)
2656	op->stats.food = 999;	2620	op->stats.food = 999;
2657		2621
2658	/* create a bodypart-trophy to make the winner happy */	2622	/* create a bodypart-trophy to make the winner happy */
2659	if (object *tmp = arch_to_object (archetype::find ("finger")))	2623	if (object *tmp = arch_to_object (archetype::find ("finger")))
2660	{	2624	{
2661	sprintf (buf, "%s's finger", &op->name);	2625	tmp->name = format ("%s's finger" , &op->name);
2662	tmp->name = buf;	2626	tmp->name_pl = format ("%s's fingers", &op->name);
2663	sprintf (buf, " This finger has been cut off %s\n"
2664	" the %s, when he was defeated at\n level %d by %s.\n",
2665	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2666	tmp->msg = buf;	2627	tmp->msg = format (
		2628	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2629	&op->name, op->contr->title,
		2630	(int)op->level,
		2631	op->contr->killer_name ()
		2632	);
2667	tmp->value = 0, tmp->type = 0;	2633	tmp->value = 0, tmp->type = 0;
2668	tmp->materialname = "organics";	2634	tmp->materialname = "organics";
2669	tmp->insert_at (op, tmp);	2635	tmp->insert_at (op, tmp);
2670	}	2636	}
2671		2637
…		…
2679		2645
2680	command_kill_pets (op, 0);	2646	command_kill_pets (op, 0);
2681		2647
2682	if (op->stats.food < 0)	2648	if (op->stats.food < 0)
2683	{	2649	{
2684	sprintf (buf, "%s starved to death.", &op->name);	2650	op->contr->killer = archetype::get ("killer_starvation");
2685	strcpy (op->contr->killer, "starvation");	2651	op->contr->killer->destroy ();
2686	}	2652	}
2687	else
2688	sprintf (buf, "%s died.", &op->name);
2689		2653
2690	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2654	op->contr->play_sound (sound_find ("player_dies"));
2691		2655
2692	/* save the map location for corpse, gravestone */	2656	/* save the map location for corpse, gravestone */
2693	x = op->x;	2657	x = op->x;
2694	y = op->y;	2658	y = op->y;
2695	map = op->map;	2659	map = op->map;
…		…
2802	lost_a_stat = 1;	2766	lost_a_stat = 1;
2803	}	2767	}
2804	}	2768	}
2805	}	2769	}
2806	}	2770	}
		2771
2807	/* If no stat lost, tell the player. */	2772	/* If no stat lost, tell the player. */
2808	if (!lost_a_stat)	2773	if (!lost_a_stat)
2809	{	2774	{
2810	/* determine_god() seems to not work sometimes... why is this?	2775	/* determine_god() seems to not work sometimes... why is this?
2811	Should I be using something else? GD */	2776	Should I be using something else? GD */
…		…
2815	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2780	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2816	else	2781	else
2817	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2782	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2818	}	2783	}
2819	#else	2784	#else
2820	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2821	#endif	2786	#endif
2822		2787
2823	/* Put a gravestone up where the character 'almost' died. List the	2788	/* Put a gravestone up where the character 'almost' died. List the
2824	* exp loss on the stone.	2789	* exp loss on the stone.
2825	*/	2790	*/
2826	tmp = arch_to_object (archetype::find ("gravestone"));	2791	tmp = arch_to_object (archetype::find ("gravestone"));
2827	sprintf (buf, "%s's gravestone", &op->name);	2792	tmp->name = format ("%s's gravestone", &op->name);
2828	tmp->name = buf;	2793	tmp->name_pl = format ("%s's gravestones", &op->name);
2829	sprintf (buf, "%s's gravestones", &op->name);
2830	tmp->name_pl = buf;
2831	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);	2794	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 ());
2832	tmp->msg = buf;
2833	tmp->x = op->x, tmp->y = op->y;	2795	tmp->x = op->x, tmp->y = op->y;
2834	insert_ob_in_map (tmp, op->map, NULL, 0);	2796	insert_ob_in_map (tmp, op->map, NULL, 0);
2835		2797
2836	/**************************************/	2798	/**************************************/
2837	/* */	2799	/* */
…		…
2858	{	2820	{
2859	tmp->destroy ();	2821	tmp->destroy ();
2860	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2861	}	2823	}
2862		2824
2863	cure_disease (op, 0); /* remove any disease */	2825	cure_disease (op, 0, 0); /* remove any disease */
		2826
		2827	// remove all spell effects that are active
		2828	// to avoid long-term effects such as word-of-recall
		2829	for (object *item = op->inv; item; )
		2830	{
		2831	object *next = item->below;
		2832
		2833	if (item->type == SPELL_EFFECT && item->active)
		2834	item->destroy ();
		2835
		2836	item = next;
		2837	}
2864		2838
2865	/*add_exp(op, (op->stats.exp * -0.20)); */	2839	/*add_exp(op, (op->stats.exp * -0.20)); */
2866	apply_death_exp_penalty (op);	2840	apply_death_exp_penalty (op);
		2841
2867	if (op->stats.food < 100)	2842	if (op->stats.food < 100)
2868	op->stats.food = 900;	2843	op->stats.food = 900;
		2844
2869	op->stats.hp = op->stats.maxhp;	2845	op->stats.hp = op->stats.maxhp;
2870	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2871	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2872		2848
2873	/*	2849	/*
2874	* Check to see if the player has any unpaid items. If so, remove them	2850	* Check to see if the player has any unpaid items. If so, remove them
2875	* and put them back in the map.	2851	* and put them back in the map.
2876	*/	2852	*/
2877	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2878		2854
2879	/****************************************/	2855	/****************************************/
2880	/* */	2856	/* */
2881	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2882	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
2941		2917
2942	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2918	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2943	{	2919	{
2944	if (tmp->nrof > 1)	2920	if (tmp->nrof > 1)
2945	{	2921	{
2946	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2922	tmp->decrease (rndm (1, tmp->nrof - 1));
2947	tmp2->destroy ();
2948	insert_ob_in_map (tmp, op->map, NULL, 0);	2923	insert_ob_in_map (tmp, op->map, NULL, 0);
2949	}	2924	}
2950	else	2925	else
2951	tmp->destroy ();	2926	tmp->destroy ();
2952	}	2927	}
…		…
2963	void	2938	void
2964	fix_weight (void)	2939	fix_weight (void)
2965	{	2940	{
2966	for_all_players (pl)	2941	for_all_players (pl)
2967	{	2942	{
2968	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2943	sint32 old = pl->ob->carrying;
2969		2944
2970	if (old == sum)	2945	pl->ob->update_weight ();
2971	continue;	2946
		2947	if (old != pl->ob->carrying)
		2948	{
2972	pl->ob->update_stats ();	2949	pl->ob->update_stats ();
2973	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2950	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2951	}
2974	}	2952	}
2975	}	2953	}
2976		2954
2977	void	2955	void
2978	fix_luck (void)	2956	fix_luck (void)
…		…
3022	void	3000	void
3023	make_visible (object *op)	3001	make_visible (object *op)
3024	{	3002	{
3025	op->hide = 0;	3003	op->hide = 0;
3026	op->invisible = 0;	3004	op->invisible = 0;
		3005
3027	if (op->type == PLAYER)	3006	if (op->type == PLAYER)
3028	{	3007	{
3029	op->contr->tmp_invis = 0;	3008	op->contr->tmp_invis = 0;
3030	op->contr->invis_race = 0;	3009	op->contr->invis_race = 0;
3031	}	3010	}
…		…
3044		3023
3045	/* look at the surrounding terrain to determine	3024	/* look at the surrounding terrain to determine
3046	* the hideability of this object. Positive levels	3025	* the hideability of this object. Positive levels
3047	* indicate greater hideability.	3026	* indicate greater hideability.
3048	*/	3027	*/
3049
3050	int	3028	int
3051	hideability (object *ob)	3029	hideability (object *ob)
3052	{	3030	{
3053	int i, level = 0, mflag;	3031	int i, level = 0, mflag;
3054	sint16 x, y;	3032	sint16 x, y;
…		…
3064	* as bad as carrying a light on a pitch dark map */	3042	* as bad as carrying a light on a pitch dark map */
3065	if (has_carried_lights (ob))	3043	if (has_carried_lights (ob))
3066	level = -(10 + (2 * ob->map->darkness));	3044	level = -(10 + (2 * ob->map->darkness));
3067		3045
3068	/* scan through all nearby squares for terrain to hide in */	3046	/* scan through all nearby squares for terrain to hide in */
3069	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3047	for (i = 0, x = ob->x, y = ob->y;
		3048	i <= SIZEOFFREE1;
		3049	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3070	{	3050	{
3071	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3051	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3072	if (mflag & P_OUT_OF_MAP)	3052	if (mflag & P_OUT_OF_MAP)
3073	{
3074	continue;	3053	continue;
3075	}	3054
3076	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3055	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3077	level += 2;	3056	level += 2;
3078	else /* open terrain! */	3057	else /* open terrain! */
3079	level -= 1;	3058	level -= 1;
3080	}	3059	}
…		…
3091	* spot (surrounded by clear terrain in broad daylight). -b.t.	3070	* spot (surrounded by clear terrain in broad daylight). -b.t.
3092	*/	3071	*/
3093	void	3072	void
3094	do_hidden_move (object *op)	3073	do_hidden_move (object *op)
3095	{	3074	{
3096	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3075	int hide = 0;
3097	object *skop;
3098		3076
3099	if (!op || !op->map)	3077	if (!op || !op->map)
3100	return;	3078	return;
3101		3079
3102	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3080	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3081	int num = random_roll (0, 19, op, PREFER_LOW);
3103		3082
3104	/* its *extremely* hard to run and sneak/hide at the same time! */	3083	/* its *extremely* hard to run and sneak/hide at the same time! */
3105	if (op->type == PLAYER && op->contr->run_on)	3084	if (op->type == PLAYER && op->contr->run_on)
3106	if (!skop || num >= skop->level)	3085	if (!skop || num >= skop->level)
3107	{	3086	{
…		…
3117	num -= hide;	3096	num -= hide;
3118		3097
3119	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3098	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3120	{	3099	{
3121	make_visible (op);	3100	make_visible (op);
		3101
3122	if (op->type == PLAYER)	3102	if (op->type == PLAYER)
3123	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3103	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3124	}	3104	}
3125	else if (op->type == PLAYER && skop)	3105	else if (op->type == PLAYER && skop)
3126	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3106	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3179	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3180	* but we dont worry if the object isnt the top one in	3160	* but we dont worry if the object isnt the top one in
3181	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3182	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3183	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3184	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3185	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3186	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3187	* for them to differ. Sigh, this fctn could get a bit more complex.	3167	* for them to differ. Sigh, this fctn could get a bit more complex.
3188	* -b.t.	3168	* -b.t.
3189	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3190	*/	3170	*/
3191
3192	int	3171	int
3193	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3194	{	3173	{
3195	rv_vector rv;	3174	rv_vector rv;
3196	int dx, dy;	3175	int dx, dy;
…		…
3208		3187
3209	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3210		3189
3211	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3212	* through the object and find if it has any	3191	* through the object and find if it has any
3213	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3214	* a blocked los square.	3193	* a blocked los square.
3215	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3216	*/	3195	*/
3217	while (op)	3196	while (op)
3218	{	3197	{
…		…
3221		3200
3222	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3223	* code, so we need to restrict ourselves to that range of values	3202	* code, so we need to restrict ourselves to that range of values
3224	* for any meaningful values.	3203	* for any meaningful values.
3225	*/	3204	*/
3226	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3227	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3228	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3207	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3229	return 1;	3208	return 1;
		3209
3230	op = op->more;	3210	op = op->more;
3231	}	3211	}
		3212
3232	return 0;	3213	return 0;
3233	}	3214	}
3234		3215
3235	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3236	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3239	* return 0.	3220	* return 0.
3240	*/	3221	*/
3241	int	3222	int
3242	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3243	{	3224	{
3244
3245	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3246	{	3226	{
3247	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3248	return 0;	3228	return 0;
3249		3229
…		…
3255	{	3235	{
3256	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3236	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3257	return 1;	3237	return 1;
3258	}	3238	}
3259	}	3239	}
		3240
3260	return 0;	3241	return 0;
3261	}	3242	}
3262		3243
3263	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3264	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3269	* Default is to do the same as before, so only people wanting to have different points need worry about this	3250	* Default is to do the same as before, so only people wanting to have different points need worry about this
3270	*/	3251	*/
3271	int	3252	int
3272	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3273	{	3254	{
3274	object *tmp;
3275
3276	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3277	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3256	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3278	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3279	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3280	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3281	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3282	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3283	{	3262	{
3284	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3285	{	3264	{
3286	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3287	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3266	&& tmp->type == BATTLEGROUND
		3267	&& tmp->name == shstr_battleground
		3268	&& EXIT_X (tmp) && EXIT_Y (tmp))
3288	{	3269	{
3289	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3290	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3271	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3291	{	3272	{
3292	object *invtmp;
3293
3294	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3295	{	3274	{
3296	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3297	{	3276	{
3298	if (x != NULL && y != NULL)	3277	if (x && y)
3299	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3300	return 1;	3280	return 1;
3301	}	3281	}
3302	}	3282	}
3303	}	3283	}
		3284
3304	if (x != NULL && y != NULL)	3285	if (x && y)
3305	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3306	return 1;	3288	return 1;
3307	}	3289	}
3308	}	3290	}
3309	}	3291	}
		3292
3310	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3311	return 0;	3294	return 0;
3312	}	3295	}
3313		3296
3314	/*	3297	/*
…		…
3330	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3331	int i = 0, j = 0;	3314	int i = 0, j = 0;
3332		3315
3333	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3334	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3335	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3336	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3337	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3338	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3339	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3340	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3341	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3342		3325
3343	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3344	return;	3327	return;
3345		3328
3346	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3329	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3464	else	3447	else
3465	{	3448	{
3466	/* generate misc. treasure */	3449	/* generate misc. treasure */
3467	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3468	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3451	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3469	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3470	if (who->type == PLAYER)
3471	esrv_send_item (who, tmp);
3472	}	3453	}
3473	}	3454	}
3474		3455
3475	/**	3456	/**
3476	* Unready an object for a player. This function does nothing if the object was	3457	* Unready an object for a player. This function does nothing if the object was
…		…
3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3486	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3506	return 0;	3487	return 0;
3507		3488
3508	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3509	}	3490	}
		3491
		3492	void
		3493	player::infobox (const char *title, const char *msg, int color)
		3494	{
		3495	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3496	}
		3497
		3498	void
		3499	player::statusmsg (const char *msg, int color)
		3500	{
		3501	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3502	}
		3503
		3504	void
		3505	player::failmsg (const char *msg, int color)
		3506	{
		3507	play_sound (sound_find ("generic_failure"));
		3508	statusmsg (msg, color);
		3509	}
		3510

Diff Legend

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