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.62 by root, Mon Dec 25 11:25:49 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	enter_exit (op, 0);	159	}
		160
		161	void
		162	player::activate ()
		163	{
		164	if (active)
		165	return;
		166
		167	players.insert (this);
		168	ob->remove ();
		169	ob->map = 0;
		170	ob->activate_recursive ();
		171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
		173	}
		174
		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);
167	}	195	}
168		196
169	// connect the player with a specific client	197	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
171	void	199	void
172	player::connect (client *ns)	200	player::connect (client *ns)
173	{	201	{
174	this->ns = ns;	202	this->ns = ns;
175	ns->pl = this;	203	ns->pl = this;
176		204
177	next = first_player;	205	run_on = 0;
178	first_player = this;	206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
179		208
180	ns->update_look = 0;	209	ns->update_look = 0;
181	ns->look_position = 0;	210	ns->look_position = 0;
182		211
183	clear_los (ob);	212	clear_los (ob);
		213
		214	ns->reset_stats ();
184		215
185	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
188		219
189	if (!legal_range (ob, shoottype))
190	shoottype = range_none;
191
192	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	221	link_player_skills (ob);
194		222
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	update_ob_speed (ob);
197		224
198	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
199
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information
202	* to then update this. I don't think this will actually break anything - anyone
203	* that can use armour should be able to use a shield. What this may 'break'
204	* are features new characters get, eg, if someone starts up with a Q, they
205	* should be able to use a shield. However, old Q's won't get that advantage.
206	*/
207	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208	SET_FLAG (ob, FLAG_USE_SHIELD);
209		226
210	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
211	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
212	{	229	{
213	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
…		…
223	skin = tmp;	240	skin = tmp;
224		241
225	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
226	}	243	}
227		244
228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
229	add_friendly_object (ob);
230
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		246
236	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
237		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);
238	ob->update_stats ();	274	ob->update_stats ();
		275
239	ns->floorbox_update ();	276	ns->floorbox_update ();
240
241	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
243		279
244	enter_exit (ob, 0);	280	activate ();
245		281
246	send_rules (ob);	282	send_rules (ob);
247	send_news (ob);	283	send_news (ob);
248	display_motd (ob);	284	display_motd (ob);
		285
		286	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	287	INVOKE_PLAYER (LOGIN, this);
250	}	288	}
251		289
252	void	290	void
253	player::disconnect ()	291	player::disconnect ()
254	{	292	{
255	if (!ns)	293	if (ns)
256	return;	294	{
		295	if (active)
		296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
257		297
258	//TODO: don't be so harsh and destroy :)	298	INVOKE_PLAYER (DISCONNECT, this);
259	destroy ();
260		299
		300	ns->reset_stats ();
261	ns->pl = 0;	301	ns->pl = 0;
262	ns = 0;	302	ns = 0;
		303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
		307
		308	deactivate ();
263	}	309	}
264		310
265	// the need for this function can be explained	311	// the need for this function can be explained
266	// by load_object not returning the object	312	// by load_object not returning the object
267	void	313	void
268	player::set_object (object *op)	314	player::set_object (object *op)
269	{	315	{
270	ob = op;	316	ob = op;
271	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
272		318
		319	ob->speed = 1.0f;
273	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
274	ob->speed = 1.0;	321
275	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
276	ob->stats.wc = 2;
277	ob->run_away = 25; /* Then we panick... */
278
279	set_first_map (ob);
280
281	ob->roll_stats ();
282	}	323	}
283		324
284	player::player ()	325	player::player ()
285	{	326	{
286	/* There are some elements we want initialized to non zero value -	327	/* There are some elements we want initialised to non zero value -
287	* we deal with that below this point.	328	* we deal with that below this point.
288	*/	329	*/
289	outputs_sync = 16; /* Every 2 seconds */	330	outputs_sync = 4;
290	outputs_count = 8; /* Keeps present behaviour */	331	outputs_count = 4;
291	unapply = unapply_nochoice;	332	unapply = unapply_nochoice;
292		333
293	assign (savebed_map, first_map_path); /* Init. respawn position */	334	savebed_map = first_map_path; /* Init. respawn position */
294		335
295	gen_sp_armour = 10;	336	gen_sp_armour = 10;
296	last_speed = -1;
297	shoottype = range_none;
298	bowtype = bow_normal;	337	bowtype = bow_normal;
299	petmode = pet_normal;	338	petmode = pet_normal;
300	listening = 10;	339	listening = 10;
301	usekeys = containers;	340	usekeys = containers;
302	last_weapon_sp = -1;
303	peaceful = 1; /* default peaceful */	341	peaceful = 1; /* default peaceful */
304	do_los = 1;	342	do_los = 1;
305		343
306	/* we need to clear these to -1 and not zero - otherwise,	344	weapon_sp = 1.0f;
307	* if a player quits and starts a new character, we wont	345	weapon_sp_left = 0.5f;
308	* send new values to the client, as things like exp start
309	* at zero.
310	*/
311	for (int i = 0; i < NUM_SKILLS; i++)
312	last_skill_exp[i] = -1;
313
314	for (int i = 0; i < NROFATTACKS; i++)
315	last_resist[i] = -1;
316
317	last_stats.exp = -1;
318	last_weight = (uint32) - 1;
319	}	346	}
320		347
321	void	348	void
322	player::do_destroy ()	349	player::do_destroy ()
323	{	350	{
		351	disconnect ();
		352
324	attachable::do_destroy ();	353	attachable::do_destroy ();
325		354
326	disconnect ();
327
328	terminate_all_pets (ob);
329
330	if (first_player != this)
331	{
332	player *prev = first_player;
333
334	while (prev && prev->next && prev->next != this)
335	prev = prev->next;
336
337	if (prev->next != this)
338	{
339	LOG (llevError, "Free_player: Can't find previous player.\n");
340	abort ();
341	}
342
343	prev->next = next;
344	}
345	else
346	first_player = next;
347
348	if (ob)	355	if (ob)
		356	{
349	ob->destroy (true);	357	ob->destroy_inv (false);
350
351	if (ns)
352	{
353	ns->send_packet ("goodbye");
354	ns->flush ();
355	ns->pl = 0;
356	ns->destroy ();	358	ob->destroy ();
357	}	359	}
358
359	attachable::do_destroy ();
360	}	360	}
361		361
362	player::~player ()	362	player::~player ()
363	{	363	{
364	/* Clear item stack */	364	/* Clear item stack */
…		…
373	player::create ()	373	player::create ()
374	{	374	{
375	player *pl = new player;	375	player *pl = new player;
376		376
377	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);
378		384
379	return pl;	385	return pl;
380	}	386	}
381		387
382	/*	388	/*
…		…
413	object *op = NULL;	419	object *op = NULL;
414	objectlink *ol;	420	objectlink *ol;
415	unsigned lastdist;	421	unsigned lastdist;
416	rv_vector rv;	422	rv_vector rv;
417		423
418	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	424	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
419	{	425	{
420	/* 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
421	* does periodically happen. Given that, lets deal with it.	427	* does periodically happen. Given that, lets deal with it.
422	* While unlikely, it is possible the next object on the friendly	428	* While unlikely, it is possible the next object on the friendly
423	* list is also free, so encapsulate this in a while loop.	429	* list is also free, so encapsulate this in a while loop.
…		…
427	object *tmp = ol->ob;	433	object *tmp = ol->ob;
428		434
429	/* 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
430	* itself will have been cleared.	436	* itself will have been cleared.
431	*/	437	*/
432	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 ());
433	ol = ol->next;	440	ol = ol->next;
434	remove_friendly_object (tmp);	441	remove_friendly_object (tmp);
435	if (!ol)	442	if (!ol)
436	return op;	443	return op;
437	}	444	}
…		…
526	x = mon->x;	533	x = mon->x;
527	y = mon->y;	534	y = mon->y;
528	m = mon->map;	535	m = mon->map;
529	dir = rv.direction;	536	dir = rv.direction;
530	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 */
531	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
532	/* 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. */
533	if (diff > max)	541	if (diff > max)
534	return 0;	542	return 0;
		543
535	while (diff > 1 && max > 0)	544	while (diff > 1 && max > 0)
536	{	545	{
537	lastx = x;	546	lastx = x;
538	lasty = y;	547	lasty = y;
539	lastmap = m;	548	lastmap = m;
…		…
621	max--;	630	max--;
622	lastdir = dir;	631	lastdir = dir;
623	if (!firstdir)	632	if (!firstdir)
624	firstdir = dir;	633	firstdir = dir;
625	}	634	}
		635
626	if (diff <= 1)	636	if (diff <= 1)
627	{	637	{
628	/* Recalculate diff (distance) because we may not have actually	638	/* Recalculate diff (distance) because we may not have actually
629	* headed toward player for entire distance.	639	* headed toward player for entire distance.
630	*/	640	*/
631	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	641	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
632	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));
633	}	643	}
		644
634	if (diff > max)	645	if (diff > max)
635	return 0;	646	return 0;
636	}	647	}
		648
637	/* 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 */
638	if (!max)	650	if (!max)
639	return 0;	651	return 0;
640		652
641	return firstdir;	653	return firstdir;
…		…
755	roll_stat (void)	767	roll_stat (void)
756	{	768	{
757	int a[4], i, j, k;	769	int a[4], i, j, k;
758		770
759	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
760	a[i] = (int) RANDOM () % 6 + 1;	772	a[i] = (int) rndm (6) + 1;
761		773
762	for (i = 0, j = 0, k = 7; i < 4; i++)	774	for (i = 0, j = 0, k = 7; i < 4; i++)
763	if (a[i] < k)	775	if (a[i] < k)
764	k = a[i], j = i;	776	k = a[i], j = i;
765		777
…		…
771	}	783	}
772		784
773	void	785	void
774	object::roll_stats ()	786	object::roll_stats ()
775	{	787	{
776	int statsort [7];	788	int statsort [NUM_STATS];
777		789
778	for (;;)	790	for (;;)
779	{	791	{
780	int sum = 0;	792	int sum = 0;
781	for (int i = 7; i--; )	793	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	794	sum += statsort [i] = roll_stat ();
783		795
784	if (sum >= 82 && sum <= 116)	796	if (sum >= 82 && sum <= 116)
785	break;	797	break;
786	}	798	}
787		799
788	// Sort the stats so that rerolling is easier...	800	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	801	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		802
		803	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	804	stats.stat (i) = statsort [i];
792	stats.Dex = statsort[1];
793	stats.Con = statsort[2];
794	stats.Int = statsort[3];
795	stats.Wis = statsort[4];
796	stats.Pow = statsort[5];
797	stats.Cha = statsort[6];
798		805
799	stats.exp = 0;	806	stats.exp = 0;
800	stats.ac = 0;	807	stats.ac = 0;
801		808
802	stats.hp = stats.maxhp;	809	stats.hp = stats.maxhp;
…		…
814	}	821	}
815		822
816	void	823	void
817	object::swap_stats (int a, int b)	824	object::swap_stats (int a, int b)
818	{	825	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	826	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
820	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
821	set_attr_value (&contr->orig_stats, b, tmp);
822		827
		828	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	829	stats.stat (i) = contr->orig_stats.stat (i);
824	stats.Dex = contr->orig_stats.Dex;
825	stats.Con = contr->orig_stats.Con;
826	stats.Int = contr->orig_stats.Int;
827	stats.Wis = contr->orig_stats.Wis;
828	stats.Pow = contr->orig_stats.Pow;
829	stats.Cha = contr->orig_stats.Cha;
830		830
831	//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,
832	// be merged with the similar code in roll_stats	832	// be merged with the similar code in roll_stats
833	stats.ac = 0;	833	stats.ac = 0;
834		834
…		…
846	contr->levsp[1] = 6;	846	contr->levsp[1] = 6;
847	contr->levgrace[1] = 3;	847	contr->levgrace[1] = 3;
848		848
849	contr->orig_stats = stats;	849	contr->orig_stats = stats;
850	}	850	}
		851	}
		852
		853	static void
		854	start_info (object *op)
		855	{
		856	char buf[MAX_BUF];
		857
		858	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		859	new_draw_info (NDI_UNIQUE, 0, op, buf);
		860	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		861	//new_draw_info (NDI_UNIQUE, 0, op, " ");
851	}	862	}
852		863
853	/* This function takes the key that is passed, and does the	864	/* This function takes the key that is passed, and does the
854	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
855	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
856	* separate race and class; this actually changes the RACE,	867	* separate race and class; this actually changes the RACE,
857	* not the class.	868	* not the class.
858	*/	869	*/
859	int	870	void
860	key_change_class (object *op, char key)	871	player::chargen_race_done ()
861	{	872	{
862	int tmp_loop;
863
864	if (key == 'd' || key == 'D')
865	{
866	char buf[MAX_BUF];
867
868	/* this must before then initial items are given */	873	/* this must before then initial items are given */
869	esrv_new_player (op->contr, op->weight + op->carrying);	874	esrv_new_player (ob->contr, ob->weight + ob->carrying);
870		875
871	treasurelist *tl = find_treasurelist ("starting_wealth");	876	treasurelist *tl = treasurelist::find ("starting_wealth");
872	if (tl)	877	if (tl)
873	create_treasure (tl, op, 0, 0, 0);	878	create_treasure (tl, ob, 0, 0, 0);
874		879
875	INVOKE_PLAYER (BIRTH, op->contr);	880	INVOKE_PLAYER (BIRTH, ob->contr);
876	INVOKE_PLAYER (LOGIN, op->contr);	881	INVOKE_PLAYER (LOGIN, ob->contr);
877		882
878	op->contr->ns->state = ST_PLAYING;	883	ob->contr->ns->state = ST_PLAYING;
879		884
880	if (op->msg)	885	if (ob->msg)
881	op->msg = NULL;	886	ob->msg = 0;
882		887
883	/* 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
884	* to save here.	889	* to save here.
885	*/	890	*/
		891	{
		892	char buf[MAX_BUF];
886	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	893	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
887	make_path_to_file (buf);	894	make_path_to_file (buf);
		895	}
888		896
889	#ifdef AUTOSAVE
890	op->contr->last_save_tick = pticks;
891	#endif
892	start_info (op);	897	start_info (ob);
893	CLEAR_FLAG (op, FLAG_WIZ);	898	CLEAR_FLAG (ob, FLAG_WIZ);
894	give_initial_items (op, op->randomitems);	899	give_initial_items (ob, ob->randomitems);
895	link_player_skills (op);	900	link_player_skills (ob);
896	esrv_send_inventory (op, op);	901	esrv_send_inventory (ob, ob);
897	op->update_stats ();	902	ob->update_stats ();
898		903
899	/* This moves the player to a different start map, if there	904	/* This moves the player to a different start map, if there
900	* is one for this race	905	* is one for this race
901	*/	906	*/
902	if (*first_map_ext_path)	907	if (*first_map_ext_path)
903	{	908	{
904	object *tmp;	909	object *tmp;
905	char mapname[MAX_BUF];	910	char mapname[MAX_BUF];
906		911
907	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);
908	tmp = object::create ();	913	tmp = object::create ();
909	EXIT_PATH (tmp) = mapname;	914	EXIT_PATH (tmp) = mapname;
910	EXIT_X (tmp) = op->x;	915	EXIT_X (tmp) = ob->x;
911	EXIT_Y (tmp) = op->y;	916	EXIT_Y (tmp) = ob->y;
912	enter_exit (op, tmp); /* we don't really care if it succeeded;	917	ob->enter_exit (tmp); /* we don't really care if it succeeded;
913	* if the map isn't there, then stay on the	918	* if the map isn't there, then stay on the
914	* default initial map */	919	* default initial map */
915	tmp->destroy ();	920	tmp->destroy ();
916	}	921	}
917	else	922	else
918	LOG (llevDebug, "first_map_ext_path not set\n");	923	LOG (llevDebug, "first_map_ext_path not set\n");
		924	}
919		925
920	return 0;	926	void
921	}	927	player::chargen_race_next ()
922		928	{
923	/* Following actually changes the race - this is the default command	929	/* Following actually changes the race - this is the default command
924	* if we don't match with one of the options above.	930	* if we don't match with one of the options above.
925	*/	931	*/
926		932
927	tmp_loop = 0;	933	do
928	while (!tmp_loop)
929	{	934	{
930	shstr name = op->name;	935	shstr name = ob->name;
931	int x = op->x, y = op->y;	936	int x = ob->x, y = ob->y;
932		937
933	op->remove_statbonus ();	938	ob->remove_statbonus ();
934	op->remove ();	939	ob->remove ();
935	op->arch = get_player_archetype (op->arch);	940	ob->arch = get_player_archetype (ob->arch);
936	op->arch->clone.copy_to (op);	941	ob->arch->clone.copy_to (ob);
937	op->instantiate ();	942	ob->instantiate ();
938	op->stats = op->contr->orig_stats;	943	ob->stats = ob->contr->orig_stats;
939	op->name = op->name_pl = name;	944	ob->name = ob->name_pl = name;
940	op->x = x;	945	ob->x = x;
941	op->y = y;	946	ob->y = y;
942	SET_ANIMATION (op, 2); /* So player faces south */	947	SET_ANIMATION (ob, 2); /* So player faces south */
943	insert_ob_in_map (op, op->map, op, 0);	948	insert_ob_in_map (ob, ob->map, ob, 0);
944	assign (op->contr->title, op->arch->clone.name);	949	assign (ob->contr->title, ob->arch->clone.name);
945	op->add_statbonus ();	950	ob->add_statbonus ();
946	tmp_loop = allowed_class (op);
947	}	951	}
		952	while (!allowed_class (ob));
948		953
949	update_object (op, UP_OBJ_FACE);	954	update_object (ob, UP_OBJ_FACE);
950	esrv_update_item (UPD_FACE, op, op);	955	esrv_update_item (UPD_FACE, ob, ob);
951	op->update_stats ();	956	ob->update_stats ();
952	op->stats.hp = op->stats.maxhp;	957	ob->stats.hp = ob->stats.maxhp;
953	op->stats.sp = op->stats.maxsp;	958	ob->stats.sp = ob->stats.maxsp;
954	op->stats.grace = 0;	959	ob->stats.grace = 0;
955
956	if (op->msg)
957	new_draw_info (NDI_BLUE, 0, op, op->msg);
958
959	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
960	return 0;
961	}
962
963	int
964	key_confirm_quit (object *op, char key)
965	{
966	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
967	{
968	op->contr->ns->state = ST_PLAYING;
969	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
970	return 1;
971	}
972
973	INVOKE_PLAYER (LOGOUT, op->contr);
974	INVOKE_PLAYER (QUIT, op->contr);
975
976	terminate_all_pets (op);
977	leave_map (op);
978	op->direction = 0;
979	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
980
981	strcpy (op->contr->killer, "quit");
982	check_score (op);
983	op->contr->party = 0;
984	op->contr->own_title[0] = '\0';
985
986	object_ptr ob = op;
987
988	delete ob->contr;
989
990	/* We need to hunt for any per player unique maps in memory and
991	* get rid of them. The trailing slash in the path is intentional,
992	* so that players named 'Ab' won't match against players 'Abe' pathname
993	*/
994	char buf[MAX_BUF];
995	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
996
997	for (maptile *next, *mp = first_map; mp; mp = next)
998	{
999	next = mp->next;
1000
1001	if (!strncmp (mp->path, buf, strlen (buf)))
1002	delete_map (mp);
1003	}
1004
1005	delete_character (ob->name, 1);
1006
1007	return 1;
1008	}	960	}
1009		961
1010	void	962	void
1011	flee_player (object *op)	963	flee_player (object *op)
1012	{	964	{
…		…
1059	/* Cornered, get rid of scared */	1011	/* Cornered, get rid of scared */
1060	CLEAR_FLAG (op, FLAG_SCARED);	1012	CLEAR_FLAG (op, FLAG_SCARED);
1061	op->enemy = NULL;	1013	op->enemy = NULL;
1062	}	1014	}
1063		1015
1064
1065	/* 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.
1066	* 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
1067	* stop.	1018	* stop.
1068	*/	1019	*/
1069	int	1020	int
1070	check_pick (object *op)	1021	check_pick (object *op)
1071	{	1022	{
1072	object *tmp, *next;	1023	object *tmp, *next;
1073	int stop = 0;	1024	int stop = 0;
1074	int j, k, wvratio;	1025	int wvratio;
1075	char putstring[128], tmpstr[16];	1026	char putstring[128];
1076		1027
1077	/* if you're flying, you cna't pick up anything */	1028	/* if you're flying, you cna't pick up anything */
1078	if (op->move_type & MOVE_FLYING)	1029	if (op->move_type & MOVE_FLYING)
1079	return 1;	1030	return 1;
1080		1031
…		…
1417	* found object is returned.	1368	* found object is returned.
1418	*/	1369	*/
1419	object *	1370	object *
1420	find_arrow (object *op, const char *type)	1371	find_arrow (object *op, const char *type)
1421	{	1372	{
1422	object *tmp = NULL;	1373	object *tmp = 0;
1423		1374
1424	for (op = op->inv; op; op = op->below)	1375	for (op = op->inv; op; op = op->below)
1425	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))
1426	tmp = find_arrow (op, type);	1377	tmp = find_arrow (op, type);
1427	else if (op->type == ARROW && op->race == type)	1378	else if (op->type == ARROW && op->race == type)
1428	return op;	1379	return op;
		1380
1429	return tmp;	1381	return tmp;
1430	}	1382	}
1431		1383
1432	/*	1384	/*
1433	* 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
1434	* 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
1435	* 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
1436	* 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.
1437	*/	1389	*/
1438
1439	object *	1390	object *
1440	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)
1441	{	1392	{
1442	object *tmp = NULL, *arrow, *ntmp;	1393	object *tmp = NULL, *arrow, *ntmp;
1443	int attacknum, attacktype, betterby = 0, i;	1394	int attacknum, attacktype, betterby = 0, i;
…		…
1509	* find_better_arrow to find a decent arrow to use.	1460	* find_better_arrow to find a decent arrow to use.
1510	* op = the shooter	1461	* op = the shooter
1511	* type = bow->race	1462	* type = bow->race
1512	* dir = fire direction	1463	* dir = fire direction
1513	*/	1464	*/
1514
1515	object *	1465	object *
1516	pick_arrow_target (object *op, const char *type, int dir)	1466	pick_arrow_target (object *op, const char *type, int dir)
1517	{	1467	{
1518	object *tmp = NULL;	1468	object *tmp = NULL;
1519	maptile *m;	1469	maptile *m;
…		…
1584	*/	1534	*/
1585	int	1535	int
1586	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)
1587	{	1537	{
1588	object *left, *bow;	1538	object *left, *bow;
1589	int bowspeed, mflags;	1539	int mflags;
1590	maptile *m;	1540	maptile *m;
1591		1541
1592	if (!dir)	1542	if (!dir)
1593	{	1543	{
1594	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!");
1595	return 0;	1545	return 0;
1596	}	1546	}
1597		1547
1598	if (op->type == PLAYER)	1548	if (op->contr)
1599	bow = op->contr->ranges[range_bow];	1549	bow = op->current_weapon;
1600	else	1550	else
1601	{	1551	{
1602	for (bow = op->inv; bow; bow = bow->below)	1552	for (bow = op->inv; bow; bow = bow->below)
1603	/* 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
1604	* 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.
…		…
1609	if (!bow)	1559	if (!bow)
1610	{	1560	{
1611	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1561	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1612	return 0;	1562	return 0;
1613	}	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
1614	}	1572	}
1615		1573
1616	if (!bow->race || !bow->skill)	1574	if (!bow->race || !bow->skill)
1617	{	1575	{
1618	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);
1619	return 0;	1577	return 0;
1620	}	1578	}
1621
1622	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1623
1624	/* penalize ROF for bestarrow */
1625	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1626	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1627
1628	if (bowspeed < 1)
1629	bowspeed = 1;
1630		1579
1631	if (arrow == NULL)	1580	if (arrow == NULL)
1632	{	1581	{
1633	if ((arrow = find_arrow (op, bow->race)) == NULL)	1582	if ((arrow = find_arrow (op, bow->race)) == NULL)
1634	{	1583	{
1635	if (op->type == PLAYER)	1584	if (op->type == PLAYER)
1636	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);
1637	/* 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 */
1638	else	1587	else
1639	CLEAR_FLAG (op, FLAG_READY_BOW);	1588	CLEAR_FLAG (op, FLAG_READY_BOW);
		1589
1640	return 0;	1590	return 0;
1641	}	1591	}
1642	}	1592	}
1643		1593
1644	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1594	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1666	return 0;	1616	return 0;
1667	}	1617	}
1668		1618
1669	arrow->set_owner (op);	1619	arrow->set_owner (op);
1670	arrow->skill = bow->skill;	1620	arrow->skill = bow->skill;
1671
1672	arrow->direction = dir;	1621	arrow->direction = dir;
1673	arrow->x = sx;	1622
1674	arrow->y = sy;	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;
1675		1655
1676	if (op->type == PLAYER)	1656	if (op->type == PLAYER)
1677	{	1657	{
1678	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1679	op->update_stats ();
1680	}
1681
1682	SET_ANIMATION (arrow, arrow->direction);
1683	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1684	arrow->stats.hp = arrow->stats.dam;
1685	arrow->stats.grace = arrow->attacktype;
1686	if (arrow->slaying != NULL)
1687	arrow->spellarg = strdup (arrow->slaying);
1688
1689	/* Note that this was different for monsters - they got their level
1690	* added to the damage. I think the strength bonus is more proper.
1691	*/
1692
1693	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1694
1695	/* update the speed */
1696	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1697	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1698
1699	if (arrow->speed < 1.0)
1700	arrow->speed = 1.0;
1701	update_ob_speed (arrow);
1702	arrow->speed_left = 0;
1703
1704	if (op->type == PLAYER)
1705	{
1706	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1707	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1708	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1709
1710	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;
1711	}	1665	}
1712	else	1666	else
1713	{	1667	{
1714	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1715	arrow->level = op->level;	1668	arrow->level = op->level;
1716	}	1669	arrow->stats.wc -= bow->magic;
1717		1670
1718	if (arrow->attacktype == AT_PHYSICAL)	1671	if (!arrow->slaying)
		1672	arrow->slaying = bow->slaying;
		1673
1719	arrow->attacktype |= bow->attacktype;	1674	arrow->attacktype |= bow->attacktype;
		1675	}
1720		1676
1721	if (bow->slaying)	1677	wc -= arrow->level;
1722	arrow->slaying = bow->slaying;	1678	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1723		1679
1724	arrow->map = m;	1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1725	arrow->move_type = MOVE_FLY_LOW;	1681	arrow->move_type = MOVE_FLY_LOW;
1726	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1682	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1727		1683
1728	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);
1729	insert_ob_in_map (arrow, m, op, 0);	1685	m->insert (arrow, sx, sy, op);
1730		1686
1731	if (!arrow->destroyed ())	1687	if (!arrow->destroyed ())
1732	move_arrow (arrow);	1688	move_arrow (arrow);
1733		1689
1734	if (op->type == PLAYER)	1690	if (op->type == PLAYER)
…		…
1754	{	1710	{
1755	int ret = 0, wcmod = 0;	1711	int ret = 0, wcmod = 0;
1756		1712
1757	if (op->contr->bowtype == bow_bestarrow)	1713	if (op->contr->bowtype == bow_bestarrow)
1758	{	1714	{
1759	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);
1760	}	1716	}
1761	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)
1762	{	1718	{
1763	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1719	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1764	wcmod = -1;	1720	wcmod = -1;
		1721
1765	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1722	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1766	}	1723	}
1767	else if (op->contr->bowtype == bow_threewide)	1724	else if (op->contr->bowtype == bow_threewide)
1768	{	1725	{
1769	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1726	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1773	else if (op->contr->bowtype == bow_spreadshot)	1730	else if (op->contr->bowtype == bow_spreadshot)
1774	{	1731	{
1775	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);
1776	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);
1777	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);
1778
1779	}	1735	}
1780	else	1736	else
1781	{	1737	{
1782	/* Simple case */	1738	/* Simple case */
1783	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);
1784	}	1740	}
		1741
1785	return ret;	1742	return ret;
1786	}	1743	}
1787
1788		1744
1789	/* Fires a misc (wand/rod/horn) object in 'dir'.	1745	/* Fires a misc (wand/rod/horn) object in 'dir'.
1790	* Broken apart from 'fire' to keep it more readable.	1746	* Broken apart from 'fire' to keep it more readable.
1791	*/	1747	*/
1792	void	1748	void
1793	fire_misc_object (object *op, int dir)	1749	fire_misc_object (object *op, int dir)
1794	{	1750	{
1795	object *item;	1751	object *item = op->contr->ranged_ob;
1796		1752
1797	if (!op->contr->ranges[range_misc])	1753	if (!item)
1798	{	1754	{
1799	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.");
1800	return;	1756	return;
1801	}	1757	}
1802		1758
1803	item = op->contr->ranges[range_misc];
1804	if (!item->inv)	1759	if (!item->inv)
1805	{	1760	{
1806	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1761	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1807	return;	1762	return;
1808	}	1763	}
		1764
		1765	if (!op->change_weapon (item))
		1766	return;
		1767
1809	if (item->type == WAND)	1768	if (item->type == WAND)
1810	{	1769	{
1811	if (item->stats.food <= 0)	1770	if (item->stats.food <= 0)
1812	{	1771	{
1813	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1814	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
1815	return;	1775	return;
1816	}	1776	}
1817	}	1777	}
1818	else if (item->type == ROD || item->type == HORN)	1778	else if (item->type == ROD || item->type == HORN)
1819	{	1779	{
1820	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))
1821	{	1781	{
1822	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1783
1823	if (item->type == ROD)	1784	if (item->type == ROD)
1824	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));
1825	else	1786	else
1826	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
1827	return;	1789	return;
1828	}	1790	}
1829	}	1791	}
1830		1792
1831	if (cast_spell (op, item, dir, item->inv, NULL))	1793	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1839		1801
1840	if (item->arch)	1802	if (item->arch)
1841	{	1803	{
1842	CLEAR_FLAG (item, FLAG_ANIMATE);	1804	CLEAR_FLAG (item, FLAG_ANIMATE);
1843	item->face = item->arch->clone.face;	1805	item->face = item->arch->clone.face;
1844	item->speed = 0;	1806	item->set_speed (0);
1845	update_ob_speed (item);
1846	}	1807	}
		1808
1847	if ((tmp = item->in_player ()))	1809	if ((tmp = item->in_player ()))
1848	esrv_update_item (UPD_ANIM, tmp, item);	1810	esrv_update_item (UPD_ANIM, tmp, item);
1849	}	1811	}
1850	}	1812	}
1851	else if (item->type == ROD || item->type == HORN)	1813	else if (item->type == ROD || item->type == HORN)
1852	{
1853	drain_rod_charge (item);	1814	drain_rod_charge (item);
1854	}
1855	}	1815	}
1856	}	1816	}
1857		1817
1858	/* Received a fire command for the player - go and do it.	1818	/* Received a fire command for the player - go and do it.
1859	*/	1819	*/
1860	void	1820	bool
1861	fire (object *op, int dir)	1821	fire (object *op, int dir)
1862	{	1822	{
1863	int spellcost = 0;	1823	int spellcost = 0;
1864		1824
1865	/* check for loss of invisiblity/hide */	1825	/* check for loss of invisiblity/hide */
1866	if (action_makes_visible (op))	1826	if (action_makes_visible (op))
1867	make_visible (op);	1827	make_visible (op);
1868		1828
1869	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;
1870	{	1835	}
1871	case range_none:
1872	return;
1873		1836
1874	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:
1875	player_fire_bow (op, dir);	1853	player_fire_bow (op, dir);
1876	return;	1854	break;
1877		1855
1878	case range_magic: /* Casting spells */	1856	case SPELL:
1879	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);
1880	return;	1858	break;
1881		1859
1882	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:
1883	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1884	return;	1870	break;
1885
1886	case range_golem: /* Control summoned monsters from scrolls */
1887	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1888	{
1889	op->contr->ranges[range_golem] = 0;
1890	op->contr->shoottype = range_none;
1891	}
1892	else
1893	control_golem (op->contr->ranges[range_golem], dir);
1894	return;
1895
1896	case range_skill:
1897	if (!op->chosen_skill)
1898	{
1899	if (op->type == PLAYER)
1900	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1901	return;
1902	}
1903	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1904	return;
1905	case range_builder:
1906	apply_map_builder (op, dir);
1907	return;
1908	default:
1909	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1910	return;
1911	}	1871	}
1912	}
1913		1872
1914		1873	return true;
		1874	}
1915		1875
1916	/* find_key	1876	/* find_key
1917	* 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
1918	* and successfully use it, we return the key, otherwise NULL	1878	* and successfully use it, we return the key, otherwise NULL
1919	* This function merges both normal and locked door, since the logic	1879	* This function merges both normal and locked door, since the logic
…		…
1921	* pl is the player,	1881	* pl is the player,
1922	* inv is the objects inventory to searched	1882	* inv is the objects inventory to searched
1923	* door is the door we are trying to match against.	1883	* door is the door we are trying to match against.
1924	* This function can be called recursively to search containers.	1884	* This function can be called recursively to search containers.
1925	*/	1885	*/
1926
1927	object *	1886	object *
1928	find_key (object *pl, object *container, object *door)	1887	find_key (object *pl, object *container, object *door)
1929	{	1888	{
1930	object *tmp, *key;	1889	object *tmp, *key;
1931		1890
1932	/* Should not happen, but sanity checking is never bad */	1891	/* Should not happen, but sanity checking is never bad */
1933	if (container->inv == NULL)	1892	if (!container->inv)
1934	return NULL;	1893	return 0;
1935		1894
1936	/* 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 */
1937	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1896	for (tmp = container->inv; tmp; tmp = tmp->below)
1938	{	1897	{
1939	if (door->type == DOOR && tmp->type == KEY)	1898	if (door->type == DOOR && tmp->type == KEY)
1940	break;	1899	break;
1941	/* For sanity, we should really check door type, but other stuff	1900	/* For sanity, we should really check door type, but other stuff
1942	* (like containers) can be locked with special keys	1901	* (like containers) can be locked with special keys
1943	*/	1902	*/
1944	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1903	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1945	break;	1904	break;
1946	}	1905	}
		1906
1947	/* No key found - lets search inventories now */	1907	/* No key found - lets search inventories now */
1948	/* 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.
1949	* 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
1950	* a key, return	1910	* a key, return
1951	*/	1911	*/
1952	if (!tmp)	1912	if (!tmp)
1953	{	1913	{
1954	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1914	for (tmp = container->inv; tmp; tmp = tmp->below)
1955	{	1915	{
1956	/* No reason to search empty containers */	1916	/* No reason to search empty containers */
1957	if (tmp->type == CONTAINER && tmp->inv)	1917	if (tmp->type == CONTAINER && tmp->inv)
1958	{	1918	{
1959	if ((key = find_key (pl, tmp, door)) != NULL)	1919	if ((key = find_key (pl, tmp, door)))
1960	return key;	1920	return key;
1961	}	1921	}
1962	}	1922	}
		1923
1963	if (!tmp)	1924	if (!tmp)
1964	return NULL;	1925	return NULL;
1965	}	1926	}
		1927
1966	/* 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,
1967	* see if we actually want to use it	1929	* see if we actually want to use it
1968	*/	1930	*/
1969	if (pl != container)	1931	if (pl != container)
1970	{	1932	{
…		…
1991	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1953	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1992	"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));
1993	return NULL;	1955	return NULL;
1994	}	1956	}
1995	}	1957	}
		1958
1996	return tmp;	1959	return tmp;
1997	}	1960	}
1998		1961
1999	/* moved door processing out of move_player_attack.	1962	/* moved door processing out of move_player_attack.
2000	* returns 1 if player has opened the door with a key	1963	* returns 1 if player has opened the door with a key
…		…
2002	* 0 otherwise	1965	* 0 otherwise
2003	*/	1966	*/
2004	static int	1967	static int
2005	player_attack_door (object *op, object *door)	1968	player_attack_door (object *op, object *door)
2006	{	1969	{
2007	/* 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,
2008	* 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 -
2009	* otherwise, we fall through to the rest of the code.	1972	* otherwise, we fall through to the rest of the code.
2010	*/	1973	*/
2011	object *key = find_key (op, op, door);	1974	object *key = find_key (op, op, door);
2012		1975
2013	/* IF we found a key, do some extra work */	1976	/* If we found a key, do some extra work */
2014	if (key)	1977	if (key)
2015	{	1978	{
2016	object *container = key->env;	1979	object *container = key->env;
2017		1980
2018	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
2019	if (action_makes_visible (op))	1983	if (action_makes_visible (op))
2020	make_visible (op);	1984	make_visible (op);
		1985
2021	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1986	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2022	spring_trap (door->inv, op);	1987	spring_trap (door->inv, op);
		1988
2023	if (door->type == DOOR)	1989	if (door->type == DOOR)
2024	{
2025	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 */
2026	}
2027	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
2028	{	1992	{
2029	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));
2030	remove_door2 (door); /* remove door without violence ;-) */	1994	remove_door2 (door); /* remove door without violence ;-) */
2031	}	1995	}
		1996
2032	/* Do this after we print the message */	1997	/* Do this after we print the message */
2033	decrease_ob (key); /* Use up one of the keys */	1998	decrease_ob (key); /* Use up one of the keys */
2034	/* Need to update the weight the container the key was in */	1999	/* Need to update the weight the container the key was in */
2035	if (container != op)	2000	if (container != op)
2036	esrv_update_item (UPD_WEIGHT, op, container);	2001	esrv_update_item (UPD_WEIGHT, op, container);
		2002
2037	return 1; /* Nothing more to do below */	2003	return 1; /* Nothing more to do below */
2038	}	2004	}
2039	else if (door->type == LOCKED_DOOR)	2005	else if (door->type == LOCKED_DOOR)
2040	{	2006	{
2041	/* Might as well return now - no other way to open this */	2007	/* Might as well return now - no other way to open this */
2042	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2008	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2043	return 1;	2009	return 1;
2044	}	2010	}
		2011
2045	return 0;	2012	return 0;
2046	}	2013	}
2047		2014
2048	/* This function is just part of a breakup from move_player.	2015	/* This function is just part of a breakup from move_player.
2049	* It should keep the code cleaner.	2016	* It should keep the code cleaner.
2050	* When this is called, the players direction has been updated	2017	* When this is called, the players direction has been updated
2051	* (taking into account confusion.) The player is also actually	2018	* (taking into account confusion.) The player is also actually
2052	* going to try and move (not fire weapons).	2019	* going to try and move (not fire weapons).
2053	*/	2020	*/
2054	void	2021	bool
2055	move_player_attack (object *op, int dir)	2022	move_player_attack (object *op, int dir)
2056	{	2023	{
2057	object *tmp, *mon;
2058	sint16 nx, ny;
2059	int on_battleground;	2024	int on_battleground;
2060	maptile *m;
2061		2025
2062	nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2063	ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2064		2028
2065	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	}
2066		2039
2067	/* 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
2068	* 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
2069	* 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
2070	* player. This is a pretty nasty hack, because if we could	2043	* player. This is a pretty nasty hack, because if we could
2071	* 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
2072	* 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
2073	* 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
2074	* move_ob uses.	2047	* move_ob uses.
2075	*/	2048	*/
2076	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);
2077	{
2078	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2079	{
2080	m = get_map_from_coord (op->map, &nx, &ny);
2081	if (!m)
2082	return; /* Don't think this should happen */
2083	}
2084	else
2085	m = op->map;
2086		2050
2087	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2088	{
2089	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2090	return;
2091	}
2092
2093	mon = 0;
2094	/* 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
2095	* 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.
2096	* 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
2097	* on the space	2054	* on the space
2098	*/	2055	*/
2099	while (tmp)	2056	object *mon;
2100	{	2057	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2101	if (tmp == op)	2058	{
2102	{	2059	if ((mon->flag [FLAG_ALIVE]
2103	tmp = tmp->above;	2060	|| mon->type == LOCKED_DOOR
2104	continue;	2061	|| mon->flag [FLAG_CAN_ROLL])
2105	}
2106
2107	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2108	{
2109	mon = tmp;	2062	&& mon != op)
2110	break;	2063	break;
2111	}	2064	}
2112		2065
2113	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2114	mon = tmp;
2115
2116	tmp = tmp->above;
2117	}
2118
2119	if (!mon) /* This happens anytime the player tries to move */	2066	if (!mon) /* This happens anytime the player tries to move */
2120	return; /* into a wall */	2067	return false; /* into a wall */
2121		2068
2122	if (mon->head)
2123	mon = mon->head;	2069	mon = mon->head_ ();
2124		2070
2125	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)
2126	if (player_attack_door (op, mon))	2073	if (player_attack_door (op, mon))
		2074	{
		2075	--op->contr->weapon_sp_left;
2127	return;	2076	return true;
		2077	}
2128		2078
2129	/* The following deals with possibly attacking peaceful	2079	/* The following deals with possibly attacking peaceful
2130	* or frienddly creatures. Basically, all players are considered	2080	* or friendly creatures. Basically, all players are considered
2131	* unaggressive. If the moving player has peaceful set, then the	2081	* unaggressive. If the moving player has peaceful set, then the
2132	* object should be pushed instead of attacked. It is assumed that	2082	* object should be pushed instead of attacked. It is assumed that
2133	* if you are braced, you will not attack friends accidently,	2083	* if you are braced, you will not attack friends accidently,
2134	* and thus will not push them.	2084	* and thus will not push them.
2135	*/	2085	*/
2136		2086
2137	/* 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
2138	* peaceful. Our assumption is the creature is a pet if the	2088	* peaceful. Our assumption is the creature is a pet if the
2139	* player owns it and it is either friendly or unagressive.	2089	* player owns it and it is either friendly or unagressive.
2140	*/	2090	*/
2141	if ((op->type == PLAYER)	2091	if (op->type == PLAYER
2142	#if COZY_SERVER
2143	&&
2144	((mon->owner && mon->owner->contr	2092	&& ((mon->owner && mon->owner->contr
2145	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2093	&& same_party (mon->owner->contr->party, op->contr->party))
2146	#else
2147	&& mon->owner == op	2094	|| mon->owner == op)
2148	#endif
2149	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2150	{	2096	{
2151	/* 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 */
2152	if (op->contr->braced)	2098	if (op->contr->braced)
2153	return;	2099	return false;
		2100
		2101	if (op->speed_left > 0.f)
		2102	{
		2103	--op->speed_left;
		2104
2154	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);
2155	(void) push_ob (mon, dir, op);	2106	push_ob (mon, dir, op);
		2107
2156	if (op->contr->tmp_invis || op->hide)	2108	if (op->contr->tmp_invis || op->hide)
2157	make_visible (op);	2109	make_visible (op);
		2110
2158	return;	2111	return true;
2159	}	2112	}
		2113	else
		2114	return false;
		2115	}
2160		2116
2161	/* in certain circumstances, you shouldn't attack friendly	2117	/* in certain circumstances, you shouldn't attack friendly
2162	* creatures. Note that if you are braced, you can't push	2118	* creatures. Note that if you are braced, you can't push
2163	* 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
2164	* attack them either.	2120	* attack them either.
2165	*/	2121	*/
2166	if ((mon->type == PLAYER || mon->enemy != op) &&	2122	if ((mon->type == PLAYER || mon->enemy != op)
2167	(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))
2168	#ifdef PROHIBIT_PLAYERKILL
2169	(op->contr->peaceful	2124	&& ((op->contr->peaceful
2170	|| (mon->type == PLAYER	2125	|| (mon->type == PLAYER && mon->contr->peaceful))
2171	&& mon->contr->
2172	peaceful)) &&
2173	#else
2174	op->contr->peaceful &&
2175	#endif
2176	!on_battleground))	2126	&& !on_battleground))
		2127	{
		2128	if (op->speed_left > 0.f)
2177	{	2129	{
		2130	--op->speed_left;
		2131
2178	if (!op->contr->braced)	2132	if (!op->contr->braced)
2179	{	2133	{
2180	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);
2181	(void) push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2182	}	2136	}
2183	else	2137	else
2184	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2185		2139
2186	if (op->contr->tmp_invis || op->hide)	2140	if (op->contr->tmp_invis || op->hide)
2187	make_visible (op);	2141	make_visible (op);
2188	}
2189		2142
		2143	return true;
		2144	}
		2145	}
2190	/* If the object is a boulder or other rollable object, then	2146	/* If the object is a boulder or other rollable object, then
2191	* 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.
2192	*/	2148	*/
2193	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)
2194	{	2152	{
		2153	--op->speed_left;
		2154
2195	recursive_roll (mon, dir, op);	2155	recursive_roll (mon, dir, op);
2196	if (action_makes_visible (op))	2156	if (action_makes_visible (op))
2197	make_visible (op);	2157	make_visible (op);
2198	}
2199		2158
		2159	return true;
		2160	}
		2161	}
2200	/* Any generic living creature. Including things like doors.	2162	/* Any generic living creature. Including things like doors.
2201	* 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
2202	* and be living. Then, it must be one of the following:	2164	* and be living. Then, it must be one of the following:
2203	* 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
2204	* 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.
2205	*/	2167	*/
2206
2207	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2168	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2208	((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)))
2209	{	2170	{
2210		2171	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2211	/* If the player hasn't hit something this tick, and does
2212	* so, give them speed boost based on weapon speed. Doing
2213	* it here is better than process_players2, which basically
2214	* incurred a 1 tick offset.
2215	*/
2216	if (!op->contr->has_hit)
2217	{	2172	{
2218	op->speed_left += op->speed / op->contr->weapon_sp;	2173	--op->contr->weapon_sp_left;
2219
2220	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2221	}
2222		2174
2223	skill_attack (mon, op, 0, 0, 0);	2175	skill_attack (mon, op, 0, 0, 0);
2224
2225	/* If attacking another player, that player gets automatic
2226	* hitback, and doesn't loose luck either.
2227	* Disable hitback on the battleground or if the target is
2228	* the wiz.
2229	*/
2230	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2231	{
2232	short luck = mon->stats.luck;
2233
2234	mon->contr->has_hit = 1;
2235	skill_attack (op, mon, 0, 0, 0);
2236	mon->stats.luck = luck;
2237	}
2238		2176
2239	if (action_makes_visible (op))	2177	if (action_makes_visible (op))
2240	make_visible (op);	2178	make_visible (op);
2241	}
2242	} /* if player should attack something */
2243	}
2244		2179
2245	int	2180	return true;
		2181	}
		2182	}
		2183
		2184	return false;
		2185	}
		2186
		2187	bool
2246	move_player (object *op, int dir)	2188	move_player (object *op, int dir)
2247	{	2189	{
2248	int pick;	2190	int pick;
2249		2191
2250	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2192	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2251	return 0;	2193	return 0;
2252		2194
2253	/* Sanity check: make sure dir is valid */	2195	/* Sanity check: make sure dir is valid */
2254	if ((dir < 0) || (dir >= 9))	2196	if ((dir < 0) || (dir >= 9))
2255	{	2197	{
2256	LOG (llevError, "move_player: invalid direction %d\n", dir);	2198	LOG (llevError, "move_player: invalid direction %d\n", dir);
2257	return 0;	2199	return 0;
2258	}	2200	}
2259		2201
2260	/* peterm: added following line */	2202	/* peterm: added following line */
2261	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2203	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2262	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2204	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2263		2205
2264	op->facing = dir;	2206	op->facing = dir;
2265		2207
2266	if (op->hide)	2208	if (op->hide)
2267	do_hidden_move (op);	2209	do_hidden_move (op);
2268		2210
		2211	bool retval;
		2212
2269	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2213	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2270	/*nop */ ;	2214	retval = RESULT_INT (0);
2271	else if (op->contr->fire_on)	2215	else if (op->contr->fire_on)
2272	fire (op, dir);	2216	retval = fire (op, dir);
2273	else	2217	else
2274	{	2218	{
2275	move_player_attack (op, dir);	2219	retval = move_player_attack (op, dir);
2276	pick = check_pick (op);	2220	pick = check_pick (op);
2277	}	2221	}
2278		2222
2279	/* 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
2280	* server can handle repeat firing.	2224	* server can handle repeat firing.
…		…
2287	/* Update how the player looks. Use the facing, so direction may	2231	/* Update how the player looks. Use the facing, so direction may
2288	* get reset to zero. This allows for full animation capabilities	2232	* get reset to zero. This allows for full animation capabilities
2289	* for players.	2233	* for players.
2290	*/	2234	*/
2291	animate_object (op, op->facing);	2235	animate_object (op, op->facing);
2292	return 0;	2236
		2237	return retval;
2293	}	2238	}
2294		2239
2295	/* 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
2296	* new client/server stuff.	2241	* new client/server stuff.
2297	* 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
2298	* the new speed values for commands.	2243	* the new speed values for commands.
2299	*	2244	*
2300	* 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.
2301	*/	2248	*/
2302	int	2249	bool
2303	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2304	{	2251	{
2305	if (op->contr->hidden)
2306	{
2307	op->invisible = 1000;
2308	/* the socket code flashes the player visible/invisible
2309	* depending on the value of invisible, so we need to
2310	* alternate it here for it to work correctly.
2311	*/
2312	if (pticks & 2)
2313	op->invisible--;
2314	}
2315	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2316	{
2317	op->invisible--;
2318	if (!op->invisible)
2319	{
2320	make_visible (op);
2321	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2322	}
2323	}
2324
2325	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2326	{	2253	{
2327	flee_player (op);	2254	if (op->speed_left > 0.f)
2328	/* If player is still scared, that is his action for this tick */
2329	if (QUERY_FLAG (op, FLAG_SCARED))
2330	{	2255	{
2331	op->speed_left--;	2256	--op->speed_left;
		2257	flee_player (op);
		2258
2332	return 0;	2259	return true;
2333	}	2260	}
		2261	else
		2262	return false;
2334	}	2263	}
2335
2336	/* I've been seeing crashes where the golem has been destroyed, but
2337	* the player object still points to the defunct golem. The code that
2338	* destroys the golem looks correct, and it doesn't always happen, so
2339	* put this in a a workaround to clean up the golem pointer.
2340	*/
2341	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2342	op->contr->ranges[range_golem] = 0;
2343		2264
2344	/* 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
2345	* the players time has been increased when doericserver has been	2266	* the players time has been increased when doericserver has been
2346	* called, so we recheck it here.	2267	* called, so we recheck it here.
2347	*/	2268	*/
2348	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2269	if (op->contr->ns->handle_command ())
2349	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2350	;
2351
2352	if (op->speed_left < 0)
2353	return 0;	2270	return true;
2354		2271
2355	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2272	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2356	{
2357	/* All move commands take 1 tick, at least for now */
2358	op->speed_left--;
2359
2360	/* Instead of all the stuff below, let move_player take care
2361	* of it. Also, some of the skill stuff is only put in
2362	* there, as well as the confusion stuff.
2363	*/
2364	move_player (op, op->direction);	2273	return move_player (op, op->direction);
2365	if (op->speed_left > 0)
2366	return 1;
2367	else
2368	return 0;
2369	}
2370		2274
2371	return 0;	2275	return false;
2372	}	2276	}
2373		2277
2374	int	2278	int
2375	save_life (object *op)	2279	save_life (object *op)
2376	{	2280	{
…		…
2411	* from.	2315	* from.
2412	*/	2316	*/
2413	void	2317	void
2414	remove_unpaid_objects (object *op, object *env)	2318	remove_unpaid_objects (object *op, object *env)
2415	{	2319	{
2416	object *next;
2417
2418	while (op)	2320	while (op)
2419	{	2321	{
2420	next = op->below; /* Make sure we have a good value, in case	2322	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2421	* we remove object 'op'	2323
2422	*/
2423	if (QUERY_FLAG (op, FLAG_UNPAID))	2324	if (QUERY_FLAG (op, FLAG_UNPAID))
2424	{	2325	{
2425	op->remove ();
2426	op->x = env->x;
2427	op->y = env->y;
2428	if (env->type == PLAYER)	2326	if (env->type == PLAYER)
2429	esrv_del_item (env->contr, op->count);	2327	esrv_del_item (env->contr, op->count);
2430	insert_ob_in_map (op, env->map, NULL, 0);	2328
		2329	op->insert_at (env);
2431	}	2330	}
2432	else if (op->inv)	2331	else if (op->inv)
2433	remove_unpaid_objects (op->inv, env);	2332	remove_unpaid_objects (op->inv, env);
2434		2333
2435	op = next;	2334	op = next;
…		…
2491	int rate_grace = 2000;	2390	int rate_grace = 2000;
2492	const int max_hp = 1;	2391	const int max_hp = 1;
2493	const int max_sp = 1;	2392	const int max_sp = 1;
2494	const int max_grace = 1;	2393	const int max_grace = 1;
2495		2394
2496	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--;
2497	{	2404	}
2498	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2405	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2499	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2406	{
2500	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	}
2501	}	2412	}
2502		2413
2503	if (op->contr->ns->state == ST_PLAYING)	2414	if (op->contr->ns->state == ST_PLAYING)
2504	{	2415	{
2505	/* these next three if clauses make it possible to SLOW DOWN	2416	/* these next three if clauses make it possible to SLOW DOWN
…		…
2527	gen_grace = op->stats.maxgrace;	2438	gen_grace = op->stats.maxgrace;
2528	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2529	}	2440	}
2530		2441
2531	/* Regenerate Spell Points */	2442	/* Regenerate Spell Points */
2532	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2443	if (!op->contr->golem && --op->last_sp < 0)
2533	{	2444	{
2534	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);
2535	if (op->stats.sp < op->stats.maxsp)	2446	if (op->stats.sp < op->stats.maxsp)
2536	{	2447	{
2537	op->stats.sp++;	2448	op->stats.sp++;
…		…
2635	}	2546	}
2636		2547
2637	/* Digestion */	2548	/* Digestion */
2638	if (--op->last_eat < 0)	2549	if (--op->last_eat < 0)
2639	{	2550	{
2640	#ifdef COZY_SERVER
2641	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2642	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2643	#else
2644	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;
2645	#endif
2646		2552
2647	if (op->contr->gen_hp > 0)	2553	if (op->contr->gen_hp > 0)
2648	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);
2649	else	2555	else
2650	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2728	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2634	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2729	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2635	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2730		2636
2731	/* restore player */	2637	/* restore player */
2732	at = archetype::find ("poisoning");	2638	at = archetype::find ("poisoning");
2733	tmp = present_arch_in_ob (at, op);	2639	if (object *tmp = present_arch_in_ob (at, op))
2734	if (tmp)
2735	{	2640	{
2736	tmp->destroy ();	2641	tmp->destroy ();
2737	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2642	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2738	}	2643	}
2739		2644
2740	at = archetype::find ("confusion");	2645	at = archetype::find ("confusion");
2741	tmp = present_arch_in_ob (at, op);	2646	if (object *tmp = present_arch_in_ob (at, op))
2742	if (tmp)
2743	{	2647	{
2744	tmp->destroy ();	2648	tmp->destroy ();
2745	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2649	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2746	}	2650	}
2747		2651
…		…
2749	op->stats.hp = op->stats.maxhp;	2653	op->stats.hp = op->stats.maxhp;
2750	if (op->stats.food <= 0)	2654	if (op->stats.food <= 0)
2751	op->stats.food = 999;	2655	op->stats.food = 999;
2752		2656
2753	/* create a bodypart-trophy to make the winner happy */	2657	/* create a bodypart-trophy to make the winner happy */
2754	tmp = arch_to_object (archetype::find ("finger"));	2658	if (object *tmp = arch_to_object (archetype::find ("finger")))
2755	if (tmp != NULL)
2756	{	2659	{
2757	sprintf (buf, "%s's finger", &op->name);	2660	sprintf (buf, "%s's finger", &op->name);
2758	tmp->name = buf;	2661	tmp->name = buf;
2759	sprintf (buf, " This finger has been cut off %s\n"	2662	sprintf (buf, " This finger has been cut off %s\n"
2760	" 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",
2761	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2664	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2762	tmp->msg = buf;	2665	tmp->msg = buf;
2763	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2666	tmp->value = 0, tmp->type = 0;
2764	tmp->materialname = NULL;	2667	tmp->materialname = "organics";
2765	tmp->x = op->x, tmp->y = op->y;	2668	tmp->insert_at (op, tmp);
2766	insert_ob_in_map (tmp, op->map, op, 0);
2767	}	2669	}
2768		2670
2769	/* teleport defeated player to new destination */	2671	/* teleport defeated player to new destination */
2770	transfer_ob (op, x, y, 0, NULL);	2672	transfer_ob (op, x, y, 0, NULL);
2771	op->contr->braced = 0;	2673	op->contr->braced = 0;
…		…
2776		2678
2777	command_kill_pets (op, 0);	2679	command_kill_pets (op, 0);
2778		2680
2779	if (op->stats.food < 0)	2681	if (op->stats.food < 0)
2780	{	2682	{
2781	if (op->contr->explore)
2782	{
2783	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785	op->stats.food = 999;
2786	return;
2787	}
2788	sprintf (buf, "%s starved to death.", &op->name);	2683	sprintf (buf, "%s starved to death.", &op->name);
2789	strcpy (op->contr->killer, "starvation");	2684	strcpy (op->contr->killer, "starvation");
2790	}	2685	}
2791	else	2686	else
2792	{
2793	if (op->contr->explore)
2794	{
2795	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797	op->stats.hp = op->stats.maxhp;
2798	return;
2799	}
2800	sprintf (buf, "%s died.", &op->name);	2687	sprintf (buf, "%s died.", &op->name);
2801	}	2688
2802	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2689	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2803		2690
2804	/* save the map location for corpse, gravestone */	2691	/* save the map location for corpse, gravestone */
2805	x = op->x;	2692	x = op->x;
2806	y = op->y;	2693	y = op->y;
2807	map = op->map;	2694	map = op->map;
2808
2809		2695
2810	/* NOT_PERMADEATH code. This basically brings the character back to	2696	/* NOT_PERMADEATH code. This basically brings the character back to
2811	* life if they are dead - it takes some exp and a random stat.	2697	* life if they are dead - it takes some exp and a random stat.
2812	* See the config.h file for a little more in depth detail about this.	2698	* See the config.h file for a little more in depth detail about this.
2813	*/	2699	*/
…		…
2830	num_stats_lose = 1;	2716	num_stats_lose = 1;
2831	else	2717	else
2832	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2718	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2833	}	2719	}
2834	else	2720	else
2835	{
2836	num_stats_lose = 1;	2721	num_stats_lose = 1;
2837	}	2722
2838	lost_a_stat = 0;	2723	lost_a_stat = 0;
2839		2724
2840	for (z = 0; z < num_stats_lose; z++)	2725	for (z = 0; z < num_stats_lose; z++)
2841	{	2726	{
2842	i = RANDOM () % NUM_STATS;	2727	i = RANDOM () % NUM_STATS;
…		…
2983	op->stats.hp = op->stats.maxhp;	2868	op->stats.hp = op->stats.maxhp;
2984	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2869	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2985	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2870	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2986		2871
2987	/*	2872	/*
2988	* Check to see if the player is in a shop. IF so, then check to see if
2989	* 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
2990	* in the map.	2874	* and put them back in the map.
2991	*/	2875	*/
2992
2993	if (is_in_shop (op))
2994	remove_unpaid_objects (op->inv, op);	2876	remove_unpaid_objects (op->inv, op);
2995		2877
2996	/****************************************/	2878	/****************************************/
2997	/* */	2879	/* */
2998	/* Move player to his current respawn- */	2880	/* Move player to his current respawn- */
2999	/* position (usually last savebed) */	2881	/* position (usually last savebed) */
3000	/* */	2882	/* */
3001	/****************************************/	2883	/****************************************/
3002		2884
3003	enter_player_savebed (op);	2885	enter_player_savebed (op);
3004		2886
3005	/* Save the player before inserting the force to reduce
3006	* chance of abuse.
3007	*/
3008	op->contr->braced = 0;	2887	op->contr->braced = 0;
3009	op->contr->save ();
3010		2888
3011	/* it is possible that the player has blown something up	2889	/* it is possible that the player has blown something up
3012	* at his savebed location, and that can have long lasting	2890	* at his savebed location, and that can have long lasting
3013	* spell effects. So first see if there is a spell effect	2891	* spell effects. So first see if there is a spell effect
3014	* on the space that might harm the player.	2892	* on the space that might harm the player.
…		…
3023	object *force;	2901	object *force;
3024	int at;	2902	int at;
3025		2903
3026	force = get_archetype (FORCE_NAME);	2904	force = get_archetype (FORCE_NAME);
3027	/* 50 ticks should be enough time for the spell to abate */	2905	/* 50 ticks should be enough time for the spell to abate */
3028	force->speed = 0.1;	2906	force->speed = 0.1f;
3029	force->speed_left = -5.0;	2907	force->speed_left = -5.f;
3030	SET_FLAG (force, FLAG_APPLIED);	2908	SET_FLAG (force, FLAG_APPLIED);
3031	for (at = 0; at < NROFATTACKS; at++)	2909	for (at = 0; at < NROFATTACKS; at++)
3032	if (will_kill_again & (1 << at))	2910	if (will_kill_again & (1 << at))
3033	force->resist[at] = 100;	2911	force->resist[at] = 100;
3034		2912
…		…
3043	void	2921	void
3044	loot_object (object *op)	2922	loot_object (object *op)
3045	{ /* Grab and destroy some treasure */	2923	{ /* Grab and destroy some treasure */
3046	object *tmp, *tmp2, *next;	2924	object *tmp, *tmp2, *next;
3047		2925
3048	if (op->container)	2926	op->close_container (); /* close open sack first */
3049	esrv_apply_container (op, op->container); /* close open sack first */
3050		2927
3051	for (tmp = op->inv; tmp; tmp = next)	2928	for (tmp = op->inv; tmp; tmp = next)
3052	{	2929	{
3053	next = tmp->below;	2930	next = tmp->below;
3054		2931
3055	if (tmp->invisible)	2932	if (tmp->invisible)
3056	continue;	2933	continue;
3057		2934
3058	tmp->remove ();	2935	tmp->remove ();
3059	tmp->x = op->x, tmp->y = op->y;	2936	tmp->x = op->x, tmp->y = op->y;
		2937
3060	if (tmp->type == CONTAINER)	2938	if (tmp->type == CONTAINER)
3061	{ /* empty container to ground */	2939	loot_object (tmp); /* empty container to ground */
3062	loot_object (tmp);	2940
3063	}
3064	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))))
3065	{	2942	{
3066	if (tmp->nrof > 1)	2943	if (tmp->nrof > 1)
3067	{	2944	{
3068	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2945	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3069	tmp2->destroy ();	2946	tmp2->destroy ();
…		…
3080	/*	2957	/*
3081	* fix_weight(): Check recursively the weight of all players, and fix	2958	* fix_weight(): Check recursively the weight of all players, and fix
3082	* 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
3083	* was changed.	2960	* was changed.
3084	*/	2961	*/
3085
3086	void	2962	void
3087	fix_weight (void)	2963	fix_weight (void)
3088	{	2964	{
3089	for_all_players (pl)	2965	for_all_players (pl)
3090	{	2966	{
…		…
3150	if (op->type == PLAYER)	3026	if (op->type == PLAYER)
3151	{	3027	{
3152	op->contr->tmp_invis = 0;	3028	op->contr->tmp_invis = 0;
3153	op->contr->invis_race = 0;	3029	op->contr->invis_race = 0;
3154	}	3030	}
		3031
3155	update_object (op, UP_OBJ_FACE);	3032	update_object (op, UP_OBJ_CHANGE);
3156	}	3033	}
3157		3034
3158	int	3035	int
3159	is_true_undead (object *op)	3036	is_true_undead (object *op)
3160	{	3037	{
3161	object *tmp = NULL;
3162
3163	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3038	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3164	return 1;	3039	return 1;
3165		3040
3166	return 0;	3041	return 0;
3167	}	3042	}
…		…
3212	/* For Hidden creatures - a chance of becoming 'unhidden'	3087	/* For Hidden creatures - a chance of becoming 'unhidden'
3213	* every time they move - as we subtract off 'invisibility'	3088	* every time they move - as we subtract off 'invisibility'
3214	* AND, for players, if they move into a ridiculously unhideable	3089	* AND, for players, if they move into a ridiculously unhideable
3215	* spot (surrounded by clear terrain in broad daylight). -b.t.	3090	* spot (surrounded by clear terrain in broad daylight). -b.t.
3216	*/	3091	*/
3217
3218	void	3092	void
3219	do_hidden_move (object *op)	3093	do_hidden_move (object *op)
3220	{	3094	{
3221	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3222	object *skop;	3096	object *skop;
…		…
3226		3100
3227	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3101	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3228		3102
3229	/* 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! */
3230	if (op->type == PLAYER && op->contr->run_on)	3104	if (op->type == PLAYER && op->contr->run_on)
3231	{
3232	if (!skop || num >= skop->level)	3105	if (!skop || num >= skop->level)
3233	{	3106	{
3234	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!");
3235	make_visible (op);	3108	make_visible (op);
3236	return;	3109	return;
3237	}	3110	}
3238	else	3111	else
3239	num += 20;	3112	num += 20;
3240	}	3113
3241	num += op->map->difficulty;	3114	num += op->map->difficulty;
3242	hide = hideability (op); /* modify by terrain hidden level */	3115	hide = hideability (op); /* modify by terrain hidden level */
3243	num -= hide;	3116	num -= hide;
		3117
3244	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3118	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3245	{	3119	{
3246	make_visible (op);	3120	make_visible (op);
3247	if (op->type == PLAYER)	3121	if (op->type == PLAYER)
3248	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!");
3249	}	3123	}
3250	else if (op->type == PLAYER && skop)	3124	else if (op->type == PLAYER && skop)
3251	{
3252	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);
3253	}
3254	}	3126	}
3255		3127
3256	/* determine if who is standing near a hostile creature. */	3128	/* determine if who is standing near a hostile creature. */
3257		3129
3258	int	3130	int
…		…
3325	if (pl->type != PLAYER)	3197	if (pl->type != PLAYER)
3326	{	3198	{
3327	LOG (llevError, "player_can_view() called for non-player object\n");	3199	LOG (llevError, "player_can_view() called for non-player object\n");
3328	return -1;	3200	return -1;
3329	}	3201	}
		3202
3330	if (!pl || !op)	3203	if (!pl || !op)
3331	return 0;	3204	return 0;
3332		3205
3333	if (op->head)
3334	{
3335	op = op->head;	3206	op = op->head_ ();
3336	}	3207
3337	get_rangevector (pl, op, &rv, 0x1);	3208	get_rangevector (pl, op, &rv, 0x1);
3338		3209
3339	/* starting with the 'head' part, lets loop	3210	/* starting with the 'head' part, lets loop
3340	* through the object and find if it has any	3211	* through the object and find if it has any
3341	* part that is in the los array but isnt on	3212	* part that is in the los array but isnt on
…		…
3458	char buf[MAX_BUF]; /* tmp. string buffer */	3329	char buf[MAX_BUF]; /* tmp. string buffer */
3459	int i = 0, j = 0;	3330	int i = 0, j = 0;
3460		3331
3461	/* get the appropriate treasurelist */	3332	/* get the appropriate treasurelist */
3462	if (atnr == ATNR_FIRE)	3333	if (atnr == ATNR_FIRE)
3463	trlist = find_treasurelist ("dragon_ability_fire");	3334	trlist = treasurelist::find ("dragon_ability_fire");
3464	else if (atnr == ATNR_COLD)	3335	else if (atnr == ATNR_COLD)
3465	trlist = find_treasurelist ("dragon_ability_cold");	3336	trlist = treasurelist::find ("dragon_ability_cold");
3466	else if (atnr == ATNR_ELECTRICITY)	3337	else if (atnr == ATNR_ELECTRICITY)
3467	trlist = find_treasurelist ("dragon_ability_elec");	3338	trlist = treasurelist::find ("dragon_ability_elec");
3468	else if (atnr == ATNR_POISON)	3339	else if (atnr == ATNR_POISON)
3469	trlist = find_treasurelist ("dragon_ability_poison");	3340	trlist = treasurelist::find ("dragon_ability_poison");
3470		3341
3471	if (trlist == NULL || who->type != PLAYER)	3342	if (trlist == NULL || who->type != PLAYER)
3472	return;	3343	return;
3473		3344
3474	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++);
3475		3346
3476	if (tr == NULL || tr->item == NULL)	3347	if (!tr || !tr->item)
3477	{	3348	{
3478	/* 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]); */
3479	return;	3350	return;
3480	}	3351	}
3481		3352
…		…
3606	* not readied.	3477	* not readied.
3607	*/	3478	*/
3608	void	3479	void
3609	player_unready_range_ob (player *pl, object *ob)	3480	player_unready_range_ob (player *pl, object *ob)
3610	{	3481	{
3611	rangetype i;	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
3612		3484
3613	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3485	if (pl->combat_ob == ob)
3614	{	3486	pl->combat_ob = 0;
		3487
3615	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3616	{	3489	pl->ranged_ob = 0;
3617	pl->ranges[i] = NULL;
3618	if (pl->shoottype == i)
3619	{
3620	pl->shoottype = range_none;
3621	}
3622	}
3623	}
3624	}	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