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.133 by root, Sat May 12 22:04:20 2007 UTC vs.
Revision 1.192 by root, Wed Apr 30 06:40:28 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
…		…
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);
		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.5f;
325	ob->speed = 1.0f;
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);
…		…
854	static void	837	static void
855	start_info (object *op)	838	start_info (object *op)
856	{	839	{
857	char buf[MAX_BUF];	840	char buf[MAX_BUF];
858		841
859	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	842	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
860	new_draw_info (NDI_UNIQUE, 0, op, buf);	843	new_draw_info (NDI_UNIQUE, 0, op, buf);
861	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
862	//new_draw_info (NDI_UNIQUE, 0, op, " ");
863	}	844	}
864		845
865	/* This function takes the key that is passed, and does the	846	/* This function takes the key that is passed, and does the
866	* appropriate action with it (change race, or other things).	847	* appropriate action with it (change race, or other things).
867	* The function name is for historical reasons - now we have	848	* The function name is for historical reasons - now we have
…		…
870	*/	851	*/
871	void	852	void
872	player::chargen_race_done ()	853	player::chargen_race_done ()
873	{	854	{
874	/* this must before then initial items are given */	855	/* this must before then initial items are given */
875	esrv_new_player (ob->contr, ob->weight + ob->carrying);	856	esrv_new_player (ob->contr);
876		857
877	treasurelist *tl = treasurelist::find ("starting_wealth");	858	treasurelist *tl = treasurelist::find ("starting_wealth");
878	if (tl)	859	if (tl)
879	create_treasure (tl, ob, 0, 0, 0);	860	create_treasure (tl, ob, 0, 0, 0);
880		861
…		…
908	if (*first_map_ext_path)	889	if (*first_map_ext_path)
909	{	890	{
910	object *tmp;	891	object *tmp;
911	char mapname[MAX_BUF];	892	char mapname[MAX_BUF];
912		893
913	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);
914	tmp = object::create ();	895	tmp = object::create ();
915	EXIT_PATH (tmp) = mapname;	896	EXIT_PATH (tmp) = mapname;
916	EXIT_X (tmp) = ob->x;	897	EXIT_X (tmp) = ob->x;
917	EXIT_Y (tmp) = ob->y;	898	EXIT_Y (tmp) = ob->y;
918	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;
…		…
937	int x = ob->x, y = ob->y;	918	int x = ob->x, y = ob->y;
938		919
939	ob->remove_statbonus ();	920	ob->remove_statbonus ();
940	ob->remove ();	921	ob->remove ();
941	ob->arch = get_player_archetype (ob->arch);	922	ob->arch = get_player_archetype (ob->arch);
942	ob->arch->clone.copy_to (ob);	923	ob->arch->copy_to (ob);
943	ob->instantiate ();	924	ob->instantiate ();
944	ob->stats = ob->contr->orig_stats;	925	ob->stats = ob->contr->orig_stats;
945	ob->name = ob->name_pl = name;	926	ob->name = ob->name_pl = name;
946	ob->x = x;	927	ob->x = x;
947	ob->y = y;	928	ob->y = y;
948	SET_ANIMATION (ob, 2); /* So player faces south */	929	SET_ANIMATION (ob, 2); /* So player faces south */
949	insert_ob_in_map (ob, ob->map, ob, 0);	930	insert_ob_in_map (ob, ob->map, ob, 0);
950	assign (ob->contr->title, ob->arch->clone.name);	931	assign (ob->contr->title, ob->arch->object::name);
951	ob->add_statbonus ();	932	ob->add_statbonus ();
952	}	933	}
953	while (!allowed_class (ob));	934	while (!allowed_class (ob));
954		935
955	update_object (ob, UP_OBJ_FACE);	936	update_object (ob, UP_OBJ_FACE);
…		…
1030	if (op->move_type & MOVE_FLYING)	1011	if (op->move_type & MOVE_FLYING)
1031	return 1;	1012	return 1;
1032		1013
1033	next = op->below;	1014	next = op->below;
1034		1015
		1016	int cnt = MAX_ITEM_PER_DROP;
		1017	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
		1018
1035	/* 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
1036	* destroyed */	1020	* destroyed */
1037	while (next && !next->destroyed ())	1021	while (next && !next->destroyed ())
1038	{	1022	{
1039	tmp = next;	1023	tmp = next;
1040	next = tmp->below;	1024	next = tmp->below;
1041		1025
		1026	if (cnt <= 0)
		1027	{
		1028	op->failmsg ("Couldn't pickup all items at once.");
		1029	return 0;
		1030	}
		1031
1042	if (op->destroyed ())	1032	if (op->destroyed ())
1043	return 0;	1033	return 0;
1044		1034
1045	if (!can_pick (op, tmp))	1035	if (!can_pick (op, tmp))
1046	continue;	1036	continue;
1047		1037
1048	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	1038	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1049	{	1039	{
1050	if (item_matched_string (op, tmp, op->contr->search_str))	1040	if (item_matched_string (op, tmp, op->contr->search_str))
1051	pick_up (op, tmp);	1041	CHK_PICK_PICKUP;
1052	continue;	1042	continue;
1053	}	1043	}
1054		1044
1055	/* high not bit set? We're using the old autopickup model */	1045	/* high not bit set? We're using the old autopickup model */
1056	if (!(op->contr->mode & PU_NEWMODE))	1046	if (!(op->contr->mode & PU_NEWMODE))
…		…
1058	switch (op->contr->mode)	1048	switch (op->contr->mode)
1059	{	1049	{
1060	case 0:	1050	case 0:
1061	return 1; /* don't pick up */	1051	return 1; /* don't pick up */
1062	case 1:	1052	case 1:
1063	pick_up (op, tmp);	1053	CHK_PICK_PICKUP;
1064	return 1;	1054	return 1;
1065	case 2:	1055	case 2:
1066	pick_up (op, tmp);	1056	CHK_PICK_PICKUP;
1067	return 0;	1057	return 0;
1068	case 3:	1058	case 3:
1069	return 0; /* stop before pickup */	1059	return 0; /* stop before pickup */
1070	case 4:	1060	case 4:
1071	pick_up (op, tmp);	1061	CHK_PICK_PICKUP;
1072	break;	1062	break;
1073	case 5:	1063	case 5:
1074	pick_up (op, tmp);	1064	CHK_PICK_PICKUP;
1075	stop = 1;	1065	stop = 1;
1076	break;	1066	break;
1077	case 6:	1067	case 6:
1078	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1079	pick_up (op, tmp);	1069	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
		1070	CHK_PICK_PICKUP;
1080	break;	1071	break;
1081		1072
1082	case 7:	1073	case 7:
1083	if (tmp->type == MONEY || tmp->type == GEM)	1074	if (tmp->type == MONEY || tmp->type == GEM)
1084	pick_up (op, tmp);	1075	CHK_PICK_PICKUP;
1085	break;	1076	break;
1086		1077
1087	default:	1078	default:
1088	/* use value density */	1079	/* use value density */
1089	if (!QUERY_FLAG (tmp, FLAG_UNPAID)	1080	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1090	&& (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)
1091	pick_up (op, tmp);	1082	CHK_PICK_PICKUP;
1092	}	1083	}
1093	}	1084	}
1094	else	1085	else
1095	{ /* old model */	1086	{ /* old model */
1096	/* NEW pickup handling */	1087	/* NEW pickup handling */
…		…
1100	if (tmp->name != NULL)	1091	if (tmp->name != NULL)
1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1092	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1093	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1103	else	1094	else
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1095	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1096	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106		1097
1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1098	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1108	}	1099	}
1109		1100
1110	/* philosophy:	1101	/* philosophy:
…		…
1151	/* all food and drink if desired */	1142	/* all food and drink if desired */
1152	/* question: don't pick up known-poisonous stuff? */	1143	/* question: don't pick up known-poisonous stuff? */
1153	if (op->contr->mode & PU_FOOD)	1144	if (op->contr->mode & PU_FOOD)
1154	if (tmp->type == FOOD)	1145	if (tmp->type == FOOD)
1155	{	1146	{
1156	pick_up (op, tmp);	1147	CHK_PICK_PICKUP;
1157	continue;	1148	continue;
1158	}	1149	}
1159		1150
1160	if (op->contr->mode & PU_DRINK)	1151	if (op->contr->mode & PU_DRINK)
1161	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)))
1162	{	1153	{
1163	pick_up (op, tmp);	1154	CHK_PICK_PICKUP;
1164	continue;	1155	continue;
1165	}	1156	}
1166		1157
1167	if (op->contr->mode & PU_POTION)	1158	if (op->contr->mode & PU_POTION)
1168	if (tmp->type == POTION)	1159	if (tmp->type == POTION)
1169	{	1160	{
1170	pick_up (op, tmp);	1161	CHK_PICK_PICKUP;
1171	continue;	1162	continue;
1172	}	1163	}
1173		1164
1174	/* spellbooks, skillscrolls and normal books/scrolls */	1165	/* spellbooks, skillscrolls and normal books/scrolls */
1175	if (op->contr->mode & PU_SPELLBOOK)	1166	if (op->contr->mode & PU_SPELLBOOK)
1176	if (tmp->type == SPELLBOOK)	1167	if (tmp->type == SPELLBOOK)
1177	{	1168	{
1178	pick_up (op, tmp);	1169	CHK_PICK_PICKUP;
1179	continue;	1170	continue;
1180	}	1171	}
1181		1172
1182	if (op->contr->mode & PU_SKILLSCROLL)	1173	if (op->contr->mode & PU_SKILLSCROLL)
1183	if (tmp->type == SKILLSCROLL)	1174	if (tmp->type == SKILLSCROLL)
1184	{	1175	{
1185	pick_up (op, tmp);	1176	CHK_PICK_PICKUP;
1186	continue;	1177	continue;
1187	}	1178	}
1188		1179
1189	if (op->contr->mode & PU_READABLES)	1180	if (op->contr->mode & PU_READABLES)
1190	if (tmp->type == BOOK || tmp->type == SCROLL)	1181	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191	{	1182	{
1192	pick_up (op, tmp);	1183	CHK_PICK_PICKUP;
1193	continue;	1184	continue;
1194	}	1185	}
1195		1186
1196	/* wands/staves/rods/horns */	1187	/* wands/staves/rods/horns */
1197	if (op->contr->mode & PU_MAGIC_DEVICE)	1188	if (op->contr->mode & PU_MAGIC_DEVICE)
1198	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1189	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1199	{	1190	{
1200	pick_up (op, tmp);	1191	CHK_PICK_PICKUP;
1201	continue;	1192	continue;
1202	}	1193	}
1203		1194
1204	/* pick up all magical items */	1195	/* pick up all magical items */
1205	if (op->contr->mode & PU_MAGICAL)	1196	if (op->contr->mode & PU_MAGICAL)
1206	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))
1207	{	1198	{
1208	pick_up (op, tmp);	1199	CHK_PICK_PICKUP;
1209	continue;	1200	continue;
1210	}	1201	}
1211		1202
1212	if (op->contr->mode & PU_VALUABLES)	1203	if (op->contr->mode & PU_VALUABLES)
1213	{	1204	{
1214	if (tmp->type == MONEY || tmp->type == GEM)	1205	if (tmp->type == MONEY || tmp->type == GEM)
1215	{	1206	{
1216	pick_up (op, tmp);	1207	CHK_PICK_PICKUP;
1217	continue;	1208	continue;
1218	}	1209	}
1219	}	1210	}
1220		1211
1221	/* rings & amulets - talismans seems to be typed AMULET */	1212	/* rings & amulets - talismans seems to be typed AMULET */
1222	if (op->contr->mode & PU_JEWELS)	1213	if (op->contr->mode & PU_JEWELS)
1223	if (tmp->type == RING || tmp->type == AMULET)	1214	if (tmp->type == RING || tmp->type == AMULET)
1224	{	1215	{
1225	pick_up (op, tmp);	1216	CHK_PICK_PICKUP;
1226	continue;	1217	continue;
1227	}	1218	}
1228		1219
1229	/* we don't forget dragon food */	1220	/* we don't forget dragon food */
1230	if (op->contr->mode & PU_FLESH)	1221	if (op->contr->mode & PU_FLESH)
1231	if (tmp->type == FLESH)	1222	if (tmp->type == FLESH)
1232	{	1223	{
1233	pick_up (op, tmp);	1224	CHK_PICK_PICKUP;
1234	continue;	1225	continue;
1235	}	1226	}
1236		1227
1237	/* bows and arrows. Bows are good for selling! */	1228	/* bows and arrows. Bows are good for selling! */
1238	if (op->contr->mode & PU_BOW)	1229	if (op->contr->mode & PU_BOW)
1239	if (tmp->type == BOW)	1230	if (tmp->type == BOW)
1240	{	1231	{
1241	pick_up (op, tmp);	1232	CHK_PICK_PICKUP;
1242	continue;	1233	continue;
1243	}	1234	}
1244		1235
1245	if (op->contr->mode & PU_ARROW)	1236	if (op->contr->mode & PU_ARROW)
1246	if (tmp->type == ARROW)	1237	if (tmp->type == ARROW)
1247	{	1238	{
1248	pick_up (op, tmp);	1239	CHK_PICK_PICKUP;
1249	continue;	1240	continue;
1250	}	1241	}
1251		1242
1252	/* all kinds of armor etc. */	1243	/* all kinds of armor etc. */
1253	if (op->contr->mode & PU_ARMOUR)	1244	if (op->contr->mode & PU_ARMOUR)
1254	if (tmp->type == ARMOUR)	1245	if (tmp->type == ARMOUR)
1255	{	1246	{
1256	pick_up (op, tmp);	1247	CHK_PICK_PICKUP;
1257	continue;	1248	continue;
1258	}	1249	}
1259		1250
1260	if (op->contr->mode & PU_HELMET)	1251	if (op->contr->mode & PU_HELMET)
1261	if (tmp->type == HELMET)	1252	if (tmp->type == HELMET)
1262	{	1253	{
1263	pick_up (op, tmp);	1254	CHK_PICK_PICKUP;
1264	continue;	1255	continue;
1265	}	1256	}
1266		1257
1267	if (op->contr->mode & PU_SHIELD)	1258	if (op->contr->mode & PU_SHIELD)
1268	if (tmp->type == SHIELD)	1259	if (tmp->type == SHIELD)
1269	{	1260	{
1270	pick_up (op, tmp);	1261	CHK_PICK_PICKUP;
1271	continue;	1262	continue;
1272	}	1263	}
1273		1264
1274	if (op->contr->mode & PU_BOOTS)	1265	if (op->contr->mode & PU_BOOTS)
1275	if (tmp->type == BOOTS)	1266	if (tmp->type == BOOTS)
1276	{	1267	{
1277	pick_up (op, tmp);	1268	CHK_PICK_PICKUP;
1278	continue;	1269	continue;
1279	}	1270	}
1280		1271
1281	if (op->contr->mode & PU_GLOVES)	1272	if (op->contr->mode & PU_GLOVES)
1282	if (tmp->type == GLOVES)	1273	if (tmp->type == GLOVES)
1283	{	1274	{
1284	pick_up (op, tmp);	1275	CHK_PICK_PICKUP;
1285	continue;	1276	continue;
1286	}	1277	}
1287		1278
1288	if (op->contr->mode & PU_CLOAK)	1279	if (op->contr->mode & PU_CLOAK)
1289	if (tmp->type == CLOAK)	1280	if (tmp->type == CLOAK)
1290	{	1281	{
1291	pick_up (op, tmp);	1282	CHK_PICK_PICKUP;
1292	continue;	1283	continue;
1293	}	1284	}
1294		1285
1295	/* hoping to catch throwing daggers here */	1286	/* hoping to catch throwing daggers here */
1296	if (op->contr->mode & PU_MISSILEWEAPON)	1287	if (op->contr->mode & PU_MISSILEWEAPON)
1297	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1288	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1298	{	1289	{
1299	pick_up (op, tmp);	1290	CHK_PICK_PICKUP;
1300	continue;	1291	continue;
1301	}	1292	}
1302		1293
1303	/* careful: chairs and tables are weapons! */	1294	/* careful: chairs and tables are weapons! */
1304	if (op->contr->mode & PU_ALLWEAPON)	1295	if (op->contr->mode & PU_ALLWEAPON)
1305	{	1296	{
1306	if (tmp->type == WEAPON && tmp->name != NULL)	1297	if (tmp->type == WEAPON && tmp->name != NULL)
1307	{	1298	{
1308	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 &&
1309	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1300	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1310	{	1301	{
1311	pick_up (op, tmp);	1302	CHK_PICK_PICKUP;
1312	continue;	1303	continue;
1313	}	1304	}
1314	}	1305	}
1315		1306
1316	if (tmp->type == WEAPON && tmp->name == NULL)	1307	if (tmp->type == WEAPON && tmp->name == NULL)
1317	{	1308	{
1318	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)
1319	{	1310	{
1320	pick_up (op, tmp);	1311	CHK_PICK_PICKUP;
1321	continue;	1312	continue;
1322	}	1313	}
1323	}	1314	}
1324	}	1315	}
1325		1316
1326	/* misc stuff that's useful */	1317	/* misc stuff that's useful */
1327	if (op->contr->mode & PU_KEY)	1318	if (op->contr->mode & PU_KEY)
1328	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1319	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1329	{	1320	{
1330	pick_up (op, tmp);	1321	CHK_PICK_PICKUP;
1331	continue;	1322	continue;
1332	}	1323	}
1333		1324
1334	/* 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
1335	* pickups */	1326	* pickups */
…		…
1340	/* >=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
1341	* and multiply them by 5, giving 0..15*5== 5..75 */	1332	* and multiply them by 5, giving 0..15*5== 5..75 */
1342	wvratio = (op->contr->mode & PU_RATIO) * 5;	1333	wvratio = (op->contr->mode & PU_RATIO) * 5;
1343	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)
1344	{	1335	{
1345	pick_up (op, tmp);	1336	CHK_PICK_PICKUP;
1346	#if 0	1337	#if 0
1347	fprintf (stderr, "HIGH WEIGHT/VALUE [");	1338	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1348	if (tmp->name != NULL)	1339	if (tmp->name != NULL)
1349	{	1340	{
1350	fprintf (stderr, "%s", tmp->name);	1341	fprintf (stderr, "%s", tmp->name);
1351	}	1342	}
1352	else	1343	else
1353	fprintf (stderr, "%s", tmp->arch->name);	1344	fprintf (stderr, "%s", tmp->arch->archname);
1354	fprintf (stderr, ",%d] = ", tmp->type);	1345	fprintf (stderr, ",%d] = ", tmp->type);
1355	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))));
1356	#endif	1347	#endif
1357	continue;	1348	continue;
1358	}	1349	}
…		…
1369	* found object is returned.	1360	* found object is returned.
1370	*/	1361	*/
1371	object *	1362	object *
1372	find_arrow (object *op, const char *type)	1363	find_arrow (object *op, const char *type)
1373	{	1364	{
1374	object *tmp = 0;
1375
1376	for (op = op->inv; op; op = op->below)	1365	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1378	tmp = find_arrow (op, type);
1379	else if (op->type == ARROW && op->race == type)	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);
1380	return op;	1374	return arrow;
		1375	}
1381		1376
1382	return tmp;	1377	return 0;
1383	}	1378	}
1384		1379
1385	/*	1380	/*
1386	* 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
1387	* 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
…		…
1410	}	1405	}
1411	}	1406	}
1412	else if (arrow->type == ARROW && arrow->race == type)	1407	else if (arrow->type == ARROW && arrow->race == type)
1413	{	1408	{
1414	/* allways prefer assasination/slaying */	1409	/* allways prefer assasination/slaying */
1415	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1410	if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1416	{	1411	{
1417	if (arrow->attacktype & AT_DEATH)	1412	if (arrow->attacktype & AT_DEATH)
1418	{	1413	{
1419	*better = 100;	1414	*better = 100;
1420	return arrow;	1415	return arrow;
…		…
1428	else	1423	else
1429	{	1424	{
1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1425	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1431	{	1426	{
1432	attacktype = 1 << attacknum;	1427	attacktype = 1 << attacknum;
1433	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1428	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1434	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)
1435	{	1430	{
1436	tmp = arrow;	1431	tmp = arrow;
1437	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;
1438	}	1433	}
1439	}	1434	}
1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1435	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1441	{	1436	{
1442	tmp = arrow;	1437	tmp = arrow;
…		…
1544	{	1539	{
1545	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!");
1546	return 0;	1541	return 0;
1547	}	1542	}
1548		1543
1549	if (player *pl = op->contr)	1544	if (op->contr)
1550	{	1545	bow = op->current_weapon;
1551	bow = pl->ranged_ob;
1552	if (!op->change_weapon (bow))
1553	return 0;
1554	}
1555	else	1546	else
1556	{	1547	{
1557	for (bow = op->inv; bow; bow = bow->below)	1548	for (bow = op->inv; bow; bow = bow->below)
1558	/* 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
1559	* 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.
…		…
1612	arrow->destroy ();	1603	arrow->destroy ();
1613	return 0;	1604	return 0;
1614	}	1605	}
1615		1606
1616	left = arrow; /* these are arrows left to the player */	1607	left = arrow; /* these are arrows left to the player */
1617	arrow = get_split_ob (arrow, 1);	1608	arrow = arrow->split ();
1618	if (!arrow)	1609	if (!arrow)
1619	{	1610	{
1620	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);
1621	return 0;	1612	return 0;
1622	}	1613	}
…		…
1630	arrow->stats.grace = arrow->attacktype;	1621	arrow->stats.grace = arrow->attacktype;
1631		1622
1632	if (arrow->slaying)	1623	if (arrow->slaying)
1633	arrow->spellarg = strdup (arrow->slaying);	1624	arrow->spellarg = strdup (arrow->slaying);
1634		1625
		1626	#if 0
1635	if (player *pl = op->contr)	1627	if (player *pl = op->contr)
1636	{	1628	{
1637	pl->has_hit = 1;
1638	#if 0
1639	float speed = pl->weapon_sp;	1629	float speed = pl->weapon_sp;
1640		1630
1641	/* penalize ROF for bestarrow */	1631	/* penalize ROF for bestarrow */
1642	if (pl->bowtype == bow_bestarrow)	1632	if (pl->bowtype == bow_bestarrow)
1643	speed *= .9f;	1633	speed *= .9f;
1644	else	1634	else
1645	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;	1635	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646		1636
1647	op->speed_left += speed - op->speed;	1637	op->speed_left += speed - op->speed;
		1638	}
1648	#endif	1639	#endif
1649	}
1650		1640
1651	SET_ANIMATION (arrow, arrow->direction);	1641	SET_ANIMATION (arrow, arrow->direction);
1652		1642
1653	/* update the speed */	1643	/* update the speed */
1654	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0	1644	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1655	+ bow->stats.dam / 7.0;	1645	+ bow->stats.dam / 7.f;
1656		1646
1657	arrow->set_speed (max (arrow->speed, 2.0));	1647	arrow->set_speed (max (arrow->speed, 2.f));
1658	arrow->speed_left = 0;	1648	arrow->speed_left = 0;
1659		1649
1660	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1650	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661		1651
1662	if (op->type == PLAYER)	1652	if (op->type == PLAYER)
…		…
1685		1675
1686	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1676	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689		1679
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	op->play_sound (sound_find ("fire_arrow"));
1691	m->insert (arrow, sx, sy, op);	1681	m->insert (arrow, sx, sy, op);
1692		1682
1693	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1694	move_arrow (arrow);	1684	move_arrow (arrow);
1695
1696	if (op->type == PLAYER)
1697	{
1698	if (left->destroyed ())
1699	esrv_del_item (op->contr, left->count);
1700	else
1701	esrv_send_item (op, left);
1702	}
1703		1685
1704	return 1;	1686	return 1;
1705	}	1687	}
1706		1688
1707	/* Special fire code for players - this takes into	1689	/* Special fire code for players - this takes into
…		…
1746	}	1728	}
1747		1729
1748	return ret;	1730	return ret;
1749	}	1731	}
1750		1732
1751
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1733	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1734	* Broken apart from 'fire' to keep it more readable.
1754	*/	1735	*/
1755	void	1736	void
1756	fire_misc_object (object *op, int dir)	1737	fire_misc_object (object *op, int dir)
…		…
1774		1755
1775	if (item->type == WAND)	1756	if (item->type == WAND)
1776	{	1757	{
1777	if (item->stats.food <= 0)	1758	if (item->stats.food <= 0)
1778	{	1759	{
1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1760	op->contr->play_sound (sound_find ("wand_poof"));
1780	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));
1781		1762
1782	return;	1763	return;
1783	}	1764	}
1784	}	1765	}
1785	else if (item->type == ROD || item->type == HORN)	1766	else if (item->type == ROD || item->type == HORN)
1786	{	1767	{
1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1768	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
		1769
		1770	// using the maximum of the rods charge allows at least one spell cast
		1771	// for a rod or horn, this fixes some broken rods.
		1772	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1788	{	1773	{
1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1774	op->contr->play_sound (sound_find ("wand_poof"));
1790		1775
1791	if (item->type == ROD)	1776	if (item->type == ROD)
1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1793	else	1778	else
1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1779	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
…		…
1807	object *tmp;	1792	object *tmp;
1808		1793
1809	if (item->arch)	1794	if (item->arch)
1810	{	1795	{
1811	CLEAR_FLAG (item, FLAG_ANIMATE);	1796	CLEAR_FLAG (item, FLAG_ANIMATE);
1812	item->face = item->arch->clone.face;	1797	item->face = item->arch->face;
1813	item->set_speed (0);	1798	item->set_speed (0);
1814	}	1799	}
1815		1800
1816	if ((tmp = item->in_player ()))	1801	if (object *pl = item->visible_to ())
1817	esrv_update_item (UPD_ANIM, tmp, item);	1802	esrv_update_item (UPD_ANIM, pl, item);
1818	}	1803	}
1819	}	1804	}
1820	else if (item->type == ROD || item->type == HORN)	1805	else if (item->type == ROD || item->type == HORN)
1821	drain_rod_charge (item);	1806	drain_rod_charge (item);
1822	}	1807	}
1823	}	1808	}
1824		1809
1825	/* Received a fire command for the player - go and do it.	1810	/* Received a fire command for the player - go and do it.
1826	*/	1811	*/
1827	void	1812	bool
1828	fire (object *op, int dir)	1813	fire (object *op, int dir)
1829	{	1814	{
1830	int spellcost = 0;	1815	int spellcost = 0;
1831		1816
1832	/* check for loss of invisiblity/hide */	1817	/* check for loss of invisiblity/hide */
…		…
1836	player *pl = op->contr;	1821	player *pl = op->contr;
1837		1822
1838	if (pl->golem)	1823	if (pl->golem)
1839	{	1824	{
1840	control_golem (op->contr->golem, dir);	1825	control_golem (op->contr->golem, dir);
1841	return;	1826	return false;
1842	}	1827	}
1843		1828
1844	object *ob = pl->ranged_ob;	1829	object *ob = pl->ranged_ob;
1845		1830
1846	if (!ob)	1831	if (!ob)
1847	return;	1832	return false;
		1833
		1834	if (!op->change_weapon (ob))
		1835	return false;
		1836
		1837	if (op->speed_left > 0.f)
		1838	--op->speed_left;
		1839	else
		1840	return false;
1848		1841
1849	switch (ob->type)	1842	switch (ob->type)
1850	{	1843	{
1851	case BOW:	1844	case BOW:
1852	player_fire_bow (op, dir);	1845	player_fire_bow (op, dir);
…		…
1859	case BUILDER:	1852	case BUILDER:
1860	apply_map_builder (op, dir);	1853	apply_map_builder (op, dir);
1861	break;	1854	break;
1862		1855
1863	case SKILL:	1856	case SKILL:
1864	case SKILL_TOOL:
1865	do_skill (op, op, ob, dir, 0);	1857	do_skill (op, op, ob, dir, 0);
1866	break;	1858	break;
1867		1859
1868	default:	1860	default:
1869	fire_misc_object (op, dir);	1861	fire_misc_object (op, dir);
1870	break;	1862	break;
1871	}	1863	}
		1864
		1865	return true;
1872	}	1866	}
1873		1867
1874	/* find_key	1868	/* find_key
1875	* We try to find a key for the door as passed. If we find a key	1869	* We try to find a key for the door as passed. If we find a key
1876	* and successfully use it, we return the key, otherwise NULL	1870	* and successfully use it, we return the key, otherwise NULL
…		…
1963	* 0 otherwise	1957	* 0 otherwise
1964	*/	1958	*/
1965	static int	1959	static int
1966	player_attack_door (object *op, object *door)	1960	player_attack_door (object *op, object *door)
1967	{	1961	{
1968	/* If its a door, try to find a use a key. If we do destroy the door,	1962	/* If its a door, try to find a key. If we do destroy the door,
1969	* might as well return immediately as there is nothing more to do -	1963	* might as well return immediately as there is nothing more to do -
1970	* otherwise, we fall through to the rest of the code.	1964	* otherwise, we fall through to the rest of the code.
1971	*/	1965	*/
1972	object *key = find_key (op, op, door);	1966	object *key = find_key (op, op, door);
1973		1967
1974	/* IF we found a key, do some extra work */	1968	/* If we found a key, do some extra work */
1975	if (key)	1969	if (key)
1976	{	1970	{
1977	object *container = key->env;	1971	object *container = key->env;
1978
1979	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980		1972
1981	if (action_makes_visible (op))	1973	if (action_makes_visible (op))
1982	make_visible (op);	1974	make_visible (op);
1983		1975
1984	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1976	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
…		…
1986		1978
1987	if (door->type == DOOR)	1979	if (door->type == DOOR)
1988	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1980	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989	else if (door->type == LOCKED_DOOR)	1981	else if (door->type == LOCKED_DOOR)
1990	{	1982	{
1991	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1983	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1992	remove_door2 (door); /* remove door without violence ;-) */	1984	remove_door2 (door); /* remove door without violence ;-) */
1993	}	1985	}
1994		1986
1995	/* Do this after we print the message */	1987	/* Do this after we print the message */
1996	decrease_ob (key); /* Use up one of the keys */	1988	key->decrease (); /* Use up one of the keys */
1997	/* Need to update the weight the container the key was in */
1998	if (container != op)
1999	esrv_update_item (UPD_WEIGHT, op, container);
2000		1989
2001	return 1; /* Nothing more to do below */	1990	return 1; /* Nothing more to do below */
2002	}	1991	}
2003	else if (door->type == LOCKED_DOOR)	1992	else if (door->type == LOCKED_DOOR)
2004	{	1993	{
2005	/* Might as well return now - no other way to open this */	1994	/* Might as well return now - no other way to open this */
2006	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1995	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2007	return 1;	1996	return 1;
2008	}	1997	}
2009		1998
2010	return 0;	1999	return 0;
2011	}	2000	}
…		…
2014	* It should keep the code cleaner.	2003	* It should keep the code cleaner.
2015	* When this is called, the players direction has been updated	2004	* When this is called, the players direction has been updated
2016	* (taking into account confusion.) The player is also actually	2005	* (taking into account confusion.) The player is also actually
2017	* going to try and move (not fire weapons).	2006	* going to try and move (not fire weapons).
2018	*/	2007	*/
2019	void	2008	bool
2020	move_player_attack (object *op, int dir)	2009	move_player_attack (object *op, int dir)
2021	{	2010	{
2022	object *tmp, *mon;
2023	int on_battleground;	2011	int on_battleground;
2024	maptile *m;
2025		2012
2026	sint16 nx = freearr_x[dir] + op->x;	2013	sint16 nx = freearr_x[dir] + op->x;
2027	sint16 ny = freearr_y[dir] + op->y;	2014	sint16 ny = freearr_y[dir] + op->y;
2028		2015
2029	on_battleground = op_on_battleground (op, 0, 0);	2016	on_battleground = op_on_battleground (op, 0, 0);
		2017
		2018	if (out_of_map (op->map, nx, ny))
		2019	return false;
		2020
		2021	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2022	{
		2023	--op->speed_left;
		2024	return true;
		2025	}
2030		2026
2031	/* If braced, or can't move to the square, and it is not out of the	2027	/* If braced, or can't move to the square, and it is not out of the
2032	* map, attack it. Note order of if statement is important - don't	2028	* map, attack it. Note order of if statement is important - don't
2033	* want to be calling move_ob if braced, because move_ob will move the	2029	* want to be calling move_ob if braced, because move_ob will move the
2034	* player. This is a pretty nasty hack, because if we could	2030	* player. This is a pretty nasty hack, because if we could
2035	* move to some space, it then means that if we are braced, we should	2031	* move to some space, it then means that if we are braced, we should
2036	* do nothing at all. As it is, if we are braced, we go through	2032	* do nothing at all. As it is, if we are braced, we go through
2037	* quite a bit of processing. However, it probably is less than what	2033	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	2034	* move_ob uses.
2039	*/	2035	*/
2040	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2041	{
2042	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2043	{
2044	m = op->map->xy_find (nx, ny);	2036	maptile *m = op->map->xy_find (nx, ny);
2045	if (!m)
2046	return; /* Don't think this should happen */
2047	}
2048	else
2049	m = op->map;
2050		2037
2051	if (!(tmp = m->at (nx, ny).bot))
2052	return;
2053
2054	mon = 0;
2055	/* Go through all the objects, and find ones of interest. Only stop if	2038	/* Go through all the objects, and find ones of interest. Only stop if
2056	* we find a monster - that is something we know we want to attack.	2039	* we find a monster - that is something we know we want to attack.
2057	* if its a door or barrel (can roll) see if there may be monsters	2040	* if its a door or barrel (can roll) see if there may be monsters
2058	* on the space	2041	* on the space
2059	*/	2042	*/
2060	while (tmp)	2043	object *mon;
2061	{	2044	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2062	if (tmp == op)	2045	{
2063	{	2046	if ((mon->flag [FLAG_ALIVE]
2064	tmp = tmp->above;	2047	|| mon->type == LOCKED_DOOR
2065	continue;	2048	|| mon->flag [FLAG_CAN_ROLL])
2066	}
2067
2068	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2069	{
2070	mon = tmp;	2049	&& mon != op)
2071	break;	2050	break;
2072	}	2051	}
2073		2052
2074	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2075	mon = tmp;
2076
2077	tmp = tmp->above;
2078	}
2079
2080	if (!mon) /* This happens anytime the player tries to move */	2053	if (!mon) /* This happens anytime the player tries to move */
2081	return; /* into a wall */	2054	return false; /* into a wall */
2082		2055
2083	if (mon->head)
2084	mon = mon->head;	2056	mon = mon->head_ ();
2085		2057
2086	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2058	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2059	if (op->contr->weapon_sp_left > 0.f)
2087	if (player_attack_door (op, mon))	2060	if (player_attack_door (op, mon))
		2061	{
		2062	--op->contr->weapon_sp_left;
2088	return;	2063	return true;
		2064	}
2089		2065
2090	/* The following deals with possibly attacking peaceful	2066	/* The following deals with possibly attacking peaceful
2091	* or frienddly creatures. Basically, all players are considered	2067	* or friendly creatures. Basically, all players are considered
2092	* unaggressive. If the moving player has peaceful set, then the	2068	* unaggressive. If the moving player has peaceful set, then the
2093	* object should be pushed instead of attacked. It is assumed that	2069	* object should be pushed instead of attacked. It is assumed that
2094	* if you are braced, you will not attack friends accidently,	2070	* if you are braced, you will not attack friends accidently,
2095	* and thus will not push them.	2071	* and thus will not push them.
2096	*/	2072	*/
2097		2073
2098	/* If the creature is a pet, push it even if the player is not	2074	/* If the creature is a pet, push it even if the player is not
2099	* peaceful. Our assumption is the creature is a pet if the	2075	* peaceful. Our assumption is the creature is a pet if the
2100	* player owns it and it is either friendly or unagressive.	2076	* player owns it and it is either friendly or unagressive.
2101	*/	2077	*/
2102	if ((op->type == PLAYER)	2078	if (op->type == PLAYER
2103	#if COZY_SERVER
2104	&&
2105	((mon->owner && mon->owner->contr	2079	&& ((mon->owner && mon->owner->contr
2106	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2080	&& same_party (mon->owner->contr->party, op->contr->party))
2107	#else
2108	&& mon->owner == op	2081	|| mon->owner == op)
2109	#endif
2110	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2082	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2111	{	2083	{
2112	/* If we're braced, we don't want to switch places with it */	2084	/* If we're braced, we don't want to switch places with it */
2113	if (op->contr->braced)	2085	if (op->contr->braced)
2114	return;	2086	return false;
2115		2087
2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2088	if (op->speed_left > 0.f)
		2089	{
		2090	--op->speed_left;
		2091
		2092	op->play_sound (sound_find ("push_player"));
2117	push_ob (mon, dir, op);	2093	push_ob (mon, dir, op);
		2094
2118	if (op->contr->tmp_invis || op->hide)	2095	if (op->contr->tmp_invis || op->hide)
2119	make_visible (op);	2096	make_visible (op);
2120		2097
2121	return;	2098	return true;
2122	}	2099	}
		2100	else
		2101	return false;
		2102	}
2123		2103
2124	/* in certain circumstances, you shouldn't attack friendly	2104	/* in certain circumstances, you shouldn't attack friendly
2125	* creatures. Note that if you are braced, you can't push	2105	* creatures. Note that if you are braced, you can't push
2126	* someone, but put it inside this loop so that you won't	2106	* someone, but put it inside this loop so that you won't
2127	* attack them either.	2107	* attack them either.
2128	*/	2108	*/
2129	if ((mon->type == PLAYER || mon->enemy != op) &&	2109	if ((mon->type == PLAYER || mon->enemy != op)
2130	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2110	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2131	#ifdef PROHIBIT_PLAYERKILL
2132	(op->contr->peaceful	2111	&& ((op->contr->peaceful
2133	|| (mon->type == PLAYER	2112	|| (mon->type == PLAYER && mon->contr->peaceful))
2134	&& mon->contr->
2135	peaceful)) &&
2136	#else
2137	op->contr->peaceful &&
2138	#endif
2139	!on_battleground))	2113	&& !on_battleground))
		2114	{
		2115	if (op->speed_left > 0.f)
2140	{	2116	{
		2117	--op->speed_left;
		2118
2141	if (!op->contr->braced)	2119	if (!op->contr->braced)
2142	{	2120	{
2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2121	op->play_sound (sound_find ("push_player"));
2144	push_ob (mon, dir, op);	2122	push_ob (mon, dir, op);
2145	}	2123	}
2146	else	2124	else
2147	new_draw_info (0, 0, op, "You withhold your attack");	2125	op->statusmsg ("You withhold your attack");
2148		2126
2149	if (op->contr->tmp_invis || op->hide)	2127	if (op->contr->tmp_invis || op->hide)
2150	make_visible (op);	2128	make_visible (op);
2151	}
2152		2129
		2130	return true;
		2131	}
		2132	}
2153	/* If the object is a boulder or other rollable object, then	2133	/* If the object is a boulder or other rollable object, then
2154	* roll it if not braced. You can't roll it if you are braced.	2134	* roll it if not braced. You can't roll it if you are braced.
2155	*/	2135	*/
2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2136	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2137	{
		2138	if (op->speed_left > 0.f)
2157	{	2139	{
		2140	--op->speed_left;
		2141
2158	recursive_roll (mon, dir, op);	2142	recursive_roll (mon, dir, op);
2159	if (action_makes_visible (op))	2143	if (action_makes_visible (op))
2160	make_visible (op);	2144	make_visible (op);
2161	}
2162		2145
		2146	return true;
		2147	}
		2148	}
2163	/* Any generic living creature. Including things like doors.	2149	/* Any generic living creature. Including things like doors.
2164	* Way it works is like this: First, it must have some hit points	2150	* Way it works is like this: First, it must have some hit points
2165	* and be living. Then, it must be one of the following:	2151	* and be living. Then, it must be one of the following:
2166	* 1) Not a player, 2) A player, but of a different party. Note	2152	* 1) Not a player, 2) A player, but of a different party. Note
2167	* that party_number -1 is no party, so attacks can still happen.	2153	* that party_number -1 is no party, so attacks can still happen.
2168	*/	2154	*/
2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2155	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2156	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
		2157	{
		2158	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2171	{	2159	{
2172	op->contr->has_hit = 1;	2160	--op->contr->weapon_sp_left;
2173		2161
2174	skill_attack (mon, op, 0, 0, 0);	2162	skill_attack (mon, op, 0, 0, 0);
2175
2176	/* If attacking another player, that player gets automatic
2177	* hitback, and doesn't loose luck either.
2178	* Disable hitback on the battleground or if the target is
2179	* the wiz.
2180	*/
2181	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2182	{
2183	short luck = mon->stats.luck;
2184
2185	mon->contr->has_hit = 1;
2186	skill_attack (op, mon, 0, 0, 0);
2187	mon->stats.luck = luck;
2188	}
2189		2163
2190	if (action_makes_visible (op))	2164	if (action_makes_visible (op))
2191	make_visible (op);	2165	make_visible (op);
2192	}
2193	} /* if player should attack something */
2194	}
2195		2166
2196	int	2167	return true;
		2168	}
		2169	}
		2170
		2171	return false;
		2172	}
		2173
		2174	bool
2197	move_player (object *op, int dir)	2175	move_player (object *op, int dir)
2198	{	2176	{
2199	int pick;	2177	int pick;
2200		2178
2201	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2179	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2202	return 0;	2180	return 0;
2203		2181
2204	/* Sanity check: make sure dir is valid */	2182	/* Sanity check: make sure dir is valid */
2205	if ((dir < 0) || (dir >= 9))	2183	if ((dir < 0) || (dir >= 9))
2206	{	2184	{
…		…
2215	op->facing = dir;	2193	op->facing = dir;
2216		2194
2217	if (op->hide)	2195	if (op->hide)
2218	do_hidden_move (op);	2196	do_hidden_move (op);
2219		2197
		2198	bool retval;
		2199
2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2200	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2221	/*nop */ ;	2201	retval = RESULT_INT (0);
2222	else if (op->contr->fire_on)	2202	else if (op->contr->fire_on)
2223	fire (op, dir);	2203	retval = fire (op, dir);
2224	else	2204	else
2225	{	2205	{
2226	move_player_attack (op, dir);	2206	retval = move_player_attack (op, dir);
2227	pick = check_pick (op);	2207	pick = check_pick (op);
2228	}	2208	}
2229		2209
2230	/* Add special check for newcs players and fire on - this way, the	2210	/* Add special check for newcs players and fire on - this way, the
2231	* server can handle repeat firing.	2211	* server can handle repeat firing.
…		…
2238	/* Update how the player looks. Use the facing, so direction may	2218	/* Update how the player looks. Use the facing, so direction may
2239	* get reset to zero. This allows for full animation capabilities	2219	* get reset to zero. This allows for full animation capabilities
2240	* for players.	2220	* for players.
2241	*/	2221	*/
2242	animate_object (op, op->facing);	2222	animate_object (op, op->facing);
2243	return 0;	2223
		2224	return retval;
2244	}	2225	}
2245		2226
2246	/* This is similar to handle_player, below, but is only used by the	2227	/* This is similar to handle_player, below, but is only used by the
2247	* new client/server stuff.	2228	* new client/server stuff.
2248	* This is sort of special, in that the new client/server actually uses	2229	* This is sort of special, in that the new client/server actually uses
2249	* the new speed values for commands.	2230	* the new speed values for commands.
2250	*	2231	*
2251	* Returns true if there are more actions we can do.	2232	* Returns true if there are more actions we can do. Should not do
		2233	* many actions in a row, as that would be too unfair to other
		2234	* players.
2252	*/	2235	*/
2253	int	2236	bool
2254	handle_newcs_player (object *op)	2237	handle_newcs_player (object *op)
2255	{	2238	{
2256	if (QUERY_FLAG (op, FLAG_SCARED))	2239	if (QUERY_FLAG (op, FLAG_SCARED))
2257	{	2240	{
2258	flee_player (op);	2241	if (op->speed_left > 0.f)
2259
2260	/* If player is still scared, that is his action for this tick */
2261	if (op->flag [FLAG_SCARED])
2262	{	2242	{
2263	--op->speed_left;	2243	--op->speed_left;
		2244	flee_player (op);
		2245
2264	return 0;	2246	return true;
2265	}	2247	}
		2248	else
		2249	return false;
2266	}	2250	}
2267		2251
2268	/* call this here - we also will call this in do_ericserver, but	2252	/* call this here - we also will call this in do_ericserver, but
2269	* the players time has been increased when doericserver has been	2253	* the players time has been increased when doericserver has been
2270	* called, so we recheck it here.	2254	* called, so we recheck it here.
2271	*/	2255	*/
2272	if (op->contr->ns->handle_command ())	2256	if (op->contr->ns->handle_command ())
2273	return 1;	2257	return true;
2274		2258
2275	if (op->speed_left > 0.f)
2276	{
2277	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2259	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2278	{
2279	/* All move commands take 1 tick, at least for now */
2280	--op->speed_left;
2281
2282	/* Instead of all the stuff below, let move_player take care
2283	* of it. Also, some of the skill stuff is only put in
2284	* there, as well as the confusion stuff.
2285	*/
2286	move_player (op, op->direction);	2260	return move_player (op, op->direction);
2287		2261
2288	return op->speed_left > 0.f;
2289	}
2290	}
2291
2292	return 0;	2262	return false;
2293	}	2263	}
2294		2264
2295	int	2265	int
2296	save_life (object *op)	2266	save_life (object *op)
2297	{	2267	{
…		…
2299	return 0;	2269	return 0;
2300		2270
2301	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2271	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2302	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2272	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2303	{	2273	{
2304	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2274	op->play_sound (sound_find ("ob_evaporate"));
2305	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2275	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2306
2307	if (op->contr)
2308	esrv_del_item (op->contr, tmp->count);
2309		2276
2310	tmp->destroy ();	2277	tmp->destroy ();
2311	CLEAR_FLAG (op, FLAG_LIFESAVE);	2278	CLEAR_FLAG (op, FLAG_LIFESAVE);
2312		2279
2313	if (op->stats.hp < 0)	2280	if (op->stats.hp < 0)
…		…
2326	return 0;	2293	return 0;
2327	}	2294	}
2328		2295
2329	/* This goes throws the inventory and removes unpaid objects, and puts them	2296	/* This goes throws the inventory and removes unpaid objects, and puts them
2330	* back in the map (location and map determined by values of env). This	2297	* back in the map (location and map determined by values of env). This
2331	* function will descend into containers. op is the object to start the search	2298	* function will descend into containers. op is the object to start the search
2332	* from.	2299	* from.
2333	*/	2300	*/
		2301	static void
		2302	drop_unpaid_items (object *op, object *env)
		2303	{
		2304	while (op)
		2305	{
		2306	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
		2307
		2308	if (QUERY_FLAG (op, FLAG_UNPAID))
		2309	op->insert_at (env);
		2310	else if (op->inv)
		2311	drop_unpaid_items (op->inv, env);
		2312
		2313	op = next;
		2314	}
		2315	}
		2316
2334	void	2317	void
2335	remove_unpaid_objects (object *op, object *env)	2318	object::drop_unpaid_items ()
2336	{	2319	{
2337	while (op)	2320	if (!flag [FLAG_REMOVED])
2338	{	2321	::drop_unpaid_items (inv, this);
2339	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2340
2341	if (QUERY_FLAG (op, FLAG_UNPAID))
2342	{
2343	if (env->type == PLAYER)
2344	esrv_del_item (env->contr, op->count);
2345
2346	op->insert_at (env);
2347	}
2348	else if (op->inv)
2349	remove_unpaid_objects (op->inv, env);
2350
2351	op = next;
2352	}
2353	}	2322	}
2354		2323
2355	/*	2324	/*
2356	* Returns pointer a static string containing gravestone text	2325	* Returns pointer a static string containing gravestone text
2357	* Moved from apply.c to player.c - player.c is what	2326	* Moved from apply.c to player.c - player.c is what
2358	* actually uses this function. player.c may not be quite the	2327	* actually uses this function. player.c may not be quite the
2359	* best, a misc file for object actions is probably better,	2328	* best, a misc file for object actions is probably better,
2360	* but there isn't one in the server directory.	2329	* but there isn't one in the server directory.
2361	*/	2330	*/
2362	char *	2331	const char *
2363	gravestone_text (object *op)	2332	gravestone_text (object *op)
2364	{	2333	{
2365	static char buf2[MAX_BUF];	2334	static dynbuf_text buf;
2366	char buf[MAX_BUF];
2367	time_t now = time (NULL);
2368		2335
2369	strcpy (buf2, " R.I.P.\n\n");	2336	buf << "---- R.I.P. ----\n\n";
		2337	op->name;
		2338
2370	if (op->type == PLAYER)	2339	if (op->type == PLAYER)
2371	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);	2340	buf << " the " << op->contr->title;
2372	else
2373	sprintf (buf, "%s\n", &op->name);
2374		2341
2375	strncat (buf2, " ", 20 - strlen (buf) / 2);	2342	buf << "\n\n";
2376	strcat (buf2, buf);	2343
		2344	buf << "who was level ";
		2345	buf << (sint32)op->level << "\n\n" // OO breakdown
		2346	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2347
2377	if (op->type == PLAYER)	2348	if (op->type == PLAYER)
2378	sprintf (buf, "who was in level %d when killed\n", op->level);	2349	buf << "by " << op->contr->killer_name () << ".\n\n";
2379	else
2380	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2381		2350
2382	strncat (buf2, " ", 20 - strlen (buf) / 2);
2383	strcat (buf2, buf);
2384	if (op->type == PLAYER)
2385	{	2351	{
2386	sprintf (buf, "by %s.\n\n", op->contr->killer);	2352	static char buf2[128];
2387	strncat (buf2, " ", 21 - strlen (buf) / 2);	2353	time_t now = time (NULL);
2388	strcat (buf2, buf);
2389	}
2390
2391	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2354	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2392	strncat (buf2, " ", 20 - strlen (buf) / 2);	2355	buf << buf2;
2393	strcat (buf2, buf);	2356	}
2394		2357
2395	return buf2;	2358	return buf;
2396	}	2359	}
2397		2360
2398	void	2361	void
2399	do_some_living (object *op)	2362	do_some_living (object *op)
2400	{	2363	{
…		…
2452	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2415	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2453	else	2416	else
2454	{	2417	{
2455	gen_grace = op->stats.maxgrace;	2418	gen_grace = op->stats.maxgrace;
2456	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2419	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2457	}
2458
2459	/* Regenerate Spell Points */
2460	if (!op->contr->golem && --op->last_sp < 0)
2461	{
2462	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2463	if (op->stats.sp < op->stats.maxsp)
2464	{
2465	op->stats.sp++;
2466	/* dms do not consume food */
2467	if (!QUERY_FLAG (op, FLAG_WIZ))
2468	{
2469	op->stats.food--;
2470	if (op->contr->digestion < 0)
2471	op->stats.food += op->contr->digestion;
2472	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2473	op->stats.food = last_food;
2474	}
2475	}
2476
2477	if (max_sp > 1)
2478	{
2479	over_sp = (gen_sp + 10) / rate_sp;
2480	if (over_sp > 0)
2481	{
2482	if (op->stats.sp < op->stats.maxsp)
2483	{
2484	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2485
2486	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2487	op->stats.sp--;
2488
2489	if (op->stats.sp > op->stats.maxsp)
2490	op->stats.sp = op->stats.maxsp;
2491	}
2492	op->last_sp = 0;
2493	}
2494	else
2495	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2496	}
2497	else
2498	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2499	}	2420	}
2500		2421
2501	/* Regenerate Grace */	2422	/* Regenerate Grace */
2502	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2423	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2503	if (--op->last_grace < 0)	2424	if (--op->last_grace < 0)
…		…
2524	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2445	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2525	}	2446	}
2526	/* wearing stuff doesn't detract from grace generation. */	2447	/* wearing stuff doesn't detract from grace generation. */
2527	}	2448	}
2528		2449
		2450	if (op->stats.food > 0)
		2451	{
2529	/* Regenerate Hit Points */	2452	/* Regenerate Spell Points */
2530	if (--op->last_heal < 0)	2453	if (!op->contr->golem && --op->last_sp < 0)
2531	{
2532	if (op->stats.hp < op->stats.maxhp)
2533	{	2454	{
2534	op->stats.hp++;	2455	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2535	/* dms do not consume food */	2456
2536	if (!QUERY_FLAG (op, FLAG_WIZ))	2457	if (op->stats.sp < op->stats.maxsp)
2537	{	2458	{
		2459	op->stats.sp++;
		2460
		2461	/* dms do not consume food */
		2462	if (!QUERY_FLAG (op, FLAG_WIZ))
		2463	{
2538	op->stats.food--;	2464	op->stats.food--;
		2465
2539	if (op->contr->digestion < 0)	2466	if (op->contr->digestion < 0)
2540	op->stats.food += op->contr->digestion;	2467	op->stats.food += op->contr->digestion;
2541	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2468	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2542	op->stats.food = last_food;	2469	op->stats.food = last_food;
		2470	}
2543	}	2471	}
2544	}
2545		2472
2546	if (max_hp > 1)	2473	if (max_sp > 1)
2547	{
2548	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2549	if (over_hp > 0)
2550	{	2474	{
2551	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2475	over_sp = (gen_sp + 10) / rate_sp;
		2476	if (over_sp > 0)
		2477	{
		2478	if (op->stats.sp < op->stats.maxsp)
		2479	{
		2480	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2481
		2482	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2483	op->stats.sp--;
		2484
		2485	if (op->stats.sp > op->stats.maxsp)
		2486	op->stats.sp = op->stats.maxsp;
		2487	}
		2488
2552	op->last_heal = 0;	2489	op->last_sp = 0;
		2490	}
		2491	else
		2492	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2553	}	2493	}
2554	else	2494	else
		2495	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2496	}
		2497
		2498	/* Regenerate Hit Points */
		2499	if (--op->last_heal < 0)
		2500	{
		2501	if (op->stats.hp < op->stats.maxhp)
2555	{	2502	{
2556	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2503	op->stats.hp++;
		2504
		2505	/* dms do not consume food */
		2506	if (!QUERY_FLAG (op, FLAG_WIZ))
		2507	{
		2508	op->stats.food--;
		2509
		2510	if (op->contr->digestion < 0)
		2511	op->stats.food += op->contr->digestion;
		2512	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2513	op->stats.food = last_food;
		2514	}
2557	}	2515	}
		2516
		2517	if (max_hp > 1)
		2518	{
		2519	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2520
		2521	if (over_hp > 0)
		2522	{
		2523	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2524	op->last_heal = 0;
		2525	}
		2526	else
		2527	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2558	}	2528	}
2559	else	2529	else
2560	{
2561	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2530	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2562	}	2531	}
2563	}	2532	}
2564		2533
2565	/* Digestion */	2534	/* Digestion */
2566	if (--op->last_eat < 0)	2535	if (--op->last_eat < 0)
2567	{	2536	{
2568	#ifdef COZY_SERVER	2537	int bonus = max (0, op->contr->digestion),
2569	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2538	penalty = max (0, -op->contr->digestion);
2570	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2571	#else
2572	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2573	#endif
2574		2539
2575	if (op->contr->gen_hp > 0)
2576	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2540	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2577	else
2578	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2579		2541
2580	/* dms do not consume food */	2542	/* dms do not consume food */
2581	if (!QUERY_FLAG (op, FLAG_WIZ))	2543	if (!QUERY_FLAG (op, FLAG_WIZ))
2582	op->stats.food--;	2544	op->stats.food--;
2583	}	2545	}
…		…
2610	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2572	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2611	manual_apply (op, flesh, 0);	2573	manual_apply (op, flesh, 0);
2612	}	2574	}
2613	}	2575	}
2614		2576
2615	while (op->stats.food < 0 && op->stats.hp >= 0)	2577	if (op->stats.food < 0)
2616	op->stats.food++, op->stats.hp--;	2578	{
		2579	op->stats.hp += op->stats.food;
		2580	op->stats.food = 0;
		2581	}
2617		2582
2618	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2583	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2619	kill_player (op);	2584	kill_player (op);
2620	}	2585	}
2621	}	2586	}
…		…
2626	* file.	2591	* file.
2627	*/	2592	*/
2628	void	2593	void
2629	kill_player (object *op)	2594	kill_player (object *op)
2630	{	2595	{
		2596	int x, y;
2631	char buf[MAX_BUF];	2597	char buf[MAX_BUF];
2632	int x, y;
2633
2634	//int i;
2635	maptile *map; /* this is for resurrection */	2598	maptile *map; /* this is for resurrection */
2636
2637	/* int z;
2638	int num_stats_lose;
2639	int lost_a_stat;
2640	int lose_this_stat;
2641	int this_stat; */
2642	int will_kill_again;	2599	int will_kill_again;
2643	archetype *at;	2600	archetype *at;
2644	object *tmp;	2601	object *tmp;
2645		2602
2646	if (save_life (op))	2603	if (save_life (op))
2647	return;	2604	return;
2648
2649		2605
2650	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2606	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2651	* in cities ONLY!!! It is very important that this doesn't get abused.	2607	* in cities ONLY!!! It is very important that this doesn't get abused.
2652	* Look at op_on_battleground() for more info --AndreasV	2608	* Look at op_on_battleground() for more info --AndreasV
2653	*/	2609	*/
…		…
2669	{	2625	{
2670	tmp->destroy ();	2626	tmp->destroy ();
2671	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2627	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2672	}	2628	}
2673		2629
2674	cure_disease (op, 0); /* remove any disease */	2630	cure_disease (op, 0, 0); /* remove any disease */
2675	op->stats.hp = op->stats.maxhp;	2631	op->stats.hp = op->stats.maxhp;
2676	if (op->stats.food <= 0)	2632	if (op->stats.food <= 0)
2677	op->stats.food = 999;	2633	op->stats.food = 999;
2678		2634
2679	/* create a bodypart-trophy to make the winner happy */	2635	/* create a bodypart-trophy to make the winner happy */
2680	if (object *tmp = arch_to_object (archetype::find ("finger")))	2636	if (object *tmp = arch_to_object (archetype::find ("finger")))
2681	{	2637	{
2682	sprintf (buf, "%s's finger", &op->name);	2638	tmp->name = format ("%s's finger" , &op->name);
2683	tmp->name = buf;	2639	tmp->name_pl = format ("%s's fingers", &op->name);
2684	sprintf (buf, " This finger has been cut off %s\n"
2685	" the %s, when he was defeated at\n level %d by %s.\n",
2686	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2687	tmp->msg = buf;	2640	tmp->msg = format (
		2641	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2642	&op->name, op->contr->title,
		2643	(int)op->level,
		2644	op->contr->killer_name ()
		2645	);
2688	tmp->value = 0, tmp->type = 0;	2646	tmp->value = 0, tmp->type = 0;
2689	tmp->materialname = "organics";	2647	tmp->materialname = "organics";
2690	tmp->insert_at (op, tmp);	2648	tmp->insert_at (op, tmp);
2691	}	2649	}
2692		2650
…		…
2700		2658
2701	command_kill_pets (op, 0);	2659	command_kill_pets (op, 0);
2702		2660
2703	if (op->stats.food < 0)	2661	if (op->stats.food < 0)
2704	{	2662	{
2705	sprintf (buf, "%s starved to death.", &op->name);	2663	op->contr->killer = archetype::get ("killer_starvation");
2706	strcpy (op->contr->killer, "starvation");	2664	op->contr->killer->destroy ();
2707	}	2665	}
2708	else
2709	sprintf (buf, "%s died.", &op->name);
2710		2666
2711	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2667	op->contr->play_sound (sound_find ("player_dies"));
2712		2668
2713	/* save the map location for corpse, gravestone */	2669	/* save the map location for corpse, gravestone */
2714	x = op->x;	2670	x = op->x;
2715	y = op->y;	2671	y = op->y;
2716	map = op->map;	2672	map = op->map;
…		…
2847	tmp = arch_to_object (archetype::find ("gravestone"));	2803	tmp = arch_to_object (archetype::find ("gravestone"));
2848	sprintf (buf, "%s's gravestone", &op->name);	2804	sprintf (buf, "%s's gravestone", &op->name);
2849	tmp->name = buf;	2805	tmp->name = buf;
2850	sprintf (buf, "%s's gravestones", &op->name);	2806	sprintf (buf, "%s's gravestones", &op->name);
2851	tmp->name_pl = buf;	2807	tmp->name_pl = buf;
2852	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2808	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2853	tmp->msg = buf;	2809	tmp->msg = buf;
2854	tmp->x = op->x, tmp->y = op->y;	2810	tmp->x = op->x, tmp->y = op->y;
2855	insert_ob_in_map (tmp, op->map, NULL, 0);	2811	insert_ob_in_map (tmp, op->map, NULL, 0);
2856		2812
2857	/**************************************/	2813	/**************************************/
…		…
2879	{	2835	{
2880	tmp->destroy ();	2836	tmp->destroy ();
2881	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2837	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2882	}	2838	}
2883		2839
2884	cure_disease (op, 0); /* remove any disease */	2840	cure_disease (op, 0, 0); /* remove any disease */
2885		2841
2886	/*add_exp(op, (op->stats.exp * -0.20)); */	2842	/*add_exp(op, (op->stats.exp * -0.20)); */
2887	apply_death_exp_penalty (op);	2843	apply_death_exp_penalty (op);
2888	if (op->stats.food < 100)	2844	if (op->stats.food < 100)
2889	op->stats.food = 900;	2845	op->stats.food = 900;
…		…
2893		2849
2894	/*	2850	/*
2895	* Check to see if the player has any unpaid items. If so, remove them	2851	* Check to see if the player has any unpaid items. If so, remove them
2896	* and put them back in the map.	2852	* and put them back in the map.
2897	*/	2853	*/
2898	remove_unpaid_objects (op->inv, op);	2854	op->drop_unpaid_items ();
2899		2855
2900	/****************************************/	2856	/****************************************/
2901	/* */	2857	/* */
2902	/* Move player to his current respawn- */	2858	/* Move player to his current respawn- */
2903	/* position (usually last savebed) */	2859	/* position (usually last savebed) */
…		…
2962		2918
2963	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2919	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2964	{	2920	{
2965	if (tmp->nrof > 1)	2921	if (tmp->nrof > 1)
2966	{	2922	{
2967	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2923	tmp->decrease (rndm (1, tmp->nrof - 1));
2968	tmp2->destroy ();
2969	insert_ob_in_map (tmp, op->map, NULL, 0);	2924	insert_ob_in_map (tmp, op->map, NULL, 0);
2970	}	2925	}
2971	else	2926	else
2972	tmp->destroy ();	2927	tmp->destroy ();
2973	}	2928	}
…		…
2984	void	2939	void
2985	fix_weight (void)	2940	fix_weight (void)
2986	{	2941	{
2987	for_all_players (pl)	2942	for_all_players (pl)
2988	{	2943	{
2989	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2944	sint32 old = pl->ob->carrying;
2990		2945
2991	if (old == sum)	2946	pl->ob->update_weight ();
2992	continue;	2947
		2948	if (old != pl->ob->carrying)
		2949	{
2993	pl->ob->update_stats ();	2950	pl->ob->update_stats ();
2994	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2951	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2952	}
2995	}	2953	}
2996	}	2954	}
2997		2955
2998	void	2956	void
2999	fix_luck (void)	2957	fix_luck (void)
…		…
3043	void	3001	void
3044	make_visible (object *op)	3002	make_visible (object *op)
3045	{	3003	{
3046	op->hide = 0;	3004	op->hide = 0;
3047	op->invisible = 0;	3005	op->invisible = 0;
		3006
3048	if (op->type == PLAYER)	3007	if (op->type == PLAYER)
3049	{	3008	{
3050	op->contr->tmp_invis = 0;	3009	op->contr->tmp_invis = 0;
3051	op->contr->invis_race = 0;	3010	op->contr->invis_race = 0;
3052	}	3011	}
…		…
3055	}	3014	}
3056		3015
3057	int	3016	int
3058	is_true_undead (object *op)	3017	is_true_undead (object *op)
3059	{	3018	{
3060	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3019	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3061	return 1;	3020	return 1;
3062		3021
3063	return 0;	3022	return 0;
3064	}	3023	}
3065		3024
3066	/* look at the surrounding terrain to determine	3025	/* look at the surrounding terrain to determine
3067	* the hideability of this object. Positive levels	3026	* the hideability of this object. Positive levels
3068	* indicate greater hideability.	3027	* indicate greater hideability.
3069	*/	3028	*/
3070
3071	int	3029	int
3072	hideability (object *ob)	3030	hideability (object *ob)
3073	{	3031	{
3074	int i, level = 0, mflag;	3032	int i, level = 0, mflag;
3075	sint16 x, y;	3033	sint16 x, y;
…		…
3085	* as bad as carrying a light on a pitch dark map */	3043	* as bad as carrying a light on a pitch dark map */
3086	if (has_carried_lights (ob))	3044	if (has_carried_lights (ob))
3087	level = -(10 + (2 * ob->map->darkness));	3045	level = -(10 + (2 * ob->map->darkness));
3088		3046
3089	/* scan through all nearby squares for terrain to hide in */	3047	/* scan through all nearby squares for terrain to hide in */
3090	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	3048	for (i = 0, x = ob->x, y = ob->y;
		3049	i <= SIZEOFFREE1;
		3050	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3091	{	3051	{
3092	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	3052	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3093	if (mflag & P_OUT_OF_MAP)	3053	if (mflag & P_OUT_OF_MAP)
3094	{
3095	continue;	3054	continue;
3096	}	3055
3097	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	3056	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3098	level += 2;	3057	level += 2;
3099	else /* open terrain! */	3058	else /* open terrain! */
3100	level -= 1;	3059	level -= 1;
3101	}	3060	}
…		…
3109	/* For Hidden creatures - a chance of becoming 'unhidden'	3068	/* For Hidden creatures - a chance of becoming 'unhidden'
3110	* every time they move - as we subtract off 'invisibility'	3069	* every time they move - as we subtract off 'invisibility'
3111	* AND, for players, if they move into a ridiculously unhideable	3070	* AND, for players, if they move into a ridiculously unhideable
3112	* spot (surrounded by clear terrain in broad daylight). -b.t.	3071	* spot (surrounded by clear terrain in broad daylight). -b.t.
3113	*/	3072	*/
3114
3115	void	3073	void
3116	do_hidden_move (object *op)	3074	do_hidden_move (object *op)
3117	{	3075	{
3118	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3076	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3119	object *skop;	3077	object *skop;
…		…
3201	* object op. This function works fine for monsters,	3159	* object op. This function works fine for monsters,
3202	* but we dont worry if the object isnt the top one in	3160	* but we dont worry if the object isnt the top one in
3203	* a pile (say a coin under a table would return "viewable"	3161	* a pile (say a coin under a table would return "viewable"
3204	* by this routine). Another question, should we be	3162	* by this routine). Another question, should we be
3205	* concerned with the direction the player is looking	3163	* concerned with the direction the player is looking
3206	* in? Realistically, most of use cant see stuff behind	3164	* in? Realistically, most of us can't see stuff behind
3207	* our backs...on the other hand, does the "facing" direction	3165	* our backs...on the other hand, does the "facing" direction
3208	* imply the way your head, or body is facing? Its possible	3166	* imply the way your head, or body is facing? It's possible
3209	* for them to differ. Sigh, this fctn could get a bit more complex.	3167	* for them to differ. Sigh, this fctn could get a bit more complex.
3210	* -b.t.	3168	* -b.t.
3211	* This function is now map tiling safe.	3169	* This function is now map tiling safe.
3212	*/	3170	*/
3213
3214	int	3171	int
3215	player_can_view (object *pl, object *op)	3172	player_can_view (object *pl, object *op)
3216	{	3173	{
3217	rv_vector rv;	3174	rv_vector rv;
3218	int dx, dy;	3175	int dx, dy;
…		…
3230		3187
3231	get_rangevector (pl, op, &rv, 0x1);	3188	get_rangevector (pl, op, &rv, 0x1);
3232		3189
3233	/* starting with the 'head' part, lets loop	3190	/* starting with the 'head' part, lets loop
3234	* through the object and find if it has any	3191	* through the object and find if it has any
3235	* part that is in the los array but isnt on	3192	* part that is in the los array but isn't on
3236	* a blocked los square.	3193	* a blocked los square.
3237	* we use the archetype to figure out offsets.	3194	* we use the archetype to figure out offsets.
3238	*/	3195	*/
3239	while (op)	3196	while (op)
3240	{	3197	{
3241	dx = rv.distance_x + op->arch->clone.x;	3198	dx = rv.distance_x + op->arch->x;
3242	dy = rv.distance_y + op->arch->clone.y;	3199	dy = rv.distance_y + op->arch->y;
3243		3200
3244	/* only the viewable area the player sees is updated by LOS	3201	/* only the viewable area the player sees is updated by LOS
3245	* code, so we need to restrict ourselves to that range of values	3202	* code, so we need to restrict ourselves to that range of values
3246	* for any meaningful values.	3203	* for any meaningful values.
3247	*/	3204	*/
3248	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&	3205	if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3249	FABS (dy) <= (pl->contr->ns->mapy / 2) &&	3206	abs (dy) <= (pl->contr->ns->mapy / 2) &&
3250	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])	3207	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3251	return 1;	3208	return 1;
		3209
3252	op = op->more;	3210	op = op->more;
3253	}	3211	}
		3212
3254	return 0;	3213	return 0;
3255	}	3214	}
3256		3215
3257	/* routine for both players and monsters. We call this when	3216	/* routine for both players and monsters. We call this when
3258	* there is a possibility for our action distrubing our hiding	3217	* there is a possibility for our action distrubing our hiding
…		…
3261	* return 0.	3220	* return 0.
3262	*/	3221	*/
3263	int	3222	int
3264	action_makes_visible (object *op)	3223	action_makes_visible (object *op)
3265	{	3224	{
3266
3267	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	3225	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3268	{	3226	{
3269	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	3227	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3270	return 0;	3228	return 0;
3271		3229
…		…
3277	{	3235	{
3278	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");	3236	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3279	return 1;	3237	return 1;
3280	}	3238	}
3281	}	3239	}
		3240
3282	return 0;	3241	return 0;
3283	}	3242	}
3284		3243
3285	/* op_on_battleground - checks if the given object op (usually	3244	/* op_on_battleground - checks if the given object op (usually
3286	* a player) is standing on a valid battleground-tile,	3245	* a player) is standing on a valid battleground-tile,
…		…
3291	* Default is to do the same as before, so only people wanting to have different points need worry about this	3250	* Default is to do the same as before, so only people wanting to have different points need worry about this
3292	*/	3251	*/
3293	int	3252	int
3294	op_on_battleground (object *op, int *x, int *y)	3253	op_on_battleground (object *op, int *x, int *y)
3295	{	3254	{
3296	object *tmp;
3297
3298	/* A battleground-tile needs the following attributes to be valid:	3255	/* A battleground-tile needs the following attributes to be valid:
3299	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3256	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3300	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3257	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3301	* and the exit-coordinates sp/hp must both be > 0.	3258	* and the exit-coordinates sp/hp must both be > 0.
3302	* => The intention here is to prevent abuse of the battleground-	3259	* => The intention here is to prevent abuse of the battleground-
3303	* feature (like pickable or hidden battleground tiles). */	3260	* feature (like pickable or hidden battleground tiles). */
3304	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3261	for (object *tmp = op->below; tmp; tmp = tmp->below)
3305	{	3262	{
3306	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3263	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3307	{	3264	{
3308	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3265	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3309	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3266	&& tmp->type == BATTLEGROUND
		3267	&& tmp->name == shstr_battleground
		3268	&& EXIT_X (tmp) && EXIT_Y (tmp))
3310	{	3269	{
3311	/*before we assign the exit, check if this is a teambattle */	3270	/* before we assign the exit, check if this is a teambattle */
3312	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3271	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3313	{	3272	{
3314	object *invtmp;
3315
3316	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3273	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3317	{	3274	{
3318	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))	3275	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3319	{	3276	{
3320	if (x != NULL && y != NULL)	3277	if (x && y)
3321	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3278	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3279
3322	return 1;	3280	return 1;
3323	}	3281	}
3324	}	3282	}
3325	}	3283	}
		3284
3326	if (x != NULL && y != NULL)	3285	if (x && y)
3327	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3286	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3287
3328	return 1;	3288	return 1;
3329	}	3289	}
3330	}	3290	}
3331	}	3291	}
		3292
3332	/* If we got here, did not find a battleground */	3293	/* If we got here, did not find a battleground */
3333	return 0;	3294	return 0;
3334	}	3295	}
3335		3296
3336	/*	3297	/*
…		…
3352	char buf[MAX_BUF]; /* tmp. string buffer */	3313	char buf[MAX_BUF]; /* tmp. string buffer */
3353	int i = 0, j = 0;	3314	int i = 0, j = 0;
3354		3315
3355	/* get the appropriate treasurelist */	3316	/* get the appropriate treasurelist */
3356	if (atnr == ATNR_FIRE)	3317	if (atnr == ATNR_FIRE)
3357	trlist = treasurelist::find ("dragon_ability_fire");	3318	trlist = treasurelist::find (shstr_dragon_ability_fire);
3358	else if (atnr == ATNR_COLD)	3319	else if (atnr == ATNR_COLD)
3359	trlist = treasurelist::find ("dragon_ability_cold");	3320	trlist = treasurelist::find (shstr_dragon_ability_cold);
3360	else if (atnr == ATNR_ELECTRICITY)	3321	else if (atnr == ATNR_ELECTRICITY)
3361	trlist = treasurelist::find ("dragon_ability_elec");	3322	trlist = treasurelist::find (shstr_dragon_ability_elec);
3362	else if (atnr == ATNR_POISON)	3323	else if (atnr == ATNR_POISON)
3363	trlist = treasurelist::find ("dragon_ability_poison");	3324	trlist = treasurelist::find (shstr_dragon_ability_poison);
3364		3325
3365	if (trlist == NULL || who->type != PLAYER)	3326	if (trlist == NULL || who->type != PLAYER)
3366	return;	3327	return;
3367		3328
3368	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3329	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3372	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3333	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3373	return;	3334	return;
3374	}	3335	}
3375		3336
3376	/* everything seems okay - now bring on the gift: */	3337	/* everything seems okay - now bring on the gift: */
3377	item = &(tr->item->clone);	3338	item = tr->item;
3378		3339
3379	if (item->type == SPELL)	3340	if (item->type == SPELL)
3380	{	3341	{
3381	if (check_spell_known (who, item->name))	3342	if (check_spell_known (who, item->name))
3382	return;	3343	return;
…		…
3441	{	3402	{
3442	/* forces in the treasurelist can alter the player's stats */	3403	/* forces in the treasurelist can alter the player's stats */
3443	object *skin;	3404	object *skin;
3444		3405
3445	/* first get the dragon skin force */	3406	/* first get the dragon skin force */
3446	shstr_cmp dragon_skin_force ("dragon_skin_force");
3447	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3407	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3448	;	3408	;
3449		3409
3450	if (!skin)	3410	if (!skin)
3451	return;	3411	return;
3452		3412
…		…
3487	else	3447	else
3488	{	3448	{
3489	/* generate misc. treasure */	3449	/* generate misc. treasure */
3490	tmp = arch_to_object (tr->item);	3450	tmp = arch_to_object (tr->item);
3491	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3451	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3492	tmp = insert_ob_in_ob (tmp, who);	3452	who->insert (tmp);
3493	if (who->type == PLAYER)
3494	esrv_send_item (who, tmp);
3495	}	3453	}
3496	}	3454	}
3497		3455
3498	/**	3456	/**
3499	* Unready an object for a player. This function does nothing if the object was	3457	* Unready an object for a player. This function does nothing if the object was
…		…
3528	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3486	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3529	return 0;	3487	return 0;
3530		3488
3531	return 100 - blocked_los [x][y];	3489	return 100 - blocked_los [x][y];
3532	}	3490	}
		3491
		3492	void
		3493	player::infobox (const char *title, const char *msg, int color)
		3494	{
		3495	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3496	}
		3497
		3498	void
		3499	player::statusmsg (const char *msg, int color)
		3500	{
		3501	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3502	}
		3503
		3504	void
		3505	player::failmsg (const char *msg, int color)
		3506	{
		3507	play_sound (sound_find ("generic_failure"));
		3508	statusmsg (msg, color);
		3509	}
		3510

Diff Legend

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