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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.178 by root, Sat Jan 5 06:11:28 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program 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 2 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author 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->carrying = sum_weight (ob);
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 ();
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	}	326	}
289		327
290	void	328	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)	329	player::set_observe (object *op)
315	{	330	{
316	ob = op;	331	observe = op ? op : ob;
317	ob->contr = this; /* this aren't yet in archetype */	332	do_los = 1;
318
319	ob->speed = 1.0f;
320	ob->speed_left = 0.5f;
321
322	ob->direction = 5; /* So player faces south */
323	}	333	}
324		334
325	player::player ()	335	player::player ()
326	{	336	{
327	/* There are some elements we want initialised to non zero value -	337	/* There are some elements we want initialised to non zero value -
…		…
355	if (ob)	365	if (ob)
356	{	366	{
357	ob->destroy_inv (false);	367	ob->destroy_inv (false);
358	ob->destroy ();	368	ob->destroy ();
359	}	369	}
		370
		371	ob = observe = 0;
360	}	372	}
361		373
362	player::~player ()	374	player::~player ()
363	{	375	{
364	/* Clear item stack */	376	/* Clear item stack */
…		…
391	* Note: there MUST be at least one player archetype!	403	* Note: there MUST be at least one player archetype!
392	*/	404	*/
393	archetype *	405	archetype *
394	get_player_archetype (archetype *at)	406	get_player_archetype (archetype *at)
395	{	407	{
396	archetype *start = at;	408	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
397		409
398	for (;;)	410	for (;;)
399	{	411	{
400	if (at == NULL \|\| at->next == NULL)	412	if (++i == archetypes.end ())
401	at = first_archetype;	413	i = archetypes.begin ();
402	else	414	else if (*i == at)
403	at = at->next;	415	cleanup ("not a single player archetype found");
404		416
405	if (at->clone.type == PLAYER)	417	if ((*i)->type == PLAYER)
406	return at;	418	return *i;
407
408	if (at == start)
409	{
410	LOG (llevError, "No Player archetypes\n");
411	exit (-1);
412	}
413	}	419	}
414	}	420	}
415		421
416	object *	422	object *
417	get_nearest_player (object *mon)	423	get_nearest_player (object *mon)
…		…
421	unsigned lastdist;	427	unsigned lastdist;
422	rv_vector rv;	428	rv_vector rv;
423		429
424	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	430	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
425	{	431	{
426	/* We should not find free objects on this friendly list, but it
427	* does periodically happen. Given that, lets deal with it.
428	* While unlikely, it is possible the next object on the friendly
429	* list is also free, so encapsulate this in a while loop.
430	*/
431	while (QUERY_FLAG (ol->ob, FLAG_FREED) \|\| !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
432	{
433	object *tmp = ol->ob;
434
435	/* Can't do much more other than log the fact, because the object
436	* itself will have been cleared.
437	*/
438	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
439	tmp->debug_desc ());
440	ol = ol->next;
441	remove_friendly_object (tmp);
442	if (!ol)
443	return op;
444	}
445
446	/* Remove special check for player from this. First, it looks to cause
447	* some crashes (ol->ob->contr not set properly?), but secondly, a more
448	* complicated method of state checking would be needed in any case -
449	* as it was, a clever player could type quit, and the function would
450	* skip them over while waiting for confirmation. Remove
451	* on_same_map check, as can_detect_enemy also does this
452	*/
453	if (!can_detect_enemy (mon, ol->ob, &rv))	432	if (!can_detect_enemy (mon, ol->ob, &rv))
454	continue;	433	continue;
455		434
456	if (lastdist > rv.distance)	435	if (lastdist > rv.distance)
457	{	436	{
…		…
654	}	633	}
655		634
656	void	635	void
657	give_initial_items (object pl, treasurelist items)	636	give_initial_items (object pl, treasurelist items)
658	{	637	{
659	object op, next = NULL;
660
661	if (pl->randomitems != NULL)	638	if (pl->randomitems)
662	create_treasure (items, pl, GT_STARTEQUIP \| GT_ONLY_GOOD, 1, 0);	639	create_treasure (items, pl, GT_STARTEQUIP \| GT_ONLY_GOOD, 1, 0);
663		640
664	for (op = pl->inv; op; op = next)	641	for (object next, op = pl->inv; op; op = next)
665	{	642	{
666	next = op->below;	643	next = op->below;
667		644
668	/* Forces get applied per default, unless they have the	645	/* Forces get applied per default, unless they have the
669	* flag "neutral" set. Sorry but I can't think of a better way	646	* flag "neutral" set. Sorry but I can't think of a better way
…		…
711	if (op->nrof > 1)	688	if (op->nrof > 1)
712	op->nrof = 1;	689	op->nrof = 1;
713	}	690	}
714		691
715	if (op->type == SPELLBOOK && op->inv)	692	if (op->type == SPELLBOOK && op->inv)
716	{
717	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	693	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
718	}
719		694
720	/* Give starting characters identified, uncursed, and undamned	695	/* Give starting characters identified, uncursed, and undamned
721	* items. Just don't identify gold or silver, or it won't be	696	* items. Just don't identify gold or silver, or it won't be
722	* merged properly.	697	* merged properly.
723	*/	698	*/
…		…
853	static void	828	static void
854	start_info (object *op)	829	start_info (object *op)
855	{	830	{
856	char buf[MAX_BUF];	831	char buf[MAX_BUF];
857		832
858	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	833	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
859	new_draw_info (NDI_UNIQUE, 0, op, buf);	834	new_draw_info (NDI_UNIQUE, 0, op, buf);
860	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
861	//new_draw_info (NDI_UNIQUE, 0, op, " ");
862	}	835	}
863		836
864	/* This function takes the key that is passed, and does the	837	/* This function takes the key that is passed, and does the
865	* appropriate action with it (change race, or other things).	838	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	839	* The function name is for historical reasons - now we have
…		…
907	if (*first_map_ext_path)	880	if (*first_map_ext_path)
908	{	881	{
909	object *tmp;	882	object *tmp;
910	char mapname[MAX_BUF];	883	char mapname[MAX_BUF];
911		884
912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	885	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
913	tmp = object::create ();	886	tmp = object::create ();
914	EXIT_PATH (tmp) = mapname;	887	EXIT_PATH (tmp) = mapname;
915	EXIT_X (tmp) = ob->x;	888	EXIT_X (tmp) = ob->x;
916	EXIT_Y (tmp) = ob->y;	889	EXIT_Y (tmp) = ob->y;
917	ob->enter_exit (tmp); /* we don't really care if it succeeded;	890	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
936	int x = ob->x, y = ob->y;	909	int x = ob->x, y = ob->y;
937		910
938	ob->remove_statbonus ();	911	ob->remove_statbonus ();
939	ob->remove ();	912	ob->remove ();
940	ob->arch = get_player_archetype (ob->arch);	913	ob->arch = get_player_archetype (ob->arch);
941	ob->arch->clone.copy_to (ob);	914	ob->arch->copy_to (ob);
942	ob->instantiate ();	915	ob->instantiate ();
943	ob->stats = ob->contr->orig_stats;	916	ob->stats = ob->contr->orig_stats;
944	ob->name = ob->name_pl = name;	917	ob->name = ob->name_pl = name;
945	ob->x = x;	918	ob->x = x;
946	ob->y = y;	919	ob->y = y;
947	SET_ANIMATION (ob, 2); /* So player faces south */	920	SET_ANIMATION (ob, 2); /* So player faces south */
948	insert_ob_in_map (ob, ob->map, ob, 0);	921	insert_ob_in_map (ob, ob->map, ob, 0);
949	assign (ob->contr->title, ob->arch->clone.name);	922	assign (ob->contr->title, ob->arch->object::name);
950	ob->add_statbonus ();	923	ob->add_statbonus ();
951	}	924	}
952	while (!allowed_class (ob));	925	while (!allowed_class (ob));
953		926
954	update_object (ob, UP_OBJ_FACE);	927	update_object (ob, UP_OBJ_FACE);
…		…
1029	if (op->move_type & MOVE_FLYING)	1002	if (op->move_type & MOVE_FLYING)
1030	return 1;	1003	return 1;
1031		1004
1032	next = op->below;	1005	next = op->below;
1033		1006
		1007	int cnt = MAX_ITEM_PER_DROP;
		1008	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1009
1034	/* loop while there are items on the floor that are not marked as	1010	/* loop while there are items on the floor that are not marked as
1035	* destroyed */	1011	* destroyed */
1036	while (next && !next->destroyed ())	1012	while (next && !next->destroyed ())
1037	{	1013	{
1038	tmp = next;	1014	tmp = next;
1039	next = tmp->below;	1015	next = tmp->below;
1040		1016
		1017	if (cnt <= 0)
		1018	{
		1019	op->failmsg ("Couldn't pickup all items at once.");
		1020	return 0;
		1021	}
		1022
1041	if (op->destroyed ())	1023	if (op->destroyed ())
1042	return 0;	1024	return 0;
1043		1025
1044	if (!can_pick (op, tmp))	1026	if (!can_pick (op, tmp))
1045	continue;	1027	continue;
1046		1028
1047	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1029	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1048	{	1030	{
1049	if (item_matched_string (op, tmp, op->contr->search_str))	1031	if (item_matched_string (op, tmp, op->contr->search_str))
1050	pick_up (op, tmp);	1032	CHK_PICK_PICKUP;
1051	continue;	1033	continue;
1052	}	1034	}
1053		1035
1054	/* high not bit set? We're using the old autopickup model */	1036	/* high not bit set? We're using the old autopickup model */
1055	if (!(op->contr->mode & PU_NEWMODE))	1037	if (!(op->contr->mode & PU_NEWMODE))
…		…
1057	switch (op->contr->mode)	1039	switch (op->contr->mode)
1058	{	1040	{
1059	case 0:	1041	case 0:
1060	return 1; /* don't pick up */	1042	return 1; /* don't pick up */
1061	case 1:	1043	case 1:
1062	pick_up (op, tmp);	1044	CHK_PICK_PICKUP;
1063	return 1;	1045	return 1;
1064	case 2:	1046	case 2:
1065	pick_up (op, tmp);	1047	CHK_PICK_PICKUP;
1066	return 0;	1048	return 0;
1067	case 3:	1049	case 3:
1068	return 0; /* stop before pickup */	1050	return 0; /* stop before pickup */
1069	case 4:	1051	case 4:
1070	pick_up (op, tmp);	1052	CHK_PICK_PICKUP;
1071	break;	1053	break;
1072	case 5:	1054	case 5:
1073	pick_up (op, tmp);	1055	CHK_PICK_PICKUP;
1074	stop = 1;	1056	stop = 1;
1075	break;	1057	break;
1076	case 6:	1058	case 6:
1077	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1059	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1078	pick_up (op, tmp);	1060	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1061	CHK_PICK_PICKUP;
1079	break;	1062	break;
1080		1063
1081	case 7:	1064	case 7:
1082	if (tmp->type == MONEY \|\| tmp->type == GEM)	1065	if (tmp->type == MONEY \|\| tmp->type == GEM)
1083	pick_up (op, tmp);	1066	CHK_PICK_PICKUP;
1084	break;	1067	break;
1085		1068
1086	default:	1069	default:
1087	/* use value density */	1070	/* use value density */
1088	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1071	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1089	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1072	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1090	pick_up (op, tmp);	1073	CHK_PICK_PICKUP;
1091	}	1074	}
1092	}	1075	}
1093	else	1076	else
1094	{ /* old model */	1077	{ /* old model */
1095	/* NEW pickup handling */	1078	/* NEW pickup handling */
…		…
1099	if (tmp->name != NULL)	1082	if (tmp->name != NULL)
1100	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1083	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1101	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1084	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1102	else	1085	else
1103	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1086	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1104	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1087	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1105		1088
1106	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1089	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1107	}	1090	}
1108		1091
1109	/* philosophy:	1092	/* philosophy:
…		…
1150	/* all food and drink if desired */	1133	/* all food and drink if desired */
1151	/* question: don't pick up known-poisonous stuff? */	1134	/* question: don't pick up known-poisonous stuff? */
1152	if (op->contr->mode & PU_FOOD)	1135	if (op->contr->mode & PU_FOOD)
1153	if (tmp->type == FOOD)	1136	if (tmp->type == FOOD)
1154	{	1137	{
1155	pick_up (op, tmp);	1138	CHK_PICK_PICKUP;
1156	continue;	1139	continue;
1157	}	1140	}
1158		1141
1159	if (op->contr->mode & PU_DRINK)	1142	if (op->contr->mode & PU_DRINK)
1160	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1143	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1161	{	1144	{
1162	pick_up (op, tmp);	1145	CHK_PICK_PICKUP;
1163	continue;	1146	continue;
1164	}	1147	}
1165		1148
1166	if (op->contr->mode & PU_POTION)	1149	if (op->contr->mode & PU_POTION)
1167	if (tmp->type == POTION)	1150	if (tmp->type == POTION)
1168	{	1151	{
1169	pick_up (op, tmp);	1152	CHK_PICK_PICKUP;
1170	continue;	1153	continue;
1171	}	1154	}
1172		1155
1173	/* spellbooks, skillscrolls and normal books/scrolls */	1156	/* spellbooks, skillscrolls and normal books/scrolls */
1174	if (op->contr->mode & PU_SPELLBOOK)	1157	if (op->contr->mode & PU_SPELLBOOK)
1175	if (tmp->type == SPELLBOOK)	1158	if (tmp->type == SPELLBOOK)
1176	{	1159	{
1177	pick_up (op, tmp);	1160	CHK_PICK_PICKUP;
1178	continue;	1161	continue;
1179	}	1162	}
1180		1163
1181	if (op->contr->mode & PU_SKILLSCROLL)	1164	if (op->contr->mode & PU_SKILLSCROLL)
1182	if (tmp->type == SKILLSCROLL)	1165	if (tmp->type == SKILLSCROLL)
1183	{	1166	{
1184	pick_up (op, tmp);	1167	CHK_PICK_PICKUP;
1185	continue;	1168	continue;
1186	}	1169	}
1187		1170
1188	if (op->contr->mode & PU_READABLES)	1171	if (op->contr->mode & PU_READABLES)
1189	if (tmp->type == BOOK \|\| tmp->type == SCROLL)	1172	if (tmp->type == BOOK \|\| tmp->type == SCROLL \|\| tmp->type == INSCRIBABLE)
1190	{	1173	{
1191	pick_up (op, tmp);	1174	CHK_PICK_PICKUP;
1192	continue;	1175	continue;
1193	}	1176	}
1194		1177
1195	/* wands/staves/rods/horns */	1178	/* wands/staves/rods/horns */
1196	if (op->contr->mode & PU_MAGIC_DEVICE)	1179	if (op->contr->mode & PU_MAGIC_DEVICE)
1197	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	1180	if (tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)
1198	{	1181	{
1199	pick_up (op, tmp);	1182	CHK_PICK_PICKUP;
1200	continue;	1183	continue;
1201	}	1184	}
1202		1185
1203	/* pick up all magical items */	1186	/* pick up all magical items */
1204	if (op->contr->mode & PU_MAGICAL)	1187	if (op->contr->mode & PU_MAGICAL)
1205	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1188	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1206	{	1189	{
1207	pick_up (op, tmp);	1190	CHK_PICK_PICKUP;
1208	continue;	1191	continue;
1209	}	1192	}
1210		1193
1211	if (op->contr->mode & PU_VALUABLES)	1194	if (op->contr->mode & PU_VALUABLES)
1212	{	1195	{
1213	if (tmp->type == MONEY \|\| tmp->type == GEM)	1196	if (tmp->type == MONEY \|\| tmp->type == GEM)
1214	{	1197	{
1215	pick_up (op, tmp);	1198	CHK_PICK_PICKUP;
1216	continue;	1199	continue;
1217	}	1200	}
1218	}	1201	}
1219		1202
1220	/* rings & amulets - talismans seems to be typed AMULET */	1203	/* rings & amulets - talismans seems to be typed AMULET */
1221	if (op->contr->mode & PU_JEWELS)	1204	if (op->contr->mode & PU_JEWELS)
1222	if (tmp->type == RING \|\| tmp->type == AMULET)	1205	if (tmp->type == RING \|\| tmp->type == AMULET)
1223	{	1206	{
1224	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1225	continue;	1208	continue;
1226	}	1209	}
1227		1210
1228	/* we don't forget dragon food */	1211	/* we don't forget dragon food */
1229	if (op->contr->mode & PU_FLESH)	1212	if (op->contr->mode & PU_FLESH)
1230	if (tmp->type == FLESH)	1213	if (tmp->type == FLESH)
1231	{	1214	{
1232	pick_up (op, tmp);	1215	CHK_PICK_PICKUP;
1233	continue;	1216	continue;
1234	}	1217	}
1235		1218
1236	/* bows and arrows. Bows are good for selling! */	1219	/* bows and arrows. Bows are good for selling! */
1237	if (op->contr->mode & PU_BOW)	1220	if (op->contr->mode & PU_BOW)
1238	if (tmp->type == BOW)	1221	if (tmp->type == BOW)
1239	{	1222	{
1240	pick_up (op, tmp);	1223	CHK_PICK_PICKUP;
1241	continue;	1224	continue;
1242	}	1225	}
1243		1226
1244	if (op->contr->mode & PU_ARROW)	1227	if (op->contr->mode & PU_ARROW)
1245	if (tmp->type == ARROW)	1228	if (tmp->type == ARROW)
1246	{	1229	{
1247	pick_up (op, tmp);	1230	CHK_PICK_PICKUP;
1248	continue;	1231	continue;
1249	}	1232	}
1250		1233
1251	/* all kinds of armor etc. */	1234	/* all kinds of armor etc. */
1252	if (op->contr->mode & PU_ARMOUR)	1235	if (op->contr->mode & PU_ARMOUR)
1253	if (tmp->type == ARMOUR)	1236	if (tmp->type == ARMOUR)
1254	{	1237	{
1255	pick_up (op, tmp);	1238	CHK_PICK_PICKUP;
1256	continue;	1239	continue;
1257	}	1240	}
1258		1241
1259	if (op->contr->mode & PU_HELMET)	1242	if (op->contr->mode & PU_HELMET)
1260	if (tmp->type == HELMET)	1243	if (tmp->type == HELMET)
1261	{	1244	{
1262	pick_up (op, tmp);	1245	CHK_PICK_PICKUP;
1263	continue;	1246	continue;
1264	}	1247	}
1265		1248
1266	if (op->contr->mode & PU_SHIELD)	1249	if (op->contr->mode & PU_SHIELD)
1267	if (tmp->type == SHIELD)	1250	if (tmp->type == SHIELD)
1268	{	1251	{
1269	pick_up (op, tmp);	1252	CHK_PICK_PICKUP;
1270	continue;	1253	continue;
1271	}	1254	}
1272		1255
1273	if (op->contr->mode & PU_BOOTS)	1256	if (op->contr->mode & PU_BOOTS)
1274	if (tmp->type == BOOTS)	1257	if (tmp->type == BOOTS)
1275	{	1258	{
1276	pick_up (op, tmp);	1259	CHK_PICK_PICKUP;
1277	continue;	1260	continue;
1278	}	1261	}
1279		1262
1280	if (op->contr->mode & PU_GLOVES)	1263	if (op->contr->mode & PU_GLOVES)
1281	if (tmp->type == GLOVES)	1264	if (tmp->type == GLOVES)
1282	{	1265	{
1283	pick_up (op, tmp);	1266	CHK_PICK_PICKUP;
1284	continue;	1267	continue;
1285	}	1268	}
1286		1269
1287	if (op->contr->mode & PU_CLOAK)	1270	if (op->contr->mode & PU_CLOAK)
1288	if (tmp->type == CLOAK)	1271	if (tmp->type == CLOAK)
1289	{	1272	{
1290	pick_up (op, tmp);	1273	CHK_PICK_PICKUP;
1291	continue;	1274	continue;
1292	}	1275	}
1293		1276
1294	/* hoping to catch throwing daggers here */	1277	/* hoping to catch throwing daggers here */
1295	if (op->contr->mode & PU_MISSILEWEAPON)	1278	if (op->contr->mode & PU_MISSILEWEAPON)
1296	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1279	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1297	{	1280	{
1298	pick_up (op, tmp);	1281	CHK_PICK_PICKUP;
1299	continue;	1282	continue;
1300	}	1283	}
1301		1284
1302	/* careful: chairs and tables are weapons! */	1285	/* careful: chairs and tables are weapons! */
1303	if (op->contr->mode & PU_ALLWEAPON)	1286	if (op->contr->mode & PU_ALLWEAPON)
1304	{	1287	{
1305	if (tmp->type == WEAPON && tmp->name != NULL)	1288	if (tmp->type == WEAPON && tmp->name != NULL)
1306	{	1289	{
1307	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1290	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1308	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1291	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1309	{	1292	{
1310	pick_up (op, tmp);	1293	CHK_PICK_PICKUP;
1311	continue;	1294	continue;
1312	}	1295	}
1313	}	1296	}
1314		1297
1315	if (tmp->type == WEAPON && tmp->name == NULL)	1298	if (tmp->type == WEAPON && tmp->name == NULL)
1316	{	1299	{
1317	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1300	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1318	{	1301	{
1319	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1320	continue;	1303	continue;
1321	}	1304	}
1322	}	1305	}
1323	}	1306	}
1324		1307
1325	/* misc stuff that's useful */	1308	/* misc stuff that's useful */
1326	if (op->contr->mode & PU_KEY)	1309	if (op->contr->mode & PU_KEY)
1327	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)	1310	if (tmp->type == KEY \|\| tmp->type == SPECIAL_KEY)
1328	{	1311	{
1329	pick_up (op, tmp);	1312	CHK_PICK_PICKUP;
1330	continue;	1313	continue;
1331	}	1314	}
1332		1315
1333	/* any of the last 4 bits set means we use the ratio for value	1316	/* any of the last 4 bits set means we use the ratio for value
1334	* pickups */	1317	* pickups */
…		…
1339	/* >=7 is the old standard setting. Now we take the last 4 bits	1322	/* >=7 is the old standard setting. Now we take the last 4 bits
1340	* and multiply them by 5, giving 0..155== 5..75 /	1323	* and multiply them by 5, giving 0..155== 5..75 /
1341	wvratio = (op->contr->mode & PU_RATIO) * 5;	1324	wvratio = (op->contr->mode & PU_RATIO) * 5;
1342	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1325	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1343	{	1326	{
1344	pick_up (op, tmp);	1327	CHK_PICK_PICKUP;
1345	#if 0	1328	#if 0
1346	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1329	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1347	if (tmp->name != NULL)	1330	if (tmp->name != NULL)
1348	{	1331	{
1349	fprintf (stderr, "%s", tmp->name);	1332	fprintf (stderr, "%s", tmp->name);
1350	}	1333	}
1351	else	1334	else
1352	fprintf (stderr, "%s", tmp->arch->name);	1335	fprintf (stderr, "%s", tmp->arch->archname);
1353	fprintf (stderr, ",%d] = ", tmp->type);	1336	fprintf (stderr, ",%d] = ", tmp->type);
1354	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1337	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1355	#endif	1338	#endif
1356	continue;	1339	continue;
1357	}	1340	}
…		…
1368	* found object is returned.	1351	* found object is returned.
1369	*/	1352	*/
1370	object *	1353	object *
1371	find_arrow (object op, const char type)	1354	find_arrow (object op, const char type)
1372	{	1355	{
1373	object *tmp = 0;
1374
1375	for (op = op->inv; op; op = op->below)	1356	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1376	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1377	tmp = find_arrow (op, type);
1378	else if (op->type == ARROW && op->race == type)	1357	if (tmp->type == ARROW && !strcmp (tmp->race, type))
		1358	return splay (tmp);
		1359
		1360	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1361	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (tmp->race, type))
		1362	if (object *arrow = find_arrow (tmp, type))
		1363	{
		1364	splay (tmp);
1379	return op;	1365	return arrow;
		1366	}
1380		1367
1381	return tmp;	1368	return 0;
1382	}	1369	}
1383		1370
1384	/*	1371	/*
1385	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1372	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1386	* against the target. A full test is not performed, simply a basic test	1373	* against the target. A full test is not performed, simply a basic test
…		…
1427	else	1414	else
1428	{	1415	{
1429	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1416	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1430	{	1417	{
1431	attacktype = 1 << attacknum;	1418	attacktype = 1 << attacknum;
1432	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1419	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1433	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1420	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1434	{	1421	{
1435	tmp = arrow;	1422	tmp = arrow;
1436	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1423	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1437	}	1424	}
1438	}	1425	}
1439	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1426	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1440	{	1427	{
1441	tmp = arrow;	1428	tmp = arrow;
…		…
1679		1666
1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1667	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1681	arrow->move_type = MOVE_FLY_LOW;	1668	arrow->move_type = MOVE_FLY_LOW;
1682	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1669	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1683		1670
1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1671	op->play_sound (sound_find ("fire_arrow"));
1685	m->insert (arrow, sx, sy, op);	1672	m->insert (arrow, sx, sy, op);
1686		1673
1687	if (!arrow->destroyed ())	1674	if (!arrow->destroyed ())
1688	move_arrow (arrow);	1675	move_arrow (arrow);
1689		1676
…		…
1767		1754
1768	if (item->type == WAND)	1755	if (item->type == WAND)
1769	{	1756	{
1770	if (item->stats.food <= 0)	1757	if (item->stats.food <= 0)
1771	{	1758	{
1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1759	op->contr->play_sound (sound_find ("wand_poof"));
1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1760	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774		1761
1775	return;	1762	return;
1776	}	1763	}
1777	}	1764	}
1778	else if (item->type == ROD \|\| item->type == HORN)	1765	else if (item->type == ROD \|\| item->type == HORN)
1779	{	1766	{
1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1767	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1781	{	1768	{
1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1769	op->contr->play_sound (sound_find ("wand_poof"));
1783		1770
1784	if (item->type == ROD)	1771	if (item->type == ROD)
1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1772	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1786	else	1773	else
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1774	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1800	object *tmp;	1787	object *tmp;
1801		1788
1802	if (item->arch)	1789	if (item->arch)
1803	{	1790	{
1804	CLEAR_FLAG (item, FLAG_ANIMATE);	1791	CLEAR_FLAG (item, FLAG_ANIMATE);
1805	item->face = item->arch->clone.face;	1792	item->face = item->arch->face;
1806	item->set_speed (0);	1793	item->set_speed (0);
1807	}	1794	}
1808		1795
1809	if ((tmp = item->in_player ()))	1796	if ((tmp = item->in_player ()))
1810	esrv_update_item (UPD_ANIM, tmp, item);	1797	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1976	/* If we found a key, do some extra work */	1963	/* If we found a key, do some extra work */
1977	if (key)	1964	if (key)
1978	{	1965	{
1979	object *container = key->env;	1966	object *container = key->env;
1980		1967
1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982
1983	if (action_makes_visible (op))	1968	if (action_makes_visible (op))
1984	make_visible (op);	1969	make_visible (op);
1985		1970
1986	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1971	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1987	spring_trap (door->inv, op);	1972	spring_trap (door->inv, op);
1988		1973
1989	if (door->type == DOOR)	1974	if (door->type == DOOR)
1990	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1975	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1991	else if (door->type == LOCKED_DOOR)	1976	else if (door->type == LOCKED_DOOR)
1992	{	1977	{
1993	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1978	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1994	remove_door2 (door); /* remove door without violence ;-) */	1979	remove_door2 (door); /* remove door without violence ;-) */
1995	}	1980	}
1996		1981
1997	/* Do this after we print the message */	1982	/* Do this after we print the message */
1998	decrease_ob (key); /* Use up one of the keys */	1983	decrease_ob (key); /* Use up one of the keys */
…		…
2003	return 1; /* Nothing more to do below */	1988	return 1; /* Nothing more to do below */
2004	}	1989	}
2005	else if (door->type == LOCKED_DOOR)	1990	else if (door->type == LOCKED_DOOR)
2006	{	1991	{
2007	/* Might as well return now - no other way to open this */	1992	/* Might as well return now - no other way to open this */
2008	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	1993	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2009	return 1;	1994	return 1;
2010	}	1995	}
2011		1996
2012	return 0;	1997	return 0;
2013	}	1998	}
…		…
2100		2085
2101	if (op->speed_left > 0.f)	2086	if (op->speed_left > 0.f)
2102	{	2087	{
2103	--op->speed_left;	2088	--op->speed_left;
2104		2089
2105	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2090	op->play_sound (sound_find ("push_player"));
2106	push_ob (mon, dir, op);	2091	push_ob (mon, dir, op);
2107		2092
2108	if (op->contr->tmp_invis \|\| op->hide)	2093	if (op->contr->tmp_invis \|\| op->hide)
2109	make_visible (op);	2094	make_visible (op);
2110		2095
…		…
2129	{	2114	{
2130	--op->speed_left;	2115	--op->speed_left;
2131		2116
2132	if (!op->contr->braced)	2117	if (!op->contr->braced)
2133	{	2118	{
2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2119	op->play_sound (sound_find ("push_player"));
2135	push_ob (mon, dir, op);	2120	push_ob (mon, dir, op);
2136	}	2121	}
2137	else	2122	else
2138	new_draw_info (0, 0, op, "You withhold your attack");	2123	op->statusmsg ("You withhold your attack");
2139		2124
2140	if (op->contr->tmp_invis \|\| op->hide)	2125	if (op->contr->tmp_invis \|\| op->hide)
2141	make_visible (op);	2126	make_visible (op);
2142		2127
2143	return true;	2128	return true;
…		…
2282	return 0;	2267	return 0;
2283		2268
2284	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2269	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2285	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2270	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2286	{	2271	{
2287	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2272	op->play_sound (sound_find ("ob_evaporate"));
2288	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2273	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2289		2274
2290	if (op->contr)	2275	if (op->contr)
2291	esrv_del_item (op->contr, tmp->count);	2276	esrv_del_item (op->contr, tmp->count);
2292		2277
…		…
2312	/* This goes throws the inventory and removes unpaid objects, and puts them	2297	/* This goes throws the inventory and removes unpaid objects, and puts them
2313	* back in the map (location and map determined by values of env). This	2298	* back in the map (location and map determined by values of env). This
2314	* function will descend into containers. op is the object to start the search	2299	* function will descend into containers. op is the object to start the search
2315	* from.	2300	* from.
2316	*/	2301	*/
2317	void	2302	static void
2318	remove_unpaid_objects (object op, object env)	2303	drop_unpaid_items (object op, object env)
2319	{	2304	{
2320	while (op)	2305	while (op)
2321	{	2306	{
2322	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2307	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2323		2308
…		…
2327	esrv_del_item (env->contr, op->count);	2312	esrv_del_item (env->contr, op->count);
2328		2313
2329	op->insert_at (env);	2314	op->insert_at (env);
2330	}	2315	}
2331	else if (op->inv)	2316	else if (op->inv)
2332	remove_unpaid_objects (op->inv, env);	2317	drop_unpaid_items (op->inv, env);
2333		2318
2334	op = next;	2319	op = next;
2335	}	2320	}
		2321	}
		2322
		2323	void
		2324	object::drop_unpaid_items ()
		2325	{
		2326	if (!flag [FLAG_REMOVED])
		2327	::drop_unpaid_items (inv, this);
2336	}	2328	}
2337		2329
2338	/*	2330	/*
2339	* Returns pointer a static string containing gravestone text	2331	* Returns pointer a static string containing gravestone text
2340	* Moved from apply.c to player.c - player.c is what	2332	* Moved from apply.c to player.c - player.c is what
…		…
2435	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2427	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2436	else	2428	else
2437	{	2429	{
2438	gen_grace = op->stats.maxgrace;	2430	gen_grace = op->stats.maxgrace;
2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2431	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2440	}
2441
2442	/* Regenerate Spell Points */
2443	if (!op->contr->golem && --op->last_sp < 0)
2444	{
2445	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2446	if (op->stats.sp < op->stats.maxsp)
2447	{
2448	op->stats.sp++;
2449	/* dms do not consume food */
2450	if (!QUERY_FLAG (op, FLAG_WIZ))
2451	{
2452	op->stats.food--;
2453	if (op->contr->digestion < 0)
2454	op->stats.food += op->contr->digestion;
2455	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2456	op->stats.food = last_food;
2457	}
2458	}
2459
2460	if (max_sp > 1)
2461	{
2462	over_sp = (gen_sp + 10) / rate_sp;
2463	if (over_sp > 0)
2464	{
2465	if (op->stats.sp < op->stats.maxsp)
2466	{
2467	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2468
2469	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2470	op->stats.sp--;
2471
2472	if (op->stats.sp > op->stats.maxsp)
2473	op->stats.sp = op->stats.maxsp;
2474	}
2475	op->last_sp = 0;
2476	}
2477	else
2478	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2479	}
2480	else
2481	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2482	}	2432	}
2483		2433
2484	/* Regenerate Grace */	2434	/* Regenerate Grace */
2485	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2435	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2486	if (--op->last_grace < 0)	2436	if (--op->last_grace < 0)
…		…
2507	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2457	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2508	}	2458	}
2509	/* wearing stuff doesn't detract from grace generation. */	2459	/* wearing stuff doesn't detract from grace generation. */
2510	}	2460	}
2511		2461
		2462	if (op->stats.food > 0)
		2463	{
2512	/* Regenerate Hit Points */	2464	/* Regenerate Spell Points */
2513	if (--op->last_heal < 0)	2465	if (!op->contr->golem && --op->last_sp < 0)
2514	{
2515	if (op->stats.hp < op->stats.maxhp)
2516	{	2466	{
2517	op->stats.hp++;	2467	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2518	/* dms do not consume food */	2468
2519	if (!QUERY_FLAG (op, FLAG_WIZ))	2469	if (op->stats.sp < op->stats.maxsp)
2520	{	2470	{
		2471	op->stats.sp++;
		2472
		2473	/* dms do not consume food */
		2474	if (!QUERY_FLAG (op, FLAG_WIZ))
		2475	{
2521	op->stats.food--;	2476	op->stats.food--;
		2477
2522	if (op->contr->digestion < 0)	2478	if (op->contr->digestion < 0)
2523	op->stats.food += op->contr->digestion;	2479	op->stats.food += op->contr->digestion;
2524	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2480	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2525	op->stats.food = last_food;	2481	op->stats.food = last_food;
		2482	}
2526	}	2483	}
2527	}
2528		2484
2529	if (max_hp > 1)	2485	if (max_sp > 1)
2530	{
2531	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2532	if (over_hp > 0)
2533	{	2486	{
2534	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2487	over_sp = (gen_sp + 10) / rate_sp;
		2488	if (over_sp > 0)
		2489	{
		2490	if (op->stats.sp < op->stats.maxsp)
		2491	{
		2492	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2493
		2494	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2495	op->stats.sp--;
		2496
		2497	if (op->stats.sp > op->stats.maxsp)
		2498	op->stats.sp = op->stats.maxsp;
		2499	}
		2500
2535	op->last_heal = 0;	2501	op->last_sp = 0;
		2502	}
		2503	else
		2504	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2536	}	2505	}
2537	else	2506	else
		2507	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2508	}
		2509
		2510	/* Regenerate Hit Points */
		2511	if (--op->last_heal < 0)
		2512	{
		2513	if (op->stats.hp < op->stats.maxhp)
2538	{	2514	{
2539	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2515	op->stats.hp++;
		2516
		2517	/* dms do not consume food */
		2518	if (!QUERY_FLAG (op, FLAG_WIZ))
		2519	{
		2520	op->stats.food--;
		2521
		2522	if (op->contr->digestion < 0)
		2523	op->stats.food += op->contr->digestion;
		2524	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2525	op->stats.food = last_food;
		2526	}
2540	}	2527	}
		2528
		2529	if (max_hp > 1)
		2530	{
		2531	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2532
		2533	if (over_hp > 0)
		2534	{
		2535	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2536	op->last_heal = 0;
		2537	}
		2538	else
		2539	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2541	}	2540	}
2542	else	2541	else
2543	{
2544	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2542	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2545	}	2543	}
2546	}	2544	}
2547		2545
2548	/* Digestion */	2546	/* Digestion */
2549	if (--op->last_eat < 0)	2547	if (--op->last_eat < 0)
2550	{	2548	{
2551	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2549	int bonus = max (0, op->contr->digestion),
		2550	penalty = max (0, -op->contr->digestion);
2552		2551
2553	if (op->contr->gen_hp > 0)
2554	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2552	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2555	else
2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2557		2553
2558	/* dms do not consume food */	2554	/* dms do not consume food */
2559	if (!QUERY_FLAG (op, FLAG_WIZ))	2555	if (!QUERY_FLAG (op, FLAG_WIZ))
2560	op->stats.food--;	2556	op->stats.food--;
2561	}	2557	}
…		…
2588	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2584	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2589	manual_apply (op, flesh, 0);	2585	manual_apply (op, flesh, 0);
2590	}	2586	}
2591	}	2587	}
2592		2588
2593	while (op->stats.food < 0 && op->stats.hp >= 0)	2589	if (op->stats.food < 0)
2594	op->stats.food++, op->stats.hp--;	2590	{
		2591	op->stats.hp += op->stats.food;
		2592	op->stats.food = 0;
		2593	}
2595		2594
2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2595	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597	kill_player (op);	2596	kill_player (op);
2598	}	2597	}
2599	}	2598	}
…		…
2604	* file.	2603	* file.
2605	*/	2604	*/
2606	void	2605	void
2607	kill_player (object *op)	2606	kill_player (object *op)
2608	{	2607	{
		2608	int x, y;
2609	char buf[MAX_BUF];	2609	char buf[MAX_BUF];
2610	int x, y;
2611
2612	//int i;
2613	maptile map; / this is for resurrection */	2610	maptile map; / this is for resurrection */
2614
2615	/* int z;
2616	int num_stats_lose;
2617	int lost_a_stat;
2618	int lose_this_stat;
2619	int this_stat; */
2620	int will_kill_again;	2611	int will_kill_again;
2621	archetype *at;	2612	archetype *at;
2622	object *tmp;	2613	object *tmp;
2623		2614
2624	if (save_life (op))	2615	if (save_life (op))
2625	return;	2616	return;
2626
2627		2617
2628	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2618	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2629	* in cities ONLY!!! It is very important that this doesn't get abused.	2619	* in cities ONLY!!! It is very important that this doesn't get abused.
2630	* Look at op_on_battleground() for more info --AndreasV	2620	* Look at op_on_battleground() for more info --AndreasV
2631	*/	2621	*/
…		…
2647	{	2637	{
2648	tmp->destroy ();	2638	tmp->destroy ();
2649	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2639	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2650	}	2640	}
2651		2641
2652	cure_disease (op, 0); /* remove any disease */	2642	cure_disease (op, 0, 0); /* remove any disease */
2653	op->stats.hp = op->stats.maxhp;	2643	op->stats.hp = op->stats.maxhp;
2654	if (op->stats.food <= 0)	2644	if (op->stats.food <= 0)
2655	op->stats.food = 999;	2645	op->stats.food = 999;
2656		2646
2657	/* create a bodypart-trophy to make the winner happy */	2647	/* create a bodypart-trophy to make the winner happy */
2658	if (object *tmp = arch_to_object (archetype::find ("finger")))	2648	if (object *tmp = arch_to_object (archetype::find ("finger")))
2659	{	2649	{
2660	sprintf (buf, "%s's finger", &op->name);	2650	tmp->name = format ("%s's finger" , &op->name);
2661	tmp->name = buf;	2651	tmp->name_pl = format ("%s's fingers", &op->name);
2662	sprintf (buf, " This finger has been cut off %s\n"	2652	tmp->msg = format (
2663	" the %s, when he was defeated at\n level %d by %s.\n",	2653	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2664	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2654	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2665	tmp->msg = buf;	2655	);
2666	tmp->value = 0, tmp->type = 0;	2656	tmp->value = 0, tmp->type = 0;
2667	tmp->materialname = "organics";	2657	tmp->materialname = "organics";
2668	tmp->insert_at (op, tmp);	2658	tmp->insert_at (op, tmp);
2669	}	2659	}
2670		2660
…		…
2677	INVOKE_PLAYER (DEATH, op->contr);	2667	INVOKE_PLAYER (DEATH, op->contr);
2678		2668
2679	command_kill_pets (op, 0);	2669	command_kill_pets (op, 0);
2680		2670
2681	if (op->stats.food < 0)	2671	if (op->stats.food < 0)
2682	{
2683	sprintf (buf, "%s starved to death.", &op->name);
2684	strcpy (op->contr->killer, "starvation");	2672	strcpy (op->contr->killer, "starvation");
2685	}
2686	else
2687	sprintf (buf, "%s died.", &op->name);
2688		2673
2689	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2674	op->contr->play_sound (sound_find ("player_dies"));
2690		2675
2691	/* save the map location for corpse, gravestone */	2676	/* save the map location for corpse, gravestone */
2692	x = op->x;	2677	x = op->x;
2693	y = op->y;	2678	y = op->y;
2694	map = op->map;	2679	map = op->map;
…		…
2857	{	2842	{
2858	tmp->destroy ();	2843	tmp->destroy ();
2859	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2844	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2860	}	2845	}
2861		2846
2862	cure_disease (op, 0); /* remove any disease */	2847	cure_disease (op, 0, 0); /* remove any disease */
2863		2848
2864	/add_exp(op, (op->stats.exp -0.20)); */	2849	/add_exp(op, (op->stats.exp -0.20)); */
2865	apply_death_exp_penalty (op);	2850	apply_death_exp_penalty (op);
2866	if (op->stats.food < 100)	2851	if (op->stats.food < 100)
2867	op->stats.food = 900;	2852	op->stats.food = 900;
…		…
2871		2856
2872	/*	2857	/*
2873	* Check to see if the player has any unpaid items. If so, remove them	2858	* Check to see if the player has any unpaid items. If so, remove them
2874	* and put them back in the map.	2859	* and put them back in the map.
2875	*/	2860	*/
2876	remove_unpaid_objects (op->inv, op);	2861	op->drop_unpaid_items ();
2877		2862
2878	/****************************************/	2863	/****************************************/
2879	/* */	2864	/* */
2880	/* Move player to his current respawn- */	2865	/* Move player to his current respawn- */
2881	/* position (usually last savebed) */	2866	/* position (usually last savebed) */
…		…
3021	void	3006	void
3022	make_visible (object *op)	3007	make_visible (object *op)
3023	{	3008	{
3024	op->hide = 0;	3009	op->hide = 0;
3025	op->invisible = 0;	3010	op->invisible = 0;
		3011
3026	if (op->type == PLAYER)	3012	if (op->type == PLAYER)
3027	{	3013	{
3028	op->contr->tmp_invis = 0;	3014	op->contr->tmp_invis = 0;
3029	op->contr->invis_race = 0;	3015	op->contr->invis_race = 0;
3030	}	3016	}
…		…
3033	}	3019	}
3034		3020
3035	int	3021	int
3036	is_true_undead (object *op)	3022	is_true_undead (object *op)
3037	{	3023	{
3038	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3024	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3039	return 1;	3025	return 1;
3040		3026
3041	return 0;	3027	return 0;
3042	}	3028	}
3043		3029
3044	/* look at the surrounding terrain to determine	3030	/* look at the surrounding terrain to determine
3045	* the hideability of this object. Positive levels	3031	* the hideability of this object. Positive levels
3046	* indicate greater hideability.	3032	* indicate greater hideability.
3047	*/	3033	*/
3048
3049	int	3034	int
3050	hideability (object *ob)	3035	hideability (object *ob)
3051	{	3036	{
3052	int i, level = 0, mflag;	3037	int i, level = 0, mflag;
3053	sint16 x, y;	3038	sint16 x, y;
…		…
3178	* object op. This function works fine for monsters,	3163	* object op. This function works fine for monsters,
3179	* but we dont worry if the object isnt the top one in	3164	* but we dont worry if the object isnt the top one in
3180	* a pile (say a coin under a table would return "viewable"	3165	* a pile (say a coin under a table would return "viewable"
3181	* by this routine). Another question, should we be	3166	* by this routine). Another question, should we be
3182	* concerned with the direction the player is looking	3167	* concerned with the direction the player is looking
3183	* in? Realistically, most of use cant see stuff behind	3168	* in? Realistically, most of us can't see stuff behind
3184	* our backs...on the other hand, does the "facing" direction	3169	* our backs...on the other hand, does the "facing" direction
3185	* imply the way your head, or body is facing? Its possible	3170	* imply the way your head, or body is facing? It's possible
3186	* for them to differ. Sigh, this fctn could get a bit more complex.	3171	* for them to differ. Sigh, this fctn could get a bit more complex.
3187	* -b.t.	3172	* -b.t.
3188	* This function is now map tiling safe.	3173	* This function is now map tiling safe.
3189	*/	3174	*/
3190
3191	int	3175	int
3192	player_can_view (object pl, object op)	3176	player_can_view (object pl, object op)
3193	{	3177	{
3194	rv_vector rv;	3178	rv_vector rv;
3195	int dx, dy;	3179	int dx, dy;
…		…
3207		3191
3208	get_rangevector (pl, op, &rv, 0x1);	3192	get_rangevector (pl, op, &rv, 0x1);
3209		3193
3210	/* starting with the 'head' part, lets loop	3194	/* starting with the 'head' part, lets loop
3211	* through the object and find if it has any	3195	* through the object and find if it has any
3212	* part that is in the los array but isnt on	3196	* part that is in the los array but isn't on
3213	* a blocked los square.	3197	* a blocked los square.
3214	* we use the archetype to figure out offsets.	3198	* we use the archetype to figure out offsets.
3215	*/	3199	*/
3216	while (op)	3200	while (op)
3217	{	3201	{
3218	dx = rv.distance_x + op->arch->clone.x;	3202	dx = rv.distance_x + op->arch->x;
3219	dy = rv.distance_y + op->arch->clone.y;	3203	dy = rv.distance_y + op->arch->y;
3220		3204
3221	/* only the viewable area the player sees is updated by LOS	3205	/* only the viewable area the player sees is updated by LOS
3222	* code, so we need to restrict ourselves to that range of values	3206	* code, so we need to restrict ourselves to that range of values
3223	* for any meaningful values.	3207	* for any meaningful values.
3224	*/	3208	*/
3225	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3209	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3226	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3210	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3227	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3211	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3228	return 1;	3212	return 1;
		3213
3229	op = op->more;	3214	op = op->more;
3230	}	3215	}
		3216
3231	return 0;	3217	return 0;
3232	}	3218	}
3233		3219
3234	/* routine for both players and monsters. We call this when	3220	/* routine for both players and monsters. We call this when
3235	* there is a possibility for our action distrubing our hiding	3221	* there is a possibility for our action distrubing our hiding
…		…
3238	* return 0.	3224	* return 0.
3239	*/	3225	*/
3240	int	3226	int
3241	action_makes_visible (object *op)	3227	action_makes_visible (object *op)
3242	{	3228	{
3243
3244	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3229	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3245	{	3230	{
3246	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3231	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3247	return 0;	3232	return 0;
3248		3233
…		…
3254	{	3239	{
3255	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3240	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3256	return 1;	3241	return 1;
3257	}	3242	}
3258	}	3243	}
		3244
3259	return 0;	3245	return 0;
3260	}	3246	}
3261		3247
3262	/* op_on_battleground - checks if the given object op (usually	3248	/* op_on_battleground - checks if the given object op (usually
3263	* a player) is standing on a valid battleground-tile,	3249	* a player) is standing on a valid battleground-tile,
…		…
3268	* Default is to do the same as before, so only people wanting to have different points need worry about this	3254	* Default is to do the same as before, so only people wanting to have different points need worry about this
3269	*/	3255	*/
3270	int	3256	int
3271	op_on_battleground (object op, int x, int *y)	3257	op_on_battleground (object op, int x, int *y)
3272	{	3258	{
3273	object *tmp;
3274
3275	/* A battleground-tile needs the following attributes to be valid:	3259	/* A battleground-tile needs the following attributes to be valid:
3276	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3260	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3277	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3261	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3278	* and the exit-coordinates sp/hp must both be > 0.	3262	* and the exit-coordinates sp/hp must both be > 0.
3279	* => The intention here is to prevent abuse of the battleground-	3263	* => The intention here is to prevent abuse of the battleground-
3280	* feature (like pickable or hidden battleground tiles). */	3264	* feature (like pickable or hidden battleground tiles). */
3281	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3265	for (object *tmp = op->below; tmp; tmp = tmp->below)
3282	{	3266	{
3283	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3267	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3284	{	3268	{
3285	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3269	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3286	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3270	&& tmp->type == BATTLEGROUND
		3271	&& tmp->name == shstr_battleground
		3272	&& EXIT_X (tmp) && EXIT_Y (tmp))
3287	{	3273	{
3288	/before we assign the exit, check if this is a teambattle /	3274	/* before we assign the exit, check if this is a teambattle */
3289	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3275	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3290	{	3276	{
3291	object *invtmp;
3292
3293	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3277	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3294	{	3278	{
3295	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3279	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3296	{	3280	{
3297	if (x != NULL && y != NULL)	3281	if (x && y)
3298	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);	3282	x = EXIT_ALT_X (tmp), y = EXIT_ALT_Y (tmp);
		3283
3299	return 1;	3284	return 1;
3300	}	3285	}
3301	}	3286	}
3302	}	3287	}
		3288
3303	if (x != NULL && y != NULL)	3289	if (x && y)
3304	x = EXIT_X (tmp), y = EXIT_Y (tmp);	3290	x = EXIT_X (tmp), y = EXIT_Y (tmp);
		3291
3305	return 1;	3292	return 1;
3306	}	3293	}
3307	}	3294	}
3308	}	3295	}
		3296
3309	/* If we got here, did not find a battleground */	3297	/* If we got here, did not find a battleground */
3310	return 0;	3298	return 0;
3311	}	3299	}
3312		3300
3313	/*	3301	/*
…		…
3329	char buf[MAX_BUF]; /* tmp. string buffer */	3317	char buf[MAX_BUF]; /* tmp. string buffer */
3330	int i = 0, j = 0;	3318	int i = 0, j = 0;
3331		3319
3332	/* get the appropriate treasurelist */	3320	/* get the appropriate treasurelist */
3333	if (atnr == ATNR_FIRE)	3321	if (atnr == ATNR_FIRE)
3334	trlist = treasurelist::find ("dragon_ability_fire");	3322	trlist = treasurelist::find (shstr_dragon_ability_fire);
3335	else if (atnr == ATNR_COLD)	3323	else if (atnr == ATNR_COLD)
3336	trlist = treasurelist::find ("dragon_ability_cold");	3324	trlist = treasurelist::find (shstr_dragon_ability_cold);
3337	else if (atnr == ATNR_ELECTRICITY)	3325	else if (atnr == ATNR_ELECTRICITY)
3338	trlist = treasurelist::find ("dragon_ability_elec");	3326	trlist = treasurelist::find (shstr_dragon_ability_elec);
3339	else if (atnr == ATNR_POISON)	3327	else if (atnr == ATNR_POISON)
3340	trlist = treasurelist::find ("dragon_ability_poison");	3328	trlist = treasurelist::find (shstr_dragon_ability_poison);
3341		3329
3342	if (trlist == NULL \|\| who->type != PLAYER)	3330	if (trlist == NULL \|\| who->type != PLAYER)
3343	return;	3331	return;
3344		3332
3345	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3333	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3349	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3337	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3350	return;	3338	return;
3351	}	3339	}
3352		3340
3353	/* everything seems okay - now bring on the gift: */	3341	/* everything seems okay - now bring on the gift: */
3354	item = &(tr->item->clone);	3342	item = tr->item;
3355		3343
3356	if (item->type == SPELL)	3344	if (item->type == SPELL)
3357	{	3345	{
3358	if (check_spell_known (who, item->name))	3346	if (check_spell_known (who, item->name))
3359	return;	3347	return;
…		…
3418	{	3406	{
3419	/* forces in the treasurelist can alter the player's stats */	3407	/* forces in the treasurelist can alter the player's stats */
3420	object *skin;	3408	object *skin;
3421		3409
3422	/* first get the dragon skin force */	3410	/* first get the dragon skin force */
3423	shstr_cmp dragon_skin_force ("dragon_skin_force");
3424	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3411	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3425	;	3412	;
3426		3413
3427	if (!skin)	3414	if (!skin)
3428	return;	3415	return;
3429		3416
…		…
3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))	3492	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
3506	return 0;	3493	return 0;
3507		3494
3508	return 100 - blocked_los [x][y];	3495	return 100 - blocked_los [x][y];
3509	}	3496	}
		3497
		3498	void
		3499	player::infobox (const char title, const char msg, int color)
		3500	{
		3501	send_msg (color \| NDI_DEF \| NDI_REPLY \| NDI_CLEAR, title, msg);
		3502	}
		3503
		3504	void
		3505	player::statusmsg (const char *msg, int color)
		3506	{
		3507	send_msg (color \| NDI_REPLY, INFO_CHANNEL, msg);
		3508	}
		3509
		3510	void
		3511	player::failmsg (const char *msg, int color)
		3512	{
		3513	play_sound (sound_find ("generic_failure"));
		3514	statusmsg (msg, color);
		3515	}
		3516

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC vs. Revision 1.178 by root, Sat Jan 5 06:11:28 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC vs.
Revision 1.178 by root, Sat Jan 5 06:11:28 2008 UTC