[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.165 by root, Mon Aug 27 05:10:51 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 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 (ob)
290	{
291	ob->close_container (); //TODO: client-specific
292	ob->drop_unpaid_items ();
293	}
294
295	if (ns)
296	{
297	if (active)
298	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
299
300	INVOKE_PLAYER (DISCONNECT, this);
301
302	ns->reset_stats ();
303	ns->pl = 0;
304	ns = 0;
305	}
306
307	observe = ob;
308
309	deactivate ();
310	}
311
312	// the need for this function can be explained
313	// by load_object not returning the object
314	void
315	player::set_object (object *op)
316	{
317	ob = observe = op;
318	ob->contr = this; /* this aren't yet in archetype */
319
320	ob->speed = 1.0f;
321	ob->speed_left = 0.5f;
322
323	ob->direction = 5; /* So player faces south */
324	}	327	}
325		328
326	void	329	void
327	player::set_observe (object *op)	330	player::set_observe (object *op)
328	{	331	{
…		…
401	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
402	*/	405	*/
403	archetype *	406	archetype *
404	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
405	{	408	{
		409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();	415	archvec::iterator i = archetypes.find (nat);
407		416
408	for (;;)	417	for (;;)
409	{	418	{
410	if (++i == archetypes.end ())	419	if (++i == archetypes.end ())
411	i = archetypes.begin ();	420	i = archetypes.begin ();
…		…
629		638
630	return firstdir;	639	return firstdir;
631	}	640	}
632		641
633	void	642	void
634	give_initial_items (object pl, treasurelist items)	643	give_initial_items (object pl, treasurelist items)
635	{	644	{
636	object op, next = NULL;
637
638	if (pl->randomitems != NULL)	645	if (pl->randomitems)
639	create_treasure (items, pl, GT_STARTEQUIP \| GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP \| GT_ONLY_GOOD, 1, 0);
640		647
641	for (op = pl->inv; op; op = next)	648	for (object next, op = pl->inv; op; op = next)
642	{	649	{
643	next = op->below;	650	next = op->below;
644		651
645	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
646	* 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
…		…
651	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
652	* by this player due to race restrictions	659	* by this player due to race restrictions
653	*/	660	*/
654	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
655	{	662	{
656	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
657	(op->type == ARMOUR \|\| op->type == BOOTS \|\|	665	(op->type == ARMOUR \|\| op->type == BOOTS
658	op->type == CLOAK \|\| op->type == HELMET \|\|	666	\|\| op->type == CLOAK \|\| op->type == HELMET
659	op->type == SHIELD \|\| op->type == GLOVES \|\|	667	\|\| op->type == SHIELD \|\| op->type == GLOVES
		668	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
660	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))
661	{	670	{
662	op->destroy ();	671	op->destroy ();
663	continue;	672	continue;
664	}	673	}
665	}	674	}
…		…
688	if (op->nrof > 1)	697	if (op->nrof > 1)
689	op->nrof = 1;	698	op->nrof = 1;
690	}	699	}
691		700
692	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
693	{
694	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
695	}
696		703
697	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
698	* 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
699	* merged properly.	706	* merged properly.
700	*/	707	*/
701	if (need_identify (op))	708	if (need_identify (op))
702	{	709	{
703	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
704	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
705	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
706	}	713	}
		714
707	if (op->type == SPELL)	715	if (op->type == SPELL)
708	{	716	{
709	op->destroy ();	717	op->destroy ();
710	continue;	718	continue;
711	}	719	}
…		…
713	{	721	{
714	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
715	op->stats.exp = 0;	723	op->stats.exp = 0;
716	op->level = 1;	724	op->level = 1;
717	}	725	}
718	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
719	else
720	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
721	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
722		729
723	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
724	link_player_skills (pl);	731	link_player_skills (pl);
…		…
830	static void	837	static void
831	start_info (object *op)	838	start_info (object *op)
832	{	839	{
833	char buf[MAX_BUF];	840	char buf[MAX_BUF];
834		841
835	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
836	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
837	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
838	//new_draw_info (NDI_UNIQUE, 0, op, " ");
839	}	844	}
840		845
841	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
842	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
843	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
846	*/	851	*/
847	void	852	void
848	player::chargen_race_done ()	853	player::chargen_race_done ()
849	{	854	{
850	/* this must before then initial items are given */	855	/* this must before then initial items are given */
851	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
852		857
853	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
854	if (tl)	859	if (tl)
855	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
856		861
…		…
859		864
860	ob->contr->ns->state = ST_PLAYING;	865	ob->contr->ns->state = ST_PLAYING;
861		866
862	if (ob->msg)	867	if (ob->msg)
863	ob->msg = 0;	868	ob->msg = 0;
864
865	/* We create this now because some of the unique maps will need it
866	* to save here.
867	*/
868	{
869	char buf[MAX_BUF];
870	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
871	make_path_to_file (buf);
872	}
873		869
874	start_info (ob);	870	start_info (ob);
875	CLEAR_FLAG (ob, FLAG_WIZ);	871	CLEAR_FLAG (ob, FLAG_WIZ);
876	give_initial_items (ob, ob->randomitems);	872	give_initial_items (ob, ob->randomitems);
877	link_player_skills (ob);	873	link_player_skills (ob);
…		…
880		876
881	/* This moves the player to a different start map, if there	877	/* This moves the player to a different start map, if there
882	* is one for this race	878	* is one for this race
883	*/	879	*/
884	if (*first_map_ext_path)	880	if (*first_map_ext_path)
885	{	881	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
886	object *tmp;
887	char mapname[MAX_BUF];
888
889	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
890	tmp = object::create ();
891	EXIT_PATH (tmp) = mapname;
892	EXIT_X (tmp) = ob->x;
893	EXIT_Y (tmp) = ob->y;
894	ob->enter_exit (tmp); /* we don't really care if it succeeded;
895	* if the map isn't there, then stay on the
896	* default initial map */
897	tmp->destroy ();
898	}
899	else	882	else
900	LOG (llevDebug, "first_map_ext_path not set\n");	883	LOG (llevDebug, "first_map_ext_path not set\n");
901	}	884	}
902		885
903	void	886	void
…		…
1006	if (op->move_type & MOVE_FLYING)	989	if (op->move_type & MOVE_FLYING)
1007	return 1;	990	return 1;
1008		991
1009	next = op->below;	992	next = op->below;
1010		993
		994	int cnt = MAX_ITEM_PER_DROP;
		995	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		996
1011	/* 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
1012	* destroyed */	998	* destroyed */
1013	while (next && !next->destroyed ())	999	while (next && !next->destroyed ())
1014	{	1000	{
1015	tmp = next;	1001	tmp = next;
1016	next = tmp->below;	1002	next = tmp->below;
1017		1003
		1004	if (cnt <= 0)
		1005	{
		1006	op->failmsg ("Couldn't pickup all items at once.");
		1007	return 0;
		1008	}
		1009
1018	if (op->destroyed ())	1010	if (op->destroyed ())
1019	return 0;	1011	return 0;
1020		1012
1021	if (!can_pick (op, tmp))	1013	if (!can_pick (op, tmp))
1022	continue;	1014	continue;
1023		1015
1024	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1016	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1025	{	1017	{
1026	if (item_matched_string (op, tmp, op->contr->search_str))	1018	if (item_matched_string (op, tmp, op->contr->search_str))
1027	pick_up (op, tmp);	1019	CHK_PICK_PICKUP;
1028	continue;	1020	continue;
1029	}	1021	}
1030		1022
1031	/* high not bit set? We're using the old autopickup model */	1023	/* high not bit set? We're using the old autopickup model */
1032	if (!(op->contr->mode & PU_NEWMODE))	1024	if (!(op->contr->mode & PU_NEWMODE))
…		…
1034	switch (op->contr->mode)	1026	switch (op->contr->mode)
1035	{	1027	{
1036	case 0:	1028	case 0:
1037	return 1; /* don't pick up */	1029	return 1; /* don't pick up */
1038	case 1:	1030	case 1:
1039	pick_up (op, tmp);	1031	CHK_PICK_PICKUP;
1040	return 1;	1032	return 1;
1041	case 2:	1033	case 2:
1042	pick_up (op, tmp);	1034	CHK_PICK_PICKUP;
1043	return 0;	1035	return 0;
1044	case 3:	1036	case 3:
1045	return 0; /* stop before pickup */	1037	return 0; /* stop before pickup */
1046	case 4:	1038	case 4:
1047	pick_up (op, tmp);	1039	CHK_PICK_PICKUP;
1048	break;	1040	break;
1049	case 5:	1041	case 5:
1050	pick_up (op, tmp);	1042	CHK_PICK_PICKUP;
1051	stop = 1;	1043	stop = 1;
1052	break;	1044	break;
1053	case 6:	1045	case 6:
1054	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1046	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1055	pick_up (op, tmp);	1047	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1048	CHK_PICK_PICKUP;
1056	break;	1049	break;
1057		1050
1058	case 7:	1051	case 7:
1059	if (tmp->type == MONEY \|\| tmp->type == GEM)	1052	if (tmp->type == MONEY \|\| tmp->type == GEM)
1060	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1061	break;	1054	break;
1062		1055
1063	default:	1056	default:
1064	/* use value density */	1057	/* use value density */
1065	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1058	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1066	&& (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)
1067	pick_up (op, tmp);	1060	CHK_PICK_PICKUP;
1068	}	1061	}
1069	}	1062	}
1070	else	1063	else
1071	{ /* old model */	1064	{ /* old model */
1072	/* NEW pickup handling */	1065	/* NEW pickup handling */
…		…
1127	/* all food and drink if desired */	1120	/* all food and drink if desired */
1128	/* question: don't pick up known-poisonous stuff? */	1121	/* question: don't pick up known-poisonous stuff? */
1129	if (op->contr->mode & PU_FOOD)	1122	if (op->contr->mode & PU_FOOD)
1130	if (tmp->type == FOOD)	1123	if (tmp->type == FOOD)
1131	{	1124	{
1132	pick_up (op, tmp);	1125	CHK_PICK_PICKUP;
1133	continue;	1126	continue;
1134	}	1127	}
1135		1128
1136	if (op->contr->mode & PU_DRINK)	1129	if (op->contr->mode & PU_DRINK)
1137	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)))
1138	{	1131	{
1139	pick_up (op, tmp);	1132	CHK_PICK_PICKUP;
1140	continue;	1133	continue;
1141	}	1134	}
1142		1135
1143	if (op->contr->mode & PU_POTION)	1136	if (op->contr->mode & PU_POTION)
1144	if (tmp->type == POTION)	1137	if (tmp->type == POTION)
1145	{	1138	{
1146	pick_up (op, tmp);	1139	CHK_PICK_PICKUP;
1147	continue;	1140	continue;
1148	}	1141	}
1149		1142
1150	/* spellbooks, skillscrolls and normal books/scrolls */	1143	/* spellbooks, skillscrolls and normal books/scrolls */
1151	if (op->contr->mode & PU_SPELLBOOK)	1144	if (op->contr->mode & PU_SPELLBOOK)
1152	if (tmp->type == SPELLBOOK)	1145	if (tmp->type == SPELLBOOK)
1153	{	1146	{
1154	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1155	continue;	1148	continue;
1156	}	1149	}
1157		1150
1158	if (op->contr->mode & PU_SKILLSCROLL)	1151	if (op->contr->mode & PU_SKILLSCROLL)
1159	if (tmp->type == SKILLSCROLL)	1152	if (tmp->type == SKILLSCROLL)
1160	{	1153	{
1161	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1162	continue;	1155	continue;
1163	}	1156	}
1164		1157
1165	if (op->contr->mode & PU_READABLES)	1158	if (op->contr->mode & PU_READABLES)
1166	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)	1159	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
1167	{	1160	{
1168	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1169	continue;	1162	continue;
1170	}	1163	}
1171		1164
1172	/* wands/staves/rods/horns */	1165	/* wands/staves/rods/horns */
1173	if (op->contr->mode & PU_MAGIC_DEVICE)	1166	if (op->contr->mode & PU_MAGIC_DEVICE)
1174	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	1167	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
1175	{	1168	{
1176	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1177	continue;	1170	continue;
1178	}	1171	}
1179		1172
1180	/* pick up all magical items */	1173	/* pick up all magical items */
1181	if (op->contr->mode & PU_MAGICAL)	1174	if (op->contr->mode & PU_MAGICAL)
1182	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))
1183	{	1176	{
1184	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1185	continue;	1178	continue;
1186	}	1179	}
1187		1180
1188	if (op->contr->mode & PU_VALUABLES)	1181	if (op->contr->mode & PU_VALUABLES)
1189	{	1182	{
1190	if (tmp->type == MONEY \|\| tmp->type == GEM)	1183	if (tmp->type == MONEY \|\| tmp->type == GEM)
1191	{	1184	{
1192	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1193	continue;	1186	continue;
1194	}	1187	}
1195	}	1188	}
1196		1189
1197	/* rings & amulets - talismans seems to be typed AMULET */	1190	/* rings & amulets - talismans seems to be typed AMULET */
1198	if (op->contr->mode & PU_JEWELS)	1191	if (op->contr->mode & PU_JEWELS)
1199	if (tmp->type == RING \|\| tmp->type == AMULET)	1192	if (tmp->type == RING \|\| tmp->type == AMULET)
1200	{	1193	{
1201	pick_up (op, tmp);	1194	CHK_PICK_PICKUP;
1202	continue;	1195	continue;
1203	}	1196	}
1204		1197
1205	/* we don't forget dragon food */	1198	/* we don't forget dragon food */
1206	if (op->contr->mode & PU_FLESH)	1199	if (op->contr->mode & PU_FLESH)
1207	if (tmp->type == FLESH)	1200	if (tmp->type == FLESH)
1208	{	1201	{
1209	pick_up (op, tmp);	1202	CHK_PICK_PICKUP;
1210	continue;	1203	continue;
1211	}	1204	}
1212		1205
1213	/* bows and arrows. Bows are good for selling! */	1206	/* bows and arrows. Bows are good for selling! */
1214	if (op->contr->mode & PU_BOW)	1207	if (op->contr->mode & PU_BOW)
1215	if (tmp->type == BOW)	1208	if (tmp->type == BOW)
1216	{	1209	{
1217	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1218	continue;	1211	continue;
1219	}	1212	}
1220		1213
1221	if (op->contr->mode & PU_ARROW)	1214	if (op->contr->mode & PU_ARROW)
1222	if (tmp->type == ARROW)	1215	if (tmp->type == ARROW)
1223	{	1216	{
1224	pick_up (op, tmp);	1217	CHK_PICK_PICKUP;
1225	continue;	1218	continue;
1226	}	1219	}
1227		1220
1228	/* all kinds of armor etc. */	1221	/* all kinds of armor etc. */
1229	if (op->contr->mode & PU_ARMOUR)	1222	if (op->contr->mode & PU_ARMOUR)
1230	if (tmp->type == ARMOUR)	1223	if (tmp->type == ARMOUR)
1231	{	1224	{
1232	pick_up (op, tmp);	1225	CHK_PICK_PICKUP;
1233	continue;	1226	continue;
1234	}	1227	}
1235		1228
1236	if (op->contr->mode & PU_HELMET)	1229	if (op->contr->mode & PU_HELMET)
1237	if (tmp->type == HELMET)	1230	if (tmp->type == HELMET)
1238	{	1231	{
1239	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1240	continue;	1233	continue;
1241	}	1234	}
1242		1235
1243	if (op->contr->mode & PU_SHIELD)	1236	if (op->contr->mode & PU_SHIELD)
1244	if (tmp->type == SHIELD)	1237	if (tmp->type == SHIELD)
1245	{	1238	{
1246	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1247	continue;	1240	continue;
1248	}	1241	}
1249		1242
1250	if (op->contr->mode & PU_BOOTS)	1243	if (op->contr->mode & PU_BOOTS)
1251	if (tmp->type == BOOTS)	1244	if (tmp->type == BOOTS)
1252	{	1245	{
1253	pick_up (op, tmp);	1246	CHK_PICK_PICKUP;
1254	continue;	1247	continue;
1255	}	1248	}
1256		1249
1257	if (op->contr->mode & PU_GLOVES)	1250	if (op->contr->mode & PU_GLOVES)
1258	if (tmp->type == GLOVES)	1251	if (tmp->type == GLOVES)
1259	{	1252	{
1260	pick_up (op, tmp);	1253	CHK_PICK_PICKUP;
1261	continue;	1254	continue;
1262	}	1255	}
1263		1256
1264	if (op->contr->mode & PU_CLOAK)	1257	if (op->contr->mode & PU_CLOAK)
1265	if (tmp->type == CLOAK)	1258	if (tmp->type == CLOAK)
1266	{	1259	{
1267	pick_up (op, tmp);	1260	CHK_PICK_PICKUP;
1268	continue;	1261	continue;
1269	}	1262	}
1270		1263
1271	/* hoping to catch throwing daggers here */	1264	/* hoping to catch throwing daggers here */
1272	if (op->contr->mode & PU_MISSILEWEAPON)	1265	if (op->contr->mode & PU_MISSILEWEAPON)
1273	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1266	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1274	{	1267	{
1275	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1276	continue;	1269	continue;
1277	}	1270	}
1278		1271
1279	/* careful: chairs and tables are weapons! */	1272	/* careful: chairs and tables are weapons! */
1280	if (op->contr->mode & PU_ALLWEAPON)	1273	if (op->contr->mode & PU_ALLWEAPON)
…		…
1282	if (tmp->type == WEAPON && tmp->name != NULL)	1275	if (tmp->type == WEAPON && tmp->name != NULL)
1283	{	1276	{
1284	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 &&
1285	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)	1278	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1286	{	1279	{
1287	pick_up (op, tmp);	1280	CHK_PICK_PICKUP;
1288	continue;	1281	continue;
1289	}	1282	}
1290	}	1283	}
1291		1284
1292	if (tmp->type == WEAPON && tmp->name == NULL)	1285	if (tmp->type == WEAPON && tmp->name == NULL)
1293	{	1286	{
1294	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)
1295	{	1288	{
1296	pick_up (op, tmp);	1289	CHK_PICK_PICKUP;
1297	continue;	1290	continue;
1298	}	1291	}
1299	}	1292	}
1300	}	1293	}
1301		1294
1302	/* misc stuff that's useful */	1295	/* misc stuff that's useful */
1303	if (op->contr->mode & PU_KEY)	1296	if (op->contr->mode & PU_KEY)
1304	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)	1297	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)
1305	{	1298	{
1306	pick_up (op, tmp);	1299	CHK_PICK_PICKUP;
1307	continue;	1300	continue;
1308	}	1301	}
1309		1302
1310	/* 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
1311	* pickups */	1304	* pickups */
…		…
1316	/* >=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
1317	* and multiply them by 5, giving 0..155== 5..75 /	1310	* and multiply them by 5, giving 0..155== 5..75 /
1318	wvratio = (op->contr->mode & PU_RATIO) * 5;	1311	wvratio = (op->contr->mode & PU_RATIO) * 5;
1319	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)
1320	{	1313	{
1321	pick_up (op, tmp);	1314	CHK_PICK_PICKUP;
1322	#if 0	1315	#if 0
1323	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1316	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1324	if (tmp->name != NULL)	1317	if (tmp->name != NULL)
1325	{	1318	{
1326	fprintf (stderr, "%s", tmp->name);	1319	fprintf (stderr, "%s", tmp->name);
…		…
1345	* found object is returned.	1338	* found object is returned.
1346	*/	1339	*/
1347	object *	1340	object *
1348	find_arrow (object op, const char type)	1341	find_arrow (object op, const char type)
1349	{	1342	{
1350	object *tmp = 0;
1351
1352	for (op = op->inv; op; op = op->below)	1343	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1353	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1354	tmp = find_arrow (op, type);
1355	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);
1356	return op;	1352	return arrow;
		1353	}
1357		1354
1358	return tmp;	1355	return 0;
1359	}	1356	}
1360		1357
1361	/*	1358	/*
1362	* 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
1363	* 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
…		…
1386	}	1383	}
1387	}	1384	}
1388	else if (arrow->type == ARROW && arrow->race == type)	1385	else if (arrow->type == ARROW && arrow->race == type)
1389	{	1386	{
1390	/* allways prefer assasination/slaying */	1387	/* allways prefer assasination/slaying */
1391	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1388	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1392	{	1389	{
1393	if (arrow->attacktype & AT_DEATH)	1390	if (arrow->attacktype & AT_DEATH)
1394	{	1391	{
1395	*better = 100;	1392	*better = 100;
1396	return arrow;	1393	return arrow;
…		…
1424	betterby = 1 + arrow->magic + arrow->stats.dam;	1421	betterby = 1 + arrow->magic + arrow->stats.dam;
1425	}	1422	}
1426	}	1423	}
1427	}	1424	}
1428	}	1425	}
		1426
1429	if (tmp == NULL && arrow == NULL)	1427	if (tmp == NULL && arrow == NULL)
1430	return find_arrow (op, type);	1428	return find_arrow (op, type);
1431		1429
1432	*better = betterby;	1430	*better = betterby;
1433	return tmp;	1431	return tmp;
…		…
1584	arrow->destroy ();	1582	arrow->destroy ();
1585	return 0;	1583	return 0;
1586	}	1584	}
1587		1585
1588	left = arrow; /* these are arrows left to the player */	1586	left = arrow; /* these are arrows left to the player */
1589	arrow = get_split_ob (arrow, 1);	1587	arrow = arrow->split ();
1590	if (!arrow)	1588	if (!arrow)
1591	{	1589	{
1592	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);
1593	return 0;	1591	return 0;
1594	}	1592	}
…		…
1661	op->play_sound (sound_find ("fire_arrow"));	1659	op->play_sound (sound_find ("fire_arrow"));
1662	m->insert (arrow, sx, sy, op);	1660	m->insert (arrow, sx, sy, op);
1663		1661
1664	if (!arrow->destroyed ())	1662	if (!arrow->destroyed ())
1665	move_arrow (arrow);	1663	move_arrow (arrow);
1666
1667	if (op->type == PLAYER)
1668	{
1669	if (left->destroyed ())
1670	esrv_del_item (op->contr, left->count);
1671	else
1672	esrv_send_item (op, left);
1673	}
1674		1664
1675	return 1;	1665	return 1;
1676	}	1666	}
1677		1667
1678	/* Special fire code for players - this takes into	1668	/* Special fire code for players - this takes into
…		…
1752	return;	1742	return;
1753	}	1743	}
1754	}	1744	}
1755	else if (item->type == ROD \|\| item->type == HORN)	1745	else if (item->type == ROD \|\| item->type == HORN)
1756	{	1746	{
1757	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))
1758	{	1752	{
1759	op->contr->play_sound (sound_find ("wand_poof"));	1753	op->contr->play_sound (sound_find ("wand_poof"));
1760		1754
1761	if (item->type == ROD)	1755	if (item->type == ROD)
1762	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));
…		…
1781	CLEAR_FLAG (item, FLAG_ANIMATE);	1775	CLEAR_FLAG (item, FLAG_ANIMATE);
1782	item->face = item->arch->face;	1776	item->face = item->arch->face;
1783	item->set_speed (0);	1777	item->set_speed (0);
1784	}	1778	}
1785		1779
1786	if ((tmp = item->in_player ()))	1780	if (object *pl = item->visible_to ())
1787	esrv_update_item (UPD_ANIM, tmp, item);	1781	esrv_update_item (UPD_ANIM, pl, item);
1788	}	1782	}
1789	}	1783	}
1790	else if (item->type == ROD \|\| item->type == HORN)	1784	else if (item->type == ROD \|\| item->type == HORN)
1791	drain_rod_charge (item);	1785	drain_rod_charge (item);
1792	}	1786	}
…		…
1963		1957
1964	if (door->type == DOOR)	1958	if (door->type == DOOR)
1965	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 */
1966	else if (door->type == LOCKED_DOOR)	1960	else if (door->type == LOCKED_DOOR)
1967	{	1961	{
1968	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);
1969	remove_door2 (door); /* remove door without violence ;-) */	1963	remove_door2 (door); /* remove door without violence ;-) */
1970	}	1964	}
1971		1965
1972	/* Do this after we print the message */	1966	/* Do this after we print the message */
1973	decrease_ob (key); /* Use up one of the keys */	1967	key->decrease (); /* Use up one of the keys */
1974	/* Need to update the weight the container the key was in */
1975	if (container != op)
1976	esrv_update_item (UPD_WEIGHT, op, container);
1977		1968
1978	return 1; /* Nothing more to do below */	1969	return 1; /* Nothing more to do below */
1979	}	1970	}
1980	else if (door->type == LOCKED_DOOR)	1971	else if (door->type == LOCKED_DOOR)
1981	{	1972	{
1982	/* Might as well return now - no other way to open this */	1973	/* Might as well return now - no other way to open this */
1983	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...");
1984	return 1;	1975	return 1;
1985	}	1976	}
1986		1977
1987	return 0;	1978	return 0;
1988	}	1979	}
…		…
2108	{	2099	{
2109	op->play_sound (sound_find ("push_player"));	2100	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	2101	push_ob (mon, dir, op);
2111	}	2102	}
2112	else	2103	else
2113	new_draw_info (0, 0, op, "You withhold your attack");	2104	op->statusmsg ("You withhold your attack");
2114		2105
2115	if (op->contr->tmp_invis \|\| op->hide)	2106	if (op->contr->tmp_invis \|\| op->hide)
2116	make_visible (op);	2107	make_visible (op);
2117		2108
2118	return true;	2109	return true;
…		…
2162	bool	2153	bool
2163	move_player (object *op, int dir)	2154	move_player (object *op, int dir)
2164	{	2155	{
2165	int pick;	2156	int pick;
2166		2157
2167	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2158	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)
2168	return 0;	2159	return 0;
2169		2160
2170	/* Sanity check: make sure dir is valid */	2161	/* Sanity check: make sure dir is valid */
2171	if ((dir < 0) \|\| (dir >= 9))	2162	if ((dir < 0) \|\| (dir >= 9))
2172	{	2163	{
…		…
2260	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2251	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2261	{	2252	{
2262	op->play_sound (sound_find ("ob_evaporate"));	2253	op->play_sound (sound_find ("ob_evaporate"));
2263	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));
2264		2255
2265	if (op->contr)
2266	esrv_del_item (op->contr, tmp->count);
2267
2268	tmp->destroy ();	2256	tmp->destroy ();
2269	CLEAR_FLAG (op, FLAG_LIFESAVE);	2257	CLEAR_FLAG (op, FLAG_LIFESAVE);
2270		2258
2271	if (op->stats.hp < 0)	2259	if (op->stats.hp < 0)
2272	op->stats.hp = op->stats.maxhp;	2260	op->stats.hp = op->stats.maxhp;
…		…
2284	return 0;	2272	return 0;
2285	}	2273	}
2286		2274
2287	/* 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
2288	* 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
2289	* 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
2290	* from.	2278	* from.
2291	*/	2279	*/
2292	static void	2280	static void
2293	drop_unpaid_items (object op, object env)	2281	drop_unpaid_items (object op, object env)
2294	{	2282	{
2295	while (op)	2283	while (op)
2296	{	2284	{
2297	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2285	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2298		2286
2299	if (QUERY_FLAG (op, FLAG_UNPAID))	2287	if (QUERY_FLAG (op, FLAG_UNPAID))
2300	{
2301	if (env->type == PLAYER)
2302	esrv_del_item (env->contr, op->count);
2303
2304	op->insert_at (env);	2288	op->insert_at (env);
2305	}
2306	else if (op->inv)	2289	else if (op->inv)
2307	drop_unpaid_items (op->inv, env);	2290	drop_unpaid_items (op->inv, env);
2308		2291
2309	op = next;	2292	op = next;
2310	}	2293	}
…		…
2322	* Moved from apply.c to player.c - player.c is what	2305	* Moved from apply.c to player.c - player.c is what
2323	* actually uses this function. player.c may not be quite the	2306	* actually uses this function. player.c may not be quite the
2324	* best, a misc file for object actions is probably better,	2307	* best, a misc file for object actions is probably better,
2325	* but there isn't one in the server directory.	2308	* but there isn't one in the server directory.
2326	*/	2309	*/
2327	char *	2310	const char *
2328	gravestone_text (object *op)	2311	gravestone_text (object *op)
2329	{	2312	{
2330	static char buf2[MAX_BUF];	2313	static dynbuf_text buf;
2331	char buf[MAX_BUF];
2332	time_t now = time (NULL);
2333		2314
2334	strcpy (buf2, " R.I.P.\n\n");	2315	buf << "---- R.I.P. ----\n\n";
		2316	op->name;
		2317
2335	if (op->type == PLAYER)	2318	if (op->type == PLAYER)
2336	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2319	buf << " the " << op->contr->title;
2337	else
2338	sprintf (buf, "%s\n", &op->name);
2339		2320
2340	strncat (buf2, " ", 20 - strlen (buf) / 2);	2321	buf << "\n\n";
2341	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
2342	if (op->type == PLAYER)	2327	if (op->type == PLAYER)
2343	sprintf (buf, "who was in level %d when killed\n", op->level);	2328	buf << "by " << op->contr->killer_name () << ".\n\n";
2344	else
2345	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2346		2329
2347	strncat (buf2, " ", 20 - strlen (buf) / 2);
2348	strcat (buf2, buf);
2349	if (op->type == PLAYER)
2350	{	2330	{
2351	sprintf (buf, "by %s.\n\n", op->contr->killer);	2331	static char buf2[128];
2352	strncat (buf2, " ", 21 - strlen (buf) / 2);	2332	time_t now = time (NULL);
2353	strcat (buf2, buf);
2354	}
2355
2356	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2333	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2357	strncat (buf2, " ", 20 - strlen (buf) / 2);	2334	buf << buf2;
2358	strcat (buf2, buf);	2335	}
2359		2336
2360	return buf2;	2337	return buf;
2361	}	2338	}
2362		2339
2363	void	2340	void
2364	do_some_living (object *op)	2341	do_some_living (object *op)
2365	{	2342	{
…		…
2546	op->stats.food--;	2523	op->stats.food--;
2547	}	2524	}
2548		2525
2549	if (op->stats.food < 0 && op->stats.hp >= 0)	2526	if (op->stats.food < 0 && op->stats.hp >= 0)
2550	{	2527	{
2551	object tmp, flesh = 0;	2528	object *flesh = 0;
2552		2529
2553	for (tmp = op->inv; tmp; tmp = tmp->below)	2530	for_inv_removable (op, tmp)
2554	{	2531	{
2555	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)
2556	{	2536	{
2557	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2537	op->statusmsg ("You blindly grab for a bite of food. "
2558	{	2538	"H<To prevent you from starving, you ate some random item from your backpack.>");
2559	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2560	manual_apply (op, tmp, 0);	2539	manual_apply (op, tmp, 0);
		2540
2561	if (op->stats.food >= 0 \|\| op->stats.hp < 0)	2541	if (op->stats.food >= 0 \|\| op->stats.hp < 0)
2562	break;	2542	break;
2563	}	2543	}
2564	else if (tmp->type == FLESH)	2544	else if (tmp->type == FLESH)
2565	flesh = tmp;	2545	flesh = tmp;
2566	} /* End if paid for object */	2546	}
2567	} /* end of for loop */
2568		2547
2569	/* 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
2570	* eat flesh instead.	2549	* eat flesh instead.
2571	*/	2550	*/
2572	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2551	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2573	{	2552	{
2574	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.>");
2575	manual_apply (op, flesh, 0);	2555	manual_apply (op, flesh, 0);
2576	}	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.>");
2577	}	2562	}
2578		2563
2579	if (op->stats.food < 0)	2564	if (op->stats.food < 0)
2580	{	2565	{
2581	op->stats.hp += op->stats.food;	2566	op->stats.hp += op->stats.food;
2582	op->stats.food = 0;	2567	op->stats.food = 0;
2583	}	2568	}
2584		2569
2585	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2570	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2586	kill_player (op);	2571	kill_player (op);
…		…
2593	* file.	2578	* file.
2594	*/	2579	*/
2595	void	2580	void
2596	kill_player (object *op)	2581	kill_player (object *op)
2597	{	2582	{
		2583	int x, y;
2598	char buf[MAX_BUF];	2584	char buf[MAX_BUF];
2599	int x, y;
2600
2601	//int i;
2602	maptile map; / this is for resurrection */	2585	maptile map; / this is for resurrection */
2603
2604	/* int z;
2605	int num_stats_lose;
2606	int lost_a_stat;
2607	int lose_this_stat;
2608	int this_stat; */
2609	int will_kill_again;	2586	int will_kill_again;
2610	archetype *at;	2587	archetype *at;
2611	object *tmp;	2588	object *tmp;
2612		2589
2613	if (save_life (op))	2590	if (save_life (op))
…		…
2643	op->stats.food = 999;	2620	op->stats.food = 999;
2644		2621
2645	/* create a bodypart-trophy to make the winner happy */	2622	/* create a bodypart-trophy to make the winner happy */
2646	if (object *tmp = arch_to_object (archetype::find ("finger")))	2623	if (object *tmp = arch_to_object (archetype::find ("finger")))
2647	{	2624	{
2648	sprintf (buf, "%s's finger", &op->name);	2625	tmp->name = format ("%s's finger" , &op->name);
2649	tmp->name = buf;	2626	tmp->name_pl = format ("%s's fingers", &op->name);
2650	sprintf (buf, " This finger has been cut off %s\n"
2651	" the %s, when he was defeated at\n level %d by %s.\n",
2652	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2653	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	);
2654	tmp->value = 0, tmp->type = 0;	2633	tmp->value = 0, tmp->type = 0;
2655	tmp->materialname = "organics";	2634	tmp->materialname = "organics";
2656	tmp->insert_at (op, tmp);	2635	tmp->insert_at (op, tmp);
2657	}	2636	}
2658		2637
…		…
2666		2645
2667	command_kill_pets (op, 0);	2646	command_kill_pets (op, 0);
2668		2647
2669	if (op->stats.food < 0)	2648	if (op->stats.food < 0)
2670	{	2649	{
2671	sprintf (buf, "%s starved to death.", &op->name);	2650	op->contr->killer = archetype::get ("killer_starvation");
2672	strcpy (op->contr->killer, "starvation");	2651	op->contr->killer->destroy ();
2673	}	2652	}
2674	else
2675	sprintf (buf, "%s died.", &op->name);
2676		2653
2677	op->contr->play_sound (sound_find ("player_dies"));	2654	op->contr->play_sound (sound_find ("player_dies"));
2678		2655
2679	/* save the map location for corpse, gravestone */	2656	/* save the map location for corpse, gravestone */
2680	x = op->x;	2657	x = op->x;
…		…
2789	lost_a_stat = 1;	2766	lost_a_stat = 1;
2790	}	2767	}
2791	}	2768	}
2792	}	2769	}
2793	}	2770	}
		2771
2794	/* If no stat lost, tell the player. */	2772	/* If no stat lost, tell the player. */
2795	if (!lost_a_stat)	2773	if (!lost_a_stat)
2796	{	2774	{
2797	/* determine_god() seems to not work sometimes... why is this?	2775	/* determine_god() seems to not work sometimes... why is this?
2798	Should I be using something else? GD */	2776	Should I be using something else? GD */
…		…
2802	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);
2803	else	2781	else
2804	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.");
2805	}	2783	}
2806	#else	2784	#else
2807	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.");
2808	#endif	2786	#endif
2809		2787
2810	/* Put a gravestone up where the character 'almost' died. List the	2788	/* Put a gravestone up where the character 'almost' died. List the
2811	* exp loss on the stone.	2789	* exp loss on the stone.
2812	*/	2790	*/
2813	tmp = arch_to_object (archetype::find ("gravestone"));	2791	tmp = arch_to_object (archetype::find ("gravestone"));
2814	sprintf (buf, "%s's gravestone", &op->name);	2792	tmp->name = format ("%s's gravestone", &op->name);
2815	tmp->name = buf;	2793	tmp->name_pl = format ("%s's gravestones", &op->name);
2816	sprintf (buf, "%s's gravestones", &op->name);
2817	tmp->name_pl = buf;
2818	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 ());
2819	tmp->msg = buf;
2820	tmp->x = op->x, tmp->y = op->y;	2795	tmp->x = op->x, tmp->y = op->y;
2821	insert_ob_in_map (tmp, op->map, NULL, 0);	2796	insert_ob_in_map (tmp, op->map, NULL, 0);
2822		2797
2823	/**************************************/	2798	/**************************************/
2824	/* */	2799	/* */
…		…
2847	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2822	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2848	}	2823	}
2849		2824
2850	cure_disease (op, 0, 0); /* remove any disease */	2825	cure_disease (op, 0, 0); /* remove any disease */
2851		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	}
		2838
2852	/add_exp(op, (op->stats.exp -0.20)); */	2839	/add_exp(op, (op->stats.exp -0.20)); */
2853	apply_death_exp_penalty (op);	2840	apply_death_exp_penalty (op);
		2841
2854	if (op->stats.food < 100)	2842	if (op->stats.food < 100)
2855	op->stats.food = 900;	2843	op->stats.food = 900;
		2844
2856	op->stats.hp = op->stats.maxhp;	2845	op->stats.hp = op->stats.maxhp;
2857	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2846	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2858	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2847	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2859		2848
2860	/*	2849	/*
…		…
2928		2917
2929	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))))
2930	{	2919	{
2931	if (tmp->nrof > 1)	2920	if (tmp->nrof > 1)
2932	{	2921	{
2933	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2922	tmp->decrease (rndm (1, tmp->nrof - 1));
2934	tmp2->destroy ();
2935	insert_ob_in_map (tmp, op->map, NULL, 0);	2923	insert_ob_in_map (tmp, op->map, NULL, 0);
2936	}	2924	}
2937	else	2925	else
2938	tmp->destroy ();	2926	tmp->destroy ();
2939	}	2927	}
…		…
2950	void	2938	void
2951	fix_weight (void)	2939	fix_weight (void)
2952	{	2940	{
2953	for_all_players (pl)	2941	for_all_players (pl)
2954	{	2942	{
2955	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2943	sint32 old = pl->ob->carrying;
2956		2944
2957	if (old == sum)	2945	pl->ob->update_weight ();
2958	continue;	2946
		2947	if (old != pl->ob->carrying)
		2948	{
2959	pl->ob->update_stats ();	2949	pl->ob->update_stats ();
2960	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	}
2961	}	2952	}
2962	}	2953	}
2963		2954
2964	void	2955	void
2965	fix_luck (void)	2956	fix_luck (void)
…		…
3051	* as bad as carrying a light on a pitch dark map */	3042	* as bad as carrying a light on a pitch dark map */
3052	if (has_carried_lights (ob))	3043	if (has_carried_lights (ob))
3053	level = -(10 + (2 * ob->map->darkness));	3044	level = -(10 + (2 * ob->map->darkness));
3054		3045
3055	/* scan through all nearby squares for terrain to hide in */	3046	/* scan through all nearby squares for terrain to hide in */
3056	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])
3057	{	3050	{
3058	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3051	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3059	if (mflag & P_OUT_OF_MAP)	3052	if (mflag & P_OUT_OF_MAP)
3060	{
3061	continue;	3053	continue;
3062	}	3054
3063	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3055	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3064	level += 2;	3056	level += 2;
3065	else /* open terrain! */	3057	else /* open terrain! */
3066	level -= 1;	3058	level -= 1;
3067	}	3059	}
…		…
3078	* spot (surrounded by clear terrain in broad daylight). -b.t.	3070	* spot (surrounded by clear terrain in broad daylight). -b.t.
3079	*/	3071	*/
3080	void	3072	void
3081	do_hidden_move (object *op)	3073	do_hidden_move (object *op)
3082	{	3074	{
3083	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3075	int hide = 0;
3084	object *skop;
3085		3076
3086	if (!op \|\| !op->map)	3077	if (!op \|\| !op->map)
3087	return;	3078	return;
3088		3079
3089	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);
3090		3082
3091	/* 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! */
3092	if (op->type == PLAYER && op->contr->run_on)	3084	if (op->type == PLAYER && op->contr->run_on)
3093	if (!skop \|\| num >= skop->level)	3085	if (!skop \|\| num >= skop->level)
3094	{	3086	{
…		…
3104	num -= hide;	3096	num -= hide;
3105		3097
3106	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))	3098	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))
3107	{	3099	{
3108	make_visible (op);	3100	make_visible (op);
		3101
3109	if (op->type == PLAYER)	3102	if (op->type == PLAYER)
3110	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!");
3111	}	3104	}
3112	else if (op->type == PLAYER && skop)	3105	else if (op->type == PLAYER && skop)
3113	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);
…		…
3454	else	3447	else
3455	{	3448	{
3456	/* generate misc. treasure */	3449	/* generate misc. treasure */
3457	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3458	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));
3459	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3460	if (who->type == PLAYER)
3461	esrv_send_item (who, tmp);
3462	}	3453	}
3463	}	3454	}
3464		3455
3465	/**	3456	/**
3466	* 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
…		…
3495	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))
3496	return 0;	3487	return 0;
3497		3488
3498	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3499	}	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

Comparing deliantra/server/server/player.C (file contents): Revision 1.165 by root, Mon Aug 27 05:10:51 2007 UTC vs. Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.165 by root, Mon Aug 27 05:10:51 2007 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC