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

Diff Legend

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