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.139 by root, Fri May 18 01:01:02 2007 UTC vs.
Revision 1.195 by root, Mon May 5 15:21:50 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,2008 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>
…		…
147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);	147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);	148	close_and_delete (fp, comp);
150	}	149	}
151		150
152	float
153	player::weapon_speed () const
154	{
155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156	}
157
158	/* This loads the first map an puts the player on it. */	151	/* This loads the first map an puts the player on it. */
159	static void	152	static void
160	set_first_map (object *op)	153	set_first_map (object *op)
161	{	154	{
162	op->contr->maplevel = first_map_path;	155	op->contr->maplevel = first_map_path;
163	op->x = -1;	156	op->x = -1;
164	op->y = -1;	157	op->y = -1;
165	}
166
167	void
168	player::enter_map ()
169	{
170	object *tmp = object::create ();
171
172	EXIT_PATH (tmp) = maplevel;
173	EXIT_X (tmp) = ob->x;
174	EXIT_Y (tmp) = ob->y;
175	ob->enter_exit (tmp);
176
177	tmp->destroy ();
178	}	158	}
179		159
180	void	160	void
181	player::activate ()	161	player::activate ()
182	{	162	{
…		…
187	ob->remove ();	167	ob->remove ();
188	ob->map = 0;	168	ob->map = 0;
189	ob->activate_recursive ();	169	ob->activate_recursive ();
190	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
191	add_friendly_object (ob);	171	add_friendly_object (ob);
192	enter_map ();
193	}	172	}
194		173
195	void	174	void
196	player::deactivate ()	175	player::deactivate ()
197	{	176	{
…		…
204		183
205	if (ob->map)	184	if (ob->map)
206	maplevel = ob->map->path;	185	maplevel = ob->map->path;
207		186
208	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
209	ob->map = 0;	189	ob->map = 0;
210	party = 0;	190	party = 0;
211		191
212	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
213		193
…		…
227	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
228		208
229	ns->update_look = 0;	209	ns->update_look = 0;
230	ns->look_position = 0;	210	ns->look_position = 0;
231		211
232	clear_los (ob);	212	clear_los (this);
233		213
234	ns->reset_stats ();	214	ns->reset_stats ();
235		215
236	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
237	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
238	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
239		219
240	ob->carrying = sum_weight (ob);	220	ob->update_weight ();
241	link_player_skills (ob);	221	link_player_skills (ob);
242		222
243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
244		224
245	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
246		226
247	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
248	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
249	{	229	{
250	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
251		231
252	shstr_cmp dragon_ability_force ("dragon_ability_force");
253	shstr_cmp dragon_skin_force ("dragon_skin_force");
254
255	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
256	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
257	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
258	abil = tmp;	235	abil = tmp;
259	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
260	skin = tmp;	237	skin = tmp;
261		238
262	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
263	}	240	}
264		241
265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266		243
267	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this);
		245
		246	ob->update_stats ();
		247
		248	ns->floorbox_update ();
		249	esrv_send_inventory (ob, ob);
		250	esrv_add_spells (this, 0);
		251
		252	activate ();
		253
		254	send_rules (ob);
		255	send_news (ob);
		256	display_motd (ob);
		257
		258	INVOKE_PLAYER (CONNECT, this);
		259	INVOKE_PLAYER (LOGIN, this);
		260	}
		261
		262	void
		263	player::disconnect ()
		264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
		271	if (ns)
		272	{
		273	if (active)
		274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		275
		276	INVOKE_PLAYER (DISCONNECT, this);
		277
		278	ns->reset_stats ();
		279	ns->pl = 0;
		280	ns = 0;
		281	}
		282
		283	observe = ob;
		284
		285	deactivate ();
		286	}
		287
		288	// the need for this function can be explained
		289	// by load_object not returning the object
		290	void
		291	player::set_object (object *op)
		292	{
		293	ob = observe = op;
		294	ob->contr = this; /* this aren't yet in archetype */
		295
		296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
		299	ob->direction = 5; /* So player faces south */
268		300
269	ob->flag [FLAG_READY_WEAPON] = false;	301	ob->flag [FLAG_READY_WEAPON] = false;
270	ob->flag [FLAG_READY_SKILL] = false;	302	ob->flag [FLAG_READY_SKILL] = false;
271	ob->flag [FLAG_READY_BOW] = false;	303	ob->flag [FLAG_READY_BOW] = false;
272		304
273	for (object *op = ob->inv; op; op = op->below)	305	for (object *op = ob->inv; op; op = op->below)
274	if (op->flag [FLAG_APPLIED])	306	if (op->flag [FLAG_APPLIED])
275	switch (op->type)	307	switch (op->type)
276	{	308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
277	case WAND:	313	case WAND:
278	case ROD:	314	case ROD:
279	case HORN:	315	case HORN:
280	case BOW:	316	case BOW:
281	case SKILL_TOOL:	317	ranged_ob = op;
		318	break;
		319
282	case WEAPON:	320	case WEAPON:
283	op->flag [FLAG_APPLIED] = false;	321	combat_ob = op;
284	apply_special (ob, op, AP_APPLY);
285	break;	322	break;
286
287	case SKILL:
288	op->flag [FLAG_APPLIED] = false;
289	break;
290	}	323	}
291		324
292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
293	ob->update_stats ();	326	ob->deactivate (); // change_Weapon activates, fix this better
294
295	ns->floorbox_update ();
296	esrv_send_inventory (ob, ob);
297	esrv_add_spells (this, 0);
298
299	activate ();
300
301	send_rules (ob);
302	send_news (ob);
303	display_motd (ob);
304
305	INVOKE_PLAYER (CONNECT, this);
306	INVOKE_PLAYER (LOGIN, this);
307	}	327	}
308		328
309	void	329	void
310	player::disconnect ()
311	{
312	if (ns)
313	{
314	if (active)
315	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
316
317	INVOKE_PLAYER (DISCONNECT, this);
318
319	ns->reset_stats ();
320	ns->pl = 0;
321	ns = 0;
322	}
323
324	if (ob)
325	ob->close_container (); //TODO: client-specific
326
327	deactivate ();
328	}
329
330	// the need for this function can be explained
331	// by load_object not returning the object
332	void
333	player::set_object (object *op)	330	player::set_observe (object *op)
334	{	331	{
335	ob = op;	332	observe = op ? op : ob;
336	ob->contr = this; /* this aren't yet in archetype */	333	do_los = 1;
337
338	ob->speed_left = 0.5f;
339	ob->speed = 1.0f;
340	ob->direction = 5; /* So player faces south */
341	}	334	}
342		335
343	player::player ()	336	player::player ()
344	{	337	{
345	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
356	petmode = pet_normal;	349	petmode = pet_normal;
357	listening = 10;	350	listening = 10;
358	usekeys = containers;	351	usekeys = containers;
359	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
360	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
361	}	357	}
362		358
363	void	359	void
364	player::do_destroy ()	360	player::do_destroy ()
365	{	361	{
…		…
370	if (ob)	366	if (ob)
371	{	367	{
372	ob->destroy_inv (false);	368	ob->destroy_inv (false);
373	ob->destroy ();	369	ob->destroy ();
374	}	370	}
		371
		372	ob = observe = 0;
375	}	373	}
376		374
377	player::~player ()	375	player::~player ()
378	{	376	{
379	/* Clear item stack */	377	/* Clear item stack */
…		…
406	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
407	*/	405	*/
408	archetype *	406	archetype *
409	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
410	{	408	{
411	archetype *start = at;	409	// archetypes could have been reloaded
		410	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		411
		412	if (!nat)
		413	return at;
		414
		415	archvec::iterator i = archetypes.find (nat);
412		416
413	for (;;)	417	for (;;)
414	{	418	{
415	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
416	at = first_archetype;	420	i = archetypes.begin ();
417	else	421	else if (*i == at)
418	at = at->next;	422	cleanup ("not a single player archetype found");
419		423
420	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
421	return at;	425	return *i;
422
423	if (at == start)
424	{
425	LOG (llevError, "No Player archetypes\n");
426	exit (-1);
427	}
428	}	426	}
429	}	427	}
430		428
431	object *	429	object *
432	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
436	unsigned lastdist;	434	unsigned lastdist;
437	rv_vector rv;	435	rv_vector rv;
438		436
439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
440	{	438	{
441	/* We should not find free objects on this friendly list, but it
442	* does periodically happen. Given that, lets deal with it.
443	* While unlikely, it is possible the next object on the friendly
444	* list is also free, so encapsulate this in a while loop.
445	*/
446	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
447	{
448	object *tmp = ol->ob;
449
450	/* Can't do much more other than log the fact, because the object
451	* itself will have been cleared.
452	*/
453	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
454	tmp->debug_desc ());
455	ol = ol->next;
456	remove_friendly_object (tmp);
457	if (!ol)
458	return op;
459	}
460
461	/* Remove special check for player from this. First, it looks to cause
462	* some crashes (ol->ob->contr not set properly?), but secondly, a more
463	* complicated method of state checking would be needed in any case -
464	* as it was, a clever player could type quit, and the function would
465	* skip them over while waiting for confirmation. Remove
466	* on_same_map check, as can_detect_enemy also does this
467	*/
468	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
469	continue;	440	continue;
470		441
471	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
472	{	443	{
…		…
667		638
668	return firstdir;	639	return firstdir;
669	}	640	}
670		641
671	void	642	void
672	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
673	{	644	{
674	object *op, *next = NULL;
675
676	if (pl->randomitems != NULL)	645	if (pl->randomitems)
677	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
678		647
679	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
680	{	649	{
681	next = op->below;	650	next = op->below;
682		651
683	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
684	* flag "neutral" set. Sorry but I can't think of a better way	653	* flag "neutral" set. Sorry but I can't think of a better way
…		…
689	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
690	* by this player due to race restrictions	659	* by this player due to race restrictions
691	*/	660	*/
692	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
693	{	662	{
694	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
695	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
696	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
697	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
698	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	669	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
699	{	670	{
700	op->destroy ();	671	op->destroy ();
701	continue;	672	continue;
702	}	673	}
703	}	674	}
…		…
726	if (op->nrof > 1)	697	if (op->nrof > 1)
727	op->nrof = 1;	698	op->nrof = 1;
728	}	699	}
729		700
730	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
731	{
732	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
733	}
734		703
735	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
736	* items. Just don't identify gold or silver, or it won't be	705	* items. Just don't identify gold or silver, or it won't be
737	* merged properly.	706	* merged properly.
738	*/	707	*/
739	if (need_identify (op))	708	if (need_identify (op))
740	{	709	{
741	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
742	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
743	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
744	}	713	}
		714
745	if (op->type == SPELL)	715	if (op->type == SPELL)
746	{	716	{
747	op->destroy ();	717	op->destroy ();
748	continue;	718	continue;
749	}	719	}
…		…
751	{	721	{
752	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
753	op->stats.exp = 0;	723	op->stats.exp = 0;
754	op->level = 1;	724	op->level = 1;
755	}	725	}
756	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
757	else
758	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
759	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
760		729
761	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
762	link_player_skills (pl);	731	link_player_skills (pl);
…		…
868	static void	837	static void
869	start_info (object *op)	838	start_info (object *op)
870	{	839	{
871	char buf[MAX_BUF];	840	char buf[MAX_BUF];
872		841
873	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
874	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
875	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
876	//new_draw_info (NDI_UNIQUE, 0, op, " ");
877	}	844	}
878		845
879	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
880	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
881	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
884	*/	851	*/
885	void	852	void
886	player::chargen_race_done ()	853	player::chargen_race_done ()
887	{	854	{
888	/* this must before then initial items are given */	855	/* this must before then initial items are given */
889	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
890		857
891	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
892	if (tl)	859	if (tl)
893	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
894		861
…		…
922	if (*first_map_ext_path)	889	if (*first_map_ext_path)
923	{	890	{
924	object *tmp;	891	object *tmp;
925	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
926		893
927	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);	894	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
928	tmp = object::create ();	895	tmp = object::create ();
929	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
930	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
931	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
932	ob->enter_exit (tmp); /* we don't really care if it succeeded;	899	ob->enter_exit (tmp); /* we don't really care if it succeeded;
…		…
951	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
952		919
953	ob->remove_statbonus ();	920	ob->remove_statbonus ();
954	ob->remove ();	921	ob->remove ();
955	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
956	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
957	ob->instantiate ();	924	ob->instantiate ();
958	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
959	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
960	ob->x = x;	927	ob->x = x;
961	ob->y = y;	928	ob->y = y;
962	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
963	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
964	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
965	ob->add_statbonus ();	932	ob->add_statbonus ();
966	}	933	}
967	while (!allowed_class (ob));	934	while (!allowed_class (ob));
968		935
969	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1044	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1045	return 1;	1012	return 1;
1046		1013
1047	next = op->below;	1014	next = op->below;
1048		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1049	/* loop while there are items on the floor that are not marked as	1019	/* loop while there are items on the floor that are not marked as
1050	* destroyed */	1020	* destroyed */
1051	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1052	{	1022	{
1053	tmp = next;	1023	tmp = next;
1054	next = tmp->below;	1024	next = tmp->below;
1055		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1056	if (op->destroyed ())	1032	if (op->destroyed ())
1057	return 0;	1033	return 0;
1058		1034
1059	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1060	continue;	1036	continue;
1061		1037
1062	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1063	{	1039	{
1064	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1065	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1066	continue;	1042	continue;
1067	}	1043	}
1068		1044
1069	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1070	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1072	switch (op->contr->mode)	1048	switch (op->contr->mode)
1073	{	1049	{
1074	case 0:	1050	case 0:
1075	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1076	case 1:	1052	case 1:
1077	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1078	return 1;	1054	return 1;
1079	case 2:	1055	case 2:
1080	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1081	return 0;	1057	return 0;
1082	case 3:	1058	case 3:
1083	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1084	case 4:	1060	case 4:
1085	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1086	break;	1062	break;
1087	case 5:	1063	case 5:
1088	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1089	stop = 1;	1065	stop = 1;
1090	break;	1066	break;
1091	case 6:	1067	case 6:
1092	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1093	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1094	break;	1071	break;
1095		1072
1096	case 7:	1073	case 7:
1097	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1098	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1099	break;	1076	break;
1100		1077
1101	default:	1078	default:
1102	/* use value density */	1079	/* use value density */
1103	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1104	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1081	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1105	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1106	}	1083	}
1107	}	1084	}
1108	else	1085	else
1109	{ /* old model */	1086	{ /* old model */
1110	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1114	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1115	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1116	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1093	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1117	else	1094	else
1118	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1119	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1096	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1120		1097
1121	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1122	}	1099	}
1123		1100
1124	/* philosophy:	1101	/* philosophy:
…		…
1165	/* all food and drink if desired */	1142	/* all food and drink if desired */
1166	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1167	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1168	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1169	{	1146	{
1170	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1171	continue;	1148	continue;
1172	}	1149	}
1173		1150
1174	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1175	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1152	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1176	{	1153	{
1177	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1178	continue;	1155	continue;
1179	}	1156	}
1180		1157
1181	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1182	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1183	{	1160	{
1184	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1185	continue;	1162	continue;
1186	}	1163	}
1187		1164
1188	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1189	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1190	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1191	{	1168	{
1192	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1193	continue;	1170	continue;
1194	}	1171	}
1195		1172
1196	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1197	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1198	{	1175	{
1199	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1200	continue;	1177	continue;
1201	}	1178	}
1202		1179
1203	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1204	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1205	{	1182	{
1206	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1207	continue;	1184	continue;
1208	}	1185	}
1209		1186
1210	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1211	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1212	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1213	{	1190	{
1214	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1215	continue;	1192	continue;
1216	}	1193	}
1217		1194
1218	/* pick up all magical items */	1195	/* pick up all magical items */
1219	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1220	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1197	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1221	{	1198	{
1222	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1223	continue;	1200	continue;
1224	}	1201	}
1225		1202
1226	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1227	{	1204	{
1228	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1229	{	1206	{
1230	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1231	continue;	1208	continue;
1232	}	1209	}
1233	}	1210	}
1234		1211
1235	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1236	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1237	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1238	{	1215	{
1239	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1240	continue;	1217	continue;
1241	}	1218	}
1242		1219
1243	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1244	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1245	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1246	{	1223	{
1247	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1248	continue;	1225	continue;
1249	}	1226	}
1250		1227
1251	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1252	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1253	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1254	{	1231	{
1255	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1256	continue;	1233	continue;
1257	}	1234	}
1258		1235
1259	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1260	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1261	{	1238	{
1262	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1263	continue;	1240	continue;
1264	}	1241	}
1265		1242
1266	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1267	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1268	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1269	{	1246	{
1270	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1271	continue;	1248	continue;
1272	}	1249	}
1273		1250
1274	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1275	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1276	{	1253	{
1277	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1278	continue;	1255	continue;
1279	}	1256	}
1280		1257
1281	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1282	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1283	{	1260	{
1284	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1285	continue;	1262	continue;
1286	}	1263	}
1287		1264
1288	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1289	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1290	{	1267	{
1291	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1292	continue;	1269	continue;
1293	}	1270	}
1294		1271
1295	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1296	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1297	{	1274	{
1298	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1299	continue;	1276	continue;
1300	}	1277	}
1301		1278
1302	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1303	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1304	{	1281	{
1305	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1306	continue;	1283	continue;
1307	}	1284	}
1308		1285
1309	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1310	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1311	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1312	{	1289	{
1313	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1314	continue;	1291	continue;
1315	}	1292	}
1316		1293
1317	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1318	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1319	{	1296	{
1320	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1321	{	1298	{
1322	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1299	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1323	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1324	{	1301	{
1325	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1326	continue;	1303	continue;
1327	}	1304	}
1328	}	1305	}
1329		1306
1330	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1331	{	1308	{
1332	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1309	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1333	{	1310	{
1334	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1335	continue;	1312	continue;
1336	}	1313	}
1337	}	1314	}
1338	}	1315	}
1339		1316
1340	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1341	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1342	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1343	{	1320	{
1344	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1345	continue;	1322	continue;
1346	}	1323	}
1347		1324
1348	/* any of the last 4 bits set means we use the ratio for value	1325	/* any of the last 4 bits set means we use the ratio for value
1349	* pickups */	1326	* pickups */
…		…
1354	/* >=7 is the old standard setting. Now we take the last 4 bits	1331	/* >=7 is the old standard setting. Now we take the last 4 bits
1355	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1356	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1357	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1334	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1358	{	1335	{
1359	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1360	#if 0	1337	#if 0
1361	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1362	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1363	{	1340	{
1364	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1365	}	1342	}
1366	else	1343	else
1367	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1368	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1369	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1346	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1370	#endif	1347	#endif
1371	continue;	1348	continue;
1372	}	1349	}
…		…
1383	* found object is returned.	1360	* found object is returned.
1384	*/	1361	*/
1385	object *	1362	object *
1386	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1387	{	1364	{
1388	object *tmp = 0;
1389
1390	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1391	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1392	tmp = find_arrow (op, type);
1393	else if (op->type == ARROW && op->race == type)	1366	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1367	return splay (tmp);
		1368
		1369	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1370	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1371	if (object *arrow = find_arrow (tmp, type))
		1372	{
		1373	splay (tmp);
1394	return op;	1374	return arrow;
		1375	}
1395		1376
1396	return tmp;	1377	return 0;
1397	}	1378	}
1398		1379
1399	/*	1380	/*
1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1381	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1401	* against the target. A full test is not performed, simply a basic test	1382	* against the target. A full test is not performed, simply a basic test
…		…
1424	}	1405	}
1425	}	1406	}
1426	else if (arrow->type == ARROW && arrow->race == type)	1407	else if (arrow->type == ARROW && arrow->race == type)
1427	{	1408	{
1428	/* allways prefer assasination/slaying */	1409	/* allways prefer assasination/slaying */
1429	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1410	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1430	{	1411	{
1431	if (arrow->attacktype & AT_DEATH)	1412	if (arrow->attacktype & AT_DEATH)
1432	{	1413	{
1433	*better = 100;	1414	*better = 100;
1434	return arrow;	1415	return arrow;
…		…
1442	else	1423	else
1443	{	1424	{
1444	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1445	{	1426	{
1446	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1447	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1448	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1429	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1449	{	1430	{
1450	tmp = arrow;	1431	tmp = arrow;
1451	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1432	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1452	}	1433	}
1453	}	1434	}
1454	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1455	{	1436	{
1456	tmp = arrow;	1437	tmp = arrow;
…		…
1462	betterby = 1 + arrow->magic + arrow->stats.dam;	1443	betterby = 1 + arrow->magic + arrow->stats.dam;
1463	}	1444	}
1464	}	1445	}
1465	}	1446	}
1466	}	1447	}
		1448
1467	if (tmp == NULL && arrow == NULL)	1449	if (tmp == NULL && arrow == NULL)
1468	return find_arrow (op, type);	1450	return find_arrow (op, type);
1469		1451
1470	*better = betterby;	1452	*better = betterby;
1471	return tmp;	1453	return tmp;
…		…
1622	arrow->destroy ();	1604	arrow->destroy ();
1623	return 0;	1605	return 0;
1624	}	1606	}
1625		1607
1626	left = arrow; /* these are arrows left to the player */	1608	left = arrow; /* these are arrows left to the player */
1627	arrow = get_split_ob (arrow, 1);	1609	arrow = arrow->split ();
1628	if (!arrow)	1610	if (!arrow)
1629	{	1611	{
1630	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1612	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1631	return 0;	1613	return 0;
1632	}	1614	}
…		…
1640	arrow->stats.grace = arrow->attacktype;	1622	arrow->stats.grace = arrow->attacktype;
1641		1623
1642	if (arrow->slaying)	1624	if (arrow->slaying)
1643	arrow->spellarg = strdup (arrow->slaying);	1625	arrow->spellarg = strdup (arrow->slaying);
1644		1626
		1627	#if 0
1645	if (player *pl = op->contr)	1628	if (player *pl = op->contr)
1646	{	1629	{
1647	if (!pl->has_hit)
1648	{
1649	pl->has_hit = 1;
1650	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1651	}
1652	#if 0
1653	float speed = pl->weapon_sp;	1630	float speed = pl->weapon_sp;
1654		1631
1655	/* penalize ROF for bestarrow */	1632	/* penalize ROF for bestarrow */
1656	if (pl->bowtype == bow_bestarrow)	1633	if (pl->bowtype == bow_bestarrow)
1657	speed *= .9f;	1634	speed *= .9f;
1658	else	1635	else
1659	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1636	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1660		1637
1661	op->speed_left += speed - op->speed;	1638	op->speed_left += speed - op->speed;
		1639	}
1662	#endif	1640	#endif
1663	}
1664		1641
1665	SET_ANIMATION (arrow, arrow->direction);	1642	SET_ANIMATION (arrow, arrow->direction);
1666		1643
1667	/* update the speed */	1644	/* update the speed */
1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1645	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1669	+ bow->stats.dam / 7.0;	1646	+ bow->stats.dam / 7.f;
1670		1647
1671	arrow->set_speed (max (arrow->speed, 2.0));	1648	arrow->set_speed (max (arrow->speed, 2.f));
1672	arrow->speed_left = 0;	1649	arrow->speed_left = 0;
1673		1650
1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1651	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1675		1652
1676	if (op->type == PLAYER)	1653	if (op->type == PLAYER)
…		…
1699		1676
1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1677	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1701	arrow->move_type = MOVE_FLY_LOW;	1678	arrow->move_type = MOVE_FLY_LOW;
1702	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1679	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1703		1680
1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1681	op->play_sound (sound_find ("fire_arrow"));
1705	m->insert (arrow, sx, sy, op);	1682	m->insert (arrow, sx, sy, op);
1706		1683
1707	if (!arrow->destroyed ())	1684	if (!arrow->destroyed ())
1708	move_arrow (arrow);	1685	move_arrow (arrow);
1709
1710	if (op->type == PLAYER)
1711	{
1712	if (left->destroyed ())
1713	esrv_del_item (op->contr, left->count);
1714	else
1715	esrv_send_item (op, left);
1716	}
1717		1686
1718	return 1;	1687	return 1;
1719	}	1688	}
1720		1689
1721	/* Special fire code for players - this takes into	1690	/* Special fire code for players - this takes into
…		…
1787		1756
1788	if (item->type == WAND)	1757	if (item->type == WAND)
1789	{	1758	{
1790	if (item->stats.food <= 0)	1759	if (item->stats.food <= 0)
1791	{	1760	{
1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1761	op->contr->play_sound (sound_find ("wand_poof"));
1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1762	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1794		1763
1795	return;	1764	return;
1796	}	1765	}
1797	}	1766	}
1798	else if (item->type == ROD || item->type == HORN)	1767	else if (item->type == ROD || item->type == HORN)
1799	{	1768	{
1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1769	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1770
		1771	// using the maximum of the rods charge allows at least one spell cast
		1772	// for a rod or horn, this fixes some broken rods.
		1773	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1801	{	1774	{
1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1775	op->contr->play_sound (sound_find ("wand_poof"));
1803		1776
1804	if (item->type == ROD)	1777	if (item->type == ROD)
1805	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1778	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1806	else	1779	else
1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1820	object *tmp;	1793	object *tmp;
1821		1794
1822	if (item->arch)	1795	if (item->arch)
1823	{	1796	{
1824	CLEAR_FLAG (item, FLAG_ANIMATE);	1797	CLEAR_FLAG (item, FLAG_ANIMATE);
1825	item->face = item->arch->clone.face;	1798	item->face = item->arch->face;
1826	item->set_speed (0);	1799	item->set_speed (0);
1827	}	1800	}
1828		1801
1829	if ((tmp = item->in_player ()))	1802	if (object *pl = item->visible_to ())
1830	esrv_update_item (UPD_ANIM, tmp, item);	1803	esrv_update_item (UPD_ANIM, pl, item);
1831	}	1804	}
1832	}	1805	}
1833	else if (item->type == ROD || item->type == HORN)	1806	else if (item->type == ROD || item->type == HORN)
1834	drain_rod_charge (item);	1807	drain_rod_charge (item);
1835	}	1808	}
1836	}	1809	}
1837		1810
1838	/* Received a fire command for the player - go and do it.	1811	/* Received a fire command for the player - go and do it.
1839	*/	1812	*/
1840	void	1813	bool
1841	fire (object *op, int dir)	1814	fire (object *op, int dir)
1842	{	1815	{
1843	int spellcost = 0;	1816	int spellcost = 0;
1844		1817
1845	/* check for loss of invisiblity/hide */	1818	/* check for loss of invisiblity/hide */
…		…
1849	player *pl = op->contr;	1822	player *pl = op->contr;
1850		1823
1851	if (pl->golem)	1824	if (pl->golem)
1852	{	1825	{
1853	control_golem (op->contr->golem, dir);	1826	control_golem (op->contr->golem, dir);
1854	return;	1827	return false;
1855	}	1828	}
1856		1829
1857	object *ob = pl->ranged_ob;	1830	object *ob = pl->ranged_ob;
1858		1831
1859	if (!ob)	1832	if (!ob)
1860	return;	1833	return false;
1861		1834
1862	if (!op->change_weapon (ob))	1835	if (!op->change_weapon (ob))
1863	return;	1836	return false;
		1837
		1838	if (op->speed_left > 0.f)
		1839	--op->speed_left;
		1840	else
		1841	return false;
1864		1842
1865	switch (ob->type)	1843	switch (ob->type)
1866	{	1844	{
1867	case BOW:	1845	case BOW:
1868	player_fire_bow (op, dir);	1846	player_fire_bow (op, dir);
…		…
1882		1860
1883	default:	1861	default:
1884	fire_misc_object (op, dir);	1862	fire_misc_object (op, dir);
1885	break;	1863	break;
1886	}	1864	}
		1865
		1866	return true;
1887	}	1867	}
1888		1868
1889	/* find_key	1869	/* find_key
1890	* We try to find a key for the door as passed. If we find a key	1870	* We try to find a key for the door as passed. If we find a key
1891	* and successfully use it, we return the key, otherwise NULL	1871	* and successfully use it, we return the key, otherwise NULL
…		…
1978	* 0 otherwise	1958	* 0 otherwise
1979	*/	1959	*/
1980	static int	1960	static int
1981	player_attack_door (object *op, object *door)	1961	player_attack_door (object *op, object *door)
1982	{	1962	{
1983	/* If its a door, try to find a use a key. If we do destroy the door,	1963	/* If its a door, try to find a key. If we do destroy the door,
1984	* might as well return immediately as there is nothing more to do -	1964	* might as well return immediately as there is nothing more to do -
1985	* otherwise, we fall through to the rest of the code.	1965	* otherwise, we fall through to the rest of the code.
1986	*/	1966	*/
1987	object *key = find_key (op, op, door);	1967	object *key = find_key (op, op, door);
1988		1968
1989	/* IF we found a key, do some extra work */	1969	/* If we found a key, do some extra work */
1990	if (key)	1970	if (key)
1991	{	1971	{
1992	object *container = key->env;	1972	object *container = key->env;
1993
1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1995		1973
1996	if (action_makes_visible (op))	1974	if (action_makes_visible (op))
1997	make_visible (op);	1975	make_visible (op);
1998		1976
1999	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1977	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
2001		1979
2002	if (door->type == DOOR)	1980	if (door->type == DOOR)
2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2004	else if (door->type == LOCKED_DOOR)	1982	else if (door->type == LOCKED_DOOR)
2005	{	1983	{
2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1984	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2007	remove_door2 (door); /* remove door without violence ;-) */	1985	remove_door2 (door); /* remove door without violence ;-) */
2008	}	1986	}
2009		1987
2010	/* Do this after we print the message */	1988	/* Do this after we print the message */
2011	decrease_ob (key); /* Use up one of the keys */	1989	key->decrease (); /* Use up one of the keys */
2012	/* Need to update the weight the container the key was in */
2013	if (container != op)
2014	esrv_update_item (UPD_WEIGHT, op, container);
2015		1990
2016	return 1; /* Nothing more to do below */	1991	return 1; /* Nothing more to do below */
2017	}	1992	}
2018	else if (door->type == LOCKED_DOOR)	1993	else if (door->type == LOCKED_DOOR)
2019	{	1994	{
2020	/* Might as well return now - no other way to open this */	1995	/* Might as well return now - no other way to open this */
2021	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...");
2022	return 1;	1997	return 1;
2023	}	1998	}
2024		1999
2025	return 0;	2000	return 0;
2026	}	2001	}
…		…
2029	* It should keep the code cleaner.	2004	* It should keep the code cleaner.
2030	* When this is called, the players direction has been updated	2005	* When this is called, the players direction has been updated
2031	* (taking into account confusion.) The player is also actually	2006	* (taking into account confusion.) The player is also actually
2032	* going to try and move (not fire weapons).	2007	* going to try and move (not fire weapons).
2033	*/	2008	*/
2034	void	2009	bool
2035	move_player_attack (object *op, int dir)	2010	move_player_attack (object *op, int dir)
2036	{	2011	{
2037	object *tmp, *mon;
2038	int on_battleground;	2012	int on_battleground;
2039	maptile *m;
2040		2013
2041	sint16 nx = freearr_x[dir] + op->x;	2014	sint16 nx = freearr_x[dir] + op->x;
2042	sint16 ny = freearr_y[dir] + op->y;	2015	sint16 ny = freearr_y[dir] + op->y;
2043		2016
2044	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	}
2045		2027
2046	/* 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
2047	* 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
2048	* 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
2049	* player. This is a pretty nasty hack, because if we could	2031	* player. This is a pretty nasty hack, because if we could
2050	* 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
2051	* 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
2052	* 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
2053	* move_ob uses.	2035	* move_ob uses.
2054	*/	2036	*/
2055	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2056	{
2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2058	{
2059	m = op->map->xy_find (nx, ny);	2037	maptile *m = op->map->xy_find (nx, ny);
2060	if (!m)
2061	return; /* Don't think this should happen */
2062	}
2063	else
2064	m = op->map;
2065		2038
2066	if (!(tmp = m->at (nx, ny).bot))
2067	return;
2068
2069	mon = 0;
2070	/* 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
2071	* 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.
2072	* 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
2073	* on the space	2042	* on the space
2074	*/	2043	*/
2075	while (tmp)	2044	object *mon;
2076	{	2045	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2077	if (tmp == op)	2046	{
2078	{	2047	if ((mon->flag [FLAG_ALIVE]
2079	tmp = tmp->above;	2048	|| mon->type == LOCKED_DOOR
2080	continue;	2049	|| mon->flag [FLAG_CAN_ROLL])
2081	}
2082
2083	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2084	{
2085	mon = tmp;	2050	&& mon != op)
2086	break;	2051	break;
2087	}	2052	}
2088		2053
2089	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2090	mon = tmp;
2091
2092	tmp = tmp->above;
2093	}
2094
2095	if (!mon) /* This happens anytime the player tries to move */	2054	if (!mon) /* This happens anytime the player tries to move */
2096	return; /* into a wall */	2055	return false; /* into a wall */
2097		2056
2098	if (mon->head)
2099	mon = mon->head;	2057	mon = mon->head_ ();
2100		2058
2101	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)
2102	if (player_attack_door (op, mon))	2061	if (player_attack_door (op, mon))
		2062	{
		2063	--op->contr->weapon_sp_left;
2103	return;	2064	return true;
		2065	}
2104		2066
2105	/* The following deals with possibly attacking peaceful	2067	/* The following deals with possibly attacking peaceful
2106	* or frienddly creatures. Basically, all players are considered	2068	* or friendly creatures. Basically, all players are considered
2107	* unaggressive. If the moving player has peaceful set, then the	2069	* unaggressive. If the moving player has peaceful set, then the
2108	* object should be pushed instead of attacked. It is assumed that	2070	* object should be pushed instead of attacked. It is assumed that
2109	* if you are braced, you will not attack friends accidently,	2071	* if you are braced, you will not attack friends accidently,
2110	* and thus will not push them.	2072	* and thus will not push them.
2111	*/	2073	*/
2112		2074
2113	/* 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
2114	* peaceful. Our assumption is the creature is a pet if the	2076	* peaceful. Our assumption is the creature is a pet if the
2115	* player owns it and it is either friendly or unagressive.	2077	* player owns it and it is either friendly or unagressive.
2116	*/	2078	*/
2117	if (op->type == PLAYER	2079	if (op->type == PLAYER
2118	&& ((mon->owner && mon->owner->contr	2080	&& ((mon->owner && mon->owner->contr
2119	&& same_party (mon->owner->contr->party, op->contr->party))	2081	&& same_party (mon->owner->contr->party, op->contr->party))
2120	|| mon->owner == op)	2082	|| mon->owner == op)
2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2083	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2122	{	2084	{
2123	/* 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 */
2124	if (op->contr->braced)	2086	if (op->contr->braced)
2125	return;	2087	return false;
2126		2088
2127	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"));
2128	push_ob (mon, dir, op);	2094	push_ob (mon, dir, op);
		2095
2129	if (op->contr->tmp_invis || op->hide)	2096	if (op->contr->tmp_invis || op->hide)
2130	make_visible (op);	2097	make_visible (op);
2131		2098
2132	return;	2099	return true;
2133	}	2100	}
		2101	else
		2102	return false;
		2103	}
2134		2104
2135	/* in certain circumstances, you shouldn't attack friendly	2105	/* in certain circumstances, you shouldn't attack friendly
2136	* creatures. Note that if you are braced, you can't push	2106	* creatures. Note that if you are braced, you can't push
2137	* 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
2138	* attack them either.	2108	* attack them either.
2139	*/	2109	*/
2140	if ((mon->type == PLAYER || mon->enemy != op)	2110	if ((mon->type == PLAYER || mon->enemy != op)
2141	&& (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))
2142	&& ((op->contr->peaceful	2112	&& ((op->contr->peaceful
2143	|| (mon->type == PLAYER && mon->contr->peaceful))	2113	|| (mon->type == PLAYER && mon->contr->peaceful))
2144	&& !on_battleground))	2114	&& !on_battleground))
		2115	{
		2116	if (op->speed_left > 0.f)
2145	{	2117	{
		2118	--op->speed_left;
		2119
2146	if (!op->contr->braced)	2120	if (!op->contr->braced)
2147	{	2121	{
2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2122	op->play_sound (sound_find ("push_player"));
2149	push_ob (mon, dir, op);	2123	push_ob (mon, dir, op);
2150	}	2124	}
2151	else	2125	else
2152	new_draw_info (0, 0, op, "You withhold your attack");	2126	op->statusmsg ("You withhold your attack");
2153		2127
2154	if (op->contr->tmp_invis || op->hide)	2128	if (op->contr->tmp_invis || op->hide)
2155	make_visible (op);	2129	make_visible (op);
2156	}
2157		2130
		2131	return true;
		2132	}
		2133	}
2158	/* If the object is a boulder or other rollable object, then	2134	/* If the object is a boulder or other rollable object, then
2159	* 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.
2160	*/	2136	*/
2161	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)
2162	{	2140	{
		2141	--op->speed_left;
		2142
2163	recursive_roll (mon, dir, op);	2143	recursive_roll (mon, dir, op);
2164	if (action_makes_visible (op))	2144	if (action_makes_visible (op))
2165	make_visible (op);	2145	make_visible (op);
2166	}
2167		2146
		2147	return true;
		2148	}
		2149	}
2168	/* Any generic living creature. Including things like doors.	2150	/* Any generic living creature. Including things like doors.
2169	* 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
2170	* and be living. Then, it must be one of the following:	2152	* and be living. Then, it must be one of the following:
2171	* 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
2172	* 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.
2173	*/	2155	*/
2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2156	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2175	((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)))
2176	{	2158	{
2177	if (!op->contr->has_hit)	2159	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2178	{	2160	{
2179	op->contr->has_hit = 1;	2161	--op->contr->weapon_sp_left;
2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2181	}
2182		2162
2183	skill_attack (mon, op, 0, 0, 0);	2163	skill_attack (mon, op, 0, 0, 0);
2184
2185	/* If attacking another player, that player gets automatic
2186	* hitback, and doesn't loose luck either.
2187	* Disable hitback on the battleground or if the target is
2188	* the wiz.
2189	*/
2190	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2191	{
2192	short luck = mon->stats.luck;
2193
2194	mon->contr->has_hit = 1;
2195	skill_attack (op, mon, 0, 0, 0);
2196	mon->stats.luck = luck;
2197	}
2198		2164
2199	if (action_makes_visible (op))	2165	if (action_makes_visible (op))
2200	make_visible (op);	2166	make_visible (op);
2201	}
2202	} /* if player should attack something */
2203	}
2204		2167
2205	int	2168	return true;
		2169	}
		2170	}
		2171
		2172	return false;
		2173	}
		2174
		2175	bool
2206	move_player (object *op, int dir)	2176	move_player (object *op, int dir)
2207	{	2177	{
2208	int pick;	2178	int pick;
2209		2179
2210	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2180	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2211	return 0;	2181	return 0;
2212		2182
2213	/* Sanity check: make sure dir is valid */	2183	/* Sanity check: make sure dir is valid */
2214	if ((dir < 0) || (dir >= 9))	2184	if ((dir < 0) || (dir >= 9))
2215	{	2185	{
…		…
2224	op->facing = dir;	2194	op->facing = dir;
2225		2195
2226	if (op->hide)	2196	if (op->hide)
2227	do_hidden_move (op);	2197	do_hidden_move (op);
2228		2198
		2199	bool retval;
		2200
2229	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2201	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2230	/*nop */ ;	2202	retval = RESULT_INT (0);
2231	else if (op->contr->fire_on)	2203	else if (op->contr->fire_on)
2232	fire (op, dir);	2204	retval = fire (op, dir);
2233	else	2205	else
2234	{	2206	{
2235	move_player_attack (op, dir);	2207	retval = move_player_attack (op, dir);
2236	pick = check_pick (op);	2208	pick = check_pick (op);
2237	}	2209	}
2238		2210
2239	/* 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
2240	* server can handle repeat firing.	2212	* server can handle repeat firing.
…		…
2247	/* Update how the player looks. Use the facing, so direction may	2219	/* Update how the player looks. Use the facing, so direction may
2248	* get reset to zero. This allows for full animation capabilities	2220	* get reset to zero. This allows for full animation capabilities
2249	* for players.	2221	* for players.
2250	*/	2222	*/
2251	animate_object (op, op->facing);	2223	animate_object (op, op->facing);
2252	return 0;	2224
		2225	return retval;
2253	}	2226	}
2254		2227
2255	/* 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
2256	* new client/server stuff.	2229	* new client/server stuff.
2257	* 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
2258	* the new speed values for commands.	2231	* the new speed values for commands.
2259	*	2232	*
2260	* 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.
2261	*/	2236	*/
2262	int	2237	bool
2263	handle_newcs_player (object *op)	2238	handle_newcs_player (object *op)
2264	{	2239	{
2265	if (QUERY_FLAG (op, FLAG_SCARED))	2240	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2241	{
2267	flee_player (op);	2242	if (op->speed_left > 0.f)
2268
2269	/* If player is still scared, that is his action for this tick */
2270	if (op->flag [FLAG_SCARED])
2271	{	2243	{
2272	--op->speed_left;	2244	--op->speed_left;
		2245	flee_player (op);
		2246
2273	return 0;	2247	return true;
2274	}	2248	}
		2249	else
		2250	return false;
2275	}	2251	}
2276		2252
2277	/* 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
2278	* the players time has been increased when doericserver has been	2254	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2255	* called, so we recheck it here.
2280	*/	2256	*/
2281	if (op->contr->ns->handle_command ())	2257	if (op->contr->ns->handle_command ())
2282	return 1;	2258	return true;
2283		2259
2284	if (op->speed_left > 0.f)
2285	{
2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2260	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2287	{
2288	/* All move commands take 1 tick, at least for now */
2289	--op->speed_left;
2290
2291	/* Instead of all the stuff below, let move_player take care
2292	* of it. Also, some of the skill stuff is only put in
2293	* there, as well as the confusion stuff.
2294	*/
2295	move_player (op, op->direction);	2261	return move_player (op, op->direction);
2296		2262
2297	return op->speed_left > 0.f;
2298	}
2299	}
2300
2301	return 0;	2263	return false;
2302	}	2264	}
2303		2265
2304	int	2266	int
2305	save_life (object *op)	2267	save_life (object *op)
2306	{	2268	{
…		…
2308	return 0;	2270	return 0;
2309		2271
2310	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2272	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2311	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2273	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2312	{	2274	{
2313	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2275	op->play_sound (sound_find ("ob_evaporate"));
2314	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));
2315
2316	if (op->contr)
2317	esrv_del_item (op->contr, tmp->count);
2318		2277
2319	tmp->destroy ();	2278	tmp->destroy ();
2320	CLEAR_FLAG (op, FLAG_LIFESAVE);	2279	CLEAR_FLAG (op, FLAG_LIFESAVE);
2321		2280
2322	if (op->stats.hp < 0)	2281	if (op->stats.hp < 0)
…		…
2335	return 0;	2294	return 0;
2336	}	2295	}
2337		2296
2338	/* 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
2339	* 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
2340	* 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
2341	* from.	2300	* from.
2342	*/	2301	*/
		2302	static void
		2303	drop_unpaid_items (object *op, object *env)
		2304	{
		2305	while (op)
		2306	{
		2307	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2308
		2309	if (QUERY_FLAG (op, FLAG_UNPAID))
		2310	op->insert_at (env);
		2311	else if (op->inv)
		2312	drop_unpaid_items (op->inv, env);
		2313
		2314	op = next;
		2315	}
		2316	}
		2317
2343	void	2318	void
2344	remove_unpaid_objects (object *op, object *env)	2319	object::drop_unpaid_items ()
2345	{	2320	{
2346	while (op)	2321	if (!flag [FLAG_REMOVED])
2347	{	2322	::drop_unpaid_items (inv, this);
2348	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2349
2350	if (QUERY_FLAG (op, FLAG_UNPAID))
2351	{
2352	if (env->type == PLAYER)
2353	esrv_del_item (env->contr, op->count);
2354
2355	op->insert_at (env);
2356	}
2357	else if (op->inv)
2358	remove_unpaid_objects (op->inv, env);
2359
2360	op = next;
2361	}
2362	}	2323	}
2363		2324
2364	/*	2325	/*
2365	* Returns pointer a static string containing gravestone text	2326	* Returns pointer a static string containing gravestone text
2366	* Moved from apply.c to player.c - player.c is what	2327	* Moved from apply.c to player.c - player.c is what
2367	* actually uses this function. player.c may not be quite the	2328	* actually uses this function. player.c may not be quite the
2368	* best, a misc file for object actions is probably better,	2329	* best, a misc file for object actions is probably better,
2369	* but there isn't one in the server directory.	2330	* but there isn't one in the server directory.
2370	*/	2331	*/
2371	char *	2332	const char *
2372	gravestone_text (object *op)	2333	gravestone_text (object *op)
2373	{	2334	{
2374	static char buf2[MAX_BUF];	2335	static dynbuf_text buf;
2375	char buf[MAX_BUF];
2376	time_t now = time (NULL);
2377		2336
2378	strcpy (buf2, " R.I.P.\n\n");	2337	buf << "---- R.I.P. ----\n\n";
		2338	op->name;
		2339
2379	if (op->type == PLAYER)	2340	if (op->type == PLAYER)
2380	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2341	buf << " the " << op->contr->title;
2381	else
2382	sprintf (buf, "%s\n", &op->name);
2383		2342
2384	strncat (buf2, " ", 20 - strlen (buf) / 2);	2343	buf << "\n\n";
2385	strcat (buf2, buf);	2344
		2345	buf << "who was level ";
		2346	buf << (sint32)op->level << "\n\n" // OO breakdown
		2347	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2348
2386	if (op->type == PLAYER)	2349	if (op->type == PLAYER)
2387	sprintf (buf, "who was in level %d when killed\n", op->level);	2350	buf << "by " << op->contr->killer_name () << ".\n\n";
2388	else
2389	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2390		2351
2391	strncat (buf2, " ", 20 - strlen (buf) / 2);
2392	strcat (buf2, buf);
2393	if (op->type == PLAYER)
2394	{	2352	{
2395	sprintf (buf, "by %s.\n\n", op->contr->killer);	2353	static char buf2[128];
2396	strncat (buf2, " ", 21 - strlen (buf) / 2);	2354	time_t now = time (NULL);
2397	strcat (buf2, buf);
2398	}
2399
2400	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2355	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2401	strncat (buf2, " ", 20 - strlen (buf) / 2);	2356	buf << buf2;
2402	strcat (buf2, buf);	2357	}
2403		2358
2404	return buf2;	2359	return buf;
2405	}	2360	}
2406		2361
2407	void	2362	void
2408	do_some_living (object *op)	2363	do_some_living (object *op)
2409	{	2364	{
…		…
2461	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2416	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2462	else	2417	else
2463	{	2418	{
2464	gen_grace = op->stats.maxgrace;	2419	gen_grace = op->stats.maxgrace;
2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2420	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2466	}
2467
2468	/* Regenerate Spell Points */
2469	if (!op->contr->golem && --op->last_sp < 0)
2470	{
2471	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2472	if (op->stats.sp < op->stats.maxsp)
2473	{
2474	op->stats.sp++;
2475	/* dms do not consume food */
2476	if (!QUERY_FLAG (op, FLAG_WIZ))
2477	{
2478	op->stats.food--;
2479	if (op->contr->digestion < 0)
2480	op->stats.food += op->contr->digestion;
2481	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2482	op->stats.food = last_food;
2483	}
2484	}
2485
2486	if (max_sp > 1)
2487	{
2488	over_sp = (gen_sp + 10) / rate_sp;
2489	if (over_sp > 0)
2490	{
2491	if (op->stats.sp < op->stats.maxsp)
2492	{
2493	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2494
2495	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2496	op->stats.sp--;
2497
2498	if (op->stats.sp > op->stats.maxsp)
2499	op->stats.sp = op->stats.maxsp;
2500	}
2501	op->last_sp = 0;
2502	}
2503	else
2504	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2505	}
2506	else
2507	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2508	}	2421	}
2509		2422
2510	/* Regenerate Grace */	2423	/* Regenerate Grace */
2511	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2424	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2512	if (--op->last_grace < 0)	2425	if (--op->last_grace < 0)
…		…
2533	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2446	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2534	}	2447	}
2535	/* wearing stuff doesn't detract from grace generation. */	2448	/* wearing stuff doesn't detract from grace generation. */
2536	}	2449	}
2537		2450
		2451	if (op->stats.food > 0)
		2452	{
2538	/* Regenerate Hit Points */	2453	/* Regenerate Spell Points */
2539	if (--op->last_heal < 0)	2454	if (!op->contr->golem && --op->last_sp < 0)
2540	{
2541	if (op->stats.hp < op->stats.maxhp)
2542	{	2455	{
2543	op->stats.hp++;	2456	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2544	/* dms do not consume food */	2457
2545	if (!QUERY_FLAG (op, FLAG_WIZ))	2458	if (op->stats.sp < op->stats.maxsp)
2546	{	2459	{
		2460	op->stats.sp++;
		2461
		2462	/* dms do not consume food */
		2463	if (!QUERY_FLAG (op, FLAG_WIZ))
		2464	{
2547	op->stats.food--;	2465	op->stats.food--;
		2466
2548	if (op->contr->digestion < 0)	2467	if (op->contr->digestion < 0)
2549	op->stats.food += op->contr->digestion;	2468	op->stats.food += op->contr->digestion;
2550	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2469	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2551	op->stats.food = last_food;	2470	op->stats.food = last_food;
		2471	}
2552	}	2472	}
2553	}
2554		2473
2555	if (max_hp > 1)	2474	if (max_sp > 1)
2556	{
2557	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2558	if (over_hp > 0)
2559	{	2475	{
2560	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2476	over_sp = (gen_sp + 10) / rate_sp;
		2477	if (over_sp > 0)
		2478	{
		2479	if (op->stats.sp < op->stats.maxsp)
		2480	{
		2481	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2482
		2483	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2484	op->stats.sp--;
		2485
		2486	if (op->stats.sp > op->stats.maxsp)
		2487	op->stats.sp = op->stats.maxsp;
		2488	}
		2489
2561	op->last_heal = 0;	2490	op->last_sp = 0;
		2491	}
		2492	else
		2493	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2562	}	2494	}
2563	else	2495	else
		2496	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2497	}
		2498
		2499	/* Regenerate Hit Points */
		2500	if (--op->last_heal < 0)
		2501	{
		2502	if (op->stats.hp < op->stats.maxhp)
2564	{	2503	{
2565	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2504	op->stats.hp++;
		2505
		2506	/* dms do not consume food */
		2507	if (!QUERY_FLAG (op, FLAG_WIZ))
		2508	{
		2509	op->stats.food--;
		2510
		2511	if (op->contr->digestion < 0)
		2512	op->stats.food += op->contr->digestion;
		2513	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2514	op->stats.food = last_food;
		2515	}
2566	}	2516	}
		2517
		2518	if (max_hp > 1)
		2519	{
		2520	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2521
		2522	if (over_hp > 0)
		2523	{
		2524	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2525	op->last_heal = 0;
		2526	}
		2527	else
		2528	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2567	}	2529	}
2568	else	2530	else
2569	{
2570	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2531	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2571	}	2532	}
2572	}	2533	}
2573		2534
2574	/* Digestion */	2535	/* Digestion */
2575	if (--op->last_eat < 0)	2536	if (--op->last_eat < 0)
2576	{	2537	{
2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2538	int bonus = max (0, op->contr->digestion),
		2539	penalty = max (0, -op->contr->digestion);
2578		2540
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2541	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2581	else
2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2583		2542
2584	/* dms do not consume food */	2543	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2544	if (!QUERY_FLAG (op, FLAG_WIZ))
2586	op->stats.food--;	2545	op->stats.food--;
2587	}	2546	}
…		…
2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2573	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2615	manual_apply (op, flesh, 0);	2574	manual_apply (op, flesh, 0);
2616	}	2575	}
2617	}	2576	}
2618		2577
2619	while (op->stats.food < 0 && op->stats.hp >= 0)	2578	if (op->stats.food < 0 && op->stats.hp >= -op->stats.food)
2620	op->stats.food++, op->stats.hp--;	2579	{
		2580	op->stats.hp += op->stats.food;
		2581	op->stats.food = 0;
		2582	}
2621		2583
2622	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2584	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2623	kill_player (op);	2585	kill_player (op);
2624	}	2586	}
2625	}	2587	}
…		…
2630	* file.	2592	* file.
2631	*/	2593	*/
2632	void	2594	void
2633	kill_player (object *op)	2595	kill_player (object *op)
2634	{	2596	{
		2597	int x, y;
2635	char buf[MAX_BUF];	2598	char buf[MAX_BUF];
2636	int x, y;
2637
2638	//int i;
2639	maptile *map; /* this is for resurrection */	2599	maptile *map; /* this is for resurrection */
2640
2641	/* int z;
2642	int num_stats_lose;
2643	int lost_a_stat;
2644	int lose_this_stat;
2645	int this_stat; */
2646	int will_kill_again;	2600	int will_kill_again;
2647	archetype *at;	2601	archetype *at;
2648	object *tmp;	2602	object *tmp;
2649		2603
2650	if (save_life (op))	2604	if (save_life (op))
2651	return;	2605	return;
2652
2653		2606
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2607	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2655	* in cities ONLY!!! It is very important that this doesn't get abused.	2608	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2609	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2610	*/
…		…
2673	{	2626	{
2674	tmp->destroy ();	2627	tmp->destroy ();
2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2628	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2676	}	2629	}
2677		2630
2678	cure_disease (op, 0); /* remove any disease */	2631	cure_disease (op, 0, 0); /* remove any disease */
2679	op->stats.hp = op->stats.maxhp;	2632	op->stats.hp = op->stats.maxhp;
2680	if (op->stats.food <= 0)	2633	if (op->stats.food <= 0)
2681	op->stats.food = 999;	2634	op->stats.food = 999;
2682		2635
2683	/* create a bodypart-trophy to make the winner happy */	2636	/* create a bodypart-trophy to make the winner happy */
2684	if (object *tmp = arch_to_object (archetype::find ("finger")))	2637	if (object *tmp = arch_to_object (archetype::find ("finger")))
2685	{	2638	{
2686	sprintf (buf, "%s's finger", &op->name);	2639	tmp->name = format ("%s's finger" , &op->name);
2687	tmp->name = buf;	2640	tmp->name_pl = format ("%s's fingers", &op->name);
2688	sprintf (buf, " This finger has been cut off %s\n"
2689	" the %s, when he was defeated at\n level %d by %s.\n",
2690	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2691	tmp->msg = buf;	2641	tmp->msg = format (
		2642	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2643	&op->name, op->contr->title,
		2644	(int)op->level,
		2645	op->contr->killer_name ()
		2646	);
2692	tmp->value = 0, tmp->type = 0;	2647	tmp->value = 0, tmp->type = 0;
2693	tmp->materialname = "organics";	2648	tmp->materialname = "organics";
2694	tmp->insert_at (op, tmp);	2649	tmp->insert_at (op, tmp);
2695	}	2650	}
2696		2651
…		…
2704		2659
2705	command_kill_pets (op, 0);	2660	command_kill_pets (op, 0);
2706		2661
2707	if (op->stats.food < 0)	2662	if (op->stats.food < 0)
2708	{	2663	{
2709	sprintf (buf, "%s starved to death.", &op->name);	2664	op->contr->killer = archetype::get ("killer_starvation");
2710	strcpy (op->contr->killer, "starvation");	2665	op->contr->killer->destroy ();
2711	}	2666	}
2712	else
2713	sprintf (buf, "%s died.", &op->name);
2714		2667
2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2668	op->contr->play_sound (sound_find ("player_dies"));
2716		2669
2717	/* save the map location for corpse, gravestone */	2670	/* save the map location for corpse, gravestone */
2718	x = op->x;	2671	x = op->x;
2719	y = op->y;	2672	y = op->y;
2720	map = op->map;	2673	map = op->map;
…		…
2827	lost_a_stat = 1;	2780	lost_a_stat = 1;
2828	}	2781	}
2829	}	2782	}
2830	}	2783	}
2831	}	2784	}
		2785
2832	/* If no stat lost, tell the player. */	2786	/* If no stat lost, tell the player. */
2833	if (!lost_a_stat)	2787	if (!lost_a_stat)
2834	{	2788	{
2835	/* determine_god() seems to not work sometimes... why is this?	2789	/* determine_god() seems to not work sometimes... why is this?
2836	Should I be using something else? GD */	2790	Should I be using something else? GD */
…		…
2840	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2794	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2841	else	2795	else
2842	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2796	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2843	}	2797	}
2844	#else	2798	#else
2845	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2799	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2846	#endif	2800	#endif
2847		2801
2848	/* Put a gravestone up where the character 'almost' died. List the	2802	/* Put a gravestone up where the character 'almost' died. List the
2849	* exp loss on the stone.	2803	* exp loss on the stone.
2850	*/	2804	*/
2851	tmp = arch_to_object (archetype::find ("gravestone"));	2805	tmp = arch_to_object (archetype::find ("gravestone"));
2852	sprintf (buf, "%s's gravestone", &op->name);	2806	tmp->name = format ("%s's gravestone", &op->name);
2853	tmp->name = buf;	2807	tmp->name_pl = format ("%s's gravestones", &op->name);
2854	sprintf (buf, "%s's gravestones", &op->name);
2855	tmp->name_pl = buf;
2856	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2808	tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2857	tmp->msg = buf;
2858	tmp->x = op->x, tmp->y = op->y;	2809	tmp->x = op->x, tmp->y = op->y;
2859	insert_ob_in_map (tmp, op->map, NULL, 0);	2810	insert_ob_in_map (tmp, op->map, NULL, 0);
2860		2811
2861	/**************************************/	2812	/**************************************/
2862	/* */	2813	/* */
…		…
2883	{	2834	{
2884	tmp->destroy ();	2835	tmp->destroy ();
2885	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2836	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2886	}	2837	}
2887		2838
2888	cure_disease (op, 0); /* remove any disease */	2839	cure_disease (op, 0, 0); /* remove any disease */
		2840
		2841	// remove all spell effects that are active
		2842	// to avoid long-term effects such as word-of-recall
		2843	for (object *item = op->inv; item; )
		2844	{
		2845	object *next = item->below;
		2846
		2847	if (item->type == SPELL_EFFECT && item->active)
		2848	item->destroy ();
		2849
		2850	item = next;
		2851	}
2889		2852
2890	/*add_exp(op, (op->stats.exp * -0.20)); */	2853	/*add_exp(op, (op->stats.exp * -0.20)); */
2891	apply_death_exp_penalty (op);	2854	apply_death_exp_penalty (op);
		2855
2892	if (op->stats.food < 100)	2856	if (op->stats.food < 100)
2893	op->stats.food = 900;	2857	op->stats.food = 900;
		2858
2894	op->stats.hp = op->stats.maxhp;	2859	op->stats.hp = op->stats.maxhp;
2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2860	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2861	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2897		2862
2898	/*	2863	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2864	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2865	* and put them back in the map.
2901	*/	2866	*/
2902	remove_unpaid_objects (op->inv, op);	2867	op->drop_unpaid_items ();
2903		2868
2904	/****************************************/	2869	/****************************************/
2905	/* */	2870	/* */
2906	/* Move player to his current respawn- */	2871	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2872	/* position (usually last savebed) */
…		…
2966		2931
2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2932	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2968	{	2933	{
2969	if (tmp->nrof > 1)	2934	if (tmp->nrof > 1)
2970	{	2935	{
2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2936	tmp->decrease (rndm (1, tmp->nrof - 1));
2972	tmp2->destroy ();
2973	insert_ob_in_map (tmp, op->map, NULL, 0);	2937	insert_ob_in_map (tmp, op->map, NULL, 0);
2974	}	2938	}
2975	else	2939	else
2976	tmp->destroy ();	2940	tmp->destroy ();
2977	}	2941	}
…		…
2988	void	2952	void
2989	fix_weight (void)	2953	fix_weight (void)
2990	{	2954	{
2991	for_all_players (pl)	2955	for_all_players (pl)
2992	{	2956	{
2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2957	sint32 old = pl->ob->carrying;
2994		2958
2995	if (old == sum)	2959	pl->ob->update_weight ();
2996	continue;	2960
		2961	if (old != pl->ob->carrying)
		2962	{
2997	pl->ob->update_stats ();	2963	pl->ob->update_stats ();
2998	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2964	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2965	}
2999	}	2966	}
3000	}	2967	}
3001		2968
3002	void	2969	void
3003	fix_luck (void)	2970	fix_luck (void)
…		…
3047	void	3014	void
3048	make_visible (object *op)	3015	make_visible (object *op)
3049	{	3016	{
3050	op->hide = 0;	3017	op->hide = 0;
3051	op->invisible = 0;	3018	op->invisible = 0;
		3019
3052	if (op->type == PLAYER)	3020	if (op->type == PLAYER)
3053	{	3021	{
3054	op->contr->tmp_invis = 0;	3022	op->contr->tmp_invis = 0;
3055	op->contr->invis_race = 0;	3023	op->contr->invis_race = 0;
3056	}	3024	}
…		…
3059	}	3027	}
3060		3028
3061	int	3029	int
3062	is_true_undead (object *op)	3030	is_true_undead (object *op)
3063	{	3031	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3032	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3065	return 1;	3033	return 1;
3066		3034
3067	return 0;	3035	return 0;
3068	}	3036	}
3069		3037
3070	/* look at the surrounding terrain to determine	3038	/* look at the surrounding terrain to determine
3071	* the hideability of this object. Positive levels	3039	* the hideability of this object. Positive levels
3072	* indicate greater hideability.	3040	* indicate greater hideability.
3073	*/	3041	*/
3074
3075	int	3042	int
3076	hideability (object *ob)	3043	hideability (object *ob)
3077	{	3044	{
3078	int i, level = 0, mflag;	3045	int i, level = 0, mflag;
3079	sint16 x, y;	3046	sint16 x, y;
…		…
3089	* as bad as carrying a light on a pitch dark map */	3056	* as bad as carrying a light on a pitch dark map */
3090	if (has_carried_lights (ob))	3057	if (has_carried_lights (ob))
3091	level = -(10 + (2 * ob->map->darkness));	3058	level = -(10 + (2 * ob->map->darkness));
3092		3059
3093	/* scan through all nearby squares for terrain to hide in */	3060	/* scan through all nearby squares for terrain to hide in */
3094	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3061	for (i = 0, x = ob->x, y = ob->y;
		3062	i <= SIZEOFFREE1;
		3063	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3095	{	3064	{
3096	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3065	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3097	if (mflag & P_OUT_OF_MAP)	3066	if (mflag & P_OUT_OF_MAP)
3098	{
3099	continue;	3067	continue;
3100	}	3068
3101	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3069	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3102	level += 2;	3070	level += 2;
3103	else /* open terrain! */	3071	else /* open terrain! */
3104	level -= 1;	3072	level -= 1;
3105	}	3073	}
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	3081	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	3082	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	3083	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	3084	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	3085	*/
3118
3119	void	3086	void
3120	do_hidden_move (object *op)	3087	do_hidden_move (object *op)
3121	{	3088	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3089	int hide = 0;
3123	object *skop;
3124		3090
3125	if (!op || !op->map)	3091	if (!op || !op->map)
3126	return;	3092	return;
3127		3093
3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3094	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3095	int num = random_roll (0, 19, op, PREFER_LOW);
3129		3096
3130	/* its *extremely* hard to run and sneak/hide at the same time! */	3097	/* its *extremely* hard to run and sneak/hide at the same time! */
3131	if (op->type == PLAYER && op->contr->run_on)	3098	if (op->type == PLAYER && op->contr->run_on)
3132	if (!skop || num >= skop->level)	3099	if (!skop || num >= skop->level)
3133	{	3100	{
…		…
3143	num -= hide;	3110	num -= hide;
3144		3111
3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3112	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3146	{	3113	{
3147	make_visible (op);	3114	make_visible (op);
		3115
3148	if (op->type == PLAYER)	3116	if (op->type == PLAYER)
3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3117	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3150	}	3118	}
3151	else if (op->type == PLAYER && skop)	3119	else if (op->type == PLAYER && skop)
3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3120	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3205	* object op. This function works fine for monsters,	3173	* object op. This function works fine for monsters,
3206	* but we dont worry if the object isnt the top one in	3174	* but we dont worry if the object isnt the top one in
3207	* a pile (say a coin under a table would return "viewable"	3175	* a pile (say a coin under a table would return "viewable"
3208	* by this routine). Another question, should we be	3176	* by this routine). Another question, should we be
3209	* concerned with the direction the player is looking	3177	* concerned with the direction the player is looking
3210	* in? Realistically, most of use cant see stuff behind	3178	* in? Realistically, most of us can't see stuff behind
3211	* our backs...on the other hand, does the "facing" direction	3179	* our backs...on the other hand, does the "facing" direction
3212	* imply the way your head, or body is facing? Its possible	3180	* imply the way your head, or body is facing? It's possible
3213	* for them to differ. Sigh, this fctn could get a bit more complex.	3181	* for them to differ. Sigh, this fctn could get a bit more complex.
3214	* -b.t.	3182	* -b.t.
3215	* This function is now map tiling safe.	3183	* This function is now map tiling safe.
3216	*/	3184	*/
3217
3218	int	3185	int
3219	player_can_view (object *pl, object *op)	3186	player_can_view (object *pl, object *op)
3220	{	3187	{
3221	rv_vector rv;	3188	rv_vector rv;
3222	int dx, dy;	3189	int dx, dy;
…		…
3234		3201
3235	get_rangevector (pl, op, &rv, 0x1);	3202	get_rangevector (pl, op, &rv, 0x1);
3236		3203
3237	/* starting with the 'head' part, lets loop	3204	/* starting with the 'head' part, lets loop
3238	* through the object and find if it has any	3205	* through the object and find if it has any
3239	* part that is in the los array but isnt on	3206	* part that is in the los array but isn't on
3240	* a blocked los square.	3207	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3208	* we use the archetype to figure out offsets.
3242	*/	3209	*/
3243	while (op)	3210	while (op)
3244	{	3211	{
3245	dx = rv.distance_x + op->arch->clone.x;	3212	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3213	dy = rv.distance_y + op->arch->y;
3247		3214
3248	/* only the viewable area the player sees is updated by LOS	3215	/* only the viewable area the player sees is updated by LOS
3249	* code, so we need to restrict ourselves to that range of values	3216	* code, so we need to restrict ourselves to that range of values
3250	* for any meaningful values.	3217	* for any meaningful values.
3251	*/	3218	*/
3252	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3219	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3253	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3220	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3254	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3221	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3255	return 1;	3222	return 1;
		3223
3256	op = op->more;	3224	op = op->more;
3257	}	3225	}
		3226
3258	return 0;	3227	return 0;
3259	}	3228	}
3260		3229
3261	/* routine for both players and monsters. We call this when	3230	/* routine for both players and monsters. We call this when
3262	* there is a possibility for our action distrubing our hiding	3231	* there is a possibility for our action distrubing our hiding
…		…
3265	* return 0.	3234	* return 0.
3266	*/	3235	*/
3267	int	3236	int
3268	action_makes_visible (object *op)	3237	action_makes_visible (object *op)
3269	{	3238	{
3270
3271	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3239	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3272	{	3240	{
3273	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3241	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3274	return 0;	3242	return 0;
3275		3243
…		…
3281	{	3249	{
3282	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3250	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3283	return 1;	3251	return 1;
3284	}	3252	}
3285	}	3253	}
		3254
3286	return 0;	3255	return 0;
3287	}	3256	}
3288		3257
3289	/* op_on_battleground - checks if the given object op (usually	3258	/* op_on_battleground - checks if the given object op (usually
3290	* a player) is standing on a valid battleground-tile,	3259	* a player) is standing on a valid battleground-tile,
…		…
3295	* Default is to do the same as before, so only people wanting to have different points need worry about this	3264	* Default is to do the same as before, so only people wanting to have different points need worry about this
3296	*/	3265	*/
3297	int	3266	int
3298	op_on_battleground (object *op, int *x, int *y)	3267	op_on_battleground (object *op, int *x, int *y)
3299	{	3268	{
3300	object *tmp;
3301
3302	/* A battleground-tile needs the following attributes to be valid:	3269	/* A battleground-tile needs the following attributes to be valid:
3303	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3270	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3304	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3271	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3305	* and the exit-coordinates sp/hp must both be > 0.	3272	* and the exit-coordinates sp/hp must both be > 0.
3306	* => The intention here is to prevent abuse of the battleground-	3273	* => The intention here is to prevent abuse of the battleground-
3307	* feature (like pickable or hidden battleground tiles). */	3274	* feature (like pickable or hidden battleground tiles). */
3308	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3275	for (object *tmp = op->below; tmp; tmp = tmp->below)
3309	{	3276	{
3310	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3277	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3311	{	3278	{
3312	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3279	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3313	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3280	&& tmp->type == BATTLEGROUND
		3281	&& tmp->name == shstr_battleground
		3282	&& EXIT_X (tmp) && EXIT_Y (tmp))
3314	{	3283	{
3315	/*before we assign the exit, check if this is a teambattle */	3284	/* before we assign the exit, check if this is a teambattle */
3316	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3285	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3317	{	3286	{
3318	object *invtmp;
3319
3320	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3287	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3321	{	3288	{
3322	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3289	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3323	{	3290	{
3324	if (x != NULL && y != NULL)	3291	if (x && y)
3325	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3292	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3293
3326	return 1;	3294	return 1;
3327	}	3295	}
3328	}	3296	}
3329	}	3297	}
		3298
3330	if (x != NULL && y != NULL)	3299	if (x && y)
3331	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3300	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3301
3332	return 1;	3302	return 1;
3333	}	3303	}
3334	}	3304	}
3335	}	3305	}
		3306
3336	/* If we got here, did not find a battleground */	3307	/* If we got here, did not find a battleground */
3337	return 0;	3308	return 0;
3338	}	3309	}
3339		3310
3340	/*	3311	/*
…		…
3356	char buf[MAX_BUF]; /* tmp. string buffer */	3327	char buf[MAX_BUF]; /* tmp. string buffer */
3357	int i = 0, j = 0;	3328	int i = 0, j = 0;
3358		3329
3359	/* get the appropriate treasurelist */	3330	/* get the appropriate treasurelist */
3360	if (atnr == ATNR_FIRE)	3331	if (atnr == ATNR_FIRE)
3361	trlist = treasurelist::find ("dragon_ability_fire");	3332	trlist = treasurelist::find (shstr_dragon_ability_fire);
3362	else if (atnr == ATNR_COLD)	3333	else if (atnr == ATNR_COLD)
3363	trlist = treasurelist::find ("dragon_ability_cold");	3334	trlist = treasurelist::find (shstr_dragon_ability_cold);
3364	else if (atnr == ATNR_ELECTRICITY)	3335	else if (atnr == ATNR_ELECTRICITY)
3365	trlist = treasurelist::find ("dragon_ability_elec");	3336	trlist = treasurelist::find (shstr_dragon_ability_elec);
3366	else if (atnr == ATNR_POISON)	3337	else if (atnr == ATNR_POISON)
3367	trlist = treasurelist::find ("dragon_ability_poison");	3338	trlist = treasurelist::find (shstr_dragon_ability_poison);
3368		3339
3369	if (trlist == NULL || who->type != PLAYER)	3340	if (trlist == NULL || who->type != PLAYER)
3370	return;	3341	return;
3371		3342
3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3343	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3376	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3347	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3377	return;	3348	return;
3378	}	3349	}
3379		3350
3380	/* everything seems okay - now bring on the gift: */	3351	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3352	item = tr->item;
3382		3353
3383	if (item->type == SPELL)	3354	if (item->type == SPELL)
3384	{	3355	{
3385	if (check_spell_known (who, item->name))	3356	if (check_spell_known (who, item->name))
3386	return;	3357	return;
…		…
3445	{	3416	{
3446	/* forces in the treasurelist can alter the player's stats */	3417	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3418	object *skin;
3448		3419
3449	/* first get the dragon skin force */	3420	/* first get the dragon skin force */
3450	shstr_cmp dragon_skin_force ("dragon_skin_force");
3451	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3421	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3452	;	3422	;
3453		3423
3454	if (!skin)	3424	if (!skin)
3455	return;	3425	return;
3456		3426
…		…
3491	else	3461	else
3492	{	3462	{
3493	/* generate misc. treasure */	3463	/* generate misc. treasure */
3494	tmp = arch_to_object (tr->item);	3464	tmp = arch_to_object (tr->item);
3495	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3465	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3496	tmp = insert_ob_in_ob (tmp, who);	3466	who->insert (tmp);
3497	if (who->type == PLAYER)
3498	esrv_send_item (who, tmp);
3499	}	3467	}
3500	}	3468	}
3501		3469
3502	/**	3470	/**
3503	* Unready an object for a player. This function does nothing if the object was	3471	* Unready an object for a player. This function does nothing if the object was
…		…
3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3500	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3533	return 0;	3501	return 0;
3534		3502
3535	return 100 - blocked_los [x][y];	3503	return 100 - blocked_los [x][y];
3536	}	3504	}
		3505
		3506	void
		3507	player::infobox (const char *title, const char *msg, int color)
		3508	{
		3509	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3510	}
		3511
		3512	void
		3513	player::statusmsg (const char *msg, int color)
		3514	{
		3515	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3516	}
		3517
		3518	void
		3519	player::failmsg (const char *msg, int color)
		3520	{
		3521	play_sound (sound_find ("generic_failure"));
		3522	statusmsg (msg, color);
		3523	}
		3524

Diff Legend

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