[ViewVC] Diff of: cvs/deliantra/server/server/player.C

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

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.111 by root, Mon Apr 23 11:43:22 2007 UTC vs. Revision 1.150 by root, Sun Jun 10 03:11:17 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.111 by root, Mon Apr 23 11:43:22 2007 UTC vs.
Revision 1.150 by root, Sun Jun 10 03:11:17 2007 UTC