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.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC vs.
Revision 1.153 by root, Tue Jul 10 05:51:38 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <pwd.h>
27	#include <sproto.h>	25	#include <sproto.h>
28	#include <sounds.h>	26	#include <sounds.h>
29	#include <living.h>	27	#include <living.h>
30	#include <object.h>	28	#include <object.h>
31	#include <spells.h>	29	#include <spells.h>
…		…
124	continue;	122	continue;
125		123
126	if (*buf == '%')	124	if (*buf == '%')
127	{ /* send one news */	125	{ /* send one news */
128	if (size > 0)	126	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 */	127	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		128
131	strcpy (subject, buf + 1);	129	strcpy (subject, buf + 1);
132	strip_endline (subject);	130	strip_endline (subject);
133	size = 0;	131	size = 0;
134	news[0] = '\0';	132	news[0] = '\0';
…		…
144	size += strlen (buf);	142	size += strlen (buf);
145	}	143	}
146	}	144	}
147		145
148	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	146	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);	147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150	close_and_delete (fp, comp);	148	close_and_delete (fp, comp);
151	}	149	}
152		150
153	/* This loads the first map an puts the player on it. */	151	/* This loads the first map an puts the player on it. */
154	static void	152	static void
155	set_first_map (object *op)	153	set_first_map (object *op)
156	{	154	{
157	op->contr->maplevel = first_map_path;	155	op->contr->maplevel = first_map_path;
158	op->x = -1;	156	op->x = -1;
159	op->y = -1;	157	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	}	158	}
174		159
175	void	160	void
176	player::activate ()	161	player::activate ()
177	{	162	{
…		…
182	ob->remove ();	167	ob->remove ();
183	ob->map = 0;	168	ob->map = 0;
184	ob->activate_recursive ();	169	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	171	add_friendly_object (ob);
187	enter_map ();
188	}	172	}
189		173
190	void	174	void
191	player::deactivate ()	175	player::deactivate ()
192	{	176	{
…		…
194	return;	178	return;
195		179
196	terminate_all_pets (ob);	180	terminate_all_pets (ob);
197	remove_friendly_object (ob);	181	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	182	ob->deactivate_recursive ();
		183
		184	if (ob->map)
199	maplevel = ob->map->path;	185	maplevel = ob->map->path;
		186
200	ob->remove ();	187	ob->remove ();
201	ob->map = 0;	188	ob->map = 0;
202	party = 0;	189	party = 0;
203		190
204	// for weird reasons, this is often "ob", keeping a circular reference	191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
205	ranges [range_skill] = 0;
206		192
207	players.erase (this);	193	players.erase (this);
208	}	194	}
209		195
210	// connect the player with a specific client	196	// connect the player with a specific client
211	// also changed, rationalises, and fixes some incorrect settings	197	// also changes, rationalises, and fixes some incorrect settings
212	void	198	void
213	player::connect (client *ns)	199	player::connect (client *ns)
214	{	200	{
215	this->ns = ns;	201	this->ns = ns;
216	ns->pl = this;	202	ns->pl = this;
…		…
220	ob->close_container (); //TODO: client-specific	206	ob->close_container (); //TODO: client-specific
221		207
222	ns->update_look = 0;	208	ns->update_look = 0;
223	ns->look_position = 0;	209	ns->look_position = 0;
224		210
225	clear_los (ob);	211	clear_los (this);
226		212
227	ns->reset_stats ();	213	ns->reset_stats ();
228		214
229	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
230	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
231	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
232
233	if (!legal_range (ob, shoottype))
234	shoottype = range_none;
235		218
236	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
237	link_player_skills (ob);	220	link_player_skills (ob);
238		221
239	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
240		223
241	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
242		225
243	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
244	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
245	{	228	{
246	object *tmp, *abil = 0, *skin = 0;	229	object *tmp, *abil = 0, *skin = 0;
247		230
248	shstr_cmp dragon_ability_force ("dragon_ability_force");
249	shstr_cmp dragon_skin_force ("dragon_skin_force");
250
251	for (tmp = ob->inv; tmp; tmp = tmp->below)	231	for (tmp = ob->inv; tmp; tmp = tmp->below)
252	if (tmp->type == FORCE)	232	if (tmp->type == FORCE)
253	if (tmp->arch->name == dragon_ability_force)	233	if (tmp->arch->archname == shstr_dragon_ability_force)
254	abil = tmp;	234	abil = tmp;
255	else if (tmp->arch->name == dragon_skin_force)	235	else if (tmp->arch->archname == shstr_dragon_skin_force)
256	skin = tmp;	236	skin = tmp;
257		237
258	set_dragon_name (ob, abil, skin);	238	set_dragon_name (ob, abil, skin);
259	}	239	}
260		240
261	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
262		242
263	esrv_new_player (this, ob->weight + ob->carrying);	243	esrv_new_player (this, ob->weight + ob->carrying);
264		244
		245	ob->flag [FLAG_READY_WEAPON] = false;
		246	ob->flag [FLAG_READY_SKILL] = false;
		247	ob->flag [FLAG_READY_BOW] = false;
		248
		249	for (object *op = ob->inv; op; op = op->below)
		250	if (op->flag [FLAG_APPLIED])
		251	switch (op->type)
		252	{
		253	case SKILL:
		254	ob->flag [FLAG_APPLIED] = false;
		255	break;
		256
		257	case WAND:
		258	case ROD:
		259	case HORN:
		260	case BOW:
		261	ranged_ob = op;
		262	break;
		263
		264	case WEAPON:
		265	combat_ob = op;
		266	break;
		267	}
		268
		269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
265	ob->update_stats ();	270	ob->update_stats ();
		271
266	ns->floorbox_update ();	272	ns->floorbox_update ();
267
268	esrv_send_inventory (ob, ob);	273	esrv_send_inventory (ob, ob);
269	esrv_add_spells (this, 0);	274	esrv_add_spells (this, 0);
270		275
271	activate ();	276	activate ();
272		277
…		…
288		293
289	INVOKE_PLAYER (DISCONNECT, this);	294	INVOKE_PLAYER (DISCONNECT, this);
290		295
291	ns->reset_stats ();	296	ns->reset_stats ();
292	ns->pl = 0;	297	ns->pl = 0;
293	this->ns = 0;	298	ns = 0;
294	}	299	}
295		300
296	if (ob)	301	if (ob)
297	ob->close_container (); //TODO: client-specific	302	ob->close_container (); //TODO: client-specific
		303
		304	observe = ob;
298		305
299	deactivate ();	306	deactivate ();
300	}	307	}
301		308
302	// the need for this function can be explained	309	// the need for this function can be explained
303	// by load_object not returning the object	310	// by load_object not returning the object
304	void	311	void
305	player::set_object (object *op)	312	player::set_object (object *op)
306	{	313	{
307	ob = op;	314	ob = observe = op;
308	ob->contr = this; /* this aren't yet in archetype */	315	ob->contr = this; /* this aren't yet in archetype */
309		316
310	ob->speed_left = 0.5;
311	ob->speed = 1.0;	317	ob->speed = 1.0f;
		318	ob->speed_left = 0.5f;
		319
312	ob->direction = 5; /* So player faces south */	320	ob->direction = 5; /* So player faces south */
		321	}
		322
		323	void
		324	player::set_observe (object *op)
		325	{
		326	observe = op ? op : ob;
		327	do_los = 1;
313	}	328	}
314		329
315	player::player ()	330	player::player ()
316	{	331	{
317	/* There are some elements we want initialised to non zero value -	332	/* There are some elements we want initialised to non zero value -
318	* we deal with that below this point.	333	* we deal with that below this point.
319	*/	334	*/
320	outputs_sync = 16; /* Every 2 seconds */	335	outputs_sync = 4;
321	outputs_count = 8; /* Keeps present behaviour */	336	outputs_count = 4;
322	unapply = unapply_nochoice;	337	unapply = unapply_nochoice;
323		338
324	savebed_map = first_map_path; /* Init. respawn position */	339	savebed_map = first_map_path; /* Init. respawn position */
325		340
326	gen_sp_armour = 10;	341	gen_sp_armour = 10;
327	shoottype = range_none;
328	bowtype = bow_normal;	342	bowtype = bow_normal;
329	petmode = pet_normal;	343	petmode = pet_normal;
330	listening = 10;	344	listening = 10;
331	usekeys = containers;	345	usekeys = containers;
332	peaceful = 1; /* default peaceful */	346	peaceful = 1; /* default peaceful */
333	do_los = 1;	347	do_los = 1;
		348
		349	weapon_sp = 1.0f;
		350	weapon_sp_left = 0.5f;
334	}	351	}
335		352
336	void	353	void
337	player::do_destroy ()	354	player::do_destroy ()
338	{	355	{
…		…
343	if (ob)	360	if (ob)
344	{	361	{
345	ob->destroy_inv (false);	362	ob->destroy_inv (false);
346	ob->destroy ();	363	ob->destroy ();
347	}	364	}
		365
		366	ob = observe = 0;
348	}	367	}
349		368
350	player::~player ()	369	player::~player ()
351	{	370	{
352	/* Clear item stack */	371	/* Clear item stack */
…		…
379	* Note: there MUST be at least one player archetype!	398	* Note: there MUST be at least one player archetype!
380	*/	399	*/
381	archetype *	400	archetype *
382	get_player_archetype (archetype *at)	401	get_player_archetype (archetype *at)
383	{	402	{
384	archetype *start = at;	403	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
385		404
386	for (;;)	405	for (;;)
387	{	406	{
388	if (at == NULL || at->next == NULL)	407	if (++i == archetypes.end ())
389	at = first_archetype;	408	i = archetypes.begin ();
390	else	409	else if (*i == at)
391	at = at->next;	410	cleanup ("not a single player archetype found");
392		411
393	if (at->clone.type == PLAYER)	412	if ((*i)->type == PLAYER)
394	return at;	413	return *i;
395
396	if (at == start)
397	{
398	LOG (llevError, "No Player archetypes\n");
399	exit (-1);
400	}
401	}	414	}
402	}	415	}
403		416
404	object *	417	object *
405	get_nearest_player (object *mon)	418	get_nearest_player (object *mon)
…		…
771	}	784	}
772		785
773	void	786	void
774	object::roll_stats ()	787	object::roll_stats ()
775	{	788	{
776	int statsort [7];	789	int statsort [NUM_STATS];
777		790
778	for (;;)	791	for (;;)
779	{	792	{
780	int sum = 0;	793	int sum = 0;
781	for (int i = 7; i--; )	794	for (int i = NUM_STATS; i--; )
782	sum += statsort [i] = roll_stat ();	795	sum += statsort [i] = roll_stat ();
783		796
784	if (sum >= 82 && sum <= 116)	797	if (sum >= 82 && sum <= 116)
785	break;	798	break;
786	}	799	}
787		800
788	// Sort the stats so that rerolling is easier...	801	// Sort the stats so that rerolling is easier...
789	std::sort (statsort, statsort + 7, std::greater<int>());	802	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
790		803
		804	for (int i = 0; i < NUM_STATS; ++i)
791	stats.Str = statsort[0];	805	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		806
799	stats.exp = 0;	807	stats.exp = 0;
800	stats.ac = 0;	808	stats.ac = 0;
801		809
802	stats.hp = stats.maxhp;	810	stats.hp = stats.maxhp;
…		…
814	}	822	}
815		823
816	void	824	void
817	object::swap_stats (int a, int b)	825	object::swap_stats (int a, int b)
818	{	826	{
819	int tmp = get_attr_value (&contr->orig_stats, a);	827	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		828
		829	for (int i = 0; i < NUM_STATS; ++i)
823	stats.Str = contr->orig_stats.Str;	830	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		831
831	//TODO: the following code looks so borked and should, at the very least,	832	//TODO: the following code looks so borked and should, at the very least,
832	// be merged with the similar code in roll_stats	833	// be merged with the similar code in roll_stats
833	stats.ac = 0;	834	stats.ac = 0;
834		835
…		…
865	* appropriate action with it (change race, or other things).	866	* appropriate action with it (change race, or other things).
866	* The function name is for historical reasons - now we have	867	* The function name is for historical reasons - now we have
867	* separate race and class; this actually changes the RACE,	868	* separate race and class; this actually changes the RACE,
868	* not the class.	869	* not the class.
869	*/	870	*/
870	int	871	void
871	key_change_class (object *op, char key)	872	player::chargen_race_done ()
872	{	873	{
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 */	874	/* this must before then initial items are given */
880	esrv_new_player (op->contr, op->weight + op->carrying);	875	esrv_new_player (ob->contr, ob->weight + ob->carrying);
881		876
882	treasurelist *tl = find_treasurelist ("starting_wealth");	877	treasurelist *tl = treasurelist::find ("starting_wealth");
883	if (tl)	878	if (tl)
884	create_treasure (tl, op, 0, 0, 0);	879	create_treasure (tl, ob, 0, 0, 0);
885		880
886	INVOKE_PLAYER (BIRTH, op->contr);	881	INVOKE_PLAYER (BIRTH, ob->contr);
887	INVOKE_PLAYER (LOGIN, op->contr);	882	INVOKE_PLAYER (LOGIN, ob->contr);
888		883
889	op->contr->ns->state = ST_PLAYING;	884	ob->contr->ns->state = ST_PLAYING;
890		885
891	if (op->msg)	886	if (ob->msg)
892	op->msg = NULL;	887	ob->msg = 0;
893		888
894	/* We create this now because some of the unique maps will need it	889	/* We create this now because some of the unique maps will need it
895	* to save here.	890	* to save here.
896	*/	891	*/
		892	{
		893	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);	895	make_path_to_file (buf);
		896	}
899		897
900	start_info (op);	898	start_info (ob);
901	CLEAR_FLAG (op, FLAG_WIZ);	899	CLEAR_FLAG (ob, FLAG_WIZ);
902	give_initial_items (op, op->randomitems);	900	give_initial_items (ob, ob->randomitems);
903	link_player_skills (op);	901	link_player_skills (ob);
904	esrv_send_inventory (op, op);	902	esrv_send_inventory (ob, ob);
905	op->update_stats ();	903	ob->update_stats ();
906		904
907	/* This moves the player to a different start map, if there	905	/* This moves the player to a different start map, if there
908	* is one for this race	906	* is one for this race
909	*/	907	*/
910	if (*first_map_ext_path)	908	if (*first_map_ext_path)
911	{	909	{
912	object *tmp;	910	object *tmp;
913	char mapname[MAX_BUF];	911	char mapname[MAX_BUF];
914		912
915	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
916	tmp = object::create ();	914	tmp = object::create ();
917	EXIT_PATH (tmp) = mapname;	915	EXIT_PATH (tmp) = mapname;
918	EXIT_X (tmp) = op->x;	916	EXIT_X (tmp) = ob->x;
919	EXIT_Y (tmp) = op->y;	917	EXIT_Y (tmp) = ob->y;
920	op->enter_exit (tmp); /* we don't really care if it succeeded;	918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
921	* if the map isn't there, then stay on the	919	* if the map isn't there, then stay on the
922	* default initial map */	920	* default initial map */
923	tmp->destroy ();	921	tmp->destroy ();
924	}	922	}
925	else	923	else
926	LOG (llevDebug, "first_map_ext_path not set\n");	924	LOG (llevDebug, "first_map_ext_path not set\n");
		925	}
927		926
928	return 0;	927	void
929	}	928	player::chargen_race_next ()
930		929	{
931	/* Following actually changes the race - this is the default command	930	/* Following actually changes the race - this is the default command
932	* if we don't match with one of the options above.	931	* if we don't match with one of the options above.
933	*/	932	*/
934		933
935	tmp_loop = 0;	934	do
936	while (!tmp_loop)
937	{	935	{
938	shstr name = op->name;	936	shstr name = ob->name;
939	int x = op->x, y = op->y;	937	int x = ob->x, y = ob->y;
940		938
941	op->remove_statbonus ();	939	ob->remove_statbonus ();
942	op->remove ();	940	ob->remove ();
943	op->arch = get_player_archetype (op->arch);	941	ob->arch = get_player_archetype (ob->arch);
944	op->arch->clone.copy_to (op);	942	ob->arch->copy_to (ob);
945	op->instantiate ();	943	ob->instantiate ();
946	op->stats = op->contr->orig_stats;	944	ob->stats = ob->contr->orig_stats;
947	op->name = op->name_pl = name;	945	ob->name = ob->name_pl = name;
948	op->x = x;	946	ob->x = x;
949	op->y = y;	947	ob->y = y;
950	SET_ANIMATION (op, 2); /* So player faces south */	948	SET_ANIMATION (ob, 2); /* So player faces south */
951	insert_ob_in_map (op, op->map, op, 0);	949	insert_ob_in_map (ob, ob->map, ob, 0);
952	assign (op->contr->title, op->arch->clone.name);	950	assign (ob->contr->title, ob->arch->object::name);
953	op->add_statbonus ();	951	ob->add_statbonus ();
954	tmp_loop = allowed_class (op);
955	}	952	}
		953	while (!allowed_class (ob));
956		954
957	update_object (op, UP_OBJ_FACE);	955	update_object (ob, UP_OBJ_FACE);
958	esrv_update_item (UPD_FACE, op, op);	956	esrv_update_item (UPD_FACE, ob, ob);
959	op->update_stats ();	957	ob->update_stats ();
960	op->stats.hp = op->stats.maxhp;	958	ob->stats.hp = ob->stats.maxhp;
961	op->stats.sp = op->stats.maxsp;	959	ob->stats.sp = ob->stats.maxsp;
962	op->stats.grace = 0;	960	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	}	961	}
970		962
971	void	963	void
972	flee_player (object *op)	964	flee_player (object *op)
973	{	965	{
…		…
1020	/* Cornered, get rid of scared */	1012	/* Cornered, get rid of scared */
1021	CLEAR_FLAG (op, FLAG_SCARED);	1013	CLEAR_FLAG (op, FLAG_SCARED);
1022	op->enemy = NULL;	1014	op->enemy = NULL;
1023	}	1015	}
1024		1016
1025
1026	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1017	/* 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	1018	* It returns 1 if the player should keep on moving, 0 if he should
1028	* stop.	1019	* stop.
1029	*/	1020	*/
1030	int	1021	int
1031	check_pick (object *op)	1022	check_pick (object *op)
1032	{	1023	{
…		…
1109	if (tmp->name != NULL)	1100	if (tmp->name != NULL)
1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1101	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))));	1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112	else	1103	else
1113	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	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))));	1105	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1115		1106
1116	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1117	}	1108	}
1118		1109
1119	/* philosophy:	1110	/* philosophy:
…		…
1312	/* careful: chairs and tables are weapons! */	1303	/* careful: chairs and tables are weapons! */
1313	if (op->contr->mode & PU_ALLWEAPON)	1304	if (op->contr->mode & PU_ALLWEAPON)
1314	{	1305	{
1315	if (tmp->type == WEAPON && tmp->name != NULL)	1306	if (tmp->type == WEAPON && tmp->name != NULL)
1316	{	1307	{
1317	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1318	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1309	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1319	{	1310	{
1320	pick_up (op, tmp);	1311	pick_up (op, tmp);
1321	continue;	1312	continue;
1322	}	1313	}
1323	}	1314	}
1324		1315
1325	if (tmp->type == WEAPON && tmp->name == NULL)	1316	if (tmp->type == WEAPON && tmp->name == NULL)
1326	{	1317	{
1327	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1318	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1328	{	1319	{
1329	pick_up (op, tmp);	1320	pick_up (op, tmp);
1330	continue;	1321	continue;
1331	}	1322	}
1332	}	1323	}
…		…
1357	if (tmp->name != NULL)	1348	if (tmp->name != NULL)
1358	{	1349	{
1359	fprintf (stderr, "%s", tmp->name);	1350	fprintf (stderr, "%s", tmp->name);
1360	}	1351	}
1361	else	1352	else
1362	fprintf (stderr, "%s", tmp->arch->name);	1353	fprintf (stderr, "%s", tmp->arch->archname);
1363	fprintf (stderr, ",%d] = ", tmp->type);	1354	fprintf (stderr, ",%d] = ", tmp->type);
1364	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1365	#endif	1356	#endif
1366	continue;	1357	continue;
1367	}	1358	}
…		…
1437	else	1428	else
1438	{	1429	{
1439	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1440	{	1431	{
1441	attacktype = 1 << attacknum;	1432	attacktype = 1 << attacknum;
1442	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1433	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1443	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1444	{	1435	{
1445	tmp = arrow;	1436	tmp = arrow;
1446	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1447	}	1438	}
1448	}	1439	}
1449	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1450	{	1441	{
1451	tmp = arrow;	1442	tmp = arrow;
…		…
1470	* find_better_arrow to find a decent arrow to use.	1461	* find_better_arrow to find a decent arrow to use.
1471	* op = the shooter	1462	* op = the shooter
1472	* type = bow->race	1463	* type = bow->race
1473	* dir = fire direction	1464	* dir = fire direction
1474	*/	1465	*/
1475
1476	object *	1466	object *
1477	pick_arrow_target (object *op, const char *type, int dir)	1467	pick_arrow_target (object *op, const char *type, int dir)
1478	{	1468	{
1479	object *tmp = NULL;	1469	object *tmp = NULL;
1480	maptile *m;	1470	maptile *m;
…		…
1545	*/	1535	*/
1546	int	1536	int
1547	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1537	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1548	{	1538	{
1549	object *left, *bow;	1539	object *left, *bow;
1550	int bowspeed, mflags;	1540	int mflags;
1551	maptile *m;	1541	maptile *m;
1552		1542
1553	if (!dir)	1543	if (!dir)
1554	{	1544	{
1555	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1556	return 0;	1546	return 0;
1557	}	1547	}
1558		1548
1559	if (op->type == PLAYER)	1549	if (op->contr)
1560	bow = op->contr->ranges[range_bow];	1550	bow = op->current_weapon;
1561	else	1551	else
1562	{	1552	{
1563	for (bow = op->inv; bow; bow = bow->below)	1553	for (bow = op->inv; bow; bow = bow->below)
1564	/* Don't check for applied - monsters don't apply bows - in that way, they	1554	/* 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.	1555	* don't need to switch back and forth between bows and weapons.
…		…
1570	if (!bow)	1560	if (!bow)
1571	{	1561	{
1572	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1562	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1573	return 0;	1563	return 0;
1574	}	1564	}
		1565
		1566	// optimisation: move object to top so we will find it quickly again
		1567	if (bow->below)
		1568	{
		1569	bow->remove ();
		1570	op->insert (bow);
		1571	}
		1572
1575	}	1573	}
1576		1574
1577	if (!bow->race || !bow->skill)	1575	if (!bow->race || !bow->skill)
1578	{	1576	{
1579	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1577	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1580	return 0;	1578	return 0;
1581	}	1579	}
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		1580
1592	if (arrow == NULL)	1581	if (arrow == NULL)
1593	{	1582	{
1594	if ((arrow = find_arrow (op, bow->race)) == NULL)	1583	if ((arrow = find_arrow (op, bow->race)) == NULL)
1595	{	1584	{
1596	if (op->type == PLAYER)	1585	if (op->type == PLAYER)
1597	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1586	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 */	1587	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599	else	1588	else
1600	CLEAR_FLAG (op, FLAG_READY_BOW);	1589	CLEAR_FLAG (op, FLAG_READY_BOW);
		1590
1601	return 0;	1591	return 0;
1602	}	1592	}
1603	}	1593	}
1604		1594
1605	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1595	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1629		1619
1630	arrow->set_owner (op);	1620	arrow->set_owner (op);
1631	arrow->skill = bow->skill;	1621	arrow->skill = bow->skill;
1632	arrow->direction = dir;	1622	arrow->direction = dir;
1633		1623
		1624	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1625	arrow->stats.hp = arrow->stats.dam;
		1626	arrow->stats.grace = arrow->attacktype;
		1627
		1628	if (arrow->slaying)
		1629	arrow->spellarg = strdup (arrow->slaying);
		1630
		1631	#if 0
		1632	if (player *pl = op->contr)
		1633	{
		1634	float speed = pl->weapon_sp;
		1635
		1636	/* penalize ROF for bestarrow */
		1637	if (pl->bowtype == bow_bestarrow)
		1638	speed *= .9f;
		1639	else
		1640	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1641
		1642	op->speed_left += speed - op->speed;
		1643	}
		1644	#endif
		1645
		1646	SET_ANIMATION (arrow, arrow->direction);
		1647
		1648	/* update the speed */
		1649	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1650	+ bow->stats.dam / 7.f;
		1651
		1652	arrow->set_speed (max (arrow->speed, 2.f));
		1653	arrow->speed_left = 0;
		1654
		1655	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1656
1634	if (op->type == PLAYER)	1657	if (op->type == PLAYER)
1635	{	1658	{
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;	1659	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1660	wc -= dex_bonus[op->stats.Dex];
		1661
		1662	if (!arrow->slaying)
		1663	arrow->slaying = op->slaying;
		1664
		1665	arrow->attacktype |= op->attacktype;
1667	}	1666	}
1668	else	1667	else
1669	{	1668	{
1670	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671	arrow->level = op->level;	1669	arrow->level = op->level;
1672	}	1670	arrow->stats.wc -= bow->magic;
1673		1671
1674	if (arrow->attacktype == AT_PHYSICAL)	1672	if (!arrow->slaying)
		1673	arrow->slaying = bow->slaying;
		1674
1675	arrow->attacktype |= bow->attacktype;	1675	arrow->attacktype |= bow->attacktype;
		1676	}
1676		1677
1677	if (bow->slaying)	1678	wc -= arrow->level;
1678	arrow->slaying = bow->slaying;	1679	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1679		1680
		1681	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1680	arrow->move_type = MOVE_FLY_LOW;	1682	arrow->move_type = MOVE_FLY_LOW;
1681	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1683	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1682		1684
1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1685	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1684	m->insert (arrow, sx, sy, op);	1686	m->insert (arrow, sx, sy, op);
…		…
1709	{	1711	{
1710	int ret = 0, wcmod = 0;	1712	int ret = 0, wcmod = 0;
1711		1713
1712	if (op->contr->bowtype == bow_bestarrow)	1714	if (op->contr->bowtype == bow_bestarrow)
1713	{	1715	{
1714	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1716	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1715	}	1717	}
1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1718	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1717	{	1719	{
1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1720	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1719	wcmod = -1;	1721	wcmod = -1;
…		…
1729	else if (op->contr->bowtype == bow_spreadshot)	1731	else if (op->contr->bowtype == bow_spreadshot)
1730	{	1732	{
1731	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1733	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);	1734	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);	1735	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1734
1735	}	1736	}
1736	else	1737	else
1737	{	1738	{
1738	/* Simple case */	1739	/* Simple case */
1739	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1740	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1740	}	1741	}
		1742
1741	return ret;	1743	return ret;
1742	}	1744	}
1743
1744		1745
1745	/* Fires a misc (wand/rod/horn) object in 'dir'.	1746	/* Fires a misc (wand/rod/horn) object in 'dir'.
1746	* Broken apart from 'fire' to keep it more readable.	1747	* Broken apart from 'fire' to keep it more readable.
1747	*/	1748	*/
1748	void	1749	void
1749	fire_misc_object (object *op, int dir)	1750	fire_misc_object (object *op, int dir)
1750	{	1751	{
1751	object *item;	1752	object *item = op->contr->ranged_ob;
1752		1753
1753	if (!op->contr->ranges[range_misc])	1754	if (!item)
1754	{	1755	{
1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1756	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1756	return;	1757	return;
1757	}	1758	}
1758		1759
1759	item = op->contr->ranges[range_misc];
1760	if (!item->inv)	1760	if (!item->inv)
1761	{	1761	{
1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1763	return;	1763	return;
1764	}	1764	}
		1765
		1766	if (!op->change_weapon (item))
		1767	return;
		1768
1765	if (item->type == WAND)	1769	if (item->type == WAND)
1766	{	1770	{
1767	if (item->stats.food <= 0)	1771	if (item->stats.food <= 0)
1768	{	1772	{
1769	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1773	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));	1774	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1775
1771	return;	1776	return;
1772	}	1777	}
1773	}	1778	}
1774	else if (item->type == ROD || item->type == HORN)	1779	else if (item->type == ROD || item->type == HORN)
1775	{	1780	{
1776	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1781	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1777	{	1782	{
1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1783	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1784
1779	if (item->type == ROD)	1785	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));	1786	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1781	else	1787	else
1782	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1789
1783	return;	1790	return;
1784	}	1791	}
1785	}	1792	}
1786		1793
1787	if (cast_spell (op, item, dir, item->inv, NULL))	1794	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1794	object *tmp;	1801	object *tmp;
1795		1802
1796	if (item->arch)	1803	if (item->arch)
1797	{	1804	{
1798	CLEAR_FLAG (item, FLAG_ANIMATE);	1805	CLEAR_FLAG (item, FLAG_ANIMATE);
1799	item->face = item->arch->clone.face;	1806	item->face = item->arch->face;
1800	item->set_speed (0);	1807	item->set_speed (0);
1801	}	1808	}
1802		1809
1803	if ((tmp = item->in_player ()))	1810	if ((tmp = item->in_player ()))
1804	esrv_update_item (UPD_ANIM, tmp, item);	1811	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1809	}	1816	}
1810	}	1817	}
1811		1818
1812	/* Received a fire command for the player - go and do it.	1819	/* Received a fire command for the player - go and do it.
1813	*/	1820	*/
1814	void	1821	bool
1815	fire (object *op, int dir)	1822	fire (object *op, int dir)
1816	{	1823	{
1817	int spellcost = 0;	1824	int spellcost = 0;
1818		1825
1819	/* check for loss of invisiblity/hide */	1826	/* check for loss of invisiblity/hide */
1820	if (action_makes_visible (op))	1827	if (action_makes_visible (op))
1821	make_visible (op);	1828	make_visible (op);
1822		1829
1823	switch (op->contr->shoottype)	1830	player *pl = op->contr;
		1831
		1832	if (pl->golem)
		1833	{
		1834	control_golem (op->contr->golem, dir);
		1835	return false;
1824	{	1836	}
1825	case range_none:
1826	return;
1827		1837
1828	case range_bow:	1838	object *ob = pl->ranged_ob;
		1839
		1840	if (!ob)
		1841	return false;
		1842
		1843	if (!op->change_weapon (ob))
		1844	return false;
		1845
		1846	if (op->speed_left > 0.f)
		1847	--op->speed_left;
		1848	else
		1849	return false;
		1850
		1851	switch (ob->type)
		1852	{
		1853	case BOW:
1829	player_fire_bow (op, dir);	1854	player_fire_bow (op, dir);
1830	return;	1855	break;
1831		1856
1832	case range_magic: /* Casting spells */	1857	case SPELL:
1833	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1858	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1834	return;	1859	break;
1835		1860
1836	case range_misc:	1861	case BUILDER:
		1862	apply_map_builder (op, dir);
		1863	break;
		1864
		1865	case SKILL:
		1866	do_skill (op, op, ob, dir, 0);
		1867	break;
		1868
		1869	default:
1837	fire_misc_object (op, dir);	1870	fire_misc_object (op, dir);
1838	return;	1871	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	}	1872	}
		1873
		1874	return true;
1867	}	1875	}
1868		1876
1869	/* find_key	1877	/* find_key
1870	* We try to find a key for the door as passed. If we find a key	1878	* We try to find a key for the door as passed. If we find a key
1871	* and successfully use it, we return the key, otherwise NULL	1879	* and successfully use it, we return the key, otherwise NULL
…		…
1958	* 0 otherwise	1966	* 0 otherwise
1959	*/	1967	*/
1960	static int	1968	static int
1961	player_attack_door (object *op, object *door)	1969	player_attack_door (object *op, object *door)
1962	{	1970	{
1963	/* If its a door, try to find a use a key. If we do destroy the door,	1971	/* If its a door, try to find a key. If we do destroy the door,
1964	* might as well return immediately as there is nothing more to do -	1972	* might as well return immediately as there is nothing more to do -
1965	* otherwise, we fall through to the rest of the code.	1973	* otherwise, we fall through to the rest of the code.
1966	*/	1974	*/
1967	object *key = find_key (op, op, door);	1975	object *key = find_key (op, op, door);
1968		1976
1969	/* IF we found a key, do some extra work */	1977	/* If we found a key, do some extra work */
1970	if (key)	1978	if (key)
1971	{	1979	{
1972	object *container = key->env;	1980	object *container = key->env;
1973		1981
1974	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1983
1975	if (action_makes_visible (op))	1984	if (action_makes_visible (op))
1976	make_visible (op);	1985	make_visible (op);
		1986
1977	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1987	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1978	spring_trap (door->inv, op);	1988	spring_trap (door->inv, op);
1979		1989
1980	if (door->type == DOOR)	1990	if (door->type == DOOR)
1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1991	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
2007	* It should keep the code cleaner.	2017	* It should keep the code cleaner.
2008	* When this is called, the players direction has been updated	2018	* When this is called, the players direction has been updated
2009	* (taking into account confusion.) The player is also actually	2019	* (taking into account confusion.) The player is also actually
2010	* going to try and move (not fire weapons).	2020	* going to try and move (not fire weapons).
2011	*/	2021	*/
2012	void	2022	bool
2013	move_player_attack (object *op, int dir)	2023	move_player_attack (object *op, int dir)
2014	{	2024	{
2015	object *tmp, *mon;
2016	sint16 nx, ny;
2017	int on_battleground;	2025	int on_battleground;
2018	maptile *m;
2019		2026
2020	nx = freearr_x[dir] + op->x;	2027	sint16 nx = freearr_x[dir] + op->x;
2021	ny = freearr_y[dir] + op->y;	2028	sint16 ny = freearr_y[dir] + op->y;
2022		2029
2023	on_battleground = op_on_battleground (op, 0, 0);	2030	on_battleground = op_on_battleground (op, 0, 0);
		2031
		2032	if (out_of_map (op->map, nx, ny))
		2033	return false;
		2034
		2035	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2036	{
		2037	--op->speed_left;
		2038	return true;
		2039	}
2024		2040
2025	/* If braced, or can't move to the square, and it is not out of the	2041	/* If braced, or can't move to the square, and it is not out of the
2026	* map, attack it. Note order of if statement is important - don't	2042	* map, attack it. Note order of if statement is important - don't
2027	* want to be calling move_ob if braced, because move_ob will move the	2043	* want to be calling move_ob if braced, because move_ob will move the
2028	* player. This is a pretty nasty hack, because if we could	2044	* player. This is a pretty nasty hack, because if we could
2029	* move to some space, it then means that if we are braced, we should	2045	* move to some space, it then means that if we are braced, we should
2030	* do nothing at all. As it is, if we are braced, we go through	2046	* do nothing at all. As it is, if we are braced, we go through
2031	* quite a bit of processing. However, it probably is less than what	2047	* quite a bit of processing. However, it probably is less than what
2032	* move_ob uses.	2048	* move_ob uses.
2033	*/	2049	*/
2034	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2035	{
2036	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2037	{
2038	m = op->map->xy_find (nx, ny);	2050	maptile *m = op->map->xy_find (nx, ny);
2039	if (!m)
2040	return; /* Don't think this should happen */
2041	}
2042	else
2043	m = op->map;
2044		2051
2045	if (!(tmp = m->at (nx, ny).bot))
2046	return;
2047
2048	mon = 0;
2049	/* Go through all the objects, and find ones of interest. Only stop if	2052	/* Go through all the objects, and find ones of interest. Only stop if
2050	* we find a monster - that is something we know we want to attack.	2053	* we find a monster - that is something we know we want to attack.
2051	* if its a door or barrel (can roll) see if there may be monsters	2054	* if its a door or barrel (can roll) see if there may be monsters
2052	* on the space	2055	* on the space
2053	*/	2056	*/
2054	while (tmp)	2057	object *mon;
2055	{	2058	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2056	if (tmp == op)	2059	{
2057	{	2060	if ((mon->flag [FLAG_ALIVE]
2058	tmp = tmp->above;	2061	|| mon->type == LOCKED_DOOR
2059	continue;	2062	|| mon->flag [FLAG_CAN_ROLL])
2060	}
2061
2062	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2063	{
2064	mon = tmp;	2063	&& mon != op)
2065	break;	2064	break;
2066	}	2065	}
2067		2066
2068	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2069	mon = tmp;
2070
2071	tmp = tmp->above;
2072	}
2073
2074	if (!mon) /* This happens anytime the player tries to move */	2067	if (!mon) /* This happens anytime the player tries to move */
2075	return; /* into a wall */	2068	return false; /* into a wall */
2076		2069
2077	if (mon->head)
2078	mon = mon->head;	2070	mon = mon->head_ ();
2079		2071
2080	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2072	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2073	if (op->contr->weapon_sp_left > 0.f)
2081	if (player_attack_door (op, mon))	2074	if (player_attack_door (op, mon))
		2075	{
		2076	--op->contr->weapon_sp_left;
2082	return;	2077	return true;
		2078	}
2083		2079
2084	/* The following deals with possibly attacking peaceful	2080	/* The following deals with possibly attacking peaceful
2085	* or frienddly creatures. Basically, all players are considered	2081	* or friendly creatures. Basically, all players are considered
2086	* unaggressive. If the moving player has peaceful set, then the	2082	* unaggressive. If the moving player has peaceful set, then the
2087	* object should be pushed instead of attacked. It is assumed that	2083	* object should be pushed instead of attacked. It is assumed that
2088	* if you are braced, you will not attack friends accidently,	2084	* if you are braced, you will not attack friends accidently,
2089	* and thus will not push them.	2085	* and thus will not push them.
2090	*/	2086	*/
2091		2087
2092	/* If the creature is a pet, push it even if the player is not	2088	/* If the creature is a pet, push it even if the player is not
2093	* peaceful. Our assumption is the creature is a pet if the	2089	* peaceful. Our assumption is the creature is a pet if the
2094	* player owns it and it is either friendly or unagressive.	2090	* player owns it and it is either friendly or unagressive.
2095	*/	2091	*/
2096	if ((op->type == PLAYER)	2092	if (op->type == PLAYER
2097	#if COZY_SERVER
2098	&&
2099	((mon->owner && mon->owner->contr	2093	&& ((mon->owner && mon->owner->contr
2100	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2094	&& same_party (mon->owner->contr->party, op->contr->party))
2101	#else
2102	&& mon->owner == op	2095	|| mon->owner == op)
2103	#endif
2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2096	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2105	{	2097	{
2106	/* If we're braced, we don't want to switch places with it */	2098	/* If we're braced, we don't want to switch places with it */
2107	if (op->contr->braced)	2099	if (op->contr->braced)
2108	return;	2100	return false;
		2101
		2102	if (op->speed_left > 0.f)
		2103	{
		2104	--op->speed_left;
2109		2105
2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2106	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2111	(void) push_ob (mon, dir, op);	2107	push_ob (mon, dir, op);
		2108
2112	if (op->contr->tmp_invis || op->hide)	2109	if (op->contr->tmp_invis || op->hide)
2113	make_visible (op);	2110	make_visible (op);
2114		2111
2115	return;	2112	return true;
2116	}	2113	}
		2114	else
		2115	return false;
		2116	}
2117		2117
2118	/* in certain circumstances, you shouldn't attack friendly	2118	/* in certain circumstances, you shouldn't attack friendly
2119	* creatures. Note that if you are braced, you can't push	2119	* creatures. Note that if you are braced, you can't push
2120	* someone, but put it inside this loop so that you won't	2120	* someone, but put it inside this loop so that you won't
2121	* attack them either.	2121	* attack them either.
2122	*/	2122	*/
2123	if ((mon->type == PLAYER || mon->enemy != op) &&	2123	if ((mon->type == PLAYER || mon->enemy != op)
2124	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2124	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2125	#ifdef PROHIBIT_PLAYERKILL
2126	(op->contr->peaceful	2125	&& ((op->contr->peaceful
2127	|| (mon->type == PLAYER	2126	|| (mon->type == PLAYER && mon->contr->peaceful))
2128	&& mon->contr->
2129	peaceful)) &&
2130	#else
2131	op->contr->peaceful &&
2132	#endif
2133	!on_battleground))	2127	&& !on_battleground))
		2128	{
		2129	if (op->speed_left > 0.f)
2134	{	2130	{
		2131	--op->speed_left;
		2132
2135	if (!op->contr->braced)	2133	if (!op->contr->braced)
2136	{	2134	{
2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2135	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2138	push_ob (mon, dir, op);	2136	push_ob (mon, dir, op);
2139	}	2137	}
2140	else	2138	else
2141	new_draw_info (0, 0, op, "You withhold your attack");	2139	new_draw_info (0, 0, op, "You withhold your attack");
2142		2140
2143	if (op->contr->tmp_invis || op->hide)	2141	if (op->contr->tmp_invis || op->hide)
2144	make_visible (op);	2142	make_visible (op);
2145	}
2146		2143
		2144	return true;
		2145	}
		2146	}
2147	/* If the object is a boulder or other rollable object, then	2147	/* If the object is a boulder or other rollable object, then
2148	* roll it if not braced. You can't roll it if you are braced.	2148	* roll it if not braced. You can't roll it if you are braced.
2149	*/	2149	*/
2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2151	{
		2152	if (op->speed_left > 0.f)
2151	{	2153	{
		2154	--op->speed_left;
		2155
2152	recursive_roll (mon, dir, op);	2156	recursive_roll (mon, dir, op);
2153	if (action_makes_visible (op))	2157	if (action_makes_visible (op))
2154	make_visible (op);	2158	make_visible (op);
2155	}
2156		2159
		2160	return true;
		2161	}
		2162	}
2157	/* Any generic living creature. Including things like doors.	2163	/* Any generic living creature. Including things like doors.
2158	* Way it works is like this: First, it must have some hit points	2164	* Way it works is like this: First, it must have some hit points
2159	* and be living. Then, it must be one of the following:	2165	* and be living. Then, it must be one of the following:
2160	* 1) Not a player, 2) A player, but of a different party. Note	2166	* 1) Not a player, 2) A player, but of a different party. Note
2161	* that party_number -1 is no party, so attacks can still happen.	2167	* that party_number -1 is no party, so attacks can still happen.
2162	*/	2168	*/
2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2164	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2165	{	2171	{
2166		2172	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2167	/* If the player hasn't hit something this tick, and does
2168	* so, give them speed boost based on weapon speed. Doing
2169	* it here is better than process_players2, which basically
2170	* incurred a 1 tick offset.
2171	*/
2172	if (!op->contr->has_hit)
2173	{	2173	{
2174	op->speed_left += op->speed / op->contr->weapon_sp;	2174	--op->contr->weapon_sp_left;
2175
2176	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2177	}
2178		2175
2179	skill_attack (mon, op, 0, 0, 0);	2176	skill_attack (mon, op, 0, 0, 0);
2180
2181	/* If attacking another player, that player gets automatic
2182	* hitback, and doesn't loose luck either.
2183	* Disable hitback on the battleground or if the target is
2184	* the wiz.
2185	*/
2186	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2187	{
2188	short luck = mon->stats.luck;
2189
2190	mon->contr->has_hit = 1;
2191	skill_attack (op, mon, 0, 0, 0);
2192	mon->stats.luck = luck;
2193	}
2194		2177
2195	if (action_makes_visible (op))	2178	if (action_makes_visible (op))
2196	make_visible (op);	2179	make_visible (op);
2197	}
2198	} /* if player should attack something */
2199	}
2200		2180
2201	int	2181	return true;
		2182	}
		2183	}
		2184
		2185	return false;
		2186	}
		2187
		2188	bool
2202	move_player (object *op, int dir)	2189	move_player (object *op, int dir)
2203	{	2190	{
2204	int pick;	2191	int pick;
2205		2192
2206	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2193	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2220	op->facing = dir;	2207	op->facing = dir;
2221		2208
2222	if (op->hide)	2209	if (op->hide)
2223	do_hidden_move (op);	2210	do_hidden_move (op);
2224		2211
		2212	bool retval;
		2213
2225	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2214	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2226	/*nop */ ;	2215	retval = RESULT_INT (0);
2227	else if (op->contr->fire_on)	2216	else if (op->contr->fire_on)
2228	fire (op, dir);	2217	retval = fire (op, dir);
2229	else	2218	else
2230	{	2219	{
2231	move_player_attack (op, dir);	2220	retval = move_player_attack (op, dir);
2232	pick = check_pick (op);	2221	pick = check_pick (op);
2233	}	2222	}
2234		2223
2235	/* Add special check for newcs players and fire on - this way, the	2224	/* Add special check for newcs players and fire on - this way, the
2236	* server can handle repeat firing.	2225	* server can handle repeat firing.
…		…
2243	/* Update how the player looks. Use the facing, so direction may	2232	/* Update how the player looks. Use the facing, so direction may
2244	* get reset to zero. This allows for full animation capabilities	2233	* get reset to zero. This allows for full animation capabilities
2245	* for players.	2234	* for players.
2246	*/	2235	*/
2247	animate_object (op, op->facing);	2236	animate_object (op, op->facing);
2248	return 0;	2237
		2238	return retval;
2249	}	2239	}
2250		2240
2251	/* This is similar to handle_player, below, but is only used by the	2241	/* This is similar to handle_player, below, but is only used by the
2252	* new client/server stuff.	2242	* new client/server stuff.
2253	* This is sort of special, in that the new client/server actually uses	2243	* This is sort of special, in that the new client/server actually uses
2254	* the new speed values for commands.	2244	* the new speed values for commands.
2255	*	2245	*
2256	* Returns true if there are more actions we can do.	2246	* Returns true if there are more actions we can do. Should not do
		2247	* many actions in a row, as that would be too unfair to other
		2248	* players.
2257	*/	2249	*/
2258	int	2250	bool
2259	handle_newcs_player (object *op)	2251	handle_newcs_player (object *op)
2260	{	2252	{
2261	if (op->contr->hidden)
2262	{
2263	op->invisible = 1000;
2264	/* the socket code flashes the player visible/invisible
2265	* depending on the value of invisible, so we need to
2266	* alternate it here for it to work correctly.
2267	*/
2268	if (pticks & 2)
2269	op->invisible--;
2270	}
2271	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2272	{
2273	op->invisible--;
2274	if (!op->invisible)
2275	{
2276	make_visible (op);
2277	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2278	}
2279	}
2280
2281	if (QUERY_FLAG (op, FLAG_SCARED))	2253	if (QUERY_FLAG (op, FLAG_SCARED))
2282	{	2254	{
2283	flee_player (op);	2255	if (op->speed_left > 0.f)
2284	/* If player is still scared, that is his action for this tick */
2285	if (QUERY_FLAG (op, FLAG_SCARED))
2286	{	2256	{
2287	op->speed_left--;	2257	--op->speed_left;
		2258	flee_player (op);
		2259
2288	return 0;	2260	return true;
2289	}	2261	}
		2262	else
		2263	return false;
2290	}	2264	}
2291
2292	/* I've been seeing crashes where the golem has been destroyed, but
2293	* the player object still points to the defunct golem. The code that
2294	* destroys the golem looks correct, and it doesn't always happen, so
2295	* put this in a a workaround to clean up the golem pointer.
2296	*/
2297	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2298	op->contr->ranges[range_golem] = 0;
2299		2265
2300	/* call this here - we also will call this in do_ericserver, but	2266	/* call this here - we also will call this in do_ericserver, but
2301	* the players time has been increased when doericserver has been	2267	* the players time has been increased when doericserver has been
2302	* called, so we recheck it here.	2268	* called, so we recheck it here.
2303	*/	2269	*/
2304	if (op->contr->ns->handle_command ())	2270	if (op->contr->ns->handle_command ())
2305	return 1;	2271	return true;
2306		2272
2307	if (op->speed_left > 0)
2308	{
2309	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2273	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2310	{
2311	/* All move commands take 1 tick, at least for now */
2312	op->speed_left--;
2313
2314	/* Instead of all the stuff below, let move_player take care
2315	* of it. Also, some of the skill stuff is only put in
2316	* there, as well as the confusion stuff.
2317	*/
2318	move_player (op, op->direction);	2274	return move_player (op, op->direction);
2319		2275
2320	return op->speed_left > 0;
2321	}
2322	}
2323
2324	return 0;	2276	return false;
2325	}	2277	}
2326		2278
2327	int	2279	int
2328	save_life (object *op)	2280	save_life (object *op)
2329	{	2281	{
…		…
2439	int rate_grace = 2000;	2391	int rate_grace = 2000;
2440	const int max_hp = 1;	2392	const int max_hp = 1;
2441	const int max_sp = 1;	2393	const int max_sp = 1;
2442	const int max_grace = 1;	2394	const int max_grace = 1;
2443		2395
2444	if (op->contr->outputs_sync)	2396	if (op->contr->hidden)
		2397	{
		2398	op->invisible = 1000;
		2399	/* the socket code flashes the player visible/invisible
		2400	* depending on the value of invisible, so we need to
		2401	* alternate it here for it to work correctly.
		2402	*/
		2403	if (pticks & 2)
		2404	op->invisible--;
2445	{	2405	}
2446	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2406	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2447	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2407	{
2448	flush_output_element (op, &op->contr->outputs[i]);	2408	if (!op->invisible--)
		2409	{
		2410	make_visible (op);
		2411	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2412	}
2449	}	2413	}
2450		2414
2451	if (op->contr->ns->state == ST_PLAYING)	2415	if (op->contr->ns->state == ST_PLAYING)
2452	{	2416	{
2453	/* these next three if clauses make it possible to SLOW DOWN	2417	/* these next three if clauses make it possible to SLOW DOWN
…		…
2475	gen_grace = op->stats.maxgrace;	2439	gen_grace = op->stats.maxgrace;
2476	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2440	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477	}	2441	}
2478		2442
2479	/* Regenerate Spell Points */	2443	/* Regenerate Spell Points */
2480	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2444	if (!op->contr->golem && --op->last_sp < 0)
2481	{	2445	{
2482	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2446	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483	if (op->stats.sp < op->stats.maxsp)	2447	if (op->stats.sp < op->stats.maxsp)
2484	{	2448	{
2485	op->stats.sp++;	2449	op->stats.sp++;
…		…
2583	}	2547	}
2584		2548
2585	/* Digestion */	2549	/* Digestion */
2586	if (--op->last_eat < 0)	2550	if (--op->last_eat < 0)
2587	{	2551	{
2588	#ifdef COZY_SERVER
2589	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2590	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2591	#else
2592	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2552	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2593	#endif
2594		2553
2595	if (op->contr->gen_hp > 0)	2554	if (op->contr->gen_hp > 0)
2596	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2555	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2597	else	2556	else
2598	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2557	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2910	op->stats.hp = op->stats.maxhp;	2869	op->stats.hp = op->stats.maxhp;
2911	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2870	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2871	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913		2872
2914	/*	2873	/*
2915	* Check to see if the player is in a shop. IF so, then check to see if
2916	* the player has any unpaid items. If so, remove them and put them back	2874	* Check to see if the player has any unpaid items. If so, remove them
2917	* in the map.	2875	* and put them back in the map.
2918	*/	2876	*/
2919
2920	if (is_in_shop (op))
2921	remove_unpaid_objects (op->inv, op);	2877	remove_unpaid_objects (op->inv, op);
2922		2878
2923	/****************************************/	2879	/****************************************/
2924	/* */	2880	/* */
2925	/* Move player to his current respawn- */	2881	/* Move player to his current respawn- */
2926	/* position (usually last savebed) */	2882	/* position (usually last savebed) */
…		…
2946	object *force;	2902	object *force;
2947	int at;	2903	int at;
2948		2904
2949	force = get_archetype (FORCE_NAME);	2905	force = get_archetype (FORCE_NAME);
2950	/* 50 ticks should be enough time for the spell to abate */	2906	/* 50 ticks should be enough time for the spell to abate */
2951	force->speed = 0.1;	2907	force->speed = 0.1f;
2952	force->speed_left = -5.0;	2908	force->speed_left = -5.f;
2953	SET_FLAG (force, FLAG_APPLIED);	2909	SET_FLAG (force, FLAG_APPLIED);
2954	for (at = 0; at < NROFATTACKS; at++)	2910	for (at = 0; at < NROFATTACKS; at++)
2955	if (will_kill_again & (1 << at))	2911	if (will_kill_again & (1 << at))
2956	force->resist[at] = 100;	2912	force->resist[at] = 100;
2957		2913
…		…
3071	if (op->type == PLAYER)	3027	if (op->type == PLAYER)
3072	{	3028	{
3073	op->contr->tmp_invis = 0;	3029	op->contr->tmp_invis = 0;
3074	op->contr->invis_race = 0;	3030	op->contr->invis_race = 0;
3075	}	3031	}
		3032
3076	update_object (op, UP_OBJ_FACE);	3033	update_object (op, UP_OBJ_CHANGE);
3077	}	3034	}
3078		3035
3079	int	3036	int
3080	is_true_undead (object *op)	3037	is_true_undead (object *op)
3081	{	3038	{
3082	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3039	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3083	return 1;	3040	return 1;
3084		3041
3085	return 0;	3042	return 0;
3086	}	3043	}
3087		3044
…		…
3131	/* For Hidden creatures - a chance of becoming 'unhidden'	3088	/* For Hidden creatures - a chance of becoming 'unhidden'
3132	* every time they move - as we subtract off 'invisibility'	3089	* every time they move - as we subtract off 'invisibility'
3133	* AND, for players, if they move into a ridiculously unhideable	3090	* AND, for players, if they move into a ridiculously unhideable
3134	* spot (surrounded by clear terrain in broad daylight). -b.t.	3091	* spot (surrounded by clear terrain in broad daylight). -b.t.
3135	*/	3092	*/
3136
3137	void	3093	void
3138	do_hidden_move (object *op)	3094	do_hidden_move (object *op)
3139	{	3095	{
3140	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3096	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3141	object *skop;	3097	object *skop;
…		…
3258	* a blocked los square.	3214	* a blocked los square.
3259	* we use the archetype to figure out offsets.	3215	* we use the archetype to figure out offsets.
3260	*/	3216	*/
3261	while (op)	3217	while (op)
3262	{	3218	{
3263	dx = rv.distance_x + op->arch->clone.x;	3219	dx = rv.distance_x + op->arch->x;
3264	dy = rv.distance_y + op->arch->clone.y;	3220	dy = rv.distance_y + op->arch->y;
3265		3221
3266	/* only the viewable area the player sees is updated by LOS	3222	/* only the viewable area the player sees is updated by LOS
3267	* code, so we need to restrict ourselves to that range of values	3223	* code, so we need to restrict ourselves to that range of values
3268	* for any meaningful values.	3224	* for any meaningful values.
3269	*/	3225	*/
…		…
3374	char buf[MAX_BUF]; /* tmp. string buffer */	3330	char buf[MAX_BUF]; /* tmp. string buffer */
3375	int i = 0, j = 0;	3331	int i = 0, j = 0;
3376		3332
3377	/* get the appropriate treasurelist */	3333	/* get the appropriate treasurelist */
3378	if (atnr == ATNR_FIRE)	3334	if (atnr == ATNR_FIRE)
3379	trlist = find_treasurelist ("dragon_ability_fire");	3335	trlist = treasurelist::find ("dragon_ability_fire");
3380	else if (atnr == ATNR_COLD)	3336	else if (atnr == ATNR_COLD)
3381	trlist = find_treasurelist ("dragon_ability_cold");	3337	trlist = treasurelist::find ("dragon_ability_cold");
3382	else if (atnr == ATNR_ELECTRICITY)	3338	else if (atnr == ATNR_ELECTRICITY)
3383	trlist = find_treasurelist ("dragon_ability_elec");	3339	trlist = treasurelist::find ("dragon_ability_elec");
3384	else if (atnr == ATNR_POISON)	3340	else if (atnr == ATNR_POISON)
3385	trlist = find_treasurelist ("dragon_ability_poison");	3341	trlist = treasurelist::find ("dragon_ability_poison");
3386		3342
3387	if (trlist == NULL || who->type != PLAYER)	3343	if (trlist == NULL || who->type != PLAYER)
3388	return;	3344	return;
3389		3345
3390	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3346	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3394	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3350	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3395	return;	3351	return;
3396	}	3352	}
3397		3353
3398	/* everything seems okay - now bring on the gift: */	3354	/* everything seems okay - now bring on the gift: */
3399	item = &(tr->item->clone);	3355	item = tr->item;
3400		3356
3401	if (item->type == SPELL)	3357	if (item->type == SPELL)
3402	{	3358	{
3403	if (check_spell_known (who, item->name))	3359	if (check_spell_known (who, item->name))
3404	return;	3360	return;
…		…
3463	{	3419	{
3464	/* forces in the treasurelist can alter the player's stats */	3420	/* forces in the treasurelist can alter the player's stats */
3465	object *skin;	3421	object *skin;
3466		3422
3467	/* first get the dragon skin force */	3423	/* first get the dragon skin force */
3468	shstr_cmp dragon_skin_force ("dragon_skin_force");
3469	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3424	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3470	;	3425	;
3471		3426
3472	if (!skin)	3427	if (!skin)
3473	return;	3428	return;
3474		3429
…		…
3522	* not readied.	3477	* not readied.
3523	*/	3478	*/
3524	void	3479	void
3525	player_unready_range_ob (player *pl, object *ob)	3480	player_unready_range_ob (player *pl, object *ob)
3526	{	3481	{
3527	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
		3484
		3485	if (pl->combat_ob == ob)
		3486	pl->combat_ob = 0;
		3487
3528	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3529	{
3530	pl->ranges[i] = 0;	3489	pl->ranged_ob = 0;
3531	if (pl->shoottype == i)
3532	pl->shoottype = range_none;
3533	}
3534	}	3490	}
3535		3491
3536	sint8	3492	sint8
3537	player::visibility_at (maptile *map, int x, int y) const	3493	player::visibility_at (maptile *map, int x, int y) const
3538	{	3494	{

Diff Legend

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