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.136 by root, Wed May 16 11:10:01 2007 UTC vs.
Revision 1.193 by root, Wed Apr 30 07:08:34 2008 UTC

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

Diff Legend

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