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.146 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 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 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 it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* 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>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
…		…
184		183
185	if (ob->map)	184	if (ob->map)
186	maplevel = ob->map->path;	185	maplevel = ob->map->path;
187		186
188	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
189	ob->map = 0;	189	ob->map = 0;
190	party = 0;	190	party = 0;
191		191
192	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
193		193
…		…
207	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
208		208
209	ns->update_look = 0;	209	ns->update_look = 0;
210	ns->look_position = 0;	210	ns->look_position = 0;
211		211
212	clear_los (ob);	212	clear_los (this);
213		213
214	ns->reset_stats ();	214	ns->reset_stats ();
215		215
216	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
217	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
218	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
219		219
220	ob->carrying = sum_weight (ob);	220	ob->update_weight ();
221	link_player_skills (ob);	221	link_player_skills (ob);
222		222
223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224		224
225	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
226		226
227	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
228	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
229	{	229	{
230	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
231		231
232	shstr_cmp dragon_ability_force ("dragon_ability_force");
233	shstr_cmp dragon_skin_force ("dragon_skin_force");
234
235	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
236	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
237	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
238	abil = tmp;	235	abil = tmp;
239	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
240	skin = tmp;	237	skin = tmp;
241		238
242	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
243	}	240	}
244		241
245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
246		243
247	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this, ob->weight + ob->carrying);
		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 */
248		300
249	ob->flag [FLAG_READY_WEAPON] = false;	301	ob->flag [FLAG_READY_WEAPON] = false;
250	ob->flag [FLAG_READY_SKILL] = false;	302	ob->flag [FLAG_READY_SKILL] = false;
251	ob->flag [FLAG_READY_BOW] = false;	303	ob->flag [FLAG_READY_BOW] = false;
252		304
…		…
269	combat_ob = op;	321	combat_ob = op;
270	break;	322	break;
271	}	323	}
272		324
273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274	ob->update_stats ();	326	ob->deactivate (); // change_Weapon activates, fix this better
275
276	ns->floorbox_update ();
277	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);
279
280	activate ();
281
282	send_rules (ob);
283	send_news (ob);
284	display_motd (ob);
285
286	INVOKE_PLAYER (CONNECT, this);
287	INVOKE_PLAYER (LOGIN, this);
288	}
289
290	void
291	player::disconnect ()
292	{
293	if (ns)
294	{
295	if (active)
296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
297
298	INVOKE_PLAYER (DISCONNECT, this);
299
300	ns->reset_stats ();
301	ns->pl = 0;
302	ns = 0;
303	}
304
305	if (ob)
306	ob->close_container (); //TODO: client-specific
307
308	deactivate ();
309	}
310
311	// the need for this function can be explained
312	// by load_object not returning the object
313	void
314	player::set_object (object *op)
315	{
316	ob = observe = op;
317	ob->contr = this; /* this aren't yet in archetype */
318
319	ob->speed = 1.0f;
320	ob->speed_left = 0.5f;
321
322	ob->direction = 5; /* So player faces south */
323	}	327	}
324		328
325	void	329	void
326	player::set_observe (object *op)	330	player::set_observe (object *op)
327	{	331	{
328	observe = op ? op : ob;	332	observe = op ? op : ob;
		333	do_los = 1;
329	}	334	}
330		335
331	player::player ()	336	player::player ()
332	{	337	{
333	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
361	if (ob)	366	if (ob)
362	{	367	{
363	ob->destroy_inv (false);	368	ob->destroy_inv (false);
364	ob->destroy ();	369	ob->destroy ();
365	}	370	}
		371
		372	ob = observe = 0;
366	}	373	}
367		374
368	player::~player ()	375	player::~player ()
369	{	376	{
370	/* Clear item stack */	377	/* Clear item stack */
…		…
397	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
398	*/	405	*/
399	archetype *	406	archetype *
400	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
401	{	408	{
402	archetype *start = at;	409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
		415	archvec::iterator i = archetypes.find (nat);
403		416
404	for (;;)	417	for (;;)
405	{	418	{
406	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
407	at = first_archetype;	420	i = archetypes.begin ();
408	else	421	else if (*i == at)
409	at = at->next;	422	cleanup ("not a single player archetype found");
410		423
411	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
412	return at;	425	return *i;
413
414	if (at == start)
415	{
416	LOG (llevError, "No Player archetypes\n");
417	exit (-1);
418	}
419	}	426	}
420	}	427	}
421		428
422	object *	429	object *
423	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
427	unsigned lastdist;	434	unsigned lastdist;
428	rv_vector rv;	435	rv_vector rv;
429		436
430	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
431	{	438	{
432	/* We should not find free objects on this friendly list, but it
433	* does periodically happen. Given that, lets deal with it.
434	* While unlikely, it is possible the next object on the friendly
435	* list is also free, so encapsulate this in a while loop.
436	*/
437	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
438	{
439	object *tmp = ol->ob;
440
441	/* Can't do much more other than log the fact, because the object
442	* itself will have been cleared.
443	*/
444	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
445	tmp->debug_desc ());
446	ol = ol->next;
447	remove_friendly_object (tmp);
448	if (!ol)
449	return op;
450	}
451
452	/* Remove special check for player from this. First, it looks to cause
453	* some crashes (ol->ob->contr not set properly?), but secondly, a more
454	* complicated method of state checking would be needed in any case -
455	* as it was, a clever player could type quit, and the function would
456	* skip them over while waiting for confirmation. Remove
457	* on_same_map check, as can_detect_enemy also does this
458	*/
459	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
460	continue;	440	continue;
461		441
462	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
463	{	443	{
…		…
658		638
659	return firstdir;	639	return firstdir;
660	}	640	}
661		641
662	void	642	void
663	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
664	{	644	{
665	object *op, *next = NULL;
666
667	if (pl->randomitems != NULL)	645	if (pl->randomitems)
668	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
669		647
670	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
671	{	649	{
672	next = op->below;	650	next = op->below;
673		651
674	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
675	* 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
…		…
680	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
681	* by this player due to race restrictions	659	* by this player due to race restrictions
682	*/	660	*/
683	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
684	{	662	{
685	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
686	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
687	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
688	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
689	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))
690	{	670	{
691	op->destroy ();	671	op->destroy ();
692	continue;	672	continue;
693	}	673	}
694	}	674	}
…		…
717	if (op->nrof > 1)	697	if (op->nrof > 1)
718	op->nrof = 1;	698	op->nrof = 1;
719	}	699	}
720		700
721	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
722	{
723	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
724	}
725		703
726	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
727	* 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
728	* merged properly.	706	* merged properly.
729	*/	707	*/
730	if (need_identify (op))	708	if (need_identify (op))
731	{	709	{
732	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
733	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
734	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
735	}	713	}
		714
736	if (op->type == SPELL)	715	if (op->type == SPELL)
737	{	716	{
738	op->destroy ();	717	op->destroy ();
739	continue;	718	continue;
740	}	719	}
…		…
742	{	721	{
743	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
744	op->stats.exp = 0;	723	op->stats.exp = 0;
745	op->level = 1;	724	op->level = 1;
746	}	725	}
747	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
748	else
749	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
750	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
751		729
752	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
753	link_player_skills (pl);	731	link_player_skills (pl);
…		…
859	static void	837	static void
860	start_info (object *op)	838	start_info (object *op)
861	{	839	{
862	char buf[MAX_BUF];	840	char buf[MAX_BUF];
863		841
864	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
865	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
866	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
867	//new_draw_info (NDI_UNIQUE, 0, op, " ");
868	}	844	}
869		845
870	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
871	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
872	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
913	if (*first_map_ext_path)	889	if (*first_map_ext_path)
914	{	890	{
915	object *tmp;	891	object *tmp;
916	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
917		893
918	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	894	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
919	tmp = object::create ();	895	tmp = object::create ();
920	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
921	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
922	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
923	ob->enter_exit (tmp); /* we don't really care if it succeeded;	899	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
942	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
943		919
944	ob->remove_statbonus ();	920	ob->remove_statbonus ();
945	ob->remove ();	921	ob->remove ();
946	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
947	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
948	ob->instantiate ();	924	ob->instantiate ();
949	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
950	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
951	ob->x = x;	927	ob->x = x;
952	ob->y = y;	928	ob->y = y;
953	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
954	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
955	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
956	ob->add_statbonus ();	932	ob->add_statbonus ();
957	}	933	}
958	while (!allowed_class (ob));	934	while (!allowed_class (ob));
959		935
960	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1035	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1036	return 1;	1012	return 1;
1037		1013
1038	next = op->below;	1014	next = op->below;
1039		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1040	/* loop while there are items on the floor that are not marked as	1019	/* loop while there are items on the floor that are not marked as
1041	* destroyed */	1020	* destroyed */
1042	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1043	{	1022	{
1044	tmp = next;	1023	tmp = next;
1045	next = tmp->below;	1024	next = tmp->below;
1046		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1047	if (op->destroyed ())	1032	if (op->destroyed ())
1048	return 0;	1033	return 0;
1049		1034
1050	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1051	continue;	1036	continue;
1052		1037
1053	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1054	{	1039	{
1055	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1056	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1057	continue;	1042	continue;
1058	}	1043	}
1059		1044
1060	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1061	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1063	switch (op->contr->mode)	1048	switch (op->contr->mode)
1064	{	1049	{
1065	case 0:	1050	case 0:
1066	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1067	case 1:	1052	case 1:
1068	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1069	return 1;	1054	return 1;
1070	case 2:	1055	case 2:
1071	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1072	return 0;	1057	return 0;
1073	case 3:	1058	case 3:
1074	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1075	case 4:	1060	case 4:
1076	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1077	break;	1062	break;
1078	case 5:	1063	case 5:
1079	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1080	stop = 1;	1065	stop = 1;
1081	break;	1066	break;
1082	case 6:	1067	case 6:
1083	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1084	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1085	break;	1071	break;
1086		1072
1087	case 7:	1073	case 7:
1088	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1089	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1090	break;	1076	break;
1091		1077
1092	default:	1078	default:
1093	/* use value density */	1079	/* use value density */
1094	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1095	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1081	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1096	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1097	}	1083	}
1098	}	1084	}
1099	else	1085	else
1100	{ /* old model */	1086	{ /* old model */
1101	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1105	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1106	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1107	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1093	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1108	else	1094	else
1109	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1110	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1096	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1111		1097
1112	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1113	}	1099	}
1114		1100
1115	/* philosophy:	1101	/* philosophy:
…		…
1156	/* all food and drink if desired */	1142	/* all food and drink if desired */
1157	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1158	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1159	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1160	{	1146	{
1161	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1162	continue;	1148	continue;
1163	}	1149	}
1164		1150
1165	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1166	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1152	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1167	{	1153	{
1168	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1169	continue;	1155	continue;
1170	}	1156	}
1171		1157
1172	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1173	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1174	{	1160	{
1175	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1176	continue;	1162	continue;
1177	}	1163	}
1178		1164
1179	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1180	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1181	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1182	{	1168	{
1183	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1184	continue;	1170	continue;
1185	}	1171	}
1186		1172
1187	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1188	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1189	{	1175	{
1190	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1191	continue;	1177	continue;
1192	}	1178	}
1193		1179
1194	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1195	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1196	{	1182	{
1197	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1198	continue;	1184	continue;
1199	}	1185	}
1200		1186
1201	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1202	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1203	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1204	{	1190	{
1205	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1206	continue;	1192	continue;
1207	}	1193	}
1208		1194
1209	/* pick up all magical items */	1195	/* pick up all magical items */
1210	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1211	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1197	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1212	{	1198	{
1213	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1214	continue;	1200	continue;
1215	}	1201	}
1216		1202
1217	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1218	{	1204	{
1219	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1220	{	1206	{
1221	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1222	continue;	1208	continue;
1223	}	1209	}
1224	}	1210	}
1225		1211
1226	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1227	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1228	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1229	{	1215	{
1230	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1231	continue;	1217	continue;
1232	}	1218	}
1233		1219
1234	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1235	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1236	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1237	{	1223	{
1238	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1239	continue;	1225	continue;
1240	}	1226	}
1241		1227
1242	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1243	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1244	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1245	{	1231	{
1246	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1247	continue;	1233	continue;
1248	}	1234	}
1249		1235
1250	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1251	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1252	{	1238	{
1253	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1254	continue;	1240	continue;
1255	}	1241	}
1256		1242
1257	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1258	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1259	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1260	{	1246	{
1261	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1262	continue;	1248	continue;
1263	}	1249	}
1264		1250
1265	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1266	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1267	{	1253	{
1268	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1269	continue;	1255	continue;
1270	}	1256	}
1271		1257
1272	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1273	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1274	{	1260	{
1275	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1276	continue;	1262	continue;
1277	}	1263	}
1278		1264
1279	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1280	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1281	{	1267	{
1282	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1283	continue;	1269	continue;
1284	}	1270	}
1285		1271
1286	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1287	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1288	{	1274	{
1289	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1290	continue;	1276	continue;
1291	}	1277	}
1292		1278
1293	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1294	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1295	{	1281	{
1296	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1297	continue;	1283	continue;
1298	}	1284	}
1299		1285
1300	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1301	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1302	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1303	{	1289	{
1304	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1305	continue;	1291	continue;
1306	}	1292	}
1307		1293
1308	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1309	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1310	{	1296	{
1311	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1312	{	1298	{
1313	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1299	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1314	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1315	{	1301	{
1316	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1317	continue;	1303	continue;
1318	}	1304	}
1319	}	1305	}
1320		1306
1321	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1322	{	1308	{
1323	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1309	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1324	{	1310	{
1325	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1326	continue;	1312	continue;
1327	}	1313	}
1328	}	1314	}
1329	}	1315	}
1330		1316
1331	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1332	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1333	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1334	{	1320	{
1335	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1336	continue;	1322	continue;
1337	}	1323	}
1338		1324
1339	/* any of the last 4 bits set means we use the ratio for value	1325	/* any of the last 4 bits set means we use the ratio for value
1340	* pickups */	1326	* pickups */
…		…
1345	/* >=7 is the old standard setting. Now we take the last 4 bits	1331	/* >=7 is the old standard setting. Now we take the last 4 bits
1346	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1347	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1348	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1334	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1349	{	1335	{
1350	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1351	#if 0	1337	#if 0
1352	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1353	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1354	{	1340	{
1355	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1356	}	1342	}
1357	else	1343	else
1358	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1359	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1360	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1346	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1361	#endif	1347	#endif
1362	continue;	1348	continue;
1363	}	1349	}
…		…
1374	* found object is returned.	1360	* found object is returned.
1375	*/	1361	*/
1376	object *	1362	object *
1377	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1378	{	1364	{
1379	object *tmp = 0;
1380
1381	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1382	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1383	tmp = find_arrow (op, type);
1384	else if (op->type == ARROW && op->race == type)	1366	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1367	return splay (tmp);
		1368
		1369	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1370	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1371	if (object *arrow = find_arrow (tmp, type))
		1372	{
		1373	splay (tmp);
1385	return op;	1374	return arrow;
		1375	}
1386		1376
1387	return tmp;	1377	return 0;
1388	}	1378	}
1389		1379
1390	/*	1380	/*
1391	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1381	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1392	* against the target. A full test is not performed, simply a basic test	1382	* against the target. A full test is not performed, simply a basic test
…		…
1433	else	1423	else
1434	{	1424	{
1435	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1436	{	1426	{
1437	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1438	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1439	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1429	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1440	{	1430	{
1441	tmp = arrow;	1431	tmp = arrow;
1442	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1432	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1443	}	1433	}
1444	}	1434	}
1445	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1446	{	1436	{
1447	tmp = arrow;	1437	tmp = arrow;
…		…
1613	arrow->destroy ();	1603	arrow->destroy ();
1614	return 0;	1604	return 0;
1615	}	1605	}
1616		1606
1617	left = arrow; /* these are arrows left to the player */	1607	left = arrow; /* these are arrows left to the player */
1618	arrow = get_split_ob (arrow, 1);	1608	arrow = arrow->split ();
1619	if (!arrow)	1609	if (!arrow)
1620	{	1610	{
1621	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1611	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1622	return 0;	1612	return 0;
1623	}	1613	}
…		…
1685		1675
1686	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1676	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689		1679
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	op->play_sound (sound_find ("fire_arrow"));
1691	m->insert (arrow, sx, sy, op);	1681	m->insert (arrow, sx, sy, op);
1692		1682
1693	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1694	move_arrow (arrow);	1684	move_arrow (arrow);
1695
1696	if (op->type == PLAYER)
1697	{
1698	if (left->destroyed ())
1699	esrv_del_item (op->contr, left->count);
1700	else
1701	esrv_send_item (op, left);
1702	}
1703		1685
1704	return 1;	1686	return 1;
1705	}	1687	}
1706		1688
1707	/* Special fire code for players - this takes into	1689	/* Special fire code for players - this takes into
…		…
1773		1755
1774	if (item->type == WAND)	1756	if (item->type == WAND)
1775	{	1757	{
1776	if (item->stats.food <= 0)	1758	if (item->stats.food <= 0)
1777	{	1759	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1760	op->contr->play_sound (sound_find ("wand_poof"));
1779	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1761	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1780		1762
1781	return;	1763	return;
1782	}	1764	}
1783	}	1765	}
1784	else if (item->type == ROD || item->type == HORN)	1766	else if (item->type == ROD || item->type == HORN)
1785	{	1767	{
1786	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1768	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1787	{	1769	{
1788	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1770	op->contr->play_sound (sound_find ("wand_poof"));
1789		1771
1790	if (item->type == ROD)	1772	if (item->type == ROD)
1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1792	else	1774	else
1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1775	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1806	object *tmp;	1788	object *tmp;
1807		1789
1808	if (item->arch)	1790	if (item->arch)
1809	{	1791	{
1810	CLEAR_FLAG (item, FLAG_ANIMATE);	1792	CLEAR_FLAG (item, FLAG_ANIMATE);
1811	item->face = item->arch->clone.face;	1793	item->face = item->arch->face;
1812	item->set_speed (0);	1794	item->set_speed (0);
1813	}	1795	}
1814		1796
1815	if ((tmp = item->in_player ()))	1797	if ((tmp = item->in_player ()))
1816	esrv_update_item (UPD_ANIM, tmp, item);	1798	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1982	/* If we found a key, do some extra work */	1964	/* If we found a key, do some extra work */
1983	if (key)	1965	if (key)
1984	{	1966	{
1985	object *container = key->env;	1967	object *container = key->env;
1986		1968
1987	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988
1989	if (action_makes_visible (op))	1969	if (action_makes_visible (op))
1990	make_visible (op);	1970	make_visible (op);
1991		1971
1992	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1972	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1993	spring_trap (door->inv, op);	1973	spring_trap (door->inv, op);
1994		1974
1995	if (door->type == DOOR)	1975	if (door->type == DOOR)
1996	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1976	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1997	else if (door->type == LOCKED_DOOR)	1977	else if (door->type == LOCKED_DOOR)
1998	{	1978	{
1999	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1979	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2000	remove_door2 (door); /* remove door without violence ;-) */	1980	remove_door2 (door); /* remove door without violence ;-) */
2001	}	1981	}
2002		1982
2003	/* Do this after we print the message */	1983	/* Do this after we print the message */
2004	decrease_ob (key); /* Use up one of the keys */	1984	key->decrease (); /* Use up one of the keys */
2005	/* Need to update the weight the container the key was in */	1985	/* Need to update the weight the container the key was in */
2006	if (container != op)	1986	if (container != op)
2007	esrv_update_item (UPD_WEIGHT, op, container);	1987	esrv_update_item (UPD_WEIGHT, op, container);
2008		1988
2009	return 1; /* Nothing more to do below */	1989	return 1; /* Nothing more to do below */
2010	}	1990	}
2011	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
2012	{	1992	{
2013	/* Might as well return now - no other way to open this */	1993	/* Might as well return now - no other way to open this */
2014	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1994	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2015	return 1;	1995	return 1;
2016	}	1996	}
2017		1997
2018	return 0;	1998	return 0;
2019	}	1999	}
…		…
2106		2086
2107	if (op->speed_left > 0.f)	2087	if (op->speed_left > 0.f)
2108	{	2088	{
2109	--op->speed_left;	2089	--op->speed_left;
2110		2090
2111	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2091	op->play_sound (sound_find ("push_player"));
2112	push_ob (mon, dir, op);	2092	push_ob (mon, dir, op);
2113		2093
2114	if (op->contr->tmp_invis || op->hide)	2094	if (op->contr->tmp_invis || op->hide)
2115	make_visible (op);	2095	make_visible (op);
2116		2096
…		…
2135	{	2115	{
2136	--op->speed_left;	2116	--op->speed_left;
2137		2117
2138	if (!op->contr->braced)	2118	if (!op->contr->braced)
2139	{	2119	{
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2120	op->play_sound (sound_find ("push_player"));
2141	push_ob (mon, dir, op);	2121	push_ob (mon, dir, op);
2142	}	2122	}
2143	else	2123	else
2144	new_draw_info (0, 0, op, "You withhold your attack");	2124	op->statusmsg ("You withhold your attack");
2145		2125
2146	if (op->contr->tmp_invis || op->hide)	2126	if (op->contr->tmp_invis || op->hide)
2147	make_visible (op);	2127	make_visible (op);
2148		2128
2149	return true;	2129	return true;
…		…
2193	bool	2173	bool
2194	move_player (object *op, int dir)	2174	move_player (object *op, int dir)
2195	{	2175	{
2196	int pick;	2176	int pick;
2197		2177
2198	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2178	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2199	return 0;	2179	return 0;
2200		2180
2201	/* Sanity check: make sure dir is valid */	2181	/* Sanity check: make sure dir is valid */
2202	if ((dir < 0) || (dir >= 9))	2182	if ((dir < 0) || (dir >= 9))
2203	{	2183	{
…		…
2288	return 0;	2268	return 0;
2289		2269
2290	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2270	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2291	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2271	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2292	{	2272	{
2293	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2273	op->play_sound (sound_find ("ob_evaporate"));
2294	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2274	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2295		2275
2296	if (op->contr)	2276	if (op->contr)
2297	esrv_del_item (op->contr, tmp->count);	2277	esrv_del_item (op->contr, tmp->count);
2298		2278
…		…
2318	/* This goes throws the inventory and removes unpaid objects, and puts them	2298	/* This goes throws the inventory and removes unpaid objects, and puts them
2319	* back in the map (location and map determined by values of env). This	2299	* back in the map (location and map determined by values of env). This
2320	* function will descend into containers. op is the object to start the search	2300	* function will descend into containers. op is the object to start the search
2321	* from.	2301	* from.
2322	*/	2302	*/
2323	void	2303	static void
2324	remove_unpaid_objects (object *op, object *env)	2304	drop_unpaid_items (object *op, object *env)
2325	{	2305	{
2326	while (op)	2306	while (op)
2327	{	2307	{
2328	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2308	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2329		2309
…		…
2333	esrv_del_item (env->contr, op->count);	2313	esrv_del_item (env->contr, op->count);
2334		2314
2335	op->insert_at (env);	2315	op->insert_at (env);
2336	}	2316	}
2337	else if (op->inv)	2317	else if (op->inv)
2338	remove_unpaid_objects (op->inv, env);	2318	drop_unpaid_items (op->inv, env);
2339		2319
2340	op = next;	2320	op = next;
2341	}	2321	}
		2322	}
		2323
		2324	void
		2325	object::drop_unpaid_items ()
		2326	{
		2327	if (!flag [FLAG_REMOVED])
		2328	::drop_unpaid_items (inv, this);
2342	}	2329	}
2343		2330
2344	/*	2331	/*
2345	* Returns pointer a static string containing gravestone text	2332	* Returns pointer a static string containing gravestone text
2346	* Moved from apply.c to player.c - player.c is what	2333	* Moved from apply.c to player.c - player.c is what
…		…
2441	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2428	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2442	else	2429	else
2443	{	2430	{
2444	gen_grace = op->stats.maxgrace;	2431	gen_grace = op->stats.maxgrace;
2445	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2432	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2446	}
2447
2448	/* Regenerate Spell Points */
2449	if (!op->contr->golem && --op->last_sp < 0)
2450	{
2451	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2452	if (op->stats.sp < op->stats.maxsp)
2453	{
2454	op->stats.sp++;
2455	/* dms do not consume food */
2456	if (!QUERY_FLAG (op, FLAG_WIZ))
2457	{
2458	op->stats.food--;
2459	if (op->contr->digestion < 0)
2460	op->stats.food += op->contr->digestion;
2461	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2462	op->stats.food = last_food;
2463	}
2464	}
2465
2466	if (max_sp > 1)
2467	{
2468	over_sp = (gen_sp + 10) / rate_sp;
2469	if (over_sp > 0)
2470	{
2471	if (op->stats.sp < op->stats.maxsp)
2472	{
2473	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2474
2475	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2476	op->stats.sp--;
2477
2478	if (op->stats.sp > op->stats.maxsp)
2479	op->stats.sp = op->stats.maxsp;
2480	}
2481	op->last_sp = 0;
2482	}
2483	else
2484	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2485	}
2486	else
2487	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2488	}	2433	}
2489		2434
2490	/* Regenerate Grace */	2435	/* Regenerate Grace */
2491	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2436	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2492	if (--op->last_grace < 0)	2437	if (--op->last_grace < 0)
…		…
2513	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2458	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2514	}	2459	}
2515	/* wearing stuff doesn't detract from grace generation. */	2460	/* wearing stuff doesn't detract from grace generation. */
2516	}	2461	}
2517		2462
		2463	if (op->stats.food > 0)
		2464	{
2518	/* Regenerate Hit Points */	2465	/* Regenerate Spell Points */
2519	if (--op->last_heal < 0)	2466	if (!op->contr->golem && --op->last_sp < 0)
2520	{
2521	if (op->stats.hp < op->stats.maxhp)
2522	{	2467	{
2523	op->stats.hp++;	2468	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2524	/* dms do not consume food */	2469
2525	if (!QUERY_FLAG (op, FLAG_WIZ))	2470	if (op->stats.sp < op->stats.maxsp)
2526	{	2471	{
		2472	op->stats.sp++;
		2473
		2474	/* dms do not consume food */
		2475	if (!QUERY_FLAG (op, FLAG_WIZ))
		2476	{
2527	op->stats.food--;	2477	op->stats.food--;
		2478
2528	if (op->contr->digestion < 0)	2479	if (op->contr->digestion < 0)
2529	op->stats.food += op->contr->digestion;	2480	op->stats.food += op->contr->digestion;
2530	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2481	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2531	op->stats.food = last_food;	2482	op->stats.food = last_food;
		2483	}
2532	}	2484	}
2533	}
2534		2485
2535	if (max_hp > 1)	2486	if (max_sp > 1)
2536	{
2537	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2538	if (over_hp > 0)
2539	{	2487	{
2540	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2488	over_sp = (gen_sp + 10) / rate_sp;
		2489	if (over_sp > 0)
		2490	{
		2491	if (op->stats.sp < op->stats.maxsp)
		2492	{
		2493	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2494
		2495	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2496	op->stats.sp--;
		2497
		2498	if (op->stats.sp > op->stats.maxsp)
		2499	op->stats.sp = op->stats.maxsp;
		2500	}
		2501
2541	op->last_heal = 0;	2502	op->last_sp = 0;
		2503	}
		2504	else
		2505	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2542	}	2506	}
2543	else	2507	else
		2508	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2509	}
		2510
		2511	/* Regenerate Hit Points */
		2512	if (--op->last_heal < 0)
		2513	{
		2514	if (op->stats.hp < op->stats.maxhp)
2544	{	2515	{
2545	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2516	op->stats.hp++;
		2517
		2518	/* dms do not consume food */
		2519	if (!QUERY_FLAG (op, FLAG_WIZ))
		2520	{
		2521	op->stats.food--;
		2522
		2523	if (op->contr->digestion < 0)
		2524	op->stats.food += op->contr->digestion;
		2525	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2526	op->stats.food = last_food;
		2527	}
2546	}	2528	}
		2529
		2530	if (max_hp > 1)
		2531	{
		2532	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2533
		2534	if (over_hp > 0)
		2535	{
		2536	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2537	op->last_heal = 0;
		2538	}
		2539	else
		2540	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2547	}	2541	}
2548	else	2542	else
2549	{
2550	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2543	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2551	}	2544	}
2552	}	2545	}
2553		2546
2554	/* Digestion */	2547	/* Digestion */
2555	if (--op->last_eat < 0)	2548	if (--op->last_eat < 0)
2556	{	2549	{
2557	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2550	int bonus = max (0, op->contr->digestion),
		2551	penalty = max (0, -op->contr->digestion);
2558		2552
2559	if (op->contr->gen_hp > 0)
2560	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2553	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2561	else
2562	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2563		2554
2564	/* dms do not consume food */	2555	/* dms do not consume food */
2565	if (!QUERY_FLAG (op, FLAG_WIZ))	2556	if (!QUERY_FLAG (op, FLAG_WIZ))
2566	op->stats.food--;	2557	op->stats.food--;
2567	}	2558	}
…		…
2594	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2585	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2595	manual_apply (op, flesh, 0);	2586	manual_apply (op, flesh, 0);
2596	}	2587	}
2597	}	2588	}
2598		2589
2599	while (op->stats.food < 0 && op->stats.hp >= 0)	2590	if (op->stats.food < 0)
2600	op->stats.food++, op->stats.hp--;	2591	{
		2592	op->stats.hp += op->stats.food;
		2593	op->stats.food = 0;
		2594	}
2601		2595
2602	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2603	kill_player (op);	2597	kill_player (op);
2604	}	2598	}
2605	}	2599	}
…		…
2610	* file.	2604	* file.
2611	*/	2605	*/
2612	void	2606	void
2613	kill_player (object *op)	2607	kill_player (object *op)
2614	{	2608	{
		2609	int x, y;
2615	char buf[MAX_BUF];	2610	char buf[MAX_BUF];
2616	int x, y;
2617
2618	//int i;
2619	maptile *map; /* this is for resurrection */	2611	maptile *map; /* this is for resurrection */
2620
2621	/* int z;
2622	int num_stats_lose;
2623	int lost_a_stat;
2624	int lose_this_stat;
2625	int this_stat; */
2626	int will_kill_again;	2612	int will_kill_again;
2627	archetype *at;	2613	archetype *at;
2628	object *tmp;	2614	object *tmp;
2629		2615
2630	if (save_life (op))	2616	if (save_life (op))
2631	return;	2617	return;
2632
2633		2618
2634	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2619	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2635	* in cities ONLY!!! It is very important that this doesn't get abused.	2620	* in cities ONLY!!! It is very important that this doesn't get abused.
2636	* Look at op_on_battleground() for more info --AndreasV	2621	* Look at op_on_battleground() for more info --AndreasV
2637	*/	2622	*/
…		…
2653	{	2638	{
2654	tmp->destroy ();	2639	tmp->destroy ();
2655	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2640	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2656	}	2641	}
2657		2642
2658	cure_disease (op, 0); /* remove any disease */	2643	cure_disease (op, 0, 0); /* remove any disease */
2659	op->stats.hp = op->stats.maxhp;	2644	op->stats.hp = op->stats.maxhp;
2660	if (op->stats.food <= 0)	2645	if (op->stats.food <= 0)
2661	op->stats.food = 999;	2646	op->stats.food = 999;
2662		2647
2663	/* create a bodypart-trophy to make the winner happy */	2648	/* create a bodypart-trophy to make the winner happy */
2664	if (object *tmp = arch_to_object (archetype::find ("finger")))	2649	if (object *tmp = arch_to_object (archetype::find ("finger")))
2665	{	2650	{
2666	sprintf (buf, "%s's finger", &op->name);	2651	tmp->name = format ("%s's finger" , &op->name);
2667	tmp->name = buf;	2652	tmp->name_pl = format ("%s's fingers", &op->name);
2668	sprintf (buf, " This finger has been cut off %s\n"	2653	tmp->msg = format (
2669	" the %s, when he was defeated at\n level %d by %s.\n",	2654	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2670	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2655	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2671	tmp->msg = buf;	2656	);
2672	tmp->value = 0, tmp->type = 0;	2657	tmp->value = 0, tmp->type = 0;
2673	tmp->materialname = "organics";	2658	tmp->materialname = "organics";
2674	tmp->insert_at (op, tmp);	2659	tmp->insert_at (op, tmp);
2675	}	2660	}
2676		2661
…		…
2683	INVOKE_PLAYER (DEATH, op->contr);	2668	INVOKE_PLAYER (DEATH, op->contr);
2684		2669
2685	command_kill_pets (op, 0);	2670	command_kill_pets (op, 0);
2686		2671
2687	if (op->stats.food < 0)	2672	if (op->stats.food < 0)
2688	{
2689	sprintf (buf, "%s starved to death.", &op->name);
2690	strcpy (op->contr->killer, "starvation");	2673	strcpy (op->contr->killer, "starvation");
2691	}
2692	else
2693	sprintf (buf, "%s died.", &op->name);
2694		2674
2695	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2675	op->contr->play_sound (sound_find ("player_dies"));
2696		2676
2697	/* save the map location for corpse, gravestone */	2677	/* save the map location for corpse, gravestone */
2698	x = op->x;	2678	x = op->x;
2699	y = op->y;	2679	y = op->y;
2700	map = op->map;	2680	map = op->map;
…		…
2863	{	2843	{
2864	tmp->destroy ();	2844	tmp->destroy ();
2865	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2845	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2866	}	2846	}
2867		2847
2868	cure_disease (op, 0); /* remove any disease */	2848	cure_disease (op, 0, 0); /* remove any disease */
2869		2849
2870	/*add_exp(op, (op->stats.exp * -0.20)); */	2850	/*add_exp(op, (op->stats.exp * -0.20)); */
2871	apply_death_exp_penalty (op);	2851	apply_death_exp_penalty (op);
2872	if (op->stats.food < 100)	2852	if (op->stats.food < 100)
2873	op->stats.food = 900;	2853	op->stats.food = 900;
…		…
2877		2857
2878	/*	2858	/*
2879	* Check to see if the player has any unpaid items. If so, remove them	2859	* Check to see if the player has any unpaid items. If so, remove them
2880	* and put them back in the map.	2860	* and put them back in the map.
2881	*/	2861	*/
2882	remove_unpaid_objects (op->inv, op);	2862	op->drop_unpaid_items ();
2883		2863
2884	/****************************************/	2864	/****************************************/
2885	/* */	2865	/* */
2886	/* Move player to his current respawn- */	2866	/* Move player to his current respawn- */
2887	/* position (usually last savebed) */	2867	/* position (usually last savebed) */
…		…
2946		2926
2947	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2927	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2948	{	2928	{
2949	if (tmp->nrof > 1)	2929	if (tmp->nrof > 1)
2950	{	2930	{
2951	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2931	tmp->decrease (rndm (1, tmp->nrof - 1));
2952	tmp2->destroy ();
2953	insert_ob_in_map (tmp, op->map, NULL, 0);	2932	insert_ob_in_map (tmp, op->map, NULL, 0);
2954	}	2933	}
2955	else	2934	else
2956	tmp->destroy ();	2935	tmp->destroy ();
2957	}	2936	}
…		…
2968	void	2947	void
2969	fix_weight (void)	2948	fix_weight (void)
2970	{	2949	{
2971	for_all_players (pl)	2950	for_all_players (pl)
2972	{	2951	{
2973	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2952	sint32 old = pl->ob->carrying;
2974		2953
2975	if (old == sum)	2954	pl->ob->update_weight ();
2976	continue;	2955
		2956	if (old != pl->ob->carrying)
		2957	{
2977	pl->ob->update_stats ();	2958	pl->ob->update_stats ();
2978	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2959	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2960	}
2979	}	2961	}
2980	}	2962	}
2981		2963
2982	void	2964	void
2983	fix_luck (void)	2965	fix_luck (void)
…		…
3027	void	3009	void
3028	make_visible (object *op)	3010	make_visible (object *op)
3029	{	3011	{
3030	op->hide = 0;	3012	op->hide = 0;
3031	op->invisible = 0;	3013	op->invisible = 0;
		3014
3032	if (op->type == PLAYER)	3015	if (op->type == PLAYER)
3033	{	3016	{
3034	op->contr->tmp_invis = 0;	3017	op->contr->tmp_invis = 0;
3035	op->contr->invis_race = 0;	3018	op->contr->invis_race = 0;
3036	}	3019	}
…		…
3039	}	3022	}
3040		3023
3041	int	3024	int
3042	is_true_undead (object *op)	3025	is_true_undead (object *op)
3043	{	3026	{
3044	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3027	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3045	return 1;	3028	return 1;
3046		3029
3047	return 0;	3030	return 0;
3048	}	3031	}
3049		3032
3050	/* look at the surrounding terrain to determine	3033	/* look at the surrounding terrain to determine
3051	* the hideability of this object. Positive levels	3034	* the hideability of this object. Positive levels
3052	* indicate greater hideability.	3035	* indicate greater hideability.
3053	*/	3036	*/
3054
3055	int	3037	int
3056	hideability (object *ob)	3038	hideability (object *ob)
3057	{	3039	{
3058	int i, level = 0, mflag;	3040	int i, level = 0, mflag;
3059	sint16 x, y;	3041	sint16 x, y;
…		…
3069	* as bad as carrying a light on a pitch dark map */	3051	* as bad as carrying a light on a pitch dark map */
3070	if (has_carried_lights (ob))	3052	if (has_carried_lights (ob))
3071	level = -(10 + (2 * ob->map->darkness));	3053	level = -(10 + (2 * ob->map->darkness));
3072		3054
3073	/* scan through all nearby squares for terrain to hide in */	3055	/* scan through all nearby squares for terrain to hide in */
3074	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3056	for (i = 0, x = ob->x, y = ob->y;
		3057	i <= SIZEOFFREE1;
		3058	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3075	{	3059	{
3076	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3060	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3077	if (mflag & P_OUT_OF_MAP)	3061	if (mflag & P_OUT_OF_MAP)
3078	{
3079	continue;	3062	continue;
3080	}	3063
3081	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3064	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3082	level += 2;	3065	level += 2;
3083	else /* open terrain! */	3066	else /* open terrain! */
3084	level -= 1;	3067	level -= 1;
3085	}	3068	}
…		…
3184	* object op. This function works fine for monsters,	3167	* object op. This function works fine for monsters,
3185	* but we dont worry if the object isnt the top one in	3168	* but we dont worry if the object isnt the top one in
3186	* a pile (say a coin under a table would return "viewable"	3169	* a pile (say a coin under a table would return "viewable"
3187	* by this routine). Another question, should we be	3170	* by this routine). Another question, should we be
3188	* concerned with the direction the player is looking	3171	* concerned with the direction the player is looking
3189	* in? Realistically, most of use cant see stuff behind	3172	* in? Realistically, most of us can't see stuff behind
3190	* our backs...on the other hand, does the "facing" direction	3173	* our backs...on the other hand, does the "facing" direction
3191	* imply the way your head, or body is facing? Its possible	3174	* imply the way your head, or body is facing? It's possible
3192	* for them to differ. Sigh, this fctn could get a bit more complex.	3175	* for them to differ. Sigh, this fctn could get a bit more complex.
3193	* -b.t.	3176	* -b.t.
3194	* This function is now map tiling safe.	3177	* This function is now map tiling safe.
3195	*/	3178	*/
3196
3197	int	3179	int
3198	player_can_view (object *pl, object *op)	3180	player_can_view (object *pl, object *op)
3199	{	3181	{
3200	rv_vector rv;	3182	rv_vector rv;
3201	int dx, dy;	3183	int dx, dy;
…		…
3213		3195
3214	get_rangevector (pl, op, &rv, 0x1);	3196	get_rangevector (pl, op, &rv, 0x1);
3215		3197
3216	/* starting with the 'head' part, lets loop	3198	/* starting with the 'head' part, lets loop
3217	* through the object and find if it has any	3199	* through the object and find if it has any
3218	* part that is in the los array but isnt on	3200	* part that is in the los array but isn't on
3219	* a blocked los square.	3201	* a blocked los square.
3220	* we use the archetype to figure out offsets.	3202	* we use the archetype to figure out offsets.
3221	*/	3203	*/
3222	while (op)	3204	while (op)
3223	{	3205	{
3224	dx = rv.distance_x + op->arch->clone.x;	3206	dx = rv.distance_x + op->arch->x;
3225	dy = rv.distance_y + op->arch->clone.y;	3207	dy = rv.distance_y + op->arch->y;
3226		3208
3227	/* only the viewable area the player sees is updated by LOS	3209	/* only the viewable area the player sees is updated by LOS
3228	* code, so we need to restrict ourselves to that range of values	3210	* code, so we need to restrict ourselves to that range of values
3229	* for any meaningful values.	3211	* for any meaningful values.
3230	*/	3212	*/
3231	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3213	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3232	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3214	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3233	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3215	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3234	return 1;	3216	return 1;
		3217
3235	op = op->more;	3218	op = op->more;
3236	}	3219	}
		3220
3237	return 0;	3221	return 0;
3238	}	3222	}
3239		3223
3240	/* routine for both players and monsters. We call this when	3224	/* routine for both players and monsters. We call this when
3241	* there is a possibility for our action distrubing our hiding	3225	* there is a possibility for our action distrubing our hiding
…		…
3244	* return 0.	3228	* return 0.
3245	*/	3229	*/
3246	int	3230	int
3247	action_makes_visible (object *op)	3231	action_makes_visible (object *op)
3248	{	3232	{
3249
3250	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3233	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3251	{	3234	{
3252	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3235	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3253	return 0;	3236	return 0;
3254		3237
…		…
3260	{	3243	{
3261	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3244	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3262	return 1;	3245	return 1;
3263	}	3246	}
3264	}	3247	}
		3248
3265	return 0;	3249	return 0;
3266	}	3250	}
3267		3251
3268	/* op_on_battleground - checks if the given object op (usually	3252	/* op_on_battleground - checks if the given object op (usually
3269	* a player) is standing on a valid battleground-tile,	3253	* a player) is standing on a valid battleground-tile,
…		…
3274	* Default is to do the same as before, so only people wanting to have different points need worry about this	3258	* Default is to do the same as before, so only people wanting to have different points need worry about this
3275	*/	3259	*/
3276	int	3260	int
3277	op_on_battleground (object *op, int *x, int *y)	3261	op_on_battleground (object *op, int *x, int *y)
3278	{	3262	{
3279	object *tmp;
3280
3281	/* A battleground-tile needs the following attributes to be valid:	3263	/* A battleground-tile needs the following attributes to be valid:
3282	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3264	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3283	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3265	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3284	* and the exit-coordinates sp/hp must both be > 0.	3266	* and the exit-coordinates sp/hp must both be > 0.
3285	* => The intention here is to prevent abuse of the battleground-	3267	* => The intention here is to prevent abuse of the battleground-
3286	* feature (like pickable or hidden battleground tiles). */	3268	* feature (like pickable or hidden battleground tiles). */
3287	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3269	for (object *tmp = op->below; tmp; tmp = tmp->below)
3288	{	3270	{
3289	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3271	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3290	{	3272	{
3291	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3273	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3292	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3274	&& tmp->type == BATTLEGROUND
		3275	&& tmp->name == shstr_battleground
		3276	&& EXIT_X (tmp) && EXIT_Y (tmp))
3293	{	3277	{
3294	/*before we assign the exit, check if this is a teambattle */	3278	/* before we assign the exit, check if this is a teambattle */
3295	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3279	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3296	{	3280	{
3297	object *invtmp;
3298
3299	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3281	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3300	{	3282	{
3301	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3283	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3302	{	3284	{
3303	if (x != NULL && y != NULL)	3285	if (x && y)
3304	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3286	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3287
3305	return 1;	3288	return 1;
3306	}	3289	}
3307	}	3290	}
3308	}	3291	}
		3292
3309	if (x != NULL && y != NULL)	3293	if (x && y)
3310	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3294	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3295
3311	return 1;	3296	return 1;
3312	}	3297	}
3313	}	3298	}
3314	}	3299	}
		3300
3315	/* If we got here, did not find a battleground */	3301	/* If we got here, did not find a battleground */
3316	return 0;	3302	return 0;
3317	}	3303	}
3318		3304
3319	/*	3305	/*
…		…
3335	char buf[MAX_BUF]; /* tmp. string buffer */	3321	char buf[MAX_BUF]; /* tmp. string buffer */
3336	int i = 0, j = 0;	3322	int i = 0, j = 0;
3337		3323
3338	/* get the appropriate treasurelist */	3324	/* get the appropriate treasurelist */
3339	if (atnr == ATNR_FIRE)	3325	if (atnr == ATNR_FIRE)
3340	trlist = treasurelist::find ("dragon_ability_fire");	3326	trlist = treasurelist::find (shstr_dragon_ability_fire);
3341	else if (atnr == ATNR_COLD)	3327	else if (atnr == ATNR_COLD)
3342	trlist = treasurelist::find ("dragon_ability_cold");	3328	trlist = treasurelist::find (shstr_dragon_ability_cold);
3343	else if (atnr == ATNR_ELECTRICITY)	3329	else if (atnr == ATNR_ELECTRICITY)
3344	trlist = treasurelist::find ("dragon_ability_elec");	3330	trlist = treasurelist::find (shstr_dragon_ability_elec);
3345	else if (atnr == ATNR_POISON)	3331	else if (atnr == ATNR_POISON)
3346	trlist = treasurelist::find ("dragon_ability_poison");	3332	trlist = treasurelist::find (shstr_dragon_ability_poison);
3347		3333
3348	if (trlist == NULL || who->type != PLAYER)	3334	if (trlist == NULL || who->type != PLAYER)
3349	return;	3335	return;
3350		3336
3351	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3337	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3355	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3341	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3356	return;	3342	return;
3357	}	3343	}
3358		3344
3359	/* everything seems okay - now bring on the gift: */	3345	/* everything seems okay - now bring on the gift: */
3360	item = &(tr->item->clone);	3346	item = tr->item;
3361		3347
3362	if (item->type == SPELL)	3348	if (item->type == SPELL)
3363	{	3349	{
3364	if (check_spell_known (who, item->name))	3350	if (check_spell_known (who, item->name))
3365	return;	3351	return;
…		…
3424	{	3410	{
3425	/* forces in the treasurelist can alter the player's stats */	3411	/* forces in the treasurelist can alter the player's stats */
3426	object *skin;	3412	object *skin;
3427		3413
3428	/* first get the dragon skin force */	3414	/* first get the dragon skin force */
3429	shstr_cmp dragon_skin_force ("dragon_skin_force");
3430	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3415	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3431	;	3416	;
3432		3417
3433	if (!skin)	3418	if (!skin)
3434	return;	3419	return;
3435		3420
…		…
3511	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3496	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3512	return 0;	3497	return 0;
3513		3498
3514	return 100 - blocked_los [x][y];	3499	return 100 - blocked_los [x][y];
3515	}	3500	}
		3501
		3502	void
		3503	player::infobox (const char *title, const char *msg, int color)
		3504	{
		3505	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3506	}
		3507
		3508	void
		3509	player::statusmsg (const char *msg, int color)
		3510	{
		3511	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3512	}
		3513
		3514	void
		3515	player::failmsg (const char *msg, int color)
		3516	{
		3517	play_sound (sound_find ("generic_failure"));
		3518	statusmsg (msg, color);
		3519	}
		3520

Diff Legend

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