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.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC

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

Diff Legend

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