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.152 by root, Sun Jul 1 05:00:20 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);
…		…
226	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
227	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
228	{	229	{
229	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
230		231
231	shstr_cmp dragon_ability_force ("dragon_ability_force");
232	shstr_cmp dragon_skin_force ("dragon_skin_force");
233
234	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
235	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
236	if (tmp->arch->archname == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
237	abil = tmp;	235	abil = tmp;
238	else if (tmp->arch->archname == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
239	skin = tmp;	237	skin = tmp;
240		238
241	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
242	}	240	}
243		241
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		243
246	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 */
247		300
248	ob->flag [FLAG_READY_WEAPON] = false;	301	ob->flag [FLAG_READY_WEAPON] = false;
249	ob->flag [FLAG_READY_SKILL] = false;	302	ob->flag [FLAG_READY_SKILL] = false;
250	ob->flag [FLAG_READY_BOW] = false;	303	ob->flag [FLAG_READY_BOW] = false;
251		304
…		…
268	combat_ob = op;	321	combat_ob = op;
269	break;	322	break;
270	}	323	}
271		324
272	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
273	ob->update_stats ();	326	ob->deactivate (); // change_Weapon activates, fix this better
274
275	ns->floorbox_update ();
276	esrv_send_inventory (ob, ob);
277	esrv_add_spells (this, 0);
278
279	activate ();
280
281	send_rules (ob);
282	send_news (ob);
283	display_motd (ob);
284
285	INVOKE_PLAYER (CONNECT, this);
286	INVOKE_PLAYER (LOGIN, this);
287	}
288
289	void
290	player::disconnect ()
291	{
292	if (ns)
293	{
294	if (active)
295	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
296
297	INVOKE_PLAYER (DISCONNECT, this);
298
299	ns->reset_stats ();
300	ns->pl = 0;
301	ns = 0;
302	}
303
304	if (ob)
305	ob->close_container (); //TODO: client-specific
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
…		…
886		864
887	ob->contr->ns->state = ST_PLAYING;	865	ob->contr->ns->state = ST_PLAYING;
888		866
889	if (ob->msg)	867	if (ob->msg)
890	ob->msg = 0;	868	ob->msg = 0;
891
892	/* We create this now because some of the unique maps will need it
893	* to save here.
894	*/
895	{
896	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);
899	}
900		869
901	start_info (ob);	870	start_info (ob);
902	CLEAR_FLAG (ob, FLAG_WIZ);	871	CLEAR_FLAG (ob, FLAG_WIZ);
903	give_initial_items (ob, ob->randomitems);	872	give_initial_items (ob, ob->randomitems);
904	link_player_skills (ob);	873	link_player_skills (ob);
…		…
907		876
908	/* This moves the player to a different start map, if there	877	/* This moves the player to a different start map, if there
909	* is one for this race	878	* is one for this race
910	*/	879	*/
911	if (*first_map_ext_path)	880	if (*first_map_ext_path)
912	{	881	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
913	object *tmp;
914	char mapname[MAX_BUF];
915
916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917	tmp = object::create ();
918	EXIT_PATH (tmp) = mapname;
919	EXIT_X (tmp) = ob->x;
920	EXIT_Y (tmp) = ob->y;
921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
922	* if the map isn't there, then stay on the
923	* default initial map */
924	tmp->destroy ();
925	}
926	else	882	else
927	LOG (llevDebug, "first_map_ext_path not set\n");	883	LOG (llevDebug, "first_map_ext_path not set\n");
928	}	884	}
929		885
930	void	886	void
…		…
1033	if (op->move_type & MOVE_FLYING)	989	if (op->move_type & MOVE_FLYING)
1034	return 1;	990	return 1;
1035		991
1036	next = op->below;	992	next = op->below;
1037		993
		994	int cnt = MAX_ITEM_PER_DROP;
		995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		996
1038	/* 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
1039	* destroyed */	998	* destroyed */
1040	while (next && !next->destroyed ())	999	while (next && !next->destroyed ())
1041	{	1000	{
1042	tmp = next;	1001	tmp = next;
1043	next = tmp->below;	1002	next = tmp->below;
1044		1003
		1004	if (cnt <= 0)
		1005	{
		1006	op->failmsg ("Couldn't pickup all items at once.");
		1007	return 0;
		1008	}
		1009
1045	if (op->destroyed ())	1010	if (op->destroyed ())
1046	return 0;	1011	return 0;
1047		1012
1048	if (!can_pick (op, tmp))	1013	if (!can_pick (op, tmp))
1049	continue;	1014	continue;
1050		1015
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	1017	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	1018	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	1019	CHK_PICK_PICKUP;
1055	continue;	1020	continue;
1056	}	1021	}
1057		1022
1058	/* high not bit set? We're using the old autopickup model */	1023	/* high not bit set? We're using the old autopickup model */
1059	if (!(op->contr->mode & PU_NEWMODE))	1024	if (!(op->contr->mode & PU_NEWMODE))
…		…
1061	switch (op->contr->mode)	1026	switch (op->contr->mode)
1062	{	1027	{
1063	case 0:	1028	case 0:
1064	return 1; /* don't pick up */	1029	return 1; /* don't pick up */
1065	case 1:	1030	case 1:
1066	pick_up (op, tmp);	1031	CHK_PICK_PICKUP;
1067	return 1;	1032	return 1;
1068	case 2:	1033	case 2:
1069	pick_up (op, tmp);	1034	CHK_PICK_PICKUP;
1070	return 0;	1035	return 0;
1071	case 3:	1036	case 3:
1072	return 0; /* stop before pickup */	1037	return 0; /* stop before pickup */
1073	case 4:	1038	case 4:
1074	pick_up (op, tmp);	1039	CHK_PICK_PICKUP;
1075	break;	1040	break;
1076	case 5:	1041	case 5:
1077	pick_up (op, tmp);	1042	CHK_PICK_PICKUP;
1078	stop = 1;	1043	stop = 1;
1079	break;	1044	break;
1080	case 6:	1045	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1082	pick_up (op, tmp);	1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1048	CHK_PICK_PICKUP;
1083	break;	1049	break;
1084		1050
1085	case 7:	1051	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)	1052	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1088	break;	1054	break;
1089		1055
1090	default:	1056	default:
1091	/* use value density */	1057	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (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)
1094	pick_up (op, tmp);	1060	CHK_PICK_PICKUP;
1095	}	1061	}
1096	}	1062	}
1097	else	1063	else
1098	{ /* old model */	1064	{ /* old model */
1099	/* NEW pickup handling */	1065	/* NEW pickup handling */
…		…
1154	/* all food and drink if desired */	1120	/* all food and drink if desired */
1155	/* question: don't pick up known-poisonous stuff? */	1121	/* question: don't pick up known-poisonous stuff? */
1156	if (op->contr->mode & PU_FOOD)	1122	if (op->contr->mode & PU_FOOD)
1157	if (tmp->type == FOOD)	1123	if (tmp->type == FOOD)
1158	{	1124	{
1159	pick_up (op, tmp);	1125	CHK_PICK_PICKUP;
1160	continue;	1126	continue;
1161	}	1127	}
1162		1128
1163	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_DRINK)
1164	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)))
1165	{	1131	{
1166	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1167	continue;	1133	continue;
1168	}	1134	}
1169		1135
1170	if (op->contr->mode & PU_POTION)	1136	if (op->contr->mode & PU_POTION)
1171	if (tmp->type == POTION)	1137	if (tmp->type == POTION)
1172	{	1138	{
1173	pick_up (op, tmp);	1139	CHK_PICK_PICKUP;
1174	continue;	1140	continue;
1175	}	1141	}
1176		1142
1177	/* spellbooks, skillscrolls and normal books/scrolls */	1143	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)	1144	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)	1145	if (tmp->type == SPELLBOOK)
1180	{	1146	{
1181	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1182	continue;	1148	continue;
1183	}	1149	}
1184		1150
1185	if (op->contr->mode & PU_SKILLSCROLL)	1151	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)	1152	if (tmp->type == SKILLSCROLL)
1187	{	1153	{
1188	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1189	continue;	1155	continue;
1190	}	1156	}
1191		1157
1192	if (op->contr->mode & PU_READABLES)	1158	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL)	1159	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1194	{	1160	{
1195	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1196	continue;	1162	continue;
1197	}	1163	}
1198		1164
1199	/* wands/staves/rods/horns */	1165	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)	1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1167	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{	1168	{
1203	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1204	continue;	1170	continue;
1205	}	1171	}
1206		1172
1207	/* pick up all magical items */	1173	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1174	if (op->contr->mode & PU_MAGICAL)
1209	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))
1210	{	1176	{
1211	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1212	continue;	1178	continue;
1213	}	1179	}
1214		1180
1215	if (op->contr->mode & PU_VALUABLES)	1181	if (op->contr->mode & PU_VALUABLES)
1216	{	1182	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1183	if (tmp->type == MONEY || tmp->type == GEM)
1218	{	1184	{
1219	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1220	continue;	1186	continue;
1221	}	1187	}
1222	}	1188	}
1223		1189
1224	/* rings & amulets - talismans seems to be typed AMULET */	1190	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)	1191	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)	1192	if (tmp->type == RING || tmp->type == AMULET)
1227	{	1193	{
1228	pick_up (op, tmp);	1194	CHK_PICK_PICKUP;
1229	continue;	1195	continue;
1230	}	1196	}
1231		1197
1232	/* we don't forget dragon food */	1198	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)	1199	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)	1200	if (tmp->type == FLESH)
1235	{	1201	{
1236	pick_up (op, tmp);	1202	CHK_PICK_PICKUP;
1237	continue;	1203	continue;
1238	}	1204	}
1239		1205
1240	/* bows and arrows. Bows are good for selling! */	1206	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)	1207	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)	1208	if (tmp->type == BOW)
1243	{	1209	{
1244	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1245	continue;	1211	continue;
1246	}	1212	}
1247		1213
1248	if (op->contr->mode & PU_ARROW)	1214	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)	1215	if (tmp->type == ARROW)
1250	{	1216	{
1251	pick_up (op, tmp);	1217	CHK_PICK_PICKUP;
1252	continue;	1218	continue;
1253	}	1219	}
1254		1220
1255	/* all kinds of armor etc. */	1221	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)	1222	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)	1223	if (tmp->type == ARMOUR)
1258	{	1224	{
1259	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1260	continue;	1226	continue;
1261	}	1227	}
1262		1228
1263	if (op->contr->mode & PU_HELMET)	1229	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)	1230	if (tmp->type == HELMET)
1265	{	1231	{
1266	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1267	continue;	1233	continue;
1268	}	1234	}
1269		1235
1270	if (op->contr->mode & PU_SHIELD)	1236	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)	1237	if (tmp->type == SHIELD)
1272	{	1238	{
1273	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1274	continue;	1240	continue;
1275	}	1241	}
1276		1242
1277	if (op->contr->mode & PU_BOOTS)	1243	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)	1244	if (tmp->type == BOOTS)
1279	{	1245	{
1280	pick_up (op, tmp);	1246	CHK_PICK_PICKUP;
1281	continue;	1247	continue;
1282	}	1248	}
1283		1249
1284	if (op->contr->mode & PU_GLOVES)	1250	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)	1251	if (tmp->type == GLOVES)
1286	{	1252	{
1287	pick_up (op, tmp);	1253	CHK_PICK_PICKUP;
1288	continue;	1254	continue;
1289	}	1255	}
1290		1256
1291	if (op->contr->mode & PU_CLOAK)	1257	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)	1258	if (tmp->type == CLOAK)
1293	{	1259	{
1294	pick_up (op, tmp);	1260	CHK_PICK_PICKUP;
1295	continue;	1261	continue;
1296	}	1262	}
1297		1263
1298	/* hoping to catch throwing daggers here */	1264	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)	1265	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{	1267	{
1302	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1303	continue;	1269	continue;
1304	}	1270	}
1305		1271
1306	/* careful: chairs and tables are weapons! */	1272	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)	1273	if (op->contr->mode & PU_ALLWEAPON)
…		…
1309	if (tmp->type == WEAPON && tmp->name != NULL)	1275	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{	1276	{
1311	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 &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{	1279	{
1314	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1315	continue;	1281	continue;
1316	}	1282	}
1317	}	1283	}
1318		1284
1319	if (tmp->type == WEAPON && tmp->name == NULL)	1285	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{	1286	{
1321	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)
1322	{	1288	{
1323	pick_up (op, tmp);	1289	CHK_PICK_PICKUP;
1324	continue;	1290	continue;
1325	}	1291	}
1326	}	1292	}
1327	}	1293	}
1328		1294
1329	/* misc stuff that's useful */	1295	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)	1296	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1297	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{	1298	{
1333	pick_up (op, tmp);	1299	CHK_PICK_PICKUP;
1334	continue;	1300	continue;
1335	}	1301	}
1336		1302
1337	/* 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
1338	* pickups */	1304	* pickups */
…		…
1343	/* >=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
1344	* and multiply them by 5, giving 0..15*5== 5..75 */	1310	* and multiply them by 5, giving 0..15*5== 5..75 */
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;	1311	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)	1312	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347	{	1313	{
1348	pick_up (op, tmp);	1314	CHK_PICK_PICKUP;
1349	#if 0	1315	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)	1317	if (tmp->name != NULL)
1352	{	1318	{
1353	fprintf (stderr, "%s", tmp->name);	1319	fprintf (stderr, "%s", tmp->name);
…		…
1372	* found object is returned.	1338	* found object is returned.
1373	*/	1339	*/
1374	object *	1340	object *
1375	find_arrow (object *op, const char *type)	1341	find_arrow (object *op, const char *type)
1376	{	1342	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1343	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)	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);
1383	return op;	1352	return arrow;
		1353	}
1384		1354
1385	return tmp;	1355	return 0;
1386	}	1356	}
1387		1357
1388	/*	1358	/*
1389	* 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
1390	* 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
…		…
1413	}	1383	}
1414	}	1384	}
1415	else if (arrow->type == ARROW && arrow->race == type)	1385	else if (arrow->type == ARROW && arrow->race == type)
1416	{	1386	{
1417	/* allways prefer assasination/slaying */	1387	/* allways prefer assasination/slaying */
1418	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1419	{	1389	{
1420	if (arrow->attacktype & AT_DEATH)	1390	if (arrow->attacktype & AT_DEATH)
1421	{	1391	{
1422	*better = 100;	1392	*better = 100;
1423	return arrow;	1393	return arrow;
…		…
1451	betterby = 1 + arrow->magic + arrow->stats.dam;	1421	betterby = 1 + arrow->magic + arrow->stats.dam;
1452	}	1422	}
1453	}	1423	}
1454	}	1424	}
1455	}	1425	}
		1426
1456	if (tmp == NULL && arrow == NULL)	1427	if (tmp == NULL && arrow == NULL)
1457	return find_arrow (op, type);	1428	return find_arrow (op, type);
1458		1429
1459	*better = betterby;	1430	*better = betterby;
1460	return tmp;	1431	return tmp;
…		…
1611	arrow->destroy ();	1582	arrow->destroy ();
1612	return 0;	1583	return 0;
1613	}	1584	}
1614		1585
1615	left = arrow; /* these are arrows left to the player */	1586	left = arrow; /* these are arrows left to the player */
1616	arrow = get_split_ob (arrow, 1);	1587	arrow = arrow->split ();
1617	if (!arrow)	1588	if (!arrow)
1618	{	1589	{
1619	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);
1620	return 0;	1591	return 0;
1621	}	1592	}
…		…
1683		1654
1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1655	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1685	arrow->move_type = MOVE_FLY_LOW;	1656	arrow->move_type = MOVE_FLY_LOW;
1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1657	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1687		1658
1688	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1659	op->play_sound (sound_find ("fire_arrow"));
1689	m->insert (arrow, sx, sy, op);	1660	m->insert (arrow, sx, sy, op);
1690		1661
1691	if (!arrow->destroyed ())	1662	if (!arrow->destroyed ())
1692	move_arrow (arrow);	1663	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		1664
1702	return 1;	1665	return 1;
1703	}	1666	}
1704		1667
1705	/* Special fire code for players - this takes into	1668	/* Special fire code for players - this takes into
…		…
1771		1734
1772	if (item->type == WAND)	1735	if (item->type == WAND)
1773	{	1736	{
1774	if (item->stats.food <= 0)	1737	if (item->stats.food <= 0)
1775	{	1738	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1739	op->contr->play_sound (sound_find ("wand_poof"));
1777	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));
1778		1741
1779	return;	1742	return;
1780	}	1743	}
1781	}	1744	}
1782	else if (item->type == ROD || item->type == HORN)	1745	else if (item->type == ROD || item->type == HORN)
1783	{	1746	{
1784	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))
1785	{	1752	{
1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1753	op->contr->play_sound (sound_find ("wand_poof"));
1787		1754
1788	if (item->type == ROD)	1755	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));	1756	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1790	else	1757	else
1791	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));
…		…
1808	CLEAR_FLAG (item, FLAG_ANIMATE);	1775	CLEAR_FLAG (item, FLAG_ANIMATE);
1809	item->face = item->arch->face;	1776	item->face = item->arch->face;
1810	item->set_speed (0);	1777	item->set_speed (0);
1811	}	1778	}
1812		1779
1813	if ((tmp = item->in_player ()))	1780	if (object *pl = item->visible_to ())
1814	esrv_update_item (UPD_ANIM, tmp, item);	1781	esrv_update_item (UPD_ANIM, pl, item);
1815	}	1782	}
1816	}	1783	}
1817	else if (item->type == ROD || item->type == HORN)	1784	else if (item->type == ROD || item->type == HORN)
1818	drain_rod_charge (item);	1785	drain_rod_charge (item);
1819	}	1786	}
…		…
1980	/* If we found a key, do some extra work */	1947	/* If we found a key, do some extra work */
1981	if (key)	1948	if (key)
1982	{	1949	{
1983	object *container = key->env;	1950	object *container = key->env;
1984		1951
1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1986
1987	if (action_makes_visible (op))	1952	if (action_makes_visible (op))
1988	make_visible (op);	1953	make_visible (op);
1989		1954
1990	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1955	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1991	spring_trap (door->inv, op);	1956	spring_trap (door->inv, op);
1992		1957
1993	if (door->type == DOOR)	1958	if (door->type == DOOR)
1994	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 */
1995	else if (door->type == LOCKED_DOOR)	1960	else if (door->type == LOCKED_DOOR)
1996	{	1961	{
1997	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);
1998	remove_door2 (door); /* remove door without violence ;-) */	1963	remove_door2 (door); /* remove door without violence ;-) */
1999	}	1964	}
2000		1965
2001	/* Do this after we print the message */	1966	/* Do this after we print the message */
2002	decrease_ob (key); /* Use up one of the keys */	1967	key->decrease (); /* Use up one of the keys */
2003	/* Need to update the weight the container the key was in */
2004	if (container != op)
2005	esrv_update_item (UPD_WEIGHT, op, container);
2006		1968
2007	return 1; /* Nothing more to do below */	1969	return 1; /* Nothing more to do below */
2008	}	1970	}
2009	else if (door->type == LOCKED_DOOR)	1971	else if (door->type == LOCKED_DOOR)
2010	{	1972	{
2011	/* Might as well return now - no other way to open this */	1973	/* Might as well return now - no other way to open this */
2012	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...");
2013	return 1;	1975	return 1;
2014	}	1976	}
2015		1977
2016	return 0;	1978	return 0;
2017	}	1979	}
…		…
2104		2066
2105	if (op->speed_left > 0.f)	2067	if (op->speed_left > 0.f)
2106	{	2068	{
2107	--op->speed_left;	2069	--op->speed_left;
2108		2070
2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2071	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	2072	push_ob (mon, dir, op);
2111		2073
2112	if (op->contr->tmp_invis || op->hide)	2074	if (op->contr->tmp_invis || op->hide)
2113	make_visible (op);	2075	make_visible (op);
2114		2076
…		…
2133	{	2095	{
2134	--op->speed_left;	2096	--op->speed_left;
2135		2097
2136	if (!op->contr->braced)	2098	if (!op->contr->braced)
2137	{	2099	{
2138	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2100	op->play_sound (sound_find ("push_player"));
2139	push_ob (mon, dir, op);	2101	push_ob (mon, dir, op);
2140	}	2102	}
2141	else	2103	else
2142	new_draw_info (0, 0, op, "You withhold your attack");	2104	op->statusmsg ("You withhold your attack");
2143		2105
2144	if (op->contr->tmp_invis || op->hide)	2106	if (op->contr->tmp_invis || op->hide)
2145	make_visible (op);	2107	make_visible (op);
2146		2108
2147	return true;	2109	return true;
…		…
2191	bool	2153	bool
2192	move_player (object *op, int dir)	2154	move_player (object *op, int dir)
2193	{	2155	{
2194	int pick;	2156	int pick;
2195		2157
2196	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2158	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2197	return 0;	2159	return 0;
2198		2160
2199	/* Sanity check: make sure dir is valid */	2161	/* Sanity check: make sure dir is valid */
2200	if ((dir < 0) || (dir >= 9))	2162	if ((dir < 0) || (dir >= 9))
2201	{	2163	{
…		…
2286	return 0;	2248	return 0;
2287		2249
2288	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2250	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2289	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2251	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2290	{	2252	{
2291	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2253	op->play_sound (sound_find ("ob_evaporate"));
2292	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));
2293
2294	if (op->contr)
2295	esrv_del_item (op->contr, tmp->count);
2296		2255
2297	tmp->destroy ();	2256	tmp->destroy ();
2298	CLEAR_FLAG (op, FLAG_LIFESAVE);	2257	CLEAR_FLAG (op, FLAG_LIFESAVE);
2299		2258
2300	if (op->stats.hp < 0)	2259	if (op->stats.hp < 0)
…		…
2313	return 0;	2272	return 0;
2314	}	2273	}
2315		2274
2316	/* 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
2317	* 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
2318	* 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
2319	* from.	2278	* from.
2320	*/	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
2321	void	2296	void
2322	remove_unpaid_objects (object *op, object *env)	2297	object::drop_unpaid_items ()
2323	{	2298	{
2324	while (op)	2299	if (!flag [FLAG_REMOVED])
2325	{	2300	::drop_unpaid_items (inv, this);
2326	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2327
2328	if (QUERY_FLAG (op, FLAG_UNPAID))
2329	{
2330	if (env->type == PLAYER)
2331	esrv_del_item (env->contr, op->count);
2332
2333	op->insert_at (env);
2334	}
2335	else if (op->inv)
2336	remove_unpaid_objects (op->inv, env);
2337
2338	op = next;
2339	}
2340	}	2301	}
2341		2302
2342	/*	2303	/*
2343	* Returns pointer a static string containing gravestone text	2304	* Returns pointer a static string containing gravestone text
2344	* Moved from apply.c to player.c - player.c is what	2305	* Moved from apply.c to player.c - player.c is what
2345	* actually uses this function. player.c may not be quite the	2306	* actually uses this function. player.c may not be quite the
2346	* best, a misc file for object actions is probably better,	2307	* best, a misc file for object actions is probably better,
2347	* but there isn't one in the server directory.	2308	* but there isn't one in the server directory.
2348	*/	2309	*/
2349	char *	2310	const char *
2350	gravestone_text (object *op)	2311	gravestone_text (object *op)
2351	{	2312	{
2352	static char buf2[MAX_BUF];	2313	static dynbuf_text buf;
2353	char buf[MAX_BUF];
2354	time_t now = time (NULL);
2355		2314
2356	strcpy (buf2, " R.I.P.\n\n");	2315	buf << "---- R.I.P. ----\n\n";
		2316	op->name;
		2317
2357	if (op->type == PLAYER)	2318	if (op->type == PLAYER)
2358	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2319	buf << " the " << op->contr->title;
2359	else
2360	sprintf (buf, "%s\n", &op->name);
2361		2320
2362	strncat (buf2, " ", 20 - strlen (buf) / 2);	2321	buf << "\n\n";
2363	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
2364	if (op->type == PLAYER)	2327	if (op->type == PLAYER)
2365	sprintf (buf, "who was in level %d when killed\n", op->level);	2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2366	else
2367	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2368		2329
2369	strncat (buf2, " ", 20 - strlen (buf) / 2);
2370	strcat (buf2, buf);
2371	if (op->type == PLAYER)
2372	{	2330	{
2373	sprintf (buf, "by %s.\n\n", op->contr->killer);	2331	static char buf2[128];
2374	strncat (buf2, " ", 21 - strlen (buf) / 2);	2332	time_t now = time (NULL);
2375	strcat (buf2, buf);
2376	}
2377
2378	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2379	strncat (buf2, " ", 20 - strlen (buf) / 2);	2334	buf << buf2;
2380	strcat (buf2, buf);	2335	}
2381		2336
2382	return buf2;	2337	return buf;
2383	}	2338	}
2384		2339
2385	void	2340	void
2386	do_some_living (object *op)	2341	do_some_living (object *op)
2387	{	2342	{
…		…
2439	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2394	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2440	else	2395	else
2441	{	2396	{
2442	gen_grace = op->stats.maxgrace;	2397	gen_grace = op->stats.maxgrace;
2443	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2398	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2444	}
2445
2446	/* Regenerate Spell Points */
2447	if (!op->contr->golem && --op->last_sp < 0)
2448	{
2449	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2450	if (op->stats.sp < op->stats.maxsp)
2451	{
2452	op->stats.sp++;
2453	/* dms do not consume food */
2454	if (!QUERY_FLAG (op, FLAG_WIZ))
2455	{
2456	op->stats.food--;
2457	if (op->contr->digestion < 0)
2458	op->stats.food += op->contr->digestion;
2459	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2460	op->stats.food = last_food;
2461	}
2462	}
2463
2464	if (max_sp > 1)
2465	{
2466	over_sp = (gen_sp + 10) / rate_sp;
2467	if (over_sp > 0)
2468	{
2469	if (op->stats.sp < op->stats.maxsp)
2470	{
2471	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2472
2473	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2474	op->stats.sp--;
2475
2476	if (op->stats.sp > op->stats.maxsp)
2477	op->stats.sp = op->stats.maxsp;
2478	}
2479	op->last_sp = 0;
2480	}
2481	else
2482	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483	}
2484	else
2485	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2486	}	2399	}
2487		2400
2488	/* Regenerate Grace */	2401	/* Regenerate Grace */
2489	/* 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. */
2490	if (--op->last_grace < 0)	2403	if (--op->last_grace < 0)
…		…
2511	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);
2512	}	2425	}
2513	/* wearing stuff doesn't detract from grace generation. */	2426	/* wearing stuff doesn't detract from grace generation. */
2514	}	2427	}
2515		2428
		2429	if (op->stats.food > 0)
		2430	{
2516	/* Regenerate Hit Points */	2431	/* Regenerate Spell Points */
2517	if (--op->last_heal < 0)	2432	if (!op->contr->golem && --op->last_sp < 0)
2518	{
2519	if (op->stats.hp < op->stats.maxhp)
2520	{	2433	{
2521	op->stats.hp++;	2434	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2522	/* dms do not consume food */	2435
2523	if (!QUERY_FLAG (op, FLAG_WIZ))	2436	if (op->stats.sp < op->stats.maxsp)
2524	{	2437	{
		2438	op->stats.sp++;
		2439
		2440	/* dms do not consume food */
		2441	if (!QUERY_FLAG (op, FLAG_WIZ))
		2442	{
2525	op->stats.food--;	2443	op->stats.food--;
		2444
2526	if (op->contr->digestion < 0)	2445	if (op->contr->digestion < 0)
2527	op->stats.food += op->contr->digestion;	2446	op->stats.food += op->contr->digestion;
2528	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))
2529	op->stats.food = last_food;	2448	op->stats.food = last_food;
		2449	}
2530	}	2450	}
2531	}
2532		2451
2533	if (max_hp > 1)	2452	if (max_sp > 1)
2534	{
2535	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2536	if (over_hp > 0)
2537	{	2453	{
2538	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
2539	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);
2540	}	2472	}
2541	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)
2542	{	2481	{
2543	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	}
2544	}	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);
2545	}	2507	}
2546	else	2508	else
2547	{
2548	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);
2549	}	2510	}
2550	}	2511	}
2551		2512
2552	/* Digestion */	2513	/* Digestion */
2553	if (--op->last_eat < 0)	2514	if (--op->last_eat < 0)
2554	{	2515	{
2555	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);
2556		2518
2557	if (op->contr->gen_hp > 0)
2558	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);
2559	else
2560	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561		2520
2562	/* dms do not consume food */	2521	/* dms do not consume food */
2563	if (!QUERY_FLAG (op, FLAG_WIZ))	2522	if (!QUERY_FLAG (op, FLAG_WIZ))
2564	op->stats.food--;	2523	op->stats.food--;
2565	}	2524	}
2566		2525
2567	if (op->stats.food < 0 && op->stats.hp >= 0)	2526	if (op->stats.food < 0 && op->stats.hp >= 0)
2568	{	2527	{
2569	object *tmp, *flesh = 0;	2528	object *flesh = 0;
2570		2529
2571	for (tmp = op->inv; tmp; tmp = tmp->below)	2530	for_inv_removable (op, tmp)
2572	{	2531	{
2573	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)
2574	{	2536	{
2575	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2537	op->statusmsg ("You blindly grab for a bite of food. "
2576	{	2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2577	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2578	manual_apply (op, tmp, 0);	2539	manual_apply (op, tmp, 0);
		2540
2579	if (op->stats.food >= 0 || op->stats.hp < 0)	2541	if (op->stats.food >= 0 || op->stats.hp < 0)
2580	break;	2542	break;
2581	}	2543	}
2582	else if (tmp->type == FLESH)	2544	else if (tmp->type == FLESH)
2583	flesh = tmp;	2545	flesh = tmp;
2584	} /* End if paid for object */	2546	}
2585	} /* end of for loop */
2586		2547
2587	/* 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
2588	* eat flesh instead.	2549	* eat flesh instead.
2589	*/	2550	*/
2590	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2551	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2591	{	2552	{
2592	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.>");
2593	manual_apply (op, flesh, 0);	2555	manual_apply (op, flesh, 0);
2594	}	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)
2595	}	2565	{
2596		2566	op->stats.hp += op->stats.food;
2597	while (op->stats.food < 0 && op->stats.hp >= 0)	2567	op->stats.food = 0;
2598	op->stats.food++, op->stats.hp--;	2568	}
2599		2569
2600	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2601	kill_player (op);	2571	kill_player (op);
2602	}	2572	}
2603	}	2573	}
…		…
2608	* file.	2578	* file.
2609	*/	2579	*/
2610	void	2580	void
2611	kill_player (object *op)	2581	kill_player (object *op)
2612	{	2582	{
		2583	int x, y;
2613	char buf[MAX_BUF];	2584	char buf[MAX_BUF];
2614	int x, y;
2615
2616	//int i;
2617	maptile *map; /* this is for resurrection */	2585	maptile *map; /* this is for resurrection */
2618
2619	/* int z;
2620	int num_stats_lose;
2621	int lost_a_stat;
2622	int lose_this_stat;
2623	int this_stat; */
2624	int will_kill_again;	2586	int will_kill_again;
2625	archetype *at;	2587	archetype *at;
2626	object *tmp;	2588	object *tmp;
2627		2589
2628	if (save_life (op))	2590	if (save_life (op))
2629	return;	2591	return;
2630
2631		2592
2632	/* 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
2633	* 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.
2634	* Look at op_on_battleground() for more info --AndreasV	2595	* Look at op_on_battleground() for more info --AndreasV
2635	*/	2596	*/
…		…
2651	{	2612	{
2652	tmp->destroy ();	2613	tmp->destroy ();
2653	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2614	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2654	}	2615	}
2655		2616
2656	cure_disease (op, 0); /* remove any disease */	2617	cure_disease (op, 0, 0); /* remove any disease */
2657	op->stats.hp = op->stats.maxhp;	2618	op->stats.hp = op->stats.maxhp;
2658	if (op->stats.food <= 0)	2619	if (op->stats.food <= 0)
2659	op->stats.food = 999;	2620	op->stats.food = 999;
2660		2621
2661	/* create a bodypart-trophy to make the winner happy */	2622	/* create a bodypart-trophy to make the winner happy */
2662	if (object *tmp = arch_to_object (archetype::find ("finger")))	2623	if (object *tmp = arch_to_object (archetype::find ("finger")))
2663	{	2624	{
2664	sprintf (buf, "%s's finger", &op->name);	2625	tmp->name = format ("%s's finger" , &op->name);
2665	tmp->name = buf;	2626	tmp->name_pl = format ("%s's fingers", &op->name);
2666	sprintf (buf, " This finger has been cut off %s\n"
2667	" the %s, when he was defeated at\n level %d by %s.\n",
2668	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2669	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	);
2670	tmp->value = 0, tmp->type = 0;	2633	tmp->value = 0, tmp->type = 0;
2671	tmp->materialname = "organics";	2634	tmp->materialname = "organics";
2672	tmp->insert_at (op, tmp);	2635	tmp->insert_at (op, tmp);
2673	}	2636	}
2674		2637
…		…
2682		2645
2683	command_kill_pets (op, 0);	2646	command_kill_pets (op, 0);
2684		2647
2685	if (op->stats.food < 0)	2648	if (op->stats.food < 0)
2686	{	2649	{
2687	sprintf (buf, "%s starved to death.", &op->name);	2650	op->contr->killer = archetype::get ("killer_starvation");
2688	strcpy (op->contr->killer, "starvation");	2651	op->contr->killer->destroy ();
2689	}	2652	}
2690	else
2691	sprintf (buf, "%s died.", &op->name);
2692		2653
2693	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2654	op->contr->play_sound (sound_find ("player_dies"));
2694		2655
2695	/* save the map location for corpse, gravestone */	2656	/* save the map location for corpse, gravestone */
2696	x = op->x;	2657	x = op->x;
2697	y = op->y;	2658	y = op->y;
2698	map = op->map;	2659	map = op->map;
…		…
2805	lost_a_stat = 1;	2766	lost_a_stat = 1;
2806	}	2767	}
2807	}	2768	}
2808	}	2769	}
2809	}	2770	}
		2771
2810	/* If no stat lost, tell the player. */	2772	/* If no stat lost, tell the player. */
2811	if (!lost_a_stat)	2773	if (!lost_a_stat)
2812	{	2774	{
2813	/* determine_god() seems to not work sometimes... why is this?	2775	/* determine_god() seems to not work sometimes... why is this?
2814	Should I be using something else? GD */	2776	Should I be using something else? GD */
…		…
2818	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);
2819	else	2781	else
2820	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.");
2821	}	2783	}
2822	#else	2784	#else
2823	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.");
2824	#endif	2786	#endif
2825		2787
2826	/* Put a gravestone up where the character 'almost' died. List the	2788	/* Put a gravestone up where the character 'almost' died. List the
2827	* exp loss on the stone.	2789	* exp loss on the stone.
2828	*/	2790	*/
2829	tmp = arch_to_object (archetype::find ("gravestone"));	2791	tmp = arch_to_object (archetype::find ("gravestone"));
2830	sprintf (buf, "%s's gravestone", &op->name);	2792	tmp->name = format ("%s's gravestone", &op->name);
2831	tmp->name = buf;	2793	tmp->name_pl = format ("%s's gravestones", &op->name);
2832	sprintf (buf, "%s's gravestones", &op->name);
2833	tmp->name_pl = buf;
2834	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 ());
2835	tmp->msg = buf;
2836	tmp->x = op->x, tmp->y = op->y;	2795	tmp->x = op->x, tmp->y = op->y;
2837	insert_ob_in_map (tmp, op->map, NULL, 0);	2796	insert_ob_in_map (tmp, op->map, NULL, 0);
2838		2797
2839	/**************************************/	2798	/**************************************/
2840	/* */	2799	/* */
…		…
2861	{	2820	{
2862	tmp->destroy ();	2821	tmp->destroy ();
2863	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2864	}	2823	}
2865		2824
2866	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	}
2867		2838
2868	/*add_exp(op, (op->stats.exp * -0.20)); */	2839	/*add_exp(op, (op->stats.exp * -0.20)); */
2869	apply_death_exp_penalty (op);	2840	apply_death_exp_penalty (op);
		2841
2870	if (op->stats.food < 100)	2842	if (op->stats.food < 100)
2871	op->stats.food = 900;	2843	op->stats.food = 900;
		2844
2872	op->stats.hp = op->stats.maxhp;	2845	op->stats.hp = op->stats.maxhp;
2873	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2874	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2875		2848
2876	/*	2849	/*
2877	* 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
2878	* and put them back in the map.	2851	* and put them back in the map.
2879	*/	2852	*/
2880	remove_unpaid_objects (op->inv, op);	2853	op->drop_unpaid_items ();
2881		2854
2882	/****************************************/	2855	/****************************************/
2883	/* */	2856	/* */
2884	/* Move player to his current respawn- */	2857	/* Move player to his current respawn- */
2885	/* position (usually last savebed) */	2858	/* position (usually last savebed) */
…		…
2944		2917
2945	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))))
2946	{	2919	{
2947	if (tmp->nrof > 1)	2920	if (tmp->nrof > 1)
2948	{	2921	{
2949	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2922	tmp->decrease (rndm (1, tmp->nrof - 1));
2950	tmp2->destroy ();
2951	insert_ob_in_map (tmp, op->map, NULL, 0);	2923	insert_ob_in_map (tmp, op->map, NULL, 0);
2952	}	2924	}
2953	else	2925	else
2954	tmp->destroy ();	2926	tmp->destroy ();
2955	}	2927	}
…		…
2966	void	2938	void
2967	fix_weight (void)	2939	fix_weight (void)
2968	{	2940	{
2969	for_all_players (pl)	2941	for_all_players (pl)
2970	{	2942	{
2971	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2943	sint32 old = pl->ob->carrying;
2972		2944
2973	if (old == sum)	2945	pl->ob->update_weight ();
2974	continue;	2946
		2947	if (old != pl->ob->carrying)
		2948	{
2975	pl->ob->update_stats ();	2949	pl->ob->update_stats ();
2976	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	}
2977	}	2952	}
2978	}	2953	}
2979		2954
2980	void	2955	void
2981	fix_luck (void)	2956	fix_luck (void)
…		…
3025	void	3000	void
3026	make_visible (object *op)	3001	make_visible (object *op)
3027	{	3002	{
3028	op->hide = 0;	3003	op->hide = 0;
3029	op->invisible = 0;	3004	op->invisible = 0;
		3005
3030	if (op->type == PLAYER)	3006	if (op->type == PLAYER)
3031	{	3007	{
3032	op->contr->tmp_invis = 0;	3008	op->contr->tmp_invis = 0;
3033	op->contr->invis_race = 0;	3009	op->contr->invis_race = 0;
3034	}	3010	}
…		…
3047		3023
3048	/* look at the surrounding terrain to determine	3024	/* look at the surrounding terrain to determine
3049	* the hideability of this object. Positive levels	3025	* the hideability of this object. Positive levels
3050	* indicate greater hideability.	3026	* indicate greater hideability.
3051	*/	3027	*/
3052
3053	int	3028	int
3054	hideability (object *ob)	3029	hideability (object *ob)
3055	{	3030	{
3056	int i, level = 0, mflag;	3031	int i, level = 0, mflag;
3057	sint16 x, y;	3032	sint16 x, y;
…		…
3067	* as bad as carrying a light on a pitch dark map */	3042	* as bad as carrying a light on a pitch dark map */
3068	if (has_carried_lights (ob))	3043	if (has_carried_lights (ob))
3069	level = -(10 + (2 * ob->map->darkness));	3044	level = -(10 + (2 * ob->map->darkness));
3070		3045
3071	/* scan through all nearby squares for terrain to hide in */	3046	/* scan through all nearby squares for terrain to hide in */
3072	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])
3073	{	3050	{
3074	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3051	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3075	if (mflag & P_OUT_OF_MAP)	3052	if (mflag & P_OUT_OF_MAP)
3076	{
3077	continue;	3053	continue;
3078	}	3054
3079	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3055	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3080	level += 2;	3056	level += 2;
3081	else /* open terrain! */	3057	else /* open terrain! */
3082	level -= 1;	3058	level -= 1;
3083	}	3059	}
…		…
3094	* spot (surrounded by clear terrain in broad daylight). -b.t.	3070	* spot (surrounded by clear terrain in broad daylight). -b.t.
3095	*/	3071	*/
3096	void	3072	void
3097	do_hidden_move (object *op)	3073	do_hidden_move (object *op)
3098	{	3074	{
3099	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3075	int hide = 0;
3100	object *skop;
3101		3076
3102	if (!op || !op->map)	3077	if (!op || !op->map)
3103	return;	3078	return;
3104		3079
3105	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);
3106		3082
3107	/* 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! */
3108	if (op->type == PLAYER && op->contr->run_on)	3084	if (op->type == PLAYER && op->contr->run_on)
3109	if (!skop || num >= skop->level)	3085	if (!skop || num >= skop->level)
3110	{	3086	{
…		…
3120	num -= hide;	3096	num -= hide;
3121		3097
3122	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3098	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3123	{	3099	{
3124	make_visible (op);	3100	make_visible (op);
		3101
3125	if (op->type == PLAYER)	3102	if (op->type == PLAYER)
3126	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!");
3127	}	3104	}
3128	else if (op->type == PLAYER && skop)	3105	else if (op->type == PLAYER && skop)
3129	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);
…		…
3182	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3183	* 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
3184	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3185	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3186	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3187	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3188	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3189	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3190	* 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.
3191	* -b.t.	3168	* -b.t.
3192	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3193	*/	3170	*/
3194
3195	int	3171	int
3196	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3197	{	3173	{
3198	rv_vector rv;	3174	rv_vector rv;
3199	int dx, dy;	3175	int dx, dy;
…		…
3211		3187
3212	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3213		3189
3214	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3215	* through the object and find if it has any	3191	* through the object and find if it has any
3216	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3217	* a blocked los square.	3193	* a blocked los square.
3218	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3219	*/	3195	*/
3220	while (op)	3196	while (op)
3221	{	3197	{
…		…
3224		3200
3225	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3226	* 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
3227	* for any meaningful values.	3203	* for any meaningful values.
3228	*/	3204	*/
3229	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3230	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3231	!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)])
3232	return 1;	3208	return 1;
		3209
3233	op = op->more;	3210	op = op->more;
3234	}	3211	}
		3212
3235	return 0;	3213	return 0;
3236	}	3214	}
3237		3215
3238	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3239	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3242	* return 0.	3220	* return 0.
3243	*/	3221	*/
3244	int	3222	int
3245	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3246	{	3224	{
3247
3248	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3249	{	3226	{
3250	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3251	return 0;	3228	return 0;
3252		3229
…		…
3258	{	3235	{
3259	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");
3260	return 1;	3237	return 1;
3261	}	3238	}
3262	}	3239	}
		3240
3263	return 0;	3241	return 0;
3264	}	3242	}
3265		3243
3266	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3267	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3272	* 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
3273	*/	3251	*/
3274	int	3252	int
3275	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3276	{	3254	{
3277	object *tmp;
3278
3279	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3280	* 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),
3281	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3282	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3283	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3284	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3285	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3286	{	3262	{
3287	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3288	{	3264	{
3289	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3290	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))
3291	{	3269	{
3292	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3293	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))
3294	{	3272	{
3295	object *invtmp;
3296
3297	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3298	{	3274	{
3299	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3300	{	3276	{
3301	if (x != NULL && y != NULL)	3277	if (x && y)
3302	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3303	return 1;	3280	return 1;
3304	}	3281	}
3305	}	3282	}
3306	}	3283	}
		3284
3307	if (x != NULL && y != NULL)	3285	if (x && y)
3308	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3309	return 1;	3288	return 1;
3310	}	3289	}
3311	}	3290	}
3312	}	3291	}
		3292
3313	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3314	return 0;	3294	return 0;
3315	}	3295	}
3316		3296
3317	/*	3297	/*
…		…
3333	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3334	int i = 0, j = 0;	3314	int i = 0, j = 0;
3335		3315
3336	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3337	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3338	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3339	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3340	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3341	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3342	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3343	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3344	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3345		3325
3346	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3347	return;	3327	return;
3348		3328
3349	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++);
…		…
3422	{	3402	{
3423	/* forces in the treasurelist can alter the player's stats */	3403	/* forces in the treasurelist can alter the player's stats */
3424	object *skin;	3404	object *skin;
3425		3405
3426	/* first get the dragon skin force */	3406	/* first get the dragon skin force */
3427	shstr_cmp dragon_skin_force ("dragon_skin_force");
3428	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)	3407	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3429	;	3408	;
3430		3409
3431	if (!skin)	3410	if (!skin)
3432	return;	3411	return;
3433		3412
…		…
3468	else	3447	else
3469	{	3448	{
3470	/* generate misc. treasure */	3449	/* generate misc. treasure */
3471	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3472	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));
3473	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3474	if (who->type == PLAYER)
3475	esrv_send_item (who, tmp);
3476	}	3453	}
3477	}	3454	}
3478		3455
3479	/**	3456	/**
3480	* 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
…		…
3509	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))
3510	return 0;	3487	return 0;
3511		3488
3512	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3513	}	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