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.97 by root, Mon Jan 8 22:32:11 2007 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 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	{
…		…
182	ob->remove ();	168	ob->remove ();
183	ob->map = 0;	169	ob->map = 0;
184	ob->activate_recursive ();	170	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	172	add_friendly_object (ob);
187	enter_map ();
188	}	173	}
189		174
190	void	175	void
191	player::deactivate ()	176	player::deactivate ()
192	{	177	{
…		…
194	return;	179	return;
195		180
196	terminate_all_pets (ob);	181	terminate_all_pets (ob);
197	remove_friendly_object (ob);	182	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
199	ob->remove ();	188	ob->remove ();
200	ob->map = 0;	189	ob->map = 0;
		190	party = 0;
201		191
202	// for weird reasons, this is often "ob", keeping a circular reference	192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
203	ranges [range_skill] = 0;
204		193
205	players.erase (this);	194	players.erase (this);
206	}	195	}
207		196
208	// connect the player with a specific client	197	// connect the player with a specific client
209	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
210	void	199	void
211	player::connect (client *ns)	200	player::connect (client *ns)
212	{	201	{
213	this->ns = ns;	202	this->ns = ns;
214	ns->pl = this;	203	ns->pl = this;
215		204
216	run_on = 0;	205	run_on = 0;
217	fire_on = 0;	206	fire_on = 0;
218	ob->container = 0; //TODO: client-specific	207	ob->close_container (); //TODO: client-specific
219		208
220	ns->update_look = 0;	209	ns->update_look = 0;
221	ns->look_position = 0;	210	ns->look_position = 0;
222		211
223	clear_los (ob);	212	clear_los (this);
224		213
225	ns->reset_stats ();	214	ns->reset_stats ();
226		215
227	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
228	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
229	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
230		219
231	if (!legal_range (ob, shoottype))
232	shoottype = range_none;
233
234	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
235	link_player_skills (ob);	221	link_player_skills (ob);
236		222
237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238		224
239	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
240		226
241	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
242	* from the class, and not race. I don't see any way to get the class information
243	* to then update this. I don't think this will actually break anything - anyone
244	* that can use armour should be able to use a shield. What this may 'break'
245	* are features new characters get, eg, if someone starts up with a Q, they
246	* should be able to use a shield. However, old Q's won't get that advantage.
247	*/
248	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
249	SET_FLAG (ob, FLAG_USE_SHIELD);
250
251	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
252	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
253	{	229	{
254	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
255		231
256	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
257	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
258		234
259	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
260	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
261	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
262	abil = tmp;	238	abil = tmp;
263	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
264	skin = tmp;	240	skin = tmp;
265		241
266	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
267	}	243	}
268		244
269	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
270		246
271	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
272		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);
273	ob->update_stats ();	274	ob->update_stats ();
		275
274	ns->floorbox_update ();	276	ns->floorbox_update ();
275
276	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
277	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
278		279
279	activate ();	280	activate ();
280		281
…		…
296		297
297	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
298		299
299	ns->reset_stats ();	300	ns->reset_stats ();
300	ns->pl = 0;	301	ns->pl = 0;
301	this->ns = 0;	302	ns = 0;
302	}	303	}
303		304
		305	if (ob)
304	ob->container = 0; //TODO: client-specific	306	ob->close_container (); //TODO: client-specific
		307
305	deactivate ();	308	deactivate ();
306	}	309	}
307		310
308	// the need for this function can be explained	311	// the need for this function can be explained
309	// by load_object not returning the object	312	// by load_object not returning the object
310	void	313	void
311	player::set_object (object *op)	314	player::set_object (object *op)
312	{	315	{
313	ob = op;	316	ob = observe = op;
314	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
315		318
		319	ob->speed = 1.0f;
316	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
317	ob->speed = 1.0;	321
318	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
319	ob->stats.wc = 2;	323	}
320	ob->run_away = 25; /* Then we panick... */
321		324
322	ob->roll_stats ();	325	void
		326	player::set_observe (object *op)
		327	{
		328	observe = op ? op : ob;
		329	do_los = 1;
323	}	330	}
324		331
325	player::player ()	332	player::player ()
326	{	333	{
327	/* There are some elements we want initialised to non zero value -	334	/* There are some elements we want initialised to non zero value -
328	* we deal with that below this point.	335	* we deal with that below this point.
329	*/	336	*/
330	outputs_sync = 16; /* Every 2 seconds */	337	outputs_sync = 4;
331	outputs_count = 8; /* Keeps present behaviour */	338	outputs_count = 4;
332	unapply = unapply_nochoice;	339	unapply = unapply_nochoice;
333		340
334	savebed_map = first_map_path; /* Init. respawn position */	341	savebed_map = first_map_path; /* Init. respawn position */
335		342
336	gen_sp_armour = 10;	343	gen_sp_armour = 10;
337	shoottype = range_none;
338	bowtype = bow_normal;	344	bowtype = bow_normal;
339	petmode = pet_normal;	345	petmode = pet_normal;
340	listening = 10;	346	listening = 10;
341	usekeys = containers;	347	usekeys = containers;
342	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
343	do_los = 1;	349	do_los = 1;
		350
		351	weapon_sp = 1.0f;
		352	weapon_sp_left = 0.5f;
344	}	353	}
345		354
346	void	355	void
347	player::do_destroy ()	356	player::do_destroy ()
348	{	357	{
…		…
371	player::create ()	380	player::create ()
372	{	381	{
373	player *pl = new player;	382	player *pl = new player;
374		383
375	pl->set_object (arch_to_object (get_player_archetype (0)));	384	pl->set_object (arch_to_object (get_player_archetype (0)));
		385
		386	pl->ob->roll_stats ();
		387	pl->ob->stats.wc = 2;
		388	pl->ob->run_away = 25; /* Then we panick... */
		389
376	set_first_map (pl->ob);	390	set_first_map (pl->ob);
377		391
378	return pl;	392	return pl;
379	}	393	}
380		394
…		…
526	x = mon->x;	540	x = mon->x;
527	y = mon->y;	541	y = mon->y;
528	m = mon->map;	542	m = mon->map;
529	dir = rv.direction;	543	dir = rv.direction;
530	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	544	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
531	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	545	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		546
532	/* If we can't solve it within the search distance, return now. */	547	/* If we can't solve it within the search distance, return now. */
533	if (diff > max)	548	if (diff > max)
534	return 0;	549	return 0;
		550
535	while (diff > 1 && max > 0)	551	while (diff > 1 && max > 0)
536	{	552	{
537	lastx = x;	553	lastx = x;
538	lasty = y;	554	lasty = y;
539	lastmap = m;	555	lastmap = m;
…		…
621	max--;	637	max--;
622	lastdir = dir;	638	lastdir = dir;
623	if (!firstdir)	639	if (!firstdir)
624	firstdir = dir;	640	firstdir = dir;
625	}	641	}
		642
626	if (diff <= 1)	643	if (diff <= 1)
627	{	644	{
628	/* Recalculate diff (distance) because we may not have actually	645	/* Recalculate diff (distance) because we may not have actually
629	* headed toward player for entire distance.	646	* headed toward player for entire distance.
630	*/	647	*/
631	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	648	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
632	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	649	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
633	}	650	}
		651
634	if (diff > max)	652	if (diff > max)
635	return 0;	653	return 0;
636	}	654	}
		655
637	/* If we reached the max, didn't find a direction in time */	656	/* If we reached the max, didn't find a direction in time */
638	if (!max)	657	if (!max)
639	return 0;	658	return 0;
640		659
641	return firstdir;	660	return firstdir;
…		…
755	roll_stat (void)	774	roll_stat (void)
756	{	775	{
757	int a[4], i, j, k;	776	int a[4], i, j, k;
758		777
759	for (i = 0; i < 4; i++)	778	for (i = 0; i < 4; i++)
760	a[i] = (int) RANDOM () % 6 + 1;	779	a[i] = (int) rndm (6) + 1;
761		780
762	for (i = 0, j = 0, k = 7; i < 4; i++)	781	for (i = 0, j = 0, k = 7; i < 4; i++)
763	if (a[i] < k)	782	if (a[i] < k)
764	k = a[i], j = i;	783	k = a[i], j = i;
765		784
…		…
771	}	790	}
772		791
773	void	792	void
774	object::roll_stats ()	793	object::roll_stats ()
775	{	794	{
776	int statsort [7];	795	int statsort [NUM_STATS];
777		796
778	for (;;)	797	for (;;)
779	{	798	{
780	int sum = 0;	799	int sum = 0;
781	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
783		802
784	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
785	break;	804	break;
786	}	805	}
787		806
788	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		809
		810	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
792	stats.Dex = statsort[1];
793	stats.Con = statsort[2];
794	stats.Int = statsort[3];
795	stats.Wis = statsort[4];
796	stats.Pow = statsort[5];
797	stats.Cha = statsort[6];
798		812
799	stats.exp = 0;	813	stats.exp = 0;
800	stats.ac = 0;	814	stats.ac = 0;
801		815
802	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
814	}	828	}
815		829
816	void	830	void
817	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
818	{	832	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
820	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
821	set_attr_value (&contr->orig_stats, b, tmp);
822		834
		835	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
824	stats.Dex = contr->orig_stats.Dex;
825	stats.Con = contr->orig_stats.Con;
826	stats.Int = contr->orig_stats.Int;
827	stats.Wis = contr->orig_stats.Wis;
828	stats.Pow = contr->orig_stats.Pow;
829	stats.Cha = contr->orig_stats.Cha;
830		837
831	//TODO: the following code looks so borked and should, at the very least,	838	//TODO: the following code looks so borked and should, at the very least,
832	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
833	stats.ac = 0;	840	stats.ac = 0;
834		841
…		…
865	* appropriate action with it (change race, or other things).	872	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	873	* The function name is for historical reasons - now we have
867	* separate race and class; this actually changes the RACE,	874	* separate race and class; this actually changes the RACE,
868	* not the class.	875	* not the class.
869	*/	876	*/
870	int	877	void
871	key_change_class (object *op, char key)	878	player::chargen_race_done ()
872	{	879	{
873	int tmp_loop;
874
875	if (key == 'd' || key == 'D')
876	{
877	char buf[MAX_BUF];
878
879	/* this must before then initial items are given */	880	/* this must before then initial items are given */
880	esrv_new_player (op->contr, op->weight + op->carrying);	881	esrv_new_player (ob->contr, ob->weight + ob->carrying);
881		882
882	treasurelist *tl = find_treasurelist ("starting_wealth");	883	treasurelist *tl = treasurelist::find ("starting_wealth");
883	if (tl)	884	if (tl)
884	create_treasure (tl, op, 0, 0, 0);	885	create_treasure (tl, ob, 0, 0, 0);
885		886
886	INVOKE_PLAYER (BIRTH, op->contr);	887	INVOKE_PLAYER (BIRTH, ob->contr);
887	INVOKE_PLAYER (LOGIN, op->contr);	888	INVOKE_PLAYER (LOGIN, ob->contr);
888		889
889	op->contr->ns->state = ST_PLAYING;	890	ob->contr->ns->state = ST_PLAYING;
890		891
891	if (op->msg)	892	if (ob->msg)
892	op->msg = NULL;	893	ob->msg = 0;
893		894
894	/* We create this now because some of the unique maps will need it	895	/* We create this now because some of the unique maps will need it
895	* to save here.	896	* to save here.
896	*/	897	*/
		898	{
		899	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	900	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);	901	make_path_to_file (buf);
		902	}
899		903
900	start_info (op);	904	start_info (ob);
901	CLEAR_FLAG (op, FLAG_WIZ);	905	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (op, op->randomitems);	906	give_initial_items (ob, ob->randomitems);
903	link_player_skills (op);	907	link_player_skills (ob);
904	esrv_send_inventory (op, op);	908	esrv_send_inventory (ob, ob);
905	op->update_stats ();	909	ob->update_stats ();
906		910
907	/* This moves the player to a different start map, if there	911	/* This moves the player to a different start map, if there
908	* is one for this race	912	* is one for this race
909	*/	913	*/
910	if (*first_map_ext_path)	914	if (*first_map_ext_path)
911	{	915	{
912	object *tmp;	916	object *tmp;
913	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
914		918
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916	tmp = object::create ();	920	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = op->x;	922	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = op->y;	923	EXIT_Y (tmp) = ob->y;
920	op->enter_exit (tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the	925	* if the map isn't there, then stay on the
922	* default initial map */	926	* default initial map */
923	tmp->destroy ();	927	tmp->destroy ();
924	}	928	}
925	else	929	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	930	LOG (llevDebug, "first_map_ext_path not set\n");
		931	}
927		932
928	return 0;	933	void
929	}	934	player::chargen_race_next ()
930		935	{
931	/* Following actually changes the race - this is the default command	936	/* Following actually changes the race - this is the default command
932	* if we don't match with one of the options above.	937	* if we don't match with one of the options above.
933	*/	938	*/
934		939
935	tmp_loop = 0;	940	do
936	while (!tmp_loop)
937	{	941	{
938	shstr name = op->name;	942	shstr name = ob->name;
939	int x = op->x, y = op->y;	943	int x = ob->x, y = ob->y;
940		944
941	op->remove_statbonus ();	945	ob->remove_statbonus ();
942	op->remove ();	946	ob->remove ();
943	op->arch = get_player_archetype (op->arch);	947	ob->arch = get_player_archetype (ob->arch);
944	op->arch->clone.copy_to (op);	948	ob->arch->clone.copy_to (ob);
945	op->instantiate ();	949	ob->instantiate ();
946	op->stats = op->contr->orig_stats;	950	ob->stats = ob->contr->orig_stats;
947	op->name = op->name_pl = name;	951	ob->name = ob->name_pl = name;
948	op->x = x;	952	ob->x = x;
949	op->y = y;	953	ob->y = y;
950	SET_ANIMATION (op, 2); /* So player faces south */	954	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (op, op->map, op, 0);	955	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (op->contr->title, op->arch->clone.name);	956	assign (ob->contr->title, ob->arch->clone.name);
953	op->add_statbonus ();	957	ob->add_statbonus ();
954	tmp_loop = allowed_class (op);
955	}	958	}
		959	while (!allowed_class (ob));
956		960
957	update_object (op, UP_OBJ_FACE);	961	update_object (ob, UP_OBJ_FACE);
958	esrv_update_item (UPD_FACE, op, op);	962	esrv_update_item (UPD_FACE, ob, ob);
959	op->update_stats ();	963	ob->update_stats ();
960	op->stats.hp = op->stats.maxhp;	964	ob->stats.hp = ob->stats.maxhp;
961	op->stats.sp = op->stats.maxsp;	965	ob->stats.sp = ob->stats.maxsp;
962	op->stats.grace = 0;	966	ob->stats.grace = 0;
963
964	if (op->msg)
965	new_draw_info (NDI_BLUE, 0, op, op->msg);
966
967	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
968	return 0;
969	}	967	}
970		968
971	void	969	void
972	flee_player (object *op)	970	flee_player (object *op)
973	{	971	{
…		…
1020	/* Cornered, get rid of scared */	1018	/* Cornered, get rid of scared */
1021	CLEAR_FLAG (op, FLAG_SCARED);	1019	CLEAR_FLAG (op, FLAG_SCARED);
1022	op->enemy = NULL;	1020	op->enemy = NULL;
1023	}	1021	}
1024		1022
1025
1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1023	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1027	* IT returns 1 if the player should keep on moving, 0 if he should	1024	* It returns 1 if the player should keep on moving, 0 if he should
1028	* stop.	1025	* stop.
1029	*/	1026	*/
1030	int	1027	int
1031	check_pick (object *op)	1028	check_pick (object *op)
1032	{	1029	{
1033	object *tmp, *next;	1030	object *tmp, *next;
1034	int stop = 0;	1031	int stop = 0;
1035	int j, k, wvratio;	1032	int wvratio;
1036	char putstring[128], tmpstr[16];	1033	char putstring[128];
1037		1034
1038	/* if you're flying, you cna't pick up anything */	1035	/* if you're flying, you cna't pick up anything */
1039	if (op->move_type & MOVE_FLYING)	1036	if (op->move_type & MOVE_FLYING)
1040	return 1;	1037	return 1;
1041		1038
…		…
1109	if (tmp->name != NULL)	1106	if (tmp->name != NULL)
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112	else	1109	else
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1114	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115		1112
1116	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1117	}	1114	}
1118		1115
1119	/* philosophy:	1116	/* philosophy:
…		…
1312	/* careful: chairs and tables are weapons! */	1309	/* careful: chairs and tables are weapons! */
1313	if (op->contr->mode & PU_ALLWEAPON)	1310	if (op->contr->mode & PU_ALLWEAPON)
1314	{	1311	{
1315	if (tmp->type == WEAPON && tmp->name != NULL)	1312	if (tmp->type == WEAPON && tmp->name != NULL)
1316	{	1313	{
1317	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1318	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1315	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1316	{
1320	pick_up (op, tmp);	1317	pick_up (op, tmp);
1321	continue;	1318	continue;
1322	}	1319	}
1323	}	1320	}
1324		1321
1325	if (tmp->type == WEAPON && tmp->name == NULL)	1322	if (tmp->type == WEAPON && tmp->name == NULL)
1326	{	1323	{
1327	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1324	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1328	{	1325	{
1329	pick_up (op, tmp);	1326	pick_up (op, tmp);
1330	continue;	1327	continue;
1331	}	1328	}
1332	}	1329	}
…		…
1357	if (tmp->name != NULL)	1354	if (tmp->name != NULL)
1358	{	1355	{
1359	fprintf (stderr, "%s", tmp->name);	1356	fprintf (stderr, "%s", tmp->name);
1360	}	1357	}
1361	else	1358	else
1362	fprintf (stderr, "%s", tmp->arch->name);	1359	fprintf (stderr, "%s", tmp->arch->archname);
1363	fprintf (stderr, ",%d] = ", tmp->type);	1360	fprintf (stderr, ",%d] = ", tmp->type);
1364	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1365	#endif	1362	#endif
1366	continue;	1363	continue;
1367	}	1364	}
…		…
1378	* found object is returned.	1375	* found object is returned.
1379	*/	1376	*/
1380	object *	1377	object *
1381	find_arrow (object *op, const char *type)	1378	find_arrow (object *op, const char *type)
1382	{	1379	{
1383	object *tmp = NULL;	1380	object *tmp = 0;
1384		1381
1385	for (op = op->inv; op; op = op->below)	1382	for (op = op->inv; op; op = op->below)
1386	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1383	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1387	tmp = find_arrow (op, type);	1384	tmp = find_arrow (op, type);
1388	else if (op->type == ARROW && op->race == type)	1385	else if (op->type == ARROW && op->race == type)
1389	return op;	1386	return op;
		1387
1390	return tmp;	1388	return tmp;
1391	}	1389	}
1392		1390
1393	/*	1391	/*
1394	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1392	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1395	* against the target. A full test is not performed, simply a basic test	1393	* against the target. A full test is not performed, simply a basic test
1396	* of resistances. The archer is making a quick guess at what he sees down	1394	* of resistances. The archer is making a quick guess at what he sees down
1397	* the hall. Failing that it does it's best to pick the highest plus arrow.	1395	* the hall. Failing that it does it's best to pick the highest plus arrow.
1398	*/	1396	*/
1399
1400	object *	1397	object *
1401	find_better_arrow (object *op, object *target, const char *type, int *better)	1398	find_better_arrow (object *op, object *target, const char *type, int *better)
1402	{	1399	{
1403	object *tmp = NULL, *arrow, *ntmp;	1400	object *tmp = NULL, *arrow, *ntmp;
1404	int attacknum, attacktype, betterby = 0, i;	1401	int attacknum, attacktype, betterby = 0, i;
…		…
1470	* find_better_arrow to find a decent arrow to use.	1467	* find_better_arrow to find a decent arrow to use.
1471	* op = the shooter	1468	* op = the shooter
1472	* type = bow->race	1469	* type = bow->race
1473	* dir = fire direction	1470	* dir = fire direction
1474	*/	1471	*/
1475
1476	object *	1472	object *
1477	pick_arrow_target (object *op, const char *type, int dir)	1473	pick_arrow_target (object *op, const char *type, int dir)
1478	{	1474	{
1479	object *tmp = NULL;	1475	object *tmp = NULL;
1480	maptile *m;	1476	maptile *m;
…		…
1545	*/	1541	*/
1546	int	1542	int
1547	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1543	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548	{	1544	{
1549	object *left, *bow;	1545	object *left, *bow;
1550	int bowspeed, mflags;	1546	int mflags;
1551	maptile *m;	1547	maptile *m;
1552		1548
1553	if (!dir)	1549	if (!dir)
1554	{	1550	{
1555	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1556	return 0;	1552	return 0;
1557	}	1553	}
1558		1554
1559	if (op->type == PLAYER)	1555	if (op->contr)
1560	bow = op->contr->ranges[range_bow];	1556	bow = op->current_weapon;
1561	else	1557	else
1562	{	1558	{
1563	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1560	/* Don't check for applied - monsters don't apply bows - in that way, they
1565	* don't need to switch back and forth between bows and weapons.	1561	* don't need to switch back and forth between bows and weapons.
…		…
1570	if (!bow)	1566	if (!bow)
1571	{	1567	{
1572	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1568	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573	return 0;	1569	return 0;
1574	}	1570	}
		1571
		1572	// optimisation: move object to top so we will find it quickly again
		1573	if (bow->below)
		1574	{
		1575	bow->remove ();
		1576	op->insert (bow);
		1577	}
		1578
1575	}	1579	}
1576		1580
1577	if (!bow->race || !bow->skill)	1581	if (!bow->race || !bow->skill)
1578	{	1582	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580	return 0;	1584	return 0;
1581	}	1585	}
1582
1583	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1584
1585	/* penalize ROF for bestarrow */
1586	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1587	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1588
1589	if (bowspeed < 1)
1590	bowspeed = 1;
1591		1586
1592	if (arrow == NULL)	1587	if (arrow == NULL)
1593	{	1588	{
1594	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1595	{	1590	{
1596	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
1597	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1598	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1593	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599	else	1594	else
1600	CLEAR_FLAG (op, FLAG_READY_BOW);	1595	CLEAR_FLAG (op, FLAG_READY_BOW);
		1596
1601	return 0;	1597	return 0;
1602	}	1598	}
1603	}	1599	}
1604		1600
1605	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1601	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1629		1625
1630	arrow->set_owner (op);	1626	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1628	arrow->direction = dir;
1633		1629
		1630	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1631	arrow->stats.hp = arrow->stats.dam;
		1632	arrow->stats.grace = arrow->attacktype;
		1633
		1634	if (arrow->slaying)
		1635	arrow->spellarg = strdup (arrow->slaying);
		1636
		1637	#if 0
		1638	if (player *pl = op->contr)
		1639	{
		1640	float speed = pl->weapon_sp;
		1641
		1642	/* penalize ROF for bestarrow */
		1643	if (pl->bowtype == bow_bestarrow)
		1644	speed *= .9f;
		1645	else
		1646	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1647
		1648	op->speed_left += speed - op->speed;
		1649	}
		1650	#endif
		1651
		1652	SET_ANIMATION (arrow, arrow->direction);
		1653
		1654	/* update the speed */
		1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1656	+ bow->stats.dam / 7.f;
		1657
		1658	arrow->set_speed (max (arrow->speed, 2.f));
		1659	arrow->speed_left = 0;
		1660
		1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1662
1634	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
1635	{	1664	{
1636	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1637	op->update_stats ();
1638	}
1639
1640	SET_ANIMATION (arrow, arrow->direction);
1641	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1642	arrow->stats.hp = arrow->stats.dam;
1643	arrow->stats.grace = arrow->attacktype;
1644	if (arrow->slaying != NULL)
1645	arrow->spellarg = strdup (arrow->slaying);
1646
1647	/* Note that this was different for monsters - they got their level
1648	* added to the damage. I think the strength bonus is more proper.
1649	*/
1650
1651	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1652
1653	/* update the speed */
1654	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1655	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1656
1657	arrow->set_speed (max (arrow->speed, 1.0));
1658	arrow->speed_left = 0;
1659
1660	if (op->type == PLAYER)
1661	{
1662	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1663	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1664	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1665
1666	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1666	wc -= dex_bonus[op->stats.Dex];
		1667
		1668	if (!arrow->slaying)
		1669	arrow->slaying = op->slaying;
		1670
		1671	arrow->attacktype |= op->attacktype;
1667	}	1672	}
1668	else	1673	else
1669	{	1674	{
1670	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671	arrow->level = op->level;	1675	arrow->level = op->level;
1672	}	1676	arrow->stats.wc -= bow->magic;
1673		1677
1674	if (arrow->attacktype == AT_PHYSICAL)	1678	if (!arrow->slaying)
		1679	arrow->slaying = bow->slaying;
		1680
1675	arrow->attacktype |= bow->attacktype;	1681	arrow->attacktype |= bow->attacktype;
		1682	}
1676		1683
1677	if (bow->slaying)	1684	wc -= arrow->level;
1678	arrow->slaying = bow->slaying;	1685	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679		1686
		1687	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680	arrow->move_type = MOVE_FLY_LOW;	1688	arrow->move_type = MOVE_FLY_LOW;
1681	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1689	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1682		1690
1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1691	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1684	m->insert (arrow, sx, sy, op);	1692	m->insert (arrow, sx, sy, op);
…		…
1709	{	1717	{
1710	int ret = 0, wcmod = 0;	1718	int ret = 0, wcmod = 0;
1711		1719
1712	if (op->contr->bowtype == bow_bestarrow)	1720	if (op->contr->bowtype == bow_bestarrow)
1713	{	1721	{
1714	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1722	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715	}	1723	}
1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1724	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717	{	1725	{
1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1726	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719	wcmod = -1;	1727	wcmod = -1;
…		…
1729	else if (op->contr->bowtype == bow_spreadshot)	1737	else if (op->contr->bowtype == bow_spreadshot)
1730	{	1738	{
1731	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1739	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1732	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);
1733	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1741	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735	}	1742	}
1736	else	1743	else
1737	{	1744	{
1738	/* Simple case */	1745	/* Simple case */
1739	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);
1740	}	1747	}
		1748
1741	return ret;	1749	return ret;
1742	}	1750	}
1743
1744		1751
1745	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1746	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1747	*/	1754	*/
1748	void	1755	void
1749	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
1750	{	1757	{
1751	object *item;	1758	object *item = op->contr->ranged_ob;
1752		1759
1753	if (!op->contr->ranges[range_misc])	1760	if (!item)
1754	{	1761	{
1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756	return;	1763	return;
1757	}	1764	}
1758		1765
1759	item = op->contr->ranges[range_misc];
1760	if (!item->inv)	1766	if (!item->inv)
1761	{	1767	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1769	return;
1764	}	1770	}
		1771
		1772	if (!op->change_weapon (item))
		1773	return;
		1774
1765	if (item->type == WAND)	1775	if (item->type == WAND)
1766	{	1776	{
1767	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1768	{	1778	{
1769	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1770	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1781
1771	return;	1782	return;
1772	}	1783	}
1773	}	1784	}
1774	else if (item->type == ROD || item->type == HORN)	1785	else if (item->type == ROD || item->type == HORN)
1775	{	1786	{
1776	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777	{	1788	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1790
1779	if (item->type == ROD)	1791	if (item->type == ROD)
1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781	else	1793	else
1782	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1795
1783	return;	1796	return;
1784	}	1797	}
1785	}	1798	}
1786		1799
1787	if (cast_spell (op, item, dir, item->inv, NULL))	1800	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1809	}	1822	}
1810	}	1823	}
1811		1824
1812	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1813	*/	1826	*/
1814	void	1827	bool
1815	fire (object *op, int dir)	1828	fire (object *op, int dir)
1816	{	1829	{
1817	int spellcost = 0;	1830	int spellcost = 0;
1818		1831
1819	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
1820	if (action_makes_visible (op))	1833	if (action_makes_visible (op))
1821	make_visible (op);	1834	make_visible (op);
1822		1835
1823	switch (op->contr->shoottype)	1836	player *pl = op->contr;
		1837
		1838	if (pl->golem)
		1839	{
		1840	control_golem (op->contr->golem, dir);
		1841	return false;
1824	{	1842	}
1825	case range_none:
1826	return;
1827		1843
1828	case range_bow:	1844	object *ob = pl->ranged_ob;
		1845
		1846	if (!ob)
		1847	return false;
		1848
		1849	if (!op->change_weapon (ob))
		1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
		1856
		1857	switch (ob->type)
		1858	{
		1859	case BOW:
1829	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
1830	return;	1861	break;
1831		1862
1832	case range_magic: /* Casting spells */	1863	case SPELL:
1833	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1864	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834	return;	1865	break;
1835		1866
1836	case range_misc:	1867	case BUILDER:
		1868	apply_map_builder (op, dir);
		1869	break;
		1870
		1871	case SKILL:
		1872	do_skill (op, op, ob, dir, 0);
		1873	break;
		1874
		1875	default:
1837	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1838	return;	1877	break;
1839
1840	case range_golem: /* Control summoned monsters from scrolls */
1841	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1842	{
1843	op->contr->ranges[range_golem] = 0;
1844	op->contr->shoottype = range_none;
1845	}
1846	else
1847	control_golem (op->contr->ranges[range_golem], dir);
1848	return;
1849
1850	case range_skill:
1851	if (!op->chosen_skill)
1852	{
1853	if (op->type == PLAYER)
1854	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1855	return;
1856	}
1857
1858	do_skill (op, op, op->chosen_skill, dir, NULL);
1859	return;
1860	case range_builder:
1861	apply_map_builder (op, dir);
1862	return;
1863	default:
1864	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1865	return;
1866	}	1878	}
1867	}
1868		1879
1869		1880	return true;
		1881	}
1870		1882
1871	/* find_key	1883	/* find_key
1872	* We try to find a key for the door as passed. If we find a key	1884	* We try to find a key for the door as passed. If we find a key
1873	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
1874	* This function merges both normal and locked door, since the logic	1886	* This function merges both normal and locked door, since the logic
…		…
1876	* pl is the player,	1888	* pl is the player,
1877	* inv is the objects inventory to searched	1889	* inv is the objects inventory to searched
1878	* door is the door we are trying to match against.	1890	* door is the door we are trying to match against.
1879	* This function can be called recursively to search containers.	1891	* This function can be called recursively to search containers.
1880	*/	1892	*/
1881
1882	object *	1893	object *
1883	find_key (object *pl, object *container, object *door)	1894	find_key (object *pl, object *container, object *door)
1884	{	1895	{
1885	object *tmp, *key;	1896	object *tmp, *key;
1886		1897
1887	/* Should not happen, but sanity checking is never bad */	1898	/* Should not happen, but sanity checking is never bad */
1888	if (container->inv == NULL)	1899	if (!container->inv)
1889	return NULL;	1900	return 0;
1890		1901
1891	/* First, lets try to find a key in the top level inventory */	1902	/* First, lets try to find a key in the top level inventory */
1892	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1903	for (tmp = container->inv; tmp; tmp = tmp->below)
1893	{	1904	{
1894	if (door->type == DOOR && tmp->type == KEY)	1905	if (door->type == DOOR && tmp->type == KEY)
1895	break;	1906	break;
1896	/* For sanity, we should really check door type, but other stuff	1907	/* For sanity, we should really check door type, but other stuff
1897	* (like containers) can be locked with special keys	1908	* (like containers) can be locked with special keys
1898	*/	1909	*/
1899	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1910	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1900	break;	1911	break;
1901	}	1912	}
		1913
1902	/* No key found - lets search inventories now */	1914	/* No key found - lets search inventories now */
1903	/* If we find and use a key in an inventory, return at that time.	1915	/* If we find and use a key in an inventory, return at that time.
1904	* otherwise, if we search all the inventories and still don't find	1916	* otherwise, if we search all the inventories and still don't find
1905	* a key, return	1917	* a key, return
1906	*/	1918	*/
1907	if (!tmp)	1919	if (!tmp)
1908	{	1920	{
1909	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1921	for (tmp = container->inv; tmp; tmp = tmp->below)
1910	{	1922	{
1911	/* No reason to search empty containers */	1923	/* No reason to search empty containers */
1912	if (tmp->type == CONTAINER && tmp->inv)	1924	if (tmp->type == CONTAINER && tmp->inv)
1913	{	1925	{
1914	if ((key = find_key (pl, tmp, door)) != NULL)	1926	if ((key = find_key (pl, tmp, door)))
1915	return key;	1927	return key;
1916	}	1928	}
1917	}	1929	}
		1930
1918	if (!tmp)	1931	if (!tmp)
1919	return NULL;	1932	return NULL;
1920	}	1933	}
		1934
1921	/* We get down here if we have found a key. Now if its in a container,	1935	/* We get down here if we have found a key. Now if its in a container,
1922	* see if we actually want to use it	1936	* see if we actually want to use it
1923	*/	1937	*/
1924	if (pl != container)	1938	if (pl != container)
1925	{	1939	{
…		…
1946	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1960	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1947	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1961	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1948	return NULL;	1962	return NULL;
1949	}	1963	}
1950	}	1964	}
		1965
1951	return tmp;	1966	return tmp;
1952	}	1967	}
1953		1968
1954	/* moved door processing out of move_player_attack.	1969	/* moved door processing out of move_player_attack.
1955	* returns 1 if player has opened the door with a key	1970	* returns 1 if player has opened the door with a key
…		…
1957	* 0 otherwise	1972	* 0 otherwise
1958	*/	1973	*/
1959	static int	1974	static int
1960	player_attack_door (object *op, object *door)	1975	player_attack_door (object *op, object *door)
1961	{	1976	{
1962	/* If its a door, try to find a use a key. If we do destroy the door,	1977	/* If its a door, try to find a key. If we do destroy the door,
1963	* might as well return immediately as there is nothing more to do -	1978	* might as well return immediately as there is nothing more to do -
1964	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
1965	*/	1980	*/
1966	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
1967		1982
1968	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
1969	if (key)	1984	if (key)
1970	{	1985	{
1971	object *container = key->env;	1986	object *container = key->env;
1972		1987
1973	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1989
1974	if (action_makes_visible (op))	1990	if (action_makes_visible (op))
1975	make_visible (op);	1991	make_visible (op);
		1992
1976	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1993	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1977	spring_trap (door->inv, op);	1994	spring_trap (door->inv, op);
		1995
1978	if (door->type == DOOR)	1996	if (door->type == DOOR)
1979	{
1980	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1997	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1981	}
1982	else if (door->type == LOCKED_DOOR)	1998	else if (door->type == LOCKED_DOOR)
1983	{	1999	{
1984	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2000	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1985	remove_door2 (door); /* remove door without violence ;-) */	2001	remove_door2 (door); /* remove door without violence ;-) */
1986	}	2002	}
		2003
1987	/* Do this after we print the message */	2004	/* Do this after we print the message */
1988	decrease_ob (key); /* Use up one of the keys */	2005	decrease_ob (key); /* Use up one of the keys */
1989	/* Need to update the weight the container the key was in */	2006	/* Need to update the weight the container the key was in */
1990	if (container != op)	2007	if (container != op)
1991	esrv_update_item (UPD_WEIGHT, op, container);	2008	esrv_update_item (UPD_WEIGHT, op, container);
		2009
1992	return 1; /* Nothing more to do below */	2010	return 1; /* Nothing more to do below */
1993	}	2011	}
1994	else if (door->type == LOCKED_DOOR)	2012	else if (door->type == LOCKED_DOOR)
1995	{	2013	{
1996	/* Might as well return now - no other way to open this */	2014	/* Might as well return now - no other way to open this */
1997	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2015	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1998	return 1;	2016	return 1;
1999	}	2017	}
		2018
2000	return 0;	2019	return 0;
2001	}	2020	}
2002		2021
2003	/* This function is just part of a breakup from move_player.	2022	/* This function is just part of a breakup from move_player.
2004	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
2005	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
2006	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
2007	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2008	*/	2027	*/
2009	void	2028	bool
2010	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2011	{	2030	{
2012	object *tmp, *mon;
2013	sint16 nx, ny;
2014	int on_battleground;	2031	int on_battleground;
2015	maptile *m;
2016		2032
2017	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2018	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2019		2035
2020	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
		2037
		2038	if (out_of_map (op->map, nx, ny))
		2039	return false;
		2040
		2041	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2042	{
		2043	--op->speed_left;
		2044	return true;
		2045	}
2021		2046
2022	/* If braced, or can't move to the square, and it is not out of the	2047	/* If braced, or can't move to the square, and it is not out of the
2023	* map, attack it. Note order of if statement is important - don't	2048	* map, attack it. Note order of if statement is important - don't
2024	* want to be calling move_ob if braced, because move_ob will move the	2049	* want to be calling move_ob if braced, because move_ob will move the
2025	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2026	* move to some space, it then means that if we are braced, we should	2051	* move to some space, it then means that if we are braced, we should
2027	* do nothing at all. As it is, if we are braced, we go through	2052	* do nothing at all. As it is, if we are braced, we go through
2028	* quite a bit of processing. However, it probably is less than what	2053	* quite a bit of processing. However, it probably is less than what
2029	* move_ob uses.	2054	* move_ob uses.
2030	*/	2055	*/
2031	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2032	{
2033	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2034	{
2035	m = op->map->xy_find (nx, ny);	2056	maptile *m = op->map->xy_find (nx, ny);
2036	if (!m)
2037	return; /* Don't think this should happen */
2038	}
2039	else
2040	m = op->map;
2041		2057
2042	if (!(tmp = m->at (nx, ny).bot))
2043	return;
2044
2045	mon = 0;
2046	/* Go through all the objects, and find ones of interest. Only stop if	2058	/* Go through all the objects, and find ones of interest. Only stop if
2047	* we find a monster - that is something we know we want to attack.	2059	* we find a monster - that is something we know we want to attack.
2048	* if its a door or barrel (can roll) see if there may be monsters	2060	* if its a door or barrel (can roll) see if there may be monsters
2049	* on the space	2061	* on the space
2050	*/	2062	*/
2051	while (tmp)	2063	object *mon;
2052	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2053	if (tmp == op)	2065	{
2054	{	2066	if ((mon->flag [FLAG_ALIVE]
2055	tmp = tmp->above;	2067	|| mon->type == LOCKED_DOOR
2056	continue;	2068	|| mon->flag [FLAG_CAN_ROLL])
2057	}
2058
2059	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2060	{
2061	mon = tmp;	2069	&& mon != op)
2062	break;	2070	break;
2063	}	2071	}
2064		2072
2065	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2066	mon = tmp;
2067
2068	tmp = tmp->above;
2069	}
2070
2071	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2072	return; /* into a wall */	2074	return false; /* into a wall */
2073		2075
2074	if (mon->head)
2075	mon = mon->head;	2076	mon = mon->head_ ();
2076		2077
2077	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2078	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2079	if (op->contr->weapon_sp_left > 0.f)
2078	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2079	return;	2083	return true;
		2084	}
2080		2085
2081	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2082	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2083	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2084	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2085	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2086	* and thus will not push them.	2091	* and thus will not push them.
2087	*/	2092	*/
2088		2093
2089	/* If the creature is a pet, push it even if the player is not	2094	/* If the creature is a pet, push it even if the player is not
2090	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2091	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2092	*/	2097	*/
2093	if ((op->type == PLAYER)	2098	if (op->type == PLAYER
2094	#if COZY_SERVER
2095	&&
2096	((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2097	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2098	#else
2099	&& mon->owner == op	2101	|| mon->owner == op)
2100	#endif
2101	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2102	{	2103	{
2103	/* If we're braced, we don't want to switch places with it */	2104	/* If we're braced, we don't want to switch places with it */
2104	if (op->contr->braced)	2105	if (op->contr->braced)
2105	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
2106		2111
2107	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2112	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2108	(void) push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2109	if (op->contr->tmp_invis || op->hide)	2115	if (op->contr->tmp_invis || op->hide)
2110	make_visible (op);	2116	make_visible (op);
2111		2117
2112	return;	2118	return true;
2113	}	2119	}
		2120	else
		2121	return false;
		2122	}
2114		2123
2115	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2116	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2117	* someone, but put it inside this loop so that you won't	2126	* someone, but put it inside this loop so that you won't
2118	* attack them either.	2127	* attack them either.
2119	*/	2128	*/
2120	if ((mon->type == PLAYER || mon->enemy != op) &&	2129	if ((mon->type == PLAYER || mon->enemy != op)
2121	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2130	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2122	#ifdef PROHIBIT_PLAYERKILL
2123	(op->contr->peaceful	2131	&& ((op->contr->peaceful
2124	|| (mon->type == PLAYER	2132	|| (mon->type == PLAYER && mon->contr->peaceful))
2125	&& mon->contr->
2126	peaceful)) &&
2127	#else
2128	op->contr->peaceful &&
2129	#endif
2130	!on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2131	{	2136	{
		2137	--op->speed_left;
		2138
2132	if (!op->contr->braced)	2139	if (!op->contr->braced)
2133	{	2140	{
2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2141	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2135	push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2136	}	2143	}
2137	else	2144	else
2138	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2139		2146
2140	if (op->contr->tmp_invis || op->hide)	2147	if (op->contr->tmp_invis || op->hide)
2141	make_visible (op);	2148	make_visible (op);
2142	}
2143		2149
		2150	return true;
		2151	}
		2152	}
2144	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2145	* roll it if not braced. You can't roll it if you are braced.	2154	* roll it if not braced. You can't roll it if you are braced.
2146	*/	2155	*/
2147	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2157	{
		2158	if (op->speed_left > 0.f)
2148	{	2159	{
		2160	--op->speed_left;
		2161
2149	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2150	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2151	make_visible (op);	2164	make_visible (op);
2152	}
2153		2165
		2166	return true;
		2167	}
		2168	}
2154	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2155	* Way it works is like this: First, it must have some hit points	2170	* Way it works is like this: First, it must have some hit points
2156	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2157	* 1) Not a player, 2) A player, but of a different party. Note	2172	* 1) Not a player, 2) A player, but of a different party. Note
2158	* that party_number -1 is no party, so attacks can still happen.	2173	* that party_number -1 is no party, so attacks can still happen.
2159	*/	2174	*/
2160	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2161	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2176	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2162	{	2177	{
2163		2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2164	/* If the player hasn't hit something this tick, and does
2165	* so, give them speed boost based on weapon speed. Doing
2166	* it here is better than process_players2, which basically
2167	* incurred a 1 tick offset.
2168	*/
2169	if (!op->contr->has_hit)
2170	{	2179	{
2171	op->speed_left += op->speed / op->contr->weapon_sp;	2180	--op->contr->weapon_sp_left;
2172
2173	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2174	}
2175		2181
2176	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2177
2178	/* If attacking another player, that player gets automatic
2179	* hitback, and doesn't loose luck either.
2180	* Disable hitback on the battleground or if the target is
2181	* the wiz.
2182	*/
2183	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2184	{
2185	short luck = mon->stats.luck;
2186
2187	mon->contr->has_hit = 1;
2188	skill_attack (op, mon, 0, 0, 0);
2189	mon->stats.luck = luck;
2190	}
2191		2183
2192	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2193	make_visible (op);	2185	make_visible (op);
2194	}
2195	} /* if player should attack something */
2196	}
2197		2186
2198	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2199	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2200	{	2196	{
2201	int pick;	2197	int pick;
2202		2198
2203	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2210	return 0;	2206	return 0;
2211	}	2207	}
2212		2208
2213	/* peterm: added following line */	2209	/* peterm: added following line */
2214	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2210	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2215	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2211	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2216		2212
2217	op->facing = dir;	2213	op->facing = dir;
2218		2214
2219	if (op->hide)	2215	if (op->hide)
2220	do_hidden_move (op);	2216	do_hidden_move (op);
2221		2217
		2218	bool retval;
		2219
2222	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2223	/*nop */ ;	2221	retval = RESULT_INT (0);
2224	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2225	fire (op, dir);	2223	retval = fire (op, dir);
2226	else	2224	else
2227	{	2225	{
2228	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2229	pick = check_pick (op);	2227	pick = check_pick (op);
2230	}	2228	}
2231		2229
2232	/* Add special check for newcs players and fire on - this way, the	2230	/* Add special check for newcs players and fire on - this way, the
2233	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2240	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2241	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2242	* for players.	2240	* for players.
2243	*/	2241	*/
2244	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2245	return 0;	2243
		2244	return retval;
2246	}	2245	}
2247		2246
2248	/* This is similar to handle_player, below, but is only used by the	2247	/* This is similar to handle_player, below, but is only used by the
2249	* new client/server stuff.	2248	* new client/server stuff.
2250	* This is sort of special, in that the new client/server actually uses	2249	* This is sort of special, in that the new client/server actually uses
2251	* the new speed values for commands.	2250	* the new speed values for commands.
2252	*	2251	*
2253	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do. Should not do
		2253	* many actions in a row, as that would be too unfair to other
		2254	* players.
2254	*/	2255	*/
2255	int	2256	bool
2256	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2257	{	2258	{
2258	if (op->contr->hidden)
2259	{
2260	op->invisible = 1000;
2261	/* the socket code flashes the player visible/invisible
2262	* depending on the value of invisible, so we need to
2263	* alternate it here for it to work correctly.
2264	*/
2265	if (pticks & 2)
2266	op->invisible--;
2267	}
2268	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2269	{
2270	op->invisible--;
2271	if (!op->invisible)
2272	{
2273	make_visible (op);
2274	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2275	}
2276	}
2277
2278	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2279	{	2260	{
2280	flee_player (op);	2261	if (op->speed_left > 0.f)
2281	/* If player is still scared, that is his action for this tick */
2282	if (QUERY_FLAG (op, FLAG_SCARED))
2283	{	2262	{
2284	op->speed_left--;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2285	return 0;	2266	return true;
2286	}	2267	}
		2268	else
		2269	return false;
2287	}	2270	}
2288
2289	/* I've been seeing crashes where the golem has been destroyed, but
2290	* the player object still points to the defunct golem. The code that
2291	* destroys the golem looks correct, and it doesn't always happen, so
2292	* put this in a a workaround to clean up the golem pointer.
2293	*/
2294	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2295	op->contr->ranges[range_golem] = 0;
2296		2271
2297	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2298	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2299	* called, so we recheck it here.	2274	* called, so we recheck it here.
2300	*/	2275	*/
2301	if (op->contr->ns->handle_command ())	2276	if (op->contr->ns->handle_command ())
2302	return 1;	2277	return true;
2303		2278
2304	if (op->speed_left > 0)
2305	{
2306	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2307	{
2308	/* All move commands take 1 tick, at least for now */
2309	op->speed_left--;
2310
2311	/* Instead of all the stuff below, let move_player take care
2312	* of it. Also, some of the skill stuff is only put in
2313	* there, as well as the confusion stuff.
2314	*/
2315	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2316		2281
2317	return op->speed_left > 0;
2318	}
2319	}
2320
2321	return 0;	2282	return false;
2322	}	2283	}
2323		2284
2324	int	2285	int
2325	save_life (object *op)	2286	save_life (object *op)
2326	{	2287	{
…		…
2361	* from.	2322	* from.
2362	*/	2323	*/
2363	void	2324	void
2364	remove_unpaid_objects (object *op, object *env)	2325	remove_unpaid_objects (object *op, object *env)
2365	{	2326	{
2366	object *next;
2367
2368	while (op)	2327	while (op)
2369	{	2328	{
2370	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2329	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2371		2330
2372	if (QUERY_FLAG (op, FLAG_UNPAID))	2331	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2438	int rate_grace = 2000;	2397	int rate_grace = 2000;
2439	const int max_hp = 1;	2398	const int max_hp = 1;
2440	const int max_sp = 1;	2399	const int max_sp = 1;
2441	const int max_grace = 1;	2400	const int max_grace = 1;
2442		2401
2443	if (op->contr->outputs_sync)	2402	if (op->contr->hidden)
		2403	{
		2404	op->invisible = 1000;
		2405	/* the socket code flashes the player visible/invisible
		2406	* depending on the value of invisible, so we need to
		2407	* alternate it here for it to work correctly.
		2408	*/
		2409	if (pticks & 2)
		2410	op->invisible--;
2444	{	2411	}
2445	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2412	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2446	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2413	{
2447	flush_output_element (op, &op->contr->outputs[i]);	2414	if (!op->invisible--)
		2415	{
		2416	make_visible (op);
		2417	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2418	}
2448	}	2419	}
2449		2420
2450	if (op->contr->ns->state == ST_PLAYING)	2421	if (op->contr->ns->state == ST_PLAYING)
2451	{	2422	{
2452	/* these next three if clauses make it possible to SLOW DOWN	2423	/* these next three if clauses make it possible to SLOW DOWN
…		…
2474	gen_grace = op->stats.maxgrace;	2445	gen_grace = op->stats.maxgrace;
2475	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2446	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476	}	2447	}
2477		2448
2478	/* Regenerate Spell Points */	2449	/* Regenerate Spell Points */
2479	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2450	if (!op->contr->golem && --op->last_sp < 0)
2480	{	2451	{
2481	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2452	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2482	if (op->stats.sp < op->stats.maxsp)	2453	if (op->stats.sp < op->stats.maxsp)
2483	{	2454	{
2484	op->stats.sp++;	2455	op->stats.sp++;
…		…
2582	}	2553	}
2583		2554
2584	/* Digestion */	2555	/* Digestion */
2585	if (--op->last_eat < 0)	2556	if (--op->last_eat < 0)
2586	{	2557	{
2587	#ifdef COZY_SERVER
2588	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2589	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2590	#else
2591	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2558	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2592	#endif
2593		2559
2594	if (op->contr->gen_hp > 0)	2560	if (op->contr->gen_hp > 0)
2595	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2596	else	2562	else
2597	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2702	tmp->name = buf;	2668	tmp->name = buf;
2703	sprintf (buf, " This finger has been cut off %s\n"	2669	sprintf (buf, " This finger has been cut off %s\n"
2704	" the %s, when he was defeated at\n level %d by %s.\n",	2670	" the %s, when he was defeated at\n level %d by %s.\n",
2705	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2671	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2706	tmp->msg = buf;	2672	tmp->msg = buf;
2707	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2673	tmp->value = 0, tmp->type = 0;
2708	tmp->materialname = NULL;	2674	tmp->materialname = "organics";
2709	tmp->insert_at (op, tmp);	2675	tmp->insert_at (op, tmp);
2710	}	2676	}
2711		2677
2712	/* teleport defeated player to new destination */	2678	/* teleport defeated player to new destination */
2713	transfer_ob (op, x, y, 0, NULL);	2679	transfer_ob (op, x, y, 0, NULL);
…		…
2909	op->stats.hp = op->stats.maxhp;	2875	op->stats.hp = op->stats.maxhp;
2910	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2876	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2911	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2877	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2912		2878
2913	/*	2879	/*
2914	* Check to see if the player is in a shop. IF so, then check to see if
2915	* the player has any unpaid items. If so, remove them and put them back	2880	* Check to see if the player has any unpaid items. If so, remove them
2916	* in the map.	2881	* and put them back in the map.
2917	*/	2882	*/
2918
2919	if (is_in_shop (op))
2920	remove_unpaid_objects (op->inv, op);	2883	remove_unpaid_objects (op->inv, op);
2921		2884
2922	/****************************************/	2885	/****************************************/
2923	/* */	2886	/* */
2924	/* Move player to his current respawn- */	2887	/* Move player to his current respawn- */
2925	/* position (usually last savebed) */	2888	/* position (usually last savebed) */
…		…
2945	object *force;	2908	object *force;
2946	int at;	2909	int at;
2947		2910
2948	force = get_archetype (FORCE_NAME);	2911	force = get_archetype (FORCE_NAME);
2949	/* 50 ticks should be enough time for the spell to abate */	2912	/* 50 ticks should be enough time for the spell to abate */
2950	force->speed = 0.1;	2913	force->speed = 0.1f;
2951	force->speed_left = -5.0;	2914	force->speed_left = -5.f;
2952	SET_FLAG (force, FLAG_APPLIED);	2915	SET_FLAG (force, FLAG_APPLIED);
2953	for (at = 0; at < NROFATTACKS; at++)	2916	for (at = 0; at < NROFATTACKS; at++)
2954	if (will_kill_again & (1 << at))	2917	if (will_kill_again & (1 << at))
2955	force->resist[at] = 100;	2918	force->resist[at] = 100;
2956		2919
…		…
2965	void	2928	void
2966	loot_object (object *op)	2929	loot_object (object *op)
2967	{ /* Grab and destroy some treasure */	2930	{ /* Grab and destroy some treasure */
2968	object *tmp, *tmp2, *next;	2931	object *tmp, *tmp2, *next;
2969		2932
2970	if (op->container)	2933	op->close_container (); /* close open sack first */
2971	esrv_apply_container (op, op->container); /* close open sack first */
2972		2934
2973	for (tmp = op->inv; tmp; tmp = next)	2935	for (tmp = op->inv; tmp; tmp = next)
2974	{	2936	{
2975	next = tmp->below;	2937	next = tmp->below;
2976		2938
2977	if (tmp->invisible)	2939	if (tmp->invisible)
2978	continue;	2940	continue;
2979		2941
2980	tmp->remove ();	2942	tmp->remove ();
2981	tmp->x = op->x, tmp->y = op->y;	2943	tmp->x = op->x, tmp->y = op->y;
		2944
2982	if (tmp->type == CONTAINER)	2945	if (tmp->type == CONTAINER)
2983	{ /* empty container to ground */	2946	loot_object (tmp); /* empty container to ground */
2984	loot_object (tmp);	2947
2985	}
2986	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2948	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2987	{	2949	{
2988	if (tmp->nrof > 1)	2950	if (tmp->nrof > 1)
2989	{	2951	{
2990	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2952	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2991	tmp2->destroy ();	2953	tmp2->destroy ();
…		…
3002	/*	2964	/*
3003	* fix_weight(): Check recursively the weight of all players, and fix	2965	* fix_weight(): Check recursively the weight of all players, and fix
3004	* what needs to be fixed. Refresh windows and fix speed if anything	2966	* what needs to be fixed. Refresh windows and fix speed if anything
3005	* was changed.	2967	* was changed.
3006	*/	2968	*/
3007
3008	void	2969	void
3009	fix_weight (void)	2970	fix_weight (void)
3010	{	2971	{
3011	for_all_players (pl)	2972	for_all_players (pl)
3012	{	2973	{
…		…
3072	if (op->type == PLAYER)	3033	if (op->type == PLAYER)
3073	{	3034	{
3074	op->contr->tmp_invis = 0;	3035	op->contr->tmp_invis = 0;
3075	op->contr->invis_race = 0;	3036	op->contr->invis_race = 0;
3076	}	3037	}
		3038
3077	update_object (op, UP_OBJ_FACE);	3039	update_object (op, UP_OBJ_CHANGE);
3078	}	3040	}
3079		3041
3080	int	3042	int
3081	is_true_undead (object *op)	3043	is_true_undead (object *op)
3082	{	3044	{
3083	object *tmp = NULL;
3084
3085	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3045	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3086	return 1;	3046	return 1;
3087		3047
3088	return 0;	3048	return 0;
3089	}	3049	}
…		…
3134	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3135	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3136	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3137	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3138	*/	3098	*/
3139
3140	void	3099	void
3141	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3142	{	3101	{
3143	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3144	object *skop;	3103	object *skop;
…		…
3377	char buf[MAX_BUF]; /* tmp. string buffer */	3336	char buf[MAX_BUF]; /* tmp. string buffer */
3378	int i = 0, j = 0;	3337	int i = 0, j = 0;
3379		3338
3380	/* get the appropriate treasurelist */	3339	/* get the appropriate treasurelist */
3381	if (atnr == ATNR_FIRE)	3340	if (atnr == ATNR_FIRE)
3382	trlist = find_treasurelist ("dragon_ability_fire");	3341	trlist = treasurelist::find ("dragon_ability_fire");
3383	else if (atnr == ATNR_COLD)	3342	else if (atnr == ATNR_COLD)
3384	trlist = find_treasurelist ("dragon_ability_cold");	3343	trlist = treasurelist::find ("dragon_ability_cold");
3385	else if (atnr == ATNR_ELECTRICITY)	3344	else if (atnr == ATNR_ELECTRICITY)
3386	trlist = find_treasurelist ("dragon_ability_elec");	3345	trlist = treasurelist::find ("dragon_ability_elec");
3387	else if (atnr == ATNR_POISON)	3346	else if (atnr == ATNR_POISON)
3388	trlist = find_treasurelist ("dragon_ability_poison");	3347	trlist = treasurelist::find ("dragon_ability_poison");
3389		3348
3390	if (trlist == NULL || who->type != PLAYER)	3349	if (trlist == NULL || who->type != PLAYER)
3391	return;	3350	return;
3392		3351
3393	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3352	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3467	/* forces in the treasurelist can alter the player's stats */	3426	/* forces in the treasurelist can alter the player's stats */
3468	object *skin;	3427	object *skin;
3469		3428
3470	/* first get the dragon skin force */	3429	/* first get the dragon skin force */
3471	shstr_cmp dragon_skin_force ("dragon_skin_force");	3430	shstr_cmp dragon_skin_force ("dragon_skin_force");
3472	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3431	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3473	;	3432	;
3474		3433
3475	if (!skin)	3434	if (!skin)
3476	return;	3435	return;
3477		3436
…		…
3525	* not readied.	3484	* not readied.
3526	*/	3485	*/
3527	void	3486	void
3528	player_unready_range_ob (player *pl, object *ob)	3487	player_unready_range_ob (player *pl, object *ob)
3529	{	3488	{
3530	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3489	if (pl->ob->current_weapon == ob)
		3490	pl->ob->current_weapon = 0;
		3491
		3492	if (pl->combat_ob == ob)
		3493	pl->combat_ob = 0;
		3494
3531	if (pl->ranges[i] == ob)	3495	if (pl->ranged_ob == ob)
3532	{
3533	pl->ranges[i] = 0;	3496	pl->ranged_ob = 0;
3534	if (pl->shoottype == i)
3535	pl->shoottype = range_none;
3536	}
3537	}	3497	}
		3498
		3499	sint8
		3500	player::visibility_at (maptile *map, int x, int y) const
		3501	{
		3502	if (!ns)
		3503	return 0;
		3504
		3505	int dx, dy;
		3506	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3507	return 0;
		3508
		3509	x += dx - ns->current_x + ns->mapx / 2;
		3510	y += dy - ns->current_y + ns->mapy / 2;
		3511
		3512	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3513	return 0;
		3514
		3515	return 100 - blocked_los [x][y];
		3516	}

Diff Legend

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