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.69 by root, Tue Dec 26 17:39:30 2006 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 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);
		150	}
		151
		152	float
		153	player::weapon_speed () const
		154	{
		155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
157	}	156	}
158		157
159	/* This loads the first map an puts the player on it. */	158	/* This loads the first map an puts the player on it. */
160	static void	159	static void
161	set_first_map (object *op)	160	set_first_map (object *op)
162	{	161	{
163	strcpy (op->contr->maplevel, first_map_path);	162	op->contr->maplevel = first_map_path;
164	op->x = -1;	163	op->x = -1;
165	op->y = -1;	164	op->y = -1;
		165	}
		166
		167	void
		168	player::enter_map ()
		169	{
		170	object *tmp = object::create ();
		171
		172	EXIT_PATH (tmp) = maplevel;
		173	EXIT_X (tmp) = ob->x;
		174	EXIT_Y (tmp) = ob->y;
166	enter_exit (op, 0);	175	ob->enter_exit (tmp);
		176
		177	tmp->destroy ();
		178	}
		179
		180	void
		181	player::activate ()
		182	{
		183	if (active)
		184	return;
		185
		186	players.insert (this);
		187	ob->remove ();
		188	ob->map = 0;
		189	ob->activate_recursive ();
		190	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		191	add_friendly_object (ob);
		192	enter_map ();
		193	}
		194
		195	void
		196	player::deactivate ()
		197	{
		198	if (!active)
		199	return;
		200
		201	terminate_all_pets (ob);
		202	remove_friendly_object (ob);
		203	ob->deactivate_recursive ();
		204
		205	if (ob->map)
		206	maplevel = ob->map->path;
		207
		208	ob->remove ();
		209	ob->map = 0;
		210	party = 0;
		211
		212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		213
		214	players.erase (this);
167	}	215	}
168		216
169	// connect the player with a specific client	217	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	218	// also changes, rationalises, and fixes some incorrect settings
171	void	219	void
172	player::connect (client *ns)	220	player::connect (client *ns)
173	{	221	{
174	this->ns = ns;	222	this->ns = ns;
175	ns->pl = this;	223	ns->pl = this;
176		224
177	next = first_player;	225	run_on = 0;
178	first_player = this;	226	fire_on = 0;
		227	ob->close_container (); //TODO: client-specific
179		228
180	ns->update_look = 0;	229	ns->update_look = 0;
181	ns->look_position = 0;	230	ns->look_position = 0;
182		231
183	clear_los (ob);	232	clear_los (ob);
		233
		234	ns->reset_stats ();
184		235
185	/* make sure he's a player -- needed because of class change. */	236	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	237	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	238	ob->race = ob->arch->clone.race;
188		239
189	if (!legal_range (ob, shoottype))
190	shoottype = range_none;
191
192	ob->carrying = sum_weight (ob);	240	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	241	link_player_skills (ob);
194		242
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	ob->set_speed (ob->speed);
197		244
198	assign (title, ob->arch->clone.name);	245	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		246
210	/* if it's a dragon player, set the correct title here */	247	/* if it's a dragon player, set the correct title here */
211	if (is_dragon_pl (ob))	248	if (is_dragon_pl (ob))
212	{	249	{
213	object *tmp, *abil = 0, *skin = 0;	250	object *tmp, *abil = 0, *skin = 0;
…		…
223	skin = tmp;	260	skin = tmp;
224		261
225	set_dragon_name (ob, abil, skin);	262	set_dragon_name (ob, abil, skin);
226	}	263	}
227		264
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!");	265	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		266
236	esrv_new_player (this, ob->weight + ob->carrying);	267	esrv_new_player (this, ob->weight + ob->carrying);
237		268
		269	ob->flag [FLAG_READY_WEAPON] = false;
		270	ob->flag [FLAG_READY_SKILL] = false;
		271	ob->flag [FLAG_READY_BOW] = false;
		272
		273	for (object *op = ob->inv; op; op = op->below)
		274	if (op->flag [FLAG_APPLIED])
		275	switch (op->type)
		276	{
		277	case WAND:
		278	case ROD:
		279	case HORN:
		280	case BOW:
		281	case SKILL_TOOL:
		282	case WEAPON:
		283	op->flag [FLAG_APPLIED] = false;
		284	apply_special (ob, op, AP_APPLY);
		285	break;
		286
		287	case SKILL:
		288	op->flag [FLAG_APPLIED] = false;
		289	break;
		290	}
		291
		292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
238	ob->update_stats ();	293	ob->update_stats ();
		294
239	ns->floorbox_update ();	295	ns->floorbox_update ();
240
241	esrv_send_inventory (ob, ob);	296	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	297	esrv_add_spells (this, 0);
243		298
244	enter_exit (ob, 0);	299	activate ();
245		300
246	send_rules (ob);	301	send_rules (ob);
247	send_news (ob);	302	send_news (ob);
248	display_motd (ob);	303	display_motd (ob);
		304
		305	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	306	INVOKE_PLAYER (LOGIN, this);
250	}	307	}
251		308
252	void	309	void
253	player::disconnect ()	310	player::disconnect ()
254	{	311	{
255	//TODO: don't be so harsh and destroy :)
256	if (ns)	312	if (ns)
257	destroy ();	313	{
		314	if (active)
		315	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		316
		317	INVOKE_PLAYER (DISCONNECT, this);
		318
		319	ns->reset_stats ();
		320	ns->pl = 0;
		321	ns = 0;
		322	}
		323
		324	if (ob)
		325	ob->close_container (); //TODO: client-specific
		326
		327	deactivate ();
258	}	328	}
259		329
260	// the need for this function can be explained	330	// the need for this function can be explained
261	// by load_object not returning the object	331	// by load_object not returning the object
262	void	332	void
263	player::set_object (object *op)	333	player::set_object (object *op)
264	{	334	{
265	ob = op;	335	ob = op;
266	ob->contr = this; /* this aren't yet in archetype */	336	ob->contr = this; /* this aren't yet in archetype */
267		337
268	ob->speed_left = 0.5;	338	ob->speed_left = 0.5f;
269	ob->speed = 1.0;	339	ob->speed = 1.0f;
270	ob->direction = 5; /* So player faces south */	340	ob->direction = 5; /* So player faces south */
271	ob->stats.wc = 2;
272	ob->run_away = 25; /* Then we panick... */
273
274	set_first_map (ob);
275
276	ob->roll_stats ();
277	}	341	}
278		342
279	player::player ()	343	player::player ()
280	{	344	{
281	/* There are some elements we want initialized to non zero value -	345	/* There are some elements we want initialised to non zero value -
282	* we deal with that below this point.	346	* we deal with that below this point.
283	*/	347	*/
284	outputs_sync = 16; /* Every 2 seconds */	348	outputs_sync = 4;
285	outputs_count = 8; /* Keeps present behaviour */	349	outputs_count = 4;
286	unapply = unapply_nochoice;	350	unapply = unapply_nochoice;
287		351
288	assign (savebed_map, first_map_path); /* Init. respawn position */	352	savebed_map = first_map_path; /* Init. respawn position */
289		353
290	gen_sp_armour = 10;	354	gen_sp_armour = 10;
291	last_speed = -1;
292	shoottype = range_none;
293	bowtype = bow_normal;	355	bowtype = bow_normal;
294	petmode = pet_normal;	356	petmode = pet_normal;
295	listening = 10;	357	listening = 10;
296	usekeys = containers;	358	usekeys = containers;
297	last_weapon_sp = -1;
298	peaceful = 1; /* default peaceful */	359	peaceful = 1; /* default peaceful */
299	do_los = 1;	360	do_los = 1;
300
301	/* we need to clear these to -1 and not zero - otherwise,
302	* if a player quits and starts a new character, we wont
303	* send new values to the client, as things like exp start
304	* at zero.
305	*/
306	for (int i = 0; i < NUM_SKILLS; i++)
307	last_skill_exp[i] = -1;
308
309	for (int i = 0; i < NROFATTACKS; i++)
310	last_resist[i] = -1;
311
312	last_stats.exp = -1;
313	last_weight = (uint32) - 1;
314	}	361	}
315		362
316	void	363	void
317	player::do_destroy ()	364	player::do_destroy ()
318	{	365	{
		366	disconnect ();
		367
319	attachable::do_destroy ();	368	attachable::do_destroy ();
320
321	save (false);
322	enable_save = false;
323
324	disconnect ();
325
326	terminate_all_pets (ob);
327
328	if (first_player != this)
329	{
330	player *prev = first_player;
331
332	while (prev && prev->next && prev->next != this)
333	prev = prev->next;
334
335	if (prev->next != this)
336	{
337	LOG (llevError, "Free_player: Can't find previous player.\n");
338	abort ();
339	}
340
341	prev->next = next;
342	}
343	else
344	first_player = next;
345		369
346	if (ob)	370	if (ob)
347	{	371	{
348	ob->destroy_inv (false);	372	ob->destroy_inv (false);
349	ob->destroy ();	373	ob->destroy ();
350	}
351
352	if (ns)
353	{
354	client *ns = this->ns;
355	ns->send_packet ("goodbye");
356	ns->flush ();
357	ns->pl = 0;
358	this->ns = 0;
359	ns->destroy ();
360	}	374	}
361	}	375	}
362		376
363	player::~player ()	377	player::~player ()
364	{	378	{
…		…
374	player::create ()	388	player::create ()
375	{	389	{
376	player *pl = new player;	390	player *pl = new player;
377		391
378	pl->set_object (arch_to_object (get_player_archetype (0)));	392	pl->set_object (arch_to_object (get_player_archetype (0)));
		393
		394	pl->ob->roll_stats ();
		395	pl->ob->stats.wc = 2;
		396	pl->ob->run_away = 25; /* Then we panick... */
		397
		398	set_first_map (pl->ob);
379		399
380	return pl;	400	return pl;
381	}	401	}
382		402
383	/*	403	/*
…		…
414	object *op = NULL;	434	object *op = NULL;
415	objectlink *ol;	435	objectlink *ol;
416	unsigned lastdist;	436	unsigned lastdist;
417	rv_vector rv;	437	rv_vector rv;
418		438
419	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
420	{	440	{
421	/* We should not find free objects on this friendly list, but it	441	/* We should not find free objects on this friendly list, but it
422	* does periodically happen. Given that, lets deal with it.	442	* does periodically happen. Given that, lets deal with it.
423	* While unlikely, it is possible the next object on the friendly	443	* While unlikely, it is possible the next object on the friendly
424	* list is also free, so encapsulate this in a while loop.	444	* list is also free, so encapsulate this in a while loop.
…		…
428	object *tmp = ol->ob;	448	object *tmp = ol->ob;
429		449
430	/* Can't do much more other than log the fact, because the object	450	/* Can't do much more other than log the fact, because the object
431	* itself will have been cleared.	451	* itself will have been cleared.
432	*/	452	*/
433	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	453	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		454	tmp->debug_desc ());
434	ol = ol->next;	455	ol = ol->next;
435	remove_friendly_object (tmp);	456	remove_friendly_object (tmp);
436	if (!ol)	457	if (!ol)
437	return op;	458	return op;
438	}	459	}
…		…
527	x = mon->x;	548	x = mon->x;
528	y = mon->y;	549	y = mon->y;
529	m = mon->map;	550	m = mon->map;
530	dir = rv.direction;	551	dir = rv.direction;
531	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	552	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
532	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	553	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		554
533	/* If we can't solve it within the search distance, return now. */	555	/* If we can't solve it within the search distance, return now. */
534	if (diff > max)	556	if (diff > max)
535	return 0;	557	return 0;
		558
536	while (diff > 1 && max > 0)	559	while (diff > 1 && max > 0)
537	{	560	{
538	lastx = x;	561	lastx = x;
539	lasty = y;	562	lasty = y;
540	lastmap = m;	563	lastmap = m;
…		…
622	max--;	645	max--;
623	lastdir = dir;	646	lastdir = dir;
624	if (!firstdir)	647	if (!firstdir)
625	firstdir = dir;	648	firstdir = dir;
626	}	649	}
		650
627	if (diff <= 1)	651	if (diff <= 1)
628	{	652	{
629	/* Recalculate diff (distance) because we may not have actually	653	/* Recalculate diff (distance) because we may not have actually
630	* headed toward player for entire distance.	654	* headed toward player for entire distance.
631	*/	655	*/
632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	656	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	657	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
634	}	658	}
		659
635	if (diff > max)	660	if (diff > max)
636	return 0;	661	return 0;
637	}	662	}
		663
638	/* If we reached the max, didn't find a direction in time */	664	/* If we reached the max, didn't find a direction in time */
639	if (!max)	665	if (!max)
640	return 0;	666	return 0;
641		667
642	return firstdir;	668	return firstdir;
…		…
756	roll_stat (void)	782	roll_stat (void)
757	{	783	{
758	int a[4], i, j, k;	784	int a[4], i, j, k;
759		785
760	for (i = 0; i < 4; i++)	786	for (i = 0; i < 4; i++)
761	a[i] = (int) RANDOM () % 6 + 1;	787	a[i] = (int) rndm (6) + 1;
762		788
763	for (i = 0, j = 0, k = 7; i < 4; i++)	789	for (i = 0, j = 0, k = 7; i < 4; i++)
764	if (a[i] < k)	790	if (a[i] < k)
765	k = a[i], j = i;	791	k = a[i], j = i;
766		792
…		…
772	}	798	}
773		799
774	void	800	void
775	object::roll_stats ()	801	object::roll_stats ()
776	{	802	{
777	int statsort [7];	803	int statsort [NUM_STATS];
778		804
779	for (;;)	805	for (;;)
780	{	806	{
781	int sum = 0;	807	int sum = 0;
782	for (int i = 7; i--; )	808	for (int i = NUM_STATS; i--; )
783	sum += statsort [i] = roll_stat ();	809	sum += statsort [i] = roll_stat ();
784		810
785	if (sum >= 82 && sum <= 116)	811	if (sum >= 82 && sum <= 116)
786	break;	812	break;
787	}	813	}
788		814
789	// Sort the stats so that rerolling is easier...	815	// Sort the stats so that rerolling is easier...
790	std::sort (statsort, statsort + 7, std::greater<int>());	816	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
791		817
		818	for (int i = 0; i < NUM_STATS; ++i)
792	stats.Str = statsort[0];	819	stats.stat (i) = statsort [i];
793	stats.Dex = statsort[1];
794	stats.Con = statsort[2];
795	stats.Int = statsort[3];
796	stats.Wis = statsort[4];
797	stats.Pow = statsort[5];
798	stats.Cha = statsort[6];
799		820
800	stats.exp = 0;	821	stats.exp = 0;
801	stats.ac = 0;	822	stats.ac = 0;
802		823
803	stats.hp = stats.maxhp;	824	stats.hp = stats.maxhp;
…		…
815	}	836	}
816		837
817	void	838	void
818	object::swap_stats (int a, int b)	839	object::swap_stats (int a, int b)
819	{	840	{
820	int tmp = get_attr_value (&contr->orig_stats, a);	841	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
821	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
822	set_attr_value (&contr->orig_stats, b, tmp);
823		842
		843	for (int i = 0; i < NUM_STATS; ++i)
824	stats.Str = contr->orig_stats.Str;	844	stats.stat (i) = contr->orig_stats.stat (i);
825	stats.Dex = contr->orig_stats.Dex;
826	stats.Con = contr->orig_stats.Con;
827	stats.Int = contr->orig_stats.Int;
828	stats.Wis = contr->orig_stats.Wis;
829	stats.Pow = contr->orig_stats.Pow;
830	stats.Cha = contr->orig_stats.Cha;
831		845
832	//TODO: the following code looks so borked and should, at the very least,	846	//TODO: the following code looks so borked and should, at the very least,
833	// be merged with the similar code in roll_stats	847	// be merged with the similar code in roll_stats
834	stats.ac = 0;	848	stats.ac = 0;
835		849
…		…
847	contr->levsp[1] = 6;	861	contr->levsp[1] = 6;
848	contr->levgrace[1] = 3;	862	contr->levgrace[1] = 3;
849		863
850	contr->orig_stats = stats;	864	contr->orig_stats = stats;
851	}	865	}
		866	}
		867
		868	static void
		869	start_info (object *op)
		870	{
		871	char buf[MAX_BUF];
		872
		873	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		874	new_draw_info (NDI_UNIQUE, 0, op, buf);
		875	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		876	//new_draw_info (NDI_UNIQUE, 0, op, " ");
852	}	877	}
853		878
854	/* This function takes the key that is passed, and does the	879	/* This function takes the key that is passed, and does the
855	* appropriate action with it (change race, or other things).	880	* appropriate action with it (change race, or other things).
856	* The function name is for historical reasons - now we have	881	* The function name is for historical reasons - now we have
857	* separate race and class; this actually changes the RACE,	882	* separate race and class; this actually changes the RACE,
858	* not the class.	883	* not the class.
859	*/	884	*/
860	int	885	void
861	key_change_class (object *op, char key)	886	player::chargen_race_done ()
862	{	887	{
863	int tmp_loop;
864
865	if (key == 'd' || key == 'D')
866	{
867	char buf[MAX_BUF];
868
869	/* this must before then initial items are given */	888	/* this must before then initial items are given */
870	esrv_new_player (op->contr, op->weight + op->carrying);	889	esrv_new_player (ob->contr, ob->weight + ob->carrying);
871		890
872	treasurelist *tl = find_treasurelist ("starting_wealth");	891	treasurelist *tl = treasurelist::find ("starting_wealth");
873	if (tl)	892	if (tl)
874	create_treasure (tl, op, 0, 0, 0);	893	create_treasure (tl, ob, 0, 0, 0);
875		894
876	INVOKE_PLAYER (BIRTH, op->contr);	895	INVOKE_PLAYER (BIRTH, ob->contr);
877	INVOKE_PLAYER (LOGIN, op->contr);	896	INVOKE_PLAYER (LOGIN, ob->contr);
878		897
879	op->contr->ns->state = ST_PLAYING;	898	ob->contr->ns->state = ST_PLAYING;
880		899
881	if (op->msg)	900	if (ob->msg)
882	op->msg = NULL;	901	ob->msg = 0;
883		902
884	/* We create this now because some of the unique maps will need it	903	/* We create this now because some of the unique maps will need it
885	* to save here.	904	* to save here.
886	*/	905	*/
		906	{
		907	char buf[MAX_BUF];
887	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	908	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
888	make_path_to_file (buf);	909	make_path_to_file (buf);
		910	}
889		911
890	#ifdef AUTOSAVE
891	op->contr->last_save_tick = pticks;
892	#endif
893	start_info (op);	912	start_info (ob);
894	CLEAR_FLAG (op, FLAG_WIZ);	913	CLEAR_FLAG (ob, FLAG_WIZ);
895	give_initial_items (op, op->randomitems);	914	give_initial_items (ob, ob->randomitems);
896	link_player_skills (op);	915	link_player_skills (ob);
897	esrv_send_inventory (op, op);	916	esrv_send_inventory (ob, ob);
898	op->update_stats ();	917	ob->update_stats ();
899		918
900	/* This moves the player to a different start map, if there	919	/* This moves the player to a different start map, if there
901	* is one for this race	920	* is one for this race
902	*/	921	*/
903	if (*first_map_ext_path)	922	if (*first_map_ext_path)
904	{	923	{
905	object *tmp;	924	object *tmp;
906	char mapname[MAX_BUF];	925	char mapname[MAX_BUF];
907		926
908	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	927	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
909	tmp = object::create ();	928	tmp = object::create ();
910	EXIT_PATH (tmp) = mapname;	929	EXIT_PATH (tmp) = mapname;
911	EXIT_X (tmp) = op->x;	930	EXIT_X (tmp) = ob->x;
912	EXIT_Y (tmp) = op->y;	931	EXIT_Y (tmp) = ob->y;
913	enter_exit (op, tmp); /* we don't really care if it succeeded;	932	ob->enter_exit (tmp); /* we don't really care if it succeeded;
914	* if the map isn't there, then stay on the	933	* if the map isn't there, then stay on the
915	* default initial map */	934	* default initial map */
916	tmp->destroy ();	935	tmp->destroy ();
917	}	936	}
918	else	937	else
919	LOG (llevDebug, "first_map_ext_path not set\n");	938	LOG (llevDebug, "first_map_ext_path not set\n");
		939	}
920		940
921	return 0;	941	void
922	}	942	player::chargen_race_next ()
923		943	{
924	/* Following actually changes the race - this is the default command	944	/* Following actually changes the race - this is the default command
925	* if we don't match with one of the options above.	945	* if we don't match with one of the options above.
926	*/	946	*/
927		947
928	tmp_loop = 0;	948	do
929	while (!tmp_loop)
930	{	949	{
931	shstr name = op->name;	950	shstr name = ob->name;
932	int x = op->x, y = op->y;	951	int x = ob->x, y = ob->y;
933		952
934	op->remove_statbonus ();	953	ob->remove_statbonus ();
935	op->remove ();	954	ob->remove ();
936	op->arch = get_player_archetype (op->arch);	955	ob->arch = get_player_archetype (ob->arch);
937	op->arch->clone.copy_to (op);	956	ob->arch->clone.copy_to (ob);
938	op->instantiate ();	957	ob->instantiate ();
939	op->stats = op->contr->orig_stats;	958	ob->stats = ob->contr->orig_stats;
940	op->name = op->name_pl = name;	959	ob->name = ob->name_pl = name;
941	op->x = x;	960	ob->x = x;
942	op->y = y;	961	ob->y = y;
943	SET_ANIMATION (op, 2); /* So player faces south */	962	SET_ANIMATION (ob, 2); /* So player faces south */
944	insert_ob_in_map (op, op->map, op, 0);	963	insert_ob_in_map (ob, ob->map, ob, 0);
945	assign (op->contr->title, op->arch->clone.name);	964	assign (ob->contr->title, ob->arch->clone.name);
946	op->add_statbonus ();	965	ob->add_statbonus ();
947	tmp_loop = allowed_class (op);
948	}	966	}
		967	while (!allowed_class (ob));
949		968
950	update_object (op, UP_OBJ_FACE);	969	update_object (ob, UP_OBJ_FACE);
951	esrv_update_item (UPD_FACE, op, op);	970	esrv_update_item (UPD_FACE, ob, ob);
952	op->update_stats ();	971	ob->update_stats ();
953	op->stats.hp = op->stats.maxhp;	972	ob->stats.hp = ob->stats.maxhp;
954	op->stats.sp = op->stats.maxsp;	973	ob->stats.sp = ob->stats.maxsp;
955	op->stats.grace = 0;	974	ob->stats.grace = 0;
956
957	if (op->msg)
958	new_draw_info (NDI_BLUE, 0, op, op->msg);
959
960	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
961	return 0;
962	}
963
964	int
965	key_confirm_quit (object *op, char key)
966	{
967	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
968	{
969	op->contr->ns->state = ST_PLAYING;
970	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
971	return 1;
972	}
973
974	INVOKE_PLAYER (LOGOUT, op->contr);
975	INVOKE_PLAYER (QUIT, op->contr);
976
977	op->contr->enable_save = false;
978
979	terminate_all_pets (op);
980	leave_map (op);
981	op->direction = 0;
982	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
983
984	strcpy (op->contr->killer, "quit");
985	check_score (op);
986	op->contr->party = 0;
987	op->contr->own_title[0] = '\0';
988
989	object_ptr ob = op;
990
991	/* We need to hunt for any per player unique maps in memory and
992	* get rid of them. The trailing slash in the path is intentional,
993	* so that players named 'Ab' won't match against players 'Abe' pathname
994	*/
995	char buf[MAX_BUF];
996	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
997
998	for (maptile *next, *mp = first_map; mp; mp = next)
999	{
1000	next = mp->next;
1001
1002	if (!strncmp (mp->path, buf, strlen (buf)))
1003	delete_map (mp);
1004	}
1005
1006	delete_character (ob->name, 1);
1007	ob->contr->destroy ();
1008
1009	return 1;
1010	}	975	}
1011		976
1012	void	977	void
1013	flee_player (object *op)	978	flee_player (object *op)
1014	{	979	{
…		…
1061	/* Cornered, get rid of scared */	1026	/* Cornered, get rid of scared */
1062	CLEAR_FLAG (op, FLAG_SCARED);	1027	CLEAR_FLAG (op, FLAG_SCARED);
1063	op->enemy = NULL;	1028	op->enemy = NULL;
1064	}	1029	}
1065		1030
1066
1067	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1031	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1068	* IT returns 1 if the player should keep on moving, 0 if he should	1032	* It returns 1 if the player should keep on moving, 0 if he should
1069	* stop.	1033	* stop.
1070	*/	1034	*/
1071	int	1035	int
1072	check_pick (object *op)	1036	check_pick (object *op)
1073	{	1037	{
1074	object *tmp, *next;	1038	object *tmp, *next;
1075	int stop = 0;	1039	int stop = 0;
1076	int j, k, wvratio;	1040	int wvratio;
1077	char putstring[128], tmpstr[16];	1041	char putstring[128];
1078		1042
1079	/* if you're flying, you cna't pick up anything */	1043	/* if you're flying, you cna't pick up anything */
1080	if (op->move_type & MOVE_FLYING)	1044	if (op->move_type & MOVE_FLYING)
1081	return 1;	1045	return 1;
1082		1046
…		…
1419	* found object is returned.	1383	* found object is returned.
1420	*/	1384	*/
1421	object *	1385	object *
1422	find_arrow (object *op, const char *type)	1386	find_arrow (object *op, const char *type)
1423	{	1387	{
1424	object *tmp = NULL;	1388	object *tmp = 0;
1425		1389
1426	for (op = op->inv; op; op = op->below)	1390	for (op = op->inv; op; op = op->below)
1427	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1391	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1428	tmp = find_arrow (op, type);	1392	tmp = find_arrow (op, type);
1429	else if (op->type == ARROW && op->race == type)	1393	else if (op->type == ARROW && op->race == type)
1430	return op;	1394	return op;
		1395
1431	return tmp;	1396	return tmp;
1432	}	1397	}
1433		1398
1434	/*	1399	/*
1435	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1436	* against the target. A full test is not performed, simply a basic test	1401	* against the target. A full test is not performed, simply a basic test
1437	* of resistances. The archer is making a quick guess at what he sees down	1402	* of resistances. The archer is making a quick guess at what he sees down
1438	* the hall. Failing that it does it's best to pick the highest plus arrow.	1403	* the hall. Failing that it does it's best to pick the highest plus arrow.
1439	*/	1404	*/
1440
1441	object *	1405	object *
1442	find_better_arrow (object *op, object *target, const char *type, int *better)	1406	find_better_arrow (object *op, object *target, const char *type, int *better)
1443	{	1407	{
1444	object *tmp = NULL, *arrow, *ntmp;	1408	object *tmp = NULL, *arrow, *ntmp;
1445	int attacknum, attacktype, betterby = 0, i;	1409	int attacknum, attacktype, betterby = 0, i;
…		…
1511	* find_better_arrow to find a decent arrow to use.	1475	* find_better_arrow to find a decent arrow to use.
1512	* op = the shooter	1476	* op = the shooter
1513	* type = bow->race	1477	* type = bow->race
1514	* dir = fire direction	1478	* dir = fire direction
1515	*/	1479	*/
1516
1517	object *	1480	object *
1518	pick_arrow_target (object *op, const char *type, int dir)	1481	pick_arrow_target (object *op, const char *type, int dir)
1519	{	1482	{
1520	object *tmp = NULL;	1483	object *tmp = NULL;
1521	maptile *m;	1484	maptile *m;
…		…
1586	*/	1549	*/
1587	int	1550	int
1588	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1551	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1589	{	1552	{
1590	object *left, *bow;	1553	object *left, *bow;
1591	int bowspeed, mflags;	1554	int mflags;
1592	maptile *m;	1555	maptile *m;
1593		1556
1594	if (!dir)	1557	if (!dir)
1595	{	1558	{
1596	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1559	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1597	return 0;	1560	return 0;
1598	}	1561	}
1599		1562
1600	if (op->type == PLAYER)	1563	if (op->contr)
1601	bow = op->contr->ranges[range_bow];	1564	bow = op->current_weapon;
1602	else	1565	else
1603	{	1566	{
1604	for (bow = op->inv; bow; bow = bow->below)	1567	for (bow = op->inv; bow; bow = bow->below)
1605	/* Don't check for applied - monsters don't apply bows - in that way, they	1568	/* Don't check for applied - monsters don't apply bows - in that way, they
1606	* don't need to switch back and forth between bows and weapons.	1569	* don't need to switch back and forth between bows and weapons.
…		…
1611	if (!bow)	1574	if (!bow)
1612	{	1575	{
1613	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1576	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1614	return 0;	1577	return 0;
1615	}	1578	}
		1579
		1580	// optimisation: move object to top so we will find it quickly again
		1581	if (bow->below)
		1582	{
		1583	bow->remove ();
		1584	op->insert (bow);
		1585	}
		1586
1616	}	1587	}
1617		1588
1618	if (!bow->race || !bow->skill)	1589	if (!bow->race || !bow->skill)
1619	{	1590	{
1620	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1621	return 0;	1592	return 0;
1622	}	1593	}
1623
1624	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1625
1626	/* penalize ROF for bestarrow */
1627	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1628	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1629
1630	if (bowspeed < 1)
1631	bowspeed = 1;
1632		1594
1633	if (arrow == NULL)	1595	if (arrow == NULL)
1634	{	1596	{
1635	if ((arrow = find_arrow (op, bow->race)) == NULL)	1597	if ((arrow = find_arrow (op, bow->race)) == NULL)
1636	{	1598	{
1637	if (op->type == PLAYER)	1599	if (op->type == PLAYER)
1638	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1600	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1639	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1601	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1640	else	1602	else
1641	CLEAR_FLAG (op, FLAG_READY_BOW);	1603	CLEAR_FLAG (op, FLAG_READY_BOW);
		1604
1642	return 0;	1605	return 0;
1643	}	1606	}
1644	}	1607	}
1645		1608
1646	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1609	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1668	return 0;	1631	return 0;
1669	}	1632	}
1670		1633
1671	arrow->set_owner (op);	1634	arrow->set_owner (op);
1672	arrow->skill = bow->skill;	1635	arrow->skill = bow->skill;
1673
1674	arrow->direction = dir;	1636	arrow->direction = dir;
1675	arrow->x = sx;	1637
1676	arrow->y = sy;	1638	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1639	arrow->stats.hp = arrow->stats.dam;
		1640	arrow->stats.grace = arrow->attacktype;
		1641
		1642	if (arrow->slaying)
		1643	arrow->spellarg = strdup (arrow->slaying);
		1644
		1645	if (player *pl = op->contr)
		1646	{
		1647	if (!pl->has_hit)
		1648	{
		1649	pl->has_hit = 1;
		1650	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
		1651	}
		1652	#if 0
		1653	float speed = pl->weapon_sp;
		1654
		1655	/* penalize ROF for bestarrow */
		1656	if (pl->bowtype == bow_bestarrow)
		1657	speed *= .9f;
		1658	else
		1659	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1660
		1661	op->speed_left += speed - op->speed;
		1662	#endif
		1663	}
		1664
		1665	SET_ANIMATION (arrow, arrow->direction);
		1666
		1667	/* update the speed */
		1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1669	+ bow->stats.dam / 7.0;
		1670
		1671	arrow->set_speed (max (arrow->speed, 2.0));
		1672	arrow->speed_left = 0;
		1673
		1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1677		1675
1678	if (op->type == PLAYER)	1676	if (op->type == PLAYER)
1679	{	1677	{
1680	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1681	op->update_stats ();
1682	}
1683
1684	SET_ANIMATION (arrow, arrow->direction);
1685	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1686	arrow->stats.hp = arrow->stats.dam;
1687	arrow->stats.grace = arrow->attacktype;
1688	if (arrow->slaying != NULL)
1689	arrow->spellarg = strdup (arrow->slaying);
1690
1691	/* Note that this was different for monsters - they got their level
1692	* added to the damage. I think the strength bonus is more proper.
1693	*/
1694
1695	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1696
1697	/* update the speed */
1698	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1699	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1700
1701	arrow->set_speed (max (arrow->speed, 1.0));
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;	1678	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1679	wc -= dex_bonus[op->stats.Dex];
		1680
		1681	if (!arrow->slaying)
		1682	arrow->slaying = op->slaying;
		1683
		1684	arrow->attacktype |= op->attacktype;
1711	}	1685	}
1712	else	1686	else
1713	{	1687	{
1714	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1715	arrow->level = op->level;	1688	arrow->level = op->level;
1716	}	1689	arrow->stats.wc -= bow->magic;
1717		1690
1718	if (arrow->attacktype == AT_PHYSICAL)	1691	if (!arrow->slaying)
		1692	arrow->slaying = bow->slaying;
		1693
1719	arrow->attacktype |= bow->attacktype;	1694	arrow->attacktype |= bow->attacktype;
		1695	}
1720		1696
1721	if (bow->slaying)	1697	wc -= arrow->level;
1722	arrow->slaying = bow->slaying;	1698	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1723		1699
1724	arrow->map = m;	1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1725	arrow->move_type = MOVE_FLY_LOW;	1701	arrow->move_type = MOVE_FLY_LOW;
1726	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1702	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1727		1703
1728	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1729	insert_ob_in_map (arrow, m, op, 0);	1705	m->insert (arrow, sx, sy, op);
1730		1706
1731	if (!arrow->destroyed ())	1707	if (!arrow->destroyed ())
1732	move_arrow (arrow);	1708	move_arrow (arrow);
1733		1709
1734	if (op->type == PLAYER)	1710	if (op->type == PLAYER)
…		…
1754	{	1730	{
1755	int ret = 0, wcmod = 0;	1731	int ret = 0, wcmod = 0;
1756		1732
1757	if (op->contr->bowtype == bow_bestarrow)	1733	if (op->contr->bowtype == bow_bestarrow)
1758	{	1734	{
1759	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1735	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1760	}	1736	}
1761	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1737	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1762	{	1738	{
1763	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1764	wcmod = -1;	1740	wcmod = -1;
		1741
1765	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1742	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1766	}	1743	}
1767	else if (op->contr->bowtype == bow_threewide)	1744	else if (op->contr->bowtype == bow_threewide)
1768	{	1745	{
1769	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1773	else if (op->contr->bowtype == bow_spreadshot)	1750	else if (op->contr->bowtype == bow_spreadshot)
1774	{	1751	{
1775	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1752	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);	1753	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);	1754	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1778
1779	}	1755	}
1780	else	1756	else
1781	{	1757	{
1782	/* Simple case */	1758	/* Simple case */
1783	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1759	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1784	}	1760	}
		1761
1785	return ret;	1762	return ret;
1786	}	1763	}
1787
1788		1764
1789	/* Fires a misc (wand/rod/horn) object in 'dir'.	1765	/* Fires a misc (wand/rod/horn) object in 'dir'.
1790	* Broken apart from 'fire' to keep it more readable.	1766	* Broken apart from 'fire' to keep it more readable.
1791	*/	1767	*/
1792	void	1768	void
1793	fire_misc_object (object *op, int dir)	1769	fire_misc_object (object *op, int dir)
1794	{	1770	{
1795	object *item;	1771	object *item = op->contr->ranged_ob;
1796		1772
1797	if (!op->contr->ranges[range_misc])	1773	if (!item)
1798	{	1774	{
1799	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1775	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1800	return;	1776	return;
1801	}	1777	}
1802		1778
1803	item = op->contr->ranges[range_misc];
1804	if (!item->inv)	1779	if (!item->inv)
1805	{	1780	{
1806	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1781	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1807	return;	1782	return;
1808	}	1783	}
		1784
		1785	if (!op->change_weapon (item))
		1786	return;
		1787
1809	if (item->type == WAND)	1788	if (item->type == WAND)
1810	{	1789	{
1811	if (item->stats.food <= 0)	1790	if (item->stats.food <= 0)
1812	{	1791	{
1813	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1792	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));	1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1794
1815	return;	1795	return;
1816	}	1796	}
1817	}	1797	}
1818	else if (item->type == ROD || item->type == HORN)	1798	else if (item->type == ROD || item->type == HORN)
1819	{	1799	{
1820	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1821	{	1801	{
1822	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1803
1823	if (item->type == ROD)	1804	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));	1805	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1825	else	1806	else
1826	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1808
1827	return;	1809	return;
1828	}	1810	}
1829	}	1811	}
1830		1812
1831	if (cast_spell (op, item, dir, item->inv, NULL))	1813	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1862		1844
1863	/* check for loss of invisiblity/hide */	1845	/* check for loss of invisiblity/hide */
1864	if (action_makes_visible (op))	1846	if (action_makes_visible (op))
1865	make_visible (op);	1847	make_visible (op);
1866		1848
1867	switch (op->contr->shoottype)	1849	player *pl = op->contr;
		1850
		1851	if (pl->golem)
1868	{	1852	{
1869	case range_none:	1853	control_golem (op->contr->golem, dir);
1870	return;	1854	return;
		1855	}
1871		1856
1872	case range_bow:	1857	object *ob = pl->ranged_ob;
		1858
		1859	if (!ob)
		1860	return;
		1861
		1862	if (!op->change_weapon (ob))
		1863	return;
		1864
		1865	switch (ob->type)
		1866	{
		1867	case BOW:
1873	player_fire_bow (op, dir);	1868	player_fire_bow (op, dir);
1874	return;	1869	break;
1875		1870
1876	case range_magic: /* Casting spells */	1871	case SPELL:
1877	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1872	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1878	return;	1873	break;
1879		1874
1880	case range_misc:	1875	case BUILDER:
		1876	apply_map_builder (op, dir);
		1877	break;
		1878
		1879	case SKILL:
		1880	do_skill (op, op, ob, dir, 0);
		1881	break;
		1882
		1883	default:
1881	fire_misc_object (op, dir);	1884	fire_misc_object (op, dir);
1882	return;	1885	break;
1883
1884	case range_golem: /* Control summoned monsters from scrolls */
1885	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1886	{
1887	op->contr->ranges[range_golem] = 0;
1888	op->contr->shoottype = range_none;
1889	}
1890	else
1891	control_golem (op->contr->ranges[range_golem], dir);
1892	return;
1893
1894	case range_skill:
1895	if (!op->chosen_skill)
1896	{
1897	if (op->type == PLAYER)
1898	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1899	return;
1900	}
1901	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1902	return;
1903	case range_builder:
1904	apply_map_builder (op, dir);
1905	return;
1906	default:
1907	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1908	return;
1909	}	1886	}
1910	}	1887	}
1911
1912
1913		1888
1914	/* find_key	1889	/* find_key
1915	* We try to find a key for the door as passed. If we find a key	1890	* We try to find a key for the door as passed. If we find a key
1916	* and successfully use it, we return the key, otherwise NULL	1891	* and successfully use it, we return the key, otherwise NULL
1917	* This function merges both normal and locked door, since the logic	1892	* This function merges both normal and locked door, since the logic
…		…
1919	* pl is the player,	1894	* pl is the player,
1920	* inv is the objects inventory to searched	1895	* inv is the objects inventory to searched
1921	* door is the door we are trying to match against.	1896	* door is the door we are trying to match against.
1922	* This function can be called recursively to search containers.	1897	* This function can be called recursively to search containers.
1923	*/	1898	*/
1924
1925	object *	1899	object *
1926	find_key (object *pl, object *container, object *door)	1900	find_key (object *pl, object *container, object *door)
1927	{	1901	{
1928	object *tmp, *key;	1902	object *tmp, *key;
1929		1903
1930	/* Should not happen, but sanity checking is never bad */	1904	/* Should not happen, but sanity checking is never bad */
1931	if (container->inv == NULL)	1905	if (!container->inv)
1932	return NULL;	1906	return 0;
1933		1907
1934	/* First, lets try to find a key in the top level inventory */	1908	/* First, lets try to find a key in the top level inventory */
1935	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1909	for (tmp = container->inv; tmp; tmp = tmp->below)
1936	{	1910	{
1937	if (door->type == DOOR && tmp->type == KEY)	1911	if (door->type == DOOR && tmp->type == KEY)
1938	break;	1912	break;
1939	/* For sanity, we should really check door type, but other stuff	1913	/* For sanity, we should really check door type, but other stuff
1940	* (like containers) can be locked with special keys	1914	* (like containers) can be locked with special keys
1941	*/	1915	*/
1942	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1916	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1943	break;	1917	break;
1944	}	1918	}
		1919
1945	/* No key found - lets search inventories now */	1920	/* No key found - lets search inventories now */
1946	/* If we find and use a key in an inventory, return at that time.	1921	/* If we find and use a key in an inventory, return at that time.
1947	* otherwise, if we search all the inventories and still don't find	1922	* otherwise, if we search all the inventories and still don't find
1948	* a key, return	1923	* a key, return
1949	*/	1924	*/
1950	if (!tmp)	1925	if (!tmp)
1951	{	1926	{
1952	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1927	for (tmp = container->inv; tmp; tmp = tmp->below)
1953	{	1928	{
1954	/* No reason to search empty containers */	1929	/* No reason to search empty containers */
1955	if (tmp->type == CONTAINER && tmp->inv)	1930	if (tmp->type == CONTAINER && tmp->inv)
1956	{	1931	{
1957	if ((key = find_key (pl, tmp, door)) != NULL)	1932	if ((key = find_key (pl, tmp, door)))
1958	return key;	1933	return key;
1959	}	1934	}
1960	}	1935	}
		1936
1961	if (!tmp)	1937	if (!tmp)
1962	return NULL;	1938	return NULL;
1963	}	1939	}
		1940
1964	/* We get down here if we have found a key. Now if its in a container,	1941	/* We get down here if we have found a key. Now if its in a container,
1965	* see if we actually want to use it	1942	* see if we actually want to use it
1966	*/	1943	*/
1967	if (pl != container)	1944	if (pl != container)
1968	{	1945	{
…		…
1989	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1966	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1990	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1967	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1991	return NULL;	1968	return NULL;
1992	}	1969	}
1993	}	1970	}
		1971
1994	return tmp;	1972	return tmp;
1995	}	1973	}
1996		1974
1997	/* moved door processing out of move_player_attack.	1975	/* moved door processing out of move_player_attack.
1998	* returns 1 if player has opened the door with a key	1976	* returns 1 if player has opened the door with a key
…		…
2012	if (key)	1990	if (key)
2013	{	1991	{
2014	object *container = key->env;	1992	object *container = key->env;
2015		1993
2016	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1995
2017	if (action_makes_visible (op))	1996	if (action_makes_visible (op))
2018	make_visible (op);	1997	make_visible (op);
		1998
2019	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1999	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2020	spring_trap (door->inv, op);	2000	spring_trap (door->inv, op);
		2001
2021	if (door->type == DOOR)	2002	if (door->type == DOOR)
2022	{
2023	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2024	}
2025	else if (door->type == LOCKED_DOOR)	2004	else if (door->type == LOCKED_DOOR)
2026	{	2005	{
2027	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2028	remove_door2 (door); /* remove door without violence ;-) */	2007	remove_door2 (door); /* remove door without violence ;-) */
2029	}	2008	}
		2009
2030	/* Do this after we print the message */	2010	/* Do this after we print the message */
2031	decrease_ob (key); /* Use up one of the keys */	2011	decrease_ob (key); /* Use up one of the keys */
2032	/* Need to update the weight the container the key was in */	2012	/* Need to update the weight the container the key was in */
2033	if (container != op)	2013	if (container != op)
2034	esrv_update_item (UPD_WEIGHT, op, container);	2014	esrv_update_item (UPD_WEIGHT, op, container);
		2015
2035	return 1; /* Nothing more to do below */	2016	return 1; /* Nothing more to do below */
2036	}	2017	}
2037	else if (door->type == LOCKED_DOOR)	2018	else if (door->type == LOCKED_DOOR)
2038	{	2019	{
2039	/* Might as well return now - no other way to open this */	2020	/* Might as well return now - no other way to open this */
2040	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2021	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2041	return 1;	2022	return 1;
2042	}	2023	}
		2024
2043	return 0;	2025	return 0;
2044	}	2026	}
2045		2027
2046	/* This function is just part of a breakup from move_player.	2028	/* This function is just part of a breakup from move_player.
2047	* It should keep the code cleaner.	2029	* It should keep the code cleaner.
…		…
2051	*/	2033	*/
2052	void	2034	void
2053	move_player_attack (object *op, int dir)	2035	move_player_attack (object *op, int dir)
2054	{	2036	{
2055	object *tmp, *mon;	2037	object *tmp, *mon;
2056	sint16 nx, ny;
2057	int on_battleground;	2038	int on_battleground;
2058	maptile *m;	2039	maptile *m;
2059		2040
2060	nx = freearr_x[dir] + op->x;	2041	sint16 nx = freearr_x[dir] + op->x;
2061	ny = freearr_y[dir] + op->y;	2042	sint16 ny = freearr_y[dir] + op->y;
2062		2043
2063	on_battleground = op_on_battleground (op, 0, 0);	2044	on_battleground = op_on_battleground (op, 0, 0);
2064		2045
2065	/* If braced, or can't move to the square, and it is not out of the	2046	/* If braced, or can't move to the square, and it is not out of the
2066	* map, attack it. Note order of if statement is important - don't	2047	* map, attack it. Note order of if statement is important - don't
…		…
2073	*/	2054	*/
2074	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2055	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2075	{	2056	{
2076	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2077	{	2058	{
2078	m = get_map_from_coord (op->map, &nx, &ny);	2059	m = op->map->xy_find (nx, ny);
2079	if (!m)	2060	if (!m)
2080	return; /* Don't think this should happen */	2061	return; /* Don't think this should happen */
2081	}	2062	}
2082	else	2063	else
2083	m = op->map;	2064	m = op->map;
2084		2065
2085	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2066	if (!(tmp = m->at (nx, ny).bot))
2086	{
2087	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2088	return;	2067	return;
2089	}
2090		2068
2091	mon = 0;	2069	mon = 0;
2092	/* Go through all the objects, and find ones of interest. Only stop if	2070	/* Go through all the objects, and find ones of interest. Only stop if
2093	* we find a monster - that is something we know we want to attack.	2071	* we find a monster - that is something we know we want to attack.
2094	* if its a door or barrel (can roll) see if there may be monsters	2072	* if its a door or barrel (can roll) see if there may be monsters
…		…
2134		2112
2135	/* If the creature is a pet, push it even if the player is not	2113	/* If the creature is a pet, push it even if the player is not
2136	* peaceful. Our assumption is the creature is a pet if the	2114	* peaceful. Our assumption is the creature is a pet if the
2137	* player owns it and it is either friendly or unagressive.	2115	* player owns it and it is either friendly or unagressive.
2138	*/	2116	*/
2139	if ((op->type == PLAYER)	2117	if (op->type == PLAYER
2140	#if COZY_SERVER
2141	&&
2142	((mon->owner && mon->owner->contr	2118	&& ((mon->owner && mon->owner->contr
2143	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2119	&& same_party (mon->owner->contr->party, op->contr->party))
2144	#else
2145	&& mon->owner == op	2120	|| mon->owner == op)
2146	#endif
2147	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2148	{	2122	{
2149	/* If we're braced, we don't want to switch places with it */	2123	/* If we're braced, we don't want to switch places with it */
2150	if (op->contr->braced)	2124	if (op->contr->braced)
2151	return;	2125	return;
		2126
2152	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2127	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2153	(void) push_ob (mon, dir, op);	2128	push_ob (mon, dir, op);
2154	if (op->contr->tmp_invis || op->hide)	2129	if (op->contr->tmp_invis || op->hide)
2155	make_visible (op);	2130	make_visible (op);
		2131
2156	return;	2132	return;
2157	}	2133	}
2158		2134
2159	/* in certain circumstances, you shouldn't attack friendly	2135	/* in certain circumstances, you shouldn't attack friendly
2160	* creatures. Note that if you are braced, you can't push	2136	* creatures. Note that if you are braced, you can't push
2161	* someone, but put it inside this loop so that you won't	2137	* someone, but put it inside this loop so that you won't
2162	* attack them either.	2138	* attack them either.
2163	*/	2139	*/
2164	if ((mon->type == PLAYER || mon->enemy != op) &&	2140	if ((mon->type == PLAYER || mon->enemy != op)
2165	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2141	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2166	#ifdef PROHIBIT_PLAYERKILL
2167	(op->contr->peaceful	2142	&& ((op->contr->peaceful
2168	|| (mon->type == PLAYER	2143	|| (mon->type == PLAYER && mon->contr->peaceful))
2169	&& mon->contr->
2170	peaceful)) &&
2171	#else
2172	op->contr->peaceful &&
2173	#endif
2174	!on_battleground))	2144	&& !on_battleground))
2175	{	2145	{
2176	if (!op->contr->braced)	2146	if (!op->contr->braced)
2177	{	2147	{
2178	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2179	(void) push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
2180	}	2150	}
2181	else	2151	else
2182	new_draw_info (0, 0, op, "You withhold your attack");	2152	new_draw_info (0, 0, op, "You withhold your attack");
2183		2153
2184	if (op->contr->tmp_invis || op->hide)	2154	if (op->contr->tmp_invis || op->hide)
…		…
2199	* Way it works is like this: First, it must have some hit points	2169	* Way it works is like this: First, it must have some hit points
2200	* and be living. Then, it must be one of the following:	2170	* and be living. Then, it must be one of the following:
2201	* 1) Not a player, 2) A player, but of a different party. Note	2171	* 1) Not a player, 2) A player, but of a different party. Note
2202	* that party_number -1 is no party, so attacks can still happen.	2172	* that party_number -1 is no party, so attacks can still happen.
2203	*/	2173	*/
2204
2205	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2206	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2175	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2207	{	2176	{
2208
2209	/* If the player hasn't hit something this tick, and does
2210	* so, give them speed boost based on weapon speed. Doing
2211	* it here is better than process_players2, which basically
2212	* incurred a 1 tick offset.
2213	*/
2214	if (!op->contr->has_hit)	2177	if (!op->contr->has_hit)
2215	{	2178	{
		2179	op->contr->has_hit = 1;
2216	op->speed_left += op->speed / op->contr->weapon_sp;	2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2217
2218	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2219	}	2181	}
2220		2182
2221	skill_attack (mon, op, 0, 0, 0);	2183	skill_attack (mon, op, 0, 0, 0);
2222		2184
2223	/* If attacking another player, that player gets automatic	2185	/* If attacking another player, that player gets automatic
…		…
2243	int	2205	int
2244	move_player (object *op, int dir)	2206	move_player (object *op, int dir)
2245	{	2207	{
2246	int pick;	2208	int pick;
2247		2209
2248	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2210	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2249	return 0;	2211	return 0;
2250		2212
2251	/* Sanity check: make sure dir is valid */	2213	/* Sanity check: make sure dir is valid */
2252	if ((dir < 0) || (dir >= 9))	2214	if ((dir < 0) || (dir >= 9))
2253	{	2215	{
2254	LOG (llevError, "move_player: invalid direction %d\n", dir);	2216	LOG (llevError, "move_player: invalid direction %d\n", dir);
2255	return 0;	2217	return 0;
2256	}	2218	}
2257		2219
2258	/* peterm: added following line */	2220	/* peterm: added following line */
2259	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2221	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2260	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2222	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2261		2223
2262	op->facing = dir;	2224	op->facing = dir;
2263		2225
2264	if (op->hide)	2226	if (op->hide)
2265	do_hidden_move (op);	2227	do_hidden_move (op);
…		…
2298	* Returns true if there are more actions we can do.	2260	* Returns true if there are more actions we can do.
2299	*/	2261	*/
2300	int	2262	int
2301	handle_newcs_player (object *op)	2263	handle_newcs_player (object *op)
2302	{	2264	{
2303	if (op->contr->hidden)
2304	{
2305	op->invisible = 1000;
2306	/* the socket code flashes the player visible/invisible
2307	* depending on the value of invisible, so we need to
2308	* alternate it here for it to work correctly.
2309	*/
2310	if (pticks & 2)
2311	op->invisible--;
2312	}
2313	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2314	{
2315	op->invisible--;
2316	if (!op->invisible)
2317	{
2318	make_visible (op);
2319	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2320	}
2321	}
2322
2323	if (QUERY_FLAG (op, FLAG_SCARED))	2265	if (QUERY_FLAG (op, FLAG_SCARED))
2324	{	2266	{
2325	flee_player (op);	2267	flee_player (op);
		2268
2326	/* If player is still scared, that is his action for this tick */	2269	/* If player is still scared, that is his action for this tick */
2327	if (QUERY_FLAG (op, FLAG_SCARED))	2270	if (op->flag [FLAG_SCARED])
2328	{	2271	{
2329	op->speed_left--;	2272	--op->speed_left;
2330	return 0;	2273	return 0;
2331	}	2274	}
2332	}	2275	}
2333
2334	/* I've been seeing crashes where the golem has been destroyed, but
2335	* the player object still points to the defunct golem. The code that
2336	* destroys the golem looks correct, and it doesn't always happen, so
2337	* put this in a a workaround to clean up the golem pointer.
2338	*/
2339	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2340	op->contr->ranges[range_golem] = 0;
2341		2276
2342	/* call this here - we also will call this in do_ericserver, but	2277	/* call this here - we also will call this in do_ericserver, but
2343	* the players time has been increased when doericserver has been	2278	* the players time has been increased when doericserver has been
2344	* called, so we recheck it here.	2279	* called, so we recheck it here.
2345	*/	2280	*/
2346	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2281	if (op->contr->ns->handle_command ())
2347	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2348	;
2349
2350	if (op->speed_left < 0)
2351	return 0;	2282	return 1;
2352		2283
		2284	if (op->speed_left > 0.f)
		2285	{
2353	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2354	{	2287	{
2355	/* All move commands take 1 tick, at least for now */	2288	/* All move commands take 1 tick, at least for now */
2356	op->speed_left--;	2289	--op->speed_left;
2357		2290
2358	/* Instead of all the stuff below, let move_player take care	2291	/* Instead of all the stuff below, let move_player take care
2359	* of it. Also, some of the skill stuff is only put in	2292	* of it. Also, some of the skill stuff is only put in
2360	* there, as well as the confusion stuff.	2293	* there, as well as the confusion stuff.
2361	*/	2294	*/
2362	move_player (op, op->direction);	2295	move_player (op, op->direction);
2363	if (op->speed_left > 0)	2296
2364	return 1;	2297	return op->speed_left > 0.f;
2365	else	2298	}
2366	return 0;
2367	}	2299	}
2368		2300
2369	return 0;	2301	return 0;
2370	}	2302	}
2371		2303
…		…
2409	* from.	2341	* from.
2410	*/	2342	*/
2411	void	2343	void
2412	remove_unpaid_objects (object *op, object *env)	2344	remove_unpaid_objects (object *op, object *env)
2413	{	2345	{
2414	object *next;
2415
2416	while (op)	2346	while (op)
2417	{	2347	{
2418	next = op->below; /* Make sure we have a good value, in case	2348	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2419	* we remove object 'op'	2349
2420	*/
2421	if (QUERY_FLAG (op, FLAG_UNPAID))	2350	if (QUERY_FLAG (op, FLAG_UNPAID))
2422	{	2351	{
2423	op->remove ();
2424	op->x = env->x;
2425	op->y = env->y;
2426	if (env->type == PLAYER)	2352	if (env->type == PLAYER)
2427	esrv_del_item (env->contr, op->count);	2353	esrv_del_item (env->contr, op->count);
2428	insert_ob_in_map (op, env->map, NULL, 0);	2354
		2355	op->insert_at (env);
2429	}	2356	}
2430	else if (op->inv)	2357	else if (op->inv)
2431	remove_unpaid_objects (op->inv, env);	2358	remove_unpaid_objects (op->inv, env);
2432		2359
2433	op = next;	2360	op = next;
…		…
2489	int rate_grace = 2000;	2416	int rate_grace = 2000;
2490	const int max_hp = 1;	2417	const int max_hp = 1;
2491	const int max_sp = 1;	2418	const int max_sp = 1;
2492	const int max_grace = 1;	2419	const int max_grace = 1;
2493		2420
2494	if (op->contr->outputs_sync)	2421	if (op->contr->hidden)
		2422	{
		2423	op->invisible = 1000;
		2424	/* the socket code flashes the player visible/invisible
		2425	* depending on the value of invisible, so we need to
		2426	* alternate it here for it to work correctly.
		2427	*/
		2428	if (pticks & 2)
		2429	op->invisible--;
2495	{	2430	}
2496	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2431	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2497	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2432	{
2498	flush_output_element (op, &op->contr->outputs[i]);	2433	if (!op->invisible--)
		2434	{
		2435	make_visible (op);
		2436	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2437	}
2499	}	2438	}
2500		2439
2501	if (op->contr->ns->state == ST_PLAYING)	2440	if (op->contr->ns->state == ST_PLAYING)
2502	{	2441	{
2503	/* these next three if clauses make it possible to SLOW DOWN	2442	/* these next three if clauses make it possible to SLOW DOWN
…		…
2525	gen_grace = op->stats.maxgrace;	2464	gen_grace = op->stats.maxgrace;
2526	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2527	}	2466	}
2528		2467
2529	/* Regenerate Spell Points */	2468	/* Regenerate Spell Points */
2530	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2469	if (!op->contr->golem && --op->last_sp < 0)
2531	{	2470	{
2532	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2471	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2533	if (op->stats.sp < op->stats.maxsp)	2472	if (op->stats.sp < op->stats.maxsp)
2534	{	2473	{
2535	op->stats.sp++;	2474	op->stats.sp++;
…		…
2633	}	2572	}
2634		2573
2635	/* Digestion */	2574	/* Digestion */
2636	if (--op->last_eat < 0)	2575	if (--op->last_eat < 0)
2637	{	2576	{
2638	#ifdef COZY_SERVER
2639	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2640	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2641	#else
2642	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2643	#endif
2644		2578
2645	if (op->contr->gen_hp > 0)	2579	if (op->contr->gen_hp > 0)
2646	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2647	else	2581	else
2648	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2726	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2660	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2727	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2661	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2728		2662
2729	/* restore player */	2663	/* restore player */
2730	at = archetype::find ("poisoning");	2664	at = archetype::find ("poisoning");
2731	tmp = present_arch_in_ob (at, op);	2665	if (object *tmp = present_arch_in_ob (at, op))
2732	if (tmp)
2733	{	2666	{
2734	tmp->destroy ();	2667	tmp->destroy ();
2735	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2668	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2736	}	2669	}
2737		2670
2738	at = archetype::find ("confusion");	2671	at = archetype::find ("confusion");
2739	tmp = present_arch_in_ob (at, op);	2672	if (object *tmp = present_arch_in_ob (at, op))
2740	if (tmp)
2741	{	2673	{
2742	tmp->destroy ();	2674	tmp->destroy ();
2743	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2744	}	2676	}
2745		2677
…		…
2747	op->stats.hp = op->stats.maxhp;	2679	op->stats.hp = op->stats.maxhp;
2748	if (op->stats.food <= 0)	2680	if (op->stats.food <= 0)
2749	op->stats.food = 999;	2681	op->stats.food = 999;
2750		2682
2751	/* create a bodypart-trophy to make the winner happy */	2683	/* create a bodypart-trophy to make the winner happy */
2752	tmp = arch_to_object (archetype::find ("finger"));	2684	if (object *tmp = arch_to_object (archetype::find ("finger")))
2753	if (tmp != NULL)
2754	{	2685	{
2755	sprintf (buf, "%s's finger", &op->name);	2686	sprintf (buf, "%s's finger", &op->name);
2756	tmp->name = buf;	2687	tmp->name = buf;
2757	sprintf (buf, " This finger has been cut off %s\n"	2688	sprintf (buf, " This finger has been cut off %s\n"
2758	" the %s, when he was defeated at\n level %d by %s.\n",	2689	" the %s, when he was defeated at\n level %d by %s.\n",
2759	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2690	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2760	tmp->msg = buf;	2691	tmp->msg = buf;
2761	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2692	tmp->value = 0, tmp->type = 0;
2762	tmp->materialname = NULL;	2693	tmp->materialname = "organics";
2763	tmp->x = op->x, tmp->y = op->y;	2694	tmp->insert_at (op, tmp);
2764	insert_ob_in_map (tmp, op->map, op, 0);
2765	}	2695	}
2766		2696
2767	/* teleport defeated player to new destination */	2697	/* teleport defeated player to new destination */
2768	transfer_ob (op, x, y, 0, NULL);	2698	transfer_ob (op, x, y, 0, NULL);
2769	op->contr->braced = 0;	2699	op->contr->braced = 0;
…		…
2774		2704
2775	command_kill_pets (op, 0);	2705	command_kill_pets (op, 0);
2776		2706
2777	if (op->stats.food < 0)	2707	if (op->stats.food < 0)
2778	{	2708	{
2779	if (op->contr->explore)
2780	{
2781	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2782	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783	op->stats.food = 999;
2784	return;
2785	}
2786	sprintf (buf, "%s starved to death.", &op->name);	2709	sprintf (buf, "%s starved to death.", &op->name);
2787	strcpy (op->contr->killer, "starvation");	2710	strcpy (op->contr->killer, "starvation");
2788	}	2711	}
2789	else	2712	else
2790	{
2791	if (op->contr->explore)
2792	{
2793	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2794	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795	op->stats.hp = op->stats.maxhp;
2796	return;
2797	}
2798	sprintf (buf, "%s died.", &op->name);	2713	sprintf (buf, "%s died.", &op->name);
2799	}	2714
2800	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2801		2716
2802	/* save the map location for corpse, gravestone */	2717	/* save the map location for corpse, gravestone */
2803	x = op->x;	2718	x = op->x;
2804	y = op->y;	2719	y = op->y;
2805	map = op->map;	2720	map = op->map;
2806
2807		2721
2808	/* NOT_PERMADEATH code. This basically brings the character back to	2722	/* NOT_PERMADEATH code. This basically brings the character back to
2809	* life if they are dead - it takes some exp and a random stat.	2723	* life if they are dead - it takes some exp and a random stat.
2810	* See the config.h file for a little more in depth detail about this.	2724	* See the config.h file for a little more in depth detail about this.
2811	*/	2725	*/
…		…
2828	num_stats_lose = 1;	2742	num_stats_lose = 1;
2829	else	2743	else
2830	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2744	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2831	}	2745	}
2832	else	2746	else
2833	{
2834	num_stats_lose = 1;	2747	num_stats_lose = 1;
2835	}	2748
2836	lost_a_stat = 0;	2749	lost_a_stat = 0;
2837		2750
2838	for (z = 0; z < num_stats_lose; z++)	2751	for (z = 0; z < num_stats_lose; z++)
2839	{	2752	{
2840	i = RANDOM () % NUM_STATS;	2753	i = RANDOM () % NUM_STATS;
…		…
2981	op->stats.hp = op->stats.maxhp;	2894	op->stats.hp = op->stats.maxhp;
2982	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2983	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2984		2897
2985	/*	2898	/*
2986	* Check to see if the player is in a shop. IF so, then check to see if
2987	* the player has any unpaid items. If so, remove them and put them back	2899	* Check to see if the player has any unpaid items. If so, remove them
2988	* in the map.	2900	* and put them back in the map.
2989	*/	2901	*/
2990
2991	if (is_in_shop (op))
2992	remove_unpaid_objects (op->inv, op);	2902	remove_unpaid_objects (op->inv, op);
2993		2903
2994	/****************************************/	2904	/****************************************/
2995	/* */	2905	/* */
2996	/* Move player to his current respawn- */	2906	/* Move player to his current respawn- */
2997	/* position (usually last savebed) */	2907	/* position (usually last savebed) */
2998	/* */	2908	/* */
2999	/****************************************/	2909	/****************************************/
3000		2910
3001	enter_player_savebed (op);	2911	enter_player_savebed (op);
3002		2912
3003	/* Save the player before inserting the force to reduce
3004	* chance of abuse.
3005	*/
3006	op->contr->braced = 0;	2913	op->contr->braced = 0;
3007	op->contr->save ();
3008		2914
3009	/* it is possible that the player has blown something up	2915	/* it is possible that the player has blown something up
3010	* at his savebed location, and that can have long lasting	2916	* at his savebed location, and that can have long lasting
3011	* spell effects. So first see if there is a spell effect	2917	* spell effects. So first see if there is a spell effect
3012	* on the space that might harm the player.	2918	* on the space that might harm the player.
…		…
3021	object *force;	2927	object *force;
3022	int at;	2928	int at;
3023		2929
3024	force = get_archetype (FORCE_NAME);	2930	force = get_archetype (FORCE_NAME);
3025	/* 50 ticks should be enough time for the spell to abate */	2931	/* 50 ticks should be enough time for the spell to abate */
3026	force->speed = 0.1;	2932	force->speed = 0.1f;
3027	force->speed_left = -5.0;	2933	force->speed_left = -5.f;
3028	SET_FLAG (force, FLAG_APPLIED);	2934	SET_FLAG (force, FLAG_APPLIED);
3029	for (at = 0; at < NROFATTACKS; at++)	2935	for (at = 0; at < NROFATTACKS; at++)
3030	if (will_kill_again & (1 << at))	2936	if (will_kill_again & (1 << at))
3031	force->resist[at] = 100;	2937	force->resist[at] = 100;
3032		2938
…		…
3041	void	2947	void
3042	loot_object (object *op)	2948	loot_object (object *op)
3043	{ /* Grab and destroy some treasure */	2949	{ /* Grab and destroy some treasure */
3044	object *tmp, *tmp2, *next;	2950	object *tmp, *tmp2, *next;
3045		2951
3046	if (op->container)	2952	op->close_container (); /* close open sack first */
3047	esrv_apply_container (op, op->container); /* close open sack first */
3048		2953
3049	for (tmp = op->inv; tmp; tmp = next)	2954	for (tmp = op->inv; tmp; tmp = next)
3050	{	2955	{
3051	next = tmp->below;	2956	next = tmp->below;
3052		2957
3053	if (tmp->invisible)	2958	if (tmp->invisible)
3054	continue;	2959	continue;
3055		2960
3056	tmp->remove ();	2961	tmp->remove ();
3057	tmp->x = op->x, tmp->y = op->y;	2962	tmp->x = op->x, tmp->y = op->y;
		2963
3058	if (tmp->type == CONTAINER)	2964	if (tmp->type == CONTAINER)
3059	{ /* empty container to ground */	2965	loot_object (tmp); /* empty container to ground */
3060	loot_object (tmp);	2966
3061	}
3062	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3063	{	2968	{
3064	if (tmp->nrof > 1)	2969	if (tmp->nrof > 1)
3065	{	2970	{
3066	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3067	tmp2->destroy ();	2972	tmp2->destroy ();
…		…
3078	/*	2983	/*
3079	* fix_weight(): Check recursively the weight of all players, and fix	2984	* fix_weight(): Check recursively the weight of all players, and fix
3080	* what needs to be fixed. Refresh windows and fix speed if anything	2985	* what needs to be fixed. Refresh windows and fix speed if anything
3081	* was changed.	2986	* was changed.
3082	*/	2987	*/
3083
3084	void	2988	void
3085	fix_weight (void)	2989	fix_weight (void)
3086	{	2990	{
3087	for_all_players (pl)	2991	for_all_players (pl)
3088	{	2992	{
…		…
3148	if (op->type == PLAYER)	3052	if (op->type == PLAYER)
3149	{	3053	{
3150	op->contr->tmp_invis = 0;	3054	op->contr->tmp_invis = 0;
3151	op->contr->invis_race = 0;	3055	op->contr->invis_race = 0;
3152	}	3056	}
		3057
3153	update_object (op, UP_OBJ_FACE);	3058	update_object (op, UP_OBJ_CHANGE);
3154	}	3059	}
3155		3060
3156	int	3061	int
3157	is_true_undead (object *op)	3062	is_true_undead (object *op)
3158	{	3063	{
3159	object *tmp = NULL;
3160
3161	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3162	return 1;	3065	return 1;
3163		3066
3164	return 0;	3067	return 0;
3165	}	3068	}
…		…
3224		3127
3225	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3226		3129
3227	/* its *extremely* hard to run and sneak/hide at the same time! */	3130	/* its *extremely* hard to run and sneak/hide at the same time! */
3228	if (op->type == PLAYER && op->contr->run_on)	3131	if (op->type == PLAYER && op->contr->run_on)
3229	{
3230	if (!skop || num >= skop->level)	3132	if (!skop || num >= skop->level)
3231	{	3133	{
3232	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3134	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3233	make_visible (op);	3135	make_visible (op);
3234	return;	3136	return;
3235	}	3137	}
3236	else	3138	else
3237	num += 20;	3139	num += 20;
3238	}	3140
3239	num += op->map->difficulty;	3141	num += op->map->difficulty;
3240	hide = hideability (op); /* modify by terrain hidden level */	3142	hide = hideability (op); /* modify by terrain hidden level */
3241	num -= hide;	3143	num -= hide;
		3144
3242	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3243	{	3146	{
3244	make_visible (op);	3147	make_visible (op);
3245	if (op->type == PLAYER)	3148	if (op->type == PLAYER)
3246	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3247	}	3150	}
3248	else if (op->type == PLAYER && skop)	3151	else if (op->type == PLAYER && skop)
3249	{
3250	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3251	}
3252	}	3153	}
3253		3154
3254	/* determine if who is standing near a hostile creature. */	3155	/* determine if who is standing near a hostile creature. */
3255		3156
3256	int	3157	int
…		…
3323	if (pl->type != PLAYER)	3224	if (pl->type != PLAYER)
3324	{	3225	{
3325	LOG (llevError, "player_can_view() called for non-player object\n");	3226	LOG (llevError, "player_can_view() called for non-player object\n");
3326	return -1;	3227	return -1;
3327	}	3228	}
		3229
3328	if (!pl || !op)	3230	if (!pl || !op)
3329	return 0;	3231	return 0;
3330		3232
3331	if (op->head)
3332	{
3333	op = op->head;	3233	op = op->head_ ();
3334	}	3234
3335	get_rangevector (pl, op, &rv, 0x1);	3235	get_rangevector (pl, op, &rv, 0x1);
3336		3236
3337	/* starting with the 'head' part, lets loop	3237	/* starting with the 'head' part, lets loop
3338	* through the object and find if it has any	3238	* through the object and find if it has any
3339	* part that is in the los array but isnt on	3239	* part that is in the los array but isnt on
…		…
3456	char buf[MAX_BUF]; /* tmp. string buffer */	3356	char buf[MAX_BUF]; /* tmp. string buffer */
3457	int i = 0, j = 0;	3357	int i = 0, j = 0;
3458		3358
3459	/* get the appropriate treasurelist */	3359	/* get the appropriate treasurelist */
3460	if (atnr == ATNR_FIRE)	3360	if (atnr == ATNR_FIRE)
3461	trlist = find_treasurelist ("dragon_ability_fire");	3361	trlist = treasurelist::find ("dragon_ability_fire");
3462	else if (atnr == ATNR_COLD)	3362	else if (atnr == ATNR_COLD)
3463	trlist = find_treasurelist ("dragon_ability_cold");	3363	trlist = treasurelist::find ("dragon_ability_cold");
3464	else if (atnr == ATNR_ELECTRICITY)	3364	else if (atnr == ATNR_ELECTRICITY)
3465	trlist = find_treasurelist ("dragon_ability_elec");	3365	trlist = treasurelist::find ("dragon_ability_elec");
3466	else if (atnr == ATNR_POISON)	3366	else if (atnr == ATNR_POISON)
3467	trlist = find_treasurelist ("dragon_ability_poison");	3367	trlist = treasurelist::find ("dragon_ability_poison");
3468		3368
3469	if (trlist == NULL || who->type != PLAYER)	3369	if (trlist == NULL || who->type != PLAYER)
3470	return;	3370	return;
3471		3371
3472	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3473		3373
3474	if (tr == NULL || tr->item == NULL)	3374	if (!tr || !tr->item)
3475	{	3375	{
3476	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3376	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3477	return;	3377	return;
3478	}	3378	}
3479		3379
…		…
3604	* not readied.	3504	* not readied.
3605	*/	3505	*/
3606	void	3506	void
3607	player_unready_range_ob (player *pl, object *ob)	3507	player_unready_range_ob (player *pl, object *ob)
3608	{	3508	{
3609	rangetype i;	3509	if (pl->ob->current_weapon == ob)
		3510	pl->ob->current_weapon = 0;
3610		3511
3611	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3512	if (pl->combat_ob == ob)
3612	{	3513	pl->combat_ob = 0;
		3514
3613	if (pl->ranges[i] == ob)	3515	if (pl->ranged_ob == ob)
3614	{	3516	pl->ranged_ob = 0;
3615	pl->ranges[i] = NULL;
3616	if (pl->shoottype == i)
3617	{
3618	pl->shoottype = range_none;
3619	}
3620	}
3621	}
3622	}	3517	}
		3518
		3519	sint8
		3520	player::visibility_at (maptile *map, int x, int y) const
		3521	{
		3522	if (!ns)
		3523	return 0;
		3524
		3525	int dx, dy;
		3526	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3527	return 0;
		3528
		3529	x += dx - ns->current_x + ns->mapx / 2;
		3530	y += dy - ns->current_y + ns->mapy / 2;
		3531
		3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3533	return 0;
		3534
		3535	return 100 - blocked_los [x][y];
		3536	}

Diff Legend

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