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.124 by root, Fri May 11 21:24:29 2007 UTC vs.
Revision 1.187 by root, Mon Apr 21 07:07:36 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
…		…
157	op->x = -1;	156	op->x = -1;
158	op->y = -1;	157	op->y = -1;
159	}	158	}
160		159
161	void	160	void
162	player::enter_map ()
163	{
164	object *tmp = object::create ();
165
166	EXIT_PATH (tmp) = maplevel;
167	EXIT_X (tmp) = ob->x;
168	EXIT_Y (tmp) = ob->y;
169	ob->enter_exit (tmp);
170
171	tmp->destroy ();
172	}
173
174	void
175	player::activate ()	161	player::activate ()
176	{	162	{
177	if (active)	163	if (active)
178	return;	164	return;
179		165
…		…
181	ob->remove ();	167	ob->remove ();
182	ob->map = 0;	168	ob->map = 0;
183	ob->activate_recursive ();	169	ob->activate_recursive ();
184	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
185	add_friendly_object (ob);	171	add_friendly_object (ob);
186	enter_map ();
187	}	172	}
188		173
189	void	174	void
190	player::deactivate ()	175	player::deactivate ()
191	{	176	{
…		…
198		183
199	if (ob->map)	184	if (ob->map)
200	maplevel = ob->map->path;	185	maplevel = ob->map->path;
201		186
202	ob->remove ();	187	ob->remove ();
		188	ob->enemy = 0; // sometimes keeps an extra refcount on itself
203	ob->map = 0;	189	ob->map = 0;
204	party = 0;	190	party = 0;
205		191
206	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207		193
…		…
221	ob->close_container (); //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
222		208
223	ns->update_look = 0;	209	ns->update_look = 0;
224	ns->look_position = 0;	210	ns->look_position = 0;
225		211
226	clear_los (ob);	212	clear_los (this);
227		213
228	ns->reset_stats ();	214	ns->reset_stats ();
229		215
230	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
231	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
232	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
233		219
234	ob->carrying = sum_weight (ob);	220	ob->update_weight ();
235	link_player_skills (ob);	221	link_player_skills (ob);
236		222
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		224
239	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
240		226
241	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
242	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
243	{	229	{
244	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
245		231
246	shstr_cmp dragon_ability_force ("dragon_ability_force");
247	shstr_cmp dragon_skin_force ("dragon_skin_force");
248
249	for (tmp = ob->inv; tmp; tmp = tmp->below)	232	for (tmp = ob->inv; tmp; tmp = tmp->below)
250	if (tmp->type == FORCE)	233	if (tmp->type == FORCE)
251	if (tmp->arch->name == dragon_ability_force)	234	if (tmp->arch->archname == shstr_dragon_ability_force)
252	abil = tmp;	235	abil = tmp;
253	else if (tmp->arch->name == dragon_skin_force)	236	else if (tmp->arch->archname == shstr_dragon_skin_force)
254	skin = tmp;	237	skin = tmp;
255		238
256	set_dragon_name (ob, abil, skin);	239	set_dragon_name (ob, abil, skin);
257	}	240	}
258		241
259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	242	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
260		243
261	esrv_new_player (this, ob->weight + ob->carrying);	244	esrv_new_player (this, ob->weight + ob->carrying);
		245
		246	ob->update_stats ();
		247
		248	ns->floorbox_update ();
		249	esrv_send_inventory (ob, ob);
		250	esrv_add_spells (this, 0);
		251
		252	activate ();
		253
		254	send_rules (ob);
		255	send_news (ob);
		256	display_motd (ob);
		257
		258	INVOKE_PLAYER (CONNECT, this);
		259	INVOKE_PLAYER (LOGIN, this);
		260	}
		261
		262	void
		263	player::disconnect ()
		264	{
		265	if (ob)
		266	{
		267	ob->close_container (); //TODO: client-specific
		268	ob->drop_unpaid_items ();
		269	}
		270
		271	if (ns)
		272	{
		273	if (active)
		274	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		275
		276	INVOKE_PLAYER (DISCONNECT, this);
		277
		278	ns->reset_stats ();
		279	ns->pl = 0;
		280	ns = 0;
		281	}
		282
		283	observe = ob;
		284
		285	deactivate ();
		286	}
		287
		288	// the need for this function can be explained
		289	// by load_object not returning the object
		290	void
		291	player::set_object (object *op)
		292	{
		293	ob = observe = op;
		294	ob->contr = this; /* this aren't yet in archetype */
		295
		296	ob->speed = 1.0f;
		297	ob->speed_left = 0.5f;
		298
		299	ob->direction = 5; /* So player faces south */
		300
		301	ob->flag [FLAG_READY_WEAPON] = false;
		302	ob->flag [FLAG_READY_SKILL] = false;
		303	ob->flag [FLAG_READY_BOW] = false;
262		304
263	for (object *op = ob->inv; op; op = op->below)	305	for (object *op = ob->inv; op; op = op->below)
264	if (op->flag [FLAG_APPLIED])	306	if (op->flag [FLAG_APPLIED])
265	switch (op->type)	307	switch (op->type)
266	{	308	{
		309	case SKILL:
		310	ob->flag [FLAG_APPLIED] = false;
		311	break;
		312
267	case WAND:	313	case WAND:
268	case ROD:	314	case ROD:
269	case HORN:	315	case HORN:
270	case BOW:	316	case BOW:
271	case SKILL:	317	ranged_ob = op;
272	case SKILL_TOOL:	318	break;
		319
273	case WEAPON:	320	case WEAPON:
274	apply_special (ob, op, AP_UNAPPLY);	321	combat_ob = op;
275	apply_special (ob, op, AP_APPLY);
276	break;	322	break;
277	}	323	}
278		324
279	ob->update_stats ();	325	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
280	ns->floorbox_update ();	326	ob->deactivate (); // change_Weapon activates, fix this better
281
282	esrv_send_inventory (ob, ob);
283	esrv_add_spells (this, 0);
284
285	activate ();
286
287	send_rules (ob);
288	send_news (ob);
289	display_motd (ob);
290
291	INVOKE_PLAYER (CONNECT, this);
292	INVOKE_PLAYER (LOGIN, this);
293	}	327	}
294		328
295	void	329	void
296	player::disconnect ()
297	{
298	if (ns)
299	{
300	if (active)
301	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
302
303	INVOKE_PLAYER (DISCONNECT, this);
304
305	ns->reset_stats ();
306	ns->pl = 0;
307	ns = 0;
308	}
309
310	if (ob)
311	ob->close_container (); //TODO: client-specific
312
313	deactivate ();
314	}
315
316	// the need for this function can be explained
317	// by load_object not returning the object
318	void
319	player::set_object (object *op)	330	player::set_observe (object *op)
320	{	331	{
321	ob = op;	332	observe = op ? op : ob;
322	ob->contr = this; /* this aren't yet in archetype */	333	do_los = 1;
323
324	ob->speed_left = 0.5;
325	ob->speed = 1.0;
326	ob->direction = 5; /* So player faces south */
327	}	334	}
328		335
329	player::player ()	336	player::player ()
330	{	337	{
331	/* There are some elements we want initialised to non zero value -	338	/* There are some elements we want initialised to non zero value -
…		…
342	petmode = pet_normal;	349	petmode = pet_normal;
343	listening = 10;	350	listening = 10;
344	usekeys = containers;	351	usekeys = containers;
345	peaceful = 1; /* default peaceful */	352	peaceful = 1; /* default peaceful */
346	do_los = 1;	353	do_los = 1;
		354
		355	weapon_sp = 1.0f;
		356	weapon_sp_left = 0.5f;
347	}	357	}
348		358
349	void	359	void
350	player::do_destroy ()	360	player::do_destroy ()
351	{	361	{
…		…
356	if (ob)	366	if (ob)
357	{	367	{
358	ob->destroy_inv (false);	368	ob->destroy_inv (false);
359	ob->destroy ();	369	ob->destroy ();
360	}	370	}
		371
		372	ob = observe = 0;
361	}	373	}
362		374
363	player::~player ()	375	player::~player ()
364	{	376	{
365	/* Clear item stack */	377	/* Clear item stack */
…		…
392	* Note: there MUST be at least one player archetype!	404	* Note: there MUST be at least one player archetype!
393	*/	405	*/
394	archetype *	406	archetype *
395	get_player_archetype (archetype *at)	407	get_player_archetype (archetype *at)
396	{	408	{
397	archetype *start = at;	409	// 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);
398		416
399	for (;;)	417	for (;;)
400	{	418	{
401	if (at == NULL || at->next == NULL)	419	if (++i == archetypes.end ())
402	at = first_archetype;	420	i = archetypes.begin ();
403	else	421	else if (*i == at)
404	at = at->next;	422	cleanup ("not a single player archetype found");
405		423
406	if (at->clone.type == PLAYER)	424	if ((*i)->type == PLAYER)
407	return at;	425	return *i;
408
409	if (at == start)
410	{
411	LOG (llevError, "No Player archetypes\n");
412	exit (-1);
413	}
414	}	426	}
415	}	427	}
416		428
417	object *	429	object *
418	get_nearest_player (object *mon)	430	get_nearest_player (object *mon)
…		…
422	unsigned lastdist;	434	unsigned lastdist;
423	rv_vector rv;	435	rv_vector rv;
424		436
425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	437	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	438	{
427	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.
431	*/
432	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433	{
434	object *tmp = ol->ob;
435
436	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.
438	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440	tmp->debug_desc ());
441	ol = ol->next;
442	remove_friendly_object (tmp);
443	if (!ol)
444	return op;
445	}
446
447	/* Remove special check for player from this. First, it looks to cause
448	* some crashes (ol->ob->contr not set properly?), but secondly, a more
449	* complicated method of state checking would be needed in any case -
450	* as it was, a clever player could type quit, and the function would
451	* skip them over while waiting for confirmation. Remove
452	* on_same_map check, as can_detect_enemy also does this
453	*/
454	if (!can_detect_enemy (mon, ol->ob, &rv))	439	if (!can_detect_enemy (mon, ol->ob, &rv))
455	continue;	440	continue;
456		441
457	if (lastdist > rv.distance)	442	if (lastdist > rv.distance)
458	{	443	{
…		…
653		638
654	return firstdir;	639	return firstdir;
655	}	640	}
656		641
657	void	642	void
658	give_initial_items (object *pl, treasurelist * items)	643	give_initial_items (object *pl, treasurelist *items)
659	{	644	{
660	object *op, *next = NULL;
661
662	if (pl->randomitems != NULL)	645	if (pl->randomitems)
663	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	646	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
664		647
665	for (op = pl->inv; op; op = next)	648	for (object *next, *op = pl->inv; op; op = next)
666	{	649	{
667	next = op->below;	650	next = op->below;
668		651
669	/* Forces get applied per default, unless they have the	652	/* Forces get applied per default, unless they have the
670	* 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
…		…
675	/* we never give weapons/armour if these cannot be used	658	/* we never give weapons/armour if these cannot be used
676	* by this player due to race restrictions	659	* by this player due to race restrictions
677	*/	660	*/
678	if (pl->type == PLAYER)	661	if (pl->type == PLAYER)
679	{	662	{
680	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	663	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		664	&&
681	(op->type == ARMOUR || op->type == BOOTS ||	665	(op->type == ARMOUR || op->type == BOOTS
682	op->type == CLOAK || op->type == HELMET ||	666	|| op->type == CLOAK || op->type == HELMET
683	op->type == SHIELD || op->type == GLOVES ||	667	|| op->type == SHIELD || op->type == GLOVES
		668	|| op->type == BRACERS || op->type == GIRDLE))
684	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))
685	{	670	{
686	op->destroy ();	671	op->destroy ();
687	continue;	672	continue;
688	}	673	}
689	}	674	}
…		…
712	if (op->nrof > 1)	697	if (op->nrof > 1)
713	op->nrof = 1;	698	op->nrof = 1;
714	}	699	}
715		700
716	if (op->type == SPELLBOOK && op->inv)	701	if (op->type == SPELLBOOK && op->inv)
717	{
718	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	702	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
719	}
720		703
721	/* Give starting characters identified, uncursed, and undamned	704	/* Give starting characters identified, uncursed, and undamned
722	* 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
723	* merged properly.	706	* merged properly.
724	*/	707	*/
725	if (need_identify (op))	708	if (need_identify (op))
726	{	709	{
727	SET_FLAG (op, FLAG_IDENTIFIED);	710	SET_FLAG (op, FLAG_IDENTIFIED);
728	CLEAR_FLAG (op, FLAG_CURSED);	711	CLEAR_FLAG (op, FLAG_CURSED);
729	CLEAR_FLAG (op, FLAG_DAMNED);	712	CLEAR_FLAG (op, FLAG_DAMNED);
730	}	713	}
		714
731	if (op->type == SPELL)	715	if (op->type == SPELL)
732	{	716	{
733	op->destroy ();	717	op->destroy ();
734	continue;	718	continue;
735	}	719	}
…		…
737	{	721	{
738	SET_FLAG (op, FLAG_CAN_USE_SKILL);	722	SET_FLAG (op, FLAG_CAN_USE_SKILL);
739	op->stats.exp = 0;	723	op->stats.exp = 0;
740	op->level = 1;	724	op->level = 1;
741	}	725	}
742	/* lock all 'normal items by default */	726	else /* lock all 'normal items by default */
743	else
744	SET_FLAG (op, FLAG_INV_LOCKED);	727	SET_FLAG (op, FLAG_INV_LOCKED);
745	} /* for loop of objects in player inv */	728	} /* for loop of objects in player inv */
746		729
747	/* Need to set up the skill pointers */	730	/* Need to set up the skill pointers */
748	link_player_skills (pl);	731	link_player_skills (pl);
…		…
784	}	767	}
785		768
786	void	769	void
787	object::roll_stats ()	770	object::roll_stats ()
788	{	771	{
789	int statsort [7];	772	int statsort [NUM_STATS];
790		773
791	for (;;)	774	for (;;)
792	{	775	{
793	int sum = 0;	776	int sum = 0;
794	for (int i = 7; i--; )	777	for (int i = NUM_STATS; i--; )
795	sum += statsort [i] = roll_stat ();	778	sum += statsort [i] = roll_stat ();
796		779
797	if (sum >= 82 && sum <= 116)	780	if (sum >= 82 && sum <= 116)
798	break;	781	break;
799	}	782	}
800		783
801	// Sort the stats so that rerolling is easier...	784	// Sort the stats so that rerolling is easier...
802	std::sort (statsort, statsort + 7, std::greater<int>());	785	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
803		786
		787	for (int i = 0; i < NUM_STATS; ++i)
804	stats.Str = statsort[0];	788	stats.stat (i) = statsort [i];
805	stats.Dex = statsort[1];
806	stats.Con = statsort[2];
807	stats.Int = statsort[3];
808	stats.Wis = statsort[4];
809	stats.Pow = statsort[5];
810	stats.Cha = statsort[6];
811		789
812	stats.exp = 0;	790	stats.exp = 0;
813	stats.ac = 0;	791	stats.ac = 0;
814		792
815	stats.hp = stats.maxhp;	793	stats.hp = stats.maxhp;
…		…
827	}	805	}
828		806
829	void	807	void
830	object::swap_stats (int a, int b)	808	object::swap_stats (int a, int b)
831	{	809	{
832	int tmp = get_attr_value (&contr->orig_stats, a);	810	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
833	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
834	set_attr_value (&contr->orig_stats, b, tmp);
835		811
		812	for (int i = 0; i < NUM_STATS; ++i)
836	stats.Str = contr->orig_stats.Str;	813	stats.stat (i) = contr->orig_stats.stat (i);
837	stats.Dex = contr->orig_stats.Dex;
838	stats.Con = contr->orig_stats.Con;
839	stats.Int = contr->orig_stats.Int;
840	stats.Wis = contr->orig_stats.Wis;
841	stats.Pow = contr->orig_stats.Pow;
842	stats.Cha = contr->orig_stats.Cha;
843		814
844	//TODO: the following code looks so borked and should, at the very least,	815	//TODO: the following code looks so borked and should, at the very least,
845	// be merged with the similar code in roll_stats	816	// be merged with the similar code in roll_stats
846	stats.ac = 0;	817	stats.ac = 0;
847		818
…		…
866	static void	837	static void
867	start_info (object *op)	838	start_info (object *op)
868	{	839	{
869	char buf[MAX_BUF];	840	char buf[MAX_BUF];
870		841
871	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
872	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
873	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
874	//new_draw_info (NDI_UNIQUE, 0, op, " ");
875	}	844	}
876		845
877	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
878	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
879	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
920	if (*first_map_ext_path)	889	if (*first_map_ext_path)
921	{	890	{
922	object *tmp;	891	object *tmp;
923	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
924		893
925	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);
926	tmp = object::create ();	895	tmp = object::create ();
927	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
928	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
929	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
930	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;
…		…
949	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
950		919
951	ob->remove_statbonus ();	920	ob->remove_statbonus ();
952	ob->remove ();	921	ob->remove ();
953	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
954	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
955	ob->instantiate ();	924	ob->instantiate ();
956	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
957	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
958	ob->x = x;	927	ob->x = x;
959	ob->y = y;	928	ob->y = y;
960	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
961	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
962	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
963	ob->add_statbonus ();	932	ob->add_statbonus ();
964	}	933	}
965	while (!allowed_class (ob));	934	while (!allowed_class (ob));
966		935
967	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1042	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1043	return 1;	1012	return 1;
1044		1013
1045	next = op->below;	1014	next = op->below;
1046		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1047	/* 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
1048	* destroyed */	1020	* destroyed */
1049	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1050	{	1022	{
1051	tmp = next;	1023	tmp = next;
1052	next = tmp->below;	1024	next = tmp->below;
1053		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1054	if (op->destroyed ())	1032	if (op->destroyed ())
1055	return 0;	1033	return 0;
1056		1034
1057	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1058	continue;	1036	continue;
1059		1037
1060	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1061	{	1039	{
1062	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1063	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1064	continue;	1042	continue;
1065	}	1043	}
1066		1044
1067	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1068	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1070	switch (op->contr->mode)	1048	switch (op->contr->mode)
1071	{	1049	{
1072	case 0:	1050	case 0:
1073	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1074	case 1:	1052	case 1:
1075	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1076	return 1;	1054	return 1;
1077	case 2:	1055	case 2:
1078	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1079	return 0;	1057	return 0;
1080	case 3:	1058	case 3:
1081	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1082	case 4:	1060	case 4:
1083	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1084	break;	1062	break;
1085	case 5:	1063	case 5:
1086	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1087	stop = 1;	1065	stop = 1;
1088	break;	1066	break;
1089	case 6:	1067	case 6:
1090	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1091	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1092	break;	1071	break;
1093		1072
1094	case 7:	1073	case 7:
1095	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1096	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1097	break;	1076	break;
1098		1077
1099	default:	1078	default:
1100	/* use value density */	1079	/* use value density */
1101	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1102	&& (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)
1103	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1104	}	1083	}
1105	}	1084	}
1106	else	1085	else
1107	{ /* old model */	1086	{ /* old model */
1108	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1112	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&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))));
1115	else	1094	else
1116	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117	&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))));
1118		1097
1119	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1120	}	1099	}
1121		1100
1122	/* philosophy:	1101	/* philosophy:
…		…
1163	/* all food and drink if desired */	1142	/* all food and drink if desired */
1164	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1165	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1166	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1167	{	1146	{
1168	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1169	continue;	1148	continue;
1170	}	1149	}
1171		1150
1172	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1173	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)))
1174	{	1153	{
1175	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1176	continue;	1155	continue;
1177	}	1156	}
1178		1157
1179	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1180	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1181	{	1160	{
1182	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1183	continue;	1162	continue;
1184	}	1163	}
1185		1164
1186	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1187	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1188	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1189	{	1168	{
1190	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1191	continue;	1170	continue;
1192	}	1171	}
1193		1172
1194	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1195	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1196	{	1175	{
1197	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1198	continue;	1177	continue;
1199	}	1178	}
1200		1179
1201	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1202	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1203	{	1182	{
1204	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1205	continue;	1184	continue;
1206	}	1185	}
1207		1186
1208	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1209	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1210	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1211	{	1190	{
1212	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1213	continue;	1192	continue;
1214	}	1193	}
1215		1194
1216	/* pick up all magical items */	1195	/* pick up all magical items */
1217	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1218	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))
1219	{	1198	{
1220	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1221	continue;	1200	continue;
1222	}	1201	}
1223		1202
1224	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1225	{	1204	{
1226	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1227	{	1206	{
1228	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1229	continue;	1208	continue;
1230	}	1209	}
1231	}	1210	}
1232		1211
1233	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1234	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1235	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1236	{	1215	{
1237	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1238	continue;	1217	continue;
1239	}	1218	}
1240		1219
1241	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1242	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1243	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1244	{	1223	{
1245	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1246	continue;	1225	continue;
1247	}	1226	}
1248		1227
1249	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1250	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1251	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1252	{	1231	{
1253	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1254	continue;	1233	continue;
1255	}	1234	}
1256		1235
1257	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1258	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1259	{	1238	{
1260	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1261	continue;	1240	continue;
1262	}	1241	}
1263		1242
1264	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1265	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1266	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1267	{	1246	{
1268	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1269	continue;	1248	continue;
1270	}	1249	}
1271		1250
1272	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1273	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1274	{	1253	{
1275	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1276	continue;	1255	continue;
1277	}	1256	}
1278		1257
1279	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1280	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1281	{	1260	{
1282	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1283	continue;	1262	continue;
1284	}	1263	}
1285		1264
1286	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1287	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1288	{	1267	{
1289	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1290	continue;	1269	continue;
1291	}	1270	}
1292		1271
1293	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1294	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1295	{	1274	{
1296	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1297	continue;	1276	continue;
1298	}	1277	}
1299		1278
1300	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1301	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1302	{	1281	{
1303	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1304	continue;	1283	continue;
1305	}	1284	}
1306		1285
1307	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1308	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1309	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1310	{	1289	{
1311	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1312	continue;	1291	continue;
1313	}	1292	}
1314		1293
1315	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1316	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1317	{	1296	{
1318	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1319	{	1298	{
1320	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 &&
1321	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1322	{	1301	{
1323	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1324	continue;	1303	continue;
1325	}	1304	}
1326	}	1305	}
1327		1306
1328	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1329	{	1308	{
1330	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)
1331	{	1310	{
1332	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1333	continue;	1312	continue;
1334	}	1313	}
1335	}	1314	}
1336	}	1315	}
1337		1316
1338	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1339	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1340	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1341	{	1320	{
1342	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1343	continue;	1322	continue;
1344	}	1323	}
1345		1324
1346	/* 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
1347	* pickups */	1326	* pickups */
…		…
1352	/* >=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
1353	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1354	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1355	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)
1356	{	1335	{
1357	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1358	#if 0	1337	#if 0
1359	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1360	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1361	{	1340	{
1362	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1363	}	1342	}
1364	else	1343	else
1365	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1366	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1367	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))));
1368	#endif	1347	#endif
1369	continue;	1348	continue;
1370	}	1349	}
…		…
1381	* found object is returned.	1360	* found object is returned.
1382	*/	1361	*/
1383	object *	1362	object *
1384	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1385	{	1364	{
1386	object *tmp = 0;
1387
1388	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1389	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1390	tmp = find_arrow (op, type);
1391	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);
1392	return op;	1374	return arrow;
		1375	}
1393		1376
1394	return tmp;	1377	return 0;
1395	}	1378	}
1396		1379
1397	/*	1380	/*
1398	* 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
1399	* 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
…		…
1440	else	1423	else
1441	{	1424	{
1442	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1443	{	1426	{
1444	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1445	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1446	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)
1447	{	1430	{
1448	tmp = arrow;	1431	tmp = arrow;
1449	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;
1450	}	1433	}
1451	}	1434	}
1452	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1453	{	1436	{
1454	tmp = arrow;	1437	tmp = arrow;
…		…
1547	*/	1530	*/
1548	int	1531	int
1549	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1532	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1550	{	1533	{
1551	object *left, *bow;	1534	object *left, *bow;
1552	int bowspeed, mflags;	1535	int mflags;
1553	maptile *m;	1536	maptile *m;
1554		1537
1555	if (!dir)	1538	if (!dir)
1556	{	1539	{
1557	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1540	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1558	return 0;	1541	return 0;
1559	}	1542	}
1560		1543
1561	if (player *pl = op->contr)	1544	if (op->contr)
1562	{	1545	bow = op->current_weapon;
1563	bow = pl->ranged_ob;
1564	op->set_weapon (bow);
1565	}
1566	else	1546	else
1567	{	1547	{
1568	for (bow = op->inv; bow; bow = bow->below)	1548	for (bow = op->inv; bow; bow = bow->below)
1569	/* Don't check for applied - monsters don't apply bows - in that way, they	1549	/* Don't check for applied - monsters don't apply bows - in that way, they
1570	* don't need to switch back and forth between bows and weapons.	1550	* don't need to switch back and forth between bows and weapons.
…		…
1591	{	1571	{
1592	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1572	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1593	return 0;	1573	return 0;
1594	}	1574	}
1595		1575
1596	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1597
1598	/* penalize ROF for bestarrow */
1599	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1600	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1601
1602	if (bowspeed < 1)
1603	bowspeed = 1;
1604
1605	if (arrow == NULL)	1576	if (arrow == NULL)
1606	{	1577	{
1607	if ((arrow = find_arrow (op, bow->race)) == NULL)	1578	if ((arrow = find_arrow (op, bow->race)) == NULL)
1608	{	1579	{
1609	if (op->type == PLAYER)	1580	if (op->type == PLAYER)
…		…
1632	arrow->destroy ();	1603	arrow->destroy ();
1633	return 0;	1604	return 0;
1634	}	1605	}
1635		1606
1636	left = arrow; /* these are arrows left to the player */	1607	left = arrow; /* these are arrows left to the player */
1637	arrow = get_split_ob (arrow, 1);	1608	arrow = arrow->split ();
1638	if (!arrow)	1609	if (!arrow)
1639	{	1610	{
1640	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);
1641	return 0;	1612	return 0;
1642	}	1613	}
…		…
1650	arrow->stats.grace = arrow->attacktype;	1621	arrow->stats.grace = arrow->attacktype;
1651		1622
1652	if (arrow->slaying)	1623	if (arrow->slaying)
1653	arrow->spellarg = strdup (arrow->slaying);	1624	arrow->spellarg = strdup (arrow->slaying);
1654		1625
		1626	#if 0
		1627	if (player *pl = op->contr)
		1628	{
		1629	float speed = pl->weapon_sp;
		1630
		1631	/* penalize ROF for bestarrow */
		1632	if (pl->bowtype == bow_bestarrow)
		1633	speed *= .9f;
		1634	else
		1635	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1636
		1637	op->speed_left += speed - op->speed;
		1638	}
		1639	#endif
		1640
		1641	SET_ANIMATION (arrow, arrow->direction);
		1642
		1643	/* update the speed */
		1644	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1645	+ bow->stats.dam / 7.f;
		1646
		1647	arrow->set_speed (max (arrow->speed, 2.f));
		1648	arrow->speed_left = 0;
		1649
		1650	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1651
1655	if (op->type == PLAYER)	1652	if (op->type == PLAYER)
1656	{	1653	{
1657	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1658	op->update_stats ();
1659	}
1660
1661	SET_ANIMATION (arrow, arrow->direction);
1662
1663	arrow->stats.dam += op->stats.dam + arrow->magic;
1664
1665	/* update the speed */
1666	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1667	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1668
1669	arrow->set_speed (max (arrow->speed, 1.0));
1670	arrow->speed_left = 0;
1671
1672	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1673
1674	if (op->type == PLAYER)
1675	{
1676	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1654	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1677	arrow->stats.wc -= dex_bonus[op->stats.Dex];	1655	wc -= dex_bonus[op->stats.Dex];
1678		1656
1679	if (!arrow->slaying)	1657	if (!arrow->slaying)
1680	arrow->slaying = op->slaying;	1658	arrow->slaying = op->slaying;
1681		1659
1682	arrow->attacktype |= op->attacktype;	1660	arrow->attacktype |= op->attacktype;
…		…
1690	arrow->slaying = bow->slaying;	1668	arrow->slaying = bow->slaying;
1691		1669
1692	arrow->attacktype |= bow->attacktype;	1670	arrow->attacktype |= bow->attacktype;
1693	}	1671	}
1694		1672
1695	arrow->stats.wc -= arrow->level;	1673	wc -= arrow->level;
		1674	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1696		1675
		1676	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1697	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1698	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1699		1679
1700	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	op->play_sound (sound_find ("fire_arrow"));
1701	m->insert (arrow, sx, sy, op);	1681	m->insert (arrow, sx, sy, op);
1702		1682
1703	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1704	move_arrow (arrow);	1684	move_arrow (arrow);
1705
1706	if (op->type == PLAYER)
1707	{
1708	if (left->destroyed ())
1709	esrv_del_item (op->contr, left->count);
1710	else
1711	esrv_send_item (op, left);
1712	}
1713		1685
1714	return 1;	1686	return 1;
1715	}	1687	}
1716		1688
1717	/* Special fire code for players - this takes into	1689	/* Special fire code for players - this takes into
…		…
1756	}	1728	}
1757		1729
1758	return ret;	1730	return ret;
1759	}	1731	}
1760		1732
1761
1762	/* Fires a misc (wand/rod/horn) object in 'dir'.	1733	/* Fires a misc (wand/rod/horn) object in 'dir'.
1763	* Broken apart from 'fire' to keep it more readable.	1734	* Broken apart from 'fire' to keep it more readable.
1764	*/	1735	*/
1765	void	1736	void
1766	fire_misc_object (object *op, int dir)	1737	fire_misc_object (object *op, int dir)
…		…
1777	{	1748	{
1778	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1749	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1779	return;	1750	return;
1780	}	1751	}
1781		1752
1782	op->set_weapon (item);	1753	if (!op->change_weapon (item))
		1754	return;
1783		1755
1784	if (item->type == WAND)	1756	if (item->type == WAND)
1785	{	1757	{
1786	if (item->stats.food <= 0)	1758	if (item->stats.food <= 0)
1787	{	1759	{
1788	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1760	op->contr->play_sound (sound_find ("wand_poof"));
1789	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));
1790		1762
1791	return;	1763	return;
1792	}	1764	}
1793	}	1765	}
1794	else if (item->type == ROD || item->type == HORN)	1766	else if (item->type == ROD || item->type == HORN)
1795	{	1767	{
1796	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1768	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1797	{	1769	{
1798	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1770	op->contr->play_sound (sound_find ("wand_poof"));
1799		1771
1800	if (item->type == ROD)	1772	if (item->type == ROD)
1801	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1802	else	1774	else
1803	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1775	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1816	object *tmp;	1788	object *tmp;
1817		1789
1818	if (item->arch)	1790	if (item->arch)
1819	{	1791	{
1820	CLEAR_FLAG (item, FLAG_ANIMATE);	1792	CLEAR_FLAG (item, FLAG_ANIMATE);
1821	item->face = item->arch->clone.face;	1793	item->face = item->arch->face;
1822	item->set_speed (0);	1794	item->set_speed (0);
1823	}	1795	}
1824		1796
1825	if ((tmp = item->in_player ()))	1797	if ((tmp = item->in_player ()))
1826	esrv_update_item (UPD_ANIM, tmp, item);	1798	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1831	}	1803	}
1832	}	1804	}
1833		1805
1834	/* Received a fire command for the player - go and do it.	1806	/* Received a fire command for the player - go and do it.
1835	*/	1807	*/
1836	void	1808	bool
1837	fire (object *op, int dir)	1809	fire (object *op, int dir)
1838	{	1810	{
1839	int spellcost = 0;	1811	int spellcost = 0;
1840		1812
1841	/* check for loss of invisiblity/hide */	1813	/* check for loss of invisiblity/hide */
…		…
1845	player *pl = op->contr;	1817	player *pl = op->contr;
1846		1818
1847	if (pl->golem)	1819	if (pl->golem)
1848	{	1820	{
1849	control_golem (op->contr->golem, dir);	1821	control_golem (op->contr->golem, dir);
1850	return;	1822	return false;
1851	}	1823	}
1852		1824
1853	object *ob = pl->ranged_ob;	1825	object *ob = pl->ranged_ob;
1854		1826
1855	if (!ob)	1827	if (!ob)
1856	return;	1828	return false;
		1829
		1830	if (!op->change_weapon (ob))
		1831	return false;
		1832
		1833	if (op->speed_left > 0.f)
		1834	--op->speed_left;
		1835	else
		1836	return false;
1857		1837
1858	switch (ob->type)	1838	switch (ob->type)
1859	{	1839	{
1860	case BOW:	1840	case BOW:
1861	player_fire_bow (op, dir);	1841	player_fire_bow (op, dir);
…		…
1868	case BUILDER:	1848	case BUILDER:
1869	apply_map_builder (op, dir);	1849	apply_map_builder (op, dir);
1870	break;	1850	break;
1871		1851
1872	case SKILL:	1852	case SKILL:
1873	case SKILL_TOOL:
1874	do_skill (op, op, ob, dir, 0);	1853	do_skill (op, op, ob, dir, 0);
1875	break;	1854	break;
1876		1855
1877	default:	1856	default:
1878	fire_misc_object (op, dir);	1857	fire_misc_object (op, dir);
1879	break;	1858	break;
1880	}	1859	}
		1860
		1861	return true;
1881	}	1862	}
1882		1863
1883	/* find_key	1864	/* find_key
1884	* We try to find a key for the door as passed. If we find a key	1865	* We try to find a key for the door as passed. If we find a key
1885	* and successfully use it, we return the key, otherwise NULL	1866	* and successfully use it, we return the key, otherwise NULL
…		…
1972	* 0 otherwise	1953	* 0 otherwise
1973	*/	1954	*/
1974	static int	1955	static int
1975	player_attack_door (object *op, object *door)	1956	player_attack_door (object *op, object *door)
1976	{	1957	{
1977	/* If its a door, try to find a use a key. If we do destroy the door,	1958	/* If its a door, try to find a key. If we do destroy the door,
1978	* might as well return immediately as there is nothing more to do -	1959	* might as well return immediately as there is nothing more to do -
1979	* otherwise, we fall through to the rest of the code.	1960	* otherwise, we fall through to the rest of the code.
1980	*/	1961	*/
1981	object *key = find_key (op, op, door);	1962	object *key = find_key (op, op, door);
1982		1963
1983	/* IF we found a key, do some extra work */	1964	/* If we found a key, do some extra work */
1984	if (key)	1965	if (key)
1985	{	1966	{
1986	object *container = key->env;	1967	object *container = key->env;
1987
1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989		1968
1990	if (action_makes_visible (op))	1969	if (action_makes_visible (op))
1991	make_visible (op);	1970	make_visible (op);
1992		1971
1993	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1972	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1995		1974
1996	if (door->type == DOOR)	1975	if (door->type == DOOR)
1997	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1976	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1998	else if (door->type == LOCKED_DOOR)	1977	else if (door->type == LOCKED_DOOR)
1999	{	1978	{
2000	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1979	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2001	remove_door2 (door); /* remove door without violence ;-) */	1980	remove_door2 (door); /* remove door without violence ;-) */
2002	}	1981	}
2003		1982
2004	/* Do this after we print the message */	1983	/* Do this after we print the message */
2005	decrease_ob (key); /* Use up one of the keys */	1984	key->decrease (); /* Use up one of the keys */
2006	/* Need to update the weight the container the key was in */	1985	/* Need to update the weight the container the key was in */
2007	if (container != op)	1986	if (container != op)
2008	esrv_update_item (UPD_WEIGHT, op, container);	1987	esrv_update_item (UPD_WEIGHT, op, container);
2009		1988
2010	return 1; /* Nothing more to do below */	1989	return 1; /* Nothing more to do below */
2011	}	1990	}
2012	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
2013	{	1992	{
2014	/* Might as well return now - no other way to open this */	1993	/* Might as well return now - no other way to open this */
2015	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1994	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2016	return 1;	1995	return 1;
2017	}	1996	}
2018		1997
2019	return 0;	1998	return 0;
2020	}	1999	}
…		…
2023	* It should keep the code cleaner.	2002	* It should keep the code cleaner.
2024	* When this is called, the players direction has been updated	2003	* When this is called, the players direction has been updated
2025	* (taking into account confusion.) The player is also actually	2004	* (taking into account confusion.) The player is also actually
2026	* going to try and move (not fire weapons).	2005	* going to try and move (not fire weapons).
2027	*/	2006	*/
2028	void	2007	bool
2029	move_player_attack (object *op, int dir)	2008	move_player_attack (object *op, int dir)
2030	{	2009	{
2031	object *tmp, *mon;
2032	int on_battleground;	2010	int on_battleground;
2033	maptile *m;
2034		2011
2035	sint16 nx = freearr_x[dir] + op->x;	2012	sint16 nx = freearr_x[dir] + op->x;
2036	sint16 ny = freearr_y[dir] + op->y;	2013	sint16 ny = freearr_y[dir] + op->y;
2037		2014
2038	on_battleground = op_on_battleground (op, 0, 0);	2015	on_battleground = op_on_battleground (op, 0, 0);
		2016
		2017	if (out_of_map (op->map, nx, ny))
		2018	return false;
		2019
		2020	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2021	{
		2022	--op->speed_left;
		2023	return true;
		2024	}
2039		2025
2040	/* If braced, or can't move to the square, and it is not out of the	2026	/* If braced, or can't move to the square, and it is not out of the
2041	* map, attack it. Note order of if statement is important - don't	2027	* map, attack it. Note order of if statement is important - don't
2042	* want to be calling move_ob if braced, because move_ob will move the	2028	* want to be calling move_ob if braced, because move_ob will move the
2043	* player. This is a pretty nasty hack, because if we could	2029	* player. This is a pretty nasty hack, because if we could
2044	* move to some space, it then means that if we are braced, we should	2030	* move to some space, it then means that if we are braced, we should
2045	* do nothing at all. As it is, if we are braced, we go through	2031	* do nothing at all. As it is, if we are braced, we go through
2046	* quite a bit of processing. However, it probably is less than what	2032	* quite a bit of processing. However, it probably is less than what
2047	* move_ob uses.	2033	* move_ob uses.
2048	*/	2034	*/
2049	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2050	{
2051	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2052	{
2053	m = op->map->xy_find (nx, ny);	2035	maptile *m = op->map->xy_find (nx, ny);
2054	if (!m)
2055	return; /* Don't think this should happen */
2056	}
2057	else
2058	m = op->map;
2059		2036
2060	if (!(tmp = m->at (nx, ny).bot))
2061	return;
2062
2063	mon = 0;
2064	/* Go through all the objects, and find ones of interest. Only stop if	2037	/* Go through all the objects, and find ones of interest. Only stop if
2065	* we find a monster - that is something we know we want to attack.	2038	* we find a monster - that is something we know we want to attack.
2066	* if its a door or barrel (can roll) see if there may be monsters	2039	* if its a door or barrel (can roll) see if there may be monsters
2067	* on the space	2040	* on the space
2068	*/	2041	*/
2069	while (tmp)	2042	object *mon;
2070	{	2043	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2071	if (tmp == op)	2044	{
2072	{	2045	if ((mon->flag [FLAG_ALIVE]
2073	tmp = tmp->above;	2046	|| mon->type == LOCKED_DOOR
2074	continue;	2047	|| mon->flag [FLAG_CAN_ROLL])
2075	}
2076
2077	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2078	{
2079	mon = tmp;	2048	&& mon != op)
2080	break;	2049	break;
2081	}	2050	}
2082		2051
2083	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2084	mon = tmp;
2085
2086	tmp = tmp->above;
2087	}
2088
2089	if (!mon) /* This happens anytime the player tries to move */	2052	if (!mon) /* This happens anytime the player tries to move */
2090	return; /* into a wall */	2053	return false; /* into a wall */
2091		2054
2092	if (mon->head)
2093	mon = mon->head;	2055	mon = mon->head_ ();
2094		2056
2095	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2057	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2058	if (op->contr->weapon_sp_left > 0.f)
2096	if (player_attack_door (op, mon))	2059	if (player_attack_door (op, mon))
		2060	{
		2061	--op->contr->weapon_sp_left;
2097	return;	2062	return true;
		2063	}
2098		2064
2099	/* The following deals with possibly attacking peaceful	2065	/* The following deals with possibly attacking peaceful
2100	* or frienddly creatures. Basically, all players are considered	2066	* or friendly creatures. Basically, all players are considered
2101	* unaggressive. If the moving player has peaceful set, then the	2067	* unaggressive. If the moving player has peaceful set, then the
2102	* object should be pushed instead of attacked. It is assumed that	2068	* object should be pushed instead of attacked. It is assumed that
2103	* if you are braced, you will not attack friends accidently,	2069	* if you are braced, you will not attack friends accidently,
2104	* and thus will not push them.	2070	* and thus will not push them.
2105	*/	2071	*/
2106		2072
2107	/* If the creature is a pet, push it even if the player is not	2073	/* If the creature is a pet, push it even if the player is not
2108	* peaceful. Our assumption is the creature is a pet if the	2074	* peaceful. Our assumption is the creature is a pet if the
2109	* player owns it and it is either friendly or unagressive.	2075	* player owns it and it is either friendly or unagressive.
2110	*/	2076	*/
2111	if ((op->type == PLAYER)	2077	if (op->type == PLAYER
2112	#if COZY_SERVER
2113	&&
2114	((mon->owner && mon->owner->contr	2078	&& ((mon->owner && mon->owner->contr
2115	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2079	&& same_party (mon->owner->contr->party, op->contr->party))
2116	#else
2117	&& mon->owner == op	2080	|| mon->owner == op)
2118	#endif
2119	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2081	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2120	{	2082	{
2121	/* If we're braced, we don't want to switch places with it */	2083	/* If we're braced, we don't want to switch places with it */
2122	if (op->contr->braced)	2084	if (op->contr->braced)
2123	return;	2085	return false;
2124		2086
2125	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2087	if (op->speed_left > 0.f)
		2088	{
		2089	--op->speed_left;
		2090
		2091	op->play_sound (sound_find ("push_player"));
2126	push_ob (mon, dir, op);	2092	push_ob (mon, dir, op);
		2093
2127	if (op->contr->tmp_invis || op->hide)	2094	if (op->contr->tmp_invis || op->hide)
2128	make_visible (op);	2095	make_visible (op);
2129		2096
2130	return;	2097	return true;
2131	}	2098	}
		2099	else
		2100	return false;
		2101	}
2132		2102
2133	/* in certain circumstances, you shouldn't attack friendly	2103	/* in certain circumstances, you shouldn't attack friendly
2134	* creatures. Note that if you are braced, you can't push	2104	* creatures. Note that if you are braced, you can't push
2135	* someone, but put it inside this loop so that you won't	2105	* someone, but put it inside this loop so that you won't
2136	* attack them either.	2106	* attack them either.
2137	*/	2107	*/
2138	if ((mon->type == PLAYER || mon->enemy != op) &&	2108	if ((mon->type == PLAYER || mon->enemy != op)
2139	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2109	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2140	#ifdef PROHIBIT_PLAYERKILL
2141	(op->contr->peaceful	2110	&& ((op->contr->peaceful
2142	|| (mon->type == PLAYER	2111	|| (mon->type == PLAYER && mon->contr->peaceful))
2143	&& mon->contr->
2144	peaceful)) &&
2145	#else
2146	op->contr->peaceful &&
2147	#endif
2148	!on_battleground))	2112	&& !on_battleground))
		2113	{
		2114	if (op->speed_left > 0.f)
2149	{	2115	{
		2116	--op->speed_left;
		2117
2150	if (!op->contr->braced)	2118	if (!op->contr->braced)
2151	{	2119	{
2152	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2120	op->play_sound (sound_find ("push_player"));
2153	push_ob (mon, dir, op);	2121	push_ob (mon, dir, op);
2154	}	2122	}
2155	else	2123	else
2156	new_draw_info (0, 0, op, "You withhold your attack");	2124	op->statusmsg ("You withhold your attack");
2157		2125
2158	if (op->contr->tmp_invis || op->hide)	2126	if (op->contr->tmp_invis || op->hide)
2159	make_visible (op);	2127	make_visible (op);
2160	}
2161		2128
		2129	return true;
		2130	}
		2131	}
2162	/* If the object is a boulder or other rollable object, then	2132	/* If the object is a boulder or other rollable object, then
2163	* roll it if not braced. You can't roll it if you are braced.	2133	* roll it if not braced. You can't roll it if you are braced.
2164	*/	2134	*/
2165	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2135	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2136	{
		2137	if (op->speed_left > 0.f)
2166	{	2138	{
		2139	--op->speed_left;
		2140
2167	recursive_roll (mon, dir, op);	2141	recursive_roll (mon, dir, op);
2168	if (action_makes_visible (op))	2142	if (action_makes_visible (op))
2169	make_visible (op);	2143	make_visible (op);
2170	}
2171		2144
		2145	return true;
		2146	}
		2147	}
2172	/* Any generic living creature. Including things like doors.	2148	/* Any generic living creature. Including things like doors.
2173	* Way it works is like this: First, it must have some hit points	2149	* Way it works is like this: First, it must have some hit points
2174	* and be living. Then, it must be one of the following:	2150	* and be living. Then, it must be one of the following:
2175	* 1) Not a player, 2) A player, but of a different party. Note	2151	* 1) Not a player, 2) A player, but of a different party. Note
2176	* that party_number -1 is no party, so attacks can still happen.	2152	* that party_number -1 is no party, so attacks can still happen.
2177	*/	2153	*/
2178	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2154	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2179	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2155	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2180	{	2156	{
2181		2157	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2182	/* If the player hasn't hit something this tick, and does
2183	* so, give them speed boost based on weapon speed. Doing
2184	* it here is better than process_players2, which basically
2185	* incurred a 1 tick offset.
2186	*/
2187	if (!op->contr->has_hit)
2188	{	2158	{
2189	op->speed_left += op->speed / op->contr->weapon_sp;	2159	--op->contr->weapon_sp_left;
2190
2191	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2192	}
2193		2160
2194	skill_attack (mon, op, 0, 0, 0);	2161	skill_attack (mon, op, 0, 0, 0);
2195
2196	/* If attacking another player, that player gets automatic
2197	* hitback, and doesn't loose luck either.
2198	* Disable hitback on the battleground or if the target is
2199	* the wiz.
2200	*/
2201	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2202	{
2203	short luck = mon->stats.luck;
2204
2205	mon->contr->has_hit = 1;
2206	skill_attack (op, mon, 0, 0, 0);
2207	mon->stats.luck = luck;
2208	}
2209		2162
2210	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2211	make_visible (op);	2164	make_visible (op);
2212	}
2213	} /* if player should attack something */
2214	}
2215		2165
2216	int	2166	return true;
		2167	}
		2168	}
		2169
		2170	return false;
		2171	}
		2172
		2173	bool
2217	move_player (object *op, int dir)	2174	move_player (object *op, int dir)
2218	{	2175	{
2219	int pick;	2176	int pick;
2220		2177
2221	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2178	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2222	return 0;	2179	return 0;
2223		2180
2224	/* Sanity check: make sure dir is valid */	2181	/* Sanity check: make sure dir is valid */
2225	if ((dir < 0) || (dir >= 9))	2182	if ((dir < 0) || (dir >= 9))
2226	{	2183	{
…		…
2235	op->facing = dir;	2192	op->facing = dir;
2236		2193
2237	if (op->hide)	2194	if (op->hide)
2238	do_hidden_move (op);	2195	do_hidden_move (op);
2239		2196
		2197	bool retval;
		2198
2240	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2199	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2241	/*nop */ ;	2200	retval = RESULT_INT (0);
2242	else if (op->contr->fire_on)	2201	else if (op->contr->fire_on)
2243	fire (op, dir);	2202	retval = fire (op, dir);
2244	else	2203	else
2245	{	2204	{
2246	move_player_attack (op, dir);	2205	retval = move_player_attack (op, dir);
2247	pick = check_pick (op);	2206	pick = check_pick (op);
2248	}	2207	}
2249		2208
2250	/* Add special check for newcs players and fire on - this way, the	2209	/* Add special check for newcs players and fire on - this way, the
2251	* server can handle repeat firing.	2210	* server can handle repeat firing.
…		…
2258	/* Update how the player looks. Use the facing, so direction may	2217	/* Update how the player looks. Use the facing, so direction may
2259	* get reset to zero. This allows for full animation capabilities	2218	* get reset to zero. This allows for full animation capabilities
2260	* for players.	2219	* for players.
2261	*/	2220	*/
2262	animate_object (op, op->facing);	2221	animate_object (op, op->facing);
2263	return 0;	2222
		2223	return retval;
2264	}	2224	}
2265		2225
2266	/* This is similar to handle_player, below, but is only used by the	2226	/* This is similar to handle_player, below, but is only used by the
2267	* new client/server stuff.	2227	* new client/server stuff.
2268	* This is sort of special, in that the new client/server actually uses	2228	* This is sort of special, in that the new client/server actually uses
2269	* the new speed values for commands.	2229	* the new speed values for commands.
2270	*	2230	*
2271	* Returns true if there are more actions we can do.	2231	* Returns true if there are more actions we can do. Should not do
		2232	* many actions in a row, as that would be too unfair to other
		2233	* players.
2272	*/	2234	*/
2273	int	2235	bool
2274	handle_newcs_player (object *op)	2236	handle_newcs_player (object *op)
2275	{	2237	{
2276	if (QUERY_FLAG (op, FLAG_SCARED))	2238	if (QUERY_FLAG (op, FLAG_SCARED))
2277	{	2239	{
2278	flee_player (op);	2240	if (op->speed_left > 0.f)
2279	/* If player is still scared, that is his action for this tick */
2280	if (QUERY_FLAG (op, FLAG_SCARED))
2281	{	2241	{
2282	op->speed_left--;	2242	--op->speed_left;
		2243	flee_player (op);
		2244
2283	return 0;	2245	return true;
2284	}	2246	}
		2247	else
		2248	return false;
2285	}	2249	}
2286		2250
2287	/* call this here - we also will call this in do_ericserver, but	2251	/* call this here - we also will call this in do_ericserver, but
2288	* the players time has been increased when doericserver has been	2252	* the players time has been increased when doericserver has been
2289	* called, so we recheck it here.	2253	* called, so we recheck it here.
2290	*/	2254	*/
2291	if (op->contr->ns->handle_command ())	2255	if (op->contr->ns->handle_command ())
2292	return 1;	2256	return true;
2293		2257
2294	if (op->speed_left > 0)
2295	{
2296	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2258	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2297	{
2298	/* All move commands take 1 tick, at least for now */
2299	op->speed_left--;
2300
2301	/* Instead of all the stuff below, let move_player take care
2302	* of it. Also, some of the skill stuff is only put in
2303	* there, as well as the confusion stuff.
2304	*/
2305	move_player (op, op->direction);	2259	return move_player (op, op->direction);
2306		2260
2307	return op->speed_left > 0;
2308	}
2309	}
2310
2311	return 0;	2261	return false;
2312	}	2262	}
2313		2263
2314	int	2264	int
2315	save_life (object *op)	2265	save_life (object *op)
2316	{	2266	{
…		…
2318	return 0;	2268	return 0;
2319		2269
2320	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2270	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2321	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2271	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2322	{	2272	{
2323	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2273	op->play_sound (sound_find ("ob_evaporate"));
2324	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2274	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2325		2275
2326	if (op->contr)	2276	if (op->contr)
2327	esrv_del_item (op->contr, tmp->count);	2277	esrv_del_item (op->contr, tmp->count);
2328		2278
…		…
2348	/* This goes throws the inventory and removes unpaid objects, and puts them	2298	/* This goes throws the inventory and removes unpaid objects, and puts them
2349	* back in the map (location and map determined by values of env). This	2299	* back in the map (location and map determined by values of env). This
2350	* function will descend into containers. op is the object to start the search	2300	* function will descend into containers. op is the object to start the search
2351	* from.	2301	* from.
2352	*/	2302	*/
2353	void	2303	static void
2354	remove_unpaid_objects (object *op, object *env)	2304	drop_unpaid_items (object *op, object *env)
2355	{	2305	{
2356	while (op)	2306	while (op)
2357	{	2307	{
2358	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2308	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2359		2309
…		…
2363	esrv_del_item (env->contr, op->count);	2313	esrv_del_item (env->contr, op->count);
2364		2314
2365	op->insert_at (env);	2315	op->insert_at (env);
2366	}	2316	}
2367	else if (op->inv)	2317	else if (op->inv)
2368	remove_unpaid_objects (op->inv, env);	2318	drop_unpaid_items (op->inv, env);
2369		2319
2370	op = next;	2320	op = next;
2371	}	2321	}
		2322	}
		2323
		2324	void
		2325	object::drop_unpaid_items ()
		2326	{
		2327	if (!flag [FLAG_REMOVED])
		2328	::drop_unpaid_items (inv, this);
2372	}	2329	}
2373		2330
2374	/*	2331	/*
2375	* Returns pointer a static string containing gravestone text	2332	* Returns pointer a static string containing gravestone text
2376	* Moved from apply.c to player.c - player.c is what	2333	* Moved from apply.c to player.c - player.c is what
…		…
2471	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2428	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2472	else	2429	else
2473	{	2430	{
2474	gen_grace = op->stats.maxgrace;	2431	gen_grace = op->stats.maxgrace;
2475	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2432	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476	}
2477
2478	/* Regenerate Spell Points */
2479	if (!op->contr->golem && --op->last_sp < 0)
2480	{
2481	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2482	if (op->stats.sp < op->stats.maxsp)
2483	{
2484	op->stats.sp++;
2485	/* dms do not consume food */
2486	if (!QUERY_FLAG (op, FLAG_WIZ))
2487	{
2488	op->stats.food--;
2489	if (op->contr->digestion < 0)
2490	op->stats.food += op->contr->digestion;
2491	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2492	op->stats.food = last_food;
2493	}
2494	}
2495
2496	if (max_sp > 1)
2497	{
2498	over_sp = (gen_sp + 10) / rate_sp;
2499	if (over_sp > 0)
2500	{
2501	if (op->stats.sp < op->stats.maxsp)
2502	{
2503	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2504
2505	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2506	op->stats.sp--;
2507
2508	if (op->stats.sp > op->stats.maxsp)
2509	op->stats.sp = op->stats.maxsp;
2510	}
2511	op->last_sp = 0;
2512	}
2513	else
2514	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2515	}
2516	else
2517	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2518	}	2433	}
2519		2434
2520	/* Regenerate Grace */	2435	/* Regenerate Grace */
2521	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2436	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2522	if (--op->last_grace < 0)	2437	if (--op->last_grace < 0)
…		…
2543	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2458	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2544	}	2459	}
2545	/* wearing stuff doesn't detract from grace generation. */	2460	/* wearing stuff doesn't detract from grace generation. */
2546	}	2461	}
2547		2462
		2463	if (op->stats.food > 0)
		2464	{
2548	/* Regenerate Hit Points */	2465	/* Regenerate Spell Points */
2549	if (--op->last_heal < 0)	2466	if (!op->contr->golem && --op->last_sp < 0)
2550	{
2551	if (op->stats.hp < op->stats.maxhp)
2552	{	2467	{
2553	op->stats.hp++;	2468	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2554	/* dms do not consume food */	2469
2555	if (!QUERY_FLAG (op, FLAG_WIZ))	2470	if (op->stats.sp < op->stats.maxsp)
2556	{	2471	{
		2472	op->stats.sp++;
		2473
		2474	/* dms do not consume food */
		2475	if (!QUERY_FLAG (op, FLAG_WIZ))
		2476	{
2557	op->stats.food--;	2477	op->stats.food--;
		2478
2558	if (op->contr->digestion < 0)	2479	if (op->contr->digestion < 0)
2559	op->stats.food += op->contr->digestion;	2480	op->stats.food += op->contr->digestion;
2560	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2481	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2561	op->stats.food = last_food;	2482	op->stats.food = last_food;
		2483	}
2562	}	2484	}
2563	}
2564		2485
2565	if (max_hp > 1)	2486	if (max_sp > 1)
2566	{
2567	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2568	if (over_hp > 0)
2569	{	2487	{
2570	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2488	over_sp = (gen_sp + 10) / rate_sp;
		2489	if (over_sp > 0)
		2490	{
		2491	if (op->stats.sp < op->stats.maxsp)
		2492	{
		2493	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2494
		2495	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2496	op->stats.sp--;
		2497
		2498	if (op->stats.sp > op->stats.maxsp)
		2499	op->stats.sp = op->stats.maxsp;
		2500	}
		2501
2571	op->last_heal = 0;	2502	op->last_sp = 0;
		2503	}
		2504	else
		2505	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2572	}	2506	}
2573	else	2507	else
		2508	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2509	}
		2510
		2511	/* Regenerate Hit Points */
		2512	if (--op->last_heal < 0)
		2513	{
		2514	if (op->stats.hp < op->stats.maxhp)
2574	{	2515	{
2575	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2516	op->stats.hp++;
		2517
		2518	/* dms do not consume food */
		2519	if (!QUERY_FLAG (op, FLAG_WIZ))
		2520	{
		2521	op->stats.food--;
		2522
		2523	if (op->contr->digestion < 0)
		2524	op->stats.food += op->contr->digestion;
		2525	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2526	op->stats.food = last_food;
		2527	}
2576	}	2528	}
		2529
		2530	if (max_hp > 1)
		2531	{
		2532	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2533
		2534	if (over_hp > 0)
		2535	{
		2536	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2537	op->last_heal = 0;
		2538	}
		2539	else
		2540	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2577	}	2541	}
2578	else	2542	else
2579	{
2580	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2543	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2581	}	2544	}
2582	}	2545	}
2583		2546
2584	/* Digestion */	2547	/* Digestion */
2585	if (--op->last_eat < 0)	2548	if (--op->last_eat < 0)
2586	{	2549	{
2587	#ifdef COZY_SERVER	2550	int bonus = max (0, op->contr->digestion),
2588	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2551	penalty = max (0, -op->contr->digestion);
2589	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2590	#else
2591	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2592	#endif
2593		2552
2594	if (op->contr->gen_hp > 0)
2595	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2553	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2596	else
2597	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2598		2554
2599	/* dms do not consume food */	2555	/* dms do not consume food */
2600	if (!QUERY_FLAG (op, FLAG_WIZ))	2556	if (!QUERY_FLAG (op, FLAG_WIZ))
2601	op->stats.food--;	2557	op->stats.food--;
2602	}	2558	}
…		…
2629	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2585	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2630	manual_apply (op, flesh, 0);	2586	manual_apply (op, flesh, 0);
2631	}	2587	}
2632	}	2588	}
2633		2589
2634	while (op->stats.food < 0 && op->stats.hp >= 0)	2590	if (op->stats.food < 0)
2635	op->stats.food++, op->stats.hp--;	2591	{
		2592	op->stats.hp += op->stats.food;
		2593	op->stats.food = 0;
		2594	}
2636		2595
2637	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2596	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2638	kill_player (op);	2597	kill_player (op);
2639	}	2598	}
2640	}	2599	}
…		…
2645	* file.	2604	* file.
2646	*/	2605	*/
2647	void	2606	void
2648	kill_player (object *op)	2607	kill_player (object *op)
2649	{	2608	{
		2609	int x, y;
2650	char buf[MAX_BUF];	2610	char buf[MAX_BUF];
2651	int x, y;
2652
2653	//int i;
2654	maptile *map; /* this is for resurrection */	2611	maptile *map; /* this is for resurrection */
2655
2656	/* int z;
2657	int num_stats_lose;
2658	int lost_a_stat;
2659	int lose_this_stat;
2660	int this_stat; */
2661	int will_kill_again;	2612	int will_kill_again;
2662	archetype *at;	2613	archetype *at;
2663	object *tmp;	2614	object *tmp;
2664		2615
2665	if (save_life (op))	2616	if (save_life (op))
2666	return;	2617	return;
2667
2668		2618
2669	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2619	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2670	* in cities ONLY!!! It is very important that this doesn't get abused.	2620	* in cities ONLY!!! It is very important that this doesn't get abused.
2671	* Look at op_on_battleground() for more info --AndreasV	2621	* Look at op_on_battleground() for more info --AndreasV
2672	*/	2622	*/
…		…
2688	{	2638	{
2689	tmp->destroy ();	2639	tmp->destroy ();
2690	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2640	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2691	}	2641	}
2692		2642
2693	cure_disease (op, 0); /* remove any disease */	2643	cure_disease (op, 0, 0); /* remove any disease */
2694	op->stats.hp = op->stats.maxhp;	2644	op->stats.hp = op->stats.maxhp;
2695	if (op->stats.food <= 0)	2645	if (op->stats.food <= 0)
2696	op->stats.food = 999;	2646	op->stats.food = 999;
2697		2647
2698	/* create a bodypart-trophy to make the winner happy */	2648	/* create a bodypart-trophy to make the winner happy */
2699	if (object *tmp = arch_to_object (archetype::find ("finger")))	2649	if (object *tmp = arch_to_object (archetype::find ("finger")))
2700	{	2650	{
2701	sprintf (buf, "%s's finger", &op->name);	2651	tmp->name = format ("%s's finger" , &op->name);
2702	tmp->name = buf;	2652	tmp->name_pl = format ("%s's fingers", &op->name);
2703	sprintf (buf, " This finger has been cut off %s\n"	2653	tmp->msg = format (
2704	" the %s, when he was defeated at\n level %d by %s.\n",	2654	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2705	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2655	&op->name, op->contr->title, (int) (op->level), op->contr->killer
2706	tmp->msg = buf;	2656	);
2707	tmp->value = 0, tmp->type = 0;	2657	tmp->value = 0, tmp->type = 0;
2708	tmp->materialname = "organics";	2658	tmp->materialname = "organics";
2709	tmp->insert_at (op, tmp);	2659	tmp->insert_at (op, tmp);
2710	}	2660	}
2711		2661
…		…
2718	INVOKE_PLAYER (DEATH, op->contr);	2668	INVOKE_PLAYER (DEATH, op->contr);
2719		2669
2720	command_kill_pets (op, 0);	2670	command_kill_pets (op, 0);
2721		2671
2722	if (op->stats.food < 0)	2672	if (op->stats.food < 0)
2723	{
2724	sprintf (buf, "%s starved to death.", &op->name);
2725	strcpy (op->contr->killer, "starvation");	2673	strcpy (op->contr->killer, "starvation");
2726	}
2727	else
2728	sprintf (buf, "%s died.", &op->name);
2729		2674
2730	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2675	op->contr->play_sound (sound_find ("player_dies"));
2731		2676
2732	/* save the map location for corpse, gravestone */	2677	/* save the map location for corpse, gravestone */
2733	x = op->x;	2678	x = op->x;
2734	y = op->y;	2679	y = op->y;
2735	map = op->map;	2680	map = op->map;
…		…
2898	{	2843	{
2899	tmp->destroy ();	2844	tmp->destroy ();
2900	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2845	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2901	}	2846	}
2902		2847
2903	cure_disease (op, 0); /* remove any disease */	2848	cure_disease (op, 0, 0); /* remove any disease */
2904		2849
2905	/*add_exp(op, (op->stats.exp * -0.20)); */	2850	/*add_exp(op, (op->stats.exp * -0.20)); */
2906	apply_death_exp_penalty (op);	2851	apply_death_exp_penalty (op);
2907	if (op->stats.food < 100)	2852	if (op->stats.food < 100)
2908	op->stats.food = 900;	2853	op->stats.food = 900;
…		…
2912		2857
2913	/*	2858	/*
2914	* Check to see if the player has any unpaid items. If so, remove them	2859	* Check to see if the player has any unpaid items. If so, remove them
2915	* and put them back in the map.	2860	* and put them back in the map.
2916	*/	2861	*/
2917	remove_unpaid_objects (op->inv, op);	2862	op->drop_unpaid_items ();
2918		2863
2919	/****************************************/	2864	/****************************************/
2920	/* */	2865	/* */
2921	/* Move player to his current respawn- */	2866	/* Move player to his current respawn- */
2922	/* position (usually last savebed) */	2867	/* position (usually last savebed) */
…		…
2942	object *force;	2887	object *force;
2943	int at;	2888	int at;
2944		2889
2945	force = get_archetype (FORCE_NAME);	2890	force = get_archetype (FORCE_NAME);
2946	/* 50 ticks should be enough time for the spell to abate */	2891	/* 50 ticks should be enough time for the spell to abate */
2947	force->speed = 0.1;	2892	force->speed = 0.1f;
2948	force->speed_left = -5.0;	2893	force->speed_left = -5.f;
2949	SET_FLAG (force, FLAG_APPLIED);	2894	SET_FLAG (force, FLAG_APPLIED);
2950	for (at = 0; at < NROFATTACKS; at++)	2895	for (at = 0; at < NROFATTACKS; at++)
2951	if (will_kill_again & (1 << at))	2896	if (will_kill_again & (1 << at))
2952	force->resist[at] = 100;	2897	force->resist[at] = 100;
2953		2898
…		…
2981		2926
2982	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2927	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2983	{	2928	{
2984	if (tmp->nrof > 1)	2929	if (tmp->nrof > 1)
2985	{	2930	{
2986	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2931	tmp->decrease (rndm (1, tmp->nrof - 1));
2987	tmp2->destroy ();
2988	insert_ob_in_map (tmp, op->map, NULL, 0);	2932	insert_ob_in_map (tmp, op->map, NULL, 0);
2989	}	2933	}
2990	else	2934	else
2991	tmp->destroy ();	2935	tmp->destroy ();
2992	}	2936	}
…		…
3003	void	2947	void
3004	fix_weight (void)	2948	fix_weight (void)
3005	{	2949	{
3006	for_all_players (pl)	2950	for_all_players (pl)
3007	{	2951	{
3008	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2952	sint32 old = pl->ob->carrying;
3009		2953
3010	if (old == sum)	2954	pl->ob->update_weight ();
3011	continue;	2955
		2956	if (old != pl->ob->carrying)
		2957	{
3012	pl->ob->update_stats ();	2958	pl->ob->update_stats ();
3013	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2959	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2960	}
3014	}	2961	}
3015	}	2962	}
3016		2963
3017	void	2964	void
3018	fix_luck (void)	2965	fix_luck (void)
…		…
3062	void	3009	void
3063	make_visible (object *op)	3010	make_visible (object *op)
3064	{	3011	{
3065	op->hide = 0;	3012	op->hide = 0;
3066	op->invisible = 0;	3013	op->invisible = 0;
		3014
3067	if (op->type == PLAYER)	3015	if (op->type == PLAYER)
3068	{	3016	{
3069	op->contr->tmp_invis = 0;	3017	op->contr->tmp_invis = 0;
3070	op->contr->invis_race = 0;	3018	op->contr->invis_race = 0;
3071	}	3019	}
…		…
3074	}	3022	}
3075		3023
3076	int	3024	int
3077	is_true_undead (object *op)	3025	is_true_undead (object *op)
3078	{	3026	{
3079	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3027	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3080	return 1;	3028	return 1;
3081		3029
3082	return 0;	3030	return 0;
3083	}	3031	}
3084		3032
3085	/* look at the surrounding terrain to determine	3033	/* look at the surrounding terrain to determine
3086	* the hideability of this object. Positive levels	3034	* the hideability of this object. Positive levels
3087	* indicate greater hideability.	3035	* indicate greater hideability.
3088	*/	3036	*/
3089
3090	int	3037	int
3091	hideability (object *ob)	3038	hideability (object *ob)
3092	{	3039	{
3093	int i, level = 0, mflag;	3040	int i, level = 0, mflag;
3094	sint16 x, y;	3041	sint16 x, y;
…		…
3104	* as bad as carrying a light on a pitch dark map */	3051	* as bad as carrying a light on a pitch dark map */
3105	if (has_carried_lights (ob))	3052	if (has_carried_lights (ob))
3106	level = -(10 + (2 * ob->map->darkness));	3053	level = -(10 + (2 * ob->map->darkness));
3107		3054
3108	/* scan through all nearby squares for terrain to hide in */	3055	/* scan through all nearby squares for terrain to hide in */
3109	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3056	for (i = 0, x = ob->x, y = ob->y;
		3057	i <= SIZEOFFREE1;
		3058	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3110	{	3059	{
3111	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3060	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3112	if (mflag & P_OUT_OF_MAP)	3061	if (mflag & P_OUT_OF_MAP)
3113	{
3114	continue;	3062	continue;
3115	}	3063
3116	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3064	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3117	level += 2;	3065	level += 2;
3118	else /* open terrain! */	3066	else /* open terrain! */
3119	level -= 1;	3067	level -= 1;
3120	}	3068	}
…		…
3128	/* For Hidden creatures - a chance of becoming 'unhidden'	3076	/* For Hidden creatures - a chance of becoming 'unhidden'
3129	* every time they move - as we subtract off 'invisibility'	3077	* every time they move - as we subtract off 'invisibility'
3130	* AND, for players, if they move into a ridiculously unhideable	3078	* AND, for players, if they move into a ridiculously unhideable
3131	* spot (surrounded by clear terrain in broad daylight). -b.t.	3079	* spot (surrounded by clear terrain in broad daylight). -b.t.
3132	*/	3080	*/
3133
3134	void	3081	void
3135	do_hidden_move (object *op)	3082	do_hidden_move (object *op)
3136	{	3083	{
3137	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3084	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3138	object *skop;	3085	object *skop;
…		…
3220	* object op. This function works fine for monsters,	3167	* object op. This function works fine for monsters,
3221	* but we dont worry if the object isnt the top one in	3168	* but we dont worry if the object isnt the top one in
3222	* a pile (say a coin under a table would return "viewable"	3169	* a pile (say a coin under a table would return "viewable"
3223	* by this routine). Another question, should we be	3170	* by this routine). Another question, should we be
3224	* concerned with the direction the player is looking	3171	* concerned with the direction the player is looking
3225	* in? Realistically, most of use cant see stuff behind	3172	* in? Realistically, most of us can't see stuff behind
3226	* our backs...on the other hand, does the "facing" direction	3173	* our backs...on the other hand, does the "facing" direction
3227	* imply the way your head, or body is facing? Its possible	3174	* imply the way your head, or body is facing? It's possible
3228	* for them to differ. Sigh, this fctn could get a bit more complex.	3175	* for them to differ. Sigh, this fctn could get a bit more complex.
3229	* -b.t.	3176	* -b.t.
3230	* This function is now map tiling safe.	3177	* This function is now map tiling safe.
3231	*/	3178	*/
3232
3233	int	3179	int
3234	player_can_view (object *pl, object *op)	3180	player_can_view (object *pl, object *op)
3235	{	3181	{
3236	rv_vector rv;	3182	rv_vector rv;
3237	int dx, dy;	3183	int dx, dy;
…		…
3249		3195
3250	get_rangevector (pl, op, &rv, 0x1);	3196	get_rangevector (pl, op, &rv, 0x1);
3251		3197
3252	/* starting with the 'head' part, lets loop	3198	/* starting with the 'head' part, lets loop
3253	* through the object and find if it has any	3199	* through the object and find if it has any
3254	* part that is in the los array but isnt on	3200	* part that is in the los array but isn't on
3255	* a blocked los square.	3201	* a blocked los square.
3256	* we use the archetype to figure out offsets.	3202	* we use the archetype to figure out offsets.
3257	*/	3203	*/
3258	while (op)	3204	while (op)
3259	{	3205	{
3260	dx = rv.distance_x + op->arch->clone.x;	3206	dx = rv.distance_x + op->arch->x;
3261	dy = rv.distance_y + op->arch->clone.y;	3207	dy = rv.distance_y + op->arch->y;
3262		3208
3263	/* only the viewable area the player sees is updated by LOS	3209	/* only the viewable area the player sees is updated by LOS
3264	* code, so we need to restrict ourselves to that range of values	3210	* code, so we need to restrict ourselves to that range of values
3265	* for any meaningful values.	3211	* for any meaningful values.
3266	*/	3212	*/
3267	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3213	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3268	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3214	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3269	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3215	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3270	return 1;	3216	return 1;
		3217
3271	op = op->more;	3218	op = op->more;
3272	}	3219	}
		3220
3273	return 0;	3221	return 0;
3274	}	3222	}
3275		3223
3276	/* routine for both players and monsters. We call this when	3224	/* routine for both players and monsters. We call this when
3277	* there is a possibility for our action distrubing our hiding	3225	* there is a possibility for our action distrubing our hiding
…		…
3280	* return 0.	3228	* return 0.
3281	*/	3229	*/
3282	int	3230	int
3283	action_makes_visible (object *op)	3231	action_makes_visible (object *op)
3284	{	3232	{
3285
3286	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3233	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3287	{	3234	{
3288	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3235	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3289	return 0;	3236	return 0;
3290		3237
…		…
3296	{	3243	{
3297	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3244	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3298	return 1;	3245	return 1;
3299	}	3246	}
3300	}	3247	}
		3248
3301	return 0;	3249	return 0;
3302	}	3250	}
3303		3251
3304	/* op_on_battleground - checks if the given object op (usually	3252	/* op_on_battleground - checks if the given object op (usually
3305	* a player) is standing on a valid battleground-tile,	3253	* a player) is standing on a valid battleground-tile,
…		…
3310	* Default is to do the same as before, so only people wanting to have different points need worry about this	3258	* Default is to do the same as before, so only people wanting to have different points need worry about this
3311	*/	3259	*/
3312	int	3260	int
3313	op_on_battleground (object *op, int *x, int *y)	3261	op_on_battleground (object *op, int *x, int *y)
3314	{	3262	{
3315	object *tmp;
3316
3317	/* A battleground-tile needs the following attributes to be valid:	3263	/* A battleground-tile needs the following attributes to be valid:
3318	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3264	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3319	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3265	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3320	* and the exit-coordinates sp/hp must both be > 0.	3266	* and the exit-coordinates sp/hp must both be > 0.
3321	* => The intention here is to prevent abuse of the battleground-	3267	* => The intention here is to prevent abuse of the battleground-
3322	* feature (like pickable or hidden battleground tiles). */	3268	* feature (like pickable or hidden battleground tiles). */
3323	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3269	for (object *tmp = op->below; tmp; tmp = tmp->below)
3324	{	3270	{
3325	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3271	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3326	{	3272	{
3327	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3273	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3328	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3274	&& tmp->type == BATTLEGROUND
		3275	&& tmp->name == shstr_battleground
		3276	&& EXIT_X (tmp) && EXIT_Y (tmp))
3329	{	3277	{
3330	/*before we assign the exit, check if this is a teambattle */	3278	/* before we assign the exit, check if this is a teambattle */
3331	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3279	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3332	{	3280	{
3333	object *invtmp;
3334
3335	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3281	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3336	{	3282	{
3337	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3283	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3338	{	3284	{
3339	if (x != NULL && y != NULL)	3285	if (x && y)
3340	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3286	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3287
3341	return 1;	3288	return 1;
3342	}	3289	}
3343	}	3290	}
3344	}	3291	}
		3292
3345	if (x != NULL && y != NULL)	3293	if (x && y)
3346	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3294	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3295
3347	return 1;	3296	return 1;
3348	}	3297	}
3349	}	3298	}
3350	}	3299	}
		3300
3351	/* If we got here, did not find a battleground */	3301	/* If we got here, did not find a battleground */
3352	return 0;	3302	return 0;
3353	}	3303	}
3354		3304
3355	/*	3305	/*
…		…
3371	char buf[MAX_BUF]; /* tmp. string buffer */	3321	char buf[MAX_BUF]; /* tmp. string buffer */
3372	int i = 0, j = 0;	3322	int i = 0, j = 0;
3373		3323
3374	/* get the appropriate treasurelist */	3324	/* get the appropriate treasurelist */
3375	if (atnr == ATNR_FIRE)	3325	if (atnr == ATNR_FIRE)
3376	trlist = treasurelist::find ("dragon_ability_fire");	3326	trlist = treasurelist::find (shstr_dragon_ability_fire);
3377	else if (atnr == ATNR_COLD)	3327	else if (atnr == ATNR_COLD)
3378	trlist = treasurelist::find ("dragon_ability_cold");	3328	trlist = treasurelist::find (shstr_dragon_ability_cold);
3379	else if (atnr == ATNR_ELECTRICITY)	3329	else if (atnr == ATNR_ELECTRICITY)
3380	trlist = treasurelist::find ("dragon_ability_elec");	3330	trlist = treasurelist::find (shstr_dragon_ability_elec);
3381	else if (atnr == ATNR_POISON)	3331	else if (atnr == ATNR_POISON)
3382	trlist = treasurelist::find ("dragon_ability_poison");	3332	trlist = treasurelist::find (shstr_dragon_ability_poison);
3383		3333
3384	if (trlist == NULL || who->type != PLAYER)	3334	if (trlist == NULL || who->type != PLAYER)
3385	return;	3335	return;
3386		3336
3387	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3337	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3391	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3341	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3392	return;	3342	return;
3393	}	3343	}
3394		3344
3395	/* everything seems okay - now bring on the gift: */	3345	/* everything seems okay - now bring on the gift: */
3396	item = &(tr->item->clone);	3346	item = tr->item;
3397		3347
3398	if (item->type == SPELL)	3348	if (item->type == SPELL)
3399	{	3349	{
3400	if (check_spell_known (who, item->name))	3350	if (check_spell_known (who, item->name))
3401	return;	3351	return;
…		…
3460	{	3410	{
3461	/* forces in the treasurelist can alter the player's stats */	3411	/* forces in the treasurelist can alter the player's stats */
3462	object *skin;	3412	object *skin;
3463		3413
3464	/* first get the dragon skin force */	3414	/* first get the dragon skin force */
3465	shstr_cmp dragon_skin_force ("dragon_skin_force");
3466	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3415	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3467	;	3416	;
3468		3417
3469	if (!skin)	3418	if (!skin)
3470	return;	3419	return;
3471		3420
…		…
3547	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3496	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3548	return 0;	3497	return 0;
3549		3498
3550	return 100 - blocked_los [x][y];	3499	return 100 - blocked_los [x][y];
3551	}	3500	}
		3501
		3502	void
		3503	player::infobox (const char *title, const char *msg, int color)
		3504	{
		3505	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3506	}
		3507
		3508	void
		3509	player::statusmsg (const char *msg, int color)
		3510	{
		3511	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3512	}
		3513
		3514	void
		3515	player::failmsg (const char *msg, int color)
		3516	{
		3517	play_sound (sound_find ("generic_failure"));
		3518	statusmsg (msg, color);
		3519	}
		3520

Diff Legend

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