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.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.151 by root, Sat Jun 16 00:12:20 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <pwd.h>
27	#include <sproto.h>	26	#include <sproto.h>
28	#include <sounds.h>	27	#include <sounds.h>
29	#include <living.h>	28	#include <living.h>
30	#include <object.h>	29	#include <object.h>
31	#include <spells.h>	30	#include <spells.h>
…		…
116		115
117	news[0] = '\0';	116	news[0] = '\0';
118	subject[0] = '\0';	117	subject[0] = '\0';
119	size = 0;	118	size = 0;
120		119
121	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
122	{	121	{
123	if (*buf == '#')	122	if (*buf == '#')
124	continue;	123	continue;
125		124
126	if (*buf == '%')	125	if (*buf == '%')
127	{ /* send one news */	126	{ /* send one news */
128	if (size > 0)	127	if (size > 0)
129	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 */
130		129
131	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
132	strip_endline (subject);	131	strip_endline (subject);
133	size = 0;	132	size = 0;
134	news[0] = '\0';	133	news[0] = '\0';
…		…
144	size += strlen (buf);	143	size += strlen (buf);
145	}	144	}
146	}	145	}
147		146
148	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149	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);
150	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
151	}	150	}
152		151
153	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
154	static void	153	static void
155	set_first_map (object *op)	154	set_first_map (object *op)
156	{	155	{
157	op->contr->maplevel = first_map_path;	156	op->contr->maplevel = first_map_path;
158	op->x = -1;	157	op->x = -1;
159	op->y = -1;	158	op->y = -1;
160	}
161
162	void
163	player::enter_map ()
164	{
165	object *tmp = object::create ();
166
167	EXIT_PATH (tmp) = maplevel;
168	EXIT_X (tmp) = ob->x;
169	EXIT_Y (tmp) = ob->y;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}	159	}
174		160
175	void	161	void
176	player::activate ()	162	player::activate ()
177	{	163	{
…		…
180		166
181	players.insert (this);	167	players.insert (this);
182	ob->remove ();	168	ob->remove ();
183	ob->map = 0;	169	ob->map = 0;
184	ob->activate_recursive ();	170	ob->activate_recursive ();
185	enter_map ();	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
186	}	173	}
187		174
188	void	175	void
189	player::deactivate ()	176	player::deactivate ()
190	{	177	{
191	if (!active)	178	if (!active)
192	return;	179	return;
193		180
194	terminate_all_pets (ob);	181	terminate_all_pets (ob);
		182	remove_friendly_object (ob);
195	ob->deactivate_recursive ();	183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
196	ob->remove ();	188	ob->remove ();
197	ob->map = 0;	189	ob->map = 0;
		190	party = 0;
		191
		192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
198		193
199	players.erase (this);	194	players.erase (this);
200	}	195	}
201		196
202	// connect the player with a specific client	197	// connect the player with a specific client
203	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
204	void	199	void
205	player::connect (client *ns)	200	player::connect (client *ns)
206	{	201	{
207	this->ns = ns;	202	this->ns = ns;
208	ns->pl = this;	203	ns->pl = this;
209		204
		205	run_on = 0;
		206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
		208
210	ns->update_look = 0;	209	ns->update_look = 0;
211	ns->look_position = 0;	210	ns->look_position = 0;
212		211
213	clear_los (ob);	212	clear_los (this);
		213
		214	ns->reset_stats ();
214		215
215	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->race;
218
219	if (!legal_range (ob, shoottype))
220	shoottype = range_none;
221		219
222	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
223	link_player_skills (ob);	221	link_player_skills (ob);
224		222
225	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226		224
227	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->object::name);
228
229	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
230	* from the class, and not race. I don't see any way to get the class information
231	* to then update this. I don't think this will actually break anything - anyone
232	* that can use armour should be able to use a shield. What this may 'break'
233	* are features new characters get, eg, if someone starts up with a Q, they
234	* should be able to use a shield. However, old Q's won't get that advantage.
235	*/
236	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237	SET_FLAG (ob, FLAG_USE_SHIELD);
238		226
239	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
240	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
241	{	229	{
242	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
…		…
244	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
245	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
246		234
247	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
248	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
249	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
250	abil = tmp;	238	abil = tmp;
251	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
252	skin = tmp;	240	skin = tmp;
253		241
254	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
255	}	243	}
256		244
257	CLEAR_FLAG (ob, FLAG_FRIENDLY);
258	add_friendly_object (ob);
259
260	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
261		246
262	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
263		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);
264	ob->update_stats ();	274	ob->update_stats ();
		275
265	ns->floorbox_update ();	276	ns->floorbox_update ();
266
267	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
268	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
269		279
270	activate ();	280	activate ();
271		281
…		…
285	if (active)	295	if (active)
286	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
287		297
288	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
289		299
		300	ns->reset_stats ();
290	ns->pl = 0;	301	ns->pl = 0;
291	this->ns = 0;	302	ns = 0;
292	}	303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
		307
		308	observe = ob;
293		309
294	deactivate ();	310	deactivate ();
295	}	311	}
296		312
297	// the need for this function can be explained	313	// the need for this function can be explained
298	// by load_object not returning the object	314	// by load_object not returning the object
299	void	315	void
300	player::set_object (object *op)	316	player::set_object (object *op)
301	{	317	{
302	ob = op;	318	ob = observe = op;
303	ob->contr = this; /* this aren't yet in archetype */	319	ob->contr = this; /* this aren't yet in archetype */
304		320
		321	ob->speed = 1.0f;
305	ob->speed_left = 0.5;	322	ob->speed_left = 0.5f;
306	ob->speed = 1.0;	323
307	ob->direction = 5; /* So player faces south */	324	ob->direction = 5; /* So player faces south */
308	ob->stats.wc = 2;	325	}
309	ob->run_away = 25; /* Then we panick... */
310		326
311	ob->roll_stats ();	327	void
		328	player::set_observe (object *op)
		329	{
		330	observe = op ? op : ob;
		331	do_los = 1;
312	}	332	}
313		333
314	player::player ()	334	player::player ()
315	{	335	{
316	/* There are some elements we want initialised to non zero value -	336	/* There are some elements we want initialised to non zero value -
317	* we deal with that below this point.	337	* we deal with that below this point.
318	*/	338	*/
319	outputs_sync = 16; /* Every 2 seconds */	339	outputs_sync = 4;
320	outputs_count = 8; /* Keeps present behaviour */	340	outputs_count = 4;
321	unapply = unapply_nochoice;	341	unapply = unapply_nochoice;
322		342
323	savebed_map = first_map_path; /* Init. respawn position */	343	savebed_map = first_map_path; /* Init. respawn position */
324		344
325	gen_sp_armour = 10;	345	gen_sp_armour = 10;
326	last_speed = -1;
327	shoottype = range_none;
328	bowtype = bow_normal;	346	bowtype = bow_normal;
329	petmode = pet_normal;	347	petmode = pet_normal;
330	listening = 10;	348	listening = 10;
331	usekeys = containers;	349	usekeys = containers;
332	last_weapon_sp = -1;
333	peaceful = 1; /* default peaceful */	350	peaceful = 1; /* default peaceful */
334	do_los = 1;	351	do_los = 1;
335		352
336	/* we need to clear these to -1 and not zero - otherwise,	353	weapon_sp = 1.0f;
337	* if a player quits and starts a new character, we wont	354	weapon_sp_left = 0.5f;
338	* send new values to the client, as things like exp start
339	* at zero.
340	*/
341	for (int i = 0; i < NUM_SKILLS; i++)
342	last_skill_exp[i] = -1;
343
344	for (int i = 0; i < NROFATTACKS; i++)
345	last_resist[i] = -1;
346
347	last_stats.exp = -1;
348	last_weight = (uint32) - 1;
349	}	355	}
350		356
351	void	357	void
352	player::do_destroy ()	358	player::do_destroy ()
353	{	359	{
…		…
358	if (ob)	364	if (ob)
359	{	365	{
360	ob->destroy_inv (false);	366	ob->destroy_inv (false);
361	ob->destroy ();	367	ob->destroy ();
362	}	368	}
		369
		370	ob = observe = 0;
363	}	371	}
364		372
365	player::~player ()	373	player::~player ()
366	{	374	{
367	/* Clear item stack */	375	/* Clear item stack */
…		…
376	player::create ()	384	player::create ()
377	{	385	{
378	player *pl = new player;	386	player *pl = new player;
379		387
380	pl->set_object (arch_to_object (get_player_archetype (0)));	388	pl->set_object (arch_to_object (get_player_archetype (0)));
		389
		390	pl->ob->roll_stats ();
		391	pl->ob->stats.wc = 2;
		392	pl->ob->run_away = 25; /* Then we panick... */
		393
381	set_first_map (pl->ob);	394	set_first_map (pl->ob);
382		395
383	return pl;	396	return pl;
384	}	397	}
385		398
…		…
389	* Note: there MUST be at least one player archetype!	402	* Note: there MUST be at least one player archetype!
390	*/	403	*/
391	archetype *	404	archetype *
392	get_player_archetype (archetype *at)	405	get_player_archetype (archetype *at)
393	{	406	{
394	archetype *start = at;	407	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
395		408
396	for (;;)	409	for (;;)
397	{	410	{
398	if (at == NULL || at->next == NULL)	411	if (++i == archetypes.end ())
399	at = first_archetype;	412	i = archetypes.begin ();
400	else	413	else if (*i == at)
401	at = at->next;	414	cleanup ("not a single player archetype found");
402		415
403	if (at->clone.type == PLAYER)	416	if ((*i)->type == PLAYER)
404	return at;	417	return *i;
405
406	if (at == start)
407	{
408	LOG (llevError, "No Player archetypes\n");
409	exit (-1);
410	}
411	}	418	}
412	}	419	}
413		420
414	object *	421	object *
415	get_nearest_player (object *mon)	422	get_nearest_player (object *mon)
…		…
417	object *op = NULL;	424	object *op = NULL;
418	objectlink *ol;	425	objectlink *ol;
419	unsigned lastdist;	426	unsigned lastdist;
420	rv_vector rv;	427	rv_vector rv;
421		428
422	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	429	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
423	{	430	{
424	/* We should not find free objects on this friendly list, but it	431	/* We should not find free objects on this friendly list, but it
425	* does periodically happen. Given that, lets deal with it.	432	* does periodically happen. Given that, lets deal with it.
426	* While unlikely, it is possible the next object on the friendly	433	* While unlikely, it is possible the next object on the friendly
427	* list is also free, so encapsulate this in a while loop.	434	* list is also free, so encapsulate this in a while loop.
…		…
431	object *tmp = ol->ob;	438	object *tmp = ol->ob;
432		439
433	/* Can't do much more other than log the fact, because the object	440	/* Can't do much more other than log the fact, because the object
434	* itself will have been cleared.	441	* itself will have been cleared.
435	*/	442	*/
436	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	443	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		444	tmp->debug_desc ());
437	ol = ol->next;	445	ol = ol->next;
438	remove_friendly_object (tmp);	446	remove_friendly_object (tmp);
439	if (!ol)	447	if (!ol)
440	return op;	448	return op;
441	}	449	}
…		…
530	x = mon->x;	538	x = mon->x;
531	y = mon->y;	539	y = mon->y;
532	m = mon->map;	540	m = mon->map;
533	dir = rv.direction;	541	dir = rv.direction;
534	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	542	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
535	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	543	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		544
536	/* If we can't solve it within the search distance, return now. */	545	/* If we can't solve it within the search distance, return now. */
537	if (diff > max)	546	if (diff > max)
538	return 0;	547	return 0;
		548
539	while (diff > 1 && max > 0)	549	while (diff > 1 && max > 0)
540	{	550	{
541	lastx = x;	551	lastx = x;
542	lasty = y;	552	lasty = y;
543	lastmap = m;	553	lastmap = m;
…		…
625	max--;	635	max--;
626	lastdir = dir;	636	lastdir = dir;
627	if (!firstdir)	637	if (!firstdir)
628	firstdir = dir;	638	firstdir = dir;
629	}	639	}
		640
630	if (diff <= 1)	641	if (diff <= 1)
631	{	642	{
632	/* Recalculate diff (distance) because we may not have actually	643	/* Recalculate diff (distance) because we may not have actually
633	* headed toward player for entire distance.	644	* headed toward player for entire distance.
634	*/	645	*/
635	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	646	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
636	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	647	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
637	}	648	}
		649
638	if (diff > max)	650	if (diff > max)
639	return 0;	651	return 0;
640	}	652	}
		653
641	/* If we reached the max, didn't find a direction in time */	654	/* If we reached the max, didn't find a direction in time */
642	if (!max)	655	if (!max)
643	return 0;	656	return 0;
644		657
645	return firstdir;	658	return firstdir;
…		…
759	roll_stat (void)	772	roll_stat (void)
760	{	773	{
761	int a[4], i, j, k;	774	int a[4], i, j, k;
762		775
763	for (i = 0; i < 4; i++)	776	for (i = 0; i < 4; i++)
764	a[i] = (int) RANDOM () % 6 + 1;	777	a[i] = (int) rndm (6) + 1;
765		778
766	for (i = 0, j = 0, k = 7; i < 4; i++)	779	for (i = 0, j = 0, k = 7; i < 4; i++)
767	if (a[i] < k)	780	if (a[i] < k)
768	k = a[i], j = i;	781	k = a[i], j = i;
769		782
…		…
775	}	788	}
776		789
777	void	790	void
778	object::roll_stats ()	791	object::roll_stats ()
779	{	792	{
780	int statsort [7];	793	int statsort [NUM_STATS];
781		794
782	for (;;)	795	for (;;)
783	{	796	{
784	int sum = 0;	797	int sum = 0;
785	for (int i = 7; i--; )	798	for (int i = NUM_STATS; i--; )
786	sum += statsort [i] = roll_stat ();	799	sum += statsort [i] = roll_stat ();
787		800
788	if (sum >= 82 && sum <= 116)	801	if (sum >= 82 && sum <= 116)
789	break;	802	break;
790	}	803	}
791		804
792	// Sort the stats so that rerolling is easier...	805	// Sort the stats so that rerolling is easier...
793	std::sort (statsort, statsort + 7, std::greater<int>());	806	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
794		807
		808	for (int i = 0; i < NUM_STATS; ++i)
795	stats.Str = statsort[0];	809	stats.stat (i) = statsort [i];
796	stats.Dex = statsort[1];
797	stats.Con = statsort[2];
798	stats.Int = statsort[3];
799	stats.Wis = statsort[4];
800	stats.Pow = statsort[5];
801	stats.Cha = statsort[6];
802		810
803	stats.exp = 0;	811	stats.exp = 0;
804	stats.ac = 0;	812	stats.ac = 0;
805		813
806	stats.hp = stats.maxhp;	814	stats.hp = stats.maxhp;
…		…
818	}	826	}
819		827
820	void	828	void
821	object::swap_stats (int a, int b)	829	object::swap_stats (int a, int b)
822	{	830	{
823	int tmp = get_attr_value (&contr->orig_stats, a);	831	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
824	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
825	set_attr_value (&contr->orig_stats, b, tmp);
826		832
		833	for (int i = 0; i < NUM_STATS; ++i)
827	stats.Str = contr->orig_stats.Str;	834	stats.stat (i) = contr->orig_stats.stat (i);
828	stats.Dex = contr->orig_stats.Dex;
829	stats.Con = contr->orig_stats.Con;
830	stats.Int = contr->orig_stats.Int;
831	stats.Wis = contr->orig_stats.Wis;
832	stats.Pow = contr->orig_stats.Pow;
833	stats.Cha = contr->orig_stats.Cha;
834		835
835	//TODO: the following code looks so borked and should, at the very least,	836	//TODO: the following code looks so borked and should, at the very least,
836	// be merged with the similar code in roll_stats	837	// be merged with the similar code in roll_stats
837	stats.ac = 0;	838	stats.ac = 0;
838		839
…		…
869	* appropriate action with it (change race, or other things).	870	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	871	* The function name is for historical reasons - now we have
871	* separate race and class; this actually changes the RACE,	872	* separate race and class; this actually changes the RACE,
872	* not the class.	873	* not the class.
873	*/	874	*/
874	int	875	void
875	key_change_class (object *op, char key)	876	player::chargen_race_done ()
876	{	877	{
877	int tmp_loop;
878
879	if (key == 'd' || key == 'D')
880	{
881	char buf[MAX_BUF];
882
883	/* this must before then initial items are given */	878	/* this must before then initial items are given */
884	esrv_new_player (op->contr, op->weight + op->carrying);	879	esrv_new_player (ob->contr, ob->weight + ob->carrying);
885		880
886	treasurelist *tl = find_treasurelist ("starting_wealth");	881	treasurelist *tl = treasurelist::find ("starting_wealth");
887	if (tl)	882	if (tl)
888	create_treasure (tl, op, 0, 0, 0);	883	create_treasure (tl, ob, 0, 0, 0);
889		884
890	INVOKE_PLAYER (BIRTH, op->contr);	885	INVOKE_PLAYER (BIRTH, ob->contr);
891	INVOKE_PLAYER (LOGIN, op->contr);	886	INVOKE_PLAYER (LOGIN, ob->contr);
892		887
893	op->contr->ns->state = ST_PLAYING;	888	ob->contr->ns->state = ST_PLAYING;
894		889
895	if (op->msg)	890	if (ob->msg)
896	op->msg = NULL;	891	ob->msg = 0;
897		892
898	/* We create this now because some of the unique maps will need it	893	/* We create this now because some of the unique maps will need it
899	* to save here.	894	* to save here.
900	*/	895	*/
		896	{
		897	char buf[MAX_BUF];
901	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	898	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
902	make_path_to_file (buf);	899	make_path_to_file (buf);
		900	}
903		901
904	#ifdef AUTOSAVE
905	op->contr->last_save_tick = pticks;
906	#endif
907	start_info (op);	902	start_info (ob);
908	CLEAR_FLAG (op, FLAG_WIZ);	903	CLEAR_FLAG (ob, FLAG_WIZ);
909	give_initial_items (op, op->randomitems);	904	give_initial_items (ob, ob->randomitems);
910	link_player_skills (op);	905	link_player_skills (ob);
911	esrv_send_inventory (op, op);	906	esrv_send_inventory (ob, ob);
912	op->update_stats ();	907	ob->update_stats ();
913		908
914	/* This moves the player to a different start map, if there	909	/* This moves the player to a different start map, if there
915	* is one for this race	910	* is one for this race
916	*/	911	*/
917	if (*first_map_ext_path)	912	if (*first_map_ext_path)
918	{	913	{
919	object *tmp;	914	object *tmp;
920	char mapname[MAX_BUF];	915	char mapname[MAX_BUF];
921		916
922	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	917	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
923	tmp = object::create ();	918	tmp = object::create ();
924	EXIT_PATH (tmp) = mapname;	919	EXIT_PATH (tmp) = mapname;
925	EXIT_X (tmp) = op->x;	920	EXIT_X (tmp) = ob->x;
926	EXIT_Y (tmp) = op->y;	921	EXIT_Y (tmp) = ob->y;
927	op->enter_exit (tmp); /* we don't really care if it succeeded;	922	ob->enter_exit (tmp); /* we don't really care if it succeeded;
928	* if the map isn't there, then stay on the	923	* if the map isn't there, then stay on the
929	* default initial map */	924	* default initial map */
930	tmp->destroy ();	925	tmp->destroy ();
931	}	926	}
932	else	927	else
933	LOG (llevDebug, "first_map_ext_path not set\n");	928	LOG (llevDebug, "first_map_ext_path not set\n");
		929	}
934		930
935	return 0;	931	void
936	}	932	player::chargen_race_next ()
937		933	{
938	/* Following actually changes the race - this is the default command	934	/* Following actually changes the race - this is the default command
939	* if we don't match with one of the options above.	935	* if we don't match with one of the options above.
940	*/	936	*/
941		937
942	tmp_loop = 0;	938	do
943	while (!tmp_loop)
944	{	939	{
945	shstr name = op->name;	940	shstr name = ob->name;
946	int x = op->x, y = op->y;	941	int x = ob->x, y = ob->y;
947		942
948	op->remove_statbonus ();	943	ob->remove_statbonus ();
949	op->remove ();	944	ob->remove ();
950	op->arch = get_player_archetype (op->arch);	945	ob->arch = get_player_archetype (ob->arch);
951	op->arch->clone.copy_to (op);	946	ob->arch->copy_to (ob);
952	op->instantiate ();	947	ob->instantiate ();
953	op->stats = op->contr->orig_stats;	948	ob->stats = ob->contr->orig_stats;
954	op->name = op->name_pl = name;	949	ob->name = ob->name_pl = name;
955	op->x = x;	950	ob->x = x;
956	op->y = y;	951	ob->y = y;
957	SET_ANIMATION (op, 2); /* So player faces south */	952	SET_ANIMATION (ob, 2); /* So player faces south */
958	insert_ob_in_map (op, op->map, op, 0);	953	insert_ob_in_map (ob, ob->map, ob, 0);
959	assign (op->contr->title, op->arch->clone.name);	954	assign (ob->contr->title, ob->arch->object::name);
960	op->add_statbonus ();	955	ob->add_statbonus ();
961	tmp_loop = allowed_class (op);
962	}	956	}
		957	while (!allowed_class (ob));
963		958
964	update_object (op, UP_OBJ_FACE);	959	update_object (ob, UP_OBJ_FACE);
965	esrv_update_item (UPD_FACE, op, op);	960	esrv_update_item (UPD_FACE, ob, ob);
966	op->update_stats ();	961	ob->update_stats ();
967	op->stats.hp = op->stats.maxhp;	962	ob->stats.hp = ob->stats.maxhp;
968	op->stats.sp = op->stats.maxsp;	963	ob->stats.sp = ob->stats.maxsp;
969	op->stats.grace = 0;	964	ob->stats.grace = 0;
970
971	if (op->msg)
972	new_draw_info (NDI_BLUE, 0, op, op->msg);
973
974	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
975	return 0;
976	}	965	}
977		966
978	void	967	void
979	flee_player (object *op)	968	flee_player (object *op)
980	{	969	{
…		…
1027	/* Cornered, get rid of scared */	1016	/* Cornered, get rid of scared */
1028	CLEAR_FLAG (op, FLAG_SCARED);	1017	CLEAR_FLAG (op, FLAG_SCARED);
1029	op->enemy = NULL;	1018	op->enemy = NULL;
1030	}	1019	}
1031		1020
1032
1033	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1021	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1034	* IT returns 1 if the player should keep on moving, 0 if he should	1022	* It returns 1 if the player should keep on moving, 0 if he should
1035	* stop.	1023	* stop.
1036	*/	1024	*/
1037	int	1025	int
1038	check_pick (object *op)	1026	check_pick (object *op)
1039	{	1027	{
1040	object *tmp, *next;	1028	object *tmp, *next;
1041	int stop = 0;	1029	int stop = 0;
1042	int j, k, wvratio;	1030	int wvratio;
1043	char putstring[128], tmpstr[16];	1031	char putstring[128];
1044		1032
1045	/* if you're flying, you cna't pick up anything */	1033	/* if you're flying, you cna't pick up anything */
1046	if (op->move_type & MOVE_FLYING)	1034	if (op->move_type & MOVE_FLYING)
1047	return 1;	1035	return 1;
1048		1036
…		…
1116	if (tmp->name != NULL)	1104	if (tmp->name != NULL)
1117	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1105	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1118	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1106	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1119	else	1107	else
1120	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1108	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1121	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1109	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1122		1110
1123	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1111	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1124	}	1112	}
1125		1113
1126	/* philosophy:	1114	/* philosophy:
…		…
1319	/* careful: chairs and tables are weapons! */	1307	/* careful: chairs and tables are weapons! */
1320	if (op->contr->mode & PU_ALLWEAPON)	1308	if (op->contr->mode & PU_ALLWEAPON)
1321	{	1309	{
1322	if (tmp->type == WEAPON && tmp->name != NULL)	1310	if (tmp->type == WEAPON && tmp->name != NULL)
1323	{	1311	{
1324	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1312	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1325	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1313	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1326	{	1314	{
1327	pick_up (op, tmp);	1315	pick_up (op, tmp);
1328	continue;	1316	continue;
1329	}	1317	}
1330	}	1318	}
1331		1319
1332	if (tmp->type == WEAPON && tmp->name == NULL)	1320	if (tmp->type == WEAPON && tmp->name == NULL)
1333	{	1321	{
1334	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1322	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1335	{	1323	{
1336	pick_up (op, tmp);	1324	pick_up (op, tmp);
1337	continue;	1325	continue;
1338	}	1326	}
1339	}	1327	}
…		…
1364	if (tmp->name != NULL)	1352	if (tmp->name != NULL)
1365	{	1353	{
1366	fprintf (stderr, "%s", tmp->name);	1354	fprintf (stderr, "%s", tmp->name);
1367	}	1355	}
1368	else	1356	else
1369	fprintf (stderr, "%s", tmp->arch->name);	1357	fprintf (stderr, "%s", tmp->arch->archname);
1370	fprintf (stderr, ",%d] = ", tmp->type);	1358	fprintf (stderr, ",%d] = ", tmp->type);
1371	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1359	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1372	#endif	1360	#endif
1373	continue;	1361	continue;
1374	}	1362	}
…		…
1385	* found object is returned.	1373	* found object is returned.
1386	*/	1374	*/
1387	object *	1375	object *
1388	find_arrow (object *op, const char *type)	1376	find_arrow (object *op, const char *type)
1389	{	1377	{
1390	object *tmp = NULL;	1378	object *tmp = 0;
1391		1379
1392	for (op = op->inv; op; op = op->below)	1380	for (op = op->inv; op; op = op->below)
1393	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1381	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1394	tmp = find_arrow (op, type);	1382	tmp = find_arrow (op, type);
1395	else if (op->type == ARROW && op->race == type)	1383	else if (op->type == ARROW && op->race == type)
1396	return op;	1384	return op;
		1385
1397	return tmp;	1386	return tmp;
1398	}	1387	}
1399		1388
1400	/*	1389	/*
1401	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1390	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1402	* against the target. A full test is not performed, simply a basic test	1391	* against the target. A full test is not performed, simply a basic test
1403	* of resistances. The archer is making a quick guess at what he sees down	1392	* of resistances. The archer is making a quick guess at what he sees down
1404	* the hall. Failing that it does it's best to pick the highest plus arrow.	1393	* the hall. Failing that it does it's best to pick the highest plus arrow.
1405	*/	1394	*/
1406
1407	object *	1395	object *
1408	find_better_arrow (object *op, object *target, const char *type, int *better)	1396	find_better_arrow (object *op, object *target, const char *type, int *better)
1409	{	1397	{
1410	object *tmp = NULL, *arrow, *ntmp;	1398	object *tmp = NULL, *arrow, *ntmp;
1411	int attacknum, attacktype, betterby = 0, i;	1399	int attacknum, attacktype, betterby = 0, i;
…		…
1444	else	1432	else
1445	{	1433	{
1446	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1434	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1447	{	1435	{
1448	attacktype = 1 << attacknum;	1436	attacktype = 1 << attacknum;
1449	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1437	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1450	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1438	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1451	{	1439	{
1452	tmp = arrow;	1440	tmp = arrow;
1453	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1441	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1454	}	1442	}
1455	}	1443	}
1456	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1444	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1457	{	1445	{
1458	tmp = arrow;	1446	tmp = arrow;
…		…
1477	* find_better_arrow to find a decent arrow to use.	1465	* find_better_arrow to find a decent arrow to use.
1478	* op = the shooter	1466	* op = the shooter
1479	* type = bow->race	1467	* type = bow->race
1480	* dir = fire direction	1468	* dir = fire direction
1481	*/	1469	*/
1482
1483	object *	1470	object *
1484	pick_arrow_target (object *op, const char *type, int dir)	1471	pick_arrow_target (object *op, const char *type, int dir)
1485	{	1472	{
1486	object *tmp = NULL;	1473	object *tmp = NULL;
1487	maptile *m;	1474	maptile *m;
…		…
1552	*/	1539	*/
1553	int	1540	int
1554	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1541	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1555	{	1542	{
1556	object *left, *bow;	1543	object *left, *bow;
1557	int bowspeed, mflags;	1544	int mflags;
1558	maptile *m;	1545	maptile *m;
1559		1546
1560	if (!dir)	1547	if (!dir)
1561	{	1548	{
1562	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1549	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1563	return 0;	1550	return 0;
1564	}	1551	}
1565		1552
1566	if (op->type == PLAYER)	1553	if (op->contr)
1567	bow = op->contr->ranges[range_bow];	1554	bow = op->current_weapon;
1568	else	1555	else
1569	{	1556	{
1570	for (bow = op->inv; bow; bow = bow->below)	1557	for (bow = op->inv; bow; bow = bow->below)
1571	/* Don't check for applied - monsters don't apply bows - in that way, they	1558	/* Don't check for applied - monsters don't apply bows - in that way, they
1572	* don't need to switch back and forth between bows and weapons.	1559	* don't need to switch back and forth between bows and weapons.
…		…
1577	if (!bow)	1564	if (!bow)
1578	{	1565	{
1579	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1566	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1580	return 0;	1567	return 0;
1581	}	1568	}
		1569
		1570	// optimisation: move object to top so we will find it quickly again
		1571	if (bow->below)
		1572	{
		1573	bow->remove ();
		1574	op->insert (bow);
		1575	}
		1576
1582	}	1577	}
1583		1578
1584	if (!bow->race || !bow->skill)	1579	if (!bow->race || !bow->skill)
1585	{	1580	{
1586	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1581	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1587	return 0;	1582	return 0;
1588	}	1583	}
1589
1590	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1591
1592	/* penalize ROF for bestarrow */
1593	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1594	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1595
1596	if (bowspeed < 1)
1597	bowspeed = 1;
1598		1584
1599	if (arrow == NULL)	1585	if (arrow == NULL)
1600	{	1586	{
1601	if ((arrow = find_arrow (op, bow->race)) == NULL)	1587	if ((arrow = find_arrow (op, bow->race)) == NULL)
1602	{	1588	{
1603	if (op->type == PLAYER)	1589	if (op->type == PLAYER)
1604	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1605	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1591	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1606	else	1592	else
1607	CLEAR_FLAG (op, FLAG_READY_BOW);	1593	CLEAR_FLAG (op, FLAG_READY_BOW);
		1594
1608	return 0;	1595	return 0;
1609	}	1596	}
1610	}	1597	}
1611		1598
1612	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1599	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1636		1623
1637	arrow->set_owner (op);	1624	arrow->set_owner (op);
1638	arrow->skill = bow->skill;	1625	arrow->skill = bow->skill;
1639	arrow->direction = dir;	1626	arrow->direction = dir;
1640		1627
		1628	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1629	arrow->stats.hp = arrow->stats.dam;
		1630	arrow->stats.grace = arrow->attacktype;
		1631
		1632	if (arrow->slaying)
		1633	arrow->spellarg = strdup (arrow->slaying);
		1634
		1635	#if 0
		1636	if (player *pl = op->contr)
		1637	{
		1638	float speed = pl->weapon_sp;
		1639
		1640	/* penalize ROF for bestarrow */
		1641	if (pl->bowtype == bow_bestarrow)
		1642	speed *= .9f;
		1643	else
		1644	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1645
		1646	op->speed_left += speed - op->speed;
		1647	}
		1648	#endif
		1649
		1650	SET_ANIMATION (arrow, arrow->direction);
		1651
		1652	/* update the speed */
		1653	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1654	+ bow->stats.dam / 7.f;
		1655
		1656	arrow->set_speed (max (arrow->speed, 2.f));
		1657	arrow->speed_left = 0;
		1658
		1659	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1660
1641	if (op->type == PLAYER)	1661	if (op->type == PLAYER)
1642	{	1662	{
1643	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1644	op->update_stats ();
1645	}
1646
1647	SET_ANIMATION (arrow, arrow->direction);
1648	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1649	arrow->stats.hp = arrow->stats.dam;
1650	arrow->stats.grace = arrow->attacktype;
1651	if (arrow->slaying != NULL)
1652	arrow->spellarg = strdup (arrow->slaying);
1653
1654	/* Note that this was different for monsters - they got their level
1655	* added to the damage. I think the strength bonus is more proper.
1656	*/
1657
1658	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1659
1660	/* update the speed */
1661	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1662	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1663
1664	arrow->set_speed (max (arrow->speed, 1.0));
1665	arrow->speed_left = 0;
1666
1667	if (op->type == PLAYER)
1668	{
1669	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1670	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1671	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1672
1673	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1663	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1664	wc -= dex_bonus[op->stats.Dex];
		1665
		1666	if (!arrow->slaying)
		1667	arrow->slaying = op->slaying;
		1668
		1669	arrow->attacktype |= op->attacktype;
1674	}	1670	}
1675	else	1671	else
1676	{	1672	{
1677	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1678	arrow->level = op->level;	1673	arrow->level = op->level;
1679	}	1674	arrow->stats.wc -= bow->magic;
1680		1675
1681	if (arrow->attacktype == AT_PHYSICAL)	1676	if (!arrow->slaying)
		1677	arrow->slaying = bow->slaying;
		1678
1682	arrow->attacktype |= bow->attacktype;	1679	arrow->attacktype |= bow->attacktype;
		1680	}
1683		1681
1684	if (bow->slaying)	1682	wc -= arrow->level;
1685	arrow->slaying = bow->slaying;	1683	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1686		1684
		1685	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1686	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1687	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689		1688
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1689	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1691	m->insert (arrow, sx, sy, op);	1690	m->insert (arrow, sx, sy, op);
…		…
1716	{	1715	{
1717	int ret = 0, wcmod = 0;	1716	int ret = 0, wcmod = 0;
1718		1717
1719	if (op->contr->bowtype == bow_bestarrow)	1718	if (op->contr->bowtype == bow_bestarrow)
1720	{	1719	{
1721	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1720	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1722	}	1721	}
1723	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1722	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1724	{	1723	{
1725	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1724	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1726	wcmod = -1;	1725	wcmod = -1;
…		…
1736	else if (op->contr->bowtype == bow_spreadshot)	1735	else if (op->contr->bowtype == bow_spreadshot)
1737	{	1736	{
1738	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1737	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1739	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1738	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1740	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1739	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1741
1742	}	1740	}
1743	else	1741	else
1744	{	1742	{
1745	/* Simple case */	1743	/* Simple case */
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1744	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747	}	1745	}
		1746
1748	return ret;	1747	return ret;
1749	}	1748	}
1750
1751		1749
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1750	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1751	* Broken apart from 'fire' to keep it more readable.
1754	*/	1752	*/
1755	void	1753	void
1756	fire_misc_object (object *op, int dir)	1754	fire_misc_object (object *op, int dir)
1757	{	1755	{
1758	object *item;	1756	object *item = op->contr->ranged_ob;
1759		1757
1760	if (!op->contr->ranges[range_misc])	1758	if (!item)
1761	{	1759	{
1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1760	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1763	return;	1761	return;
1764	}	1762	}
1765		1763
1766	item = op->contr->ranges[range_misc];
1767	if (!item->inv)	1764	if (!item->inv)
1768	{	1765	{
1769	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1766	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1770	return;	1767	return;
1771	}	1768	}
		1769
		1770	if (!op->change_weapon (item))
		1771	return;
		1772
1772	if (item->type == WAND)	1773	if (item->type == WAND)
1773	{	1774	{
1774	if (item->stats.food <= 0)	1775	if (item->stats.food <= 0)
1775	{	1776	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1777	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1778	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1779
1778	return;	1780	return;
1779	}	1781	}
1780	}	1782	}
1781	else if (item->type == ROD || item->type == HORN)	1783	else if (item->type == ROD || item->type == HORN)
1782	{	1784	{
1783	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1785	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1784	{	1786	{
1785	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1787	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1788
1786	if (item->type == ROD)	1789	if (item->type == ROD)
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1790	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1788	else	1791	else
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1793
1790	return;	1794	return;
1791	}	1795	}
1792	}	1796	}
1793		1797
1794	if (cast_spell (op, item, dir, item->inv, NULL))	1798	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1801	object *tmp;	1805	object *tmp;
1802		1806
1803	if (item->arch)	1807	if (item->arch)
1804	{	1808	{
1805	CLEAR_FLAG (item, FLAG_ANIMATE);	1809	CLEAR_FLAG (item, FLAG_ANIMATE);
1806	item->face = item->arch->clone.face;	1810	item->face = item->arch->face;
1807	item->set_speed (0);	1811	item->set_speed (0);
1808	}	1812	}
1809		1813
1810	if ((tmp = item->in_player ()))	1814	if ((tmp = item->in_player ()))
1811	esrv_update_item (UPD_ANIM, tmp, item);	1815	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1816	}	1820	}
1817	}	1821	}
1818		1822
1819	/* Received a fire command for the player - go and do it.	1823	/* Received a fire command for the player - go and do it.
1820	*/	1824	*/
1821	void	1825	bool
1822	fire (object *op, int dir)	1826	fire (object *op, int dir)
1823	{	1827	{
1824	int spellcost = 0;	1828	int spellcost = 0;
1825		1829
1826	/* check for loss of invisiblity/hide */	1830	/* check for loss of invisiblity/hide */
1827	if (action_makes_visible (op))	1831	if (action_makes_visible (op))
1828	make_visible (op);	1832	make_visible (op);
1829		1833
1830	switch (op->contr->shoottype)	1834	player *pl = op->contr;
		1835
		1836	if (pl->golem)
		1837	{
		1838	control_golem (op->contr->golem, dir);
		1839	return false;
1831	{	1840	}
1832	case range_none:
1833	return;
1834		1841
1835	case range_bow:	1842	object *ob = pl->ranged_ob;
		1843
		1844	if (!ob)
		1845	return false;
		1846
		1847	if (!op->change_weapon (ob))
		1848	return false;
		1849
		1850	if (op->speed_left > 0.f)
		1851	--op->speed_left;
		1852	else
		1853	return false;
		1854
		1855	switch (ob->type)
		1856	{
		1857	case BOW:
1836	player_fire_bow (op, dir);	1858	player_fire_bow (op, dir);
1837	return;	1859	break;
1838		1860
1839	case range_magic: /* Casting spells */	1861	case SPELL:
1840	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1862	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1841	return;	1863	break;
1842		1864
1843	case range_misc:	1865	case BUILDER:
		1866	apply_map_builder (op, dir);
		1867	break;
		1868
		1869	case SKILL:
		1870	do_skill (op, op, ob, dir, 0);
		1871	break;
		1872
		1873	default:
1844	fire_misc_object (op, dir);	1874	fire_misc_object (op, dir);
1845	return;	1875	break;
1846
1847	case range_golem: /* Control summoned monsters from scrolls */
1848	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1849	{
1850	op->contr->ranges[range_golem] = 0;
1851	op->contr->shoottype = range_none;
1852	}
1853	else
1854	control_golem (op->contr->ranges[range_golem], dir);
1855	return;
1856
1857	case range_skill:
1858	if (!op->chosen_skill)
1859	{
1860	if (op->type == PLAYER)
1861	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1862	return;
1863	}
1864	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1865	return;
1866	case range_builder:
1867	apply_map_builder (op, dir);
1868	return;
1869	default:
1870	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1871	return;
1872	}	1876	}
1873	}
1874		1877
1875		1878	return true;
		1879	}
1876		1880
1877	/* find_key	1881	/* find_key
1878	* We try to find a key for the door as passed. If we find a key	1882	* We try to find a key for the door as passed. If we find a key
1879	* and successfully use it, we return the key, otherwise NULL	1883	* and successfully use it, we return the key, otherwise NULL
1880	* This function merges both normal and locked door, since the logic	1884	* This function merges both normal and locked door, since the logic
…		…
1882	* pl is the player,	1886	* pl is the player,
1883	* inv is the objects inventory to searched	1887	* inv is the objects inventory to searched
1884	* door is the door we are trying to match against.	1888	* door is the door we are trying to match against.
1885	* This function can be called recursively to search containers.	1889	* This function can be called recursively to search containers.
1886	*/	1890	*/
1887
1888	object *	1891	object *
1889	find_key (object *pl, object *container, object *door)	1892	find_key (object *pl, object *container, object *door)
1890	{	1893	{
1891	object *tmp, *key;	1894	object *tmp, *key;
1892		1895
1893	/* Should not happen, but sanity checking is never bad */	1896	/* Should not happen, but sanity checking is never bad */
1894	if (container->inv == NULL)	1897	if (!container->inv)
1895	return NULL;	1898	return 0;
1896		1899
1897	/* First, lets try to find a key in the top level inventory */	1900	/* First, lets try to find a key in the top level inventory */
1898	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1901	for (tmp = container->inv; tmp; tmp = tmp->below)
1899	{	1902	{
1900	if (door->type == DOOR && tmp->type == KEY)	1903	if (door->type == DOOR && tmp->type == KEY)
1901	break;	1904	break;
1902	/* For sanity, we should really check door type, but other stuff	1905	/* For sanity, we should really check door type, but other stuff
1903	* (like containers) can be locked with special keys	1906	* (like containers) can be locked with special keys
1904	*/	1907	*/
1905	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1908	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1906	break;	1909	break;
1907	}	1910	}
		1911
1908	/* No key found - lets search inventories now */	1912	/* No key found - lets search inventories now */
1909	/* If we find and use a key in an inventory, return at that time.	1913	/* If we find and use a key in an inventory, return at that time.
1910	* otherwise, if we search all the inventories and still don't find	1914	* otherwise, if we search all the inventories and still don't find
1911	* a key, return	1915	* a key, return
1912	*/	1916	*/
1913	if (!tmp)	1917	if (!tmp)
1914	{	1918	{
1915	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1919	for (tmp = container->inv; tmp; tmp = tmp->below)
1916	{	1920	{
1917	/* No reason to search empty containers */	1921	/* No reason to search empty containers */
1918	if (tmp->type == CONTAINER && tmp->inv)	1922	if (tmp->type == CONTAINER && tmp->inv)
1919	{	1923	{
1920	if ((key = find_key (pl, tmp, door)) != NULL)	1924	if ((key = find_key (pl, tmp, door)))
1921	return key;	1925	return key;
1922	}	1926	}
1923	}	1927	}
		1928
1924	if (!tmp)	1929	if (!tmp)
1925	return NULL;	1930	return NULL;
1926	}	1931	}
		1932
1927	/* We get down here if we have found a key. Now if its in a container,	1933	/* We get down here if we have found a key. Now if its in a container,
1928	* see if we actually want to use it	1934	* see if we actually want to use it
1929	*/	1935	*/
1930	if (pl != container)	1936	if (pl != container)
1931	{	1937	{
…		…
1952	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1958	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1953	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1959	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1954	return NULL;	1960	return NULL;
1955	}	1961	}
1956	}	1962	}
		1963
1957	return tmp;	1964	return tmp;
1958	}	1965	}
1959		1966
1960	/* moved door processing out of move_player_attack.	1967	/* moved door processing out of move_player_attack.
1961	* returns 1 if player has opened the door with a key	1968	* returns 1 if player has opened the door with a key
…		…
1963	* 0 otherwise	1970	* 0 otherwise
1964	*/	1971	*/
1965	static int	1972	static int
1966	player_attack_door (object *op, object *door)	1973	player_attack_door (object *op, object *door)
1967	{	1974	{
1968	/* If its a door, try to find a use a key. If we do destroy the door,	1975	/* If its a door, try to find a key. If we do destroy the door,
1969	* might as well return immediately as there is nothing more to do -	1976	* might as well return immediately as there is nothing more to do -
1970	* otherwise, we fall through to the rest of the code.	1977	* otherwise, we fall through to the rest of the code.
1971	*/	1978	*/
1972	object *key = find_key (op, op, door);	1979	object *key = find_key (op, op, door);
1973		1980
1974	/* IF we found a key, do some extra work */	1981	/* If we found a key, do some extra work */
1975	if (key)	1982	if (key)
1976	{	1983	{
1977	object *container = key->env;	1984	object *container = key->env;
1978		1985
1979	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1987
1980	if (action_makes_visible (op))	1988	if (action_makes_visible (op))
1981	make_visible (op);	1989	make_visible (op);
		1990
1982	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1991	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1983	spring_trap (door->inv, op);	1992	spring_trap (door->inv, op);
		1993
1984	if (door->type == DOOR)	1994	if (door->type == DOOR)
1985	{
1986	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1995	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1987	}
1988	else if (door->type == LOCKED_DOOR)	1996	else if (door->type == LOCKED_DOOR)
1989	{	1997	{
1990	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1998	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1991	remove_door2 (door); /* remove door without violence ;-) */	1999	remove_door2 (door); /* remove door without violence ;-) */
1992	}	2000	}
		2001
1993	/* Do this after we print the message */	2002	/* Do this after we print the message */
1994	decrease_ob (key); /* Use up one of the keys */	2003	decrease_ob (key); /* Use up one of the keys */
1995	/* Need to update the weight the container the key was in */	2004	/* Need to update the weight the container the key was in */
1996	if (container != op)	2005	if (container != op)
1997	esrv_update_item (UPD_WEIGHT, op, container);	2006	esrv_update_item (UPD_WEIGHT, op, container);
		2007
1998	return 1; /* Nothing more to do below */	2008	return 1; /* Nothing more to do below */
1999	}	2009	}
2000	else if (door->type == LOCKED_DOOR)	2010	else if (door->type == LOCKED_DOOR)
2001	{	2011	{
2002	/* Might as well return now - no other way to open this */	2012	/* Might as well return now - no other way to open this */
2003	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2013	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2004	return 1;	2014	return 1;
2005	}	2015	}
		2016
2006	return 0;	2017	return 0;
2007	}	2018	}
2008		2019
2009	/* This function is just part of a breakup from move_player.	2020	/* This function is just part of a breakup from move_player.
2010	* It should keep the code cleaner.	2021	* It should keep the code cleaner.
2011	* When this is called, the players direction has been updated	2022	* When this is called, the players direction has been updated
2012	* (taking into account confusion.) The player is also actually	2023	* (taking into account confusion.) The player is also actually
2013	* going to try and move (not fire weapons).	2024	* going to try and move (not fire weapons).
2014	*/	2025	*/
2015	void	2026	bool
2016	move_player_attack (object *op, int dir)	2027	move_player_attack (object *op, int dir)
2017	{	2028	{
2018	object *tmp, *mon;
2019	sint16 nx, ny;
2020	int on_battleground;	2029	int on_battleground;
2021	maptile *m;
2022		2030
2023	nx = freearr_x[dir] + op->x;	2031	sint16 nx = freearr_x[dir] + op->x;
2024	ny = freearr_y[dir] + op->y;	2032	sint16 ny = freearr_y[dir] + op->y;
2025		2033
2026	on_battleground = op_on_battleground (op, 0, 0);	2034	on_battleground = op_on_battleground (op, 0, 0);
		2035
		2036	if (out_of_map (op->map, nx, ny))
		2037	return false;
		2038
		2039	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2040	{
		2041	--op->speed_left;
		2042	return true;
		2043	}
2027		2044
2028	/* If braced, or can't move to the square, and it is not out of the	2045	/* If braced, or can't move to the square, and it is not out of the
2029	* map, attack it. Note order of if statement is important - don't	2046	* map, attack it. Note order of if statement is important - don't
2030	* want to be calling move_ob if braced, because move_ob will move the	2047	* want to be calling move_ob if braced, because move_ob will move the
2031	* player. This is a pretty nasty hack, because if we could	2048	* player. This is a pretty nasty hack, because if we could
2032	* move to some space, it then means that if we are braced, we should	2049	* move to some space, it then means that if we are braced, we should
2033	* do nothing at all. As it is, if we are braced, we go through	2050	* do nothing at all. As it is, if we are braced, we go through
2034	* quite a bit of processing. However, it probably is less than what	2051	* quite a bit of processing. However, it probably is less than what
2035	* move_ob uses.	2052	* move_ob uses.
2036	*/	2053	*/
2037	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2038	{
2039	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2040	{
2041	m = op->map->xy_find (nx, ny);	2054	maptile *m = op->map->xy_find (nx, ny);
2042	if (!m)
2043	return; /* Don't think this should happen */
2044	}
2045	else
2046	m = op->map;
2047		2055
2048	if (!(tmp = m->at (nx, ny).bot))
2049	return;
2050
2051	mon = 0;
2052	/* Go through all the objects, and find ones of interest. Only stop if	2056	/* Go through all the objects, and find ones of interest. Only stop if
2053	* we find a monster - that is something we know we want to attack.	2057	* we find a monster - that is something we know we want to attack.
2054	* if its a door or barrel (can roll) see if there may be monsters	2058	* if its a door or barrel (can roll) see if there may be monsters
2055	* on the space	2059	* on the space
2056	*/	2060	*/
2057	while (tmp)	2061	object *mon;
2058	{	2062	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2059	if (tmp == op)	2063	{
2060	{	2064	if ((mon->flag [FLAG_ALIVE]
2061	tmp = tmp->above;	2065	|| mon->type == LOCKED_DOOR
2062	continue;	2066	|| mon->flag [FLAG_CAN_ROLL])
2063	}
2064
2065	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2066	{
2067	mon = tmp;	2067	&& mon != op)
2068	break;	2068	break;
2069	}	2069	}
2070		2070
2071	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2072	mon = tmp;
2073
2074	tmp = tmp->above;
2075	}
2076
2077	if (!mon) /* This happens anytime the player tries to move */	2071	if (!mon) /* This happens anytime the player tries to move */
2078	return; /* into a wall */	2072	return false; /* into a wall */
2079		2073
2080	if (mon->head)
2081	mon = mon->head;	2074	mon = mon->head_ ();
2082		2075
2083	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2076	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2077	if (op->contr->weapon_sp_left > 0.f)
2084	if (player_attack_door (op, mon))	2078	if (player_attack_door (op, mon))
		2079	{
		2080	--op->contr->weapon_sp_left;
2085	return;	2081	return true;
		2082	}
2086		2083
2087	/* The following deals with possibly attacking peaceful	2084	/* The following deals with possibly attacking peaceful
2088	* or frienddly creatures. Basically, all players are considered	2085	* or friendly creatures. Basically, all players are considered
2089	* unaggressive. If the moving player has peaceful set, then the	2086	* unaggressive. If the moving player has peaceful set, then the
2090	* object should be pushed instead of attacked. It is assumed that	2087	* object should be pushed instead of attacked. It is assumed that
2091	* if you are braced, you will not attack friends accidently,	2088	* if you are braced, you will not attack friends accidently,
2092	* and thus will not push them.	2089	* and thus will not push them.
2093	*/	2090	*/
2094		2091
2095	/* If the creature is a pet, push it even if the player is not	2092	/* If the creature is a pet, push it even if the player is not
2096	* peaceful. Our assumption is the creature is a pet if the	2093	* peaceful. Our assumption is the creature is a pet if the
2097	* player owns it and it is either friendly or unagressive.	2094	* player owns it and it is either friendly or unagressive.
2098	*/	2095	*/
2099	if ((op->type == PLAYER)	2096	if (op->type == PLAYER
2100	#if COZY_SERVER
2101	&&
2102	((mon->owner && mon->owner->contr	2097	&& ((mon->owner && mon->owner->contr
2103	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2098	&& same_party (mon->owner->contr->party, op->contr->party))
2104	#else
2105	&& mon->owner == op	2099	|| mon->owner == op)
2106	#endif
2107	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2100	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108	{	2101	{
2109	/* If we're braced, we don't want to switch places with it */	2102	/* If we're braced, we don't want to switch places with it */
2110	if (op->contr->braced)	2103	if (op->contr->braced)
2111	return;	2104	return false;
		2105
		2106	if (op->speed_left > 0.f)
		2107	{
		2108	--op->speed_left;
2112		2109
2113	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2114	(void) push_ob (mon, dir, op);	2111	push_ob (mon, dir, op);
		2112
2115	if (op->contr->tmp_invis || op->hide)	2113	if (op->contr->tmp_invis || op->hide)
2116	make_visible (op);	2114	make_visible (op);
2117		2115
2118	return;	2116	return true;
2119	}	2117	}
		2118	else
		2119	return false;
		2120	}
2120		2121
2121	/* in certain circumstances, you shouldn't attack friendly	2122	/* in certain circumstances, you shouldn't attack friendly
2122	* creatures. Note that if you are braced, you can't push	2123	* creatures. Note that if you are braced, you can't push
2123	* someone, but put it inside this loop so that you won't	2124	* someone, but put it inside this loop so that you won't
2124	* attack them either.	2125	* attack them either.
2125	*/	2126	*/
2126	if ((mon->type == PLAYER || mon->enemy != op) &&	2127	if ((mon->type == PLAYER || mon->enemy != op)
2127	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2128	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2128	#ifdef PROHIBIT_PLAYERKILL
2129	(op->contr->peaceful	2129	&& ((op->contr->peaceful
2130	|| (mon->type == PLAYER	2130	|| (mon->type == PLAYER && mon->contr->peaceful))
2131	&& mon->contr->
2132	peaceful)) &&
2133	#else
2134	op->contr->peaceful &&
2135	#endif
2136	!on_battleground))	2131	&& !on_battleground))
		2132	{
		2133	if (op->speed_left > 0.f)
2137	{	2134	{
		2135	--op->speed_left;
		2136
2138	if (!op->contr->braced)	2137	if (!op->contr->braced)
2139	{	2138	{
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2139	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141	push_ob (mon, dir, op);	2140	push_ob (mon, dir, op);
2142	}	2141	}
2143	else	2142	else
2144	new_draw_info (0, 0, op, "You withhold your attack");	2143	new_draw_info (0, 0, op, "You withhold your attack");
2145		2144
2146	if (op->contr->tmp_invis || op->hide)	2145	if (op->contr->tmp_invis || op->hide)
2147	make_visible (op);	2146	make_visible (op);
2148	}
2149		2147
		2148	return true;
		2149	}
		2150	}
2150	/* If the object is a boulder or other rollable object, then	2151	/* If the object is a boulder or other rollable object, then
2151	* roll it if not braced. You can't roll it if you are braced.	2152	* roll it if not braced. You can't roll it if you are braced.
2152	*/	2153	*/
2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2154	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2155	{
		2156	if (op->speed_left > 0.f)
2154	{	2157	{
		2158	--op->speed_left;
		2159
2155	recursive_roll (mon, dir, op);	2160	recursive_roll (mon, dir, op);
2156	if (action_makes_visible (op))	2161	if (action_makes_visible (op))
2157	make_visible (op);	2162	make_visible (op);
2158	}
2159		2163
		2164	return true;
		2165	}
		2166	}
2160	/* Any generic living creature. Including things like doors.	2167	/* Any generic living creature. Including things like doors.
2161	* Way it works is like this: First, it must have some hit points	2168	* Way it works is like this: First, it must have some hit points
2162	* and be living. Then, it must be one of the following:	2169	* and be living. Then, it must be one of the following:
2163	* 1) Not a player, 2) A player, but of a different party. Note	2170	* 1) Not a player, 2) A player, but of a different party. Note
2164	* that party_number -1 is no party, so attacks can still happen.	2171	* that party_number -1 is no party, so attacks can still happen.
2165	*/	2172	*/
2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2173	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2174	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2168	{	2175	{
2169		2176	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2170	/* If the player hasn't hit something this tick, and does
2171	* so, give them speed boost based on weapon speed. Doing
2172	* it here is better than process_players2, which basically
2173	* incurred a 1 tick offset.
2174	*/
2175	if (!op->contr->has_hit)
2176	{	2177	{
2177	op->speed_left += op->speed / op->contr->weapon_sp;	2178	--op->contr->weapon_sp_left;
2178
2179	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180	}
2181		2179
2182	skill_attack (mon, op, 0, 0, 0);	2180	skill_attack (mon, op, 0, 0, 0);
2183
2184	/* If attacking another player, that player gets automatic
2185	* hitback, and doesn't loose luck either.
2186	* Disable hitback on the battleground or if the target is
2187	* the wiz.
2188	*/
2189	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2190	{
2191	short luck = mon->stats.luck;
2192
2193	mon->contr->has_hit = 1;
2194	skill_attack (op, mon, 0, 0, 0);
2195	mon->stats.luck = luck;
2196	}
2197		2181
2198	if (action_makes_visible (op))	2182	if (action_makes_visible (op))
2199	make_visible (op);	2183	make_visible (op);
2200	}
2201	} /* if player should attack something */
2202	}
2203		2184
2204	int	2185	return true;
		2186	}
		2187	}
		2188
		2189	return false;
		2190	}
		2191
		2192	bool
2205	move_player (object *op, int dir)	2193	move_player (object *op, int dir)
2206	{	2194	{
2207	int pick;	2195	int pick;
2208		2196
2209	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2197	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2216	return 0;	2204	return 0;
2217	}	2205	}
2218		2206
2219	/* peterm: added following line */	2207	/* peterm: added following line */
2220	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2208	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2221	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2209	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2222		2210
2223	op->facing = dir;	2211	op->facing = dir;
2224		2212
2225	if (op->hide)	2213	if (op->hide)
2226	do_hidden_move (op);	2214	do_hidden_move (op);
2227		2215
		2216	bool retval;
		2217
2228	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2218	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2229	/*nop */ ;	2219	retval = RESULT_INT (0);
2230	else if (op->contr->fire_on)	2220	else if (op->contr->fire_on)
2231	fire (op, dir);	2221	retval = fire (op, dir);
2232	else	2222	else
2233	{	2223	{
2234	move_player_attack (op, dir);	2224	retval = move_player_attack (op, dir);
2235	pick = check_pick (op);	2225	pick = check_pick (op);
2236	}	2226	}
2237		2227
2238	/* Add special check for newcs players and fire on - this way, the	2228	/* Add special check for newcs players and fire on - this way, the
2239	* server can handle repeat firing.	2229	* server can handle repeat firing.
…		…
2246	/* Update how the player looks. Use the facing, so direction may	2236	/* Update how the player looks. Use the facing, so direction may
2247	* get reset to zero. This allows for full animation capabilities	2237	* get reset to zero. This allows for full animation capabilities
2248	* for players.	2238	* for players.
2249	*/	2239	*/
2250	animate_object (op, op->facing);	2240	animate_object (op, op->facing);
2251	return 0;	2241
		2242	return retval;
2252	}	2243	}
2253		2244
2254	/* This is similar to handle_player, below, but is only used by the	2245	/* This is similar to handle_player, below, but is only used by the
2255	* new client/server stuff.	2246	* new client/server stuff.
2256	* This is sort of special, in that the new client/server actually uses	2247	* This is sort of special, in that the new client/server actually uses
2257	* the new speed values for commands.	2248	* the new speed values for commands.
2258	*	2249	*
2259	* Returns true if there are more actions we can do.	2250	* Returns true if there are more actions we can do. Should not do
		2251	* many actions in a row, as that would be too unfair to other
		2252	* players.
2260	*/	2253	*/
2261	int	2254	bool
2262	handle_newcs_player (object *op)	2255	handle_newcs_player (object *op)
2263	{	2256	{
2264	if (op->contr->hidden)
2265	{
2266	op->invisible = 1000;
2267	/* the socket code flashes the player visible/invisible
2268	* depending on the value of invisible, so we need to
2269	* alternate it here for it to work correctly.
2270	*/
2271	if (pticks & 2)
2272	op->invisible--;
2273	}
2274	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2275	{
2276	op->invisible--;
2277	if (!op->invisible)
2278	{
2279	make_visible (op);
2280	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2281	}
2282	}
2283
2284	if (QUERY_FLAG (op, FLAG_SCARED))	2257	if (QUERY_FLAG (op, FLAG_SCARED))
2285	{	2258	{
2286	flee_player (op);	2259	if (op->speed_left > 0.f)
2287	/* If player is still scared, that is his action for this tick */
2288	if (QUERY_FLAG (op, FLAG_SCARED))
2289	{	2260	{
2290	op->speed_left--;	2261	--op->speed_left;
		2262	flee_player (op);
		2263
2291	return 0;	2264	return true;
2292	}	2265	}
		2266	else
		2267	return false;
2293	}	2268	}
2294
2295	/* I've been seeing crashes where the golem has been destroyed, but
2296	* the player object still points to the defunct golem. The code that
2297	* destroys the golem looks correct, and it doesn't always happen, so
2298	* put this in a a workaround to clean up the golem pointer.
2299	*/
2300	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2301	op->contr->ranges[range_golem] = 0;
2302		2269
2303	/* call this here - we also will call this in do_ericserver, but	2270	/* call this here - we also will call this in do_ericserver, but
2304	* the players time has been increased when doericserver has been	2271	* the players time has been increased when doericserver has been
2305	* called, so we recheck it here.	2272	* called, so we recheck it here.
2306	*/	2273	*/
2307	if (op->contr->ns->handle_command ())	2274	if (op->contr->ns->handle_command ())
2308	return 1;	2275	return true;
2309		2276
2310	if (op->speed_left > 0)
2311	{
2312	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2277	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2313	{
2314	/* All move commands take 1 tick, at least for now */
2315	op->speed_left--;
2316
2317	/* Instead of all the stuff below, let move_player take care
2318	* of it. Also, some of the skill stuff is only put in
2319	* there, as well as the confusion stuff.
2320	*/
2321	move_player (op, op->direction);	2278	return move_player (op, op->direction);
2322		2279
2323	return op->speed_left > 0;
2324	}
2325	}
2326
2327	return 0;	2280	return false;
2328	}	2281	}
2329		2282
2330	int	2283	int
2331	save_life (object *op)	2284	save_life (object *op)
2332	{	2285	{
…		…
2367	* from.	2320	* from.
2368	*/	2321	*/
2369	void	2322	void
2370	remove_unpaid_objects (object *op, object *env)	2323	remove_unpaid_objects (object *op, object *env)
2371	{	2324	{
2372	object *next;
2373
2374	while (op)	2325	while (op)
2375	{	2326	{
2376	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2327	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2377		2328
2378	if (QUERY_FLAG (op, FLAG_UNPAID))	2329	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2444	int rate_grace = 2000;	2395	int rate_grace = 2000;
2445	const int max_hp = 1;	2396	const int max_hp = 1;
2446	const int max_sp = 1;	2397	const int max_sp = 1;
2447	const int max_grace = 1;	2398	const int max_grace = 1;
2448		2399
2449	if (op->contr->outputs_sync)	2400	if (op->contr->hidden)
		2401	{
		2402	op->invisible = 1000;
		2403	/* the socket code flashes the player visible/invisible
		2404	* depending on the value of invisible, so we need to
		2405	* alternate it here for it to work correctly.
		2406	*/
		2407	if (pticks & 2)
		2408	op->invisible--;
2450	{	2409	}
2451	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2410	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2452	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2411	{
2453	flush_output_element (op, &op->contr->outputs[i]);	2412	if (!op->invisible--)
		2413	{
		2414	make_visible (op);
		2415	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2416	}
2454	}	2417	}
2455		2418
2456	if (op->contr->ns->state == ST_PLAYING)	2419	if (op->contr->ns->state == ST_PLAYING)
2457	{	2420	{
2458	/* these next three if clauses make it possible to SLOW DOWN	2421	/* these next three if clauses make it possible to SLOW DOWN
…		…
2480	gen_grace = op->stats.maxgrace;	2443	gen_grace = op->stats.maxgrace;
2481	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2444	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2482	}	2445	}
2483		2446
2484	/* Regenerate Spell Points */	2447	/* Regenerate Spell Points */
2485	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2448	if (!op->contr->golem && --op->last_sp < 0)
2486	{	2449	{
2487	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2450	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2488	if (op->stats.sp < op->stats.maxsp)	2451	if (op->stats.sp < op->stats.maxsp)
2489	{	2452	{
2490	op->stats.sp++;	2453	op->stats.sp++;
…		…
2588	}	2551	}
2589		2552
2590	/* Digestion */	2553	/* Digestion */
2591	if (--op->last_eat < 0)	2554	if (--op->last_eat < 0)
2592	{	2555	{
2593	#ifdef COZY_SERVER
2594	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2595	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2596	#else
2597	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2556	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2598	#endif
2599		2557
2600	if (op->contr->gen_hp > 0)	2558	if (op->contr->gen_hp > 0)
2601	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2559	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2602	else	2560	else
2603	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2708	tmp->name = buf;	2666	tmp->name = buf;
2709	sprintf (buf, " This finger has been cut off %s\n"	2667	sprintf (buf, " This finger has been cut off %s\n"
2710	" the %s, when he was defeated at\n level %d by %s.\n",	2668	" the %s, when he was defeated at\n level %d by %s.\n",
2711	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2669	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2712	tmp->msg = buf;	2670	tmp->msg = buf;
2713	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2671	tmp->value = 0, tmp->type = 0;
2714	tmp->materialname = NULL;	2672	tmp->materialname = "organics";
2715	tmp->insert_at (op, tmp);	2673	tmp->insert_at (op, tmp);
2716	}	2674	}
2717		2675
2718	/* teleport defeated player to new destination */	2676	/* teleport defeated player to new destination */
2719	transfer_ob (op, x, y, 0, NULL);	2677	transfer_ob (op, x, y, 0, NULL);
…		…
2915	op->stats.hp = op->stats.maxhp;	2873	op->stats.hp = op->stats.maxhp;
2916	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2874	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2917	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2875	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2918		2876
2919	/*	2877	/*
2920	* Check to see if the player is in a shop. IF so, then check to see if
2921	* the player has any unpaid items. If so, remove them and put them back	2878	* Check to see if the player has any unpaid items. If so, remove them
2922	* in the map.	2879	* and put them back in the map.
2923	*/	2880	*/
2924
2925	if (is_in_shop (op))
2926	remove_unpaid_objects (op->inv, op);	2881	remove_unpaid_objects (op->inv, op);
2927		2882
2928	/****************************************/	2883	/****************************************/
2929	/* */	2884	/* */
2930	/* Move player to his current respawn- */	2885	/* Move player to his current respawn- */
2931	/* position (usually last savebed) */	2886	/* position (usually last savebed) */
…		…
2951	object *force;	2906	object *force;
2952	int at;	2907	int at;
2953		2908
2954	force = get_archetype (FORCE_NAME);	2909	force = get_archetype (FORCE_NAME);
2955	/* 50 ticks should be enough time for the spell to abate */	2910	/* 50 ticks should be enough time for the spell to abate */
2956	force->speed = 0.1;	2911	force->speed = 0.1f;
2957	force->speed_left = -5.0;	2912	force->speed_left = -5.f;
2958	SET_FLAG (force, FLAG_APPLIED);	2913	SET_FLAG (force, FLAG_APPLIED);
2959	for (at = 0; at < NROFATTACKS; at++)	2914	for (at = 0; at < NROFATTACKS; at++)
2960	if (will_kill_again & (1 << at))	2915	if (will_kill_again & (1 << at))
2961	force->resist[at] = 100;	2916	force->resist[at] = 100;
2962		2917
…		…
2971	void	2926	void
2972	loot_object (object *op)	2927	loot_object (object *op)
2973	{ /* Grab and destroy some treasure */	2928	{ /* Grab and destroy some treasure */
2974	object *tmp, *tmp2, *next;	2929	object *tmp, *tmp2, *next;
2975		2930
2976	if (op->container)	2931	op->close_container (); /* close open sack first */
2977	esrv_apply_container (op, op->container); /* close open sack first */
2978		2932
2979	for (tmp = op->inv; tmp; tmp = next)	2933	for (tmp = op->inv; tmp; tmp = next)
2980	{	2934	{
2981	next = tmp->below;	2935	next = tmp->below;
2982		2936
2983	if (tmp->invisible)	2937	if (tmp->invisible)
2984	continue;	2938	continue;
2985		2939
2986	tmp->remove ();	2940	tmp->remove ();
2987	tmp->x = op->x, tmp->y = op->y;	2941	tmp->x = op->x, tmp->y = op->y;
		2942
2988	if (tmp->type == CONTAINER)	2943	if (tmp->type == CONTAINER)
2989	{ /* empty container to ground */	2944	loot_object (tmp); /* empty container to ground */
2990	loot_object (tmp);	2945
2991	}
2992	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2946	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2993	{	2947	{
2994	if (tmp->nrof > 1)	2948	if (tmp->nrof > 1)
2995	{	2949	{
2996	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2950	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2997	tmp2->destroy ();	2951	tmp2->destroy ();
…		…
3008	/*	2962	/*
3009	* fix_weight(): Check recursively the weight of all players, and fix	2963	* fix_weight(): Check recursively the weight of all players, and fix
3010	* what needs to be fixed. Refresh windows and fix speed if anything	2964	* what needs to be fixed. Refresh windows and fix speed if anything
3011	* was changed.	2965	* was changed.
3012	*/	2966	*/
3013
3014	void	2967	void
3015	fix_weight (void)	2968	fix_weight (void)
3016	{	2969	{
3017	for_all_players (pl)	2970	for_all_players (pl)
3018	{	2971	{
…		…
3078	if (op->type == PLAYER)	3031	if (op->type == PLAYER)
3079	{	3032	{
3080	op->contr->tmp_invis = 0;	3033	op->contr->tmp_invis = 0;
3081	op->contr->invis_race = 0;	3034	op->contr->invis_race = 0;
3082	}	3035	}
		3036
3083	update_object (op, UP_OBJ_FACE);	3037	update_object (op, UP_OBJ_CHANGE);
3084	}	3038	}
3085		3039
3086	int	3040	int
3087	is_true_undead (object *op)	3041	is_true_undead (object *op)
3088	{	3042	{
3089	object *tmp = NULL;
3090
3091	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3043	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3092	return 1;	3044	return 1;
3093		3045
3094	return 0;	3046	return 0;
3095	}	3047	}
3096		3048
…		…
3140	/* For Hidden creatures - a chance of becoming 'unhidden'	3092	/* For Hidden creatures - a chance of becoming 'unhidden'
3141	* every time they move - as we subtract off 'invisibility'	3093	* every time they move - as we subtract off 'invisibility'
3142	* AND, for players, if they move into a ridiculously unhideable	3094	* AND, for players, if they move into a ridiculously unhideable
3143	* spot (surrounded by clear terrain in broad daylight). -b.t.	3095	* spot (surrounded by clear terrain in broad daylight). -b.t.
3144	*/	3096	*/
3145
3146	void	3097	void
3147	do_hidden_move (object *op)	3098	do_hidden_move (object *op)
3148	{	3099	{
3149	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3100	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3150	object *skop;	3101	object *skop;
…		…
3267	* a blocked los square.	3218	* a blocked los square.
3268	* we use the archetype to figure out offsets.	3219	* we use the archetype to figure out offsets.
3269	*/	3220	*/
3270	while (op)	3221	while (op)
3271	{	3222	{
3272	dx = rv.distance_x + op->arch->clone.x;	3223	dx = rv.distance_x + op->arch->x;
3273	dy = rv.distance_y + op->arch->clone.y;	3224	dy = rv.distance_y + op->arch->y;
3274		3225
3275	/* only the viewable area the player sees is updated by LOS	3226	/* only the viewable area the player sees is updated by LOS
3276	* code, so we need to restrict ourselves to that range of values	3227	* code, so we need to restrict ourselves to that range of values
3277	* for any meaningful values.	3228	* for any meaningful values.
3278	*/	3229	*/
…		…
3383	char buf[MAX_BUF]; /* tmp. string buffer */	3334	char buf[MAX_BUF]; /* tmp. string buffer */
3384	int i = 0, j = 0;	3335	int i = 0, j = 0;
3385		3336
3386	/* get the appropriate treasurelist */	3337	/* get the appropriate treasurelist */
3387	if (atnr == ATNR_FIRE)	3338	if (atnr == ATNR_FIRE)
3388	trlist = find_treasurelist ("dragon_ability_fire");	3339	trlist = treasurelist::find ("dragon_ability_fire");
3389	else if (atnr == ATNR_COLD)	3340	else if (atnr == ATNR_COLD)
3390	trlist = find_treasurelist ("dragon_ability_cold");	3341	trlist = treasurelist::find ("dragon_ability_cold");
3391	else if (atnr == ATNR_ELECTRICITY)	3342	else if (atnr == ATNR_ELECTRICITY)
3392	trlist = find_treasurelist ("dragon_ability_elec");	3343	trlist = treasurelist::find ("dragon_ability_elec");
3393	else if (atnr == ATNR_POISON)	3344	else if (atnr == ATNR_POISON)
3394	trlist = find_treasurelist ("dragon_ability_poison");	3345	trlist = treasurelist::find ("dragon_ability_poison");
3395		3346
3396	if (trlist == NULL || who->type != PLAYER)	3347	if (trlist == NULL || who->type != PLAYER)
3397	return;	3348	return;
3398		3349
3399	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3350	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3403	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3354	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3404	return;	3355	return;
3405	}	3356	}
3406		3357
3407	/* everything seems okay - now bring on the gift: */	3358	/* everything seems okay - now bring on the gift: */
3408	item = &(tr->item->clone);	3359	item = tr->item;
3409		3360
3410	if (item->type == SPELL)	3361	if (item->type == SPELL)
3411	{	3362	{
3412	if (check_spell_known (who, item->name))	3363	if (check_spell_known (who, item->name))
3413	return;	3364	return;
…		…
3473	/* forces in the treasurelist can alter the player's stats */	3424	/* forces in the treasurelist can alter the player's stats */
3474	object *skin;	3425	object *skin;
3475		3426
3476	/* first get the dragon skin force */	3427	/* first get the dragon skin force */
3477	shstr_cmp dragon_skin_force ("dragon_skin_force");	3428	shstr_cmp dragon_skin_force ("dragon_skin_force");
3478	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3429	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3479	;	3430	;
3480		3431
3481	if (!skin)	3432	if (!skin)
3482	return;	3433	return;
3483		3434
…		…
3531	* not readied.	3482	* not readied.
3532	*/	3483	*/
3533	void	3484	void
3534	player_unready_range_ob (player *pl, object *ob)	3485	player_unready_range_ob (player *pl, object *ob)
3535	{	3486	{
3536	rangetype i;	3487	if (pl->ob->current_weapon == ob)
		3488	pl->ob->current_weapon = 0;
3537		3489
3538	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3490	if (pl->combat_ob == ob)
3539	{	3491	pl->combat_ob = 0;
		3492
3540	if (pl->ranges[i] == ob)	3493	if (pl->ranged_ob == ob)
3541	{	3494	pl->ranged_ob = 0;
3542	pl->ranges[i] = NULL;
3543	if (pl->shoottype == i)
3544	{
3545	pl->shoottype = range_none;
3546	}
3547	}
3548	}
3549	}	3495	}
		3496
		3497	sint8
		3498	player::visibility_at (maptile *map, int x, int y) const
		3499	{
		3500	if (!ns)
		3501	return 0;
		3502
		3503	int dx, dy;
		3504	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3505	return 0;
		3506
		3507	x += dx - ns->current_x + ns->mapx / 2;
		3508	y += dy - ns->current_y + ns->mapy / 2;
		3509
		3510	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3511	return 0;
		3512
		3513	return 100 - blocked_los [x][y];
		3514	}

Diff Legend

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