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.228 by elmex, Sun Jan 18 17:50:19 2009 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>
…		…
123	continue;	122	continue;
124		123
125	if (*buf == '%')	124	if (*buf == '%')
126	{ /* send one news */	125	{ /* send one news */
127	if (size > 0)	126	if (size > 0)
128	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */	127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
		128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
		129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
		130	subject, news); /*send previously read news */
129		131
130	strcpy (subject, buf + 1);	132	strcpy (subject, buf + 1);
131	strip_endline (subject);	133	strip_endline (subject);
132	size = 0;	134	size = 0;
133	news[0] = '\0';	135	news[0] = '\0';
…		…
147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	149	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);	150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149	close_and_delete (fp, comp);	151	close_and_delete (fp, comp);
150	}	152	}
151		153
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. */	154	/* This loads the first map an puts the player on it. */
159	static void	155	static void
160	set_first_map (object *op)	156	set_first_map (object *op)
161	{	157	{
162	op->contr->maplevel = first_map_path;	158	op->contr->maplevel = first_map_path;
163	op->x = -1;	159	op->x = -1;
164	op->y = -1;	160	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	}	161	}
179		162
180	void	163	void
181	player::activate ()	164	player::activate ()
182	{	165	{
…		…
187	ob->remove ();	170	ob->remove ();
188	ob->map = 0;	171	ob->map = 0;
189	ob->activate_recursive ();	172	ob->activate_recursive ();
190	CLEAR_FLAG (ob, FLAG_FRIENDLY);	173	CLEAR_FLAG (ob, FLAG_FRIENDLY);
191	add_friendly_object (ob);	174	add_friendly_object (ob);
192	enter_map ();
193	}	175	}
194		176
195	void	177	void
196	player::deactivate ()	178	player::deactivate ()
197	{	179	{
…		…
204		186
205	if (ob->map)	187	if (ob->map)
206	maplevel = ob->map->path;	188	maplevel = ob->map->path;
207		189
208	ob->remove ();	190	ob->remove ();
		191	ob->enemy = 0; // sometimes keeps an extra refcount on itself
209	ob->map = 0;	192	ob->map = 0;
210	party = 0;	193	party = 0;
211		194
212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
213		196
…		…
227	ob->close_container (); //TODO: client-specific	210	ob->close_container (); //TODO: client-specific
228		211
229	ns->update_look = 0;	212	ns->update_look = 0;
230	ns->look_position = 0;	213	ns->look_position = 0;
231		214
232	clear_los (ob);	215	clear_los ();
233		216
234	ns->reset_stats ();	217	ns->reset_stats ();
235		218
236	/* make sure he's a player -- needed because of class change. */	219	/* make sure he's a player -- needed because of class change. */
237	ob->type = PLAYER; // we are paranoid	220	ob->type = PLAYER; // we are paranoid
238	ob->race = ob->arch->clone.race;	221	ob->race = ob->arch->race;
239		222
240	ob->carrying = sum_weight (ob);	223	ob->update_weight ();
241	link_player_skills (ob);	224	link_skills ();
242		225
243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
244		227
245	assign (title, ob->arch->clone.name);	228	assign (title, ob->arch->object::name);
246		229
247	/* if it's a dragon player, set the correct title here */	230	/* if it's a dragon player, set the correct title here */
248	if (is_dragon_pl (ob))	231	if (is_dragon_pl (ob))
249	{	232	{
250	object *tmp, *abil = 0, *skin = 0;	233	object *tmp, *abil = 0, *skin = 0;
251		234
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)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
256	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
257	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == shstr_dragon_ability_force)
258	abil = tmp;	238	abil = tmp;
259	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == shstr_dragon_skin_force)
260	skin = tmp;	240	skin = tmp;
261		241
262	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
263	}	243	}
264		244
265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266		246
267	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this);
		248
		249	ob->update_stats ();
		250
		251	ns->floorbox_update ();
		252	esrv_send_inventory (ob, ob);
		253	esrv_add_spells (this, 0);
		254
		255	activate ();
		256
		257	send_rules (ob);
		258	send_news (ob);
		259	display_motd (ob);
		260
		261	INVOKE_PLAYER (CONNECT, this);
		262	INVOKE_PLAYER (LOGIN, this);
		263	}
		264
		265	void
		266	player::disconnect ()
		267	{
		268	if (ob)
		269	{
		270	ob->close_container (); //TODO: client-specific
		271	ob->drop_unpaid_items ();
		272	}
		273
		274	if (ns)
		275	{
		276	if (active)
		277	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		278
		279	INVOKE_PLAYER (DISCONNECT, this);
		280
		281	ns->reset_stats ();
		282	ns->pl = 0;
		283	ns = 0;
		284	}
		285
		286	observe = ob;
		287
		288	deactivate ();
		289	}
		290
		291	// the need for this function can be explained
		292	// by load_object not returning the object
		293	void
		294	player::set_object (object *op)
		295	{
		296	ob = observe = op;
		297	ob->contr = this; /* this aren't yet in archetype */
		298
		299	ob->speed = 1.0f;
		300	ob->speed_left = 0.5f;
		301
		302	ob->direction = 5; /* So player faces south */
268		303
269	ob->flag [FLAG_READY_WEAPON] = false;	304	ob->flag [FLAG_READY_WEAPON] = false;
270	ob->flag [FLAG_READY_SKILL] = false;	305	ob->flag [FLAG_READY_SKILL] = false;
271	ob->flag [FLAG_READY_BOW] = false;	306	ob->flag [FLAG_READY_BOW] = false;
272		307
273	for (object *op = ob->inv; op; op = op->below)	308	for (object *op = ob->inv; op; op = op->below)
274	if (op->flag [FLAG_APPLIED])	309	if (op->flag [FLAG_APPLIED])
275	switch (op->type)	310	switch (op->type)
276	{	311	{
		312	case SKILL:
		313	ob->flag [FLAG_APPLIED] = false;
		314	break;
		315
277	case WAND:	316	case WAND:
278	case ROD:	317	case ROD:
279	case HORN:	318	case HORN:
280	case BOW:	319	case BOW:
281	case SKILL_TOOL:	320	ranged_ob = op;
		321	break;
		322
282	case WEAPON:	323	case WEAPON:
283	op->flag [FLAG_APPLIED] = false;	324	combat_ob = op;
284	apply_special (ob, op, AP_APPLY);
285	break;	325	break;
286
287	case SKILL:
288	op->flag [FLAG_APPLIED] = false;
289	break;
290	}	326	}
291		327
292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
293	ob->update_stats ();	329	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	}	330	}
308		331
309	void	332	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)	333	player::set_observe (object *op)
334	{	334	{
335	ob = op;	335	observe = op ? op : ob;
336	ob->contr = this; /* this aren't yet in archetype */	336	do_los = 1;
337
338	ob->speed_left = 0.5f;
339	ob->speed = 1.0f;
340	ob->direction = 5; /* So player faces south */
341	}	337	}
342		338
343	player::player ()	339	player::player ()
344	{	340	{
345	/* There are some elements we want initialised to non zero value -	341	/* There are some elements we want initialised to non zero value -
…		…
352	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
353		349
354	gen_sp_armour = 10;	350	gen_sp_armour = 10;
355	bowtype = bow_normal;	351	bowtype = bow_normal;
356	petmode = pet_normal;	352	petmode = pet_normal;
357	listening = 10;
358	usekeys = containers;	353	usekeys = containers;
359	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
360	do_los = 1;	355	do_los = 1;
		356
		357	weapon_sp = 1.0f;
		358	weapon_sp_left = 0.5f;
361	}	359	}
362		360
363	void	361	void
364	player::do_destroy ()	362	player::do_destroy ()
365	{	363	{
…		…
370	if (ob)	368	if (ob)
371	{	369	{
372	ob->destroy_inv (false);	370	ob->destroy_inv (false);
373	ob->destroy ();	371	ob->destroy ();
374	}	372	}
		373
		374	ob = observe = 0;
375	}	375	}
376		376
377	player::~player ()	377	player::~player ()
378	{	378	{
379	/* Clear item stack */	379	/* Clear item stack */
…		…
406	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
407	*/	407	*/
408	archetype *	408	archetype *
409	get_player_archetype (archetype *at)	409	get_player_archetype (archetype *at)
410	{	410	{
411	archetype *start = at;	411	// archetypes could have been reloaded
		412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		413
		414	if (!nat)
		415	return at;
		416
		417	archvec::iterator i = archetypes.find (nat);
412		418
413	for (;;)	419	for (;;)
414	{	420	{
415	if (at == NULL || at->next == NULL)	421	if (++i == archetypes.end ())
416	at = first_archetype;	422	i = archetypes.begin ();
417	else	423	else if (*i == at)
418	at = at->next;	424	cleanup ("not a single player archetype found");
419		425
420	if (at->clone.type == PLAYER)	426	if ((*i)->type == PLAYER)
421	return at;	427	return *i;
422
423	if (at == start)
424	{
425	LOG (llevError, "No Player archetypes\n");
426	exit (-1);
427	}
428	}	428	}
429	}	429	}
430		430
431	object *	431	object *
432	get_nearest_player (object *mon)	432	get_nearest_player (object *mon)
…		…
436	unsigned lastdist;	436	unsigned lastdist;
437	rv_vector rv;	437	rv_vector rv;
438		438
439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
440	{	440	{
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))	441	if (!can_detect_enemy (mon, ol->ob, &rv))
469	continue;	442	continue;
470		443
471	if (lastdist > rv.distance)	444	if (lastdist > rv.distance)
472	{	445	{
…		…
667		640
668	return firstdir;	641	return firstdir;
669	}	642	}
670		643
671	void	644	void
672	give_initial_items (object *pl, treasurelist * items)	645	give_initial_items (object *pl, treasurelist *items)
673	{	646	{
674	object *op, *next = NULL;
675
676	if (pl->randomitems != NULL)	647	if (pl->randomitems)
677	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
678		649
679	for (op = pl->inv; op; op = next)	650	for (object *next, *op = pl->inv; op; op = next)
680	{	651	{
681	next = op->below;	652	next = op->below;
682		653
683	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
684	* flag "neutral" set. Sorry but I can't think of a better way	655	* flag "neutral" set. Sorry but I can't think of a better way
…		…
689	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
690	* by this player due to race restrictions	661	* by this player due to race restrictions
691	*/	662	*/
692	if (pl->type == PLAYER)	663	if (pl->type == PLAYER)
693	{	664	{
694	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
695	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
696	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
697	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
		670	|| op->type == BRACERS || op->type == GIRDLE))
698	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
699	{	672	{
700	op->destroy ();	673	op->destroy ();
701	continue;	674	continue;
702	}	675	}
703	}	676	}
704		677
705	/* This really needs to be better - we should really give	678	/* Here we remove duplicated skills (as duplicated spell objects have
706	* a substitute spellbook. The problem is that we don't really	679	* _very_ confusing effects for players), which could for instance be
707	* have a good idea what to replace it with (need something like	680	* generated by bad treasurelists. - elmex
708	* a first level treasurelist for each skill.)
709	* remove duplicate skills also
710	*/	681	*/
711	if (op->type == SPELLBOOK || op->type == SKILL)	682	if (op->type == SKILL)
712	{	683	{
713	object *tmp;
714
715	for (tmp = op->below; tmp; tmp = tmp->below)	684	for (object *tmp = op->below; tmp; tmp = tmp->below)
716	if (tmp->type == op->type && tmp->name == op->name)	685	if (tmp->type == op->type && tmp->name == op->name)
717	break;
718
719	if (tmp)
720	{	686	{
721	op->destroy ();	687	op->destroy ();
		688	LOG (llevError,
722	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	689	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
723	continue;	690	break;
724	}	691	}
725		692
726	if (op->nrof > 1)	693	if (op->nrof > 1)
727	op->nrof = 1;	694	op->nrof = 1;
728	}	695	}
729		696
730	if (op->type == SPELLBOOK && op->inv)	697	if (op->type == SPELLBOOK && op->inv)
731	{
732	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	698	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
733	}
734		699
735	/* Give starting characters identified, uncursed, and undamned	700	/* Give starting characters identified, uncursed, and undamned
736	* items. Just don't identify gold or silver, or it won't be	701	* items. Just don't identify gold or silver, or it won't be
737	* merged properly.	702	* merged properly.
738	*/	703	*/
739	if (need_identify (op))	704	if (need_identify (op))
740	{	705	{
741	SET_FLAG (op, FLAG_IDENTIFIED);	706	SET_FLAG (op, FLAG_IDENTIFIED);
742	CLEAR_FLAG (op, FLAG_CURSED);	707	CLEAR_FLAG (op, FLAG_CURSED);
743	CLEAR_FLAG (op, FLAG_DAMNED);	708	CLEAR_FLAG (op, FLAG_DAMNED);
744	}	709	}
		710
745	if (op->type == SPELL)	711	if (op->type == SPELL)
746	{	712	{
747	op->destroy ();	713	op->destroy ();
748	continue;	714	continue;
749	}	715	}
…		…
751	{	717	{
752	SET_FLAG (op, FLAG_CAN_USE_SKILL);	718	SET_FLAG (op, FLAG_CAN_USE_SKILL);
753	op->stats.exp = 0;	719	op->stats.exp = 0;
754	op->level = 1;	720	op->level = 1;
755	}	721	}
756	/* lock all 'normal items by default */	722	else /* lock all 'normal items by default */
757	else
758	SET_FLAG (op, FLAG_INV_LOCKED);	723	SET_FLAG (op, FLAG_INV_LOCKED);
759	} /* for loop of objects in player inv */	724	} /* for loop of objects in player inv */
760		725
761	/* Need to set up the skill pointers */	726	/* Need to set up the skill pointers */
762	link_player_skills (pl);	727	pl->contr->link_skills ();
763	}	728	}
764		729
765	void	730	void
766	get_party_password (object *op, partylist *party)	731	get_party_password (object *op, partylist *party)
767	{	732	{
…		…
868	static void	833	static void
869	start_info (object *op)	834	start_info (object *op)
870	{	835	{
871	char buf[MAX_BUF];	836	char buf[MAX_BUF];
872		837
873	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	838	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
874	new_draw_info (NDI_UNIQUE, 0, op, buf);	839	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	}	840	}
878		841
879	/* This function takes the key that is passed, and does the	842	/* This function takes the key that is passed, and does the
880	* appropriate action with it (change race, or other things).	843	* appropriate action with it (change race, or other things).
881	* The function name is for historical reasons - now we have	844	* The function name is for historical reasons - now we have
…		…
884	*/	847	*/
885	void	848	void
886	player::chargen_race_done ()	849	player::chargen_race_done ()
887	{	850	{
888	/* this must before then initial items are given */	851	/* this must before then initial items are given */
889	esrv_new_player (ob->contr, ob->weight + ob->carrying);	852	esrv_new_player (ob->contr);
890		853
891	treasurelist *tl = treasurelist::find ("starting_wealth");	854	treasurelist *tl = treasurelist::find ("starting_wealth");
892	if (tl)	855	if (tl)
893	create_treasure (tl, ob, 0, 0, 0);	856	create_treasure (tl, ob, 0, 0, 0);
894		857
…		…
898	ob->contr->ns->state = ST_PLAYING;	861	ob->contr->ns->state = ST_PLAYING;
899		862
900	if (ob->msg)	863	if (ob->msg)
901	ob->msg = 0;	864	ob->msg = 0;
902		865
903	/* We create this now because some of the unique maps will need it
904	* to save here.
905	*/
906	{
907	char buf[MAX_BUF];
908	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
909	make_path_to_file (buf);
910	}
911
912	start_info (ob);	866	start_info (ob);
913	CLEAR_FLAG (ob, FLAG_WIZ);	867	CLEAR_FLAG (ob, FLAG_WIZ);
914	give_initial_items (ob, ob->randomitems);	868	give_initial_items (ob, ob->randomitems);
915	link_player_skills (ob);
916	esrv_send_inventory (ob, ob);	869	esrv_send_inventory (ob, ob);
917	ob->update_stats ();	870	ob->update_stats ();
918		871
919	/* This moves the player to a different start map, if there	872	/* This moves the player to a different start map, if there
920	* is one for this race	873	* is one for this race
921	*/	874	*/
922	if (*first_map_ext_path)	875	if (*first_map_ext_path)
923	{	876	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
924	object *tmp;
925	char mapname[MAX_BUF];
926
927	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
928	tmp = object::create ();
929	EXIT_PATH (tmp) = mapname;
930	EXIT_X (tmp) = ob->x;
931	EXIT_Y (tmp) = ob->y;
932	ob->enter_exit (tmp); /* we don't really care if it succeeded;
933	* if the map isn't there, then stay on the
934	* default initial map */
935	tmp->destroy ();
936	}
937	else	877	else
938	LOG (llevDebug, "first_map_ext_path not set\n");	878	LOG (llevDebug, "first_map_ext_path not set\n");
939	}	879	}
940		880
941	void	881	void
…		…
951	int x = ob->x, y = ob->y;	891	int x = ob->x, y = ob->y;
952		892
953	ob->remove_statbonus ();	893	ob->remove_statbonus ();
954	ob->remove ();	894	ob->remove ();
955	ob->arch = get_player_archetype (ob->arch);	895	ob->arch = get_player_archetype (ob->arch);
956	ob->arch->clone.copy_to (ob);	896	ob->arch->copy_to (ob);
957	ob->instantiate ();	897	ob->instantiate ();
958	ob->stats = ob->contr->orig_stats;	898	ob->stats = ob->contr->orig_stats;
959	ob->name = ob->name_pl = name;	899	ob->name = ob->name_pl = name;
960	ob->x = x;	900	ob->x = x;
961	ob->y = y;	901	ob->y = y;
962	SET_ANIMATION (ob, 2); /* So player faces south */	902	SET_ANIMATION (ob, 2); /* So player faces south */
963	insert_ob_in_map (ob, ob->map, ob, 0);	903	insert_ob_in_map (ob, ob->map, ob, 0);
964	assign (ob->contr->title, ob->arch->clone.name);	904	assign (ob->contr->title, ob->arch->object::name);
965	ob->add_statbonus ();	905	ob->add_statbonus ();
966	}	906	}
967	while (!allowed_class (ob));	907	while (!allowed_class (ob));
968		908
969	update_object (ob, UP_OBJ_FACE);	909	update_object (ob, UP_OBJ_FACE);
…		…
985	LOG (llevDebug, "Fleeing player is dead.\n");	925	LOG (llevDebug, "Fleeing player is dead.\n");
986	CLEAR_FLAG (op, FLAG_SCARED);	926	CLEAR_FLAG (op, FLAG_SCARED);
987	return;	927	return;
988	}	928	}
989		929
990	if (op->enemy == NULL)	930	if (!op->enemy)
991	{	931	{
992	LOG (llevDebug, "Fleeing player had no enemy.\n");	932	LOG (llevDebug, "Fleeing player had no enemy.\n");
993	CLEAR_FLAG (op, FLAG_SCARED);	933	CLEAR_FLAG (op, FLAG_SCARED);
994	return;	934	return;
995	}	935	}
996		936
997	/* Seen some crashes here. Since we don't store an
998	* op->enemy_count, it is possible that something destroys the
999	* actual enemy, and the object is recycled.
1000	*/
1001	if (op->enemy->map == NULL)
1002	{
1003	CLEAR_FLAG (op, FLAG_SCARED);
1004	op->enemy = NULL;
1005	return;
1006	}
1007
1008	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	937	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1009	{	938	{
1010	op->enemy = NULL;	939	op->enemy = NULL;
1011	CLEAR_FLAG (op, FLAG_SCARED);	940	CLEAR_FLAG (op, FLAG_SCARED);
1012	return;	941	return;
…		…
1015	get_rangevector (op, op->enemy, &rv, 0);	944	get_rangevector (op, op->enemy, &rv, 0);
1016		945
1017	dir = absdir (4 + rv.direction);	946	dir = absdir (4 + rv.direction);
1018	for (diff = 0; diff < 3; diff++)	947	for (diff = 0; diff < 3; diff++)
1019	{	948	{
1020	int m = 1 - (RANDOM () & 2);	949	int m = 1 - rndm (2) * 2;
1021		950
1022	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	951	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1023	return;	952	return;
1024	}	953	}
1025		954
…		…
1036	check_pick (object *op)	965	check_pick (object *op)
1037	{	966	{
1038	object *tmp, *next;	967	object *tmp, *next;
1039	int stop = 0;	968	int stop = 0;
1040	int wvratio;	969	int wvratio;
1041	char putstring[128];
1042		970
1043	/* if you're flying, you cna't pick up anything */	971	/* if you're flying, you cna't pick up anything */
1044	if (op->move_type & MOVE_FLYING)	972	if (op->move_type & MOVE_FLYING)
1045	return 1;	973	return 1;
1046		974
1047	next = op->below;	975	next = op->below;
1048		976
		977	int cnt = MAX_ITEM_PER_DROP;
		978	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		979
1049	/* loop while there are items on the floor that are not marked as	980	/* loop while there are items on the floor that are not marked as
1050	* destroyed */	981	* destroyed */
1051	while (next && !next->destroyed ())	982	while (next && !next->destroyed ())
1052	{	983	{
1053	tmp = next;	984	tmp = next;
1054	next = tmp->below;	985	next = tmp->below;
1055		986
		987	if (cnt <= 0)
		988	{
		989	op->failmsg ("Couldn't pickup all items at once.");
		990	return 0;
		991	}
		992
1056	if (op->destroyed ())	993	if (op->destroyed ())
1057	return 0;	994	return 0;
1058		995
1059	if (!can_pick (op, tmp))	996	if (!can_pick (op, tmp))
1060	continue;	997	continue;
1061		998
1062	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	999	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1063	{	1000	{
1064	if (item_matched_string (op, tmp, op->contr->search_str))	1001	if (item_matched_string (op, tmp, op->contr->search_str))
1065	pick_up (op, tmp);	1002	CHK_PICK_PICKUP;
		1003
1066	continue;	1004	continue;
1067	}	1005	}
1068		1006
1069	/* high not bit set? We're using the old autopickup model */	1007	/* pickup handling */
		1008	if (op->contr->mode & PU_DEBUG)
		1009	{
		1010	/* some debugging code to figure out item information */
		1011	const char *str = tmp->name
		1012	? format ("item name: %s item type: %d weight/value: %d",
		1013	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
		1014	: format ("item name: %s item type: %d weight/value: %d",
		1015	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1016
		1017	new_draw_info (NDI_UNIQUE, 0, op, str);
		1018	}
		1019
		1020	if (op->contr->mode & PU_INHIBIT)
		1021	return 1;
		1022
		1023	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		1024	return 1;
		1025
		1026	/* philosophy:
		1027	* It's easy to grab an item type from a pile, as long as it's
		1028	* generic. This takes no game-time. For more detailed pickups
		1029	* and selections, select-items should be used. This is a
		1030	* grab-as-you-run type mode that's really useful for arrows for
		1031	* example.
		1032	* The drawback: right now it has no frontend, so you need to
		1033	* stick the bits you want into a calculator in hex mode and then
		1034	* convert to decimal and then 'pickup <#>
		1035	*/
		1036
		1037	/* the first two modes are exclusive: if NOTHING we return, if
		1038	* STOP then we stop. All the rest are applied sequentially,
		1039	* meaning if any test passes, the item gets picked up. */
		1040
		1041	/* if mode is set to pick nothing up, return */
		1042	if (op->contr->mode == PU_NOTHING)
		1043	return 1;
		1044
		1045	/* if mode is set to stop when encountering objects, return */
		1046	/* take STOP before INHIBIT since it doesn't actually pick
		1047	* anything up */
		1048	if (op->contr->mode & PU_STOP)
		1049	return 0;
		1050
		1051	/* useful for going into stores and not losing your settings... */
		1052	/* and for battles wher you don't want to get loaded down while
		1053	* fighting */
		1054	if (op->contr->mode & PU_INHIBIT)
		1055	return 1;
		1056
		1057	/* prevent us from turning into auto-thieves :) */
		1058	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		1059	continue;
		1060
		1061	/* ignore known cursed objects */
		1062	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		1063	continue;
		1064
		1065	/* all food and drink if desired */
		1066	/* question: don't pick up known-poisonous stuff? */
1070	if (!(op->contr->mode & PU_NEWMODE))	1067	if (op->contr->mode & PU_FOOD)
		1068	if (tmp->type == FOOD)
1071	{	1069	{
1072	switch (op->contr->mode)	1070	CHK_PICK_PICKUP;
		1071	continue;
		1072	}
		1073
		1074	if (op->contr->mode & PU_DRINK)
		1075	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
		1076	{
		1077	CHK_PICK_PICKUP;
		1078	continue;
		1079	}
		1080
		1081	if (op->contr->mode & PU_POTION)
		1082	if (tmp->type == POTION)
		1083	{
		1084	CHK_PICK_PICKUP;
		1085	continue;
		1086	}
		1087
		1088	/* spellbooks, skillscrolls and normal books/scrolls */
		1089	if (op->contr->mode & PU_SPELLBOOK)
		1090	if (tmp->type == SPELLBOOK)
		1091	{
		1092	CHK_PICK_PICKUP;
		1093	continue;
		1094	}
		1095
		1096	if (op->contr->mode & PU_SKILLSCROLL)
		1097	if (tmp->type == SKILLSCROLL)
		1098	{
		1099	CHK_PICK_PICKUP;
		1100	continue;
		1101	}
		1102
		1103	if (op->contr->mode & PU_READABLES)
		1104	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		1105	{
		1106	CHK_PICK_PICKUP;
		1107	continue;
		1108	}
		1109
		1110	/* wands/staves/rods/horns */
		1111	if (op->contr->mode & PU_MAGIC_DEVICE)
		1112	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
		1113	{
		1114	CHK_PICK_PICKUP;
		1115	continue;
		1116	}
		1117
		1118	/* pick up all magical items */
		1119	if (op->contr->mode & PU_MAGICAL)
		1120	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1121	{
		1122	CHK_PICK_PICKUP;
		1123	continue;
		1124	}
		1125
		1126	if (op->contr->mode & PU_VALUABLES)
		1127	{
		1128	if (tmp->type == MONEY || tmp->type == GEM)
1073	{	1129	{
1074	case 0:	1130	CHK_PICK_PICKUP;
1075	return 1; /* don't pick up */	1131	continue;
1076	case 1:
1077	pick_up (op, tmp);
1078	return 1;
1079	case 2:
1080	pick_up (op, tmp);
1081	return 0;
1082	case 3:
1083	return 0; /* stop before pickup */
1084	case 4:
1085	pick_up (op, tmp);
1086	break;
1087	case 5:
1088	pick_up (op, tmp);
1089	stop = 1;
1090	break;
1091	case 6:
1092	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1093	pick_up (op, tmp);
1094	break;
1095
1096	case 7:
1097	if (tmp->type == MONEY || tmp->type == GEM)
1098	pick_up (op, tmp);
1099	break;
1100
1101	default:
1102	/* use value density */
1103	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1104	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1105	pick_up (op, tmp);
1106	}	1132	}
1107	}	1133	}
1108	else	1134
1109	{ /* old model */	1135	/* rings & amulets - talismans seems to be typed AMULET */
1110	/* NEW pickup handling */
1111	if (op->contr->mode & PU_DEBUG)	1136	if (op->contr->mode & PU_JEWELS)
		1137	if (tmp->type == RING || tmp->type == AMULET)
1112	{	1138	{
1113	/* some debugging code to figure out item information */	1139	CHK_PICK_PICKUP;
1114	if (tmp->name != NULL)
1115	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))));
1117	else
1118	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))));
1120
1121	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1122	}
1123
1124	/* philosophy:
1125	* It's easy to grab an item type from a pile, as long as it's
1126	* generic. This takes no game-time. For more detailed pickups
1127	* and selections, select-items should be used. This is a
1128	* grab-as-you-run type mode that's really useful for arrows for
1129	* example.
1130	* The drawback: right now it has no frontend, so you need to
1131	* stick the bits you want into a calculator in hex mode and then
1132	* convert to decimal and then 'pickup <#>
1133	*/
1134
1135	/* the first two modes are exclusive: if NOTHING we return, if
1136	* STOP then we stop. All the rest are applied sequentially,
1137	* meaning if any test passes, the item gets picked up. */
1138
1139	/* if mode is set to pick nothing up, return */
1140
1141	if (op->contr->mode & PU_NOTHING)
1142	return 1;
1143
1144	/* if mode is set to stop when encountering objects, return */
1145	/* take STOP before INHIBIT since it doesn't actually pick
1146	* anything up */
1147
1148	if (op->contr->mode & PU_STOP)
1149	return 0;
1150
1151	/* useful for going into stores and not losing your settings... */
1152	/* and for battles wher you don't want to get loaded down while
1153	* fighting */
1154	if (op->contr->mode & PU_INHIBIT)
1155	return 1;
1156
1157	/* prevent us from turning into auto-thieves :) */
1158	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1159	continue;	1140	continue;
		1141	}
1160		1142
1161	/* ignore known cursed objects */	1143	/* we don't forget dragon food */
1162	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1144	if (op->contr->mode & PU_FLESH)
		1145	if (tmp->type == FLESH)
		1146	{
		1147	CHK_PICK_PICKUP;
1163	continue;	1148	continue;
		1149	}
1164		1150
1165	/* all food and drink if desired */	1151	/* bows and arrows. Bows are good for selling! */
1166	/* question: don't pick up known-poisonous stuff? */	1152	if (op->contr->mode & PU_BOW)
		1153	if (tmp->type == BOW)
		1154	{
		1155	CHK_PICK_PICKUP;
		1156	continue;
		1157	}
		1158
		1159	if (op->contr->mode & PU_ARROW)
		1160	if (tmp->type == ARROW)
		1161	{
		1162	CHK_PICK_PICKUP;
		1163	continue;
		1164	}
		1165
		1166	/* all kinds of armor etc. */
		1167	if (op->contr->mode & PU_ARMOUR)
		1168	if (tmp->type == ARMOUR)
		1169	{
		1170	CHK_PICK_PICKUP;
		1171	continue;
		1172	}
		1173
		1174	if (op->contr->mode & PU_HELMET)
		1175	if (tmp->type == HELMET)
		1176	{
		1177	CHK_PICK_PICKUP;
		1178	continue;
		1179	}
		1180
		1181	if (op->contr->mode & PU_SHIELD)
		1182	if (tmp->type == SHIELD)
		1183	{
		1184	CHK_PICK_PICKUP;
		1185	continue;
		1186	}
		1187
1167	if (op->contr->mode & PU_FOOD)	1188	if (op->contr->mode & PU_BOOTS)
1168	if (tmp->type == FOOD)	1189	if (tmp->type == BOOTS)
		1190	{
		1191	CHK_PICK_PICKUP;
		1192	continue;
		1193	}
		1194
		1195	if (op->contr->mode & PU_GLOVES)
		1196	if (tmp->type == GLOVES)
		1197	{
		1198	CHK_PICK_PICKUP;
		1199	continue;
		1200	}
		1201
		1202	if (op->contr->mode & PU_CLOAK)
		1203	if (tmp->type == CLOAK)
		1204	{
		1205	CHK_PICK_PICKUP;
		1206	continue;
		1207	}
		1208
		1209	/* hoping to catch throwing daggers here */
		1210	if (op->contr->mode & PU_MISSILEWEAPON)
		1211	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
		1212	{
		1213	CHK_PICK_PICKUP;
		1214	continue;
		1215	}
		1216
		1217	/* careful: chairs and tables are weapons! */
		1218	if (op->contr->mode & PU_ALLWEAPON)
		1219	{
		1220	if (tmp->type == WEAPON)
		1221	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1169	{	1222	{
1170	pick_up (op, tmp);	1223	CHK_PICK_PICKUP;
1171	continue;	1224	continue;
1172	}	1225	}
		1226	}
1173		1227
		1228	/* misc stuff that's useful */
1174	if (op->contr->mode & PU_DRINK)	1229	if (op->contr->mode & PU_KEY)
1175	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1230	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1176	{	1231	{
1177	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1178	continue;	1233	continue;
1179	}	1234	}
1180		1235
		1236	/* any of the last 4 bits set means we use the ratio for value
		1237	* pickups */
1181	if (op->contr->mode & PU_POTION)	1238	if (op->contr->mode & PU_RATIO)
1182	if (tmp->type == POTION)	1239	{
		1240	/* use value density to decide what else to grab */
		1241	/* >=7 was >= op->contr->mode */
		1242	/* >=7 is the old standard setting. Now we take the last 4 bits
1183	{	1243	*/
1184	pick_up (op, tmp);
1185	continue;
1186	}
1187
1188	/* spellbooks, skillscrolls and normal books/scrolls */
1189	if (op->contr->mode & PU_SPELLBOOK)
1190	if (tmp->type == SPELLBOOK)
1191	{
1192	pick_up (op, tmp);
1193	continue;
1194	}
1195
1196	if (op->contr->mode & PU_SKILLSCROLL)
1197	if (tmp->type == SKILLSCROLL)
1198	{
1199	pick_up (op, tmp);
1200	continue;
1201	}
1202
1203	if (op->contr->mode & PU_READABLES)
1204	if (tmp->type == BOOK || tmp->type == SCROLL)
1205	{
1206	pick_up (op, tmp);
1207	continue;
1208	}
1209
1210	/* wands/staves/rods/horns */
1211	if (op->contr->mode & PU_MAGIC_DEVICE)
1212	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1213	{
1214	pick_up (op, tmp);
1215	continue;
1216	}
1217
1218	/* pick up all magical items */
1219	if (op->contr->mode & PU_MAGICAL)	1244	wvratio = op->contr->mode & PU_RATIO;
1220	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1245	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1221	{
1222	pick_up (op, tmp);
1223	continue;
1224	}
1225
1226	if (op->contr->mode & PU_VALUABLES)
1227	{	1246	{
1228	if (tmp->type == MONEY || tmp->type == GEM)	1247	#if 0
		1248	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1249	if (tmp->name != NULL)
1229	{	1250	{
1230	pick_up (op, tmp);	1251	fprintf (stderr, "%s", tmp->name);
1231	continue;
1232	}	1252	}
1233	}
1234
1235	/* rings & amulets - talismans seems to be typed AMULET */
1236	if (op->contr->mode & PU_JEWELS)
1237	if (tmp->type == RING || tmp->type == AMULET)
1238	{
1239	pick_up (op, tmp);
1240	continue;
1241	}
1242
1243	/* we don't forget dragon food */
1244	if (op->contr->mode & PU_FLESH)
1245	if (tmp->type == FLESH)
1246	{
1247	pick_up (op, tmp);
1248	continue;
1249	}
1250
1251	/* bows and arrows. Bows are good for selling! */
1252	if (op->contr->mode & PU_BOW)
1253	if (tmp->type == BOW)
1254	{
1255	pick_up (op, tmp);
1256	continue;
1257	}
1258
1259	if (op->contr->mode & PU_ARROW)
1260	if (tmp->type == ARROW)
1261	{
1262	pick_up (op, tmp);
1263	continue;
1264	}
1265
1266	/* all kinds of armor etc. */
1267	if (op->contr->mode & PU_ARMOUR)
1268	if (tmp->type == ARMOUR)
1269	{
1270	pick_up (op, tmp);
1271	continue;
1272	}
1273
1274	if (op->contr->mode & PU_HELMET)
1275	if (tmp->type == HELMET)
1276	{
1277	pick_up (op, tmp);
1278	continue;
1279	}
1280
1281	if (op->contr->mode & PU_SHIELD)
1282	if (tmp->type == SHIELD)
1283	{
1284	pick_up (op, tmp);
1285	continue;
1286	}
1287
1288	if (op->contr->mode & PU_BOOTS)
1289	if (tmp->type == BOOTS)
1290	{
1291	pick_up (op, tmp);
1292	continue;
1293	}
1294
1295	if (op->contr->mode & PU_GLOVES)
1296	if (tmp->type == GLOVES)
1297	{
1298	pick_up (op, tmp);
1299	continue;
1300	}
1301
1302	if (op->contr->mode & PU_CLOAK)
1303	if (tmp->type == CLOAK)
1304	{
1305	pick_up (op, tmp);
1306	continue;
1307	}
1308
1309	/* hoping to catch throwing daggers here */
1310	if (op->contr->mode & PU_MISSILEWEAPON)
1311	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1312	{
1313	pick_up (op, tmp);
1314	continue;
1315	}
1316
1317	/* careful: chairs and tables are weapons! */
1318	if (op->contr->mode & PU_ALLWEAPON)
1319	{
1320	if (tmp->type == WEAPON && tmp->name != NULL)
1321	{
1322	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1323	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1324	{
1325	pick_up (op, tmp);
1326	continue;
1327	}
1328	}
1329
1330	if (tmp->type == WEAPON && tmp->name == NULL)
1331	{
1332	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1333	{
1334	pick_up (op, tmp);
1335	continue;
1336	}
1337	}
1338	}
1339
1340	/* misc stuff that's useful */
1341	if (op->contr->mode & PU_KEY)
1342	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1343	{
1344	pick_up (op, tmp);
1345	continue;
1346	}
1347
1348	/* any of the last 4 bits set means we use the ratio for value
1349	* pickups */
1350	if (op->contr->mode & PU_RATIO)
1351	{
1352	/* use value density to decide what else to grab */
1353	/* >=7 was >= op->contr->mode */
1354	/* >=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 */
1356	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)
1358	{
1359	pick_up (op, tmp);
1360	#if 0
1361	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1362	if (tmp->name != NULL)
1363	{
1364	fprintf (stderr, "%s", tmp->name);
1365	}
1366	else	1253	else
1367	fprintf (stderr, "%s", tmp->arch->name);	1254	fprintf (stderr, "%s", tmp->arch->archname);
1368	fprintf (stderr, ",%d] = ", tmp->type);	1255	fprintf (stderr, ",%d] = ", tmp->type);
1369	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1256	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1370	#endif	1257	#endif
		1258	CHK_PICK_PICKUP;
1371	continue;	1259	continue;
1372	}
1373	}	1260	}
1374	} /* the new pickup model */	1261	} /* the new pickup model */
1375	}	1262	}
1376		1263
1377	return !stop;	1264	return !stop;
…		…
1383	* found object is returned.	1270	* found object is returned.
1384	*/	1271	*/
1385	object *	1272	object *
1386	find_arrow (object *op, const char *type)	1273	find_arrow (object *op, const char *type)
1387	{	1274	{
1388	object *tmp = 0;
1389
1390	for (op = op->inv; op; op = op->below)	1275	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)	1276	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1277	return splay (tmp);
		1278
		1279	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1280	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1281	if (object *arrow = find_arrow (tmp, type))
		1282	{
		1283	splay (tmp);
1394	return op;	1284	return arrow;
		1285	}
1395		1286
1396	return tmp;	1287	return 0;
1397	}	1288	}
1398		1289
1399	/*	1290	/*
1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1291	* 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	1292	* against the target. A full test is not performed, simply a basic test
1402	* of resistances. The archer is making a quick guess at what he sees down	1293	* of resistances. The archer is making a quick guess at what he sees down
1403	* the hall. Failing that it does it's best to pick the highest plus arrow.	1294	* the hall. Failing that it does it's best to pick the highest plus arrow.
1404	*/	1295	*/
1405	object *	1296	object *
1406	find_better_arrow (object *op, object *target, const char *type, int *better)	1297	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1407	{	1298	{
1408	object *tmp = NULL, *arrow, *ntmp;	1299	object *tmp = NULL, *arrow, *ntmp;
1409	int attacknum, attacktype, betterby = 0, i;	1300	int attacknum, attacktype, betterby = 0, i;
1410		1301
1411	if (!type)	1302	if (!type)
…		…
1415	{	1306	{
1416	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1307	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1417	{	1308	{
1418	i = 0;	1309	i = 0;
1419	ntmp = find_better_arrow (arrow, target, type, &i);	1310	ntmp = find_better_arrow (arrow, target, type, &i);
		1311
1420	if (i > betterby)	1312	if (i > betterby)
1421	{	1313	{
1422	tmp = ntmp;	1314	tmp = ntmp;
1423	betterby = i;	1315	betterby = i;
1424	}	1316	}
1425	}	1317	}
1426	else if (arrow->type == ARROW && arrow->race == type)	1318	else if (arrow->type == ARROW && arrow->race == type)
1427	{	1319	{
1428	/* allways prefer assasination/slaying */	1320	/* allways prefer assasination/slaying */
1429	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1321	if (target->race && arrow->slaying.contains (target->race))
1430	{	1322	{
1431	if (arrow->attacktype & AT_DEATH)	1323	if (arrow->attacktype & AT_DEATH)
1432	{	1324	{
1433	*better = 100;	1325	*better = 100;
1434	return arrow;	1326	return arrow;
…		…
1442	else	1334	else
1443	{	1335	{
1444	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1336	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1445	{	1337	{
1446	attacktype = 1 << attacknum;	1338	attacktype = 1 << attacknum;
1447	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1339	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1448	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1340	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1449	{	1341	{
1450	tmp = arrow;	1342	tmp = arrow;
1451	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1343	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1452	}	1344	}
1453	}	1345	}
		1346
1454	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1347	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1455	{	1348	{
1456	tmp = arrow;	1349	tmp = arrow;
1457	betterby = 2 + arrow->magic + arrow->stats.dam;	1350	betterby = 2 + arrow->magic + arrow->stats.dam;
1458	}	1351	}
		1352
1459	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1353	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1460	{	1354	{
1461	tmp = arrow;	1355	tmp = arrow;
1462	betterby = 1 + arrow->magic + arrow->stats.dam;	1356	betterby = 1 + arrow->magic + arrow->stats.dam;
1463	}	1357	}
1464	}	1358	}
1465	}	1359	}
1466	}	1360	}
		1361
1467	if (tmp == NULL && arrow == NULL)	1362	if (tmp == NULL && arrow == NULL)
1468	return find_arrow (op, type);	1363	return find_arrow (op, type);
1469		1364
1470	*better = betterby;	1365	*better = betterby;
1471	return tmp;	1366	return tmp;
…		…
1476	* op = the shooter	1371	* op = the shooter
1477	* type = bow->race	1372	* type = bow->race
1478	* dir = fire direction	1373	* dir = fire direction
1479	*/	1374	*/
1480	object *	1375	object *
1481	pick_arrow_target (object *op, const char *type, int dir)	1376	pick_arrow_target (object *op, shstr_cmp type, int dir)
1482	{	1377	{
1483	object *tmp = NULL;	1378	object *tmp = NULL;
1484	maptile *m;	1379	maptile *m;
1485	int i, mflags, found, number;	1380	int i, mflags, found, number;
1486	sint16 x, y;	1381	sint16 x, y;
…		…
1501	for (i = 0, found = 0; i < 20; i++)	1396	for (i = 0, found = 0; i < 20; i++)
1502	{	1397	{
1503	x += freearr_x[dir];	1398	x += freearr_x[dir];
1504	y += freearr_y[dir];	1399	y += freearr_y[dir];
1505	mflags = get_map_flags (m, &m, x, y, &x, &y);	1400	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1401
1506	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1402	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1507	{	1403	{
1508	tmp = NULL;	1404	tmp = 0;
1509	break;	1405	break;
1510	}	1406	}
1511	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1407	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1512	{	1408	{
1513	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1409	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1514	* perhaps a bad assumption.	1410	* perhaps a bad assumption.
1515	*/	1411	*/
1516	tmp = NULL;	1412	tmp = 0;
1517	break;	1413	break;
1518	}	1414	}
		1415
1519	if (mflags & P_IS_ALIVE)	1416	if (mflags & P_IS_ALIVE)
1520	{
1521	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1417	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1522	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1418	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1523	{
1524	found++;
1525	break;
1526	}
1527	if (found)
1528	break;	1419	break;
1529	}
1530	}	1420	}
1531	if (tmp == NULL)	1421
		1422	if (!tmp)
1532	return find_arrow (op, type);	1423	return find_arrow (op, type);
1533		1424
1534	if (tmp->head)	1425	if (tmp->head)
1535	tmp = tmp->head;	1426	tmp = tmp->head;
1536		1427
…		…
1581	if (bow->below)	1472	if (bow->below)
1582	{	1473	{
1583	bow->remove ();	1474	bow->remove ();
1584	op->insert (bow);	1475	op->insert (bow);
1585	}	1476	}
1586
1587	}	1477	}
1588		1478
1589	if (!bow->race || !bow->skill)	1479	if (!bow->race || !bow->skill)
1590	{	1480	{
1591	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1481	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1617	}	1507	}
1618		1508
1619	/* this should not happen, but sometimes does */	1509	/* this should not happen, but sometimes does */
1620	if (arrow->nrof == 0)	1510	if (arrow->nrof == 0)
1621	{	1511	{
		1512	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1622	arrow->destroy ();	1513	arrow->destroy ();
1623	return 0;	1514	return 0;
1624	}	1515	}
1625		1516
1626	left = arrow; /* these are arrows left to the player */	1517	left = arrow; /* these are arrows left to the player */
1627	arrow = get_split_ob (arrow, 1);	1518	arrow = arrow->split ();
1628	if (!arrow)	1519	if (!arrow)
1629	{	1520	{
1630	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1521	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1631	return 0;	1522	return 0;
1632	}	1523	}
…		…
1640	arrow->stats.grace = arrow->attacktype;	1531	arrow->stats.grace = arrow->attacktype;
1641		1532
1642	if (arrow->slaying)	1533	if (arrow->slaying)
1643	arrow->spellarg = strdup (arrow->slaying);	1534	arrow->spellarg = strdup (arrow->slaying);
1644		1535
		1536	#if 0
1645	if (player *pl = op->contr)	1537	if (player *pl = op->contr)
1646	{	1538	{
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;	1539	float speed = pl->weapon_sp;
1654		1540
1655	/* penalize ROF for bestarrow */	1541	/* penalize ROF for bestarrow */
1656	if (pl->bowtype == bow_bestarrow)	1542	if (pl->bowtype == bow_bestarrow)
1657	speed *= .9f;	1543	speed *= .9f;
1658	else	1544	else
1659	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1545	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1660		1546
1661	op->speed_left += speed - op->speed;	1547	op->speed_left += speed - op->speed;
		1548	}
1662	#endif	1549	#endif
1663	}
1664		1550
1665	SET_ANIMATION (arrow, arrow->direction);	1551	SET_ANIMATION (arrow, arrow->direction);
1666		1552
1667	/* update the speed */	1553	/* update the speed */
1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1554	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;	1555	+ bow->stats.dam / 7.f;
1670		1556
1671	arrow->set_speed (max (arrow->speed, 2.0));	1557	arrow->set_speed (max (arrow->speed, 2.f));
1672	arrow->speed_left = 0;	1558	arrow->speed_left = 0;
1673		1559
1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1560	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1675		1561
1676	if (op->type == PLAYER)	1562	if (op->type == PLAYER)
…		…
1699		1585
1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1586	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1701	arrow->move_type = MOVE_FLY_LOW;	1587	arrow->move_type = MOVE_FLY_LOW;
1702	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1588	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1703		1589
1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1590	op->play_sound (sound_find ("fire_arrow"));
1705	m->insert (arrow, sx, sy, op);	1591	m->insert (arrow, sx, sy, op);
1706		1592
1707	if (!arrow->destroyed ())	1593	if (!arrow->destroyed ())
1708	move_arrow (arrow);	1594	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		1595
1718	return 1;	1596	return 1;
1719	}	1597	}
1720		1598
1721	/* Special fire code for players - this takes into	1599	/* Special fire code for players - this takes into
…		…
1726	* hence the function name.	1604	* hence the function name.
1727	*/	1605	*/
1728	int	1606	int
1729	player_fire_bow (object *op, int dir)	1607	player_fire_bow (object *op, int dir)
1730	{	1608	{
1731	int ret = 0, wcmod = 0;	1609	int ret;
1732		1610
1733	if (op->contr->bowtype == bow_bestarrow)	1611	if (op->contr->bowtype == bow_bestarrow)
1734	{	1612	{
1735	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1613	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1736	}	1614	}
1737	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1615	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1738	{	1616	{
1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1617	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1740	wcmod = -1;
1741
1742	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1618	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1743	}	1619	}
1744	else if (op->contr->bowtype == bow_threewide)	1620	else if (op->contr->bowtype == bow_threewide)
1745	{	1621	{
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1622	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1623	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1748	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1624	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
1749	}	1625	}
1750	else if (op->contr->bowtype == bow_spreadshot)	1626	else if (op->contr->bowtype == bow_spreadshot)
1751	{	1627	{
1752	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1628	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1753	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1629	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1754	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1630	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1755	}	1631	}
1756	else	1632	else
1757	{	1633	{
…		…
1787		1663
1788	if (item->type == WAND)	1664	if (item->type == WAND)
1789	{	1665	{
1790	if (item->stats.food <= 0)	1666	if (item->stats.food <= 0)
1791	{	1667	{
1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1668	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));	1669	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1794		1670
1795	return;	1671	return;
1796	}	1672	}
1797	}	1673	}
1798	else if (item->type == ROD || item->type == HORN)	1674	else if (item->type == ROD || item->type == HORN)
1799	{	1675	{
1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1676	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1677
		1678	// using the maximum of the rods charge allows at least one spell cast
		1679	// for a rod or horn, this fixes some broken rods.
		1680	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1801	{	1681	{
1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1682	op->contr->play_sound (sound_find ("wand_poof"));
1803		1683
1804	if (item->type == ROD)	1684	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));	1685	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1806	else	1686	else
1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1687	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1810	}	1690	}
1811	}	1691	}
1812		1692
1813	if (cast_spell (op, item, dir, item->inv, NULL))	1693	if (cast_spell (op, item, dir, item->inv, NULL))
1814	{	1694	{
1815	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1695	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1696
1816	if (item->type == WAND)	1697	if (item->type == WAND)
1817	{	1698	{
1818	if (!(--item->stats.food))	1699	if (!(--item->stats.food))
1819	{	1700	{
1820	object *tmp;	1701	object *tmp;
1821		1702
1822	if (item->arch)	1703	if (item->arch)
1823	{	1704	{
1824	CLEAR_FLAG (item, FLAG_ANIMATE);	1705	CLEAR_FLAG (item, FLAG_ANIMATE);
1825	item->face = item->arch->clone.face;	1706	item->face = item->arch->face;
1826	item->set_speed (0);	1707	item->set_speed (0);
1827	}	1708	}
1828		1709
1829	if ((tmp = item->in_player ()))	1710	if (object *pl = item->visible_to ())
1830	esrv_update_item (UPD_ANIM, tmp, item);	1711	esrv_update_item (UPD_ANIM, pl, item);
1831	}	1712	}
1832	}	1713	}
1833	else if (item->type == ROD || item->type == HORN)	1714	else if (item->type == ROD || item->type == HORN)
1834	drain_rod_charge (item);	1715	drain_rod_charge (item);
1835	}	1716	}
1836	}	1717	}
1837		1718
1838	/* Received a fire command for the player - go and do it.	1719	/* Received a fire command for the player - go and do it.
1839	*/	1720	*/
1840	void	1721	bool
1841	fire (object *op, int dir)	1722	fire (object *op, int dir)
1842	{	1723	{
1843	int spellcost = 0;	1724	int spellcost = 0;
		1725
		1726	player *pl = op->contr;
		1727
		1728	if (pl->golem)
		1729	{
		1730	control_golem (op->contr->golem, dir);
		1731	return false;
		1732	}
		1733
		1734	object *ob = pl->ranged_ob;
		1735
		1736	if (!ob)
		1737	return false;
		1738
		1739	if (op->speed_left > 0.f)
		1740	--op->speed_left;
		1741	else
		1742	return false;
		1743
		1744	if (!op->change_weapon (ob))
		1745	return false;
1844		1746
1845	/* check for loss of invisiblity/hide */	1747	/* check for loss of invisiblity/hide */
1846	if (action_makes_visible (op))	1748	if (action_makes_visible (op))
1847	make_visible (op);	1749	make_visible (op);
1848		1750
1849	player *pl = op->contr;
1850
1851	if (pl->golem)
1852	{
1853	control_golem (op->contr->golem, dir);
1854	return;
1855	}
1856
1857	object *ob = pl->ranged_ob;
1858
1859	if (!ob)
1860	return;
1861
1862	if (!op->change_weapon (ob))
1863	return;
1864
1865	switch (ob->type)	1751	switch (ob->type)
1866	{	1752	{
1867	case BOW:	1753	case BOW:
1868	player_fire_bow (op, dir);	1754	player_fire_bow (op, dir);
1869	break;	1755	break;
…		…
1882		1768
1883	default:	1769	default:
1884	fire_misc_object (op, dir);	1770	fire_misc_object (op, dir);
1885	break;	1771	break;
1886	}	1772	}
		1773
		1774	return true;
1887	}	1775	}
1888		1776
1889	/* find_key	1777	/* find_key
1890	* We try to find a key for the door as passed. If we find a key	1778	* 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	1779	* and successfully use it, we return the key, otherwise NULL
…		…
1959	* Change the color so that the message doesn't disappear with	1847	* Change the color so that the message doesn't disappear with
1960	* all the others.	1848	* all the others.
1961	*/	1849	*/
1962	if (pl->contr->usekeys == key_inventory ||	1850	if (pl->contr->usekeys == key_inventory ||
1963	!QUERY_FLAG (container, FLAG_APPLIED) ||	1851	!QUERY_FLAG (container, FLAG_APPLIED) ||
1964	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1852	(pl->contr->usekeys == keyrings && container->race != shstr_keys))
1965	{	1853	{
1966	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1854	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1967	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1855	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1968	return NULL;	1856	return NULL;
1969	}	1857	}
…		…
1978	* 0 otherwise	1866	* 0 otherwise
1979	*/	1867	*/
1980	static int	1868	static int
1981	player_attack_door (object *op, object *door)	1869	player_attack_door (object *op, object *door)
1982	{	1870	{
1983	/* If its a door, try to find a use a key. If we do destroy the door,	1871	/* 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 -	1872	* might as well return immediately as there is nothing more to do -
1985	* otherwise, we fall through to the rest of the code.	1873	* otherwise, we fall through to the rest of the code.
1986	*/	1874	*/
1987	object *key = find_key (op, op, door);	1875	object *key = find_key (op, op, door);
1988		1876
1989	/* IF we found a key, do some extra work */	1877	/* If we found a key, do some extra work */
1990	if (key)	1878	if (key)
1991	{	1879	{
1992	object *container = key->env;	1880	object *container = key->env;
1993
1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1995		1881
1996	if (action_makes_visible (op))	1882	if (action_makes_visible (op))
1997	make_visible (op);	1883	make_visible (op);
1998		1884
1999	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1885	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
2001		1887
2002	if (door->type == DOOR)	1888	if (door->type == DOOR)
2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1889	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2004	else if (door->type == LOCKED_DOOR)	1890	else if (door->type == LOCKED_DOOR)
2005	{	1891	{
2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1892	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2007	remove_door2 (door); /* remove door without violence ;-) */	1893	remove_door2 (door); /* remove door without violence ;-) */
2008	}	1894	}
2009		1895
2010	/* Do this after we print the message */	1896	/* Do this after we print the message */
2011	decrease_ob (key); /* Use up one of the keys */	1897	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		1898
2016	return 1; /* Nothing more to do below */	1899	return 1; /* Nothing more to do below */
2017	}	1900	}
2018	else if (door->type == LOCKED_DOOR)	1901	else if (door->type == LOCKED_DOOR)
2019	{	1902	{
2020	/* Might as well return now - no other way to open this */	1903	/* Might as well return now - no other way to open this */
2021	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1904	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2022	return 1;	1905	return 1;
2023	}	1906	}
2024		1907
2025	return 0;	1908	return 0;
2026	}	1909	}
…		…
2029	* It should keep the code cleaner.	1912	* It should keep the code cleaner.
2030	* When this is called, the players direction has been updated	1913	* When this is called, the players direction has been updated
2031	* (taking into account confusion.) The player is also actually	1914	* (taking into account confusion.) The player is also actually
2032	* going to try and move (not fire weapons).	1915	* going to try and move (not fire weapons).
2033	*/	1916	*/
2034	void	1917	bool
2035	move_player_attack (object *op, int dir)	1918	move_player_attack (object *op, int dir)
2036	{	1919	{
2037	object *tmp, *mon;
2038	int on_battleground;	1920	int on_battleground;
2039	maptile *m;
2040		1921
2041	sint16 nx = freearr_x[dir] + op->x;	1922	sint16 nx = freearr_x[dir] + op->x;
2042	sint16 ny = freearr_y[dir] + op->y;	1923	sint16 ny = freearr_y[dir] + op->y;
2043		1924
2044	on_battleground = op_on_battleground (op, 0, 0);	1925	on_battleground = op_on_battleground (op, 0, 0);
		1926
		1927	if (out_of_map (op->map, nx, ny))
		1928	return false;
		1929
		1930	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1931	{
		1932	--op->speed_left;
		1933	return true;
		1934	}
2045		1935
2046	/* If braced, or can't move to the square, and it is not out of the	1936	/* 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	1937	* 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	1938	* 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	1939	* 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	1940	* 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	1941	* 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	1942	* quite a bit of processing. However, it probably is less than what
2053	* move_ob uses.	1943	* move_ob uses.
2054	*/	1944	*/
2055	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	1945	maptile *m = op->map->xy_find (nx, ny);
		1946
		1947	/* Go through all the objects, and find ones of interest. Only stop if
		1948	* we find a monster - that is something we know we want to attack.
		1949	* if its a door or barrel (can roll) see if there may be monsters
		1950	* on the space
		1951	*/
		1952	object *mon;
		1953	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
		1954	{
		1955	if ((mon->flag [FLAG_ALIVE]
		1956	|| mon->type == LOCKED_DOOR
		1957	|| mon->flag [FLAG_CAN_ROLL])
		1958	&& mon != op)
		1959	break;
2056	{	1960	}
2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))	1961
		1962	if (!mon) /* This happens anytime the player tries to move */
		1963	return false; /* into a wall */
		1964
		1965	mon = mon->head_ ();
		1966
		1967	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		1968	if (op->contr->weapon_sp_left > 0.f)
		1969	if (player_attack_door (op, mon))
		1970	{
		1971	--op->contr->weapon_sp_left;
		1972	return true;
2058	{	1973	}
2059	m = op->map->xy_find (nx, ny);	1974
2060	if (!m)	1975	/* The following deals with possibly attacking peaceful
2061	return; /* Don't think this should happen */	1976	* or friendly creatures. Basically, all players are considered
		1977	* unaggressive. If the moving player has peaceful set, then the
		1978	* object should be pushed instead of attacked. It is assumed that
		1979	* if you are braced, you will not attack friends accidently,
		1980	* and thus will not push them.
		1981	*/
		1982
		1983	/* If the creature is a pet, push it even if the player is not
		1984	* peaceful. Our assumption is the creature is a pet if the
		1985	* player owns it and it is either friendly or unagressive.
		1986	*/
		1987	if (op->type == PLAYER
		1988	&& ((mon->owner && mon->owner->contr
		1989	&& same_party (mon->owner->contr->party, op->contr->party))
		1990	|| mon->owner == op)
		1991	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
		1992	{
		1993	/* If we're braced, we don't want to switch places with it */
		1994	if (op->contr->braced)
		1995	return false;
		1996
		1997	if (op->speed_left > 0.f)
		1998	{
		1999	--op->speed_left;
		2000
		2001	op->play_sound (sound_find ("push_player"));
		2002	push_ob (mon, dir, op);
		2003
		2004	if (action_makes_visible (op))
		2005	make_visible (op);
		2006
		2007	return true;
2062	}	2008	}
2063	else	2009	else
2064	m = op->map;
2065
2066	if (!(tmp = m->at (nx, ny).bot))
2067	return;	2010	return false;
		2011	}
2068		2012
2069	mon = 0;
2070	/* 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.
2072	* if its a door or barrel (can roll) see if there may be monsters
2073	* on the space
2074	*/
2075	while (tmp)
2076	{
2077	if (tmp == op)
2078	{
2079	tmp = tmp->above;
2080	continue;
2081	}
2082
2083	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2084	{
2085	mon = tmp;
2086	break;
2087	}
2088
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 */
2096	return; /* into a wall */
2097
2098	if (mon->head)
2099	mon = mon->head;
2100
2101	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2102	if (player_attack_door (op, mon))
2103	return;
2104
2105	/* The following deals with possibly attacking peaceful
2106	* or frienddly creatures. Basically, all players are considered
2107	* unaggressive. If the moving player has peaceful set, then the
2108	* object should be pushed instead of attacked. It is assumed that
2109	* if you are braced, you will not attack friends accidently,
2110	* and thus will not push them.
2111	*/
2112
2113	/* 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
2115	* player owns it and it is either friendly or unagressive.
2116	*/
2117	if (op->type == PLAYER
2118	&& ((mon->owner && mon->owner->contr
2119	&& same_party (mon->owner->contr->party, op->contr->party))
2120	|| mon->owner == op)
2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2122	{
2123	/* If we're braced, we don't want to switch places with it */
2124	if (op->contr->braced)
2125	return;
2126
2127	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2128	push_ob (mon, dir, op);
2129	if (op->contr->tmp_invis || op->hide)
2130	make_visible (op);
2131
2132	return;
2133	}
2134
2135	/* in certain circumstances, you shouldn't attack friendly	2013	/* in certain circumstances, you shouldn't attack friendly
2136	* creatures. Note that if you are braced, you can't push	2014	* creatures. Note that if you are braced, you can't push
2137	* someone, but put it inside this loop so that you won't	2015	* someone, but put it inside this loop so that you won't
2138	* attack them either.	2016	* attack them either.
2139	*/	2017	*/
2140	if ((mon->type == PLAYER || mon->enemy != op)	2018	if ((mon->type == PLAYER || mon->enemy != op)
2141	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	2019	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2142	&& ((op->contr->peaceful	2020	&& ((op->contr->peaceful
2143	|| (mon->type == PLAYER && mon->contr->peaceful))	2021	|| (mon->type == PLAYER && mon->contr->peaceful))
2144	&& !on_battleground))	2022	&& !on_battleground))
		2023	{
		2024	if (op->speed_left > 0.f)
2145	{	2025	{
		2026	--op->speed_left;
		2027
2146	if (!op->contr->braced)	2028	if (!op->contr->braced)
2147	{	2029	{
2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2030	op->play_sound (sound_find ("push_player"));
2149	push_ob (mon, dir, op);	2031	push_ob (mon, dir, op);
2150	}	2032	}
2151	else	2033	else
2152	new_draw_info (0, 0, op, "You withhold your attack");	2034	op->statusmsg ("You withhold your attack");
2153		2035
2154	if (op->contr->tmp_invis || op->hide)	2036	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2155	make_visible (op);	2037	make_visible (op);
2156	}
2157		2038
		2039	return true;
		2040	}
		2041	}
2158	/* If the object is a boulder or other rollable object, then	2042	/* 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.	2043	* roll it if not braced. You can't roll it if you are braced.
2160	*/	2044	*/
2161	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2045	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2046	{
		2047	if (op->speed_left > 0.f)
2162	{	2048	{
		2049	--op->speed_left;
		2050
2163	recursive_roll (mon, dir, op);	2051	recursive_roll (mon, dir, op);
2164	if (action_makes_visible (op))	2052	if (action_makes_visible (op))
2165	make_visible (op);	2053	make_visible (op);
2166	}
2167		2054
		2055	return true;
		2056	}
		2057	}
2168	/* Any generic living creature. Including things like doors.	2058	/* Any generic living creature. Including things like doors.
2169	* Way it works is like this: First, it must have some hit points	2059	* 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:	2060	* 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	2061	* 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.	2062	* that party_number -1 is no party, so attacks can still happen.
2173	*/	2063	*/
2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2064	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)))	2065	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2176	{	2066	{
2177	if (!op->contr->has_hit)	2067	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2178	{	2068	{
2179	op->contr->has_hit = 1;	2069	--op->contr->weapon_sp_left;
2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2181	}
2182		2070
2183	skill_attack (mon, op, 0, 0, 0);	2071	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		2072
2199	if (action_makes_visible (op))	2073	if (action_makes_visible (op))
2200	make_visible (op);	2074	make_visible (op);
2201	}
2202	} /* if player should attack something */
2203	}
2204		2075
2205	int	2076	return true;
		2077	}
		2078	}
		2079
		2080	return false;
		2081	}
		2082
		2083	bool
2206	move_player (object *op, int dir)	2084	move_player (object *op, int dir)
2207	{	2085	{
2208	int pick;	2086	int pick;
2209		2087
2210	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2088	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2211	return 0;	2089	return 0;
2212		2090
2213	/* Sanity check: make sure dir is valid */	2091	/* Sanity check: make sure dir is valid */
2214	if ((dir < 0) || (dir >= 9))	2092	if ((dir < 0) || (dir >= 9))
2215	{	2093	{
…		…
2221	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2099	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2222	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2100	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2223		2101
2224	op->facing = dir;	2102	op->facing = dir;
2225		2103
2226	if (op->hide)	2104	if (op->flag [FLAG_HIDDEN])
2227	do_hidden_move (op);	2105	do_hidden_move (op);
2228		2106
		2107	bool retval;
		2108
2229	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2109	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2230	/*nop */ ;	2110	retval = RESULT_INT (0);
2231	else if (op->contr->fire_on)	2111	else if (op->contr->fire_on)
2232	fire (op, dir);	2112	retval = fire (op, dir);
2233	else	2113	else
2234	{	2114	{
2235	move_player_attack (op, dir);	2115	retval = move_player_attack (op, dir);
2236	pick = check_pick (op);	2116	pick = check_pick (op);
2237	}	2117	}
2238		2118
2239	/* Add special check for newcs players and fire on - this way, the	2119	/* Add special check for newcs players and fire on - this way, the
2240	* server can handle repeat firing.	2120	* server can handle repeat firing.
…		…
2247	/* Update how the player looks. Use the facing, so direction may	2127	/* Update how the player looks. Use the facing, so direction may
2248	* get reset to zero. This allows for full animation capabilities	2128	* get reset to zero. This allows for full animation capabilities
2249	* for players.	2129	* for players.
2250	*/	2130	*/
2251	animate_object (op, op->facing);	2131	animate_object (op, op->facing);
2252	return 0;	2132
		2133	return retval;
2253	}	2134	}
2254		2135
2255	/* This is similar to handle_player, below, but is only used by the	2136	/* This is similar to handle_player, below, but is only used by the
2256	* new client/server stuff.	2137	* new client/server stuff.
2257	* This is sort of special, in that the new client/server actually uses	2138	* This is sort of special, in that the new client/server actually uses
2258	* the new speed values for commands.	2139	* the new speed values for commands.
2259	*	2140	*
2260	* Returns true if there are more actions we can do.	2141	* Returns true if there are more actions we can do. Should not do
		2142	* many actions in a row, as that would be too unfair to other
		2143	* players.
2261	*/	2144	*/
2262	int	2145	bool
2263	handle_newcs_player (object *op)	2146	handle_newcs_player (object *op)
2264	{	2147	{
2265	if (QUERY_FLAG (op, FLAG_SCARED))	2148	if (QUERY_FLAG (op, FLAG_SCARED))
2266	{	2149	{
2267	flee_player (op);	2150	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	{	2151	{
2272	--op->speed_left;	2152	--op->speed_left;
		2153	flee_player (op);
		2154
2273	return 0;	2155	return true;
2274	}	2156	}
		2157	else
		2158	return false;
2275	}	2159	}
2276		2160
2277	/* call this here - we also will call this in do_ericserver, but	2161	/* call this here - we also will call this in do_ericserver, but
2278	* the players time has been increased when doericserver has been	2162	* the players time has been increased when doericserver has been
2279	* called, so we recheck it here.	2163	* called, so we recheck it here.
2280	*/	2164	*/
2281	if (op->contr->ns->handle_command ())	2165	if (op->contr->ns->handle_command ())
2282	return 1;	2166	return true;
2283		2167
2284	if (op->speed_left > 0.f)
2285	{
2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2168	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);	2169	return move_player (op, op->direction);
2296		2170
2297	return op->speed_left > 0.f;
2298	}
2299	}
2300
2301	return 0;	2171	return false;
2302	}	2172	}
2303		2173
2304	int	2174	int
2305	save_life (object *op)	2175	save_life (object *op)
2306	{	2176	{
…		…
2308	return 0;	2178	return 0;
2309		2179
2310	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2180	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2311	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2181	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2312	{	2182	{
2313	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2183	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));	2184	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		2185
2319	tmp->destroy ();	2186	tmp->destroy ();
2320	CLEAR_FLAG (op, FLAG_LIFESAVE);	2187	CLEAR_FLAG (op, FLAG_LIFESAVE);
2321		2188
2322	if (op->stats.hp < 0)	2189	if (op->stats.hp < 0)
…		…
2335	return 0;	2202	return 0;
2336	}	2203	}
2337		2204
2338	/* This goes throws the inventory and removes unpaid objects, and puts them	2205	/* 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	2206	* 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	2207	* function will descend into containers. op is the object to start the search
2341	* from.	2208	* from.
2342	*/	2209	*/
		2210	static void
		2211	drop_unpaid_items (object *op, object *env)
		2212	{
		2213	while (op)
		2214	{
		2215	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2216
		2217	if (QUERY_FLAG (op, FLAG_UNPAID))
		2218	op->insert_at (env);
		2219	else if (op->inv)
		2220	drop_unpaid_items (op->inv, env);
		2221
		2222	op = next;
		2223	}
		2224	}
		2225
2343	void	2226	void
2344	remove_unpaid_objects (object *op, object *env)	2227	object::drop_unpaid_items ()
2345	{	2228	{
2346	while (op)	2229	if (!flag [FLAG_REMOVED])
2347	{	2230	::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	}	2231	}
2363		2232
2364	/*	2233	/*
2365	* Returns pointer a static string containing gravestone text	2234	* Returns pointer a static string containing gravestone text
2366	* Moved from apply.c to player.c - player.c is what	2235	* Moved from apply.c to player.c - player.c is what
2367	* actually uses this function. player.c may not be quite the	2236	* actually uses this function. player.c may not be quite the
2368	* best, a misc file for object actions is probably better,	2237	* best, a misc file for object actions is probably better,
2369	* but there isn't one in the server directory.	2238	* but there isn't one in the server directory.
2370	*/	2239	*/
2371	char *	2240	const char *
2372	gravestone_text (object *op)	2241	gravestone_text (object *op)
2373	{	2242	{
2374	static char buf2[MAX_BUF];	2243	static dynbuf_text buf;
2375	char buf[MAX_BUF];
2376	time_t now = time (NULL);
2377		2244
2378	strcpy (buf2, " R.I.P.\n\n");	2245	buf << "---- R.I.P. ----\n\n"
		2246	<< op->name;
		2247
2379	if (op->type == PLAYER)	2248	if (op->type == PLAYER)
2380	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2249	buf << " the " << op->contr->title;
2381	else
2382	sprintf (buf, "%s\n", &op->name);
2383		2250
2384	strncat (buf2, " ", 20 - strlen (buf) / 2);	2251	buf << "\n\n";
2385	strcat (buf2, buf);	2252
		2253	buf << "who was level ";
		2254	buf << (sint32)op->level << "\n\n" // OO breakdown
		2255	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2256
2386	if (op->type == PLAYER)	2257	if (op->type == PLAYER)
2387	sprintf (buf, "who was in level %d when killed\n", op->level);	2258	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		2259
2391	strncat (buf2, " ", 20 - strlen (buf) / 2);
2392	strcat (buf2, buf);
2393	if (op->type == PLAYER)
2394	{	2260	{
2395	sprintf (buf, "by %s.\n\n", op->contr->killer);	2261	static char buf2[128];
2396	strncat (buf2, " ", 21 - strlen (buf) / 2);	2262	time_t now = time (NULL);
2397	strcat (buf2, buf);
2398	}
2399
2400	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2263	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2401	strncat (buf2, " ", 20 - strlen (buf) / 2);	2264	buf << buf2;
2402	strcat (buf2, buf);	2265	}
2403		2266
2404	return buf2;	2267	return buf;
2405	}	2268	}
2406		2269
2407	void	2270	void
2408	do_some_living (object *op)	2271	do_some_living (object *op)
2409	{	2272	{
…		…
2461	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2324	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2462	else	2325	else
2463	{	2326	{
2464	gen_grace = op->stats.maxgrace;	2327	gen_grace = op->stats.maxgrace;
2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2328	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	}	2329	}
2509		2330
2510	/* Regenerate Grace */	2331	/* Regenerate Grace */
2511	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2332	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2512	if (--op->last_grace < 0)	2333	if (--op->last_grace < 0)
…		…
2533	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2354	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2534	}	2355	}
2535	/* wearing stuff doesn't detract from grace generation. */	2356	/* wearing stuff doesn't detract from grace generation. */
2536	}	2357	}
2537		2358
		2359	if (op->stats.food > 0)
		2360	{
2538	/* Regenerate Hit Points */	2361	/* Regenerate Spell Points */
2539	if (--op->last_heal < 0)	2362	if (!op->contr->golem && --op->last_sp < 0)
2540	{
2541	if (op->stats.hp < op->stats.maxhp)
2542	{	2363	{
2543	op->stats.hp++;	2364	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2544	/* dms do not consume food */	2365
2545	if (!QUERY_FLAG (op, FLAG_WIZ))	2366	if (op->stats.sp < op->stats.maxsp)
2546	{	2367	{
		2368	op->stats.sp++;
		2369
		2370	/* dms do not consume food */
		2371	if (!QUERY_FLAG (op, FLAG_WIZ))
		2372	{
2547	op->stats.food--;	2373	op->stats.food--;
		2374
2548	if (op->contr->digestion < 0)	2375	if (op->contr->digestion < 0)
2549	op->stats.food += op->contr->digestion;	2376	op->stats.food += op->contr->digestion;
2550	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2377	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2551	op->stats.food = last_food;	2378	op->stats.food = last_food;
		2379	}
2552	}	2380	}
2553	}
2554		2381
2555	if (max_hp > 1)	2382	if (max_sp > 1)
2556	{
2557	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2558	if (over_hp > 0)
2559	{	2383	{
2560	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2384	over_sp = (gen_sp + 10) / rate_sp;
		2385	if (over_sp > 0)
		2386	{
		2387	if (op->stats.sp < op->stats.maxsp)
		2388	{
		2389	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2390
		2391	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2392	op->stats.sp--;
		2393
		2394	if (op->stats.sp > op->stats.maxsp)
		2395	op->stats.sp = op->stats.maxsp;
		2396	}
		2397
2561	op->last_heal = 0;	2398	op->last_sp = 0;
		2399	}
		2400	else
		2401	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2562	}	2402	}
2563	else	2403	else
		2404	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2405	}
		2406
		2407	/* Regenerate Hit Points */
		2408	if (--op->last_heal < 0)
		2409	{
		2410	if (op->stats.hp < op->stats.maxhp)
2564	{	2411	{
2565	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2412	op->stats.hp++;
		2413
		2414	/* dms do not consume food */
		2415	if (!QUERY_FLAG (op, FLAG_WIZ))
		2416	{
		2417	op->stats.food--;
		2418
		2419	if (op->contr->digestion < 0)
		2420	op->stats.food += op->contr->digestion;
		2421	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2422	op->stats.food = last_food;
		2423	}
2566	}	2424	}
		2425
		2426	if (max_hp > 1)
		2427	{
		2428	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2429
		2430	if (over_hp > 0)
		2431	{
		2432	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2433	op->last_heal = 0;
		2434	}
		2435	else
		2436	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2567	}	2437	}
2568	else	2438	else
2569	{
2570	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2439	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2571	}	2440	}
2572	}	2441	}
2573		2442
2574	/* Digestion */	2443	/* Digestion */
2575	if (--op->last_eat < 0)	2444	if (--op->last_eat < 0)
2576	{	2445	{
2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2446	int bonus = max (0, op->contr->digestion),
		2447	penalty = max (0, -op->contr->digestion);
2578		2448
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2449	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		2450
2584	/* dms do not consume food */	2451	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2452	if (!QUERY_FLAG (op, FLAG_WIZ))
2586	op->stats.food--;	2453	op->stats.food--;
2587	}	2454	}
2588		2455
2589	if (op->stats.food < 0 && op->stats.hp >= 0)	2456	if (op->stats.food < 0 && op->stats.hp >= 0)
2590	{	2457	{
2591	object *tmp, *flesh = 0;	2458	object *flesh = 0;
2592		2459
2593	for (tmp = op->inv; tmp; tmp = tmp->below)	2460	for_inv_removable (op, tmp)
2594	{	2461	{
2595	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2462	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2463	continue;
		2464
		2465	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2596	{	2466	{
2597	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2467	op->statusmsg ("You blindly grab for a bite of food. "
2598	{	2468	"H<To prevent you from starving, you ate some random item from your backpack.>");
2599	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2600	manual_apply (op, tmp, 0);	2469	manual_apply (op, tmp, 0);
		2470
2601	if (op->stats.food >= 0 || op->stats.hp < 0)	2471	if (op->stats.food >= 0 || op->stats.hp < 0)
2602	break;	2472	break;
2603	}	2473	}
2604	else if (tmp->type == FLESH)	2474	else if (tmp->type == FLESH)
2605	flesh = tmp;	2475	flesh = tmp;
2606	} /* End if paid for object */	2476	}
2607	} /* end of for loop */
2608		2477
2609	/* If player is still starving, it means they don't have any food, so	2478	/* If player is still starving, it means they don't have any food, so
2610	* eat flesh instead.	2479	* eat flesh instead.
2611	*/	2480	*/
2612	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2481	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2613	{	2482	{
2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2483	op->statusmsg ("You blindly grab for a bite of food. "
		2484	"H<To prevent you from starving, you ate some random item from your backpack.>");
2615	manual_apply (op, flesh, 0);	2485	manual_apply (op, flesh, 0);
2616	}	2486	}
		2487
		2488	// If player is still starving, alert him!
		2489	if (op->stats.food < 0)
		2490	op->failmsg ("You are starving! "
		2491	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2492	}
		2493
		2494	if (op->stats.food < 0)
2617	}	2495	{
		2496	op->stats.hp += op->stats.food;
		2497	op->stats.food = 0;
2618		2498
2619	while (op->stats.food < 0 && op->stats.hp >= 0)	2499	if (op->stats.hp < 0)
2620	op->stats.food++, op->stats.hp--;	2500	{
		2501	op->contr->killer = archetype::get ("killer_starvation");
		2502	op->contr->killer->destroy ();
		2503	}
		2504	}
2621		2505
		2506	/* killer should be set here already */
2622	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2507	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2623	kill_player (op);	2508	kill_player (op);
2624	}	2509	}
2625	}	2510	}
2626		2511
…		…
2630	* file.	2515	* file.
2631	*/	2516	*/
2632	void	2517	void
2633	kill_player (object *op)	2518	kill_player (object *op)
2634	{	2519	{
2635	char buf[MAX_BUF];
2636	int x, y;	2520	int x, y;
2637
2638	//int i;
2639	maptile *map; /* this is for resurrection */	2521	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;	2522	int will_kill_again;
2647	archetype *at;	2523	archetype *at;
2648	object *tmp;	2524	object *tmp;
2649		2525
2650	if (save_life (op))	2526	if (save_life (op))
2651	return;	2527	return;
2652		2528
		2529	dynbuf_text deathtab;
		2530
		2531	/* restore player */
		2532	at = archetype::find ("poisoning");
		2533	if (object *tmp = present_arch_in_ob (at, op))
		2534	{
		2535	tmp->destroy ();
		2536	deathtab << "Your body feels cleansed...\r";
		2537	}
		2538
		2539	at = archetype::find ("confusion");
		2540	if (object *tmp = present_arch_in_ob (at, op))
		2541	{
		2542	tmp->destroy ();
		2543	deathtab << "Your mind feels clearer...\r";
		2544	}
		2545
		2546	cure_disease (op, 0, 0); /* remove any disease */
		2547
		2548	max_it (op->stats.hp , op->stats.maxhp);
		2549	max_it (op->stats.sp , op->stats.maxsp);
		2550	max_it (op->stats.grace, op->stats.maxgrace);
		2551
		2552	if (op->stats.food <= 0)
		2553	op->stats.food = 999;
		2554
		2555	// remove all spell effects that are active
		2556	// to avoid long-term effects such as word-of-recall
		2557	for (object *item = op->inv; item; )
		2558	{
		2559	object *next = item->below;
		2560
		2561	if (item->type == SPELL_EFFECT && item->active)
		2562	item->destroy ();
		2563
		2564	item = next;
		2565	}
2653		2566
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2567	/* 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.	2568	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2569	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2570	*/
2658	if (op_on_battleground (op, &x, &y))	2571	if (op_on_battleground (op, &x, &y))
2659	{	2572	{
2660	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2573	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2661	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2662
2663	/* restore player */
2664	at = archetype::find ("poisoning");
2665	if (object *tmp = present_arch_in_ob (at, op))
2666	{
2667	tmp->destroy ();
2668	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2669	}
2670
2671	at = archetype::find ("confusion");
2672	if (object *tmp = present_arch_in_ob (at, op))
2673	{
2674	tmp->destroy ();
2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2676	}
2677
2678	cure_disease (op, 0); /* remove any disease */
2679	op->stats.hp = op->stats.maxhp;
2680	if (op->stats.food <= 0)
2681	op->stats.food = 999;
2682		2574
2683	/* create a bodypart-trophy to make the winner happy */	2575	/* create a bodypart-trophy to make the winner happy */
2684	if (object *tmp = arch_to_object (archetype::find ("finger")))	2576	if (object *tmp = arch_to_object (archetype::find ("finger")))
2685	{	2577	{
2686	sprintf (buf, "%s's finger", &op->name);	2578	tmp->name = format ("%s's finger" , &op->name);
2687	tmp->name = buf;	2579	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;	2580	tmp->msg = format (
		2581	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2582	&op->name, op->contr->title,
		2583	(int)op->level,
		2584	op->contr->killer_name ()
		2585	);
2692	tmp->value = 0, tmp->type = 0;	2586	tmp->value = 0, tmp->type = 0;
2693	tmp->materialname = "organics";	2587	tmp->materialname = "organics";
2694	tmp->insert_at (op, tmp);	2588	tmp->insert_at (op, tmp);
2695	}	2589	}
2696		2590
2697	/* teleport defeated player to new destination */	2591	/* teleport defeated player to new destination */
2698	transfer_ob (op, x, y, 0, NULL);	2592	transfer_ob (op, x, y, 0, NULL);
2699	op->contr->braced = 0;	2593	op->contr->braced = 0;
		2594
		2595	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2700	return;	2596	return;
2701	}	2597	}
2702		2598
		2599	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2600	deathtab << "T<YOU HAVE DIED>\n\n";
		2601
2703	INVOKE_PLAYER (DEATH, op->contr);	2602	INVOKE_PLAYER (DEATH, op->contr);
2704		2603
2705	command_kill_pets (op, 0);	2604	command_kill_pets (op, 0);
2706		2605
2707	if (op->stats.food < 0)	2606	op->contr->play_sound (sound_find ("player_dies"));
2708	{
2709	sprintf (buf, "%s starved to death.", &op->name);
2710	strcpy (op->contr->killer, "starvation");
2711	}
2712	else
2713	sprintf (buf, "%s died.", &op->name);
2714
2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2716		2607
2717	/* save the map location for corpse, gravestone */	2608	/* save the map location for corpse, gravestone */
2718	x = op->x;	2609	x = op->x;
2719	y = op->y;	2610	y = op->y;
2720	map = op->map;	2611	map = op->map;
…		…
2748		2639
2749	lost_a_stat = 0;	2640	lost_a_stat = 0;
2750		2641
2751	for (z = 0; z < num_stats_lose; z++)	2642	for (z = 0; z < num_stats_lose; z++)
2752	{	2643	{
2753	i = RANDOM () % NUM_STATS;	2644	i = rndm (NUM_STATS);
2754		2645
2755	if (settings.stat_loss_on_death)	2646	if (settings.stat_loss_on_death)
2756	{	2647	{
2757	/* Pick a random stat and take a point off it. Tell the player	2648	/* Pick a random stat and take a point off it. Tell the player
2758	* what he lost.	2649	* what he lost.
…		…
2809	}	2700	}
2810	}	2701	}
2811		2702
2812	if (lose_this_stat)	2703	if (lose_this_stat)
2813	{	2704	{
2814	this_stat = get_attr_value (&(dep->stats), i);	2705	this_stat = get_attr_value (&dep->stats, i);
2815	/* We could try to do something clever like find another	2706	/* We could try to do something clever like find another
2816	* stat to reduce if this fails. But chances are, if	2707	* stat to reduce if this fails. But chances are, if
2817	* stats have been depleted to -50, all are pretty low	2708	* stats have been depleted to -50, all are pretty low
2818	* and should be roughly the same, so it shouldn't make a	2709	* and should be roughly the same, so it shouldn't make a
2819	* difference.	2710	* difference.
…		…
2827	lost_a_stat = 1;	2718	lost_a_stat = 1;
2828	}	2719	}
2829	}	2720	}
2830	}	2721	}
2831	}	2722	}
		2723
2832	/* If no stat lost, tell the player. */	2724	/* If no stat lost, tell the player. */
2833	if (!lost_a_stat)	2725	if (!lost_a_stat)
2834	{	2726	{
2835	/* determine_god() seems to not work sometimes... why is this?	2727	/* determine_god() seems to not work sometimes... why is this?
2836	Should I be using something else? GD */	2728	Should I be using something else? GD */
2837	const char *god = determine_god (op);	2729	shstr_tmp god = determine_god (op);
2838		2730
2839	if (god && (strcmp (god, "none")))	2731	if (god != shstr_none)
2840	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2732	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2841	else	2733	else
2842	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2734	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2843	}	2735	}
2844	#else	2736	#else
2845	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2737	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2846	#endif	2738	#endif
2847		2739
2848	/* Put a gravestone up where the character 'almost' died. List the	2740	/* Put a gravestone up where the character 'almost' died. List the
2849	* exp loss on the stone.	2741	* exp loss on the stone.
2850	*/	2742	*/
2851	tmp = arch_to_object (archetype::find ("gravestone"));	2743	tmp = arch_to_object (archetype::find ("gravestone"));
2852	sprintf (buf, "%s's gravestone", &op->name);	2744	tmp->name = format ("%s's gravestone", &op->name);
2853	tmp->name = buf;	2745	tmp->name_pl = format ("%s's gravestones", &op->name);
2854	sprintf (buf, "%s's gravestones", &op->name);	2746	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2855	tmp->name_pl = buf;	2747	&op->name, op->contr->title, op->contr->killer_name ());
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);
2857	tmp->msg = buf;
2858	tmp->x = op->x, tmp->y = op->y;	2748	tmp->x = op->x, tmp->y = op->y;
2859	insert_ob_in_map (tmp, op->map, NULL, 0);	2749	insert_ob_in_map (tmp, op->map, NULL, 0);
2860		2750
2861	/**************************************/	2751	/**************************************/
2862	/* */	2752	/* */
2863	/* Subtract the experience points, */	2753	/* Subtract the experience points, */
2864	/* if we died cause of food, give us */
2865	/* food, and reset HP's... */
2866	/* */	2754	/* */
2867	/**************************************/	2755	/**************************************/
2868		2756
2869	/* remove any poisoning and confusion the character may be suffering. */
2870	/* restore player */
2871	at = archetype::find ("poisoning");
2872	tmp = present_arch_in_ob (at, op);
2873
2874	if (tmp)
2875	{
2876	tmp->destroy ();
2877	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2878	}
2879
2880	at = archetype::find ("confusion");
2881	tmp = present_arch_in_ob (at, op);
2882	if (tmp)
2883	{
2884	tmp->destroy ();
2885	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2886	}
2887
2888	cure_disease (op, 0); /* remove any disease */
2889
2890	/*add_exp(op, (op->stats.exp * -0.20)); */	2757	/*add_exp(op, (op->stats.exp * -0.20)); */
2891	apply_death_exp_penalty (op);	2758	apply_death_exp_penalty (op);
2892	if (op->stats.food < 100)
2893	op->stats.food = 900;
2894	op->stats.hp = op->stats.maxhp;
2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2897		2759
2898	/*	2760	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2761	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2762	* and put them back in the map.
2901	*/	2763	*/
2902	remove_unpaid_objects (op->inv, op);	2764	op->drop_unpaid_items ();
2903		2765
2904	/****************************************/	2766	/****************************************/
2905	/* */	2767	/* */
2906	/* Move player to his current respawn- */	2768	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2769	/* position (usually last savebed) */
…		…
2936	if (will_kill_again & (1 << at))	2798	if (will_kill_again & (1 << at))
2937	force->resist[at] = 100;	2799	force->resist[at] = 100;
2938		2800
2939	insert_ob_in_ob (force, op);	2801	insert_ob_in_ob (force, op);
2940	op->update_stats ();	2802	op->update_stats ();
2941
2942	}	2803	}
2943		2804
2944	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2805	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2945	}	2806	}
2946		2807
2947	void	2808	void
2948	loot_object (object *op)	2809	loot_object (object *op)
2949	{ /* Grab and destroy some treasure */	2810	{ /* Grab and destroy some treasure */
…		…
2966		2827
2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2828	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2968	{	2829	{
2969	if (tmp->nrof > 1)	2830	if (tmp->nrof > 1)
2970	{	2831	{
2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2832	tmp->decrease (rndm (1, tmp->nrof - 1));
2972	tmp2->destroy ();
2973	insert_ob_in_map (tmp, op->map, NULL, 0);	2833	insert_ob_in_map (tmp, op->map, NULL, 0);
2974	}	2834	}
2975	else	2835	else
2976	tmp->destroy ();	2836	tmp->destroy ();
2977	}	2837	}
…		…
2988	void	2848	void
2989	fix_weight (void)	2849	fix_weight (void)
2990	{	2850	{
2991	for_all_players (pl)	2851	for_all_players (pl)
2992	{	2852	{
2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2853	sint32 old = pl->ob->carrying;
2994		2854
2995	if (old == sum)	2855	pl->ob->update_weight ();
2996	continue;	2856
		2857	if (old != pl->ob->carrying)
		2858	{
2997	pl->ob->update_stats ();	2859	pl->ob->update_stats ();
2998	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2860	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2861	}
2999	}	2862	}
3000	}	2863	}
3001		2864
3002	void	2865	void
3003	fix_luck (void)	2866	fix_luck (void)
…		…
3045	}	2908	}
3046		2909
3047	void	2910	void
3048	make_visible (object *op)	2911	make_visible (object *op)
3049	{	2912	{
3050	op->hide = 0;	2913	op->flag [FLAG_HIDDEN] = 0;
3051	op->invisible = 0;	2914	op->invisible = 0;
		2915
3052	if (op->type == PLAYER)	2916	if (op->type == PLAYER)
3053	{	2917	{
3054	op->contr->tmp_invis = 0;	2918	op->contr->tmp_invis = 0;
3055	op->contr->invis_race = 0;	2919	op->contr->invis_race = 0;
3056	}	2920	}
…		…
3059	}	2923	}
3060		2924
3061	int	2925	int
3062	is_true_undead (object *op)	2926	is_true_undead (object *op)
3063	{	2927	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	2928	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3065	return 1;	2929	return 1;
3066		2930
3067	return 0;	2931	return 0;
3068	}	2932	}
3069		2933
3070	/* look at the surrounding terrain to determine	2934	/* look at the surrounding terrain to determine
3071	* the hideability of this object. Positive levels	2935	* the hideability of this object. Positive levels
3072	* indicate greater hideability.	2936	* indicate greater hideability.
3073	*/	2937	*/
3074
3075	int	2938	int
3076	hideability (object *ob)	2939	hideability (object *ob)
3077	{	2940	{
3078	int i, level = 0, mflag;	2941	int i, level = 0, mflag;
3079	sint16 x, y;	2942	sint16 x, y;
3080		2943
3081	if (!ob || !ob->map)	2944	if (!ob || !ob->map)
3082	return 0;	2945	return 0;
3083		2946
3084	/* so, on normal lighted maps, its hard to hide */	2947	/* so, on normal lighted maps, its hard to hide */
3085	level = ob->map->darkness - 2;	2948	level = ob->map->darklevel () - 2;
3086		2949
3087	/* this also picks up whether the object is glowing.	2950	/* this also picks up whether the object is glowing.
3088	* If you carry a light on a non-dark map, its not	2951	* If you carry a light on a non-dark map, its not
3089	* as bad as carrying a light on a pitch dark map */	2952	* as bad as carrying a light on a pitch dark map */
3090	if (has_carried_lights (ob))	2953	if (ob->has_carried_lights ())
3091	level = -(10 + (2 * ob->map->darkness));	2954	level = -(10 + (2 * ob->map->darklevel ()));
3092		2955
3093	/* scan through all nearby squares for terrain to hide in */	2956	/* 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])	2957	for (i = 0, x = ob->x, y = ob->y;
		2958	i <= SIZEOFFREE1;
		2959	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3095	{	2960	{
3096	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2961	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3097	if (mflag & P_OUT_OF_MAP)	2962	if (mflag & P_OUT_OF_MAP)
3098	{
3099	continue;	2963	continue;
3100	}	2964
3101	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2965	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3102	level += 2;	2966	level += 2;
3103	else /* open terrain! */	2967	else /* open terrain! */
3104	level -= 1;	2968	level -= 1;
3105	}	2969	}
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	2977	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	2978	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	2979	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	2980	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	2981	*/
3118
3119	void	2982	void
3120	do_hidden_move (object *op)	2983	do_hidden_move (object *op)
3121	{	2984	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2985	int hide = 0;
3123	object *skop;
3124		2986
3125	if (!op || !op->map)	2987	if (!op || !op->map)
3126	return;	2988	return;
3127		2989
3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2990	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2991	int num = random_roll (0, 19, op, PREFER_LOW);
3129		2992
3130	/* its *extremely* hard to run and sneak/hide at the same time! */	2993	/* its *extremely* hard to run and sneak/hide at the same time! */
3131	if (op->type == PLAYER && op->contr->run_on)	2994	if (op->type == PLAYER && op->contr->run_on)
3132	if (!skop || num >= skop->level)	2995	if (!skop || num >= skop->level)
3133	{	2996	{
…		…
3143	num -= hide;	3006	num -= hide;
3144		3007
3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3008	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3146	{	3009	{
3147	make_visible (op);	3010	make_visible (op);
		3011
3148	if (op->type == PLAYER)	3012	if (op->type == PLAYER)
3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3013	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3150	}	3014	}
3151	else if (op->type == PLAYER && skop)	3015	else if (op->type == PLAYER && skop)
3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3016	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3205	* object op. This function works fine for monsters,	3069	* object op. This function works fine for monsters,
3206	* but we dont worry if the object isnt the top one in	3070	* but we dont worry if the object isnt the top one in
3207	* a pile (say a coin under a table would return "viewable"	3071	* a pile (say a coin under a table would return "viewable"
3208	* by this routine). Another question, should we be	3072	* by this routine). Another question, should we be
3209	* concerned with the direction the player is looking	3073	* concerned with the direction the player is looking
3210	* in? Realistically, most of use cant see stuff behind	3074	* in? Realistically, most of us can't see stuff behind
3211	* our backs...on the other hand, does the "facing" direction	3075	* our backs...on the other hand, does the "facing" direction
3212	* imply the way your head, or body is facing? Its possible	3076	* 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.	3077	* for them to differ. Sigh, this fctn could get a bit more complex.
3214	* -b.t.	3078	* -b.t.
3215	* This function is now map tiling safe.	3079	* This function is now map tiling safe.
3216	*/	3080	*/
3217
3218	int	3081	int
3219	player_can_view (object *pl, object *op)	3082	player_can_view (object *pl, object *op)
3220	{	3083	{
3221	rv_vector rv;	3084	rv_vector rv;
3222	int dx, dy;	3085	int dx, dy;
…		…
3234		3097
3235	get_rangevector (pl, op, &rv, 0x1);	3098	get_rangevector (pl, op, &rv, 0x1);
3236		3099
3237	/* starting with the 'head' part, lets loop	3100	/* starting with the 'head' part, lets loop
3238	* through the object and find if it has any	3101	* through the object and find if it has any
3239	* part that is in the los array but isnt on	3102	* part that is in the los array but isn't on
3240	* a blocked los square.	3103	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3104	* we use the archetype to figure out offsets.
3242	*/	3105	*/
3243	while (op)	3106	while (op)
3244	{	3107	{
3245	dx = rv.distance_x + op->arch->clone.x;	3108	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3109	dy = rv.distance_y + op->arch->y;
3247		3110
3248	/* only the viewable area the player sees is updated by LOS	3111	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3249	* code, so we need to restrict ourselves to that range of values
3250	* for any meaningful values.
3251	*/
3252	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3253	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3254	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3255	return 1;	3112	return 1;
		3113
3256	op = op->more;	3114	op = op->more;
3257	}	3115	}
		3116
3258	return 0;	3117	return 0;
3259	}	3118	}
3260		3119
3261	/* routine for both players and monsters. We call this when	3120	/* routine for both players and monsters. We call this when
3262	* there is a possibility for our action distrubing our hiding	3121	* there is a possibility for our action distrubing our hiding
3263	* place or invisiblity spell. Artefact invisiblity is not	3122	* place or invisiblity spell. Artefact invisiblity causes
3264	* effected by this. If we arent invisible to begin with, we	3123	* "noise" instead. If we arent invisible to begin with, we
3265	* return 0.	3124	* return 0.
3266	*/	3125	*/
3267	int	3126	int
3268	action_makes_visible (object *op)	3127	action_makes_visible (object *op)
3269	{	3128	{
3270
3271	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3129	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3272	{	3130	{
3273	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3131	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3132	{
		3133	// artefact invisibility is permanent, but we still make noise
		3134	// this is important for game-balance.
		3135	if (op->contr)
		3136	op->make_noise ();
		3137
3274	return 0;	3138	return 0;
		3139	}
3275		3140
3276	if (op->contr && op->contr->tmp_invis == 0)	3141	if (op->contr && op->contr->tmp_invis == 0)
3277	return 0;	3142	return 0;
3278		3143
3279	/* If monsters, they should become visible */	3144	/* If monsters, they should become visible */
3280	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))	3145	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3281	{	3146	{
3282	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3147	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3283	return 1;	3148	return 1;
3284	}	3149	}
3285	}	3150	}
		3151
3286	return 0;	3152	return 0;
3287	}	3153	}
3288		3154
3289	/* op_on_battleground - checks if the given object op (usually	3155	/* op_on_battleground - checks if the given object op (usually
3290	* a player) is standing on a valid battleground-tile,	3156	* 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	3161	* Default is to do the same as before, so only people wanting to have different points need worry about this
3296	*/	3162	*/
3297	int	3163	int
3298	op_on_battleground (object *op, int *x, int *y)	3164	op_on_battleground (object *op, int *x, int *y)
3299	{	3165	{
3300	object *tmp;
3301
3302	/* A battleground-tile needs the following attributes to be valid:	3166	/* 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),	3167	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3304	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3168	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3305	* and the exit-coordinates sp/hp must both be > 0.	3169	* and the exit-coordinates sp/hp must both be > 0.
3306	* => The intention here is to prevent abuse of the battleground-	3170	* => The intention here is to prevent abuse of the battleground-
3307	* feature (like pickable or hidden battleground tiles). */	3171	* feature (like pickable or hidden battleground tiles). */
3308	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3172	for (object *tmp = op->below; tmp; tmp = tmp->below)
3309	{	3173	{
3310	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3174	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3311	{	3175	{
3312	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3176	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3313	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3177	&& tmp->type == BATTLEGROUND
		3178	&& tmp->name == shstr_battleground
		3179	&& EXIT_X (tmp) && EXIT_Y (tmp))
3314	{	3180	{
3315	/*before we assign the exit, check if this is a teambattle */	3181	/* before we assign the exit, check if this is a teambattle */
3316	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3182	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3317	{	3183	{
3318	object *invtmp;
3319
3320	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3184	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3321	{	3185	{
3322	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3186	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3323	{	3187	{
3324	if (x != NULL && y != NULL)	3188	if (x && y)
3325	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3189	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3190
3326	return 1;	3191	return 1;
3327	}	3192	}
3328	}	3193	}
3329	}	3194	}
		3195
3330	if (x != NULL && y != NULL)	3196	if (x && y)
3331	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3197	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3198
3332	return 1;	3199	return 1;
3333	}	3200	}
3334	}	3201	}
3335	}	3202	}
		3203
3336	/* If we got here, did not find a battleground */	3204	/* If we got here, did not find a battleground */
3337	return 0;	3205	return 0;
3338	}	3206	}
3339		3207
3340	/*	3208	/*
…		…
3356	char buf[MAX_BUF]; /* tmp. string buffer */	3224	char buf[MAX_BUF]; /* tmp. string buffer */
3357	int i = 0, j = 0;	3225	int i = 0, j = 0;
3358		3226
3359	/* get the appropriate treasurelist */	3227	/* get the appropriate treasurelist */
3360	if (atnr == ATNR_FIRE)	3228	if (atnr == ATNR_FIRE)
3361	trlist = treasurelist::find ("dragon_ability_fire");	3229	trlist = treasurelist::find (shstr_dragon_ability_fire);
3362	else if (atnr == ATNR_COLD)	3230	else if (atnr == ATNR_COLD)
3363	trlist = treasurelist::find ("dragon_ability_cold");	3231	trlist = treasurelist::find (shstr_dragon_ability_cold);
3364	else if (atnr == ATNR_ELECTRICITY)	3232	else if (atnr == ATNR_ELECTRICITY)
3365	trlist = treasurelist::find ("dragon_ability_elec");	3233	trlist = treasurelist::find (shstr_dragon_ability_elec);
3366	else if (atnr == ATNR_POISON)	3234	else if (atnr == ATNR_POISON)
3367	trlist = treasurelist::find ("dragon_ability_poison");	3235	trlist = treasurelist::find (shstr_dragon_ability_poison);
3368		3236
3369	if (trlist == NULL || who->type != PLAYER)	3237	if (trlist == NULL || who->type != PLAYER)
3370	return;	3238	return;
3371		3239
3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3240	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]); */	3244	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3377	return;	3245	return;
3378	}	3246	}
3379		3247
3380	/* everything seems okay - now bring on the gift: */	3248	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3249	item = tr->item;
3382		3250
3383	if (item->type == SPELL)	3251	if (item->type == SPELL)
3384	{	3252	{
3385	if (check_spell_known (who, item->name))	3253	if (check_spell_known (who, item->name))
3386	return;	3254	return;
…		…
3445	{	3313	{
3446	/* forces in the treasurelist can alter the player's stats */	3314	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3315	object *skin;
3448		3316
3449	/* first get the dragon skin force */	3317	/* 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)	3318	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3452	;	3319	;
3453		3320
3454	if (!skin)	3321	if (!skin)
3455	return;	3322	return;
3456		3323
…		…
3491	else	3358	else
3492	{	3359	{
3493	/* generate misc. treasure */	3360	/* generate misc. treasure */
3494	tmp = arch_to_object (tr->item);	3361	tmp = arch_to_object (tr->item);
3495	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3362	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);	3363	who->insert (tmp);
3497	if (who->type == PLAYER)
3498	esrv_send_item (who, tmp);
3499	}	3364	}
3500	}	3365	}
3501		3366
3502	/**	3367	/**
3503	* Unready an object for a player. This function does nothing if the object was	3368	* Unready an object for a player. This function does nothing if the object was
…		…
3515	if (pl->ranged_ob == ob)	3380	if (pl->ranged_ob == ob)
3516	pl->ranged_ob = 0;	3381	pl->ranged_ob = 0;
3517	}	3382	}
3518		3383
3519	sint8	3384	sint8
3520	player::visibility_at (maptile *map, int x, int y) const	3385	player::darkness_at (maptile *map, int x, int y) const
3521	{	3386	{
3522	if (!ns)	3387	if (!ns)
3523	return 0;	3388	return LOS_BLOCKED;
3524		3389
3525	int dx, dy;	3390	int dx, dy;
3526	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3391	if (!adjacent_map (map, ns->current_map, &dx, &dy))
3527	return 0;	3392	return LOS_BLOCKED;
3528		3393
3529	x += dx - ns->current_x + ns->mapx / 2;	3394	x += dx - ns->current_x;
3530	y += dy - ns->current_y + ns->mapy / 2;	3395	y += dy - ns->current_y;
3531		3396
3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3533	return 0;
3534
3535	return 100 - blocked_los [x][y];	3397	return blocked_los (x, y);
3536	}	3398	}
		3399
		3400	void
		3401	player::infobox (const char *title, const char *msg, int color)
		3402	{
		3403	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3404	}
		3405
		3406	void
		3407	player::statusmsg (const char *msg, int color)
		3408	{
		3409	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3410	}
		3411
		3412	void
		3413	player::failmsg (const char *msg, int color)
		3414	{
		3415	play_sound (sound_find ("generic_failure"));
		3416	statusmsg (msg, color);
		3417	}
		3418

Diff Legend

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