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

Diff Legend

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