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.134 by root, Sun May 13 08:43:12 2007 UTC vs.
Revision 1.206 by root, Mon Sep 29 10:20:49 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
…		…
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';
…		…
157	op->x = -1;	159	op->x = -1;
158	op->y = -1;	160	op->y = -1;
159	}	161	}
160		162
161	void	163	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	164	player::activate ()
176	{	165	{
177	if (active)	166	if (active)
178	return;	167	return;
179		168
…		…
181	ob->remove ();	170	ob->remove ();
182	ob->map = 0;	171	ob->map = 0;
183	ob->activate_recursive ();	172	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	173	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	174	add_friendly_object (ob);
186	enter_map ();
187	}	175	}
188		176
189	void	177	void
190	player::deactivate ()	178	player::deactivate ()
191	{	179	{
…		…
198		186
199	if (ob->map)	187	if (ob->map)
200	maplevel = ob->map->path;	188	maplevel = ob->map->path;
201		189
202	ob->remove ();	190	ob->remove ();
		191	ob->enemy = 0; // sometimes keeps an extra refcount on itself
203	ob->map = 0;	192	ob->map = 0;
204	party = 0;	193	party = 0;
205		194
206	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
207		196
…		…
221	ob->close_container (); //TODO: client-specific	210	ob->close_container (); //TODO: client-specific
222		211
223	ns->update_look = 0;	212	ns->update_look = 0;
224	ns->look_position = 0;	213	ns->look_position = 0;
225		214
226	clear_los (ob);	215	clear_los (this);
227		216
228	ns->reset_stats ();	217	ns->reset_stats ();
229		218
230	/* make sure he's a player -- needed because of class change. */	219	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	220	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	221	ob->race = ob->arch->race;
233		222
234	ob->carrying = sum_weight (ob);	223	ob->update_weight ();
235	link_player_skills (ob);	224	link_skills ();
236		225
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		227
239	assign (title, ob->arch->clone.name);	228	assign (title, ob->arch->object::name);
240		229
241	/* if it's a dragon player, set the correct title here */	230	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	231	if (is_dragon_pl (ob))
243	{	232	{
244	object *tmp, *abil = 0, *skin = 0;	233	object *tmp, *abil = 0, *skin = 0;
245		234
246	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == shstr_dragon_ability_force)
252	abil = tmp;	238	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == shstr_dragon_skin_force)
254	skin = tmp;	240	skin = tmp;
255		241
256	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
257	}	243	}
258		244
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		246
261	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 */
		303
		304	ob->flag [FLAG_READY_WEAPON] = false;
		305	ob->flag [FLAG_READY_SKILL] = false;
		306	ob->flag [FLAG_READY_BOW] = false;
262		307
263	for (object *op = ob->inv; op; op = op->below)	308	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	309	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	310	switch (op->type)
266	{	311	{
		312	case SKILL:
		313	ob->flag [FLAG_APPLIED] = false;
		314	break;
		315
267	case WAND:	316	case WAND:
268	case ROD:	317	case ROD:
269	case HORN:	318	case HORN:
270	case BOW:	319	case BOW:
271	case SKILL:	320	ranged_ob = op;
272	case SKILL_TOOL:	321	break;
		322
273	case WEAPON:	323	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	324	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	325	break;
277	}	326	}
278		327
279	ob->update_stats ();	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
280	ns->floorbox_update ();	329	ob->deactivate (); // change_weapon activates, fix this better
281
282	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);
284
285	activate ();
286
287	send_rules (ob);
288	send_news (ob);
289	display_motd (ob);
290
291	INVOKE_PLAYER (CONNECT, this);
292	INVOKE_PLAYER (LOGIN, this);
293	}	330	}
294		331
295	void	332	void
296	player::disconnect ()
297	{
298	if (ns)
299	{
300	if (active)
301	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303	INVOKE_PLAYER (DISCONNECT, this);
304
305	ns->reset_stats ();
306	ns->pl = 0;
307	ns = 0;
308	}
309
310	if (ob)
311	ob->close_container (); //TODO: client-specific
312
313	deactivate ();
314	}
315
316	// the need for this function can be explained
317	// by load_object not returning the object
318	void
319	player::set_object (object *op)	333	player::set_observe (object *op)
320	{	334	{
321	ob = op;	335	observe = op ? op : ob;
322	ob->contr = this; /* this aren't yet in archetype */	336	do_los = 1;
323
324	ob->speed_left = 0.5f;
325	ob->speed = 1.0f;
326	ob->direction = 5; /* So player faces south */
327	}	337	}
328		338
329	player::player ()	339	player::player ()
330	{	340	{
331	/* There are some elements we want initialised to non zero value -	341	/* There are some elements we want initialised to non zero value -
…		…
338	savebed_map = first_map_path; /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
339		349
340	gen_sp_armour = 10;	350	gen_sp_armour = 10;
341	bowtype = bow_normal;	351	bowtype = bow_normal;
342	petmode = pet_normal;	352	petmode = pet_normal;
343	listening = 10;
344	usekeys = containers;	353	usekeys = containers;
345	peaceful = 1; /* default peaceful */	354	peaceful = 1; /* default peaceful */
346	do_los = 1;	355	do_los = 1;
		356
		357	weapon_sp = 1.0f;
		358	weapon_sp_left = 0.5f;
347	}	359	}
348		360
349	void	361	void
350	player::do_destroy ()	362	player::do_destroy ()
351	{	363	{
…		…
354	attachable::do_destroy ();	366	attachable::do_destroy ();
355		367
356	if (ob)	368	if (ob)
357	{	369	{
358	ob->destroy_inv (false);	370	ob->destroy_inv (false);
359	ob->destroy ();	371	ob->destroy (true);
360	}	372	}
		373
		374	ob = observe = 0;
361	}	375	}
362		376
363	player::~player ()	377	player::~player ()
364	{	378	{
365	/* Clear item stack */	379	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
393	*/	407	*/
394	archetype *	408	archetype *
395	get_player_archetype (archetype *at)	409	get_player_archetype (archetype *at)
396	{	410	{
397	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);
398		418
399	for (;;)	419	for (;;)
400	{	420	{
401	if (at == NULL || at->next == NULL)	421	if (++i == archetypes.end ())
402	at = first_archetype;	422	i = archetypes.begin ();
403	else	423	else if (*i == at)
404	at = at->next;	424	cleanup ("not a single player archetype found");
405		425
406	if (at->clone.type == PLAYER)	426	if ((*i)->type == PLAYER)
407	return at;	427	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	428	}
415	}	429	}
416		430
417	object *	431	object *
418	get_nearest_player (object *mon)	432	get_nearest_player (object *mon)
…		…
422	unsigned lastdist;	436	unsigned lastdist;
423	rv_vector rv;	437	rv_vector rv;
424		438
425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	440	{
427	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.
431	*/
432	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433	{
434	object *tmp = ol->ob;
435
436	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.
438	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440	tmp->debug_desc ());
441	ol = ol->next;
442	remove_friendly_object (tmp);
443	if (!ol)
444	return op;
445	}
446
447	/* Remove special check for player from this. First, it looks to cause
448	* some crashes (ol->ob->contr not set properly?), but secondly, a more
449	* complicated method of state checking would be needed in any case -
450	* as it was, a clever player could type quit, and the function would
451	* skip them over while waiting for confirmation. Remove
452	* on_same_map check, as can_detect_enemy also does this
453	*/
454	if (!can_detect_enemy (mon, ol->ob, &rv))	441	if (!can_detect_enemy (mon, ol->ob, &rv))
455	continue;	442	continue;
456		443
457	if (lastdist > rv.distance)	444	if (lastdist > rv.distance)
458	{	445	{
…		…
653		640
654	return firstdir;	641	return firstdir;
655	}	642	}
656		643
657	void	644	void
658	give_initial_items (object *pl, treasurelist * items)	645	give_initial_items (object *pl, treasurelist *items)
659	{	646	{
660	object *op, *next = NULL;
661
662	if (pl->randomitems != NULL)	647	if (pl->randomitems)
663	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664		649
665	for (op = pl->inv; op; op = next)	650	for (object *next, *op = pl->inv; op; op = next)
666	{	651	{
667	next = op->below;	652	next = op->below;
668		653
669	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
670	* 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
…		…
675	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
676	* by this player due to race restrictions	661	* by this player due to race restrictions
677	*/	662	*/
678	if (pl->type == PLAYER)	663	if (pl->type == PLAYER)
679	{	664	{
680	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
681	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
682	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
683	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
		670	|| op->type == BRACERS || op->type == GIRDLE))
684	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))
685	{	672	{
686	op->destroy ();	673	op->destroy (true);
687	continue;	674	continue;
688	}	675	}
689	}	676	}
690		677
691	/* This really needs to be better - we should really give	678	/* This really needs to be better - we should really give
…		…
702	if (tmp->type == op->type && tmp->name == op->name)	689	if (tmp->type == op->type && tmp->name == op->name)
703	break;	690	break;
704		691
705	if (tmp)	692	if (tmp)
706	{	693	{
707	op->destroy ();	694	op->destroy (true);
708	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
709	continue;	696	continue;
710	}	697	}
711		698
712	if (op->nrof > 1)	699	if (op->nrof > 1)
713	op->nrof = 1;	700	op->nrof = 1;
714	}	701	}
715		702
716	if (op->type == SPELLBOOK && op->inv)	703	if (op->type == SPELLBOOK && op->inv)
717	{
718	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719	}
720		705
721	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
722	* items. Just don't identify gold or silver, or it won't be	707	* items. Just don't identify gold or silver, or it won't be
723	* merged properly.	708	* merged properly.
724	*/	709	*/
725	if (need_identify (op))	710	if (need_identify (op))
726	{	711	{
727	SET_FLAG (op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
728	CLEAR_FLAG (op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
729	CLEAR_FLAG (op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
730	}	715	}
		716
731	if (op->type == SPELL)	717	if (op->type == SPELL)
732	{	718	{
733	op->destroy ();	719	op->destroy (true);
734	continue;	720	continue;
735	}	721	}
736	else if (op->type == SKILL)	722	else if (op->type == SKILL)
737	{	723	{
738	SET_FLAG (op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
739	op->stats.exp = 0;	725	op->stats.exp = 0;
740	op->level = 1;	726	op->level = 1;
741	}	727	}
742	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
743	else
744	SET_FLAG (op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
745	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
746		731
747	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
748	link_player_skills (pl);	733	pl->contr->link_skills ();
749	}	734	}
750		735
751	void	736	void
752	get_party_password (object *op, partylist *party)	737	get_party_password (object *op, partylist *party)
753	{	738	{
…		…
854	static void	839	static void
855	start_info (object *op)	840	start_info (object *op)
856	{	841	{
857	char buf[MAX_BUF];	842	char buf[MAX_BUF];
858		843
859	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860	new_draw_info (NDI_UNIQUE, 0, op, buf);	845	new_draw_info (NDI_UNIQUE, 0, op, buf);
861	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862	//new_draw_info (NDI_UNIQUE, 0, op, " ");
863	}	846	}
864		847
865	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
866	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
867	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
…		…
870	*/	853	*/
871	void	854	void
872	player::chargen_race_done ()	855	player::chargen_race_done ()
873	{	856	{
874	/* this must before then initial items are given */	857	/* this must before then initial items are given */
875	esrv_new_player (ob->contr, ob->weight + ob->carrying);	858	esrv_new_player (ob->contr);
876		859
877	treasurelist *tl = treasurelist::find ("starting_wealth");	860	treasurelist *tl = treasurelist::find ("starting_wealth");
878	if (tl)	861	if (tl)
879	create_treasure (tl, ob, 0, 0, 0);	862	create_treasure (tl, ob, 0, 0, 0);
880		863
…		…
884	ob->contr->ns->state = ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
885		868
886	if (ob->msg)	869	if (ob->msg)
887	ob->msg = 0;	870	ob->msg = 0;
888		871
889	/* We create this now because some of the unique maps will need it
890	* to save here.
891	*/
892	{
893	char buf[MAX_BUF];
894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895	make_path_to_file (buf);
896	}
897
898	start_info (ob);	872	start_info (ob);
899	CLEAR_FLAG (ob, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
900	give_initial_items (ob, ob->randomitems);	874	give_initial_items (ob, ob->randomitems);
901	link_player_skills (ob);
902	esrv_send_inventory (ob, ob);	875	esrv_send_inventory (ob, ob);
903	ob->update_stats ();	876	ob->update_stats ();
904		877
905	/* This moves the player to a different start map, if there	878	/* This moves the player to a different start map, if there
906	* is one for this race	879	* is one for this race
907	*/	880	*/
908	if (*first_map_ext_path)	881	if (*first_map_ext_path)
909	{	882	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
910	object *tmp;
911	char mapname[MAX_BUF];
912
913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
914	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;
918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
919	* if the map isn't there, then stay on the
920	* default initial map */
921	tmp->destroy ();
922	}
923	else	883	else
924	LOG (llevDebug, "first_map_ext_path not set\n");	884	LOG (llevDebug, "first_map_ext_path not set\n");
925	}	885	}
926		886
927	void	887	void
…		…
937	int x = ob->x, y = ob->y;	897	int x = ob->x, y = ob->y;
938		898
939	ob->remove_statbonus ();	899	ob->remove_statbonus ();
940	ob->remove ();	900	ob->remove ();
941	ob->arch = get_player_archetype (ob->arch);	901	ob->arch = get_player_archetype (ob->arch);
942	ob->arch->clone.copy_to (ob);	902	ob->arch->copy_to (ob);
943	ob->instantiate ();	903	ob->instantiate ();
944	ob->stats = ob->contr->orig_stats;	904	ob->stats = ob->contr->orig_stats;
945	ob->name = ob->name_pl = name;	905	ob->name = ob->name_pl = name;
946	ob->x = x;	906	ob->x = x;
947	ob->y = y;	907	ob->y = y;
948	SET_ANIMATION (ob, 2); /* So player faces south */	908	SET_ANIMATION (ob, 2); /* So player faces south */
949	insert_ob_in_map (ob, ob->map, ob, 0);	909	insert_ob_in_map (ob, ob->map, ob, 0);
950	assign (ob->contr->title, ob->arch->clone.name);	910	assign (ob->contr->title, ob->arch->object::name);
951	ob->add_statbonus ();	911	ob->add_statbonus ();
952	}	912	}
953	while (!allowed_class (ob));	913	while (!allowed_class (ob));
954		914
955	update_object (ob, UP_OBJ_FACE);	915	update_object (ob, UP_OBJ_FACE);
…		…
1030	if (op->move_type & MOVE_FLYING)	990	if (op->move_type & MOVE_FLYING)
1031	return 1;	991	return 1;
1032		992
1033	next = op->below;	993	next = op->below;
1034		994
		995	int cnt = MAX_ITEM_PER_DROP;
		996	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		997
1035	/* loop while there are items on the floor that are not marked as	998	/* loop while there are items on the floor that are not marked as
1036	* destroyed */	999	* destroyed */
1037	while (next && !next->destroyed ())	1000	while (next && !next->destroyed ())
1038	{	1001	{
1039	tmp = next;	1002	tmp = next;
1040	next = tmp->below;	1003	next = tmp->below;
1041		1004
		1005	if (cnt <= 0)
		1006	{
		1007	op->failmsg ("Couldn't pickup all items at once.");
		1008	return 0;
		1009	}
		1010
1042	if (op->destroyed ())	1011	if (op->destroyed ())
1043	return 0;	1012	return 0;
1044		1013
1045	if (!can_pick (op, tmp))	1014	if (!can_pick (op, tmp))
1046	continue;	1015	continue;
1047		1016
1048	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1017	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049	{	1018	{
1050	if (item_matched_string (op, tmp, op->contr->search_str))	1019	if (item_matched_string (op, tmp, op->contr->search_str))
1051	pick_up (op, tmp);	1020	CHK_PICK_PICKUP;
1052	continue;	1021	continue;
1053	}	1022	}
1054		1023
1055	/* high not bit set? We're using the old autopickup model */	1024	/* high not bit set? We're using the old autopickup model */
1056	if (!(op->contr->mode & PU_NEWMODE))	1025	if (!(op->contr->mode & PU_NEWMODE))
…		…
1058	switch (op->contr->mode)	1027	switch (op->contr->mode)
1059	{	1028	{
1060	case 0:	1029	case 0:
1061	return 1; /* don't pick up */	1030	return 1; /* don't pick up */
1062	case 1:	1031	case 1:
1063	pick_up (op, tmp);	1032	CHK_PICK_PICKUP;
1064	return 1;	1033	return 1;
1065	case 2:	1034	case 2:
1066	pick_up (op, tmp);	1035	CHK_PICK_PICKUP;
1067	return 0;	1036	return 0;
1068	case 3:	1037	case 3:
1069	return 0; /* stop before pickup */	1038	return 0; /* stop before pickup */
1070	case 4:	1039	case 4:
1071	pick_up (op, tmp);	1040	CHK_PICK_PICKUP;
1072	break;	1041	break;
1073	case 5:	1042	case 5:
1074	pick_up (op, tmp);	1043	CHK_PICK_PICKUP;
1075	stop = 1;	1044	stop = 1;
1076	break;	1045	break;
1077	case 6:	1046	case 6:
1078	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1047	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079	pick_up (op, tmp);	1048	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1049	CHK_PICK_PICKUP;
1080	break;	1050	break;
1081		1051
1082	case 7:	1052	case 7:
1083	if (tmp->type == MONEY || tmp->type == GEM)	1053	if (tmp->type == MONEY || tmp->type == GEM)
1084	pick_up (op, tmp);	1054	CHK_PICK_PICKUP;
1085	break;	1055	break;
1086		1056
1087	default:	1057	default:
1088	/* use value density */	1058	/* use value density */
1089	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1059	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)	1060	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1091	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1092	}	1062	}
1093	}	1063	}
1094	else	1064	else
1095	{ /* old model */	1065	{ /* old model */
1096	/* NEW pickup handling */	1066	/* NEW pickup handling */
…		…
1100	if (tmp->name != NULL)	1070	if (tmp->name != NULL)
1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1071	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1072	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1103	else	1073	else
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1074	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1075	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106		1076
1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1077	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108	}	1078	}
1109		1079
1110	/* philosophy:	1080	/* philosophy:
…		…
1151	/* all food and drink if desired */	1121	/* all food and drink if desired */
1152	/* question: don't pick up known-poisonous stuff? */	1122	/* question: don't pick up known-poisonous stuff? */
1153	if (op->contr->mode & PU_FOOD)	1123	if (op->contr->mode & PU_FOOD)
1154	if (tmp->type == FOOD)	1124	if (tmp->type == FOOD)
1155	{	1125	{
1156	pick_up (op, tmp);	1126	CHK_PICK_PICKUP;
1157	continue;	1127	continue;
1158	}	1128	}
1159		1129
1160	if (op->contr->mode & PU_DRINK)	1130	if (op->contr->mode & PU_DRINK)
1161	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1131	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1162	{	1132	{
1163	pick_up (op, tmp);	1133	CHK_PICK_PICKUP;
1164	continue;	1134	continue;
1165	}	1135	}
1166		1136
1167	if (op->contr->mode & PU_POTION)	1137	if (op->contr->mode & PU_POTION)
1168	if (tmp->type == POTION)	1138	if (tmp->type == POTION)
1169	{	1139	{
1170	pick_up (op, tmp);	1140	CHK_PICK_PICKUP;
1171	continue;	1141	continue;
1172	}	1142	}
1173		1143
1174	/* spellbooks, skillscrolls and normal books/scrolls */	1144	/* spellbooks, skillscrolls and normal books/scrolls */
1175	if (op->contr->mode & PU_SPELLBOOK)	1145	if (op->contr->mode & PU_SPELLBOOK)
1176	if (tmp->type == SPELLBOOK)	1146	if (tmp->type == SPELLBOOK)
1177	{	1147	{
1178	pick_up (op, tmp);	1148	CHK_PICK_PICKUP;
1179	continue;	1149	continue;
1180	}	1150	}
1181		1151
1182	if (op->contr->mode & PU_SKILLSCROLL)	1152	if (op->contr->mode & PU_SKILLSCROLL)
1183	if (tmp->type == SKILLSCROLL)	1153	if (tmp->type == SKILLSCROLL)
1184	{	1154	{
1185	pick_up (op, tmp);	1155	CHK_PICK_PICKUP;
1186	continue;	1156	continue;
1187	}	1157	}
1188		1158
1189	if (op->contr->mode & PU_READABLES)	1159	if (op->contr->mode & PU_READABLES)
1190	if (tmp->type == BOOK || tmp->type == SCROLL)	1160	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191	{	1161	{
1192	pick_up (op, tmp);	1162	CHK_PICK_PICKUP;
1193	continue;	1163	continue;
1194	}	1164	}
1195		1165
1196	/* wands/staves/rods/horns */	1166	/* wands/staves/rods/horns */
1197	if (op->contr->mode & PU_MAGIC_DEVICE)	1167	if (op->contr->mode & PU_MAGIC_DEVICE)
1198	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1168	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199	{	1169	{
1200	pick_up (op, tmp);	1170	CHK_PICK_PICKUP;
1201	continue;	1171	continue;
1202	}	1172	}
1203		1173
1204	/* pick up all magical items */	1174	/* pick up all magical items */
1205	if (op->contr->mode & PU_MAGICAL)	1175	if (op->contr->mode & PU_MAGICAL)
1206	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1176	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1207	{	1177	{
1208	pick_up (op, tmp);	1178	CHK_PICK_PICKUP;
1209	continue;	1179	continue;
1210	}	1180	}
1211		1181
1212	if (op->contr->mode & PU_VALUABLES)	1182	if (op->contr->mode & PU_VALUABLES)
1213	{	1183	{
1214	if (tmp->type == MONEY || tmp->type == GEM)	1184	if (tmp->type == MONEY || tmp->type == GEM)
1215	{	1185	{
1216	pick_up (op, tmp);	1186	CHK_PICK_PICKUP;
1217	continue;	1187	continue;
1218	}	1188	}
1219	}	1189	}
1220		1190
1221	/* rings & amulets - talismans seems to be typed AMULET */	1191	/* rings & amulets - talismans seems to be typed AMULET */
1222	if (op->contr->mode & PU_JEWELS)	1192	if (op->contr->mode & PU_JEWELS)
1223	if (tmp->type == RING || tmp->type == AMULET)	1193	if (tmp->type == RING || tmp->type == AMULET)
1224	{	1194	{
1225	pick_up (op, tmp);	1195	CHK_PICK_PICKUP;
1226	continue;	1196	continue;
1227	}	1197	}
1228		1198
1229	/* we don't forget dragon food */	1199	/* we don't forget dragon food */
1230	if (op->contr->mode & PU_FLESH)	1200	if (op->contr->mode & PU_FLESH)
1231	if (tmp->type == FLESH)	1201	if (tmp->type == FLESH)
1232	{	1202	{
1233	pick_up (op, tmp);	1203	CHK_PICK_PICKUP;
1234	continue;	1204	continue;
1235	}	1205	}
1236		1206
1237	/* bows and arrows. Bows are good for selling! */	1207	/* bows and arrows. Bows are good for selling! */
1238	if (op->contr->mode & PU_BOW)	1208	if (op->contr->mode & PU_BOW)
1239	if (tmp->type == BOW)	1209	if (tmp->type == BOW)
1240	{	1210	{
1241	pick_up (op, tmp);	1211	CHK_PICK_PICKUP;
1242	continue;	1212	continue;
1243	}	1213	}
1244		1214
1245	if (op->contr->mode & PU_ARROW)	1215	if (op->contr->mode & PU_ARROW)
1246	if (tmp->type == ARROW)	1216	if (tmp->type == ARROW)
1247	{	1217	{
1248	pick_up (op, tmp);	1218	CHK_PICK_PICKUP;
1249	continue;	1219	continue;
1250	}	1220	}
1251		1221
1252	/* all kinds of armor etc. */	1222	/* all kinds of armor etc. */
1253	if (op->contr->mode & PU_ARMOUR)	1223	if (op->contr->mode & PU_ARMOUR)
1254	if (tmp->type == ARMOUR)	1224	if (tmp->type == ARMOUR)
1255	{	1225	{
1256	pick_up (op, tmp);	1226	CHK_PICK_PICKUP;
1257	continue;	1227	continue;
1258	}	1228	}
1259		1229
1260	if (op->contr->mode & PU_HELMET)	1230	if (op->contr->mode & PU_HELMET)
1261	if (tmp->type == HELMET)	1231	if (tmp->type == HELMET)
1262	{	1232	{
1263	pick_up (op, tmp);	1233	CHK_PICK_PICKUP;
1264	continue;	1234	continue;
1265	}	1235	}
1266		1236
1267	if (op->contr->mode & PU_SHIELD)	1237	if (op->contr->mode & PU_SHIELD)
1268	if (tmp->type == SHIELD)	1238	if (tmp->type == SHIELD)
1269	{	1239	{
1270	pick_up (op, tmp);	1240	CHK_PICK_PICKUP;
1271	continue;	1241	continue;
1272	}	1242	}
1273		1243
1274	if (op->contr->mode & PU_BOOTS)	1244	if (op->contr->mode & PU_BOOTS)
1275	if (tmp->type == BOOTS)	1245	if (tmp->type == BOOTS)
1276	{	1246	{
1277	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1278	continue;	1248	continue;
1279	}	1249	}
1280		1250
1281	if (op->contr->mode & PU_GLOVES)	1251	if (op->contr->mode & PU_GLOVES)
1282	if (tmp->type == GLOVES)	1252	if (tmp->type == GLOVES)
1283	{	1253	{
1284	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1285	continue;	1255	continue;
1286	}	1256	}
1287		1257
1288	if (op->contr->mode & PU_CLOAK)	1258	if (op->contr->mode & PU_CLOAK)
1289	if (tmp->type == CLOAK)	1259	if (tmp->type == CLOAK)
1290	{	1260	{
1291	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1292	continue;	1262	continue;
1293	}	1263	}
1294		1264
1295	/* hoping to catch throwing daggers here */	1265	/* hoping to catch throwing daggers here */
1296	if (op->contr->mode & PU_MISSILEWEAPON)	1266	if (op->contr->mode & PU_MISSILEWEAPON)
1297	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1267	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298	{	1268	{
1299	pick_up (op, tmp);	1269	CHK_PICK_PICKUP;
1300	continue;	1270	continue;
1301	}	1271	}
1302		1272
1303	/* careful: chairs and tables are weapons! */	1273	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1274	if (op->contr->mode & PU_ALLWEAPON)
1305	{	1275	{
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1276	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1277	{
1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1278	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1279	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1280	{
1311	pick_up (op, tmp);	1281	CHK_PICK_PICKUP;
1312	continue;	1282	continue;
1313	}	1283	}
1314	}	1284	}
1315		1285
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1286	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1287	{
1318	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1288	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1289	{
1320	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1321	continue;	1291	continue;
1322	}	1292	}
1323	}	1293	}
1324	}	1294	}
1325		1295
1326	/* misc stuff that's useful */	1296	/* misc stuff that's useful */
1327	if (op->contr->mode & PU_KEY)	1297	if (op->contr->mode & PU_KEY)
1328	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1298	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329	{	1299	{
1330	pick_up (op, tmp);	1300	CHK_PICK_PICKUP;
1331	continue;	1301	continue;
1332	}	1302	}
1333		1303
1334	/* any of the last 4 bits set means we use the ratio for value	1304	/* any of the last 4 bits set means we use the ratio for value
1335	* pickups */	1305	* pickups */
1336	if (op->contr->mode & PU_RATIO)	1306	if (op->contr->mode & PU_RATIO)
1337	{	1307	{
1338	/* use value density to decide what else to grab */	1308	/* use value density to decide what else to grab */
1339	/* >=7 was >= op->contr->mode */	1309	/* >=7 was >= op->contr->mode */
1340	/* >=7 is the old standard setting. Now we take the last 4 bits	1310	/* >=7 is the old standard setting. Now we take the last 4 bits
1341	* and multiply them by 5, giving 0..15*5== 5..75 */	1311	*/
1342	wvratio = (op->contr->mode & PU_RATIO) * 5;	1312	wvratio = op->contr->mode & PU_RATIO;
1343	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)	1313	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1344	{	1314	{
1345	pick_up (op, tmp);	1315	CHK_PICK_PICKUP;
1346	#if 0	1316	#if 0
1347	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1317	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348	if (tmp->name != NULL)	1318	if (tmp->name != NULL)
1349	{	1319	{
1350	fprintf (stderr, "%s", tmp->name);	1320	fprintf (stderr, "%s", tmp->name);
1351	}	1321	}
1352	else	1322	else
1353	fprintf (stderr, "%s", tmp->arch->name);	1323	fprintf (stderr, "%s", tmp->arch->archname);
1354	fprintf (stderr, ",%d] = ", tmp->type);	1324	fprintf (stderr, ",%d] = ", tmp->type);
1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1325	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1356	#endif	1326	#endif
1357	continue;	1327	continue;
1358	}	1328	}
…		…
1369	* found object is returned.	1339	* found object is returned.
1370	*/	1340	*/
1371	object *	1341	object *
1372	find_arrow (object *op, const char *type)	1342	find_arrow (object *op, const char *type)
1373	{	1343	{
1374	object *tmp = 0;
1375
1376	for (op = op->inv; op; op = op->below)	1344	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378	tmp = find_arrow (op, type);
1379	else if (op->type == ARROW && op->race == type)	1345	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1346	return splay (tmp);
		1347
		1348	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1349	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
		1350	if (object *arrow = find_arrow (tmp, type))
		1351	{
		1352	splay (tmp);
1380	return op;	1353	return arrow;
		1354	}
1381		1355
1382	return tmp;	1356	return 0;
1383	}	1357	}
1384		1358
1385	/*	1359	/*
1386	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1360	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1387	* against the target. A full test is not performed, simply a basic test	1361	* against the target. A full test is not performed, simply a basic test
…		…
1410	}	1384	}
1411	}	1385	}
1412	else if (arrow->type == ARROW && arrow->race == type)	1386	else if (arrow->type == ARROW && arrow->race == type)
1413	{	1387	{
1414	/* allways prefer assasination/slaying */	1388	/* allways prefer assasination/slaying */
1415	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1389	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1416	{	1390	{
1417	if (arrow->attacktype & AT_DEATH)	1391	if (arrow->attacktype & AT_DEATH)
1418	{	1392	{
1419	*better = 100;	1393	*better = 100;
1420	return arrow;	1394	return arrow;
…		…
1428	else	1402	else
1429	{	1403	{
1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1404	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431	{	1405	{
1432	attacktype = 1 << attacknum;	1406	attacktype = 1 << attacknum;
1433	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1407	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1408	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1435	{	1409	{
1436	tmp = arrow;	1410	tmp = arrow;
1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1411	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1438	}	1412	}
1439	}	1413	}
1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1414	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441	{	1415	{
1442	tmp = arrow;	1416	tmp = arrow;
…		…
1448	betterby = 1 + arrow->magic + arrow->stats.dam;	1422	betterby = 1 + arrow->magic + arrow->stats.dam;
1449	}	1423	}
1450	}	1424	}
1451	}	1425	}
1452	}	1426	}
		1427
1453	if (tmp == NULL && arrow == NULL)	1428	if (tmp == NULL && arrow == NULL)
1454	return find_arrow (op, type);	1429	return find_arrow (op, type);
1455		1430
1456	*better = betterby;	1431	*better = betterby;
1457	return tmp;	1432	return tmp;
…		…
1544	{	1519	{
1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1520	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1546	return 0;	1521	return 0;
1547	}	1522	}
1548		1523
1549	if (player *pl = op->contr)	1524	if (op->contr)
1550	{	1525	bow = op->current_weapon;
1551	bow = pl->ranged_ob;
1552	if (!op->change_weapon (bow))
1553	return 0;
1554	}
1555	else	1526	else
1556	{	1527	{
1557	for (bow = op->inv; bow; bow = bow->below)	1528	for (bow = op->inv; bow; bow = bow->below)
1558	/* Don't check for applied - monsters don't apply bows - in that way, they	1529	/* Don't check for applied - monsters don't apply bows - in that way, they
1559	* don't need to switch back and forth between bows and weapons.	1530	* don't need to switch back and forth between bows and weapons.
…		…
1607	}	1578	}
1608		1579
1609	/* this should not happen, but sometimes does */	1580	/* this should not happen, but sometimes does */
1610	if (arrow->nrof == 0)	1581	if (arrow->nrof == 0)
1611	{	1582	{
		1583	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1612	arrow->destroy ();	1584	arrow->destroy (true);
1613	return 0;	1585	return 0;
1614	}	1586	}
1615		1587
1616	left = arrow; /* these are arrows left to the player */	1588	left = arrow; /* these are arrows left to the player */
1617	arrow = get_split_ob (arrow, 1);	1589	arrow = arrow->split ();
1618	if (!arrow)	1590	if (!arrow)
1619	{	1591	{
1620	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1621	return 0;	1593	return 0;
1622	}	1594	}
…		…
1630	arrow->stats.grace = arrow->attacktype;	1602	arrow->stats.grace = arrow->attacktype;
1631		1603
1632	if (arrow->slaying)	1604	if (arrow->slaying)
1633	arrow->spellarg = strdup (arrow->slaying);	1605	arrow->spellarg = strdup (arrow->slaying);
1634		1606
		1607	#if 0
1635	if (player *pl = op->contr)	1608	if (player *pl = op->contr)
1636	{	1609	{
1637	{
1638	pl->has_hit = 1;
1639	pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
1640	}
1641	#if 0
1642	float speed = pl->weapon_sp;	1610	float speed = pl->weapon_sp;
1643		1611
1644	/* penalize ROF for bestarrow */	1612	/* penalize ROF for bestarrow */
1645	if (pl->bowtype == bow_bestarrow)	1613	if (pl->bowtype == bow_bestarrow)
1646	speed *= .9f;	1614	speed *= .9f;
1647	else	1615	else
1648	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1616	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1649		1617
1650	op->speed_left += speed - op->speed;	1618	op->speed_left += speed - op->speed;
		1619	}
1651	#endif	1620	#endif
1652	}
1653		1621
1654	SET_ANIMATION (arrow, arrow->direction);	1622	SET_ANIMATION (arrow, arrow->direction);
1655		1623
1656	/* update the speed */	1624	/* update the speed */
1657	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1625	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1658	+ bow->stats.dam / 7.0;	1626	+ bow->stats.dam / 7.f;
1659		1627
1660	arrow->set_speed (max (arrow->speed, 2.0));	1628	arrow->set_speed (max (arrow->speed, 2.f));
1661	arrow->speed_left = 0;	1629	arrow->speed_left = 0;
1662		1630
1663	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1631	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1664		1632
1665	if (op->type == PLAYER)	1633	if (op->type == PLAYER)
…		…
1688		1656
1689	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1657	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1690	arrow->move_type = MOVE_FLY_LOW;	1658	arrow->move_type = MOVE_FLY_LOW;
1691	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1659	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1692		1660
1693	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1661	op->play_sound (sound_find ("fire_arrow"));
1694	m->insert (arrow, sx, sy, op);	1662	m->insert (arrow, sx, sy, op);
1695		1663
1696	if (!arrow->destroyed ())	1664	if (!arrow->destroyed ())
1697	move_arrow (arrow);	1665	move_arrow (arrow);
1698
1699	if (op->type == PLAYER)
1700	{
1701	if (left->destroyed ())
1702	esrv_del_item (op->contr, left->count);
1703	else
1704	esrv_send_item (op, left);
1705	}
1706		1666
1707	return 1;	1667	return 1;
1708	}	1668	}
1709		1669
1710	/* Special fire code for players - this takes into	1670	/* Special fire code for players - this takes into
…		…
1749	}	1709	}
1750		1710
1751	return ret;	1711	return ret;
1752	}	1712	}
1753		1713
1754
1755	/* Fires a misc (wand/rod/horn) object in 'dir'.	1714	/* Fires a misc (wand/rod/horn) object in 'dir'.
1756	* Broken apart from 'fire' to keep it more readable.	1715	* Broken apart from 'fire' to keep it more readable.
1757	*/	1716	*/
1758	void	1717	void
1759	fire_misc_object (object *op, int dir)	1718	fire_misc_object (object *op, int dir)
…		…
1777		1736
1778	if (item->type == WAND)	1737	if (item->type == WAND)
1779	{	1738	{
1780	if (item->stats.food <= 0)	1739	if (item->stats.food <= 0)
1781	{	1740	{
1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1741	op->contr->play_sound (sound_find ("wand_poof"));
1783	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1742	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1784		1743
1785	return;	1744	return;
1786	}	1745	}
1787	}	1746	}
1788	else if (item->type == ROD || item->type == HORN)	1747	else if (item->type == ROD || item->type == HORN)
1789	{	1748	{
1790	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1749	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1750
		1751	// using the maximum of the rods charge allows at least one spell cast
		1752	// for a rod or horn, this fixes some broken rods.
		1753	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1791	{	1754	{
1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1755	op->contr->play_sound (sound_find ("wand_poof"));
1793		1756
1794	if (item->type == ROD)	1757	if (item->type == ROD)
1795	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1758	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1796	else	1759	else
1797	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1760	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1810	object *tmp;	1773	object *tmp;
1811		1774
1812	if (item->arch)	1775	if (item->arch)
1813	{	1776	{
1814	CLEAR_FLAG (item, FLAG_ANIMATE);	1777	CLEAR_FLAG (item, FLAG_ANIMATE);
1815	item->face = item->arch->clone.face;	1778	item->face = item->arch->face;
1816	item->set_speed (0);	1779	item->set_speed (0);
1817	}	1780	}
1818		1781
1819	if ((tmp = item->in_player ()))	1782	if (object *pl = item->visible_to ())
1820	esrv_update_item (UPD_ANIM, tmp, item);	1783	esrv_update_item (UPD_ANIM, pl, item);
1821	}	1784	}
1822	}	1785	}
1823	else if (item->type == ROD || item->type == HORN)	1786	else if (item->type == ROD || item->type == HORN)
1824	drain_rod_charge (item);	1787	drain_rod_charge (item);
1825	}	1788	}
1826	}	1789	}
1827		1790
1828	/* Received a fire command for the player - go and do it.	1791	/* Received a fire command for the player - go and do it.
1829	*/	1792	*/
1830	void	1793	bool
1831	fire (object *op, int dir)	1794	fire (object *op, int dir)
1832	{	1795	{
1833	int spellcost = 0;	1796	int spellcost = 0;
1834		1797
1835	/* check for loss of invisiblity/hide */	1798	/* check for loss of invisiblity/hide */
…		…
1839	player *pl = op->contr;	1802	player *pl = op->contr;
1840		1803
1841	if (pl->golem)	1804	if (pl->golem)
1842	{	1805	{
1843	control_golem (op->contr->golem, dir);	1806	control_golem (op->contr->golem, dir);
1844	return;	1807	return false;
1845	}	1808	}
1846		1809
1847	object *ob = pl->ranged_ob;	1810	object *ob = pl->ranged_ob;
1848		1811
1849	if (!ob)	1812	if (!ob)
1850	return;	1813	return false;
		1814
		1815	if (!op->change_weapon (ob))
		1816	return false;
		1817
		1818	if (op->speed_left > 0.f)
		1819	--op->speed_left;
		1820	else
		1821	return false;
1851		1822
1852	switch (ob->type)	1823	switch (ob->type)
1853	{	1824	{
1854	case BOW:	1825	case BOW:
1855	player_fire_bow (op, dir);	1826	player_fire_bow (op, dir);
…		…
1862	case BUILDER:	1833	case BUILDER:
1863	apply_map_builder (op, dir);	1834	apply_map_builder (op, dir);
1864	break;	1835	break;
1865		1836
1866	case SKILL:	1837	case SKILL:
1867	case SKILL_TOOL:
1868	do_skill (op, op, ob, dir, 0);	1838	do_skill (op, op, ob, dir, 0);
1869	break;	1839	break;
1870		1840
1871	default:	1841	default:
1872	fire_misc_object (op, dir);	1842	fire_misc_object (op, dir);
1873	break;	1843	break;
1874	}	1844	}
		1845
		1846	return true;
1875	}	1847	}
1876		1848
1877	/* find_key	1849	/* find_key
1878	* We try to find a key for the door as passed. If we find a key	1850	* We try to find a key for the door as passed. If we find a key
1879	* and successfully use it, we return the key, otherwise NULL	1851	* and successfully use it, we return the key, otherwise NULL
…		…
1966	* 0 otherwise	1938	* 0 otherwise
1967	*/	1939	*/
1968	static int	1940	static int
1969	player_attack_door (object *op, object *door)	1941	player_attack_door (object *op, object *door)
1970	{	1942	{
1971	/* If its a door, try to find a use a key. If we do destroy the door,	1943	/* If its a door, try to find a key. If we do destroy the door,
1972	* might as well return immediately as there is nothing more to do -	1944	* might as well return immediately as there is nothing more to do -
1973	* otherwise, we fall through to the rest of the code.	1945	* otherwise, we fall through to the rest of the code.
1974	*/	1946	*/
1975	object *key = find_key (op, op, door);	1947	object *key = find_key (op, op, door);
1976		1948
1977	/* IF we found a key, do some extra work */	1949	/* If we found a key, do some extra work */
1978	if (key)	1950	if (key)
1979	{	1951	{
1980	object *container = key->env;	1952	object *container = key->env;
1981
1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983		1953
1984	if (action_makes_visible (op))	1954	if (action_makes_visible (op))
1985	make_visible (op);	1955	make_visible (op);
1986		1956
1987	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1957	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1989		1959
1990	if (door->type == DOOR)	1960	if (door->type == DOOR)
1991	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1961	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992	else if (door->type == LOCKED_DOOR)	1962	else if (door->type == LOCKED_DOOR)
1993	{	1963	{
1994	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1964	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1995	remove_door2 (door); /* remove door without violence ;-) */	1965	remove_door2 (door); /* remove door without violence ;-) */
1996	}	1966	}
1997		1967
1998	/* Do this after we print the message */	1968	/* Do this after we print the message */
1999	decrease_ob (key); /* Use up one of the keys */	1969	key->decrease (); /* Use up one of the keys */
2000	/* Need to update the weight the container the key was in */
2001	if (container != op)
2002	esrv_update_item (UPD_WEIGHT, op, container);
2003		1970
2004	return 1; /* Nothing more to do below */	1971	return 1; /* Nothing more to do below */
2005	}	1972	}
2006	else if (door->type == LOCKED_DOOR)	1973	else if (door->type == LOCKED_DOOR)
2007	{	1974	{
2008	/* Might as well return now - no other way to open this */	1975	/* Might as well return now - no other way to open this */
2009	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1976	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2010	return 1;	1977	return 1;
2011	}	1978	}
2012		1979
2013	return 0;	1980	return 0;
2014	}	1981	}
…		…
2017	* It should keep the code cleaner.	1984	* It should keep the code cleaner.
2018	* When this is called, the players direction has been updated	1985	* When this is called, the players direction has been updated
2019	* (taking into account confusion.) The player is also actually	1986	* (taking into account confusion.) The player is also actually
2020	* going to try and move (not fire weapons).	1987	* going to try and move (not fire weapons).
2021	*/	1988	*/
2022	void	1989	bool
2023	move_player_attack (object *op, int dir)	1990	move_player_attack (object *op, int dir)
2024	{	1991	{
2025	object *tmp, *mon;
2026	int on_battleground;	1992	int on_battleground;
2027	maptile *m;
2028		1993
2029	sint16 nx = freearr_x[dir] + op->x;	1994	sint16 nx = freearr_x[dir] + op->x;
2030	sint16 ny = freearr_y[dir] + op->y;	1995	sint16 ny = freearr_y[dir] + op->y;
2031		1996
2032	on_battleground = op_on_battleground (op, 0, 0);	1997	on_battleground = op_on_battleground (op, 0, 0);
		1998
		1999	if (out_of_map (op->map, nx, ny))
		2000	return false;
		2001
		2002	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2003	{
		2004	--op->speed_left;
		2005	return true;
		2006	}
2033		2007
2034	/* If braced, or can't move to the square, and it is not out of the	2008	/* If braced, or can't move to the square, and it is not out of the
2035	* map, attack it. Note order of if statement is important - don't	2009	* map, attack it. Note order of if statement is important - don't
2036	* want to be calling move_ob if braced, because move_ob will move the	2010	* want to be calling move_ob if braced, because move_ob will move the
2037	* player. This is a pretty nasty hack, because if we could	2011	* player. This is a pretty nasty hack, because if we could
2038	* move to some space, it then means that if we are braced, we should	2012	* move to some space, it then means that if we are braced, we should
2039	* do nothing at all. As it is, if we are braced, we go through	2013	* do nothing at all. As it is, if we are braced, we go through
2040	* quite a bit of processing. However, it probably is less than what	2014	* quite a bit of processing. However, it probably is less than what
2041	* move_ob uses.	2015	* move_ob uses.
2042	*/	2016	*/
2043	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2044	{
2045	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2046	{
2047	m = op->map->xy_find (nx, ny);	2017	maptile *m = op->map->xy_find (nx, ny);
2048	if (!m)
2049	return; /* Don't think this should happen */
2050	}
2051	else
2052	m = op->map;
2053		2018
2054	if (!(tmp = m->at (nx, ny).bot))
2055	return;
2056
2057	mon = 0;
2058	/* Go through all the objects, and find ones of interest. Only stop if	2019	/* Go through all the objects, and find ones of interest. Only stop if
2059	* we find a monster - that is something we know we want to attack.	2020	* we find a monster - that is something we know we want to attack.
2060	* if its a door or barrel (can roll) see if there may be monsters	2021	* if its a door or barrel (can roll) see if there may be monsters
2061	* on the space	2022	* on the space
2062	*/	2023	*/
2063	while (tmp)	2024	object *mon;
2064	{	2025	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2065	if (tmp == op)	2026	{
2066	{	2027	if ((mon->flag [FLAG_ALIVE]
2067	tmp = tmp->above;	2028	|| mon->type == LOCKED_DOOR
2068	continue;	2029	|| mon->flag [FLAG_CAN_ROLL])
2069	}
2070
2071	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2072	{
2073	mon = tmp;	2030	&& mon != op)
2074	break;	2031	break;
2075	}	2032	}
2076		2033
2077	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2078	mon = tmp;
2079
2080	tmp = tmp->above;
2081	}
2082
2083	if (!mon) /* This happens anytime the player tries to move */	2034	if (!mon) /* This happens anytime the player tries to move */
2084	return; /* into a wall */	2035	return false; /* into a wall */
2085		2036
2086	if (mon->head)
2087	mon = mon->head;	2037	mon = mon->head_ ();
2088		2038
2089	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2039	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2040	if (op->contr->weapon_sp_left > 0.f)
2090	if (player_attack_door (op, mon))	2041	if (player_attack_door (op, mon))
		2042	{
		2043	--op->contr->weapon_sp_left;
2091	return;	2044	return true;
		2045	}
2092		2046
2093	/* The following deals with possibly attacking peaceful	2047	/* The following deals with possibly attacking peaceful
2094	* or frienddly creatures. Basically, all players are considered	2048	* or friendly creatures. Basically, all players are considered
2095	* unaggressive. If the moving player has peaceful set, then the	2049	* unaggressive. If the moving player has peaceful set, then the
2096	* object should be pushed instead of attacked. It is assumed that	2050	* object should be pushed instead of attacked. It is assumed that
2097	* if you are braced, you will not attack friends accidently,	2051	* if you are braced, you will not attack friends accidently,
2098	* and thus will not push them.	2052	* and thus will not push them.
2099	*/	2053	*/
2100		2054
2101	/* If the creature is a pet, push it even if the player is not	2055	/* If the creature is a pet, push it even if the player is not
2102	* peaceful. Our assumption is the creature is a pet if the	2056	* peaceful. Our assumption is the creature is a pet if the
2103	* player owns it and it is either friendly or unagressive.	2057	* player owns it and it is either friendly or unagressive.
2104	*/	2058	*/
2105	if ((op->type == PLAYER)	2059	if (op->type == PLAYER
2106	#if COZY_SERVER
2107	&&
2108	((mon->owner && mon->owner->contr	2060	&& ((mon->owner && mon->owner->contr
2109	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2061	&& same_party (mon->owner->contr->party, op->contr->party))
2110	#else
2111	&& mon->owner == op	2062	|| mon->owner == op)
2112	#endif
2113	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2063	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2114	{	2064	{
2115	/* If we're braced, we don't want to switch places with it */	2065	/* If we're braced, we don't want to switch places with it */
2116	if (op->contr->braced)	2066	if (op->contr->braced)
2117	return;	2067	return false;
2118		2068
2119	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2069	if (op->speed_left > 0.f)
		2070	{
		2071	--op->speed_left;
		2072
		2073	op->play_sound (sound_find ("push_player"));
2120	push_ob (mon, dir, op);	2074	push_ob (mon, dir, op);
		2075
2121	if (op->contr->tmp_invis || op->hide)	2076	if (op->contr->tmp_invis || op->hide)
2122	make_visible (op);	2077	make_visible (op);
2123		2078
2124	return;	2079	return true;
2125	}	2080	}
		2081	else
		2082	return false;
		2083	}
2126		2084
2127	/* in certain circumstances, you shouldn't attack friendly	2085	/* in certain circumstances, you shouldn't attack friendly
2128	* creatures. Note that if you are braced, you can't push	2086	* creatures. Note that if you are braced, you can't push
2129	* someone, but put it inside this loop so that you won't	2087	* someone, but put it inside this loop so that you won't
2130	* attack them either.	2088	* attack them either.
2131	*/	2089	*/
2132	if ((mon->type == PLAYER || mon->enemy != op) &&	2090	if ((mon->type == PLAYER || mon->enemy != op)
2133	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2091	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2134	#ifdef PROHIBIT_PLAYERKILL
2135	(op->contr->peaceful	2092	&& ((op->contr->peaceful
2136	|| (mon->type == PLAYER	2093	|| (mon->type == PLAYER && mon->contr->peaceful))
2137	&& mon->contr->
2138	peaceful)) &&
2139	#else
2140	op->contr->peaceful &&
2141	#endif
2142	!on_battleground))	2094	&& !on_battleground))
		2095	{
		2096	if (op->speed_left > 0.f)
2143	{	2097	{
		2098	--op->speed_left;
		2099
2144	if (!op->contr->braced)	2100	if (!op->contr->braced)
2145	{	2101	{
2146	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2102	op->play_sound (sound_find ("push_player"));
2147	push_ob (mon, dir, op);	2103	push_ob (mon, dir, op);
2148	}	2104	}
2149	else	2105	else
2150	new_draw_info (0, 0, op, "You withhold your attack");	2106	op->statusmsg ("You withhold your attack");
2151		2107
2152	if (op->contr->tmp_invis || op->hide)	2108	if (op->contr->tmp_invis || op->hide)
2153	make_visible (op);	2109	make_visible (op);
2154	}
2155		2110
		2111	return true;
		2112	}
		2113	}
2156	/* If the object is a boulder or other rollable object, then	2114	/* If the object is a boulder or other rollable object, then
2157	* roll it if not braced. You can't roll it if you are braced.	2115	* roll it if not braced. You can't roll it if you are braced.
2158	*/	2116	*/
2159	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2117	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2118	{
		2119	if (op->speed_left > 0.f)
2160	{	2120	{
		2121	--op->speed_left;
		2122
2161	recursive_roll (mon, dir, op);	2123	recursive_roll (mon, dir, op);
2162	if (action_makes_visible (op))	2124	if (action_makes_visible (op))
2163	make_visible (op);	2125	make_visible (op);
2164	}
2165		2126
		2127	return true;
		2128	}
		2129	}
2166	/* Any generic living creature. Including things like doors.	2130	/* Any generic living creature. Including things like doors.
2167	* Way it works is like this: First, it must have some hit points	2131	* Way it works is like this: First, it must have some hit points
2168	* and be living. Then, it must be one of the following:	2132	* and be living. Then, it must be one of the following:
2169	* 1) Not a player, 2) A player, but of a different party. Note	2133	* 1) Not a player, 2) A player, but of a different party. Note
2170	* that party_number -1 is no party, so attacks can still happen.	2134	* that party_number -1 is no party, so attacks can still happen.
2171	*/	2135	*/
2172	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2136	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2173	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2137	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
		2138	{
		2139	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2174	{	2140	{
2175	op->contr->has_hit = 1;	2141	--op->contr->weapon_sp_left;
2176	op->speed_left += op->contr->weapon_sp - op->speed;
2177		2142
2178	skill_attack (mon, op, 0, 0, 0);	2143	skill_attack (mon, op, 0, 0, 0);
2179
2180	/* If attacking another player, that player gets automatic
2181	* hitback, and doesn't loose luck either.
2182	* Disable hitback on the battleground or if the target is
2183	* the wiz.
2184	*/
2185	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2186	{
2187	short luck = mon->stats.luck;
2188
2189	mon->contr->has_hit = 1;
2190	skill_attack (op, mon, 0, 0, 0);
2191	mon->stats.luck = luck;
2192	}
2193		2144
2194	if (action_makes_visible (op))	2145	if (action_makes_visible (op))
2195	make_visible (op);	2146	make_visible (op);
2196	}
2197	} /* if player should attack something */
2198	}
2199		2147
2200	int	2148	return true;
		2149	}
		2150	}
		2151
		2152	return false;
		2153	}
		2154
		2155	bool
2201	move_player (object *op, int dir)	2156	move_player (object *op, int dir)
2202	{	2157	{
2203	int pick;	2158	int pick;
2204		2159
2205	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2160	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2206	return 0;	2161	return 0;
2207		2162
2208	/* Sanity check: make sure dir is valid */	2163	/* Sanity check: make sure dir is valid */
2209	if ((dir < 0) || (dir >= 9))	2164	if ((dir < 0) || (dir >= 9))
2210	{	2165	{
…		…
2219	op->facing = dir;	2174	op->facing = dir;
2220		2175
2221	if (op->hide)	2176	if (op->hide)
2222	do_hidden_move (op);	2177	do_hidden_move (op);
2223		2178
		2179	bool retval;
		2180
2224	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2181	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2225	/*nop */ ;	2182	retval = RESULT_INT (0);
2226	else if (op->contr->fire_on)	2183	else if (op->contr->fire_on)
2227	fire (op, dir);	2184	retval = fire (op, dir);
2228	else	2185	else
2229	{	2186	{
2230	move_player_attack (op, dir);	2187	retval = move_player_attack (op, dir);
2231	pick = check_pick (op);	2188	pick = check_pick (op);
2232	}	2189	}
2233		2190
2234	/* Add special check for newcs players and fire on - this way, the	2191	/* Add special check for newcs players and fire on - this way, the
2235	* server can handle repeat firing.	2192	* server can handle repeat firing.
…		…
2242	/* Update how the player looks. Use the facing, so direction may	2199	/* Update how the player looks. Use the facing, so direction may
2243	* get reset to zero. This allows for full animation capabilities	2200	* get reset to zero. This allows for full animation capabilities
2244	* for players.	2201	* for players.
2245	*/	2202	*/
2246	animate_object (op, op->facing);	2203	animate_object (op, op->facing);
2247	return 0;	2204
		2205	return retval;
2248	}	2206	}
2249		2207
2250	/* This is similar to handle_player, below, but is only used by the	2208	/* This is similar to handle_player, below, but is only used by the
2251	* new client/server stuff.	2209	* new client/server stuff.
2252	* This is sort of special, in that the new client/server actually uses	2210	* This is sort of special, in that the new client/server actually uses
2253	* the new speed values for commands.	2211	* the new speed values for commands.
2254	*	2212	*
2255	* Returns true if there are more actions we can do.	2213	* Returns true if there are more actions we can do. Should not do
		2214	* many actions in a row, as that would be too unfair to other
		2215	* players.
2256	*/	2216	*/
2257	int	2217	bool
2258	handle_newcs_player (object *op)	2218	handle_newcs_player (object *op)
2259	{	2219	{
2260	if (QUERY_FLAG (op, FLAG_SCARED))	2220	if (QUERY_FLAG (op, FLAG_SCARED))
2261	{	2221	{
2262	flee_player (op);	2222	if (op->speed_left > 0.f)
2263
2264	/* If player is still scared, that is his action for this tick */
2265	if (op->flag [FLAG_SCARED])
2266	{	2223	{
2267	--op->speed_left;	2224	--op->speed_left;
		2225	flee_player (op);
		2226
2268	return 0;	2227	return true;
2269	}	2228	}
		2229	else
		2230	return false;
2270	}	2231	}
2271		2232
2272	/* call this here - we also will call this in do_ericserver, but	2233	/* call this here - we also will call this in do_ericserver, but
2273	* the players time has been increased when doericserver has been	2234	* the players time has been increased when doericserver has been
2274	* called, so we recheck it here.	2235	* called, so we recheck it here.
2275	*/	2236	*/
2276	if (op->contr->ns->handle_command ())	2237	if (op->contr->ns->handle_command ())
2277	return 1;	2238	return true;
2278		2239
2279	if (op->speed_left > 0.f)
2280	{
2281	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2240	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2282	{
2283	/* All move commands take 1 tick, at least for now */
2284	--op->speed_left;
2285
2286	/* Instead of all the stuff below, let move_player take care
2287	* of it. Also, some of the skill stuff is only put in
2288	* there, as well as the confusion stuff.
2289	*/
2290	move_player (op, op->direction);	2241	return move_player (op, op->direction);
2291		2242
2292	return op->speed_left > 0.f;
2293	}
2294	}
2295
2296	return 0;	2243	return false;
2297	}	2244	}
2298		2245
2299	int	2246	int
2300	save_life (object *op)	2247	save_life (object *op)
2301	{	2248	{
…		…
2303	return 0;	2250	return 0;
2304		2251
2305	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2252	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2306	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2253	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2307	{	2254	{
2308	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2255	op->play_sound (sound_find ("ob_evaporate"));
2309	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2256	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2310		2257
2311	if (op->contr)
2312	esrv_del_item (op->contr, tmp->count);
2313
2314	tmp->destroy ();	2258	tmp->destroy (true);
2315	CLEAR_FLAG (op, FLAG_LIFESAVE);	2259	CLEAR_FLAG (op, FLAG_LIFESAVE);
2316		2260
2317	if (op->stats.hp < 0)	2261	if (op->stats.hp < 0)
2318	op->stats.hp = op->stats.maxhp;	2262	op->stats.hp = op->stats.maxhp;
2319		2263
…		…
2330	return 0;	2274	return 0;
2331	}	2275	}
2332		2276
2333	/* This goes throws the inventory and removes unpaid objects, and puts them	2277	/* This goes throws the inventory and removes unpaid objects, and puts them
2334	* back in the map (location and map determined by values of env). This	2278	* back in the map (location and map determined by values of env). This
2335	* function will descend into containers. op is the object to start the search	2279	* function will descend into containers. op is the object to start the search
2336	* from.	2280	* from.
2337	*/	2281	*/
		2282	static void
		2283	drop_unpaid_items (object *op, object *env)
		2284	{
		2285	while (op)
		2286	{
		2287	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2288
		2289	if (QUERY_FLAG (op, FLAG_UNPAID))
		2290	op->insert_at (env);
		2291	else if (op->inv)
		2292	drop_unpaid_items (op->inv, env);
		2293
		2294	op = next;
		2295	}
		2296	}
		2297
2338	void	2298	void
2339	remove_unpaid_objects (object *op, object *env)	2299	object::drop_unpaid_items ()
2340	{	2300	{
2341	while (op)	2301	if (!flag [FLAG_REMOVED])
2342	{	2302	::drop_unpaid_items (inv, this);
2343	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2344
2345	if (QUERY_FLAG (op, FLAG_UNPAID))
2346	{
2347	if (env->type == PLAYER)
2348	esrv_del_item (env->contr, op->count);
2349
2350	op->insert_at (env);
2351	}
2352	else if (op->inv)
2353	remove_unpaid_objects (op->inv, env);
2354
2355	op = next;
2356	}
2357	}	2303	}
2358		2304
2359	/*	2305	/*
2360	* Returns pointer a static string containing gravestone text	2306	* Returns pointer a static string containing gravestone text
2361	* Moved from apply.c to player.c - player.c is what	2307	* Moved from apply.c to player.c - player.c is what
2362	* actually uses this function. player.c may not be quite the	2308	* actually uses this function. player.c may not be quite the
2363	* best, a misc file for object actions is probably better,	2309	* best, a misc file for object actions is probably better,
2364	* but there isn't one in the server directory.	2310	* but there isn't one in the server directory.
2365	*/	2311	*/
2366	char *	2312	const char *
2367	gravestone_text (object *op)	2313	gravestone_text (object *op)
2368	{	2314	{
2369	static char buf2[MAX_BUF];	2315	static dynbuf_text buf;
2370	char buf[MAX_BUF];
2371	time_t now = time (NULL);
2372		2316
2373	strcpy (buf2, " R.I.P.\n\n");	2317	buf << "---- R.I.P. ----\n\n"
		2318	<< op->name;
		2319
2374	if (op->type == PLAYER)	2320	if (op->type == PLAYER)
2375	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2321	buf << " the " << op->contr->title;
2376	else
2377	sprintf (buf, "%s\n", &op->name);
2378		2322
2379	strncat (buf2, " ", 20 - strlen (buf) / 2);	2323	buf << "\n\n";
2380	strcat (buf2, buf);	2324
		2325	buf << "who was level ";
		2326	buf << (sint32)op->level << "\n\n" // OO breakdown
		2327	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2328
2381	if (op->type == PLAYER)	2329	if (op->type == PLAYER)
2382	sprintf (buf, "who was in level %d when killed\n", op->level);	2330	buf << "by " << op->contr->killer_name () << ".\n\n";
2383	else
2384	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2385		2331
2386	strncat (buf2, " ", 20 - strlen (buf) / 2);
2387	strcat (buf2, buf);
2388	if (op->type == PLAYER)
2389	{	2332	{
2390	sprintf (buf, "by %s.\n\n", op->contr->killer);	2333	static char buf2[128];
2391	strncat (buf2, " ", 21 - strlen (buf) / 2);	2334	time_t now = time (NULL);
2392	strcat (buf2, buf);
2393	}
2394
2395	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2335	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2396	strncat (buf2, " ", 20 - strlen (buf) / 2);	2336	buf << buf2;
2397	strcat (buf2, buf);	2337	}
2398		2338
2399	return buf2;	2339	return buf;
2400	}	2340	}
2401		2341
2402	void	2342	void
2403	do_some_living (object *op)	2343	do_some_living (object *op)
2404	{	2344	{
…		…
2456	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2396	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2457	else	2397	else
2458	{	2398	{
2459	gen_grace = op->stats.maxgrace;	2399	gen_grace = op->stats.maxgrace;
2460	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2400	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2461	}
2462
2463	/* Regenerate Spell Points */
2464	if (!op->contr->golem && --op->last_sp < 0)
2465	{
2466	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2467	if (op->stats.sp < op->stats.maxsp)
2468	{
2469	op->stats.sp++;
2470	/* dms do not consume food */
2471	if (!QUERY_FLAG (op, FLAG_WIZ))
2472	{
2473	op->stats.food--;
2474	if (op->contr->digestion < 0)
2475	op->stats.food += op->contr->digestion;
2476	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2477	op->stats.food = last_food;
2478	}
2479	}
2480
2481	if (max_sp > 1)
2482	{
2483	over_sp = (gen_sp + 10) / rate_sp;
2484	if (over_sp > 0)
2485	{
2486	if (op->stats.sp < op->stats.maxsp)
2487	{
2488	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2489
2490	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2491	op->stats.sp--;
2492
2493	if (op->stats.sp > op->stats.maxsp)
2494	op->stats.sp = op->stats.maxsp;
2495	}
2496	op->last_sp = 0;
2497	}
2498	else
2499	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2500	}
2501	else
2502	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2503	}	2401	}
2504		2402
2505	/* Regenerate Grace */	2403	/* Regenerate Grace */
2506	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2404	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2507	if (--op->last_grace < 0)	2405	if (--op->last_grace < 0)
…		…
2528	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2426	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2529	}	2427	}
2530	/* wearing stuff doesn't detract from grace generation. */	2428	/* wearing stuff doesn't detract from grace generation. */
2531	}	2429	}
2532		2430
		2431	if (op->stats.food > 0)
		2432	{
2533	/* Regenerate Hit Points */	2433	/* Regenerate Spell Points */
2534	if (--op->last_heal < 0)	2434	if (!op->contr->golem && --op->last_sp < 0)
2535	{
2536	if (op->stats.hp < op->stats.maxhp)
2537	{	2435	{
2538	op->stats.hp++;	2436	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539	/* dms do not consume food */	2437
2540	if (!QUERY_FLAG (op, FLAG_WIZ))	2438	if (op->stats.sp < op->stats.maxsp)
2541	{	2439	{
		2440	op->stats.sp++;
		2441
		2442	/* dms do not consume food */
		2443	if (!QUERY_FLAG (op, FLAG_WIZ))
		2444	{
2542	op->stats.food--;	2445	op->stats.food--;
		2446
2543	if (op->contr->digestion < 0)	2447	if (op->contr->digestion < 0)
2544	op->stats.food += op->contr->digestion;	2448	op->stats.food += op->contr->digestion;
2545	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2449	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2546	op->stats.food = last_food;	2450	op->stats.food = last_food;
		2451	}
2547	}	2452	}
2548	}
2549		2453
2550	if (max_hp > 1)	2454	if (max_sp > 1)
2551	{
2552	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2553	if (over_hp > 0)
2554	{	2455	{
2555	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2456	over_sp = (gen_sp + 10) / rate_sp;
		2457	if (over_sp > 0)
		2458	{
		2459	if (op->stats.sp < op->stats.maxsp)
		2460	{
		2461	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2462
		2463	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2464	op->stats.sp--;
		2465
		2466	if (op->stats.sp > op->stats.maxsp)
		2467	op->stats.sp = op->stats.maxsp;
		2468	}
		2469
2556	op->last_heal = 0;	2470	op->last_sp = 0;
		2471	}
		2472	else
		2473	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2557	}	2474	}
2558	else	2475	else
		2476	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2477	}
		2478
		2479	/* Regenerate Hit Points */
		2480	if (--op->last_heal < 0)
		2481	{
		2482	if (op->stats.hp < op->stats.maxhp)
2559	{	2483	{
2560	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2484	op->stats.hp++;
		2485
		2486	/* dms do not consume food */
		2487	if (!QUERY_FLAG (op, FLAG_WIZ))
		2488	{
		2489	op->stats.food--;
		2490
		2491	if (op->contr->digestion < 0)
		2492	op->stats.food += op->contr->digestion;
		2493	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2494	op->stats.food = last_food;
		2495	}
2561	}	2496	}
		2497
		2498	if (max_hp > 1)
		2499	{
		2500	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2501
		2502	if (over_hp > 0)
		2503	{
		2504	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2505	op->last_heal = 0;
		2506	}
		2507	else
		2508	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2562	}	2509	}
2563	else	2510	else
2564	{
2565	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2511	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2566	}	2512	}
2567	}	2513	}
2568		2514
2569	/* Digestion */	2515	/* Digestion */
2570	if (--op->last_eat < 0)	2516	if (--op->last_eat < 0)
2571	{	2517	{
2572	#ifdef COZY_SERVER	2518	int bonus = max (0, op->contr->digestion),
2573	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2519	penalty = max (0, -op->contr->digestion);
2574	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2575	#else
2576	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2577	#endif
2578		2520
2579	if (op->contr->gen_hp > 0)
2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2521	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		2522
2584	/* dms do not consume food */	2523	/* dms do not consume food */
2585	if (!QUERY_FLAG (op, FLAG_WIZ))	2524	if (!QUERY_FLAG (op, FLAG_WIZ))
2586	op->stats.food--;	2525	op->stats.food--;
2587	}	2526	}
2588		2527
2589	if (op->stats.food < 0 && op->stats.hp >= 0)	2528	if (op->stats.food < 0 && op->stats.hp >= 0)
2590	{	2529	{
2591	object *tmp, *flesh = 0;	2530	object *flesh = 0;
2592		2531
2593	for (tmp = op->inv; tmp; tmp = tmp->below)	2532	for_inv_removable (op, tmp)
2594	{	2533	{
2595	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2534	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2535	continue;
		2536
		2537	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2596	{	2538	{
2597	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2539	op->statusmsg ("You blindly grab for a bite of food. "
2598	{	2540	"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);	2541	manual_apply (op, tmp, 0);
		2542
2601	if (op->stats.food >= 0 || op->stats.hp < 0)	2543	if (op->stats.food >= 0 || op->stats.hp < 0)
2602	break;	2544	break;
2603	}	2545	}
2604	else if (tmp->type == FLESH)	2546	else if (tmp->type == FLESH)
2605	flesh = tmp;	2547	flesh = tmp;
2606	} /* End if paid for object */	2548	}
2607	} /* end of for loop */
2608		2549
2609	/* If player is still starving, it means they don't have any food, so	2550	/* If player is still starving, it means they don't have any food, so
2610	* eat flesh instead.	2551	* eat flesh instead.
2611	*/	2552	*/
2612	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2553	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2613	{	2554	{
2614	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2555	op->statusmsg ("You blindly grab for a bite of food. "
		2556	"H<To prevent you from starving, you ate some random item from your backpack.>");
2615	manual_apply (op, flesh, 0);	2557	manual_apply (op, flesh, 0);
2616	}	2558	}
		2559
		2560	// If player is still starving, alert him!
		2561	if (op->stats.food < 0)
		2562	op->failmsg ("You are starving! "
		2563	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2564	}
		2565
		2566	if (op->stats.food < 0)
2617	}	2567	{
		2568	op->stats.hp += op->stats.food;
		2569	op->stats.food = 0;
2618		2570
2619	while (op->stats.food < 0 && op->stats.hp >= 0)	2571	if (op->stats.hp < 0)
2620	op->stats.food++, op->stats.hp--;	2572	{
		2573	op->contr->killer = archetype::get ("killer_starvation");
		2574	op->contr->killer->destroy (true);
		2575	}
		2576	}
2621		2577
		2578	/* killer should be set here already */
2622	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2579	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2623	kill_player (op);	2580	kill_player (op);
2624	}	2581	}
2625	}	2582	}
2626		2583
…		…
2630	* file.	2587	* file.
2631	*/	2588	*/
2632	void	2589	void
2633	kill_player (object *op)	2590	kill_player (object *op)
2634	{	2591	{
		2592	int x, y;
2635	char buf[MAX_BUF];	2593	char buf[MAX_BUF];
2636	int x, y;
2637
2638	//int i;
2639	maptile *map; /* this is for resurrection */	2594	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;	2595	int will_kill_again;
2647	archetype *at;	2596	archetype *at;
2648	object *tmp;	2597	object *tmp;
2649		2598
2650	if (save_life (op))	2599	if (save_life (op))
2651	return;	2600	return;
2652
2653		2601
2654	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2602	/* 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.	2603	* in cities ONLY!!! It is very important that this doesn't get abused.
2656	* Look at op_on_battleground() for more info --AndreasV	2604	* Look at op_on_battleground() for more info --AndreasV
2657	*/	2605	*/
…		…
2662		2610
2663	/* restore player */	2611	/* restore player */
2664	at = archetype::find ("poisoning");	2612	at = archetype::find ("poisoning");
2665	if (object *tmp = present_arch_in_ob (at, op))	2613	if (object *tmp = present_arch_in_ob (at, op))
2666	{	2614	{
2667	tmp->destroy ();	2615	tmp->destroy (true);
2668	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2616	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2669	}	2617	}
2670		2618
2671	at = archetype::find ("confusion");	2619	at = archetype::find ("confusion");
2672	if (object *tmp = present_arch_in_ob (at, op))	2620	if (object *tmp = present_arch_in_ob (at, op))
2673	{	2621	{
2674	tmp->destroy ();	2622	tmp->destroy (true);
2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2623	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2676	}	2624	}
2677		2625
2678	cure_disease (op, 0); /* remove any disease */	2626	cure_disease (op, 0, 0); /* remove any disease */
2679	op->stats.hp = op->stats.maxhp;	2627	op->stats.hp = op->stats.maxhp;
2680	if (op->stats.food <= 0)	2628	if (op->stats.food <= 0)
2681	op->stats.food = 999;	2629	op->stats.food = 999;
2682		2630
2683	/* create a bodypart-trophy to make the winner happy */	2631	/* create a bodypart-trophy to make the winner happy */
2684	if (object *tmp = arch_to_object (archetype::find ("finger")))	2632	if (object *tmp = arch_to_object (archetype::find ("finger")))
2685	{	2633	{
2686	sprintf (buf, "%s's finger", &op->name);	2634	tmp->name = format ("%s's finger" , &op->name);
2687	tmp->name = buf;	2635	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;	2636	tmp->msg = format (
		2637	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2638	&op->name, op->contr->title,
		2639	(int)op->level,
		2640	op->contr->killer_name ()
		2641	);
2692	tmp->value = 0, tmp->type = 0;	2642	tmp->value = 0, tmp->type = 0;
2693	tmp->materialname = "organics";	2643	tmp->materialname = "organics";
2694	tmp->insert_at (op, tmp);	2644	tmp->insert_at (op, tmp);
2695	}	2645	}
2696		2646
…		…
2702		2652
2703	INVOKE_PLAYER (DEATH, op->contr);	2653	INVOKE_PLAYER (DEATH, op->contr);
2704		2654
2705	command_kill_pets (op, 0);	2655	command_kill_pets (op, 0);
2706		2656
2707	if (op->stats.food < 0)	2657	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		2658
2717	/* save the map location for corpse, gravestone */	2659	/* save the map location for corpse, gravestone */
2718	x = op->x;	2660	x = op->x;
2719	y = op->y;	2661	y = op->y;
2720	map = op->map;	2662	map = op->map;
…		…
2827	lost_a_stat = 1;	2769	lost_a_stat = 1;
2828	}	2770	}
2829	}	2771	}
2830	}	2772	}
2831	}	2773	}
		2774
2832	/* If no stat lost, tell the player. */	2775	/* If no stat lost, tell the player. */
2833	if (!lost_a_stat)	2776	if (!lost_a_stat)
2834	{	2777	{
2835	/* determine_god() seems to not work sometimes... why is this?	2778	/* determine_god() seems to not work sometimes... why is this?
2836	Should I be using something else? GD */	2779	Should I be using something else? GD */
…		…
2840	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2783	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2841	else	2784	else
2842	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2785	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2843	}	2786	}
2844	#else	2787	#else
2845	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2788	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2846	#endif	2789	#endif
2847		2790
2848	/* Put a gravestone up where the character 'almost' died. List the	2791	/* Put a gravestone up where the character 'almost' died. List the
2849	* exp loss on the stone.	2792	* exp loss on the stone.
2850	*/	2793	*/
2851	tmp = arch_to_object (archetype::find ("gravestone"));	2794	tmp = arch_to_object (archetype::find ("gravestone"));
2852	sprintf (buf, "%s's gravestone", &op->name);	2795	tmp->name = format ("%s's gravestone", &op->name);
2853	tmp->name = buf;	2796	tmp->name_pl = format ("%s's gravestones", &op->name);
2854	sprintf (buf, "%s's gravestones", &op->name);	2797	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2855	tmp->name_pl = buf;	2798	&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;	2799	tmp->x = op->x, tmp->y = op->y;
2859	insert_ob_in_map (tmp, op->map, NULL, 0);	2800	insert_ob_in_map (tmp, op->map, NULL, 0);
2860		2801
2861	/**************************************/	2802	/**************************************/
2862	/* */	2803	/* */
…		…
2871	at = archetype::find ("poisoning");	2812	at = archetype::find ("poisoning");
2872	tmp = present_arch_in_ob (at, op);	2813	tmp = present_arch_in_ob (at, op);
2873		2814
2874	if (tmp)	2815	if (tmp)
2875	{	2816	{
2876	tmp->destroy ();	2817	tmp->destroy (true);
2877	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2818	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2878	}	2819	}
2879		2820
2880	at = archetype::find ("confusion");	2821	at = archetype::find ("confusion");
2881	tmp = present_arch_in_ob (at, op);	2822	tmp = present_arch_in_ob (at, op);
2882	if (tmp)	2823	if (tmp)
2883	{	2824	{
2884	tmp->destroy ();	2825	tmp->destroy (true);
2885	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2826	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2886	}	2827	}
2887		2828
2888	cure_disease (op, 0); /* remove any disease */	2829	cure_disease (op, 0, 0); /* remove any disease */
		2830
		2831	// remove all spell effects that are active
		2832	// to avoid long-term effects such as word-of-recall
		2833	for (object *item = op->inv; item; )
		2834	{
		2835	object *next = item->below;
		2836
		2837	if (item->type == SPELL_EFFECT && item->active)
		2838	item->destroy (true);
		2839
		2840	item = next;
		2841	}
2889		2842
2890	/*add_exp(op, (op->stats.exp * -0.20)); */	2843	/*add_exp(op, (op->stats.exp * -0.20)); */
2891	apply_death_exp_penalty (op);	2844	apply_death_exp_penalty (op);
		2845
2892	if (op->stats.food < 100)	2846	if (op->stats.food < 100)
2893	op->stats.food = 900;	2847	op->stats.food = 900;
		2848
2894	op->stats.hp = op->stats.maxhp;	2849	op->stats.hp = op->stats.maxhp;
2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2850	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2851	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2897		2852
2898	/*	2853	/*
2899	* Check to see if the player has any unpaid items. If so, remove them	2854	* Check to see if the player has any unpaid items. If so, remove them
2900	* and put them back in the map.	2855	* and put them back in the map.
2901	*/	2856	*/
2902	remove_unpaid_objects (op->inv, op);	2857	op->drop_unpaid_items ();
2903		2858
2904	/****************************************/	2859	/****************************************/
2905	/* */	2860	/* */
2906	/* Move player to his current respawn- */	2861	/* Move player to his current respawn- */
2907	/* position (usually last savebed) */	2862	/* position (usually last savebed) */
…		…
2936	if (will_kill_again & (1 << at))	2891	if (will_kill_again & (1 << at))
2937	force->resist[at] = 100;	2892	force->resist[at] = 100;
2938		2893
2939	insert_ob_in_ob (force, op);	2894	insert_ob_in_ob (force, op);
2940	op->update_stats ();	2895	op->update_stats ();
2941
2942	}	2896	}
2943		2897
2944	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2898	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2945	}	2899	}
2946		2900
…		…
2966		2920
2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2921	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2968	{	2922	{
2969	if (tmp->nrof > 1)	2923	if (tmp->nrof > 1)
2970	{	2924	{
2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2925	tmp->decrease (rndm (1, tmp->nrof - 1));
2972	tmp2->destroy ();
2973	insert_ob_in_map (tmp, op->map, NULL, 0);	2926	insert_ob_in_map (tmp, op->map, NULL, 0);
2974	}	2927	}
2975	else	2928	else
2976	tmp->destroy ();	2929	tmp->destroy (true);
2977	}	2930	}
2978	else	2931	else
2979	insert_ob_in_map (tmp, op->map, NULL, 0);	2932	insert_ob_in_map (tmp, op->map, NULL, 0);
2980	}	2933	}
2981	}	2934	}
…		…
2988	void	2941	void
2989	fix_weight (void)	2942	fix_weight (void)
2990	{	2943	{
2991	for_all_players (pl)	2944	for_all_players (pl)
2992	{	2945	{
2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2946	sint32 old = pl->ob->carrying;
2994		2947
2995	if (old == sum)	2948	pl->ob->update_weight ();
2996	continue;	2949
		2950	if (old != pl->ob->carrying)
		2951	{
2997	pl->ob->update_stats ();	2952	pl->ob->update_stats ();
2998	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2953	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2954	}
2999	}	2955	}
3000	}	2956	}
3001		2957
3002	void	2958	void
3003	fix_luck (void)	2959	fix_luck (void)
…		…
3039	if (op->type == PLAYER)	2995	if (op->type == PLAYER)
3040	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);	2996	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3041		2997
3042	cast_spell (op, throw_ob, dir, spob, NULL);	2998	cast_spell (op, throw_ob, dir, spob, NULL);
3043		2999
3044	throw_ob->destroy ();	3000	throw_ob->destroy (true);
3045	}	3001	}
3046		3002
3047	void	3003	void
3048	make_visible (object *op)	3004	make_visible (object *op)
3049	{	3005	{
3050	op->hide = 0;	3006	op->hide = 0;
3051	op->invisible = 0;	3007	op->invisible = 0;
		3008
3052	if (op->type == PLAYER)	3009	if (op->type == PLAYER)
3053	{	3010	{
3054	op->contr->tmp_invis = 0;	3011	op->contr->tmp_invis = 0;
3055	op->contr->invis_race = 0;	3012	op->contr->invis_race = 0;
3056	}	3013	}
…		…
3059	}	3016	}
3060		3017
3061	int	3018	int
3062	is_true_undead (object *op)	3019	is_true_undead (object *op)
3063	{	3020	{
3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3021	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3065	return 1;	3022	return 1;
3066		3023
3067	return 0;	3024	return 0;
3068	}	3025	}
3069		3026
3070	/* look at the surrounding terrain to determine	3027	/* look at the surrounding terrain to determine
3071	* the hideability of this object. Positive levels	3028	* the hideability of this object. Positive levels
3072	* indicate greater hideability.	3029	* indicate greater hideability.
3073	*/	3030	*/
3074
3075	int	3031	int
3076	hideability (object *ob)	3032	hideability (object *ob)
3077	{	3033	{
3078	int i, level = 0, mflag;	3034	int i, level = 0, mflag;
3079	sint16 x, y;	3035	sint16 x, y;
…		…
3089	* as bad as carrying a light on a pitch dark map */	3045	* as bad as carrying a light on a pitch dark map */
3090	if (has_carried_lights (ob))	3046	if (has_carried_lights (ob))
3091	level = -(10 + (2 * ob->map->darkness));	3047	level = -(10 + (2 * ob->map->darkness));
3092		3048
3093	/* scan through all nearby squares for terrain to hide in */	3049	/* 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])	3050	for (i = 0, x = ob->x, y = ob->y;
		3051	i <= SIZEOFFREE1;
		3052	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3095	{	3053	{
3096	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3054	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3097	if (mflag & P_OUT_OF_MAP)	3055	if (mflag & P_OUT_OF_MAP)
3098	{
3099	continue;	3056	continue;
3100	}	3057
3101	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3058	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3102	level += 2;	3059	level += 2;
3103	else /* open terrain! */	3060	else /* open terrain! */
3104	level -= 1;	3061	level -= 1;
3105	}	3062	}
…		…
3113	/* For Hidden creatures - a chance of becoming 'unhidden'	3070	/* For Hidden creatures - a chance of becoming 'unhidden'
3114	* every time they move - as we subtract off 'invisibility'	3071	* every time they move - as we subtract off 'invisibility'
3115	* AND, for players, if they move into a ridiculously unhideable	3072	* AND, for players, if they move into a ridiculously unhideable
3116	* spot (surrounded by clear terrain in broad daylight). -b.t.	3073	* spot (surrounded by clear terrain in broad daylight). -b.t.
3117	*/	3074	*/
3118
3119	void	3075	void
3120	do_hidden_move (object *op)	3076	do_hidden_move (object *op)
3121	{	3077	{
3122	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3078	int hide = 0;
3123	object *skop;
3124		3079
3125	if (!op || !op->map)	3080	if (!op || !op->map)
3126	return;	3081	return;
3127		3082
3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3083	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		3084	int num = random_roll (0, 19, op, PREFER_LOW);
3129		3085
3130	/* its *extremely* hard to run and sneak/hide at the same time! */	3086	/* its *extremely* hard to run and sneak/hide at the same time! */
3131	if (op->type == PLAYER && op->contr->run_on)	3087	if (op->type == PLAYER && op->contr->run_on)
3132	if (!skop || num >= skop->level)	3088	if (!skop || num >= skop->level)
3133	{	3089	{
…		…
3143	num -= hide;	3099	num -= hide;
3144		3100
3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3101	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3146	{	3102	{
3147	make_visible (op);	3103	make_visible (op);
		3104
3148	if (op->type == PLAYER)	3105	if (op->type == PLAYER)
3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3106	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3150	}	3107	}
3151	else if (op->type == PLAYER && skop)	3108	else if (op->type == PLAYER && skop)
3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3109	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3205	* object op. This function works fine for monsters,	3162	* object op. This function works fine for monsters,
3206	* but we dont worry if the object isnt the top one in	3163	* but we dont worry if the object isnt the top one in
3207	* a pile (say a coin under a table would return "viewable"	3164	* a pile (say a coin under a table would return "viewable"
3208	* by this routine). Another question, should we be	3165	* by this routine). Another question, should we be
3209	* concerned with the direction the player is looking	3166	* concerned with the direction the player is looking
3210	* in? Realistically, most of use cant see stuff behind	3167	* in? Realistically, most of us can't see stuff behind
3211	* our backs...on the other hand, does the "facing" direction	3168	* our backs...on the other hand, does the "facing" direction
3212	* imply the way your head, or body is facing? Its possible	3169	* 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.	3170	* for them to differ. Sigh, this fctn could get a bit more complex.
3214	* -b.t.	3171	* -b.t.
3215	* This function is now map tiling safe.	3172	* This function is now map tiling safe.
3216	*/	3173	*/
3217
3218	int	3174	int
3219	player_can_view (object *pl, object *op)	3175	player_can_view (object *pl, object *op)
3220	{	3176	{
3221	rv_vector rv;	3177	rv_vector rv;
3222	int dx, dy;	3178	int dx, dy;
…		…
3234		3190
3235	get_rangevector (pl, op, &rv, 0x1);	3191	get_rangevector (pl, op, &rv, 0x1);
3236		3192
3237	/* starting with the 'head' part, lets loop	3193	/* starting with the 'head' part, lets loop
3238	* through the object and find if it has any	3194	* through the object and find if it has any
3239	* part that is in the los array but isnt on	3195	* part that is in the los array but isn't on
3240	* a blocked los square.	3196	* a blocked los square.
3241	* we use the archetype to figure out offsets.	3197	* we use the archetype to figure out offsets.
3242	*/	3198	*/
3243	while (op)	3199	while (op)
3244	{	3200	{
3245	dx = rv.distance_x + op->arch->clone.x;	3201	dx = rv.distance_x + op->arch->x;
3246	dy = rv.distance_y + op->arch->clone.y;	3202	dy = rv.distance_y + op->arch->y;
3247		3203
3248	/* only the viewable area the player sees is updated by LOS	3204	/* only the viewable area the player sees is updated by LOS
3249	* code, so we need to restrict ourselves to that range of values	3205	* code, so we need to restrict ourselves to that range of values
3250	* for any meaningful values.	3206	* for any meaningful values.
3251	*/	3207	*/
3252	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3208	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3253	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3209	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3254	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3210	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3255	return 1;	3211	return 1;
		3212
3256	op = op->more;	3213	op = op->more;
3257	}	3214	}
		3215
3258	return 0;	3216	return 0;
3259	}	3217	}
3260		3218
3261	/* routine for both players and monsters. We call this when	3219	/* routine for both players and monsters. We call this when
3262	* there is a possibility for our action distrubing our hiding	3220	* there is a possibility for our action distrubing our hiding
…		…
3265	* return 0.	3223	* return 0.
3266	*/	3224	*/
3267	int	3225	int
3268	action_makes_visible (object *op)	3226	action_makes_visible (object *op)
3269	{	3227	{
3270
3271	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3228	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3272	{	3229	{
3273	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3230	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3274	return 0;	3231	return 0;
3275		3232
…		…
3281	{	3238	{
3282	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3239	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3283	return 1;	3240	return 1;
3284	}	3241	}
3285	}	3242	}
		3243
3286	return 0;	3244	return 0;
3287	}	3245	}
3288		3246
3289	/* op_on_battleground - checks if the given object op (usually	3247	/* op_on_battleground - checks if the given object op (usually
3290	* a player) is standing on a valid battleground-tile,	3248	* 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	3253	* Default is to do the same as before, so only people wanting to have different points need worry about this
3296	*/	3254	*/
3297	int	3255	int
3298	op_on_battleground (object *op, int *x, int *y)	3256	op_on_battleground (object *op, int *x, int *y)
3299	{	3257	{
3300	object *tmp;
3301
3302	/* A battleground-tile needs the following attributes to be valid:	3258	/* 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),	3259	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3304	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3260	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3305	* and the exit-coordinates sp/hp must both be > 0.	3261	* and the exit-coordinates sp/hp must both be > 0.
3306	* => The intention here is to prevent abuse of the battleground-	3262	* => The intention here is to prevent abuse of the battleground-
3307	* feature (like pickable or hidden battleground tiles). */	3263	* feature (like pickable or hidden battleground tiles). */
3308	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3264	for (object *tmp = op->below; tmp; tmp = tmp->below)
3309	{	3265	{
3310	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3266	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3311	{	3267	{
3312	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3268	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3313	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3269	&& tmp->type == BATTLEGROUND
		3270	&& tmp->name == shstr_battleground
		3271	&& EXIT_X (tmp) && EXIT_Y (tmp))
3314	{	3272	{
3315	/*before we assign the exit, check if this is a teambattle */	3273	/* before we assign the exit, check if this is a teambattle */
3316	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3274	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3317	{	3275	{
3318	object *invtmp;
3319
3320	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3276	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3321	{	3277	{
3322	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3278	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3323	{	3279	{
3324	if (x != NULL && y != NULL)	3280	if (x && y)
3325	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3281	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3282
3326	return 1;	3283	return 1;
3327	}	3284	}
3328	}	3285	}
3329	}	3286	}
		3287
3330	if (x != NULL && y != NULL)	3288	if (x && y)
3331	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3289	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3290
3332	return 1;	3291	return 1;
3333	}	3292	}
3334	}	3293	}
3335	}	3294	}
		3295
3336	/* If we got here, did not find a battleground */	3296	/* If we got here, did not find a battleground */
3337	return 0;	3297	return 0;
3338	}	3298	}
3339		3299
3340	/*	3300	/*
…		…
3356	char buf[MAX_BUF]; /* tmp. string buffer */	3316	char buf[MAX_BUF]; /* tmp. string buffer */
3357	int i = 0, j = 0;	3317	int i = 0, j = 0;
3358		3318
3359	/* get the appropriate treasurelist */	3319	/* get the appropriate treasurelist */
3360	if (atnr == ATNR_FIRE)	3320	if (atnr == ATNR_FIRE)
3361	trlist = treasurelist::find ("dragon_ability_fire");	3321	trlist = treasurelist::find (shstr_dragon_ability_fire);
3362	else if (atnr == ATNR_COLD)	3322	else if (atnr == ATNR_COLD)
3363	trlist = treasurelist::find ("dragon_ability_cold");	3323	trlist = treasurelist::find (shstr_dragon_ability_cold);
3364	else if (atnr == ATNR_ELECTRICITY)	3324	else if (atnr == ATNR_ELECTRICITY)
3365	trlist = treasurelist::find ("dragon_ability_elec");	3325	trlist = treasurelist::find (shstr_dragon_ability_elec);
3366	else if (atnr == ATNR_POISON)	3326	else if (atnr == ATNR_POISON)
3367	trlist = treasurelist::find ("dragon_ability_poison");	3327	trlist = treasurelist::find (shstr_dragon_ability_poison);
3368		3328
3369	if (trlist == NULL || who->type != PLAYER)	3329	if (trlist == NULL || who->type != PLAYER)
3370	return;	3330	return;
3371		3331
3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3332	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]); */	3336	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3377	return;	3337	return;
3378	}	3338	}
3379		3339
3380	/* everything seems okay - now bring on the gift: */	3340	/* everything seems okay - now bring on the gift: */
3381	item = &(tr->item->clone);	3341	item = tr->item;
3382		3342
3383	if (item->type == SPELL)	3343	if (item->type == SPELL)
3384	{	3344	{
3385	if (check_spell_known (who, item->name))	3345	if (check_spell_known (who, item->name))
3386	return;	3346	return;
…		…
3445	{	3405	{
3446	/* forces in the treasurelist can alter the player's stats */	3406	/* forces in the treasurelist can alter the player's stats */
3447	object *skin;	3407	object *skin;
3448		3408
3449	/* first get the dragon skin force */	3409	/* 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)	3410	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3452	;	3411	;
3453		3412
3454	if (!skin)	3413	if (!skin)
3455	return;	3414	return;
3456		3415
…		…
3491	else	3450	else
3492	{	3451	{
3493	/* generate misc. treasure */	3452	/* generate misc. treasure */
3494	tmp = arch_to_object (tr->item);	3453	tmp = arch_to_object (tr->item);
3495	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3454	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);	3455	who->insert (tmp);
3497	if (who->type == PLAYER)
3498	esrv_send_item (who, tmp);
3499	}	3456	}
3500	}	3457	}
3501		3458
3502	/**	3459	/**
3503	* Unready an object for a player. This function does nothing if the object was	3460	* Unready an object for a player. This function does nothing if the object was
…		…
3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3489	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3533	return 0;	3490	return 0;
3534		3491
3535	return 100 - blocked_los [x][y];	3492	return 100 - blocked_los [x][y];
3536	}	3493	}
		3494
		3495	void
		3496	player::infobox (const char *title, const char *msg, int color)
		3497	{
		3498	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3499	}
		3500
		3501	void
		3502	player::statusmsg (const char *msg, int color)
		3503	{
		3504	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3505	}
		3506
		3507	void
		3508	player::failmsg (const char *msg, int color)
		3509	{
		3510	play_sound (sound_find ("generic_failure"));
		3511	statusmsg (msg, color);
		3512	}
		3513

Diff Legend

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