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.75 by root, Sat Dec 30 21:15:59 2006 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32		32
33	#include <algorithm>	33	#include <algorithm>
34	#include <functional>	34	#include <functional>
35		35
36	player *	36	playervec players;
37	find_player (const char *plname)
38	{
39	for_all_players (pl)
40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
41	return pl;
42
43	return 0;
44	}
45		37
46	void	38	void
47	display_motd (const object *op)	39	display_motd (const object *op)
48	{	40	{
49	char buf[MAX_BUF];	41	char buf[MAX_BUF];
…		…
123		115
124	news[0] = '\0';	116	news[0] = '\0';
125	subject[0] = '\0';	117	subject[0] = '\0';
126	size = 0;	118	size = 0;
127		119
128	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
129	{	121	{
130	if (*buf == '#')	122	if (*buf == '#')
131	continue;	123	continue;
132		124
133	if (*buf == '%')	125	if (*buf == '%')
134	{ /* send one news */	126	{ /* send one news */
135	if (size > 0)	127	if (size > 0)
136	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */	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
137	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
138	strip_endline (subject);	131	strip_endline (subject);
139	size = 0;	132	size = 0;
140	news[0] = '\0';	133	news[0] = '\0';
141	}	134	}
…		…
150	size += strlen (buf);	143	size += strlen (buf);
151	}	144	}
152	}	145	}
153		146
154	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
157	}	150	}
158		151
159	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
160	static void	153	static void
161	set_first_map (object *op)	154	set_first_map (object *op)
162	{	155	{
163	strcpy (op->contr->maplevel, first_map_path);	156	op->contr->maplevel = first_map_path;
164	op->x = -1;	157	op->x = -1;
165	op->y = -1;	158	op->y = -1;
166	}	159	}
167		160
168	void	161	void
169	player::enter_map ()	162	player::activate ()
170	{	163	{
171	object *tmp = object::create ();	164	if (active)
		165	return;
172		166
173	EXIT_PATH (tmp) = maplevel;	167	players.insert (this);
174	EXIT_X (tmp) = ob->x;	168	ob->remove ();
175	EXIT_Y (tmp) = ob->y;	169	ob->map = 0;
176	ob->enter_exit (tmp);	170	ob->activate_recursive ();
		171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
		173	}
177		174
178	tmp->destroy ();	175	void
		176	player::deactivate ()
		177	{
		178	if (!active)
		179	return;
		180
		181	terminate_all_pets (ob);
		182	remove_friendly_object (ob);
		183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
		188	ob->remove ();
		189	ob->map = 0;
		190	party = 0;
		191
		192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		193
		194	players.erase (this);
179	}	195	}
180		196
181	// connect the player with a specific client	197	// connect the player with a specific client
182	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
183	void	199	void
184	player::connect (client *ns)	200	player::connect (client *ns)
185	{	201	{
186	this->ns = ns;	202	this->ns = ns;
187	ns->pl = this;	203	ns->pl = this;
188		204
189	next = first_player;	205	run_on = 0;
190	first_player = this;	206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
191		208
192	ns->update_look = 0;	209	ns->update_look = 0;
193	ns->look_position = 0;	210	ns->look_position = 0;
194		211
195	clear_los (ob);	212	clear_los (ob);
		213
		214	ns->reset_stats ();
196		215
197	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
198	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
199	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
200		219
201	if (!legal_range (ob, shoottype))
202	shoottype = range_none;
203
204	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
205	link_player_skills (ob);	221	link_player_skills (ob);
206		222
207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208		224
209	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
210
211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
212	* from the class, and not race. I don't see any way to get the class information
213	* to then update this. I don't think this will actually break anything - anyone
214	* that can use armour should be able to use a shield. What this may 'break'
215	* are features new characters get, eg, if someone starts up with a Q, they
216	* should be able to use a shield. However, old Q's won't get that advantage.
217	*/
218	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219	SET_FLAG (ob, FLAG_USE_SHIELD);
220		226
221	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
222	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
223	{	229	{
224	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
…		…
234	skin = tmp;	240	skin = tmp;
235		241
236	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
237	}	243	}
238		244
239	CLEAR_FLAG (ob, FLAG_FRIENDLY);
240	add_friendly_object (ob);
241
242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		246
246	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
247		248
		249	ob->flag [FLAG_READY_WEAPON] = false;
		250	ob->flag [FLAG_READY_SKILL] = false;
		251	ob->flag [FLAG_READY_BOW] = false;
		252
		253	for (object *op = ob->inv; op; op = op->below)
		254	if (op->flag [FLAG_APPLIED])
		255	switch (op->type)
		256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
		261	case WAND:
		262	case ROD:
		263	case HORN:
		264	case BOW:
		265	ranged_ob = op;
		266	break;
		267
		268	case WEAPON:
		269	combat_ob = op;
		270	break;
		271	}
		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
248	ob->update_stats ();	274	ob->update_stats ();
		275
249	ns->floorbox_update ();	276	ns->floorbox_update ();
250
251	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
252	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
253		279
254	ob->activate (1);	280	activate ();
255	enter_map ();
256		281
257	send_rules (ob);	282	send_rules (ob);
258	send_news (ob);	283	send_news (ob);
259	display_motd (ob);	284	display_motd (ob);
		285
		286	INVOKE_PLAYER (CONNECT, this);
260	INVOKE_PLAYER (LOGIN, this);	287	INVOKE_PLAYER (LOGIN, this);
261	}	288	}
262		289
263	void	290	void
264	player::disconnect ()	291	player::disconnect ()
265	{	292	{
		293	if (ns)
		294	{
		295	if (active)
		296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		297
		298	INVOKE_PLAYER (DISCONNECT, this);
		299
		300	ns->reset_stats ();
		301	ns->pl = 0;
		302	ns = 0;
		303	}
		304
266	if (ob)	305	if (ob)
		306	ob->close_container (); //TODO: client-specific
		307
267	ob->deactivate (1);	308	deactivate ();
268
269	//TODO: don't be so harsh and destroy :)
270	if (ns)
271	{
272	if (enable_save)
273	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274
275	client *ns = this->ns;
276	ns->send_packet ("goodbye");
277	ns->flush ();
278	ns->pl = 0;
279	this->ns = 0;
280
281	ns->destroy ();
282	destroy ();
283	}
284	}	309	}
285		310
286	// the need for this function can be explained	311	// the need for this function can be explained
287	// by load_object not returning the object	312	// by load_object not returning the object
288	void	313	void
289	player::set_object (object *op)	314	player::set_object (object *op)
290	{	315	{
291	ob = op;	316	ob = op;
292	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
293		318
		319	ob->speed = 1.0f;
294	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
295	ob->speed = 1.0;	321
296	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
297	ob->stats.wc = 2;
298	ob->run_away = 25; /* Then we panick... */
299
300	set_first_map (ob);
301	enter_map ();
302
303	ob->roll_stats ();
304	}	323	}
305		324
306	player::player ()	325	player::player ()
307	{	326	{
308	/* There are some elements we want initialized to non zero value -	327	/* There are some elements we want initialised to non zero value -
309	* we deal with that below this point.	328	* we deal with that below this point.
310	*/	329	*/
311	outputs_sync = 16; /* Every 2 seconds */	330	outputs_sync = 4;
312	outputs_count = 8; /* Keeps present behaviour */	331	outputs_count = 4;
313	unapply = unapply_nochoice;	332	unapply = unapply_nochoice;
314		333
315	assign (savebed_map, first_map_path); /* Init. respawn position */	334	savebed_map = first_map_path; /* Init. respawn position */
316		335
317	gen_sp_armour = 10;	336	gen_sp_armour = 10;
318	last_speed = -1;
319	shoottype = range_none;
320	bowtype = bow_normal;	337	bowtype = bow_normal;
321	petmode = pet_normal;	338	petmode = pet_normal;
322	listening = 10;	339	listening = 10;
323	usekeys = containers;	340	usekeys = containers;
324	last_weapon_sp = -1;
325	peaceful = 1; /* default peaceful */	341	peaceful = 1; /* default peaceful */
326	do_los = 1;	342	do_los = 1;
327		343
328	/* we need to clear these to -1 and not zero - otherwise,	344	weapon_sp = 1.0f;
329	* if a player quits and starts a new character, we wont	345	weapon_sp_left = 0.5f;
330	* send new values to the client, as things like exp start
331	* at zero.
332	*/
333	for (int i = 0; i < NUM_SKILLS; i++)
334	last_skill_exp[i] = -1;
335
336	for (int i = 0; i < NROFATTACKS; i++)
337	last_resist[i] = -1;
338
339	last_stats.exp = -1;
340	last_weight = (uint32) - 1;
341	}	346	}
342		347
343	void	348	void
344	player::do_destroy ()	349	player::do_destroy ()
345	{	350	{
346	disconnect ();	351	disconnect ();
347		352
348	save (false);
349	enable_save = false;
350
351	attachable::do_destroy ();	353	attachable::do_destroy ();
352
353	terminate_all_pets (ob);
354
355	if (first_player != this)
356	{
357	player *prev = first_player;
358
359	while (prev && prev->next && prev->next != this)
360	prev = prev->next;
361
362	if (prev->next != this)
363	{
364	LOG (llevError, "Free_player: Can't find previous player.\n");
365	abort ();
366	}
367
368	prev->next = next;
369	}
370	else
371	first_player = next;
372		354
373	if (ob)	355	if (ob)
374	{	356	{
375	ob->destroy_inv (false);	357	ob->destroy_inv (false);
376	ob->destroy ();	358	ob->destroy ();
…		…
391	player::create ()	373	player::create ()
392	{	374	{
393	player *pl = new player;	375	player *pl = new player;
394		376
395	pl->set_object (arch_to_object (get_player_archetype (0)));	377	pl->set_object (arch_to_object (get_player_archetype (0)));
		378
		379	pl->ob->roll_stats ();
		380	pl->ob->stats.wc = 2;
		381	pl->ob->run_away = 25; /* Then we panick... */
		382
		383	set_first_map (pl->ob);
396		384
397	return pl;	385	return pl;
398	}	386	}
399		387
400	/*	388	/*
…		…
431	object *op = NULL;	419	object *op = NULL;
432	objectlink *ol;	420	objectlink *ol;
433	unsigned lastdist;	421	unsigned lastdist;
434	rv_vector rv;	422	rv_vector rv;
435		423
436	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	424	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
437	{	425	{
438	/* We should not find free objects on this friendly list, but it	426	/* We should not find free objects on this friendly list, but it
439	* does periodically happen. Given that, lets deal with it.	427	* does periodically happen. Given that, lets deal with it.
440	* While unlikely, it is possible the next object on the friendly	428	* While unlikely, it is possible the next object on the friendly
441	* list is also free, so encapsulate this in a while loop.	429	* list is also free, so encapsulate this in a while loop.
…		…
445	object *tmp = ol->ob;	433	object *tmp = ol->ob;
446		434
447	/* Can't do much more other than log the fact, because the object	435	/* Can't do much more other than log the fact, because the object
448	* itself will have been cleared.	436	* itself will have been cleared.
449	*/	437	*/
450	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	438	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		439	tmp->debug_desc ());
451	ol = ol->next;	440	ol = ol->next;
452	remove_friendly_object (tmp);	441	remove_friendly_object (tmp);
453	if (!ol)	442	if (!ol)
454	return op;	443	return op;
455	}	444	}
…		…
544	x = mon->x;	533	x = mon->x;
545	y = mon->y;	534	y = mon->y;
546	m = mon->map;	535	m = mon->map;
547	dir = rv.direction;	536	dir = rv.direction;
548	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	537	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
549	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	538	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		539
550	/* If we can't solve it within the search distance, return now. */	540	/* If we can't solve it within the search distance, return now. */
551	if (diff > max)	541	if (diff > max)
552	return 0;	542	return 0;
		543
553	while (diff > 1 && max > 0)	544	while (diff > 1 && max > 0)
554	{	545	{
555	lastx = x;	546	lastx = x;
556	lasty = y;	547	lasty = y;
557	lastmap = m;	548	lastmap = m;
…		…
639	max--;	630	max--;
640	lastdir = dir;	631	lastdir = dir;
641	if (!firstdir)	632	if (!firstdir)
642	firstdir = dir;	633	firstdir = dir;
643	}	634	}
		635
644	if (diff <= 1)	636	if (diff <= 1)
645	{	637	{
646	/* Recalculate diff (distance) because we may not have actually	638	/* Recalculate diff (distance) because we may not have actually
647	* headed toward player for entire distance.	639	* headed toward player for entire distance.
648	*/	640	*/
649	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	641	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
650	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	642	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
651	}	643	}
		644
652	if (diff > max)	645	if (diff > max)
653	return 0;	646	return 0;
654	}	647	}
		648
655	/* If we reached the max, didn't find a direction in time */	649	/* If we reached the max, didn't find a direction in time */
656	if (!max)	650	if (!max)
657	return 0;	651	return 0;
658		652
659	return firstdir;	653	return firstdir;
…		…
773	roll_stat (void)	767	roll_stat (void)
774	{	768	{
775	int a[4], i, j, k;	769	int a[4], i, j, k;
776		770
777	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
778	a[i] = (int) RANDOM () % 6 + 1;	772	a[i] = (int) rndm (6) + 1;
779		773
780	for (i = 0, j = 0, k = 7; i < 4; i++)	774	for (i = 0, j = 0, k = 7; i < 4; i++)
781	if (a[i] < k)	775	if (a[i] < k)
782	k = a[i], j = i;	776	k = a[i], j = i;
783		777
…		…
789	}	783	}
790		784
791	void	785	void
792	object::roll_stats ()	786	object::roll_stats ()
793	{	787	{
794	int statsort [7];	788	int statsort [NUM_STATS];
795		789
796	for (;;)	790	for (;;)
797	{	791	{
798	int sum = 0;	792	int sum = 0;
799	for (int i = 7; i--; )	793	for (int i = NUM_STATS; i--; )
800	sum += statsort [i] = roll_stat ();	794	sum += statsort [i] = roll_stat ();
801		795
802	if (sum >= 82 && sum <= 116)	796	if (sum >= 82 && sum <= 116)
803	break;	797	break;
804	}	798	}
805		799
806	// Sort the stats so that rerolling is easier...	800	// Sort the stats so that rerolling is easier...
807	std::sort (statsort, statsort + 7, std::greater<int>());	801	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
808		802
		803	for (int i = 0; i < NUM_STATS; ++i)
809	stats.Str = statsort[0];	804	stats.stat (i) = statsort [i];
810	stats.Dex = statsort[1];
811	stats.Con = statsort[2];
812	stats.Int = statsort[3];
813	stats.Wis = statsort[4];
814	stats.Pow = statsort[5];
815	stats.Cha = statsort[6];
816		805
817	stats.exp = 0;	806	stats.exp = 0;
818	stats.ac = 0;	807	stats.ac = 0;
819		808
820	stats.hp = stats.maxhp;	809	stats.hp = stats.maxhp;
…		…
832	}	821	}
833		822
834	void	823	void
835	object::swap_stats (int a, int b)	824	object::swap_stats (int a, int b)
836	{	825	{
837	int tmp = get_attr_value (&contr->orig_stats, a);	826	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
838	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
839	set_attr_value (&contr->orig_stats, b, tmp);
840		827
		828	for (int i = 0; i < NUM_STATS; ++i)
841	stats.Str = contr->orig_stats.Str;	829	stats.stat (i) = contr->orig_stats.stat (i);
842	stats.Dex = contr->orig_stats.Dex;
843	stats.Con = contr->orig_stats.Con;
844	stats.Int = contr->orig_stats.Int;
845	stats.Wis = contr->orig_stats.Wis;
846	stats.Pow = contr->orig_stats.Pow;
847	stats.Cha = contr->orig_stats.Cha;
848		830
849	//TODO: the following code looks so borked and should, at the very least,	831	//TODO: the following code looks so borked and should, at the very least,
850	// be merged with the similar code in roll_stats	832	// be merged with the similar code in roll_stats
851	stats.ac = 0;	833	stats.ac = 0;
852		834
…		…
883	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
884	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
885	* separate race and class; this actually changes the RACE,	867	* separate race and class; this actually changes the RACE,
886	* not the class.	868	* not the class.
887	*/	869	*/
888	int	870	void
889	key_change_class (object *op, char key)	871	player::chargen_race_done ()
890	{	872	{
891	int tmp_loop;
892
893	if (key == 'd' || key == 'D')
894	{
895	char buf[MAX_BUF];
896
897	/* this must before then initial items are given */	873	/* this must before then initial items are given */
898	esrv_new_player (op->contr, op->weight + op->carrying);	874	esrv_new_player (ob->contr, ob->weight + ob->carrying);
899		875
900	treasurelist *tl = find_treasurelist ("starting_wealth");	876	treasurelist *tl = treasurelist::find ("starting_wealth");
901	if (tl)	877	if (tl)
902	create_treasure (tl, op, 0, 0, 0);	878	create_treasure (tl, ob, 0, 0, 0);
903		879
904	INVOKE_PLAYER (BIRTH, op->contr);	880	INVOKE_PLAYER (BIRTH, ob->contr);
905	INVOKE_PLAYER (LOGIN, op->contr);	881	INVOKE_PLAYER (LOGIN, ob->contr);
906		882
907	op->contr->ns->state = ST_PLAYING;	883	ob->contr->ns->state = ST_PLAYING;
908		884
909	if (op->msg)	885	if (ob->msg)
910	op->msg = NULL;	886	ob->msg = 0;
911		887
912	/* We create this now because some of the unique maps will need it	888	/* We create this now because some of the unique maps will need it
913	* to save here.	889	* to save here.
914	*/	890	*/
		891	{
		892	char buf[MAX_BUF];
915	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	893	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
916	make_path_to_file (buf);	894	make_path_to_file (buf);
		895	}
917		896
918	#ifdef AUTOSAVE
919	op->contr->last_save_tick = pticks;
920	#endif
921	start_info (op);	897	start_info (ob);
922	CLEAR_FLAG (op, FLAG_WIZ);	898	CLEAR_FLAG (ob, FLAG_WIZ);
923	give_initial_items (op, op->randomitems);	899	give_initial_items (ob, ob->randomitems);
924	link_player_skills (op);	900	link_player_skills (ob);
925	esrv_send_inventory (op, op);	901	esrv_send_inventory (ob, ob);
926	op->update_stats ();	902	ob->update_stats ();
927		903
928	/* This moves the player to a different start map, if there	904	/* This moves the player to a different start map, if there
929	* is one for this race	905	* is one for this race
930	*/	906	*/
931	if (*first_map_ext_path)	907	if (*first_map_ext_path)
932	{	908	{
933	object *tmp;	909	object *tmp;
934	char mapname[MAX_BUF];	910	char mapname[MAX_BUF];
935		911
936	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
937	tmp = object::create ();	913	tmp = object::create ();
938	EXIT_PATH (tmp) = mapname;	914	EXIT_PATH (tmp) = mapname;
939	EXIT_X (tmp) = op->x;	915	EXIT_X (tmp) = ob->x;
940	EXIT_Y (tmp) = op->y;	916	EXIT_Y (tmp) = ob->y;
941	op->enter_exit (tmp); /* we don't really care if it succeeded;	917	ob->enter_exit (tmp); /* we don't really care if it succeeded;
942	* if the map isn't there, then stay on the	918	* if the map isn't there, then stay on the
943	* default initial map */	919	* default initial map */
944	tmp->destroy ();	920	tmp->destroy ();
945	}	921	}
946	else	922	else
947	LOG (llevDebug, "first_map_ext_path not set\n");	923	LOG (llevDebug, "first_map_ext_path not set\n");
		924	}
948		925
949	return 0;	926	void
950	}	927	player::chargen_race_next ()
951		928	{
952	/* Following actually changes the race - this is the default command	929	/* Following actually changes the race - this is the default command
953	* if we don't match with one of the options above.	930	* if we don't match with one of the options above.
954	*/	931	*/
955		932
956	tmp_loop = 0;	933	do
957	while (!tmp_loop)
958	{	934	{
959	shstr name = op->name;	935	shstr name = ob->name;
960	int x = op->x, y = op->y;	936	int x = ob->x, y = ob->y;
961		937
962	op->remove_statbonus ();	938	ob->remove_statbonus ();
963	op->remove ();	939	ob->remove ();
964	op->arch = get_player_archetype (op->arch);	940	ob->arch = get_player_archetype (ob->arch);
965	op->arch->clone.copy_to (op);	941	ob->arch->clone.copy_to (ob);
966	op->instantiate ();	942	ob->instantiate ();
967	op->stats = op->contr->orig_stats;	943	ob->stats = ob->contr->orig_stats;
968	op->name = op->name_pl = name;	944	ob->name = ob->name_pl = name;
969	op->x = x;	945	ob->x = x;
970	op->y = y;	946	ob->y = y;
971	SET_ANIMATION (op, 2); /* So player faces south */	947	SET_ANIMATION (ob, 2); /* So player faces south */
972	insert_ob_in_map (op, op->map, op, 0);	948	insert_ob_in_map (ob, ob->map, ob, 0);
973	assign (op->contr->title, op->arch->clone.name);	949	assign (ob->contr->title, ob->arch->clone.name);
974	op->add_statbonus ();	950	ob->add_statbonus ();
975	tmp_loop = allowed_class (op);
976	}	951	}
		952	while (!allowed_class (ob));
977		953
978	update_object (op, UP_OBJ_FACE);	954	update_object (ob, UP_OBJ_FACE);
979	esrv_update_item (UPD_FACE, op, op);	955	esrv_update_item (UPD_FACE, ob, ob);
980	op->update_stats ();	956	ob->update_stats ();
981	op->stats.hp = op->stats.maxhp;	957	ob->stats.hp = ob->stats.maxhp;
982	op->stats.sp = op->stats.maxsp;	958	ob->stats.sp = ob->stats.maxsp;
983	op->stats.grace = 0;	959	ob->stats.grace = 0;
984
985	if (op->msg)
986	new_draw_info (NDI_BLUE, 0, op, op->msg);
987
988	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
989	return 0;
990	}
991
992	int
993	key_confirm_quit (object *op, char key)
994	{
995	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
996	{
997	op->contr->ns->state = ST_PLAYING;
998	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
999	return 1;
1000	}
1001
1002	INVOKE_PLAYER (LOGOUT, op->contr);
1003	INVOKE_PLAYER (QUIT, op->contr);
1004
1005	op->contr->enable_save = false;
1006
1007	terminate_all_pets (op);
1008	op->remove ();
1009	op->direction = 0;
1010	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1011
1012	strcpy (op->contr->killer, "quit");
1013	check_score (op);
1014	op->contr->party = 0;
1015	op->contr->own_title[0] = '\0';
1016	op->contr->destroy ();
1017
1018	return 1;
1019	}	960	}
1020		961
1021	void	962	void
1022	flee_player (object *op)	963	flee_player (object *op)
1023	{	964	{
…		…
1070	/* Cornered, get rid of scared */	1011	/* Cornered, get rid of scared */
1071	CLEAR_FLAG (op, FLAG_SCARED);	1012	CLEAR_FLAG (op, FLAG_SCARED);
1072	op->enemy = NULL;	1013	op->enemy = NULL;
1073	}	1014	}
1074		1015
1075
1076	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1016	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1077	* IT returns 1 if the player should keep on moving, 0 if he should	1017	* It returns 1 if the player should keep on moving, 0 if he should
1078	* stop.	1018	* stop.
1079	*/	1019	*/
1080	int	1020	int
1081	check_pick (object *op)	1021	check_pick (object *op)
1082	{	1022	{
1083	object *tmp, *next;	1023	object *tmp, *next;
1084	int stop = 0;	1024	int stop = 0;
1085	int j, k, wvratio;	1025	int wvratio;
1086	char putstring[128], tmpstr[16];	1026	char putstring[128];
1087		1027
1088	/* if you're flying, you cna't pick up anything */	1028	/* if you're flying, you cna't pick up anything */
1089	if (op->move_type & MOVE_FLYING)	1029	if (op->move_type & MOVE_FLYING)
1090	return 1;	1030	return 1;
1091		1031
…		…
1428	* found object is returned.	1368	* found object is returned.
1429	*/	1369	*/
1430	object *	1370	object *
1431	find_arrow (object *op, const char *type)	1371	find_arrow (object *op, const char *type)
1432	{	1372	{
1433	object *tmp = NULL;	1373	object *tmp = 0;
1434		1374
1435	for (op = op->inv; op; op = op->below)	1375	for (op = op->inv; op; op = op->below)
1436	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1376	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437	tmp = find_arrow (op, type);	1377	tmp = find_arrow (op, type);
1438	else if (op->type == ARROW && op->race == type)	1378	else if (op->type == ARROW && op->race == type)
1439	return op;	1379	return op;
		1380
1440	return tmp;	1381	return tmp;
1441	}	1382	}
1442		1383
1443	/*	1384	/*
1444	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1385	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1445	* against the target. A full test is not performed, simply a basic test	1386	* against the target. A full test is not performed, simply a basic test
1446	* of resistances. The archer is making a quick guess at what he sees down	1387	* of resistances. The archer is making a quick guess at what he sees down
1447	* the hall. Failing that it does it's best to pick the highest plus arrow.	1388	* the hall. Failing that it does it's best to pick the highest plus arrow.
1448	*/	1389	*/
1449
1450	object *	1390	object *
1451	find_better_arrow (object *op, object *target, const char *type, int *better)	1391	find_better_arrow (object *op, object *target, const char *type, int *better)
1452	{	1392	{
1453	object *tmp = NULL, *arrow, *ntmp;	1393	object *tmp = NULL, *arrow, *ntmp;
1454	int attacknum, attacktype, betterby = 0, i;	1394	int attacknum, attacktype, betterby = 0, i;
…		…
1520	* find_better_arrow to find a decent arrow to use.	1460	* find_better_arrow to find a decent arrow to use.
1521	* op = the shooter	1461	* op = the shooter
1522	* type = bow->race	1462	* type = bow->race
1523	* dir = fire direction	1463	* dir = fire direction
1524	*/	1464	*/
1525
1526	object *	1465	object *
1527	pick_arrow_target (object *op, const char *type, int dir)	1466	pick_arrow_target (object *op, const char *type, int dir)
1528	{	1467	{
1529	object *tmp = NULL;	1468	object *tmp = NULL;
1530	maptile *m;	1469	maptile *m;
…		…
1595	*/	1534	*/
1596	int	1535	int
1597	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1536	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598	{	1537	{
1599	object *left, *bow;	1538	object *left, *bow;
1600	int bowspeed, mflags;	1539	int mflags;
1601	maptile *m;	1540	maptile *m;
1602		1541
1603	if (!dir)	1542	if (!dir)
1604	{	1543	{
1605	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1544	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606	return 0;	1545	return 0;
1607	}	1546	}
1608		1547
1609	if (op->type == PLAYER)	1548	if (op->contr)
1610	bow = op->contr->ranges[range_bow];	1549	bow = op->current_weapon;
1611	else	1550	else
1612	{	1551	{
1613	for (bow = op->inv; bow; bow = bow->below)	1552	for (bow = op->inv; bow; bow = bow->below)
1614	/* Don't check for applied - monsters don't apply bows - in that way, they	1553	/* Don't check for applied - monsters don't apply bows - in that way, they
1615	* don't need to switch back and forth between bows and weapons.	1554	* don't need to switch back and forth between bows and weapons.
…		…
1620	if (!bow)	1559	if (!bow)
1621	{	1560	{
1622	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1561	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623	return 0;	1562	return 0;
1624	}	1563	}
		1564
		1565	// optimisation: move object to top so we will find it quickly again
		1566	if (bow->below)
		1567	{
		1568	bow->remove ();
		1569	op->insert (bow);
		1570	}
		1571
1625	}	1572	}
1626		1573
1627	if (!bow->race || !bow->skill)	1574	if (!bow->race || !bow->skill)
1628	{	1575	{
1629	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1576	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630	return 0;	1577	return 0;
1631	}	1578	}
1632
1633	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635	/* penalize ROF for bestarrow */
1636	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639	if (bowspeed < 1)
1640	bowspeed = 1;
1641		1579
1642	if (arrow == NULL)	1580	if (arrow == NULL)
1643	{	1581	{
1644	if ((arrow = find_arrow (op, bow->race)) == NULL)	1582	if ((arrow = find_arrow (op, bow->race)) == NULL)
1645	{	1583	{
1646	if (op->type == PLAYER)	1584	if (op->type == PLAYER)
1647	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1585	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1586	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649	else	1587	else
1650	CLEAR_FLAG (op, FLAG_READY_BOW);	1588	CLEAR_FLAG (op, FLAG_READY_BOW);
		1589
1651	return 0;	1590	return 0;
1652	}	1591	}
1653	}	1592	}
1654		1593
1655	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1594	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1679		1618
1680	arrow->set_owner (op);	1619	arrow->set_owner (op);
1681	arrow->skill = bow->skill;	1620	arrow->skill = bow->skill;
1682	arrow->direction = dir;	1621	arrow->direction = dir;
1683		1622
		1623	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1624	arrow->stats.hp = arrow->stats.dam;
		1625	arrow->stats.grace = arrow->attacktype;
		1626
		1627	if (arrow->slaying)
		1628	arrow->spellarg = strdup (arrow->slaying);
		1629
		1630	#if 0
		1631	if (player *pl = op->contr)
		1632	{
		1633	float speed = pl->weapon_sp;
		1634
		1635	/* penalize ROF for bestarrow */
		1636	if (pl->bowtype == bow_bestarrow)
		1637	speed *= .9f;
		1638	else
		1639	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1640
		1641	op->speed_left += speed - op->speed;
		1642	}
		1643	#endif
		1644
		1645	SET_ANIMATION (arrow, arrow->direction);
		1646
		1647	/* update the speed */
		1648	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1649	+ bow->stats.dam / 7.f;
		1650
		1651	arrow->set_speed (max (arrow->speed, 2.f));
		1652	arrow->speed_left = 0;
		1653
		1654	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1655
1684	if (op->type == PLAYER)	1656	if (op->type == PLAYER)
1685	{	1657	{
1686	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1687	op->update_stats ();
1688	}
1689
1690	SET_ANIMATION (arrow, arrow->direction);
1691	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1692	arrow->stats.hp = arrow->stats.dam;
1693	arrow->stats.grace = arrow->attacktype;
1694	if (arrow->slaying != NULL)
1695	arrow->spellarg = strdup (arrow->slaying);
1696
1697	/* Note that this was different for monsters - they got their level
1698	* added to the damage. I think the strength bonus is more proper.
1699	*/
1700
1701	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1702
1703	/* update the speed */
1704	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1705	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1706
1707	arrow->set_speed (max (arrow->speed, 1.0));
1708	arrow->speed_left = 0;
1709
1710	if (op->type == PLAYER)
1711	{
1712	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1713	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1714	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1715
1716	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1658	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1659	wc -= dex_bonus[op->stats.Dex];
		1660
		1661	if (!arrow->slaying)
		1662	arrow->slaying = op->slaying;
		1663
		1664	arrow->attacktype |= op->attacktype;
1717	}	1665	}
1718	else	1666	else
1719	{	1667	{
1720	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1721	arrow->level = op->level;	1668	arrow->level = op->level;
1722	}	1669	arrow->stats.wc -= bow->magic;
1723		1670
1724	if (arrow->attacktype == AT_PHYSICAL)	1671	if (!arrow->slaying)
		1672	arrow->slaying = bow->slaying;
		1673
1725	arrow->attacktype |= bow->attacktype;	1674	arrow->attacktype |= bow->attacktype;
		1675	}
1726		1676
1727	if (bow->slaying)	1677	wc -= arrow->level;
1728	arrow->slaying = bow->slaying;	1678	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1729		1679
		1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1730	arrow->move_type = MOVE_FLY_LOW;	1681	arrow->move_type = MOVE_FLY_LOW;
1731	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1682	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1732		1683
1733	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1734	m->insert (arrow, sx, sy, op);	1685	m->insert (arrow, sx, sy, op);
…		…
1759	{	1710	{
1760	int ret = 0, wcmod = 0;	1711	int ret = 0, wcmod = 0;
1761		1712
1762	if (op->contr->bowtype == bow_bestarrow)	1713	if (op->contr->bowtype == bow_bestarrow)
1763	{	1714	{
1764	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1715	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1765	}	1716	}
1766	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1717	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1767	{	1718	{
1768	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1719	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1769	wcmod = -1;	1720	wcmod = -1;
…		…
1779	else if (op->contr->bowtype == bow_spreadshot)	1730	else if (op->contr->bowtype == bow_spreadshot)
1780	{	1731	{
1781	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1732	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1782	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1733	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1783	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1734	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1784
1785	}	1735	}
1786	else	1736	else
1787	{	1737	{
1788	/* Simple case */	1738	/* Simple case */
1789	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1739	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1790	}	1740	}
		1741
1791	return ret;	1742	return ret;
1792	}	1743	}
1793
1794		1744
1795	/* Fires a misc (wand/rod/horn) object in 'dir'.	1745	/* Fires a misc (wand/rod/horn) object in 'dir'.
1796	* Broken apart from 'fire' to keep it more readable.	1746	* Broken apart from 'fire' to keep it more readable.
1797	*/	1747	*/
1798	void	1748	void
1799	fire_misc_object (object *op, int dir)	1749	fire_misc_object (object *op, int dir)
1800	{	1750	{
1801	object *item;	1751	object *item = op->contr->ranged_ob;
1802		1752
1803	if (!op->contr->ranges[range_misc])	1753	if (!item)
1804	{	1754	{
1805	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1806	return;	1756	return;
1807	}	1757	}
1808		1758
1809	item = op->contr->ranges[range_misc];
1810	if (!item->inv)	1759	if (!item->inv)
1811	{	1760	{
1812	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1761	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1813	return;	1762	return;
1814	}	1763	}
		1764
		1765	if (!op->change_weapon (item))
		1766	return;
		1767
1815	if (item->type == WAND)	1768	if (item->type == WAND)
1816	{	1769	{
1817	if (item->stats.food <= 0)	1770	if (item->stats.food <= 0)
1818	{	1771	{
1819	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1820	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1774
1821	return;	1775	return;
1822	}	1776	}
1823	}	1777	}
1824	else if (item->type == ROD || item->type == HORN)	1778	else if (item->type == ROD || item->type == HORN)
1825	{	1779	{
1826	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1827	{	1781	{
1828	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1783
1829	if (item->type == ROD)	1784	if (item->type == ROD)
1830	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1831	else	1786	else
1832	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1788
1833	return;	1789	return;
1834	}	1790	}
1835	}	1791	}
1836		1792
1837	if (cast_spell (op, item, dir, item->inv, NULL))	1793	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1859	}	1815	}
1860	}	1816	}
1861		1817
1862	/* Received a fire command for the player - go and do it.	1818	/* Received a fire command for the player - go and do it.
1863	*/	1819	*/
1864	void	1820	bool
1865	fire (object *op, int dir)	1821	fire (object *op, int dir)
1866	{	1822	{
1867	int spellcost = 0;	1823	int spellcost = 0;
1868		1824
1869	/* check for loss of invisiblity/hide */	1825	/* check for loss of invisiblity/hide */
1870	if (action_makes_visible (op))	1826	if (action_makes_visible (op))
1871	make_visible (op);	1827	make_visible (op);
1872		1828
1873	switch (op->contr->shoottype)	1829	player *pl = op->contr;
		1830
		1831	if (pl->golem)
		1832	{
		1833	control_golem (op->contr->golem, dir);
		1834	return false;
1874	{	1835	}
1875	case range_none:
1876	return;
1877		1836
1878	case range_bow:	1837	object *ob = pl->ranged_ob;
		1838
		1839	if (!ob)
		1840	return false;
		1841
		1842	if (!op->change_weapon (ob))
		1843	return false;
		1844
		1845	if (op->speed_left > 0.f)
		1846	--op->speed_left;
		1847	else
		1848	return false;
		1849
		1850	switch (ob->type)
		1851	{
		1852	case BOW:
1879	player_fire_bow (op, dir);	1853	player_fire_bow (op, dir);
1880	return;	1854	break;
1881		1855
1882	case range_magic: /* Casting spells */	1856	case SPELL:
1883	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1857	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1884	return;	1858	break;
1885		1859
1886	case range_misc:	1860	case BUILDER:
		1861	apply_map_builder (op, dir);
		1862	break;
		1863
		1864	case SKILL:
		1865	do_skill (op, op, ob, dir, 0);
		1866	break;
		1867
		1868	default:
1887	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1888	return;	1870	break;
1889
1890	case range_golem: /* Control summoned monsters from scrolls */
1891	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1892	{
1893	op->contr->ranges[range_golem] = 0;
1894	op->contr->shoottype = range_none;
1895	}
1896	else
1897	control_golem (op->contr->ranges[range_golem], dir);
1898	return;
1899
1900	case range_skill:
1901	if (!op->chosen_skill)
1902	{
1903	if (op->type == PLAYER)
1904	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1905	return;
1906	}
1907	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1908	return;
1909	case range_builder:
1910	apply_map_builder (op, dir);
1911	return;
1912	default:
1913	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1914	return;
1915	}	1871	}
1916	}
1917		1872
1918		1873	return true;
		1874	}
1919		1875
1920	/* find_key	1876	/* find_key
1921	* We try to find a key for the door as passed. If we find a key	1877	* We try to find a key for the door as passed. If we find a key
1922	* and successfully use it, we return the key, otherwise NULL	1878	* and successfully use it, we return the key, otherwise NULL
1923	* This function merges both normal and locked door, since the logic	1879	* This function merges both normal and locked door, since the logic
…		…
1925	* pl is the player,	1881	* pl is the player,
1926	* inv is the objects inventory to searched	1882	* inv is the objects inventory to searched
1927	* door is the door we are trying to match against.	1883	* door is the door we are trying to match against.
1928	* This function can be called recursively to search containers.	1884	* This function can be called recursively to search containers.
1929	*/	1885	*/
1930
1931	object *	1886	object *
1932	find_key (object *pl, object *container, object *door)	1887	find_key (object *pl, object *container, object *door)
1933	{	1888	{
1934	object *tmp, *key;	1889	object *tmp, *key;
1935		1890
1936	/* Should not happen, but sanity checking is never bad */	1891	/* Should not happen, but sanity checking is never bad */
1937	if (container->inv == NULL)	1892	if (!container->inv)
1938	return NULL;	1893	return 0;
1939		1894
1940	/* First, lets try to find a key in the top level inventory */	1895	/* First, lets try to find a key in the top level inventory */
1941	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1896	for (tmp = container->inv; tmp; tmp = tmp->below)
1942	{	1897	{
1943	if (door->type == DOOR && tmp->type == KEY)	1898	if (door->type == DOOR && tmp->type == KEY)
1944	break;	1899	break;
1945	/* For sanity, we should really check door type, but other stuff	1900	/* For sanity, we should really check door type, but other stuff
1946	* (like containers) can be locked with special keys	1901	* (like containers) can be locked with special keys
1947	*/	1902	*/
1948	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1903	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1949	break;	1904	break;
1950	}	1905	}
		1906
1951	/* No key found - lets search inventories now */	1907	/* No key found - lets search inventories now */
1952	/* If we find and use a key in an inventory, return at that time.	1908	/* If we find and use a key in an inventory, return at that time.
1953	* otherwise, if we search all the inventories and still don't find	1909	* otherwise, if we search all the inventories and still don't find
1954	* a key, return	1910	* a key, return
1955	*/	1911	*/
1956	if (!tmp)	1912	if (!tmp)
1957	{	1913	{
1958	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1914	for (tmp = container->inv; tmp; tmp = tmp->below)
1959	{	1915	{
1960	/* No reason to search empty containers */	1916	/* No reason to search empty containers */
1961	if (tmp->type == CONTAINER && tmp->inv)	1917	if (tmp->type == CONTAINER && tmp->inv)
1962	{	1918	{
1963	if ((key = find_key (pl, tmp, door)) != NULL)	1919	if ((key = find_key (pl, tmp, door)))
1964	return key;	1920	return key;
1965	}	1921	}
1966	}	1922	}
		1923
1967	if (!tmp)	1924	if (!tmp)
1968	return NULL;	1925	return NULL;
1969	}	1926	}
		1927
1970	/* We get down here if we have found a key. Now if its in a container,	1928	/* We get down here if we have found a key. Now if its in a container,
1971	* see if we actually want to use it	1929	* see if we actually want to use it
1972	*/	1930	*/
1973	if (pl != container)	1931	if (pl != container)
1974	{	1932	{
…		…
1995	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1953	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1996	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1954	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1997	return NULL;	1955	return NULL;
1998	}	1956	}
1999	}	1957	}
		1958
2000	return tmp;	1959	return tmp;
2001	}	1960	}
2002		1961
2003	/* moved door processing out of move_player_attack.	1962	/* moved door processing out of move_player_attack.
2004	* returns 1 if player has opened the door with a key	1963	* returns 1 if player has opened the door with a key
…		…
2006	* 0 otherwise	1965	* 0 otherwise
2007	*/	1966	*/
2008	static int	1967	static int
2009	player_attack_door (object *op, object *door)	1968	player_attack_door (object *op, object *door)
2010	{	1969	{
2011	/* If its a door, try to find a use a key. If we do destroy the door,	1970	/* If its a door, try to find a key. If we do destroy the door,
2012	* might as well return immediately as there is nothing more to do -	1971	* might as well return immediately as there is nothing more to do -
2013	* otherwise, we fall through to the rest of the code.	1972	* otherwise, we fall through to the rest of the code.
2014	*/	1973	*/
2015	object *key = find_key (op, op, door);	1974	object *key = find_key (op, op, door);
2016		1975
2017	/* IF we found a key, do some extra work */	1976	/* If we found a key, do some extra work */
2018	if (key)	1977	if (key)
2019	{	1978	{
2020	object *container = key->env;	1979	object *container = key->env;
2021		1980
2022	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1982
2023	if (action_makes_visible (op))	1983	if (action_makes_visible (op))
2024	make_visible (op);	1984	make_visible (op);
		1985
2025	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1986	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2026	spring_trap (door->inv, op);	1987	spring_trap (door->inv, op);
		1988
2027	if (door->type == DOOR)	1989	if (door->type == DOOR)
2028	{
2029	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1990	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2030	}
2031	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
2032	{	1992	{
2033	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1993	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2034	remove_door2 (door); /* remove door without violence ;-) */	1994	remove_door2 (door); /* remove door without violence ;-) */
2035	}	1995	}
		1996
2036	/* Do this after we print the message */	1997	/* Do this after we print the message */
2037	decrease_ob (key); /* Use up one of the keys */	1998	decrease_ob (key); /* Use up one of the keys */
2038	/* Need to update the weight the container the key was in */	1999	/* Need to update the weight the container the key was in */
2039	if (container != op)	2000	if (container != op)
2040	esrv_update_item (UPD_WEIGHT, op, container);	2001	esrv_update_item (UPD_WEIGHT, op, container);
		2002
2041	return 1; /* Nothing more to do below */	2003	return 1; /* Nothing more to do below */
2042	}	2004	}
2043	else if (door->type == LOCKED_DOOR)	2005	else if (door->type == LOCKED_DOOR)
2044	{	2006	{
2045	/* Might as well return now - no other way to open this */	2007	/* Might as well return now - no other way to open this */
2046	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2008	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2047	return 1;	2009	return 1;
2048	}	2010	}
		2011
2049	return 0;	2012	return 0;
2050	}	2013	}
2051		2014
2052	/* This function is just part of a breakup from move_player.	2015	/* This function is just part of a breakup from move_player.
2053	* It should keep the code cleaner.	2016	* It should keep the code cleaner.
2054	* When this is called, the players direction has been updated	2017	* When this is called, the players direction has been updated
2055	* (taking into account confusion.) The player is also actually	2018	* (taking into account confusion.) The player is also actually
2056	* going to try and move (not fire weapons).	2019	* going to try and move (not fire weapons).
2057	*/	2020	*/
2058	void	2021	bool
2059	move_player_attack (object *op, int dir)	2022	move_player_attack (object *op, int dir)
2060	{	2023	{
2061	object *tmp, *mon;
2062	sint16 nx, ny;
2063	int on_battleground;	2024	int on_battleground;
2064	maptile *m;
2065		2025
2066	nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2067	ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2068		2028
2069	on_battleground = op_on_battleground (op, 0, 0);	2029	on_battleground = op_on_battleground (op, 0, 0);
		2030
		2031	if (out_of_map (op->map, nx, ny))
		2032	return false;
		2033
		2034	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2035	{
		2036	--op->speed_left;
		2037	return true;
		2038	}
2070		2039
2071	/* If braced, or can't move to the square, and it is not out of the	2040	/* If braced, or can't move to the square, and it is not out of the
2072	* map, attack it. Note order of if statement is important - don't	2041	* map, attack it. Note order of if statement is important - don't
2073	* want to be calling move_ob if braced, because move_ob will move the	2042	* want to be calling move_ob if braced, because move_ob will move the
2074	* player. This is a pretty nasty hack, because if we could	2043	* player. This is a pretty nasty hack, because if we could
2075	* move to some space, it then means that if we are braced, we should	2044	* move to some space, it then means that if we are braced, we should
2076	* do nothing at all. As it is, if we are braced, we go through	2045	* do nothing at all. As it is, if we are braced, we go through
2077	* quite a bit of processing. However, it probably is less than what	2046	* quite a bit of processing. However, it probably is less than what
2078	* move_ob uses.	2047	* move_ob uses.
2079	*/	2048	*/
2080	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2049	maptile *m = op->map->xy_find (nx, ny);
2081	{
2082	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2083	{
2084	m = get_map_from_coord (op->map, &nx, &ny);
2085	if (!m)
2086	return; /* Don't think this should happen */
2087	}
2088	else
2089	m = op->map;
2090		2050
2091	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2092	{
2093	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2094	return;
2095	}
2096
2097	mon = 0;
2098	/* Go through all the objects, and find ones of interest. Only stop if	2051	/* Go through all the objects, and find ones of interest. Only stop if
2099	* we find a monster - that is something we know we want to attack.	2052	* we find a monster - that is something we know we want to attack.
2100	* if its a door or barrel (can roll) see if there may be monsters	2053	* if its a door or barrel (can roll) see if there may be monsters
2101	* on the space	2054	* on the space
2102	*/	2055	*/
2103	while (tmp)	2056	object *mon;
2104	{	2057	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2105	if (tmp == op)	2058	{
2106	{	2059	if ((mon->flag [FLAG_ALIVE]
2107	tmp = tmp->above;	2060	|| mon->type == LOCKED_DOOR
2108	continue;	2061	|| mon->flag [FLAG_CAN_ROLL])
2109	}
2110
2111	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2112	{
2113	mon = tmp;	2062	&& mon != op)
2114	break;	2063	break;
2115	}	2064	}
2116		2065
2117	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2118	mon = tmp;
2119
2120	tmp = tmp->above;
2121	}
2122
2123	if (!mon) /* This happens anytime the player tries to move */	2066	if (!mon) /* This happens anytime the player tries to move */
2124	return; /* into a wall */	2067	return false; /* into a wall */
2125		2068
2126	if (mon->head)
2127	mon = mon->head;	2069	mon = mon->head_ ();
2128		2070
2129	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2071	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2072	if (op->contr->weapon_sp_left > 0.f)
2130	if (player_attack_door (op, mon))	2073	if (player_attack_door (op, mon))
		2074	{
		2075	--op->contr->weapon_sp_left;
2131	return;	2076	return true;
		2077	}
2132		2078
2133	/* The following deals with possibly attacking peaceful	2079	/* The following deals with possibly attacking peaceful
2134	* or frienddly creatures. Basically, all players are considered	2080	* or friendly creatures. Basically, all players are considered
2135	* unaggressive. If the moving player has peaceful set, then the	2081	* unaggressive. If the moving player has peaceful set, then the
2136	* object should be pushed instead of attacked. It is assumed that	2082	* object should be pushed instead of attacked. It is assumed that
2137	* if you are braced, you will not attack friends accidently,	2083	* if you are braced, you will not attack friends accidently,
2138	* and thus will not push them.	2084	* and thus will not push them.
2139	*/	2085	*/
2140		2086
2141	/* If the creature is a pet, push it even if the player is not	2087	/* If the creature is a pet, push it even if the player is not
2142	* peaceful. Our assumption is the creature is a pet if the	2088	* peaceful. Our assumption is the creature is a pet if the
2143	* player owns it and it is either friendly or unagressive.	2089	* player owns it and it is either friendly or unagressive.
2144	*/	2090	*/
2145	if ((op->type == PLAYER)	2091	if (op->type == PLAYER
2146	#if COZY_SERVER
2147	&&
2148	((mon->owner && mon->owner->contr	2092	&& ((mon->owner && mon->owner->contr
2149	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2093	&& same_party (mon->owner->contr->party, op->contr->party))
2150	#else
2151	&& mon->owner == op	2094	|| mon->owner == op)
2152	#endif
2153	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2154	{	2096	{
2155	/* If we're braced, we don't want to switch places with it */	2097	/* If we're braced, we don't want to switch places with it */
2156	if (op->contr->braced)	2098	if (op->contr->braced)
2157	return;	2099	return false;
		2100
		2101	if (op->speed_left > 0.f)
		2102	{
		2103	--op->speed_left;
		2104
2158	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2105	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2159	(void) push_ob (mon, dir, op);	2106	push_ob (mon, dir, op);
		2107
2160	if (op->contr->tmp_invis || op->hide)	2108	if (op->contr->tmp_invis || op->hide)
2161	make_visible (op);	2109	make_visible (op);
		2110
2162	return;	2111	return true;
2163	}	2112	}
		2113	else
		2114	return false;
		2115	}
2164		2116
2165	/* in certain circumstances, you shouldn't attack friendly	2117	/* in certain circumstances, you shouldn't attack friendly
2166	* creatures. Note that if you are braced, you can't push	2118	* creatures. Note that if you are braced, you can't push
2167	* someone, but put it inside this loop so that you won't	2119	* someone, but put it inside this loop so that you won't
2168	* attack them either.	2120	* attack them either.
2169	*/	2121	*/
2170	if ((mon->type == PLAYER || mon->enemy != op) &&	2122	if ((mon->type == PLAYER || mon->enemy != op)
2171	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2123	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2172	#ifdef PROHIBIT_PLAYERKILL
2173	(op->contr->peaceful	2124	&& ((op->contr->peaceful
2174	|| (mon->type == PLAYER	2125	|| (mon->type == PLAYER && mon->contr->peaceful))
2175	&& mon->contr->
2176	peaceful)) &&
2177	#else
2178	op->contr->peaceful &&
2179	#endif
2180	!on_battleground))	2126	&& !on_battleground))
		2127	{
		2128	if (op->speed_left > 0.f)
2181	{	2129	{
		2130	--op->speed_left;
		2131
2182	if (!op->contr->braced)	2132	if (!op->contr->braced)
2183	{	2133	{
2184	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2185	(void) push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2186	}	2136	}
2187	else	2137	else
2188	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2189		2139
2190	if (op->contr->tmp_invis || op->hide)	2140	if (op->contr->tmp_invis || op->hide)
2191	make_visible (op);	2141	make_visible (op);
2192	}
2193		2142
		2143	return true;
		2144	}
		2145	}
2194	/* If the object is a boulder or other rollable object, then	2146	/* If the object is a boulder or other rollable object, then
2195	* roll it if not braced. You can't roll it if you are braced.	2147	* roll it if not braced. You can't roll it if you are braced.
2196	*/	2148	*/
2197	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2149	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2150	{
		2151	if (op->speed_left > 0.f)
2198	{	2152	{
		2153	--op->speed_left;
		2154
2199	recursive_roll (mon, dir, op);	2155	recursive_roll (mon, dir, op);
2200	if (action_makes_visible (op))	2156	if (action_makes_visible (op))
2201	make_visible (op);	2157	make_visible (op);
2202	}
2203		2158
		2159	return true;
		2160	}
		2161	}
2204	/* Any generic living creature. Including things like doors.	2162	/* Any generic living creature. Including things like doors.
2205	* Way it works is like this: First, it must have some hit points	2163	* Way it works is like this: First, it must have some hit points
2206	* and be living. Then, it must be one of the following:	2164	* and be living. Then, it must be one of the following:
2207	* 1) Not a player, 2) A player, but of a different party. Note	2165	* 1) Not a player, 2) A player, but of a different party. Note
2208	* that party_number -1 is no party, so attacks can still happen.	2166	* that party_number -1 is no party, so attacks can still happen.
2209	*/	2167	*/
2210
2211	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2212	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2169	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2213	{	2170	{
2214		2171	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2215	/* If the player hasn't hit something this tick, and does
2216	* so, give them speed boost based on weapon speed. Doing
2217	* it here is better than process_players2, which basically
2218	* incurred a 1 tick offset.
2219	*/
2220	if (!op->contr->has_hit)
2221	{	2172	{
2222	op->speed_left += op->speed / op->contr->weapon_sp;	2173	--op->contr->weapon_sp_left;
2223
2224	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2225	}
2226		2174
2227	skill_attack (mon, op, 0, 0, 0);	2175	skill_attack (mon, op, 0, 0, 0);
2228
2229	/* If attacking another player, that player gets automatic
2230	* hitback, and doesn't loose luck either.
2231	* Disable hitback on the battleground or if the target is
2232	* the wiz.
2233	*/
2234	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2235	{
2236	short luck = mon->stats.luck;
2237
2238	mon->contr->has_hit = 1;
2239	skill_attack (op, mon, 0, 0, 0);
2240	mon->stats.luck = luck;
2241	}
2242		2176
2243	if (action_makes_visible (op))	2177	if (action_makes_visible (op))
2244	make_visible (op);	2178	make_visible (op);
2245	}
2246	} /* if player should attack something */
2247	}
2248		2179
2249	int	2180	return true;
		2181	}
		2182	}
		2183
		2184	return false;
		2185	}
		2186
		2187	bool
2250	move_player (object *op, int dir)	2188	move_player (object *op, int dir)
2251	{	2189	{
2252	int pick;	2190	int pick;
2253		2191
2254	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2192	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2255	return 0;	2193	return 0;
2256		2194
2257	/* Sanity check: make sure dir is valid */	2195	/* Sanity check: make sure dir is valid */
2258	if ((dir < 0) || (dir >= 9))	2196	if ((dir < 0) || (dir >= 9))
2259	{	2197	{
2260	LOG (llevError, "move_player: invalid direction %d\n", dir);	2198	LOG (llevError, "move_player: invalid direction %d\n", dir);
2261	return 0;	2199	return 0;
2262	}	2200	}
2263		2201
2264	/* peterm: added following line */	2202	/* peterm: added following line */
2265	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2203	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2266	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2204	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2267		2205
2268	op->facing = dir;	2206	op->facing = dir;
2269		2207
2270	if (op->hide)	2208	if (op->hide)
2271	do_hidden_move (op);	2209	do_hidden_move (op);
2272		2210
		2211	bool retval;
		2212
2273	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2213	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2274	/*nop */ ;	2214	retval = RESULT_INT (0);
2275	else if (op->contr->fire_on)	2215	else if (op->contr->fire_on)
2276	fire (op, dir);	2216	retval = fire (op, dir);
2277	else	2217	else
2278	{	2218	{
2279	move_player_attack (op, dir);	2219	retval = move_player_attack (op, dir);
2280	pick = check_pick (op);	2220	pick = check_pick (op);
2281	}	2221	}
2282		2222
2283	/* Add special check for newcs players and fire on - this way, the	2223	/* Add special check for newcs players and fire on - this way, the
2284	* server can handle repeat firing.	2224	* server can handle repeat firing.
…		…
2291	/* Update how the player looks. Use the facing, so direction may	2231	/* Update how the player looks. Use the facing, so direction may
2292	* get reset to zero. This allows for full animation capabilities	2232	* get reset to zero. This allows for full animation capabilities
2293	* for players.	2233	* for players.
2294	*/	2234	*/
2295	animate_object (op, op->facing);	2235	animate_object (op, op->facing);
2296	return 0;	2236
		2237	return retval;
2297	}	2238	}
2298		2239
2299	/* This is similar to handle_player, below, but is only used by the	2240	/* This is similar to handle_player, below, but is only used by the
2300	* new client/server stuff.	2241	* new client/server stuff.
2301	* This is sort of special, in that the new client/server actually uses	2242	* This is sort of special, in that the new client/server actually uses
2302	* the new speed values for commands.	2243	* the new speed values for commands.
2303	*	2244	*
2304	* Returns true if there are more actions we can do.	2245	* Returns true if there are more actions we can do. Should not do
		2246	* many actions in a row, as that would be too unfair to other
		2247	* players.
2305	*/	2248	*/
2306	int	2249	bool
2307	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2308	{	2251	{
2309	if (op->contr->hidden)
2310	{
2311	op->invisible = 1000;
2312	/* the socket code flashes the player visible/invisible
2313	* depending on the value of invisible, so we need to
2314	* alternate it here for it to work correctly.
2315	*/
2316	if (pticks & 2)
2317	op->invisible--;
2318	}
2319	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2320	{
2321	op->invisible--;
2322	if (!op->invisible)
2323	{
2324	make_visible (op);
2325	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2326	}
2327	}
2328
2329	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2330	{	2253	{
2331	flee_player (op);	2254	if (op->speed_left > 0.f)
2332	/* If player is still scared, that is his action for this tick */
2333	if (QUERY_FLAG (op, FLAG_SCARED))
2334	{	2255	{
2335	op->speed_left--;	2256	--op->speed_left;
		2257	flee_player (op);
		2258
2336	return 0;	2259	return true;
2337	}	2260	}
		2261	else
		2262	return false;
2338	}	2263	}
2339
2340	/* I've been seeing crashes where the golem has been destroyed, but
2341	* the player object still points to the defunct golem. The code that
2342	* destroys the golem looks correct, and it doesn't always happen, so
2343	* put this in a a workaround to clean up the golem pointer.
2344	*/
2345	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2346	op->contr->ranges[range_golem] = 0;
2347		2264
2348	/* call this here - we also will call this in do_ericserver, but	2265	/* call this here - we also will call this in do_ericserver, but
2349	* the players time has been increased when doericserver has been	2266	* the players time has been increased when doericserver has been
2350	* called, so we recheck it here.	2267	* called, so we recheck it here.
2351	*/	2268	*/
2352	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2269	if (op->contr->ns->handle_command ())
2353	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2354	;
2355
2356	if (op->speed_left < 0)
2357	return 0;	2270	return true;
2358		2271
2359	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2272	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2360	{
2361	/* All move commands take 1 tick, at least for now */
2362	op->speed_left--;
2363
2364	/* Instead of all the stuff below, let move_player take care
2365	* of it. Also, some of the skill stuff is only put in
2366	* there, as well as the confusion stuff.
2367	*/
2368	move_player (op, op->direction);	2273	return move_player (op, op->direction);
2369	if (op->speed_left > 0)
2370	return 1;
2371	else
2372	return 0;
2373	}
2374		2274
2375	return 0;	2275	return false;
2376	}	2276	}
2377		2277
2378	int	2278	int
2379	save_life (object *op)	2279	save_life (object *op)
2380	{	2280	{
…		…
2415	* from.	2315	* from.
2416	*/	2316	*/
2417	void	2317	void
2418	remove_unpaid_objects (object *op, object *env)	2318	remove_unpaid_objects (object *op, object *env)
2419	{	2319	{
2420	object *next;
2421
2422	while (op)	2320	while (op)
2423	{	2321	{
2424	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2322	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2425		2323
2426	if (QUERY_FLAG (op, FLAG_UNPAID))	2324	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2492	int rate_grace = 2000;	2390	int rate_grace = 2000;
2493	const int max_hp = 1;	2391	const int max_hp = 1;
2494	const int max_sp = 1;	2392	const int max_sp = 1;
2495	const int max_grace = 1;	2393	const int max_grace = 1;
2496		2394
2497	if (op->contr->outputs_sync)	2395	if (op->contr->hidden)
		2396	{
		2397	op->invisible = 1000;
		2398	/* the socket code flashes the player visible/invisible
		2399	* depending on the value of invisible, so we need to
		2400	* alternate it here for it to work correctly.
		2401	*/
		2402	if (pticks & 2)
		2403	op->invisible--;
2498	{	2404	}
2499	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2405	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2500	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2406	{
2501	flush_output_element (op, &op->contr->outputs[i]);	2407	if (!op->invisible--)
		2408	{
		2409	make_visible (op);
		2410	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2411	}
2502	}	2412	}
2503		2413
2504	if (op->contr->ns->state == ST_PLAYING)	2414	if (op->contr->ns->state == ST_PLAYING)
2505	{	2415	{
2506	/* these next three if clauses make it possible to SLOW DOWN	2416	/* these next three if clauses make it possible to SLOW DOWN
…		…
2528	gen_grace = op->stats.maxgrace;	2438	gen_grace = op->stats.maxgrace;
2529	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2530	}	2440	}
2531		2441
2532	/* Regenerate Spell Points */	2442	/* Regenerate Spell Points */
2533	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2443	if (!op->contr->golem && --op->last_sp < 0)
2534	{	2444	{
2535	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2445	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2536	if (op->stats.sp < op->stats.maxsp)	2446	if (op->stats.sp < op->stats.maxsp)
2537	{	2447	{
2538	op->stats.sp++;	2448	op->stats.sp++;
…		…
2636	}	2546	}
2637		2547
2638	/* Digestion */	2548	/* Digestion */
2639	if (--op->last_eat < 0)	2549	if (--op->last_eat < 0)
2640	{	2550	{
2641	#ifdef COZY_SERVER
2642	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2643	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2644	#else
2645	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2551	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2646	#endif
2647		2552
2648	if (op->contr->gen_hp > 0)	2553	if (op->contr->gen_hp > 0)
2649	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2554	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2650	else	2555	else
2651	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2756	tmp->name = buf;	2661	tmp->name = buf;
2757	sprintf (buf, " This finger has been cut off %s\n"	2662	sprintf (buf, " This finger has been cut off %s\n"
2758	" the %s, when he was defeated at\n level %d by %s.\n",	2663	" the %s, when he was defeated at\n level %d by %s.\n",
2759	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2664	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2760	tmp->msg = buf;	2665	tmp->msg = buf;
2761	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2666	tmp->value = 0, tmp->type = 0;
2762	tmp->materialname = NULL;	2667	tmp->materialname = "organics";
2763	op->insert_at (tmp, op);	2668	tmp->insert_at (op, tmp);
2764	}	2669	}
2765		2670
2766	/* teleport defeated player to new destination */	2671	/* teleport defeated player to new destination */
2767	transfer_ob (op, x, y, 0, NULL);	2672	transfer_ob (op, x, y, 0, NULL);
2768	op->contr->braced = 0;	2673	op->contr->braced = 0;
…		…
2773		2678
2774	command_kill_pets (op, 0);	2679	command_kill_pets (op, 0);
2775		2680
2776	if (op->stats.food < 0)	2681	if (op->stats.food < 0)
2777	{	2682	{
2778	if (op->contr->explore)
2779	{
2780	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2781	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2782	op->stats.food = 999;
2783	return;
2784	}
2785	sprintf (buf, "%s starved to death.", &op->name);	2683	sprintf (buf, "%s starved to death.", &op->name);
2786	strcpy (op->contr->killer, "starvation");	2684	strcpy (op->contr->killer, "starvation");
2787	}	2685	}
2788	else	2686	else
2789	{
2790	if (op->contr->explore)
2791	{
2792	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2793	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2794	op->stats.hp = op->stats.maxhp;
2795	return;
2796	}
2797	sprintf (buf, "%s died.", &op->name);	2687	sprintf (buf, "%s died.", &op->name);
2798	}
2799		2688
2800	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2689	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2801		2690
2802	/* save the map location for corpse, gravestone */	2691	/* save the map location for corpse, gravestone */
2803	x = op->x;	2692	x = op->x;
…		…
2979	op->stats.hp = op->stats.maxhp;	2868	op->stats.hp = op->stats.maxhp;
2980	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2869	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2981	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2870	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2982		2871
2983	/*	2872	/*
2984	* Check to see if the player is in a shop. IF so, then check to see if
2985	* the player has any unpaid items. If so, remove them and put them back	2873	* Check to see if the player has any unpaid items. If so, remove them
2986	* in the map.	2874	* and put them back in the map.
2987	*/	2875	*/
2988
2989	if (is_in_shop (op))
2990	remove_unpaid_objects (op->inv, op);	2876	remove_unpaid_objects (op->inv, op);
2991		2877
2992	/****************************************/	2878	/****************************************/
2993	/* */	2879	/* */
2994	/* Move player to his current respawn- */	2880	/* Move player to his current respawn- */
2995	/* position (usually last savebed) */	2881	/* position (usually last savebed) */
2996	/* */	2882	/* */
2997	/****************************************/	2883	/****************************************/
2998		2884
2999	enter_player_savebed (op);	2885	enter_player_savebed (op);
3000		2886
3001	/* Save the player before inserting the force to reduce
3002	* chance of abuse.
3003	*/
3004	op->contr->braced = 0;	2887	op->contr->braced = 0;
3005	op->contr->save ();
3006		2888
3007	/* it is possible that the player has blown something up	2889	/* it is possible that the player has blown something up
3008	* at his savebed location, and that can have long lasting	2890	* at his savebed location, and that can have long lasting
3009	* spell effects. So first see if there is a spell effect	2891	* spell effects. So first see if there is a spell effect
3010	* on the space that might harm the player.	2892	* on the space that might harm the player.
…		…
3019	object *force;	2901	object *force;
3020	int at;	2902	int at;
3021		2903
3022	force = get_archetype (FORCE_NAME);	2904	force = get_archetype (FORCE_NAME);
3023	/* 50 ticks should be enough time for the spell to abate */	2905	/* 50 ticks should be enough time for the spell to abate */
3024	force->speed = 0.1;	2906	force->speed = 0.1f;
3025	force->speed_left = -5.0;	2907	force->speed_left = -5.f;
3026	SET_FLAG (force, FLAG_APPLIED);	2908	SET_FLAG (force, FLAG_APPLIED);
3027	for (at = 0; at < NROFATTACKS; at++)	2909	for (at = 0; at < NROFATTACKS; at++)
3028	if (will_kill_again & (1 << at))	2910	if (will_kill_again & (1 << at))
3029	force->resist[at] = 100;	2911	force->resist[at] = 100;
3030		2912
…		…
3039	void	2921	void
3040	loot_object (object *op)	2922	loot_object (object *op)
3041	{ /* Grab and destroy some treasure */	2923	{ /* Grab and destroy some treasure */
3042	object *tmp, *tmp2, *next;	2924	object *tmp, *tmp2, *next;
3043		2925
3044	if (op->container)	2926	op->close_container (); /* close open sack first */
3045	esrv_apply_container (op, op->container); /* close open sack first */
3046		2927
3047	for (tmp = op->inv; tmp; tmp = next)	2928	for (tmp = op->inv; tmp; tmp = next)
3048	{	2929	{
3049	next = tmp->below;	2930	next = tmp->below;
3050		2931
3051	if (tmp->invisible)	2932	if (tmp->invisible)
3052	continue;	2933	continue;
3053		2934
3054	tmp->remove ();	2935	tmp->remove ();
3055	tmp->x = op->x, tmp->y = op->y;	2936	tmp->x = op->x, tmp->y = op->y;
		2937
3056	if (tmp->type == CONTAINER)	2938	if (tmp->type == CONTAINER)
3057	{ /* empty container to ground */	2939	loot_object (tmp); /* empty container to ground */
3058	loot_object (tmp);	2940
3059	}
3060	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2941	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3061	{	2942	{
3062	if (tmp->nrof > 1)	2943	if (tmp->nrof > 1)
3063	{	2944	{
3064	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2945	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3065	tmp2->destroy ();	2946	tmp2->destroy ();
…		…
3076	/*	2957	/*
3077	* fix_weight(): Check recursively the weight of all players, and fix	2958	* fix_weight(): Check recursively the weight of all players, and fix
3078	* what needs to be fixed. Refresh windows and fix speed if anything	2959	* what needs to be fixed. Refresh windows and fix speed if anything
3079	* was changed.	2960	* was changed.
3080	*/	2961	*/
3081
3082	void	2962	void
3083	fix_weight (void)	2963	fix_weight (void)
3084	{	2964	{
3085	for_all_players (pl)	2965	for_all_players (pl)
3086	{	2966	{
…		…
3146	if (op->type == PLAYER)	3026	if (op->type == PLAYER)
3147	{	3027	{
3148	op->contr->tmp_invis = 0;	3028	op->contr->tmp_invis = 0;
3149	op->contr->invis_race = 0;	3029	op->contr->invis_race = 0;
3150	}	3030	}
		3031
3151	update_object (op, UP_OBJ_FACE);	3032	update_object (op, UP_OBJ_CHANGE);
3152	}	3033	}
3153		3034
3154	int	3035	int
3155	is_true_undead (object *op)	3036	is_true_undead (object *op)
3156	{	3037	{
3157	object *tmp = NULL;
3158
3159	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3038	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3160	return 1;	3039	return 1;
3161		3040
3162	return 0;	3041	return 0;
3163	}	3042	}
…		…
3208	/* For Hidden creatures - a chance of becoming 'unhidden'	3087	/* For Hidden creatures - a chance of becoming 'unhidden'
3209	* every time they move - as we subtract off 'invisibility'	3088	* every time they move - as we subtract off 'invisibility'
3210	* AND, for players, if they move into a ridiculously unhideable	3089	* AND, for players, if they move into a ridiculously unhideable
3211	* spot (surrounded by clear terrain in broad daylight). -b.t.	3090	* spot (surrounded by clear terrain in broad daylight). -b.t.
3212	*/	3091	*/
3213
3214	void	3092	void
3215	do_hidden_move (object *op)	3093	do_hidden_move (object *op)
3216	{	3094	{
3217	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3218	object *skop;	3096	object *skop;
…		…
3222		3100
3223	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3101	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3224		3102
3225	/* its *extremely* hard to run and sneak/hide at the same time! */	3103	/* its *extremely* hard to run and sneak/hide at the same time! */
3226	if (op->type == PLAYER && op->contr->run_on)	3104	if (op->type == PLAYER && op->contr->run_on)
3227	{
3228	if (!skop || num >= skop->level)	3105	if (!skop || num >= skop->level)
3229	{	3106	{
3230	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3107	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3231	make_visible (op);	3108	make_visible (op);
3232	return;	3109	return;
3233	}	3110	}
3234	else	3111	else
3235	num += 20;	3112	num += 20;
3236	}	3113
3237	num += op->map->difficulty;	3114	num += op->map->difficulty;
3238	hide = hideability (op); /* modify by terrain hidden level */	3115	hide = hideability (op); /* modify by terrain hidden level */
3239	num -= hide;	3116	num -= hide;
		3117
3240	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3118	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3241	{	3119	{
3242	make_visible (op);	3120	make_visible (op);
3243	if (op->type == PLAYER)	3121	if (op->type == PLAYER)
3244	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3122	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3245	}	3123	}
3246	else if (op->type == PLAYER && skop)	3124	else if (op->type == PLAYER && skop)
3247	{
3248	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3125	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3249	}
3250	}	3126	}
3251		3127
3252	/* determine if who is standing near a hostile creature. */	3128	/* determine if who is standing near a hostile creature. */
3253		3129
3254	int	3130	int
…		…
3453	char buf[MAX_BUF]; /* tmp. string buffer */	3329	char buf[MAX_BUF]; /* tmp. string buffer */
3454	int i = 0, j = 0;	3330	int i = 0, j = 0;
3455		3331
3456	/* get the appropriate treasurelist */	3332	/* get the appropriate treasurelist */
3457	if (atnr == ATNR_FIRE)	3333	if (atnr == ATNR_FIRE)
3458	trlist = find_treasurelist ("dragon_ability_fire");	3334	trlist = treasurelist::find ("dragon_ability_fire");
3459	else if (atnr == ATNR_COLD)	3335	else if (atnr == ATNR_COLD)
3460	trlist = find_treasurelist ("dragon_ability_cold");	3336	trlist = treasurelist::find ("dragon_ability_cold");
3461	else if (atnr == ATNR_ELECTRICITY)	3337	else if (atnr == ATNR_ELECTRICITY)
3462	trlist = find_treasurelist ("dragon_ability_elec");	3338	trlist = treasurelist::find ("dragon_ability_elec");
3463	else if (atnr == ATNR_POISON)	3339	else if (atnr == ATNR_POISON)
3464	trlist = find_treasurelist ("dragon_ability_poison");	3340	trlist = treasurelist::find ("dragon_ability_poison");
3465		3341
3466	if (trlist == NULL || who->type != PLAYER)	3342	if (trlist == NULL || who->type != PLAYER)
3467	return;	3343	return;
3468		3344
3469	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3345	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470		3346
3471	if (tr == NULL || tr->item == NULL)	3347	if (!tr || !tr->item)
3472	{	3348	{
3473	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3349	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474	return;	3350	return;
3475	}	3351	}
3476		3352
…		…
3601	* not readied.	3477	* not readied.
3602	*/	3478	*/
3603	void	3479	void
3604	player_unready_range_ob (player *pl, object *ob)	3480	player_unready_range_ob (player *pl, object *ob)
3605	{	3481	{
3606	rangetype i;	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
3607		3484
3608	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3485	if (pl->combat_ob == ob)
3609	{	3486	pl->combat_ob = 0;
		3487
3610	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3611	{	3489	pl->ranged_ob = 0;
3612	pl->ranges[i] = NULL;
3613	if (pl->shoottype == i)
3614	{
3615	pl->shoottype = range_none;
3616	}
3617	}
3618	}
3619	}	3490	}
		3491
		3492	sint8
		3493	player::visibility_at (maptile *map, int x, int y) const
		3494	{
		3495	if (!ns)
		3496	return 0;
		3497
		3498	int dx, dy;
		3499	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3500	return 0;
		3501
		3502	x += dx - ns->current_x + ns->mapx / 2;
		3503	y += dy - ns->current_y + ns->mapy / 2;
		3504
		3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3506	return 0;
		3507
		3508	return 100 - blocked_los [x][y];
		3509	}

Diff Legend

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