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.133 by root, Sat May 12 22:04:20 2007 UTC vs.
Revision 1.182 by root, Thu Apr 17 14:06:03 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>
…		…
157	op->x = -1;	156	op->x = -1;
158	op->y = -1;	157	op->y = -1;
159	}	158	}
160		159
161	void	160	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	161	player::activate ()
176	{	162	{
177	if (active)	163	if (active)
178	return;	164	return;
179		165
…		…
181	ob->remove ();	167	ob->remove ();
182	ob->map = 0;	168	ob->map = 0;
183	ob->activate_recursive ();	169	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	171	add_friendly_object (ob);
186	enter_map ();
187	}	172	}
188		173
189	void	174	void
190	player::deactivate ()	175	player::deactivate ()
191	{	176	{
…		…
198		183
199	if (ob->map)	184	if (ob->map)
200	maplevel = ob->map->path;	185	maplevel = ob->map->path;
201		186
202	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
203	ob->map = 0;	189	ob->map = 0;
204	party = 0;	190	party = 0;
205		191
206	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
207		193
…		…
221	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
222		208
223	ns->update_look = 0;	209	ns->update_look = 0;
224	ns->look_position = 0;	210	ns->look_position = 0;
225		211
226	clear_los (ob);	212	clear_los (this);
227		213
228	ns->reset_stats ();	214	ns->reset_stats ();
229		215
230	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
233		219
234	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
235	link_player_skills (ob);	221	link_player_skills (ob);
236		222
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		224
239	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
240		226
241	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
243	{	229	{
244	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
245		231
246	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
252	abil = tmp;	235	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
254	skin = tmp;	237	skin = tmp;
255		238
256	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
257	}	240	}
258		241
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		243
261	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 */
		300
		301	ob->flag [FLAG_READY_WEAPON] = false;
		302	ob->flag [FLAG_READY_SKILL] = false;
		303	ob->flag [FLAG_READY_BOW] = false;
262		304
263	for (object *op = ob->inv; op; op = op->below)	305	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	306	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	307	switch (op->type)
266	{	308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
267	case WAND:	313	case WAND:
268	case ROD:	314	case ROD:
269	case HORN:	315	case HORN:
270	case BOW:	316	case BOW:
271	case SKILL:	317	ranged_ob = op;
272	case SKILL_TOOL:	318	break;
		319
273	case WEAPON:	320	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	321	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	322	break;
277	}	323	}
278		324
279	ob->update_stats ();	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
280	ns->floorbox_update ();	326	ob->deactivate (); // change_Weapon activates, fix this better
281
282	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);
284
285	activate ();
286
287	send_rules (ob);
288	send_news (ob);
289	display_motd (ob);
290
291	INVOKE_PLAYER (CONNECT, this);
292	INVOKE_PLAYER (LOGIN, this);
293	}	327	}
294		328
295	void	329	void
296	player::disconnect ()
297	{
298	if (ns)
299	{
300	if (active)
301	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303	INVOKE_PLAYER (DISCONNECT, this);
304
305	ns->reset_stats ();
306	ns->pl = 0;
307	ns = 0;
308	}
309
310	if (ob)
311	ob->close_container (); //TODO: client-specific
312
313	deactivate ();
314	}
315
316	// the need for this function can be explained
317	// by load_object not returning the object
318	void
319	player::set_object (object *op)	330	player::set_observe (object *op)
320	{	331	{
321	ob = op;	332	observe = op ? op : ob;
322	ob->contr = this; /* this aren't yet in archetype */	333	do_los = 1;
323
324	ob->speed_left = 0.5f;
325	ob->speed = 1.0f;
326	ob->direction = 5; /* So player faces south */
327	}	334	}
328		335
329	player::player ()	336	player::player ()
330	{	337	{
331	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	349	petmode = pet_normal;
343	listening = 10;	350	listening = 10;
344	usekeys = containers;	351	usekeys = containers;
345	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
346	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
347	}	357	}
348		358
349	void	359	void
350	player::do_destroy ()	360	player::do_destroy ()
351	{	361	{
…		…
356	if (ob)	366	if (ob)
357	{	367	{
358	ob->destroy_inv (false);	368	ob->destroy_inv (false);
359	ob->destroy ();	369	ob->destroy ();
360	}	370	}
		371
		372	ob = observe = 0;
361	}	373	}
362		374
363	player::~player ()	375	player::~player ()
364	{	376	{
365	/* Clear item stack */	377	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
393	*/	405	*/
394	archetype *	406	archetype *
395	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
396	{	408	{
397	archetype *start = at;	409	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
398		410
399	for (;;)	411	for (;;)
400	{	412	{
401	if (at == NULL || at->next == NULL)	413	if (++i == archetypes.end ())
402	at = first_archetype;	414	i = archetypes.begin ();
403	else	415	else if (*i == at)
404	at = at->next;	416	cleanup ("not a single player archetype found");
405		417
406	if (at->clone.type == PLAYER)	418	if ((*i)->type == PLAYER)
407	return at;	419	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	420	}
415	}	421	}
416		422
417	object *	423	object *
418	get_nearest_player (object *mon)	424	get_nearest_player (object *mon)
…		…
422	unsigned lastdist;	428	unsigned lastdist;
423	rv_vector rv;	429	rv_vector rv;
424		430
425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	431	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	432	{
427	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.
431	*/
432	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433	{
434	object *tmp = ol->ob;
435
436	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.
438	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440	tmp->debug_desc ());
441	ol = ol->next;
442	remove_friendly_object (tmp);
443	if (!ol)
444	return op;
445	}
446
447	/* Remove special check for player from this. First, it looks to cause
448	* some crashes (ol->ob->contr not set properly?), but secondly, a more
449	* complicated method of state checking would be needed in any case -
450	* as it was, a clever player could type quit, and the function would
451	* skip them over while waiting for confirmation. Remove
452	* on_same_map check, as can_detect_enemy also does this
453	*/
454	if (!can_detect_enemy (mon, ol->ob, &rv))	433	if (!can_detect_enemy (mon, ol->ob, &rv))
455	continue;	434	continue;
456		435
457	if (lastdist > rv.distance)	436	if (lastdist > rv.distance)
458	{	437	{
…		…
653		632
654	return firstdir;	633	return firstdir;
655	}	634	}
656		635
657	void	636	void
658	give_initial_items (object *pl, treasurelist * items)	637	give_initial_items (object *pl, treasurelist *items)
659	{	638	{
660	object *op, *next = NULL;
661
662	if (pl->randomitems != NULL)	639	if (pl->randomitems)
663	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	640	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664		641
665	for (op = pl->inv; op; op = next)	642	for (object *next, *op = pl->inv; op; op = next)
666	{	643	{
667	next = op->below;	644	next = op->below;
668		645
669	/* Forces get applied per default, unless they have the	646	/* Forces get applied per default, unless they have the
670	* flag "neutral" set. Sorry but I can't think of a better way	647	* flag "neutral" set. Sorry but I can't think of a better way
…		…
675	/* we never give weapons/armour if these cannot be used	652	/* we never give weapons/armour if these cannot be used
676	* by this player due to race restrictions	653	* by this player due to race restrictions
677	*/	654	*/
678	if (pl->type == PLAYER)	655	if (pl->type == PLAYER)
679	{	656	{
680	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	657	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		658	&&
681	(op->type == ARMOUR || op->type == BOOTS ||	659	(op->type == ARMOUR || op->type == BOOTS
682	op->type == CLOAK || op->type == HELMET ||	660	|| op->type == CLOAK || op->type == HELMET
683	op->type == SHIELD || op->type == GLOVES ||	661	|| op->type == SHIELD || op->type == GLOVES
		662	|| op->type == BRACERS || op->type == GIRDLE))
684	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	663	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
685	{	664	{
686	op->destroy ();	665	op->destroy ();
687	continue;	666	continue;
688	}	667	}
689	}	668	}
…		…
712	if (op->nrof > 1)	691	if (op->nrof > 1)
713	op->nrof = 1;	692	op->nrof = 1;
714	}	693	}
715		694
716	if (op->type == SPELLBOOK && op->inv)	695	if (op->type == SPELLBOOK && op->inv)
717	{
718	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	696	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719	}
720		697
721	/* Give starting characters identified, uncursed, and undamned	698	/* Give starting characters identified, uncursed, and undamned
722	* items. Just don't identify gold or silver, or it won't be	699	* items. Just don't identify gold or silver, or it won't be
723	* merged properly.	700	* merged properly.
724	*/	701	*/
725	if (need_identify (op))	702	if (need_identify (op))
726	{	703	{
727	SET_FLAG (op, FLAG_IDENTIFIED);	704	SET_FLAG (op, FLAG_IDENTIFIED);
728	CLEAR_FLAG (op, FLAG_CURSED);	705	CLEAR_FLAG (op, FLAG_CURSED);
729	CLEAR_FLAG (op, FLAG_DAMNED);	706	CLEAR_FLAG (op, FLAG_DAMNED);
730	}	707	}
		708
731	if (op->type == SPELL)	709	if (op->type == SPELL)
732	{	710	{
733	op->destroy ();	711	op->destroy ();
734	continue;	712	continue;
735	}	713	}
…		…
737	{	715	{
738	SET_FLAG (op, FLAG_CAN_USE_SKILL);	716	SET_FLAG (op, FLAG_CAN_USE_SKILL);
739	op->stats.exp = 0;	717	op->stats.exp = 0;
740	op->level = 1;	718	op->level = 1;
741	}	719	}
742	/* lock all 'normal items by default */	720	else /* lock all 'normal items by default */
743	else
744	SET_FLAG (op, FLAG_INV_LOCKED);	721	SET_FLAG (op, FLAG_INV_LOCKED);
745	} /* for loop of objects in player inv */	722	} /* for loop of objects in player inv */
746		723
747	/* Need to set up the skill pointers */	724	/* Need to set up the skill pointers */
748	link_player_skills (pl);	725	link_player_skills (pl);
…		…
854	static void	831	static void
855	start_info (object *op)	832	start_info (object *op)
856	{	833	{
857	char buf[MAX_BUF];	834	char buf[MAX_BUF];
858		835
859	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	836	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860	new_draw_info (NDI_UNIQUE, 0, op, buf);	837	new_draw_info (NDI_UNIQUE, 0, op, buf);
861	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862	//new_draw_info (NDI_UNIQUE, 0, op, " ");
863	}	838	}
864		839
865	/* This function takes the key that is passed, and does the	840	/* This function takes the key that is passed, and does the
866	* appropriate action with it (change race, or other things).	841	* appropriate action with it (change race, or other things).
867	* The function name is for historical reasons - now we have	842	* The function name is for historical reasons - now we have
…		…
908	if (*first_map_ext_path)	883	if (*first_map_ext_path)
909	{	884	{
910	object *tmp;	885	object *tmp;
911	char mapname[MAX_BUF];	886	char mapname[MAX_BUF];
912		887
913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	888	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
914	tmp = object::create ();	889	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;	890	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;	891	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;	892	EXIT_Y (tmp) = ob->y;
918	ob->enter_exit (tmp); /* we don't really care if it succeeded;	893	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
937	int x = ob->x, y = ob->y;	912	int x = ob->x, y = ob->y;
938		913
939	ob->remove_statbonus ();	914	ob->remove_statbonus ();
940	ob->remove ();	915	ob->remove ();
941	ob->arch = get_player_archetype (ob->arch);	916	ob->arch = get_player_archetype (ob->arch);
942	ob->arch->clone.copy_to (ob);	917	ob->arch->copy_to (ob);
943	ob->instantiate ();	918	ob->instantiate ();
944	ob->stats = ob->contr->orig_stats;	919	ob->stats = ob->contr->orig_stats;
945	ob->name = ob->name_pl = name;	920	ob->name = ob->name_pl = name;
946	ob->x = x;	921	ob->x = x;
947	ob->y = y;	922	ob->y = y;
948	SET_ANIMATION (ob, 2); /* So player faces south */	923	SET_ANIMATION (ob, 2); /* So player faces south */
949	insert_ob_in_map (ob, ob->map, ob, 0);	924	insert_ob_in_map (ob, ob->map, ob, 0);
950	assign (ob->contr->title, ob->arch->clone.name);	925	assign (ob->contr->title, ob->arch->object::name);
951	ob->add_statbonus ();	926	ob->add_statbonus ();
952	}	927	}
953	while (!allowed_class (ob));	928	while (!allowed_class (ob));
954		929
955	update_object (ob, UP_OBJ_FACE);	930	update_object (ob, UP_OBJ_FACE);
…		…
1030	if (op->move_type & MOVE_FLYING)	1005	if (op->move_type & MOVE_FLYING)
1031	return 1;	1006	return 1;
1032		1007
1033	next = op->below;	1008	next = op->below;
1034		1009
		1010	int cnt = MAX_ITEM_PER_DROP;
		1011	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1012
1035	/* loop while there are items on the floor that are not marked as	1013	/* loop while there are items on the floor that are not marked as
1036	* destroyed */	1014	* destroyed */
1037	while (next && !next->destroyed ())	1015	while (next && !next->destroyed ())
1038	{	1016	{
1039	tmp = next;	1017	tmp = next;
1040	next = tmp->below;	1018	next = tmp->below;
1041		1019
		1020	if (cnt <= 0)
		1021	{
		1022	op->failmsg ("Couldn't pickup all items at once.");
		1023	return 0;
		1024	}
		1025
1042	if (op->destroyed ())	1026	if (op->destroyed ())
1043	return 0;	1027	return 0;
1044		1028
1045	if (!can_pick (op, tmp))	1029	if (!can_pick (op, tmp))
1046	continue;	1030	continue;
1047		1031
1048	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1032	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049	{	1033	{
1050	if (item_matched_string (op, tmp, op->contr->search_str))	1034	if (item_matched_string (op, tmp, op->contr->search_str))
1051	pick_up (op, tmp);	1035	CHK_PICK_PICKUP;
1052	continue;	1036	continue;
1053	}	1037	}
1054		1038
1055	/* high not bit set? We're using the old autopickup model */	1039	/* high not bit set? We're using the old autopickup model */
1056	if (!(op->contr->mode & PU_NEWMODE))	1040	if (!(op->contr->mode & PU_NEWMODE))
…		…
1058	switch (op->contr->mode)	1042	switch (op->contr->mode)
1059	{	1043	{
1060	case 0:	1044	case 0:
1061	return 1; /* don't pick up */	1045	return 1; /* don't pick up */
1062	case 1:	1046	case 1:
1063	pick_up (op, tmp);	1047	CHK_PICK_PICKUP;
1064	return 1;	1048	return 1;
1065	case 2:	1049	case 2:
1066	pick_up (op, tmp);	1050	CHK_PICK_PICKUP;
1067	return 0;	1051	return 0;
1068	case 3:	1052	case 3:
1069	return 0; /* stop before pickup */	1053	return 0; /* stop before pickup */
1070	case 4:	1054	case 4:
1071	pick_up (op, tmp);	1055	CHK_PICK_PICKUP;
1072	break;	1056	break;
1073	case 5:	1057	case 5:
1074	pick_up (op, tmp);	1058	CHK_PICK_PICKUP;
1075	stop = 1;	1059	stop = 1;
1076	break;	1060	break;
1077	case 6:	1061	case 6:
1078	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079	pick_up (op, tmp);	1063	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1064	CHK_PICK_PICKUP;
1080	break;	1065	break;
1081		1066
1082	case 7:	1067	case 7:
1083	if (tmp->type == MONEY || tmp->type == GEM)	1068	if (tmp->type == MONEY || tmp->type == GEM)
1084	pick_up (op, tmp);	1069	CHK_PICK_PICKUP;
1085	break;	1070	break;
1086		1071
1087	default:	1072	default:
1088	/* use value density */	1073	/* use value density */
1089	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1074	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1075	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091	pick_up (op, tmp);	1076	CHK_PICK_PICKUP;
1092	}	1077	}
1093	}	1078	}
1094	else	1079	else
1095	{ /* old model */	1080	{ /* old model */
1096	/* NEW pickup handling */	1081	/* NEW pickup handling */
…		…
1100	if (tmp->name != NULL)	1085	if (tmp->name != NULL)
1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1086	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1087	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1103	else	1088	else
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1089	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1090	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106		1091
1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1092	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108	}	1093	}
1109		1094
1110	/* philosophy:	1095	/* philosophy:
…		…
1151	/* all food and drink if desired */	1136	/* all food and drink if desired */
1152	/* question: don't pick up known-poisonous stuff? */	1137	/* question: don't pick up known-poisonous stuff? */
1153	if (op->contr->mode & PU_FOOD)	1138	if (op->contr->mode & PU_FOOD)
1154	if (tmp->type == FOOD)	1139	if (tmp->type == FOOD)
1155	{	1140	{
1156	pick_up (op, tmp);	1141	CHK_PICK_PICKUP;
1157	continue;	1142	continue;
1158	}	1143	}
1159		1144
1160	if (op->contr->mode & PU_DRINK)	1145	if (op->contr->mode & PU_DRINK)
1161	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1146	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162	{	1147	{
1163	pick_up (op, tmp);	1148	CHK_PICK_PICKUP;
1164	continue;	1149	continue;
1165	}	1150	}
1166		1151
1167	if (op->contr->mode & PU_POTION)	1152	if (op->contr->mode & PU_POTION)
1168	if (tmp->type == POTION)	1153	if (tmp->type == POTION)
1169	{	1154	{
1170	pick_up (op, tmp);	1155	CHK_PICK_PICKUP;
1171	continue;	1156	continue;
1172	}	1157	}
1173		1158
1174	/* spellbooks, skillscrolls and normal books/scrolls */	1159	/* spellbooks, skillscrolls and normal books/scrolls */
1175	if (op->contr->mode & PU_SPELLBOOK)	1160	if (op->contr->mode & PU_SPELLBOOK)
1176	if (tmp->type == SPELLBOOK)	1161	if (tmp->type == SPELLBOOK)
1177	{	1162	{
1178	pick_up (op, tmp);	1163	CHK_PICK_PICKUP;
1179	continue;	1164	continue;
1180	}	1165	}
1181		1166
1182	if (op->contr->mode & PU_SKILLSCROLL)	1167	if (op->contr->mode & PU_SKILLSCROLL)
1183	if (tmp->type == SKILLSCROLL)	1168	if (tmp->type == SKILLSCROLL)
1184	{	1169	{
1185	pick_up (op, tmp);	1170	CHK_PICK_PICKUP;
1186	continue;	1171	continue;
1187	}	1172	}
1188		1173
1189	if (op->contr->mode & PU_READABLES)	1174	if (op->contr->mode & PU_READABLES)
1190	if (tmp->type == BOOK || tmp->type == SCROLL)	1175	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191	{	1176	{
1192	pick_up (op, tmp);	1177	CHK_PICK_PICKUP;
1193	continue;	1178	continue;
1194	}	1179	}
1195		1180
1196	/* wands/staves/rods/horns */	1181	/* wands/staves/rods/horns */
1197	if (op->contr->mode & PU_MAGIC_DEVICE)	1182	if (op->contr->mode & PU_MAGIC_DEVICE)
1198	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1183	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199	{	1184	{
1200	pick_up (op, tmp);	1185	CHK_PICK_PICKUP;
1201	continue;	1186	continue;
1202	}	1187	}
1203		1188
1204	/* pick up all magical items */	1189	/* pick up all magical items */
1205	if (op->contr->mode & PU_MAGICAL)	1190	if (op->contr->mode & PU_MAGICAL)
1206	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1191	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207	{	1192	{
1208	pick_up (op, tmp);	1193	CHK_PICK_PICKUP;
1209	continue;	1194	continue;
1210	}	1195	}
1211		1196
1212	if (op->contr->mode & PU_VALUABLES)	1197	if (op->contr->mode & PU_VALUABLES)
1213	{	1198	{
1214	if (tmp->type == MONEY || tmp->type == GEM)	1199	if (tmp->type == MONEY || tmp->type == GEM)
1215	{	1200	{
1216	pick_up (op, tmp);	1201	CHK_PICK_PICKUP;
1217	continue;	1202	continue;
1218	}	1203	}
1219	}	1204	}
1220		1205
1221	/* rings & amulets - talismans seems to be typed AMULET */	1206	/* rings & amulets - talismans seems to be typed AMULET */
1222	if (op->contr->mode & PU_JEWELS)	1207	if (op->contr->mode & PU_JEWELS)
1223	if (tmp->type == RING || tmp->type == AMULET)	1208	if (tmp->type == RING || tmp->type == AMULET)
1224	{	1209	{
1225	pick_up (op, tmp);	1210	CHK_PICK_PICKUP;
1226	continue;	1211	continue;
1227	}	1212	}
1228		1213
1229	/* we don't forget dragon food */	1214	/* we don't forget dragon food */
1230	if (op->contr->mode & PU_FLESH)	1215	if (op->contr->mode & PU_FLESH)
1231	if (tmp->type == FLESH)	1216	if (tmp->type == FLESH)
1232	{	1217	{
1233	pick_up (op, tmp);	1218	CHK_PICK_PICKUP;
1234	continue;	1219	continue;
1235	}	1220	}
1236		1221
1237	/* bows and arrows. Bows are good for selling! */	1222	/* bows and arrows. Bows are good for selling! */
1238	if (op->contr->mode & PU_BOW)	1223	if (op->contr->mode & PU_BOW)
1239	if (tmp->type == BOW)	1224	if (tmp->type == BOW)
1240	{	1225	{
1241	pick_up (op, tmp);	1226	CHK_PICK_PICKUP;
1242	continue;	1227	continue;
1243	}	1228	}
1244		1229
1245	if (op->contr->mode & PU_ARROW)	1230	if (op->contr->mode & PU_ARROW)
1246	if (tmp->type == ARROW)	1231	if (tmp->type == ARROW)
1247	{	1232	{
1248	pick_up (op, tmp);	1233	CHK_PICK_PICKUP;
1249	continue;	1234	continue;
1250	}	1235	}
1251		1236
1252	/* all kinds of armor etc. */	1237	/* all kinds of armor etc. */
1253	if (op->contr->mode & PU_ARMOUR)	1238	if (op->contr->mode & PU_ARMOUR)
1254	if (tmp->type == ARMOUR)	1239	if (tmp->type == ARMOUR)
1255	{	1240	{
1256	pick_up (op, tmp);	1241	CHK_PICK_PICKUP;
1257	continue;	1242	continue;
1258	}	1243	}
1259		1244
1260	if (op->contr->mode & PU_HELMET)	1245	if (op->contr->mode & PU_HELMET)
1261	if (tmp->type == HELMET)	1246	if (tmp->type == HELMET)
1262	{	1247	{
1263	pick_up (op, tmp);	1248	CHK_PICK_PICKUP;
1264	continue;	1249	continue;
1265	}	1250	}
1266		1251
1267	if (op->contr->mode & PU_SHIELD)	1252	if (op->contr->mode & PU_SHIELD)
1268	if (tmp->type == SHIELD)	1253	if (tmp->type == SHIELD)
1269	{	1254	{
1270	pick_up (op, tmp);	1255	CHK_PICK_PICKUP;
1271	continue;	1256	continue;
1272	}	1257	}
1273		1258
1274	if (op->contr->mode & PU_BOOTS)	1259	if (op->contr->mode & PU_BOOTS)
1275	if (tmp->type == BOOTS)	1260	if (tmp->type == BOOTS)
1276	{	1261	{
1277	pick_up (op, tmp);	1262	CHK_PICK_PICKUP;
1278	continue;	1263	continue;
1279	}	1264	}
1280		1265
1281	if (op->contr->mode & PU_GLOVES)	1266	if (op->contr->mode & PU_GLOVES)
1282	if (tmp->type == GLOVES)	1267	if (tmp->type == GLOVES)
1283	{	1268	{
1284	pick_up (op, tmp);	1269	CHK_PICK_PICKUP;
1285	continue;	1270	continue;
1286	}	1271	}
1287		1272
1288	if (op->contr->mode & PU_CLOAK)	1273	if (op->contr->mode & PU_CLOAK)
1289	if (tmp->type == CLOAK)	1274	if (tmp->type == CLOAK)
1290	{	1275	{
1291	pick_up (op, tmp);	1276	CHK_PICK_PICKUP;
1292	continue;	1277	continue;
1293	}	1278	}
1294		1279
1295	/* hoping to catch throwing daggers here */	1280	/* hoping to catch throwing daggers here */
1296	if (op->contr->mode & PU_MISSILEWEAPON)	1281	if (op->contr->mode & PU_MISSILEWEAPON)
1297	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1282	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298	{	1283	{
1299	pick_up (op, tmp);	1284	CHK_PICK_PICKUP;
1300	continue;	1285	continue;
1301	}	1286	}
1302		1287
1303	/* careful: chairs and tables are weapons! */	1288	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1289	if (op->contr->mode & PU_ALLWEAPON)
1305	{	1290	{
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1291	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1292	{
1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1293	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1294	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1295	{
1311	pick_up (op, tmp);	1296	CHK_PICK_PICKUP;
1312	continue;	1297	continue;
1313	}	1298	}
1314	}	1299	}
1315		1300
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1301	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1302	{
1318	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1303	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1304	{
1320	pick_up (op, tmp);	1305	CHK_PICK_PICKUP;
1321	continue;	1306	continue;
1322	}	1307	}
1323	}	1308	}
1324	}	1309	}
1325		1310
1326	/* misc stuff that's useful */	1311	/* misc stuff that's useful */
1327	if (op->contr->mode & PU_KEY)	1312	if (op->contr->mode & PU_KEY)
1328	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1313	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329	{	1314	{
1330	pick_up (op, tmp);	1315	CHK_PICK_PICKUP;
1331	continue;	1316	continue;
1332	}	1317	}
1333		1318
1334	/* any of the last 4 bits set means we use the ratio for value	1319	/* any of the last 4 bits set means we use the ratio for value
1335	* pickups */	1320	* pickups */
…		…
1340	/* >=7 is the old standard setting. Now we take the last 4 bits	1325	/* >=7 is the old standard setting. Now we take the last 4 bits
1341	* and multiply them by 5, giving 0..15*5== 5..75 */	1326	* and multiply them by 5, giving 0..15*5== 5..75 */
1342	wvratio = (op->contr->mode & PU_RATIO) * 5;	1327	wvratio = (op->contr->mode & PU_RATIO) * 5;
1343	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1328	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1344	{	1329	{
1345	pick_up (op, tmp);	1330	CHK_PICK_PICKUP;
1346	#if 0	1331	#if 0
1347	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1332	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348	if (tmp->name != NULL)	1333	if (tmp->name != NULL)
1349	{	1334	{
1350	fprintf (stderr, "%s", tmp->name);	1335	fprintf (stderr, "%s", tmp->name);
1351	}	1336	}
1352	else	1337	else
1353	fprintf (stderr, "%s", tmp->arch->name);	1338	fprintf (stderr, "%s", tmp->arch->archname);
1354	fprintf (stderr, ",%d] = ", tmp->type);	1339	fprintf (stderr, ",%d] = ", tmp->type);
1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1340	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1356	#endif	1341	#endif
1357	continue;	1342	continue;
1358	}	1343	}
…		…
1369	* found object is returned.	1354	* found object is returned.
1370	*/	1355	*/
1371	object *	1356	object *
1372	find_arrow (object *op, const char *type)	1357	find_arrow (object *op, const char *type)
1373	{	1358	{
1374	object *tmp = 0;
1375
1376	for (op = op->inv; op; op = op->below)	1359	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378	tmp = find_arrow (op, type);
1379	else if (op->type == ARROW && op->race == type)	1360	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1361	return splay (tmp);
		1362
		1363	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1364	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1365	if (object *arrow = find_arrow (tmp, type))
		1366	{
		1367	splay (tmp);
1380	return op;	1368	return arrow;
		1369	}
1381		1370
1382	return tmp;	1371	return 0;
1383	}	1372	}
1384		1373
1385	/*	1374	/*
1386	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1375	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1387	* against the target. A full test is not performed, simply a basic test	1376	* against the target. A full test is not performed, simply a basic test
…		…
1428	else	1417	else
1429	{	1418	{
1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1419	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431	{	1420	{
1432	attacktype = 1 << attacknum;	1421	attacktype = 1 << attacknum;
1433	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1422	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1423	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1435	{	1424	{
1436	tmp = arrow;	1425	tmp = arrow;
1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1426	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1438	}	1427	}
1439	}	1428	}
1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1429	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441	{	1430	{
1442	tmp = arrow;	1431	tmp = arrow;
…		…
1544	{	1533	{
1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1534	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1546	return 0;	1535	return 0;
1547	}	1536	}
1548		1537
1549	if (player *pl = op->contr)	1538	if (op->contr)
1550	{	1539	bow = op->current_weapon;
1551	bow = pl->ranged_ob;
1552	if (!op->change_weapon (bow))
1553	return 0;
1554	}
1555	else	1540	else
1556	{	1541	{
1557	for (bow = op->inv; bow; bow = bow->below)	1542	for (bow = op->inv; bow; bow = bow->below)
1558	/* Don't check for applied - monsters don't apply bows - in that way, they	1543	/* Don't check for applied - monsters don't apply bows - in that way, they
1559	* don't need to switch back and forth between bows and weapons.	1544	* don't need to switch back and forth between bows and weapons.
…		…
1630	arrow->stats.grace = arrow->attacktype;	1615	arrow->stats.grace = arrow->attacktype;
1631		1616
1632	if (arrow->slaying)	1617	if (arrow->slaying)
1633	arrow->spellarg = strdup (arrow->slaying);	1618	arrow->spellarg = strdup (arrow->slaying);
1634		1619
		1620	#if 0
1635	if (player *pl = op->contr)	1621	if (player *pl = op->contr)
1636	{	1622	{
1637	pl->has_hit = 1;
1638	#if 0
1639	float speed = pl->weapon_sp;	1623	float speed = pl->weapon_sp;
1640		1624
1641	/* penalize ROF for bestarrow */	1625	/* penalize ROF for bestarrow */
1642	if (pl->bowtype == bow_bestarrow)	1626	if (pl->bowtype == bow_bestarrow)
1643	speed *= .9f;	1627	speed *= .9f;
1644	else	1628	else
1645	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1629	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646		1630
1647	op->speed_left += speed - op->speed;	1631	op->speed_left += speed - op->speed;
		1632	}
1648	#endif	1633	#endif
1649	}
1650		1634
1651	SET_ANIMATION (arrow, arrow->direction);	1635	SET_ANIMATION (arrow, arrow->direction);
1652		1636
1653	/* update the speed */	1637	/* update the speed */
1654	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1638	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1655	+ bow->stats.dam / 7.0;	1639	+ bow->stats.dam / 7.f;
1656		1640
1657	arrow->set_speed (max (arrow->speed, 2.0));	1641	arrow->set_speed (max (arrow->speed, 2.f));
1658	arrow->speed_left = 0;	1642	arrow->speed_left = 0;
1659		1643
1660	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1644	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661		1645
1662	if (op->type == PLAYER)	1646	if (op->type == PLAYER)
…		…
1685		1669
1686	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1670	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1671	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1672	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689		1673
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1674	op->play_sound (sound_find ("fire_arrow"));
1691	m->insert (arrow, sx, sy, op);	1675	m->insert (arrow, sx, sy, op);
1692		1676
1693	if (!arrow->destroyed ())	1677	if (!arrow->destroyed ())
1694	move_arrow (arrow);	1678	move_arrow (arrow);
1695		1679
…		…
1746	}	1730	}
1747		1731
1748	return ret;	1732	return ret;
1749	}	1733	}
1750		1734
1751
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1735	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1736	* Broken apart from 'fire' to keep it more readable.
1754	*/	1737	*/
1755	void	1738	void
1756	fire_misc_object (object *op, int dir)	1739	fire_misc_object (object *op, int dir)
…		…
1774		1757
1775	if (item->type == WAND)	1758	if (item->type == WAND)
1776	{	1759	{
1777	if (item->stats.food <= 0)	1760	if (item->stats.food <= 0)
1778	{	1761	{
1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1762	op->contr->play_sound (sound_find ("wand_poof"));
1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1763	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781		1764
1782	return;	1765	return;
1783	}	1766	}
1784	}	1767	}
1785	else if (item->type == ROD || item->type == HORN)	1768	else if (item->type == ROD || item->type == HORN)
1786	{	1769	{
1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1770	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1788	{	1771	{
1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1772	op->contr->play_sound (sound_find ("wand_poof"));
1790		1773
1791	if (item->type == ROD)	1774	if (item->type == ROD)
1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1775	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793	else	1776	else
1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1807	object *tmp;	1790	object *tmp;
1808		1791
1809	if (item->arch)	1792	if (item->arch)
1810	{	1793	{
1811	CLEAR_FLAG (item, FLAG_ANIMATE);	1794	CLEAR_FLAG (item, FLAG_ANIMATE);
1812	item->face = item->arch->clone.face;	1795	item->face = item->arch->face;
1813	item->set_speed (0);	1796	item->set_speed (0);
1814	}	1797	}
1815		1798
1816	if ((tmp = item->in_player ()))	1799	if ((tmp = item->in_player ()))
1817	esrv_update_item (UPD_ANIM, tmp, item);	1800	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1822	}	1805	}
1823	}	1806	}
1824		1807
1825	/* Received a fire command for the player - go and do it.	1808	/* Received a fire command for the player - go and do it.
1826	*/	1809	*/
1827	void	1810	bool
1828	fire (object *op, int dir)	1811	fire (object *op, int dir)
1829	{	1812	{
1830	int spellcost = 0;	1813	int spellcost = 0;
1831		1814
1832	/* check for loss of invisiblity/hide */	1815	/* check for loss of invisiblity/hide */
…		…
1836	player *pl = op->contr;	1819	player *pl = op->contr;
1837		1820
1838	if (pl->golem)	1821	if (pl->golem)
1839	{	1822	{
1840	control_golem (op->contr->golem, dir);	1823	control_golem (op->contr->golem, dir);
1841	return;	1824	return false;
1842	}	1825	}
1843		1826
1844	object *ob = pl->ranged_ob;	1827	object *ob = pl->ranged_ob;
1845		1828
1846	if (!ob)	1829	if (!ob)
1847	return;	1830	return false;
		1831
		1832	if (!op->change_weapon (ob))
		1833	return false;
		1834
		1835	if (op->speed_left > 0.f)
		1836	--op->speed_left;
		1837	else
		1838	return false;
1848		1839
1849	switch (ob->type)	1840	switch (ob->type)
1850	{	1841	{
1851	case BOW:	1842	case BOW:
1852	player_fire_bow (op, dir);	1843	player_fire_bow (op, dir);
…		…
1859	case BUILDER:	1850	case BUILDER:
1860	apply_map_builder (op, dir);	1851	apply_map_builder (op, dir);
1861	break;	1852	break;
1862		1853
1863	case SKILL:	1854	case SKILL:
1864	case SKILL_TOOL:
1865	do_skill (op, op, ob, dir, 0);	1855	do_skill (op, op, ob, dir, 0);
1866	break;	1856	break;
1867		1857
1868	default:	1858	default:
1869	fire_misc_object (op, dir);	1859	fire_misc_object (op, dir);
1870	break;	1860	break;
1871	}	1861	}
		1862
		1863	return true;
1872	}	1864	}
1873		1865
1874	/* find_key	1866	/* find_key
1875	* We try to find a key for the door as passed. If we find a key	1867	* We try to find a key for the door as passed. If we find a key
1876	* and successfully use it, we return the key, otherwise NULL	1868	* and successfully use it, we return the key, otherwise NULL
…		…
1963	* 0 otherwise	1955	* 0 otherwise
1964	*/	1956	*/
1965	static int	1957	static int
1966	player_attack_door (object *op, object *door)	1958	player_attack_door (object *op, object *door)
1967	{	1959	{
1968	/* If its a door, try to find a use a key. If we do destroy the door,	1960	/* If its a door, try to find a key. If we do destroy the door,
1969	* might as well return immediately as there is nothing more to do -	1961	* might as well return immediately as there is nothing more to do -
1970	* otherwise, we fall through to the rest of the code.	1962	* otherwise, we fall through to the rest of the code.
1971	*/	1963	*/
1972	object *key = find_key (op, op, door);	1964	object *key = find_key (op, op, door);
1973		1965
1974	/* IF we found a key, do some extra work */	1966	/* If we found a key, do some extra work */
1975	if (key)	1967	if (key)
1976	{	1968	{
1977	object *container = key->env;	1969	object *container = key->env;
1978
1979	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980		1970
1981	if (action_makes_visible (op))	1971	if (action_makes_visible (op))
1982	make_visible (op);	1972	make_visible (op);
1983		1973
1984	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1974	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1986		1976
1987	if (door->type == DOOR)	1977	if (door->type == DOOR)
1988	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1978	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989	else if (door->type == LOCKED_DOOR)	1979	else if (door->type == LOCKED_DOOR)
1990	{	1980	{
1991	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1981	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1992	remove_door2 (door); /* remove door without violence ;-) */	1982	remove_door2 (door); /* remove door without violence ;-) */
1993	}	1983	}
1994		1984
1995	/* Do this after we print the message */	1985	/* Do this after we print the message */
1996	decrease_ob (key); /* Use up one of the keys */	1986	decrease_ob (key); /* Use up one of the keys */
…		…
2001	return 1; /* Nothing more to do below */	1991	return 1; /* Nothing more to do below */
2002	}	1992	}
2003	else if (door->type == LOCKED_DOOR)	1993	else if (door->type == LOCKED_DOOR)
2004	{	1994	{
2005	/* Might as well return now - no other way to open this */	1995	/* Might as well return now - no other way to open this */
2006	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1996	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2007	return 1;	1997	return 1;
2008	}	1998	}
2009		1999
2010	return 0;	2000	return 0;
2011	}	2001	}
…		…
2014	* It should keep the code cleaner.	2004	* It should keep the code cleaner.
2015	* When this is called, the players direction has been updated	2005	* When this is called, the players direction has been updated
2016	* (taking into account confusion.) The player is also actually	2006	* (taking into account confusion.) The player is also actually
2017	* going to try and move (not fire weapons).	2007	* going to try and move (not fire weapons).
2018	*/	2008	*/
2019	void	2009	bool
2020	move_player_attack (object *op, int dir)	2010	move_player_attack (object *op, int dir)
2021	{	2011	{
2022	object *tmp, *mon;
2023	int on_battleground;	2012	int on_battleground;
2024	maptile *m;
2025		2013
2026	sint16 nx = freearr_x[dir] + op->x;	2014	sint16 nx = freearr_x[dir] + op->x;
2027	sint16 ny = freearr_y[dir] + op->y;	2015	sint16 ny = freearr_y[dir] + op->y;
2028		2016
2029	on_battleground = op_on_battleground (op, 0, 0);	2017	on_battleground = op_on_battleground (op, 0, 0);
		2018
		2019	if (out_of_map (op->map, nx, ny))
		2020	return false;
		2021
		2022	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2023	{
		2024	--op->speed_left;
		2025	return true;
		2026	}
2030		2027
2031	/* If braced, or can't move to the square, and it is not out of the	2028	/* If braced, or can't move to the square, and it is not out of the
2032	* map, attack it. Note order of if statement is important - don't	2029	* map, attack it. Note order of if statement is important - don't
2033	* want to be calling move_ob if braced, because move_ob will move the	2030	* want to be calling move_ob if braced, because move_ob will move the
2034	* player. This is a pretty nasty hack, because if we could	2031	* player. This is a pretty nasty hack, because if we could
2035	* move to some space, it then means that if we are braced, we should	2032	* move to some space, it then means that if we are braced, we should
2036	* do nothing at all. As it is, if we are braced, we go through	2033	* do nothing at all. As it is, if we are braced, we go through
2037	* quite a bit of processing. However, it probably is less than what	2034	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	2035	* move_ob uses.
2039	*/	2036	*/
2040	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2041	{
2042	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2043	{
2044	m = op->map->xy_find (nx, ny);	2037	maptile *m = op->map->xy_find (nx, ny);
2045	if (!m)
2046	return; /* Don't think this should happen */
2047	}
2048	else
2049	m = op->map;
2050		2038
2051	if (!(tmp = m->at (nx, ny).bot))
2052	return;
2053
2054	mon = 0;
2055	/* Go through all the objects, and find ones of interest. Only stop if	2039	/* Go through all the objects, and find ones of interest. Only stop if
2056	* we find a monster - that is something we know we want to attack.	2040	* we find a monster - that is something we know we want to attack.
2057	* if its a door or barrel (can roll) see if there may be monsters	2041	* if its a door or barrel (can roll) see if there may be monsters
2058	* on the space	2042	* on the space
2059	*/	2043	*/
2060	while (tmp)	2044	object *mon;
2061	{	2045	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2062	if (tmp == op)	2046	{
2063	{	2047	if ((mon->flag [FLAG_ALIVE]
2064	tmp = tmp->above;	2048	|| mon->type == LOCKED_DOOR
2065	continue;	2049	|| mon->flag [FLAG_CAN_ROLL])
2066	}
2067
2068	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2069	{
2070	mon = tmp;	2050	&& mon != op)
2071	break;	2051	break;
2072	}	2052	}
2073		2053
2074	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2075	mon = tmp;
2076
2077	tmp = tmp->above;
2078	}
2079
2080	if (!mon) /* This happens anytime the player tries to move */	2054	if (!mon) /* This happens anytime the player tries to move */
2081	return; /* into a wall */	2055	return false; /* into a wall */
2082		2056
2083	if (mon->head)
2084	mon = mon->head;	2057	mon = mon->head_ ();
2085		2058
2086	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2059	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2060	if (op->contr->weapon_sp_left > 0.f)
2087	if (player_attack_door (op, mon))	2061	if (player_attack_door (op, mon))
		2062	{
		2063	--op->contr->weapon_sp_left;
2088	return;	2064	return true;
		2065	}
2089		2066
2090	/* The following deals with possibly attacking peaceful	2067	/* The following deals with possibly attacking peaceful
2091	* or frienddly creatures. Basically, all players are considered	2068	* or friendly creatures. Basically, all players are considered
2092	* unaggressive. If the moving player has peaceful set, then the	2069	* unaggressive. If the moving player has peaceful set, then the
2093	* object should be pushed instead of attacked. It is assumed that	2070	* object should be pushed instead of attacked. It is assumed that
2094	* if you are braced, you will not attack friends accidently,	2071	* if you are braced, you will not attack friends accidently,
2095	* and thus will not push them.	2072	* and thus will not push them.
2096	*/	2073	*/
2097		2074
2098	/* If the creature is a pet, push it even if the player is not	2075	/* If the creature is a pet, push it even if the player is not
2099	* peaceful. Our assumption is the creature is a pet if the	2076	* peaceful. Our assumption is the creature is a pet if the
2100	* player owns it and it is either friendly or unagressive.	2077	* player owns it and it is either friendly or unagressive.
2101	*/	2078	*/
2102	if ((op->type == PLAYER)	2079	if (op->type == PLAYER
2103	#if COZY_SERVER
2104	&&
2105	((mon->owner && mon->owner->contr	2080	&& ((mon->owner && mon->owner->contr
2106	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2081	&& same_party (mon->owner->contr->party, op->contr->party))
2107	#else
2108	&& mon->owner == op	2082	|| mon->owner == op)
2109	#endif
2110	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2083	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2111	{	2084	{
2112	/* If we're braced, we don't want to switch places with it */	2085	/* If we're braced, we don't want to switch places with it */
2113	if (op->contr->braced)	2086	if (op->contr->braced)
2114	return;	2087	return false;
2115		2088
2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2089	if (op->speed_left > 0.f)
		2090	{
		2091	--op->speed_left;
		2092
		2093	op->play_sound (sound_find ("push_player"));
2117	push_ob (mon, dir, op);	2094	push_ob (mon, dir, op);
		2095
2118	if (op->contr->tmp_invis || op->hide)	2096	if (op->contr->tmp_invis || op->hide)
2119	make_visible (op);	2097	make_visible (op);
2120		2098
2121	return;	2099	return true;
2122	}	2100	}
		2101	else
		2102	return false;
		2103	}
2123		2104
2124	/* in certain circumstances, you shouldn't attack friendly	2105	/* in certain circumstances, you shouldn't attack friendly
2125	* creatures. Note that if you are braced, you can't push	2106	* creatures. Note that if you are braced, you can't push
2126	* someone, but put it inside this loop so that you won't	2107	* someone, but put it inside this loop so that you won't
2127	* attack them either.	2108	* attack them either.
2128	*/	2109	*/
2129	if ((mon->type == PLAYER || mon->enemy != op) &&	2110	if ((mon->type == PLAYER || mon->enemy != op)
2130	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2111	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2131	#ifdef PROHIBIT_PLAYERKILL
2132	(op->contr->peaceful	2112	&& ((op->contr->peaceful
2133	|| (mon->type == PLAYER	2113	|| (mon->type == PLAYER && mon->contr->peaceful))
2134	&& mon->contr->
2135	peaceful)) &&
2136	#else
2137	op->contr->peaceful &&
2138	#endif
2139	!on_battleground))	2114	&& !on_battleground))
		2115	{
		2116	if (op->speed_left > 0.f)
2140	{	2117	{
		2118	--op->speed_left;
		2119
2141	if (!op->contr->braced)	2120	if (!op->contr->braced)
2142	{	2121	{
2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2122	op->play_sound (sound_find ("push_player"));
2144	push_ob (mon, dir, op);	2123	push_ob (mon, dir, op);
2145	}	2124	}
2146	else	2125	else
2147	new_draw_info (0, 0, op, "You withhold your attack");	2126	op->statusmsg ("You withhold your attack");
2148		2127
2149	if (op->contr->tmp_invis || op->hide)	2128	if (op->contr->tmp_invis || op->hide)
2150	make_visible (op);	2129	make_visible (op);
2151	}
2152		2130
		2131	return true;
		2132	}
		2133	}
2153	/* If the object is a boulder or other rollable object, then	2134	/* If the object is a boulder or other rollable object, then
2154	* roll it if not braced. You can't roll it if you are braced.	2135	* roll it if not braced. You can't roll it if you are braced.
2155	*/	2136	*/
2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2137	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2138	{
		2139	if (op->speed_left > 0.f)
2157	{	2140	{
		2141	--op->speed_left;
		2142
2158	recursive_roll (mon, dir, op);	2143	recursive_roll (mon, dir, op);
2159	if (action_makes_visible (op))	2144	if (action_makes_visible (op))
2160	make_visible (op);	2145	make_visible (op);
2161	}
2162		2146
		2147	return true;
		2148	}
		2149	}
2163	/* Any generic living creature. Including things like doors.	2150	/* Any generic living creature. Including things like doors.
2164	* Way it works is like this: First, it must have some hit points	2151	* Way it works is like this: First, it must have some hit points
2165	* and be living. Then, it must be one of the following:	2152	* and be living. Then, it must be one of the following:
2166	* 1) Not a player, 2) A player, but of a different party. Note	2153	* 1) Not a player, 2) A player, but of a different party. Note
2167	* that party_number -1 is no party, so attacks can still happen.	2154	* that party_number -1 is no party, so attacks can still happen.
2168	*/	2155	*/
2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2156	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2157	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
		2158	{
		2159	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2171	{	2160	{
2172	op->contr->has_hit = 1;	2161	--op->contr->weapon_sp_left;
2173		2162
2174	skill_attack (mon, op, 0, 0, 0);	2163	skill_attack (mon, op, 0, 0, 0);
2175
2176	/* If attacking another player, that player gets automatic
2177	* hitback, and doesn't loose luck either.
2178	* Disable hitback on the battleground or if the target is
2179	* the wiz.
2180	*/
2181	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2182	{
2183	short luck = mon->stats.luck;
2184
2185	mon->contr->has_hit = 1;
2186	skill_attack (op, mon, 0, 0, 0);
2187	mon->stats.luck = luck;
2188	}
2189		2164
2190	if (action_makes_visible (op))	2165	if (action_makes_visible (op))
2191	make_visible (op);	2166	make_visible (op);
2192	}
2193	} /* if player should attack something */
2194	}
2195		2167
2196	int	2168	return true;
		2169	}
		2170	}
		2171
		2172	return false;
		2173	}
		2174
		2175	bool
2197	move_player (object *op, int dir)	2176	move_player (object *op, int dir)
2198	{	2177	{
2199	int pick;	2178	int pick;
2200		2179
2201	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2180	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2202	return 0;	2181	return 0;
2203		2182
2204	/* Sanity check: make sure dir is valid */	2183	/* Sanity check: make sure dir is valid */
2205	if ((dir < 0) || (dir >= 9))	2184	if ((dir < 0) || (dir >= 9))
2206	{	2185	{
…		…
2215	op->facing = dir;	2194	op->facing = dir;
2216		2195
2217	if (op->hide)	2196	if (op->hide)
2218	do_hidden_move (op);	2197	do_hidden_move (op);
2219		2198
		2199	bool retval;
		2200
2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2201	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2221	/*nop */ ;	2202	retval = RESULT_INT (0);
2222	else if (op->contr->fire_on)	2203	else if (op->contr->fire_on)
2223	fire (op, dir);	2204	retval = fire (op, dir);
2224	else	2205	else
2225	{	2206	{
2226	move_player_attack (op, dir);	2207	retval = move_player_attack (op, dir);
2227	pick = check_pick (op);	2208	pick = check_pick (op);
2228	}	2209	}
2229		2210
2230	/* Add special check for newcs players and fire on - this way, the	2211	/* Add special check for newcs players and fire on - this way, the
2231	* server can handle repeat firing.	2212	* server can handle repeat firing.
…		…
2238	/* Update how the player looks. Use the facing, so direction may	2219	/* Update how the player looks. Use the facing, so direction may
2239	* get reset to zero. This allows for full animation capabilities	2220	* get reset to zero. This allows for full animation capabilities
2240	* for players.	2221	* for players.
2241	*/	2222	*/
2242	animate_object (op, op->facing);	2223	animate_object (op, op->facing);
2243	return 0;	2224
		2225	return retval;
2244	}	2226	}
2245		2227
2246	/* This is similar to handle_player, below, but is only used by the	2228	/* This is similar to handle_player, below, but is only used by the
2247	* new client/server stuff.	2229	* new client/server stuff.
2248	* This is sort of special, in that the new client/server actually uses	2230	* This is sort of special, in that the new client/server actually uses
2249	* the new speed values for commands.	2231	* the new speed values for commands.
2250	*	2232	*
2251	* Returns true if there are more actions we can do.	2233	* Returns true if there are more actions we can do. Should not do
		2234	* many actions in a row, as that would be too unfair to other
		2235	* players.
2252	*/	2236	*/
2253	int	2237	bool
2254	handle_newcs_player (object *op)	2238	handle_newcs_player (object *op)
2255	{	2239	{
2256	if (QUERY_FLAG (op, FLAG_SCARED))	2240	if (QUERY_FLAG (op, FLAG_SCARED))
2257	{	2241	{
2258	flee_player (op);	2242	if (op->speed_left > 0.f)
2259
2260	/* If player is still scared, that is his action for this tick */
2261	if (op->flag [FLAG_SCARED])
2262	{	2243	{
2263	--op->speed_left;	2244	--op->speed_left;
		2245	flee_player (op);
		2246
2264	return 0;	2247	return true;
2265	}	2248	}
		2249	else
		2250	return false;
2266	}	2251	}
2267		2252
2268	/* call this here - we also will call this in do_ericserver, but	2253	/* call this here - we also will call this in do_ericserver, but
2269	* the players time has been increased when doericserver has been	2254	* the players time has been increased when doericserver has been
2270	* called, so we recheck it here.	2255	* called, so we recheck it here.
2271	*/	2256	*/
2272	if (op->contr->ns->handle_command ())	2257	if (op->contr->ns->handle_command ())
2273	return 1;	2258	return true;
2274		2259
2275	if (op->speed_left > 0.f)
2276	{
2277	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2260	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2278	{
2279	/* All move commands take 1 tick, at least for now */
2280	--op->speed_left;
2281
2282	/* Instead of all the stuff below, let move_player take care
2283	* of it. Also, some of the skill stuff is only put in
2284	* there, as well as the confusion stuff.
2285	*/
2286	move_player (op, op->direction);	2261	return move_player (op, op->direction);
2287		2262
2288	return op->speed_left > 0.f;
2289	}
2290	}
2291
2292	return 0;	2263	return false;
2293	}	2264	}
2294		2265
2295	int	2266	int
2296	save_life (object *op)	2267	save_life (object *op)
2297	{	2268	{
…		…
2299	return 0;	2270	return 0;
2300		2271
2301	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2272	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2302	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2273	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2303	{	2274	{
2304	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2275	op->play_sound (sound_find ("ob_evaporate"));
2305	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2276	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2306		2277
2307	if (op->contr)	2278	if (op->contr)
2308	esrv_del_item (op->contr, tmp->count);	2279	esrv_del_item (op->contr, tmp->count);
2309		2280
…		…
2329	/* This goes throws the inventory and removes unpaid objects, and puts them	2300	/* This goes throws the inventory and removes unpaid objects, and puts them
2330	* back in the map (location and map determined by values of env). This	2301	* back in the map (location and map determined by values of env). This
2331	* function will descend into containers. op is the object to start the search	2302	* function will descend into containers. op is the object to start the search
2332	* from.	2303	* from.
2333	*/	2304	*/
2334	void	2305	static void
2335	remove_unpaid_objects (object *op, object *env)	2306	drop_unpaid_items (object *op, object *env)
2336	{	2307	{
2337	while (op)	2308	while (op)
2338	{	2309	{
2339	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2310	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2340		2311
…		…
2344	esrv_del_item (env->contr, op->count);	2315	esrv_del_item (env->contr, op->count);
2345		2316
2346	op->insert_at (env);	2317	op->insert_at (env);
2347	}	2318	}
2348	else if (op->inv)	2319	else if (op->inv)
2349	remove_unpaid_objects (op->inv, env);	2320	drop_unpaid_items (op->inv, env);
2350		2321
2351	op = next;	2322	op = next;
2352	}	2323	}
		2324	}
		2325
		2326	void
		2327	object::drop_unpaid_items ()
		2328	{
		2329	if (!flag [FLAG_REMOVED])
		2330	::drop_unpaid_items (inv, this);
2353	}	2331	}
2354		2332
2355	/*	2333	/*
2356	* Returns pointer a static string containing gravestone text	2334	* Returns pointer a static string containing gravestone text
2357	* Moved from apply.c to player.c - player.c is what	2335	* Moved from apply.c to player.c - player.c is what
…		…
2452	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2430	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2453	else	2431	else
2454	{	2432	{
2455	gen_grace = op->stats.maxgrace;	2433	gen_grace = op->stats.maxgrace;
2456	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2434	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2457	}
2458
2459	/* Regenerate Spell Points */
2460	if (!op->contr->golem && --op->last_sp < 0)
2461	{
2462	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2463	if (op->stats.sp < op->stats.maxsp)
2464	{
2465	op->stats.sp++;
2466	/* dms do not consume food */
2467	if (!QUERY_FLAG (op, FLAG_WIZ))
2468	{
2469	op->stats.food--;
2470	if (op->contr->digestion < 0)
2471	op->stats.food += op->contr->digestion;
2472	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2473	op->stats.food = last_food;
2474	}
2475	}
2476
2477	if (max_sp > 1)
2478	{
2479	over_sp = (gen_sp + 10) / rate_sp;
2480	if (over_sp > 0)
2481	{
2482	if (op->stats.sp < op->stats.maxsp)
2483	{
2484	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2485
2486	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2487	op->stats.sp--;
2488
2489	if (op->stats.sp > op->stats.maxsp)
2490	op->stats.sp = op->stats.maxsp;
2491	}
2492	op->last_sp = 0;
2493	}
2494	else
2495	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2496	}
2497	else
2498	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2499	}	2435	}
2500		2436
2501	/* Regenerate Grace */	2437	/* Regenerate Grace */
2502	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2438	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2503	if (--op->last_grace < 0)	2439	if (--op->last_grace < 0)
…		…
2524	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2460	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2525	}	2461	}
2526	/* wearing stuff doesn't detract from grace generation. */	2462	/* wearing stuff doesn't detract from grace generation. */
2527	}	2463	}
2528		2464
		2465	if (op->stats.food > 0)
		2466	{
2529	/* Regenerate Hit Points */	2467	/* Regenerate Spell Points */
2530	if (--op->last_heal < 0)	2468	if (!op->contr->golem && --op->last_sp < 0)
2531	{
2532	if (op->stats.hp < op->stats.maxhp)
2533	{	2469	{
2534	op->stats.hp++;	2470	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2535	/* dms do not consume food */	2471
2536	if (!QUERY_FLAG (op, FLAG_WIZ))	2472	if (op->stats.sp < op->stats.maxsp)
2537	{	2473	{
		2474	op->stats.sp++;
		2475
		2476	/* dms do not consume food */
		2477	if (!QUERY_FLAG (op, FLAG_WIZ))
		2478	{
2538	op->stats.food--;	2479	op->stats.food--;
		2480
2539	if (op->contr->digestion < 0)	2481	if (op->contr->digestion < 0)
2540	op->stats.food += op->contr->digestion;	2482	op->stats.food += op->contr->digestion;
2541	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2483	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2542	op->stats.food = last_food;	2484	op->stats.food = last_food;
		2485	}
2543	}	2486	}
2544	}
2545		2487
2546	if (max_hp > 1)	2488	if (max_sp > 1)
2547	{
2548	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2549	if (over_hp > 0)
2550	{	2489	{
2551	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2490	over_sp = (gen_sp + 10) / rate_sp;
		2491	if (over_sp > 0)
		2492	{
		2493	if (op->stats.sp < op->stats.maxsp)
		2494	{
		2495	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2496
		2497	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2498	op->stats.sp--;
		2499
		2500	if (op->stats.sp > op->stats.maxsp)
		2501	op->stats.sp = op->stats.maxsp;
		2502	}
		2503
2552	op->last_heal = 0;	2504	op->last_sp = 0;
		2505	}
		2506	else
		2507	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2553	}	2508	}
2554	else	2509	else
		2510	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2511	}
		2512
		2513	/* Regenerate Hit Points */
		2514	if (--op->last_heal < 0)
		2515	{
		2516	if (op->stats.hp < op->stats.maxhp)
2555	{	2517	{
2556	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2518	op->stats.hp++;
		2519
		2520	/* dms do not consume food */
		2521	if (!QUERY_FLAG (op, FLAG_WIZ))
		2522	{
		2523	op->stats.food--;
		2524
		2525	if (op->contr->digestion < 0)
		2526	op->stats.food += op->contr->digestion;
		2527	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2528	op->stats.food = last_food;
		2529	}
2557	}	2530	}
		2531
		2532	if (max_hp > 1)
		2533	{
		2534	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2535
		2536	if (over_hp > 0)
		2537	{
		2538	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2539	op->last_heal = 0;
		2540	}
		2541	else
		2542	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2558	}	2543	}
2559	else	2544	else
2560	{
2561	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2545	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2562	}	2546	}
2563	}	2547	}
2564		2548
2565	/* Digestion */	2549	/* Digestion */
2566	if (--op->last_eat < 0)	2550	if (--op->last_eat < 0)
2567	{	2551	{
2568	#ifdef COZY_SERVER	2552	int bonus = max (0, op->contr->digestion),
2569	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2553	penalty = max (0, -op->contr->digestion);
2570	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2571	#else
2572	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2573	#endif
2574		2554
2575	if (op->contr->gen_hp > 0)
2576	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2555	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2577	else
2578	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2579		2556
2580	/* dms do not consume food */	2557	/* dms do not consume food */
2581	if (!QUERY_FLAG (op, FLAG_WIZ))	2558	if (!QUERY_FLAG (op, FLAG_WIZ))
2582	op->stats.food--;	2559	op->stats.food--;
2583	}	2560	}
…		…
2610	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2587	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2611	manual_apply (op, flesh, 0);	2588	manual_apply (op, flesh, 0);
2612	}	2589	}
2613	}	2590	}
2614		2591
2615	while (op->stats.food < 0 && op->stats.hp >= 0)	2592	if (op->stats.food < 0)
2616	op->stats.food++, op->stats.hp--;	2593	{
		2594	op->stats.hp += op->stats.food;
		2595	op->stats.food = 0;
		2596	}
2617		2597
2618	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2598	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2619	kill_player (op);	2599	kill_player (op);
2620	}	2600	}
2621	}	2601	}
…		…
2626	* file.	2606	* file.
2627	*/	2607	*/
2628	void	2608	void
2629	kill_player (object *op)	2609	kill_player (object *op)
2630	{	2610	{
		2611	int x, y;
2631	char buf[MAX_BUF];	2612	char buf[MAX_BUF];
2632	int x, y;
2633
2634	//int i;
2635	maptile *map; /* this is for resurrection */	2613	maptile *map; /* this is for resurrection */
2636
2637	/* int z;
2638	int num_stats_lose;
2639	int lost_a_stat;
2640	int lose_this_stat;
2641	int this_stat; */
2642	int will_kill_again;	2614	int will_kill_again;
2643	archetype *at;	2615	archetype *at;
2644	object *tmp;	2616	object *tmp;
2645		2617
2646	if (save_life (op))	2618	if (save_life (op))
2647	return;	2619	return;
2648
2649		2620
2650	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2621	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2651	* in cities ONLY!!! It is very important that this doesn't get abused.	2622	* in cities ONLY!!! It is very important that this doesn't get abused.
2652	* Look at op_on_battleground() for more info --AndreasV	2623	* Look at op_on_battleground() for more info --AndreasV
2653	*/	2624	*/
…		…
2669	{	2640	{
2670	tmp->destroy ();	2641	tmp->destroy ();
2671	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2642	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2672	}	2643	}
2673		2644
2674	cure_disease (op, 0); /* remove any disease */	2645	cure_disease (op, 0, 0); /* remove any disease */
2675	op->stats.hp = op->stats.maxhp;	2646	op->stats.hp = op->stats.maxhp;
2676	if (op->stats.food <= 0)	2647	if (op->stats.food <= 0)
2677	op->stats.food = 999;	2648	op->stats.food = 999;
2678		2649
2679	/* create a bodypart-trophy to make the winner happy */	2650	/* create a bodypart-trophy to make the winner happy */
2680	if (object *tmp = arch_to_object (archetype::find ("finger")))	2651	if (object *tmp = arch_to_object (archetype::find ("finger")))
2681	{	2652	{
2682	sprintf (buf, "%s's finger", &op->name);	2653	tmp->name = format ("%s's finger" , &op->name);
2683	tmp->name = buf;	2654	tmp->name_pl = format ("%s's fingers", &op->name);
2684	sprintf (buf, " This finger has been cut off %s\n"	2655	tmp->msg = format (
2685	" the %s, when he was defeated at\n level %d by %s.\n",	2656	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2686	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2657	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2687	tmp->msg = buf;	2658	);
2688	tmp->value = 0, tmp->type = 0;	2659	tmp->value = 0, tmp->type = 0;
2689	tmp->materialname = "organics";	2660	tmp->materialname = "organics";
2690	tmp->insert_at (op, tmp);	2661	tmp->insert_at (op, tmp);
2691	}	2662	}
2692		2663
…		…
2699	INVOKE_PLAYER (DEATH, op->contr);	2670	INVOKE_PLAYER (DEATH, op->contr);
2700		2671
2701	command_kill_pets (op, 0);	2672	command_kill_pets (op, 0);
2702		2673
2703	if (op->stats.food < 0)	2674	if (op->stats.food < 0)
2704	{
2705	sprintf (buf, "%s starved to death.", &op->name);
2706	strcpy (op->contr->killer, "starvation");	2675	strcpy (op->contr->killer, "starvation");
2707	}
2708	else
2709	sprintf (buf, "%s died.", &op->name);
2710		2676
2711	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2677	op->contr->play_sound (sound_find ("player_dies"));
2712		2678
2713	/* save the map location for corpse, gravestone */	2679	/* save the map location for corpse, gravestone */
2714	x = op->x;	2680	x = op->x;
2715	y = op->y;	2681	y = op->y;
2716	map = op->map;	2682	map = op->map;
…		…
2879	{	2845	{
2880	tmp->destroy ();	2846	tmp->destroy ();
2881	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2847	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2882	}	2848	}
2883		2849
2884	cure_disease (op, 0); /* remove any disease */	2850	cure_disease (op, 0, 0); /* remove any disease */
2885		2851
2886	/*add_exp(op, (op->stats.exp * -0.20)); */	2852	/*add_exp(op, (op->stats.exp * -0.20)); */
2887	apply_death_exp_penalty (op);	2853	apply_death_exp_penalty (op);
2888	if (op->stats.food < 100)	2854	if (op->stats.food < 100)
2889	op->stats.food = 900;	2855	op->stats.food = 900;
…		…
2893		2859
2894	/*	2860	/*
2895	* Check to see if the player has any unpaid items. If so, remove them	2861	* Check to see if the player has any unpaid items. If so, remove them
2896	* and put them back in the map.	2862	* and put them back in the map.
2897	*/	2863	*/
2898	remove_unpaid_objects (op->inv, op);	2864	op->drop_unpaid_items ();
2899		2865
2900	/****************************************/	2866	/****************************************/
2901	/* */	2867	/* */
2902	/* Move player to his current respawn- */	2868	/* Move player to his current respawn- */
2903	/* position (usually last savebed) */	2869	/* position (usually last savebed) */
…		…
3043	void	3009	void
3044	make_visible (object *op)	3010	make_visible (object *op)
3045	{	3011	{
3046	op->hide = 0;	3012	op->hide = 0;
3047	op->invisible = 0;	3013	op->invisible = 0;
		3014
3048	if (op->type == PLAYER)	3015	if (op->type == PLAYER)
3049	{	3016	{
3050	op->contr->tmp_invis = 0;	3017	op->contr->tmp_invis = 0;
3051	op->contr->invis_race = 0;	3018	op->contr->invis_race = 0;
3052	}	3019	}
…		…
3055	}	3022	}
3056		3023
3057	int	3024	int
3058	is_true_undead (object *op)	3025	is_true_undead (object *op)
3059	{	3026	{
3060	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3027	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3061	return 1;	3028	return 1;
3062		3029
3063	return 0;	3030	return 0;
3064	}	3031	}
3065		3032
3066	/* look at the surrounding terrain to determine	3033	/* look at the surrounding terrain to determine
3067	* the hideability of this object. Positive levels	3034	* the hideability of this object. Positive levels
3068	* indicate greater hideability.	3035	* indicate greater hideability.
3069	*/	3036	*/
3070
3071	int	3037	int
3072	hideability (object *ob)	3038	hideability (object *ob)
3073	{	3039	{
3074	int i, level = 0, mflag;	3040	int i, level = 0, mflag;
3075	sint16 x, y;	3041	sint16 x, y;
…		…
3085	* as bad as carrying a light on a pitch dark map */	3051	* as bad as carrying a light on a pitch dark map */
3086	if (has_carried_lights (ob))	3052	if (has_carried_lights (ob))
3087	level = -(10 + (2 * ob->map->darkness));	3053	level = -(10 + (2 * ob->map->darkness));
3088		3054
3089	/* scan through all nearby squares for terrain to hide in */	3055	/* scan through all nearby squares for terrain to hide in */
3090	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])
3091	{	3059	{
3092	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3060	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3093	if (mflag & P_OUT_OF_MAP)	3061	if (mflag & P_OUT_OF_MAP)
3094	{
3095	continue;	3062	continue;
3096	}	3063
3097	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3064	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3098	level += 2;	3065	level += 2;
3099	else /* open terrain! */	3066	else /* open terrain! */
3100	level -= 1;	3067	level -= 1;
3101	}	3068	}
…		…
3109	/* For Hidden creatures - a chance of becoming 'unhidden'	3076	/* For Hidden creatures - a chance of becoming 'unhidden'
3110	* every time they move - as we subtract off 'invisibility'	3077	* every time they move - as we subtract off 'invisibility'
3111	* AND, for players, if they move into a ridiculously unhideable	3078	* AND, for players, if they move into a ridiculously unhideable
3112	* spot (surrounded by clear terrain in broad daylight). -b.t.	3079	* spot (surrounded by clear terrain in broad daylight). -b.t.
3113	*/	3080	*/
3114
3115	void	3081	void
3116	do_hidden_move (object *op)	3082	do_hidden_move (object *op)
3117	{	3083	{
3118	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3084	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3119	object *skop;	3085	object *skop;
…		…
3201	* object op. This function works fine for monsters,	3167	* object op. This function works fine for monsters,
3202	* 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
3203	* a pile (say a coin under a table would return "viewable"	3169	* a pile (say a coin under a table would return "viewable"
3204	* by this routine). Another question, should we be	3170	* by this routine). Another question, should we be
3205	* concerned with the direction the player is looking	3171	* concerned with the direction the player is looking
3206	* in? Realistically, most of use cant see stuff behind	3172	* in? Realistically, most of us can't see stuff behind
3207	* our backs...on the other hand, does the "facing" direction	3173	* our backs...on the other hand, does the "facing" direction
3208	* imply the way your head, or body is facing? Its possible	3174	* imply the way your head, or body is facing? It's possible
3209	* 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.
3210	* -b.t.	3176	* -b.t.
3211	* This function is now map tiling safe.	3177	* This function is now map tiling safe.
3212	*/	3178	*/
3213
3214	int	3179	int
3215	player_can_view (object *pl, object *op)	3180	player_can_view (object *pl, object *op)
3216	{	3181	{
3217	rv_vector rv;	3182	rv_vector rv;
3218	int dx, dy;	3183	int dx, dy;
…		…
3230		3195
3231	get_rangevector (pl, op, &rv, 0x1);	3196	get_rangevector (pl, op, &rv, 0x1);
3232		3197
3233	/* starting with the 'head' part, lets loop	3198	/* starting with the 'head' part, lets loop
3234	* through the object and find if it has any	3199	* through the object and find if it has any
3235	* part that is in the los array but isnt on	3200	* part that is in the los array but isn't on
3236	* a blocked los square.	3201	* a blocked los square.
3237	* we use the archetype to figure out offsets.	3202	* we use the archetype to figure out offsets.
3238	*/	3203	*/
3239	while (op)	3204	while (op)
3240	{	3205	{
3241	dx = rv.distance_x + op->arch->clone.x;	3206	dx = rv.distance_x + op->arch->x;
3242	dy = rv.distance_y + op->arch->clone.y;	3207	dy = rv.distance_y + op->arch->y;
3243		3208
3244	/* only the viewable area the player sees is updated by LOS	3209	/* only the viewable area the player sees is updated by LOS
3245	* 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
3246	* for any meaningful values.	3211	* for any meaningful values.
3247	*/	3212	*/
3248	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3213	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3249	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3214	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3250	!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)])
3251	return 1;	3216	return 1;
		3217
3252	op = op->more;	3218	op = op->more;
3253	}	3219	}
		3220
3254	return 0;	3221	return 0;
3255	}	3222	}
3256		3223
3257	/* routine for both players and monsters. We call this when	3224	/* routine for both players and monsters. We call this when
3258	* there is a possibility for our action distrubing our hiding	3225	* there is a possibility for our action distrubing our hiding
…		…
3261	* return 0.	3228	* return 0.
3262	*/	3229	*/
3263	int	3230	int
3264	action_makes_visible (object *op)	3231	action_makes_visible (object *op)
3265	{	3232	{
3266
3267	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3233	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3268	{	3234	{
3269	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3235	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3270	return 0;	3236	return 0;
3271		3237
…		…
3277	{	3243	{
3278	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");
3279	return 1;	3245	return 1;
3280	}	3246	}
3281	}	3247	}
		3248
3282	return 0;	3249	return 0;
3283	}	3250	}
3284		3251
3285	/* op_on_battleground - checks if the given object op (usually	3252	/* op_on_battleground - checks if the given object op (usually
3286	* a player) is standing on a valid battleground-tile,	3253	* a player) is standing on a valid battleground-tile,
…		…
3291	* 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
3292	*/	3259	*/
3293	int	3260	int
3294	op_on_battleground (object *op, int *x, int *y)	3261	op_on_battleground (object *op, int *x, int *y)
3295	{	3262	{
3296	object *tmp;
3297
3298	/* A battleground-tile needs the following attributes to be valid:	3263	/* A battleground-tile needs the following attributes to be valid:
3299	* 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),
3300	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3265	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3301	* and the exit-coordinates sp/hp must both be > 0.	3266	* and the exit-coordinates sp/hp must both be > 0.
3302	* => The intention here is to prevent abuse of the battleground-	3267	* => The intention here is to prevent abuse of the battleground-
3303	* feature (like pickable or hidden battleground tiles). */	3268	* feature (like pickable or hidden battleground tiles). */
3304	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3269	for (object *tmp = op->below; tmp; tmp = tmp->below)
3305	{	3270	{
3306	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3271	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3307	{	3272	{
3308	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3273	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3309	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))
3310	{	3277	{
3311	/*before we assign the exit, check if this is a teambattle */	3278	/* before we assign the exit, check if this is a teambattle */
3312	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))
3313	{	3280	{
3314	object *invtmp;
3315
3316	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3281	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3317	{	3282	{
3318	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3283	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3319	{	3284	{
3320	if (x != NULL && y != NULL)	3285	if (x && y)
3321	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3286	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3287
3322	return 1;	3288	return 1;
3323	}	3289	}
3324	}	3290	}
3325	}	3291	}
		3292
3326	if (x != NULL && y != NULL)	3293	if (x && y)
3327	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3294	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3295
3328	return 1;	3296	return 1;
3329	}	3297	}
3330	}	3298	}
3331	}	3299	}
		3300
3332	/* If we got here, did not find a battleground */	3301	/* If we got here, did not find a battleground */
3333	return 0;	3302	return 0;
3334	}	3303	}
3335		3304
3336	/*	3305	/*
…		…
3352	char buf[MAX_BUF]; /* tmp. string buffer */	3321	char buf[MAX_BUF]; /* tmp. string buffer */
3353	int i = 0, j = 0;	3322	int i = 0, j = 0;
3354		3323
3355	/* get the appropriate treasurelist */	3324	/* get the appropriate treasurelist */
3356	if (atnr == ATNR_FIRE)	3325	if (atnr == ATNR_FIRE)
3357	trlist = treasurelist::find ("dragon_ability_fire");	3326	trlist = treasurelist::find (shstr_dragon_ability_fire);
3358	else if (atnr == ATNR_COLD)	3327	else if (atnr == ATNR_COLD)
3359	trlist = treasurelist::find ("dragon_ability_cold");	3328	trlist = treasurelist::find (shstr_dragon_ability_cold);
3360	else if (atnr == ATNR_ELECTRICITY)	3329	else if (atnr == ATNR_ELECTRICITY)
3361	trlist = treasurelist::find ("dragon_ability_elec");	3330	trlist = treasurelist::find (shstr_dragon_ability_elec);
3362	else if (atnr == ATNR_POISON)	3331	else if (atnr == ATNR_POISON)
3363	trlist = treasurelist::find ("dragon_ability_poison");	3332	trlist = treasurelist::find (shstr_dragon_ability_poison);
3364		3333
3365	if (trlist == NULL || who->type != PLAYER)	3334	if (trlist == NULL || who->type != PLAYER)
3366	return;	3335	return;
3367		3336
3368	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++);
…		…
3372	/* 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]); */
3373	return;	3342	return;
3374	}	3343	}
3375		3344
3376	/* everything seems okay - now bring on the gift: */	3345	/* everything seems okay - now bring on the gift: */
3377	item = &(tr->item->clone);	3346	item = tr->item;
3378		3347
3379	if (item->type == SPELL)	3348	if (item->type == SPELL)
3380	{	3349	{
3381	if (check_spell_known (who, item->name))	3350	if (check_spell_known (who, item->name))
3382	return;	3351	return;
…		…
3441	{	3410	{
3442	/* forces in the treasurelist can alter the player's stats */	3411	/* forces in the treasurelist can alter the player's stats */
3443	object *skin;	3412	object *skin;
3444		3413
3445	/* first get the dragon skin force */	3414	/* first get the dragon skin force */
3446	shstr_cmp dragon_skin_force ("dragon_skin_force");
3447	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)
3448	;	3416	;
3449		3417
3450	if (!skin)	3418	if (!skin)
3451	return;	3419	return;
3452		3420
…		…
3528	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))
3529	return 0;	3497	return 0;
3530		3498
3531	return 100 - blocked_los [x][y];	3499	return 100 - blocked_los [x][y];
3532	}	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