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.103 by root, Sat Feb 10 01:52:29 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <global.h>	24	#include <global.h>
26	#include <pwd.h>
27	#include <sproto.h>	25	#include <sproto.h>
28	#include <sounds.h>	26	#include <sounds.h>
29	#include <living.h>	27	#include <living.h>
30	#include <object.h>	28	#include <object.h>
31	#include <spells.h>	29	#include <spells.h>
…		…
116		114
117	news[0] = '\0';	115	news[0] = '\0';
118	subject[0] = '\0';	116	subject[0] = '\0';
119	size = 0;	117	size = 0;
120		118
121	while (fgets (buf, MAX_BUF, fp) != NULL)	119	while (fgets (buf, MAX_BUF, fp))
122	{	120	{
123	if (*buf == '#')	121	if (*buf == '#')
124	continue;	122	continue;
125		123
126	if (*buf == '%')	124	if (*buf == '%')
127	{ /* send one news */	125	{ /* send one news */
128	if (size > 0)	126	if (size > 0)
129	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */	127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130		128
131	strcpy (subject, buf + 1);	129	strcpy (subject, buf + 1);
132	strip_endline (subject);	130	strip_endline (subject);
133	size = 0;	131	size = 0;
134	news[0] = '\0';	132	news[0] = '\0';
…		…
144	size += strlen (buf);	142	size += strlen (buf);
145	}	143	}
146	}	144	}
147		145
148	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150	close_and_delete (fp, comp);	148	close_and_delete (fp, comp);
151	}	149	}
152		150
153	/* This loads the first map an puts the player on it. */	151	/* This loads the first map an puts the player on it. */
154	static void	152	static void
155	set_first_map (object *op)	153	set_first_map (object *op)
156	{	154	{
157	op->contr->maplevel = first_map_path;	155	op->contr->maplevel = first_map_path;
158	op->x = -1;	156	op->x = -1;
159	op->y = -1;	157	op->y = -1;
160	}
161
162	void
163	player::enter_map ()
164	{
165	object *tmp = object::create ();
166
167	EXIT_PATH (tmp) = maplevel;
168	EXIT_X (tmp) = ob->x;
169	EXIT_Y (tmp) = ob->y;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}	158	}
174		159
175	void	160	void
176	player::activate ()	161	player::activate ()
177	{	162	{
…		…
182	ob->remove ();	167	ob->remove ();
183	ob->map = 0;	168	ob->map = 0;
184	ob->activate_recursive ();	169	ob->activate_recursive ();
185	CLEAR_FLAG (ob, FLAG_FRIENDLY);	170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
186	add_friendly_object (ob);	171	add_friendly_object (ob);
187	enter_map ();
188	}	172	}
189		173
190	void	174	void
191	player::deactivate ()	175	player::deactivate ()
192	{	176	{
…		…
194	return;	178	return;
195		179
196	terminate_all_pets (ob);	180	terminate_all_pets (ob);
197	remove_friendly_object (ob);	181	remove_friendly_object (ob);
198	ob->deactivate_recursive ();	182	ob->deactivate_recursive ();
		183
		184	if (ob->map)
199	maplevel = ob->map->path;	185	maplevel = ob->map->path;
		186
200	ob->remove ();	187	ob->remove ();
201	ob->map = 0;	188	ob->map = 0;
		189	party = 0;
202		190
203	// for weird reasons, this is often "ob", keeping a circular reference	191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
204	ranges [range_skill] = 0;
205		192
206	players.erase (this);	193	players.erase (this);
207	}	194	}
208		195
209	// connect the player with a specific client	196	// connect the player with a specific client
210	// also changed, rationalises, and fixes some incorrect settings	197	// also changes, rationalises, and fixes some incorrect settings
211	void	198	void
212	player::connect (client *ns)	199	player::connect (client *ns)
213	{	200	{
214	this->ns = ns;	201	this->ns = ns;
215	ns->pl = this;	202	ns->pl = this;
…		…
219	ob->close_container (); //TODO: client-specific	206	ob->close_container (); //TODO: client-specific
220		207
221	ns->update_look = 0;	208	ns->update_look = 0;
222	ns->look_position = 0;	209	ns->look_position = 0;
223		210
224	clear_los (ob);	211	clear_los (this);
225		212
226	ns->reset_stats ();	213	ns->reset_stats ();
227		214
228	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
229	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
230	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
231
232	if (!legal_range (ob, shoottype))
233	shoottype = range_none;
234		218
235	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
236	link_player_skills (ob);	220	link_player_skills (ob);
237		221
238	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239		223
240	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
241
242	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
243	* from the class, and not race. I don't see any way to get the class information
244	* to then update this. I don't think this will actually break anything - anyone
245	* that can use armour should be able to use a shield. What this may 'break'
246	* are features new characters get, eg, if someone starts up with a Q, they
247	* should be able to use a shield. However, old Q's won't get that advantage.
248	*/
249	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
250	SET_FLAG (ob, FLAG_USE_SHIELD);
251		225
252	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
253	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
254	{	228	{
255	object *tmp, *abil = 0, *skin = 0;	229	object *tmp, *abil = 0, *skin = 0;
256		230
257	shstr_cmp dragon_ability_force ("dragon_ability_force");
258	shstr_cmp dragon_skin_force ("dragon_skin_force");
259
260	for (tmp = ob->inv; tmp; tmp = tmp->below)	231	for (tmp = ob->inv; tmp; tmp = tmp->below)
261	if (tmp->type == FORCE)	232	if (tmp->type == FORCE)
262	if (tmp->arch->name == dragon_ability_force)	233	if (tmp->arch->archname == shstr_dragon_ability_force)
263	abil = tmp;	234	abil = tmp;
264	else if (tmp->arch->name == dragon_skin_force)	235	else if (tmp->arch->archname == shstr_dragon_skin_force)
265	skin = tmp;	236	skin = tmp;
266		237
267	set_dragon_name (ob, abil, skin);	238	set_dragon_name (ob, abil, skin);
268	}	239	}
269		240
270	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
271		242
272	esrv_new_player (this, ob->weight + ob->carrying);	243	esrv_new_player (this, ob->weight + ob->carrying);
273		244
		245	ob->flag [FLAG_READY_WEAPON] = false;
		246	ob->flag [FLAG_READY_SKILL] = false;
		247	ob->flag [FLAG_READY_BOW] = false;
		248
		249	for (object *op = ob->inv; op; op = op->below)
		250	if (op->flag [FLAG_APPLIED])
		251	switch (op->type)
		252	{
		253	case SKILL:
		254	ob->flag [FLAG_APPLIED] = false;
		255	break;
		256
		257	case WAND:
		258	case ROD:
		259	case HORN:
		260	case BOW:
		261	ranged_ob = op;
		262	break;
		263
		264	case WEAPON:
		265	combat_ob = op;
		266	break;
		267	}
		268
		269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
274	ob->update_stats ();	270	ob->update_stats ();
		271
275	ns->floorbox_update ();	272	ns->floorbox_update ();
276
277	esrv_send_inventory (ob, ob);	273	esrv_send_inventory (ob, ob);
278	esrv_add_spells (this, 0);	274	esrv_add_spells (this, 0);
279		275
280	activate ();	276	activate ();
281		277
…		…
297		293
298	INVOKE_PLAYER (DISCONNECT, this);	294	INVOKE_PLAYER (DISCONNECT, this);
299		295
300	ns->reset_stats ();	296	ns->reset_stats ();
301	ns->pl = 0;	297	ns->pl = 0;
302	this->ns = 0;	298	ns = 0;
		299	}
		300
		301	if (ob)
303	}	302	{
304
305	ob->close_container (); //TODO: client-specific	303	ob->close_container (); //TODO: client-specific
		304	ob->drop_unpaid_items ();
		305	}
		306
		307	observe = ob;
		308
306	deactivate ();	309	deactivate ();
307	}	310	}
308		311
309	// the need for this function can be explained	312	// the need for this function can be explained
310	// by load_object not returning the object	313	// by load_object not returning the object
311	void	314	void
312	player::set_object (object *op)	315	player::set_object (object *op)
313	{	316	{
314	ob = op;	317	ob = observe = op;
315	ob->contr = this; /* this aren't yet in archetype */	318	ob->contr = this; /* this aren't yet in archetype */
316		319
		320	ob->speed = 1.0f;
317	ob->speed_left = 0.5;	321	ob->speed_left = 0.5f;
318	ob->speed = 1.0;	322
319	ob->direction = 5; /* So player faces south */	323	ob->direction = 5; /* So player faces south */
320	ob->stats.wc = 2;	324	}
321	ob->run_away = 25; /* Then we panick... */
322		325
323	ob->roll_stats ();	326	void
		327	player::set_observe (object *op)
		328	{
		329	observe = op ? op : ob;
		330	do_los = 1;
324	}	331	}
325		332
326	player::player ()	333	player::player ()
327	{	334	{
328	/* There are some elements we want initialised to non zero value -	335	/* There are some elements we want initialised to non zero value -
329	* we deal with that below this point.	336	* we deal with that below this point.
330	*/	337	*/
331	outputs_sync = 16; /* Every 2 seconds */	338	outputs_sync = 4;
332	outputs_count = 8; /* Keeps present behaviour */	339	outputs_count = 4;
333	unapply = unapply_nochoice;	340	unapply = unapply_nochoice;
334		341
335	savebed_map = first_map_path; /* Init. respawn position */	342	savebed_map = first_map_path; /* Init. respawn position */
336		343
337	gen_sp_armour = 10;	344	gen_sp_armour = 10;
338	shoottype = range_none;
339	bowtype = bow_normal;	345	bowtype = bow_normal;
340	petmode = pet_normal;	346	petmode = pet_normal;
341	listening = 10;	347	listening = 10;
342	usekeys = containers;	348	usekeys = containers;
343	peaceful = 1; /* default peaceful */	349	peaceful = 1; /* default peaceful */
344	do_los = 1;	350	do_los = 1;
		351
		352	weapon_sp = 1.0f;
		353	weapon_sp_left = 0.5f;
345	}	354	}
346		355
347	void	356	void
348	player::do_destroy ()	357	player::do_destroy ()
349	{	358	{
…		…
354	if (ob)	363	if (ob)
355	{	364	{
356	ob->destroy_inv (false);	365	ob->destroy_inv (false);
357	ob->destroy ();	366	ob->destroy ();
358	}	367	}
		368
		369	ob = observe = 0;
359	}	370	}
360		371
361	player::~player ()	372	player::~player ()
362	{	373	{
363	/* Clear item stack */	374	/* Clear item stack */
…		…
372	player::create ()	383	player::create ()
373	{	384	{
374	player *pl = new player;	385	player *pl = new player;
375		386
376	pl->set_object (arch_to_object (get_player_archetype (0)));	387	pl->set_object (arch_to_object (get_player_archetype (0)));
		388
		389	pl->ob->roll_stats ();
		390	pl->ob->stats.wc = 2;
		391	pl->ob->run_away = 25; /* Then we panick... */
		392
377	set_first_map (pl->ob);	393	set_first_map (pl->ob);
378		394
379	return pl;	395	return pl;
380	}	396	}
381		397
…		…
385	* Note: there MUST be at least one player archetype!	401	* Note: there MUST be at least one player archetype!
386	*/	402	*/
387	archetype *	403	archetype *
388	get_player_archetype (archetype *at)	404	get_player_archetype (archetype *at)
389	{	405	{
390	archetype *start = at;	406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
391		407
392	for (;;)	408	for (;;)
393	{	409	{
394	if (at == NULL || at->next == NULL)	410	if (++i == archetypes.end ())
395	at = first_archetype;	411	i = archetypes.begin ();
396	else	412	else if (*i == at)
397	at = at->next;	413	cleanup ("not a single player archetype found");
398		414
399	if (at->clone.type == PLAYER)	415	if ((*i)->type == PLAYER)
400	return at;	416	return *i;
401
402	if (at == start)
403	{
404	LOG (llevError, "No Player archetypes\n");
405	exit (-1);
406	}
407	}	417	}
408	}	418	}
409		419
410	object *	420	object *
411	get_nearest_player (object *mon)	421	get_nearest_player (object *mon)
…		…
777	}	787	}
778		788
779	void	789	void
780	object::roll_stats ()	790	object::roll_stats ()
781	{	791	{
782	int statsort [7];	792	int statsort [NUM_STATS];
783		793
784	for (;;)	794	for (;;)
785	{	795	{
786	int sum = 0;	796	int sum = 0;
787	for (int i = 7; i--; )	797	for (int i = NUM_STATS; i--; )
788	sum += statsort [i] = roll_stat ();	798	sum += statsort [i] = roll_stat ();
789		799
790	if (sum >= 82 && sum <= 116)	800	if (sum >= 82 && sum <= 116)
791	break;	801	break;
792	}	802	}
793		803
794	// Sort the stats so that rerolling is easier...	804	// Sort the stats so that rerolling is easier...
795	std::sort (statsort, statsort + 7, std::greater<int>());	805	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
796		806
		807	for (int i = 0; i < NUM_STATS; ++i)
797	stats.Str = statsort[0];	808	stats.stat (i) = statsort [i];
798	stats.Dex = statsort[1];
799	stats.Con = statsort[2];
800	stats.Int = statsort[3];
801	stats.Wis = statsort[4];
802	stats.Pow = statsort[5];
803	stats.Cha = statsort[6];
804		809
805	stats.exp = 0;	810	stats.exp = 0;
806	stats.ac = 0;	811	stats.ac = 0;
807		812
808	stats.hp = stats.maxhp;	813	stats.hp = stats.maxhp;
…		…
820	}	825	}
821		826
822	void	827	void
823	object::swap_stats (int a, int b)	828	object::swap_stats (int a, int b)
824	{	829	{
825	int tmp = get_attr_value (&contr->orig_stats, a);	830	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
826	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
827	set_attr_value (&contr->orig_stats, b, tmp);
828		831
		832	for (int i = 0; i < NUM_STATS; ++i)
829	stats.Str = contr->orig_stats.Str;	833	stats.stat (i) = contr->orig_stats.stat (i);
830	stats.Dex = contr->orig_stats.Dex;
831	stats.Con = contr->orig_stats.Con;
832	stats.Int = contr->orig_stats.Int;
833	stats.Wis = contr->orig_stats.Wis;
834	stats.Pow = contr->orig_stats.Pow;
835	stats.Cha = contr->orig_stats.Cha;
836		834
837	//TODO: the following code looks so borked and should, at the very least,	835	//TODO: the following code looks so borked and should, at the very least,
838	// be merged with the similar code in roll_stats	836	// be merged with the similar code in roll_stats
839	stats.ac = 0;	837	stats.ac = 0;
840		838
…		…
871	* appropriate action with it (change race, or other things).	869	* appropriate action with it (change race, or other things).
872	* The function name is for historical reasons - now we have	870	* The function name is for historical reasons - now we have
873	* separate race and class; this actually changes the RACE,	871	* separate race and class; this actually changes the RACE,
874	* not the class.	872	* not the class.
875	*/	873	*/
876	int	874	void
877	key_change_class (object *op, char key)	875	player::chargen_race_done ()
878	{	876	{
879	int tmp_loop;
880
881	if (key == 'd' || key == 'D')
882	{
883	char buf[MAX_BUF];
884
885	/* this must before then initial items are given */	877	/* this must before then initial items are given */
886	esrv_new_player (op->contr, op->weight + op->carrying);	878	esrv_new_player (ob->contr, ob->weight + ob->carrying);
887		879
888	treasurelist *tl = find_treasurelist ("starting_wealth");	880	treasurelist *tl = treasurelist::find ("starting_wealth");
889	if (tl)	881	if (tl)
890	create_treasure (tl, op, 0, 0, 0);	882	create_treasure (tl, ob, 0, 0, 0);
891		883
892	INVOKE_PLAYER (BIRTH, op->contr);	884	INVOKE_PLAYER (BIRTH, ob->contr);
893	INVOKE_PLAYER (LOGIN, op->contr);	885	INVOKE_PLAYER (LOGIN, ob->contr);
894		886
895	op->contr->ns->state = ST_PLAYING;	887	ob->contr->ns->state = ST_PLAYING;
896		888
897	if (op->msg)	889	if (ob->msg)
898	op->msg = NULL;	890	ob->msg = 0;
899		891
900	/* We create this now because some of the unique maps will need it	892	/* We create this now because some of the unique maps will need it
901	* to save here.	893	* to save here.
902	*/	894	*/
		895	{
		896	char buf[MAX_BUF];
903	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
904	make_path_to_file (buf);	898	make_path_to_file (buf);
		899	}
905		900
906	start_info (op);	901	start_info (ob);
907	CLEAR_FLAG (op, FLAG_WIZ);	902	CLEAR_FLAG (ob, FLAG_WIZ);
908	give_initial_items (op, op->randomitems);	903	give_initial_items (ob, ob->randomitems);
909	link_player_skills (op);	904	link_player_skills (ob);
910	esrv_send_inventory (op, op);	905	esrv_send_inventory (ob, ob);
911	op->update_stats ();	906	ob->update_stats ();
912		907
913	/* This moves the player to a different start map, if there	908	/* This moves the player to a different start map, if there
914	* is one for this race	909	* is one for this race
915	*/	910	*/
916	if (*first_map_ext_path)	911	if (*first_map_ext_path)
917	{	912	{
918	object *tmp;	913	object *tmp;
919	char mapname[MAX_BUF];	914	char mapname[MAX_BUF];
920		915
921	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
922	tmp = object::create ();	917	tmp = object::create ();
923	EXIT_PATH (tmp) = mapname;	918	EXIT_PATH (tmp) = mapname;
924	EXIT_X (tmp) = op->x;	919	EXIT_X (tmp) = ob->x;
925	EXIT_Y (tmp) = op->y;	920	EXIT_Y (tmp) = ob->y;
926	op->enter_exit (tmp); /* we don't really care if it succeeded;	921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
927	* if the map isn't there, then stay on the	922	* if the map isn't there, then stay on the
928	* default initial map */	923	* default initial map */
929	tmp->destroy ();	924	tmp->destroy ();
930	}	925	}
931	else	926	else
932	LOG (llevDebug, "first_map_ext_path not set\n");	927	LOG (llevDebug, "first_map_ext_path not set\n");
		928	}
933		929
934	return 0;	930	void
935	}	931	player::chargen_race_next ()
936		932	{
937	/* Following actually changes the race - this is the default command	933	/* Following actually changes the race - this is the default command
938	* if we don't match with one of the options above.	934	* if we don't match with one of the options above.
939	*/	935	*/
940		936
941	tmp_loop = 0;	937	do
942	while (!tmp_loop)
943	{	938	{
944	shstr name = op->name;	939	shstr name = ob->name;
945	int x = op->x, y = op->y;	940	int x = ob->x, y = ob->y;
946		941
947	op->remove_statbonus ();	942	ob->remove_statbonus ();
948	op->remove ();	943	ob->remove ();
949	op->arch = get_player_archetype (op->arch);	944	ob->arch = get_player_archetype (ob->arch);
950	op->arch->clone.copy_to (op);	945	ob->arch->copy_to (ob);
951	op->instantiate ();	946	ob->instantiate ();
952	op->stats = op->contr->orig_stats;	947	ob->stats = ob->contr->orig_stats;
953	op->name = op->name_pl = name;	948	ob->name = ob->name_pl = name;
954	op->x = x;	949	ob->x = x;
955	op->y = y;	950	ob->y = y;
956	SET_ANIMATION (op, 2); /* So player faces south */	951	SET_ANIMATION (ob, 2); /* So player faces south */
957	insert_ob_in_map (op, op->map, op, 0);	952	insert_ob_in_map (ob, ob->map, ob, 0);
958	assign (op->contr->title, op->arch->clone.name);	953	assign (ob->contr->title, ob->arch->object::name);
959	op->add_statbonus ();	954	ob->add_statbonus ();
960	tmp_loop = allowed_class (op);
961	}	955	}
		956	while (!allowed_class (ob));
962		957
963	update_object (op, UP_OBJ_FACE);	958	update_object (ob, UP_OBJ_FACE);
964	esrv_update_item (UPD_FACE, op, op);	959	esrv_update_item (UPD_FACE, ob, ob);
965	op->update_stats ();	960	ob->update_stats ();
966	op->stats.hp = op->stats.maxhp;	961	ob->stats.hp = ob->stats.maxhp;
967	op->stats.sp = op->stats.maxsp;	962	ob->stats.sp = ob->stats.maxsp;
968	op->stats.grace = 0;	963	ob->stats.grace = 0;
969
970	if (op->msg)
971	new_draw_info (NDI_BLUE, 0, op, op->msg);
972
973	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
974	return 0;
975	}	964	}
976		965
977	void	966	void
978	flee_player (object *op)	967	flee_player (object *op)
979	{	968	{
…		…
1026	/* Cornered, get rid of scared */	1015	/* Cornered, get rid of scared */
1027	CLEAR_FLAG (op, FLAG_SCARED);	1016	CLEAR_FLAG (op, FLAG_SCARED);
1028	op->enemy = NULL;	1017	op->enemy = NULL;
1029	}	1018	}
1030		1019
1031
1032	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1033	* IT returns 1 if the player should keep on moving, 0 if he should	1021	* It returns 1 if the player should keep on moving, 0 if he should
1034	* stop.	1022	* stop.
1035	*/	1023	*/
1036	int	1024	int
1037	check_pick (object *op)	1025	check_pick (object *op)
1038	{	1026	{
1039	object *tmp, *next;	1027	object *tmp, *next;
1040	int stop = 0;	1028	int stop = 0;
1041	int j, k, wvratio;	1029	int wvratio;
1042	char putstring[128], tmpstr[16];	1030	char putstring[128];
1043		1031
1044	/* if you're flying, you cna't pick up anything */	1032	/* if you're flying, you cna't pick up anything */
1045	if (op->move_type & MOVE_FLYING)	1033	if (op->move_type & MOVE_FLYING)
1046	return 1;	1034	return 1;
1047		1035
…		…
1115	if (tmp->name != NULL)	1103	if (tmp->name != NULL)
1116	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1117	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1118	else	1106	else
1119	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1120	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1121		1109
1122	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1123	}	1111	}
1124		1112
1125	/* philosophy:	1113	/* philosophy:
…		…
1200	pick_up (op, tmp);	1188	pick_up (op, tmp);
1201	continue;	1189	continue;
1202	}	1190	}
1203		1191
1204	if (op->contr->mode & PU_READABLES)	1192	if (op->contr->mode & PU_READABLES)
1205	if (tmp->type == BOOK || tmp->type == SCROLL)	1193	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1206	{	1194	{
1207	pick_up (op, tmp);	1195	pick_up (op, tmp);
1208	continue;	1196	continue;
1209	}	1197	}
1210		1198
…		…
1318	/* careful: chairs and tables are weapons! */	1306	/* careful: chairs and tables are weapons! */
1319	if (op->contr->mode & PU_ALLWEAPON)	1307	if (op->contr->mode & PU_ALLWEAPON)
1320	{	1308	{
1321	if (tmp->type == WEAPON && tmp->name != NULL)	1309	if (tmp->type == WEAPON && tmp->name != NULL)
1322	{	1310	{
1323	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1324	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1325	{	1313	{
1326	pick_up (op, tmp);	1314	pick_up (op, tmp);
1327	continue;	1315	continue;
1328	}	1316	}
1329	}	1317	}
1330		1318
1331	if (tmp->type == WEAPON && tmp->name == NULL)	1319	if (tmp->type == WEAPON && tmp->name == NULL)
1332	{	1320	{
1333	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1334	{	1322	{
1335	pick_up (op, tmp);	1323	pick_up (op, tmp);
1336	continue;	1324	continue;
1337	}	1325	}
1338	}	1326	}
…		…
1363	if (tmp->name != NULL)	1351	if (tmp->name != NULL)
1364	{	1352	{
1365	fprintf (stderr, "%s", tmp->name);	1353	fprintf (stderr, "%s", tmp->name);
1366	}	1354	}
1367	else	1355	else
1368	fprintf (stderr, "%s", tmp->arch->name);	1356	fprintf (stderr, "%s", tmp->arch->archname);
1369	fprintf (stderr, ",%d] = ", tmp->type);	1357	fprintf (stderr, ",%d] = ", tmp->type);
1370	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1371	#endif	1359	#endif
1372	continue;	1360	continue;
1373	}	1361	}
…		…
1443	else	1431	else
1444	{	1432	{
1445	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1446	{	1434	{
1447	attacktype = 1 << attacknum;	1435	attacktype = 1 << attacknum;
1448	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1436	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1449	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1437	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1450	{	1438	{
1451	tmp = arrow;	1439	tmp = arrow;
1452	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1453	}	1441	}
1454	}	1442	}
1455	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1456	{	1444	{
1457	tmp = arrow;	1445	tmp = arrow;
…		…
1476	* find_better_arrow to find a decent arrow to use.	1464	* find_better_arrow to find a decent arrow to use.
1477	* op = the shooter	1465	* op = the shooter
1478	* type = bow->race	1466	* type = bow->race
1479	* dir = fire direction	1467	* dir = fire direction
1480	*/	1468	*/
1481
1482	object *	1469	object *
1483	pick_arrow_target (object *op, const char *type, int dir)	1470	pick_arrow_target (object *op, const char *type, int dir)
1484	{	1471	{
1485	object *tmp = NULL;	1472	object *tmp = NULL;
1486	maptile *m;	1473	maptile *m;
…		…
1551	*/	1538	*/
1552	int	1539	int
1553	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1540	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1554	{	1541	{
1555	object *left, *bow;	1542	object *left, *bow;
1556	int bowspeed, mflags;	1543	int mflags;
1557	maptile *m;	1544	maptile *m;
1558		1545
1559	if (!dir)	1546	if (!dir)
1560	{	1547	{
1561	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1548	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1562	return 0;	1549	return 0;
1563	}	1550	}
1564		1551
1565	if (op->type == PLAYER)	1552	if (op->contr)
1566	bow = op->contr->ranges[range_bow];	1553	bow = op->current_weapon;
1567	else	1554	else
1568	{	1555	{
1569	for (bow = op->inv; bow; bow = bow->below)	1556	for (bow = op->inv; bow; bow = bow->below)
1570	/* Don't check for applied - monsters don't apply bows - in that way, they	1557	/* Don't check for applied - monsters don't apply bows - in that way, they
1571	* don't need to switch back and forth between bows and weapons.	1558	* don't need to switch back and forth between bows and weapons.
…		…
1576	if (!bow)	1563	if (!bow)
1577	{	1564	{
1578	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1565	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1579	return 0;	1566	return 0;
1580	}	1567	}
		1568
		1569	// optimisation: move object to top so we will find it quickly again
		1570	if (bow->below)
		1571	{
		1572	bow->remove ();
		1573	op->insert (bow);
		1574	}
		1575
1581	}	1576	}
1582		1577
1583	if (!bow->race || !bow->skill)	1578	if (!bow->race || !bow->skill)
1584	{	1579	{
1585	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1586	return 0;	1581	return 0;
1587	}	1582	}
1588
1589	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1590
1591	/* penalize ROF for bestarrow */
1592	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1593	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1594
1595	if (bowspeed < 1)
1596	bowspeed = 1;
1597		1583
1598	if (arrow == NULL)	1584	if (arrow == NULL)
1599	{	1585	{
1600	if ((arrow = find_arrow (op, bow->race)) == NULL)	1586	if ((arrow = find_arrow (op, bow->race)) == NULL)
1601	{	1587	{
1602	if (op->type == PLAYER)	1588	if (op->type == PLAYER)
1603	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1589	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1604	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1590	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1605	else	1591	else
1606	CLEAR_FLAG (op, FLAG_READY_BOW);	1592	CLEAR_FLAG (op, FLAG_READY_BOW);
		1593
1607	return 0;	1594	return 0;
1608	}	1595	}
1609	}	1596	}
1610		1597
1611	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1598	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1635		1622
1636	arrow->set_owner (op);	1623	arrow->set_owner (op);
1637	arrow->skill = bow->skill;	1624	arrow->skill = bow->skill;
1638	arrow->direction = dir;	1625	arrow->direction = dir;
1639		1626
		1627	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1628	arrow->stats.hp = arrow->stats.dam;
		1629	arrow->stats.grace = arrow->attacktype;
		1630
		1631	if (arrow->slaying)
		1632	arrow->spellarg = strdup (arrow->slaying);
		1633
		1634	#if 0
		1635	if (player *pl = op->contr)
		1636	{
		1637	float speed = pl->weapon_sp;
		1638
		1639	/* penalize ROF for bestarrow */
		1640	if (pl->bowtype == bow_bestarrow)
		1641	speed *= .9f;
		1642	else
		1643	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1644
		1645	op->speed_left += speed - op->speed;
		1646	}
		1647	#endif
		1648
		1649	SET_ANIMATION (arrow, arrow->direction);
		1650
		1651	/* update the speed */
		1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1653	+ bow->stats.dam / 7.f;
		1654
		1655	arrow->set_speed (max (arrow->speed, 2.f));
		1656	arrow->speed_left = 0;
		1657
		1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1659
1640	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
1641	{	1661	{
1642	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1643	op->update_stats ();
1644	}
1645
1646	SET_ANIMATION (arrow, arrow->direction);
1647	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1648	arrow->stats.hp = arrow->stats.dam;
1649	arrow->stats.grace = arrow->attacktype;
1650	if (arrow->slaying != NULL)
1651	arrow->spellarg = strdup (arrow->slaying);
1652
1653	/* Note that this was different for monsters - they got their level
1654	* added to the damage. I think the strength bonus is more proper.
1655	*/
1656
1657	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1658
1659	/* update the speed */
1660	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1661	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1662
1663	arrow->set_speed (max (arrow->speed, 1.0));
1664	arrow->speed_left = 0;
1665
1666	if (op->type == PLAYER)
1667	{
1668	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1669	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1670	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1671
1672	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1662	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1663	wc -= dex_bonus[op->stats.Dex];
		1664
		1665	if (!arrow->slaying)
		1666	arrow->slaying = op->slaying;
		1667
		1668	arrow->attacktype |= op->attacktype;
1673	}	1669	}
1674	else	1670	else
1675	{	1671	{
1676	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1677	arrow->level = op->level;	1672	arrow->level = op->level;
1678	}	1673	arrow->stats.wc -= bow->magic;
1679		1674
1680	if (arrow->attacktype == AT_PHYSICAL)	1675	if (!arrow->slaying)
		1676	arrow->slaying = bow->slaying;
		1677
1681	arrow->attacktype |= bow->attacktype;	1678	arrow->attacktype |= bow->attacktype;
		1679	}
1682		1680
1683	if (bow->slaying)	1681	wc -= arrow->level;
1684	arrow->slaying = bow->slaying;	1682	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1685		1683
		1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686	arrow->move_type = MOVE_FLY_LOW;	1685	arrow->move_type = MOVE_FLY_LOW;
1687	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1688		1687
1689	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1688	op->play_sound (sound_find ("fire_arrow"));
1690	m->insert (arrow, sx, sy, op);	1689	m->insert (arrow, sx, sy, op);
1691		1690
1692	if (!arrow->destroyed ())	1691	if (!arrow->destroyed ())
1693	move_arrow (arrow);	1692	move_arrow (arrow);
1694		1693
…		…
1715	{	1714	{
1716	int ret = 0, wcmod = 0;	1715	int ret = 0, wcmod = 0;
1717		1716
1718	if (op->contr->bowtype == bow_bestarrow)	1717	if (op->contr->bowtype == bow_bestarrow)
1719	{	1718	{
1720	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1719	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1721	}	1720	}
1722	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1721	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1723	{	1722	{
1724	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1723	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1725	wcmod = -1;	1724	wcmod = -1;
…		…
1735	else if (op->contr->bowtype == bow_spreadshot)	1734	else if (op->contr->bowtype == bow_spreadshot)
1736	{	1735	{
1737	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1736	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1738	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);
1739	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1738	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1740
1741	}	1739	}
1742	else	1740	else
1743	{	1741	{
1744	/* Simple case */	1742	/* Simple case */
1745	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1743	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1746	}	1744	}
		1745
1747	return ret;	1746	return ret;
1748	}	1747	}
1749
1750		1748
1751	/* Fires a misc (wand/rod/horn) object in 'dir'.	1749	/* Fires a misc (wand/rod/horn) object in 'dir'.
1752	* Broken apart from 'fire' to keep it more readable.	1750	* Broken apart from 'fire' to keep it more readable.
1753	*/	1751	*/
1754	void	1752	void
1755	fire_misc_object (object *op, int dir)	1753	fire_misc_object (object *op, int dir)
1756	{	1754	{
1757	object *item;	1755	object *item = op->contr->ranged_ob;
1758		1756
1759	if (!op->contr->ranges[range_misc])	1757	if (!item)
1760	{	1758	{
1761	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1759	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1762	return;	1760	return;
1763	}	1761	}
1764		1762
1765	item = op->contr->ranges[range_misc];
1766	if (!item->inv)	1763	if (!item->inv)
1767	{	1764	{
1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1765	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769	return;	1766	return;
1770	}	1767	}
		1768
		1769	if (!op->change_weapon (item))
		1770	return;
		1771
1771	if (item->type == WAND)	1772	if (item->type == WAND)
1772	{	1773	{
1773	if (item->stats.food <= 0)	1774	if (item->stats.food <= 0)
1774	{	1775	{
1775	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1776	op->contr->play_sound (sound_find ("wand_poof"));
1776	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1778
1777	return;	1779	return;
1778	}	1780	}
1779	}	1781	}
1780	else if (item->type == ROD || item->type == HORN)	1782	else if (item->type == ROD || item->type == HORN)
1781	{	1783	{
1782	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1783	{	1785	{
1784	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	op->contr->play_sound (sound_find ("wand_poof"));
		1787
1785	if (item->type == ROD)	1788	if (item->type == ROD)
1786	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1787	else	1790	else
1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1792
1789	return;	1793	return;
1790	}	1794	}
1791	}	1795	}
1792		1796
1793	if (cast_spell (op, item, dir, item->inv, NULL))	1797	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1800	object *tmp;	1804	object *tmp;
1801		1805
1802	if (item->arch)	1806	if (item->arch)
1803	{	1807	{
1804	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
1805	item->face = item->arch->clone.face;	1809	item->face = item->arch->face;
1806	item->set_speed (0);	1810	item->set_speed (0);
1807	}	1811	}
1808		1812
1809	if ((tmp = item->in_player ()))	1813	if ((tmp = item->in_player ()))
1810	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1815	}	1819	}
1816	}	1820	}
1817		1821
1818	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
1819	*/	1823	*/
1820	void	1824	bool
1821	fire (object *op, int dir)	1825	fire (object *op, int dir)
1822	{	1826	{
1823	int spellcost = 0;	1827	int spellcost = 0;
1824		1828
1825	/* check for loss of invisiblity/hide */	1829	/* check for loss of invisiblity/hide */
1826	if (action_makes_visible (op))	1830	if (action_makes_visible (op))
1827	make_visible (op);	1831	make_visible (op);
1828		1832
1829	switch (op->contr->shoottype)	1833	player *pl = op->contr;
		1834
		1835	if (pl->golem)
		1836	{
		1837	control_golem (op->contr->golem, dir);
		1838	return false;
1830	{	1839	}
1831	case range_none:
1832	return;
1833		1840
1834	case range_bow:	1841	object *ob = pl->ranged_ob;
		1842
		1843	if (!ob)
		1844	return false;
		1845
		1846	if (!op->change_weapon (ob))
		1847	return false;
		1848
		1849	if (op->speed_left > 0.f)
		1850	--op->speed_left;
		1851	else
		1852	return false;
		1853
		1854	switch (ob->type)
		1855	{
		1856	case BOW:
1835	player_fire_bow (op, dir);	1857	player_fire_bow (op, dir);
1836	return;	1858	break;
1837		1859
1838	case range_magic: /* Casting spells */	1860	case SPELL:
1839	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1861	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1840	return;	1862	break;
1841		1863
1842	case range_misc:	1864	case BUILDER:
		1865	apply_map_builder (op, dir);
		1866	break;
		1867
		1868	case SKILL:
		1869	do_skill (op, op, ob, dir, 0);
		1870	break;
		1871
		1872	default:
1843	fire_misc_object (op, dir);	1873	fire_misc_object (op, dir);
1844	return;	1874	break;
1845
1846	case range_golem: /* Control summoned monsters from scrolls */
1847	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1848	{
1849	op->contr->ranges[range_golem] = 0;
1850	op->contr->shoottype = range_none;
1851	}
1852	else
1853	control_golem (op->contr->ranges[range_golem], dir);
1854	return;
1855
1856	case range_skill:
1857	if (!op->chosen_skill)
1858	{
1859	if (op->type == PLAYER)
1860	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1861	return;
1862	}
1863
1864	do_skill (op, op, op->chosen_skill, dir, NULL);
1865	return;
1866	case range_builder:
1867	apply_map_builder (op, dir);
1868	return;
1869	default:
1870	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1871	return;
1872	}	1875	}
		1876
		1877	return true;
1873	}	1878	}
1874		1879
1875	/* find_key	1880	/* find_key
1876	* We try to find a key for the door as passed. If we find a key	1881	* We try to find a key for the door as passed. If we find a key
1877	* and successfully use it, we return the key, otherwise NULL	1882	* and successfully use it, we return the key, otherwise NULL
…		…
1964	* 0 otherwise	1969	* 0 otherwise
1965	*/	1970	*/
1966	static int	1971	static int
1967	player_attack_door (object *op, object *door)	1972	player_attack_door (object *op, object *door)
1968	{	1973	{
1969	/* If its a door, try to find a use a key. If we do destroy the door,	1974	/* If its a door, try to find a key. If we do destroy the door,
1970	* might as well return immediately as there is nothing more to do -	1975	* might as well return immediately as there is nothing more to do -
1971	* otherwise, we fall through to the rest of the code.	1976	* otherwise, we fall through to the rest of the code.
1972	*/	1977	*/
1973	object *key = find_key (op, op, door);	1978	object *key = find_key (op, op, door);
1974		1979
1975	/* IF we found a key, do some extra work */	1980	/* If we found a key, do some extra work */
1976	if (key)	1981	if (key)
1977	{	1982	{
1978	object *container = key->env;	1983	object *container = key->env;
1979		1984
1980	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1981	if (action_makes_visible (op))	1985	if (action_makes_visible (op))
1982	make_visible (op);	1986	make_visible (op);
		1987
1983	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1988	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1984	spring_trap (door->inv, op);	1989	spring_trap (door->inv, op);
1985		1990
1986	if (door->type == DOOR)	1991	if (door->type == DOOR)
1987	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1992	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
…		…
2013	* It should keep the code cleaner.	2018	* It should keep the code cleaner.
2014	* When this is called, the players direction has been updated	2019	* When this is called, the players direction has been updated
2015	* (taking into account confusion.) The player is also actually	2020	* (taking into account confusion.) The player is also actually
2016	* going to try and move (not fire weapons).	2021	* going to try and move (not fire weapons).
2017	*/	2022	*/
2018	void	2023	bool
2019	move_player_attack (object *op, int dir)	2024	move_player_attack (object *op, int dir)
2020	{	2025	{
2021	object *tmp, *mon;
2022	sint16 nx, ny;
2023	int on_battleground;	2026	int on_battleground;
2024	maptile *m;
2025		2027
2026	nx = freearr_x[dir] + op->x;	2028	sint16 nx = freearr_x[dir] + op->x;
2027	ny = freearr_y[dir] + op->y;	2029	sint16 ny = freearr_y[dir] + op->y;
2028		2030
2029	on_battleground = op_on_battleground (op, 0, 0);	2031	on_battleground = op_on_battleground (op, 0, 0);
		2032
		2033	if (out_of_map (op->map, nx, ny))
		2034	return false;
		2035
		2036	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2037	{
		2038	--op->speed_left;
		2039	return true;
		2040	}
2030		2041
2031	/* If braced, or can't move to the square, and it is not out of the	2042	/* If braced, or can't move to the square, and it is not out of the
2032	* map, attack it. Note order of if statement is important - don't	2043	* map, attack it. Note order of if statement is important - don't
2033	* want to be calling move_ob if braced, because move_ob will move the	2044	* want to be calling move_ob if braced, because move_ob will move the
2034	* player. This is a pretty nasty hack, because if we could	2045	* player. This is a pretty nasty hack, because if we could
2035	* move to some space, it then means that if we are braced, we should	2046	* move to some space, it then means that if we are braced, we should
2036	* do nothing at all. As it is, if we are braced, we go through	2047	* do nothing at all. As it is, if we are braced, we go through
2037	* quite a bit of processing. However, it probably is less than what	2048	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	2049	* move_ob uses.
2039	*/	2050	*/
2040	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2041	{
2042	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2043	{
2044	m = op->map->xy_find (nx, ny);	2051	maptile *m = op->map->xy_find (nx, ny);
2045	if (!m)
2046	return; /* Don't think this should happen */
2047	}
2048	else
2049	m = op->map;
2050		2052
2051	if (!(tmp = m->at (nx, ny).bot))
2052	return;
2053
2054	mon = 0;
2055	/* Go through all the objects, and find ones of interest. Only stop if	2053	/* Go through all the objects, and find ones of interest. Only stop if
2056	* we find a monster - that is something we know we want to attack.	2054	* we find a monster - that is something we know we want to attack.
2057	* if its a door or barrel (can roll) see if there may be monsters	2055	* if its a door or barrel (can roll) see if there may be monsters
2058	* on the space	2056	* on the space
2059	*/	2057	*/
2060	while (tmp)	2058	object *mon;
2061	{	2059	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2062	if (tmp == op)	2060	{
2063	{	2061	if ((mon->flag [FLAG_ALIVE]
2064	tmp = tmp->above;	2062	|| mon->type == LOCKED_DOOR
2065	continue;	2063	|| mon->flag [FLAG_CAN_ROLL])
2066	}
2067
2068	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2069	{
2070	mon = tmp;	2064	&& mon != op)
2071	break;	2065	break;
2072	}	2066	}
2073		2067
2074	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2075	mon = tmp;
2076
2077	tmp = tmp->above;
2078	}
2079
2080	if (!mon) /* This happens anytime the player tries to move */	2068	if (!mon) /* This happens anytime the player tries to move */
2081	return; /* into a wall */	2069	return false; /* into a wall */
2082		2070
2083	if (mon->head)
2084	mon = mon->head;	2071	mon = mon->head_ ();
2085		2072
2086	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2073	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2074	if (op->contr->weapon_sp_left > 0.f)
2087	if (player_attack_door (op, mon))	2075	if (player_attack_door (op, mon))
		2076	{
		2077	--op->contr->weapon_sp_left;
2088	return;	2078	return true;
		2079	}
2089		2080
2090	/* The following deals with possibly attacking peaceful	2081	/* The following deals with possibly attacking peaceful
2091	* or frienddly creatures. Basically, all players are considered	2082	* or friendly creatures. Basically, all players are considered
2092	* unaggressive. If the moving player has peaceful set, then the	2083	* unaggressive. If the moving player has peaceful set, then the
2093	* object should be pushed instead of attacked. It is assumed that	2084	* object should be pushed instead of attacked. It is assumed that
2094	* if you are braced, you will not attack friends accidently,	2085	* if you are braced, you will not attack friends accidently,
2095	* and thus will not push them.	2086	* and thus will not push them.
2096	*/	2087	*/
2097		2088
2098	/* If the creature is a pet, push it even if the player is not	2089	/* If the creature is a pet, push it even if the player is not
2099	* peaceful. Our assumption is the creature is a pet if the	2090	* peaceful. Our assumption is the creature is a pet if the
2100	* player owns it and it is either friendly or unagressive.	2091	* player owns it and it is either friendly or unagressive.
2101	*/	2092	*/
2102	if ((op->type == PLAYER)	2093	if (op->type == PLAYER
2103	#if COZY_SERVER
2104	&&
2105	((mon->owner && mon->owner->contr	2094	&& ((mon->owner && mon->owner->contr
2106	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2095	&& same_party (mon->owner->contr->party, op->contr->party))
2107	#else
2108	&& mon->owner == op	2096	|| mon->owner == op)
2109	#endif
2110	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2097	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2111	{	2098	{
2112	/* If we're braced, we don't want to switch places with it */	2099	/* If we're braced, we don't want to switch places with it */
2113	if (op->contr->braced)	2100	if (op->contr->braced)
2114	return;	2101	return false;
2115		2102
2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2103	if (op->speed_left > 0.f)
		2104	{
		2105	--op->speed_left;
		2106
		2107	op->play_sound (sound_find ("push_player"));
2117	(void) push_ob (mon, dir, op);	2108	push_ob (mon, dir, op);
		2109
2118	if (op->contr->tmp_invis || op->hide)	2110	if (op->contr->tmp_invis || op->hide)
2119	make_visible (op);	2111	make_visible (op);
2120		2112
2121	return;	2113	return true;
2122	}	2114	}
		2115	else
		2116	return false;
		2117	}
2123		2118
2124	/* in certain circumstances, you shouldn't attack friendly	2119	/* in certain circumstances, you shouldn't attack friendly
2125	* creatures. Note that if you are braced, you can't push	2120	* creatures. Note that if you are braced, you can't push
2126	* someone, but put it inside this loop so that you won't	2121	* someone, but put it inside this loop so that you won't
2127	* attack them either.	2122	* attack them either.
2128	*/	2123	*/
2129	if ((mon->type == PLAYER || mon->enemy != op) &&	2124	if ((mon->type == PLAYER || mon->enemy != op)
2130	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2125	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2131	#ifdef PROHIBIT_PLAYERKILL
2132	(op->contr->peaceful	2126	&& ((op->contr->peaceful
2133	|| (mon->type == PLAYER	2127	|| (mon->type == PLAYER && mon->contr->peaceful))
2134	&& mon->contr->
2135	peaceful)) &&
2136	#else
2137	op->contr->peaceful &&
2138	#endif
2139	!on_battleground))	2128	&& !on_battleground))
		2129	{
		2130	if (op->speed_left > 0.f)
2140	{	2131	{
		2132	--op->speed_left;
		2133
2141	if (!op->contr->braced)	2134	if (!op->contr->braced)
2142	{	2135	{
2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2136	op->play_sound (sound_find ("push_player"));
2144	push_ob (mon, dir, op);	2137	push_ob (mon, dir, op);
2145	}	2138	}
2146	else	2139	else
2147	new_draw_info (0, 0, op, "You withhold your attack");	2140	new_draw_info (0, 0, op, "You withhold your attack");
2148		2141
2149	if (op->contr->tmp_invis || op->hide)	2142	if (op->contr->tmp_invis || op->hide)
2150	make_visible (op);	2143	make_visible (op);
2151	}
2152		2144
		2145	return true;
		2146	}
		2147	}
2153	/* If the object is a boulder or other rollable object, then	2148	/* If the object is a boulder or other rollable object, then
2154	* roll it if not braced. You can't roll it if you are braced.	2149	* roll it if not braced. You can't roll it if you are braced.
2155	*/	2150	*/
2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2151	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2152	{
		2153	if (op->speed_left > 0.f)
2157	{	2154	{
		2155	--op->speed_left;
		2156
2158	recursive_roll (mon, dir, op);	2157	recursive_roll (mon, dir, op);
2159	if (action_makes_visible (op))	2158	if (action_makes_visible (op))
2160	make_visible (op);	2159	make_visible (op);
2161	}
2162		2160
		2161	return true;
		2162	}
		2163	}
2163	/* Any generic living creature. Including things like doors.	2164	/* Any generic living creature. Including things like doors.
2164	* Way it works is like this: First, it must have some hit points	2165	* Way it works is like this: First, it must have some hit points
2165	* and be living. Then, it must be one of the following:	2166	* and be living. Then, it must be one of the following:
2166	* 1) Not a player, 2) A player, but of a different party. Note	2167	* 1) Not a player, 2) A player, but of a different party. Note
2167	* that party_number -1 is no party, so attacks can still happen.	2168	* that party_number -1 is no party, so attacks can still happen.
2168	*/	2169	*/
2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2170	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2171	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2171	{	2172	{
2172		2173	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2173	/* If the player hasn't hit something this tick, and does
2174	* so, give them speed boost based on weapon speed. Doing
2175	* it here is better than process_players2, which basically
2176	* incurred a 1 tick offset.
2177	*/
2178	if (!op->contr->has_hit)
2179	{	2174	{
2180	op->speed_left += op->speed / op->contr->weapon_sp;	2175	--op->contr->weapon_sp_left;
2181
2182	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2183	}
2184		2176
2185	skill_attack (mon, op, 0, 0, 0);	2177	skill_attack (mon, op, 0, 0, 0);
2186
2187	/* If attacking another player, that player gets automatic
2188	* hitback, and doesn't loose luck either.
2189	* Disable hitback on the battleground or if the target is
2190	* the wiz.
2191	*/
2192	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2193	{
2194	short luck = mon->stats.luck;
2195
2196	mon->contr->has_hit = 1;
2197	skill_attack (op, mon, 0, 0, 0);
2198	mon->stats.luck = luck;
2199	}
2200		2178
2201	if (action_makes_visible (op))	2179	if (action_makes_visible (op))
2202	make_visible (op);	2180	make_visible (op);
2203	}
2204	} /* if player should attack something */
2205	}
2206		2181
2207	int	2182	return true;
		2183	}
		2184	}
		2185
		2186	return false;
		2187	}
		2188
		2189	bool
2208	move_player (object *op, int dir)	2190	move_player (object *op, int dir)
2209	{	2191	{
2210	int pick;	2192	int pick;
2211		2193
2212	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2194	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2226	op->facing = dir;	2208	op->facing = dir;
2227		2209
2228	if (op->hide)	2210	if (op->hide)
2229	do_hidden_move (op);	2211	do_hidden_move (op);
2230		2212
		2213	bool retval;
		2214
2231	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2215	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2232	/*nop */ ;	2216	retval = RESULT_INT (0);
2233	else if (op->contr->fire_on)	2217	else if (op->contr->fire_on)
2234	fire (op, dir);	2218	retval = fire (op, dir);
2235	else	2219	else
2236	{	2220	{
2237	move_player_attack (op, dir);	2221	retval = move_player_attack (op, dir);
2238	pick = check_pick (op);	2222	pick = check_pick (op);
2239	}	2223	}
2240		2224
2241	/* Add special check for newcs players and fire on - this way, the	2225	/* Add special check for newcs players and fire on - this way, the
2242	* server can handle repeat firing.	2226	* server can handle repeat firing.
…		…
2249	/* Update how the player looks. Use the facing, so direction may	2233	/* Update how the player looks. Use the facing, so direction may
2250	* get reset to zero. This allows for full animation capabilities	2234	* get reset to zero. This allows for full animation capabilities
2251	* for players.	2235	* for players.
2252	*/	2236	*/
2253	animate_object (op, op->facing);	2237	animate_object (op, op->facing);
2254	return 0;	2238
		2239	return retval;
2255	}	2240	}
2256		2241
2257	/* This is similar to handle_player, below, but is only used by the	2242	/* This is similar to handle_player, below, but is only used by the
2258	* new client/server stuff.	2243	* new client/server stuff.
2259	* This is sort of special, in that the new client/server actually uses	2244	* This is sort of special, in that the new client/server actually uses
2260	* the new speed values for commands.	2245	* the new speed values for commands.
2261	*	2246	*
2262	* Returns true if there are more actions we can do.	2247	* Returns true if there are more actions we can do. Should not do
		2248	* many actions in a row, as that would be too unfair to other
		2249	* players.
2263	*/	2250	*/
2264	int	2251	bool
2265	handle_newcs_player (object *op)	2252	handle_newcs_player (object *op)
2266	{	2253	{
2267	if (op->contr->hidden)
2268	{
2269	op->invisible = 1000;
2270	/* the socket code flashes the player visible/invisible
2271	* depending on the value of invisible, so we need to
2272	* alternate it here for it to work correctly.
2273	*/
2274	if (pticks & 2)
2275	op->invisible--;
2276	}
2277	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2278	{
2279	op->invisible--;
2280	if (!op->invisible)
2281	{
2282	make_visible (op);
2283	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2284	}
2285	}
2286
2287	if (QUERY_FLAG (op, FLAG_SCARED))	2254	if (QUERY_FLAG (op, FLAG_SCARED))
2288	{	2255	{
2289	flee_player (op);	2256	if (op->speed_left > 0.f)
2290	/* If player is still scared, that is his action for this tick */
2291	if (QUERY_FLAG (op, FLAG_SCARED))
2292	{	2257	{
2293	op->speed_left--;	2258	--op->speed_left;
		2259	flee_player (op);
		2260
2294	return 0;	2261	return true;
2295	}	2262	}
		2263	else
		2264	return false;
2296	}	2265	}
2297
2298	/* I've been seeing crashes where the golem has been destroyed, but
2299	* the player object still points to the defunct golem. The code that
2300	* destroys the golem looks correct, and it doesn't always happen, so
2301	* put this in a a workaround to clean up the golem pointer.
2302	*/
2303	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2304	op->contr->ranges[range_golem] = 0;
2305		2266
2306	/* call this here - we also will call this in do_ericserver, but	2267	/* call this here - we also will call this in do_ericserver, but
2307	* the players time has been increased when doericserver has been	2268	* the players time has been increased when doericserver has been
2308	* called, so we recheck it here.	2269	* called, so we recheck it here.
2309	*/	2270	*/
2310	if (op->contr->ns->handle_command ())	2271	if (op->contr->ns->handle_command ())
2311	return 1;	2272	return true;
2312		2273
2313	if (op->speed_left > 0)
2314	{
2315	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2274	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2316	{
2317	/* All move commands take 1 tick, at least for now */
2318	op->speed_left--;
2319
2320	/* Instead of all the stuff below, let move_player take care
2321	* of it. Also, some of the skill stuff is only put in
2322	* there, as well as the confusion stuff.
2323	*/
2324	move_player (op, op->direction);	2275	return move_player (op, op->direction);
2325		2276
2326	return op->speed_left > 0;
2327	}
2328	}
2329
2330	return 0;	2277	return false;
2331	}	2278	}
2332		2279
2333	int	2280	int
2334	save_life (object *op)	2281	save_life (object *op)
2335	{	2282	{
…		…
2337	return 0;	2284	return 0;
2338		2285
2339	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2286	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2340	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2287	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2341	{	2288	{
2342	play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);	2289	op->play_sound (sound_find ("ob_evaporate"));
2343	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2290	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2344		2291
2345	if (op->contr)	2292	if (op->contr)
2346	esrv_del_item (op->contr, tmp->count);	2293	esrv_del_item (op->contr, tmp->count);
2347		2294
…		…
2367	/* This goes throws the inventory and removes unpaid objects, and puts them	2314	/* This goes throws the inventory and removes unpaid objects, and puts them
2368	* back in the map (location and map determined by values of env). This	2315	* back in the map (location and map determined by values of env). This
2369	* function will descend into containers. op is the object to start the search	2316	* function will descend into containers. op is the object to start the search
2370	* from.	2317	* from.
2371	*/	2318	*/
2372	void	2319	static void
2373	remove_unpaid_objects (object *op, object *env)	2320	drop_unpaid_items (object *op, object *env)
2374	{	2321	{
2375	while (op)	2322	while (op)
2376	{	2323	{
2377	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2324	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2378		2325
…		…
2382	esrv_del_item (env->contr, op->count);	2329	esrv_del_item (env->contr, op->count);
2383		2330
2384	op->insert_at (env);	2331	op->insert_at (env);
2385	}	2332	}
2386	else if (op->inv)	2333	else if (op->inv)
2387	remove_unpaid_objects (op->inv, env);	2334	drop_unpaid_items (op->inv, env);
2388		2335
2389	op = next;	2336	op = next;
2390	}	2337	}
		2338	}
		2339
		2340	void
		2341	object::drop_unpaid_items ()
		2342	{
		2343	if (!flag [FLAG_REMOVED])
		2344	::drop_unpaid_items (inv, this);
2391	}	2345	}
2392		2346
2393	/*	2347	/*
2394	* Returns pointer a static string containing gravestone text	2348	* Returns pointer a static string containing gravestone text
2395	* Moved from apply.c to player.c - player.c is what	2349	* Moved from apply.c to player.c - player.c is what
…		…
2445	int rate_grace = 2000;	2399	int rate_grace = 2000;
2446	const int max_hp = 1;	2400	const int max_hp = 1;
2447	const int max_sp = 1;	2401	const int max_sp = 1;
2448	const int max_grace = 1;	2402	const int max_grace = 1;
2449		2403
2450	if (op->contr->outputs_sync)	2404	if (op->contr->hidden)
		2405	{
		2406	op->invisible = 1000;
		2407	/* the socket code flashes the player visible/invisible
		2408	* depending on the value of invisible, so we need to
		2409	* alternate it here for it to work correctly.
		2410	*/
		2411	if (pticks & 2)
		2412	op->invisible--;
2451	{	2413	}
2452	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2414	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2453	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2415	{
2454	flush_output_element (op, &op->contr->outputs[i]);	2416	if (!op->invisible--)
		2417	{
		2418	make_visible (op);
		2419	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2420	}
2455	}	2421	}
2456		2422
2457	if (op->contr->ns->state == ST_PLAYING)	2423	if (op->contr->ns->state == ST_PLAYING)
2458	{	2424	{
2459	/* these next three if clauses make it possible to SLOW DOWN	2425	/* these next three if clauses make it possible to SLOW DOWN
…		…
2481	gen_grace = op->stats.maxgrace;	2447	gen_grace = op->stats.maxgrace;
2482	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2448	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2483	}	2449	}
2484		2450
2485	/* Regenerate Spell Points */	2451	/* Regenerate Spell Points */
2486	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2452	if (!op->contr->golem && --op->last_sp < 0)
2487	{	2453	{
2488	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2454	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2489	if (op->stats.sp < op->stats.maxsp)	2455	if (op->stats.sp < op->stats.maxsp)
2490	{	2456	{
2491	op->stats.sp++;	2457	op->stats.sp++;
…		…
2589	}	2555	}
2590		2556
2591	/* Digestion */	2557	/* Digestion */
2592	if (--op->last_eat < 0)	2558	if (--op->last_eat < 0)
2593	{	2559	{
2594	#ifdef COZY_SERVER	2560	int bonus = max (0, op->contr->digestion),
2595	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;	2561	penalty = max (0, -op->contr->digestion);
2596	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2597	#else
2598	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2599	#endif
2600		2562
2601	if (op->contr->gen_hp > 0)
2602	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2603	else
2604	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2605		2564
2606	/* dms do not consume food */	2565	/* dms do not consume food */
2607	if (!QUERY_FLAG (op, FLAG_WIZ))	2566	if (!QUERY_FLAG (op, FLAG_WIZ))
2608	op->stats.food--;	2567	op->stats.food--;
2609	}	2568	}
…		…
2670	object *tmp;	2629	object *tmp;
2671		2630
2672	if (save_life (op))	2631	if (save_life (op))
2673	return;	2632	return;
2674		2633
2675
2676	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2634	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2677	* in cities ONLY!!! It is very important that this doesn't get abused.	2635	* in cities ONLY!!! It is very important that this doesn't get abused.
2678	* Look at op_on_battleground() for more info --AndreasV	2636	* Look at op_on_battleground() for more info --AndreasV
2679	*/	2637	*/
2680	if (op_on_battleground (op, &x, &y))	2638	if (op_on_battleground (op, &x, &y))
…		…
2732	strcpy (op->contr->killer, "starvation");	2690	strcpy (op->contr->killer, "starvation");
2733	}	2691	}
2734	else	2692	else
2735	sprintf (buf, "%s died.", &op->name);	2693	sprintf (buf, "%s died.", &op->name);
2736		2694
2737	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2695	op->contr->play_sound (sound_find ("player_dies"));
2738		2696
2739	/* save the map location for corpse, gravestone */	2697	/* save the map location for corpse, gravestone */
2740	x = op->x;	2698	x = op->x;
2741	y = op->y;	2699	y = op->y;
2742	map = op->map;	2700	map = op->map;
…		…
2916	op->stats.hp = op->stats.maxhp;	2874	op->stats.hp = op->stats.maxhp;
2917	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2875	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2918	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2876	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2919		2877
2920	/*	2878	/*
2921	* Check to see if the player is in a shop. IF so, then check to see if
2922	* the player has any unpaid items. If so, remove them and put them back	2879	* Check to see if the player has any unpaid items. If so, remove them
2923	* in the map.	2880	* and put them back in the map.
2924	*/	2881	*/
2925		2882	op->drop_unpaid_items ();
2926	if (is_in_shop (op))
2927	remove_unpaid_objects (op->inv, op);
2928		2883
2929	/****************************************/	2884	/****************************************/
2930	/* */	2885	/* */
2931	/* Move player to his current respawn- */	2886	/* Move player to his current respawn- */
2932	/* position (usually last savebed) */	2887	/* position (usually last savebed) */
…		…
2952	object *force;	2907	object *force;
2953	int at;	2908	int at;
2954		2909
2955	force = get_archetype (FORCE_NAME);	2910	force = get_archetype (FORCE_NAME);
2956	/* 50 ticks should be enough time for the spell to abate */	2911	/* 50 ticks should be enough time for the spell to abate */
2957	force->speed = 0.1;	2912	force->speed = 0.1f;
2958	force->speed_left = -5.0;	2913	force->speed_left = -5.f;
2959	SET_FLAG (force, FLAG_APPLIED);	2914	SET_FLAG (force, FLAG_APPLIED);
2960	for (at = 0; at < NROFATTACKS; at++)	2915	for (at = 0; at < NROFATTACKS; at++)
2961	if (will_kill_again & (1 << at))	2916	if (will_kill_again & (1 << at))
2962	force->resist[at] = 100;	2917	force->resist[at] = 100;
2963		2918
…		…
3077	if (op->type == PLAYER)	3032	if (op->type == PLAYER)
3078	{	3033	{
3079	op->contr->tmp_invis = 0;	3034	op->contr->tmp_invis = 0;
3080	op->contr->invis_race = 0;	3035	op->contr->invis_race = 0;
3081	}	3036	}
		3037
3082	update_object (op, UP_OBJ_FACE);	3038	update_object (op, UP_OBJ_CHANGE);
3083	}	3039	}
3084		3040
3085	int	3041	int
3086	is_true_undead (object *op)	3042	is_true_undead (object *op)
3087	{	3043	{
3088	object *tmp = NULL;
3089
3090	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3044	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3091	return 1;	3045	return 1;
3092		3046
3093	return 0;	3047	return 0;
3094	}	3048	}
3095		3049
…		…
3139	/* For Hidden creatures - a chance of becoming 'unhidden'	3093	/* For Hidden creatures - a chance of becoming 'unhidden'
3140	* every time they move - as we subtract off 'invisibility'	3094	* every time they move - as we subtract off 'invisibility'
3141	* AND, for players, if they move into a ridiculously unhideable	3095	* AND, for players, if they move into a ridiculously unhideable
3142	* spot (surrounded by clear terrain in broad daylight). -b.t.	3096	* spot (surrounded by clear terrain in broad daylight). -b.t.
3143	*/	3097	*/
3144
3145	void	3098	void
3146	do_hidden_move (object *op)	3099	do_hidden_move (object *op)
3147	{	3100	{
3148	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3101	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3149	object *skop;	3102	object *skop;
…		…
3266	* a blocked los square.	3219	* a blocked los square.
3267	* we use the archetype to figure out offsets.	3220	* we use the archetype to figure out offsets.
3268	*/	3221	*/
3269	while (op)	3222	while (op)
3270	{	3223	{
3271	dx = rv.distance_x + op->arch->clone.x;	3224	dx = rv.distance_x + op->arch->x;
3272	dy = rv.distance_y + op->arch->clone.y;	3225	dy = rv.distance_y + op->arch->y;
3273		3226
3274	/* only the viewable area the player sees is updated by LOS	3227	/* only the viewable area the player sees is updated by LOS
3275	* code, so we need to restrict ourselves to that range of values	3228	* code, so we need to restrict ourselves to that range of values
3276	* for any meaningful values.	3229	* for any meaningful values.
3277	*/	3230	*/
…		…
3382	char buf[MAX_BUF]; /* tmp. string buffer */	3335	char buf[MAX_BUF]; /* tmp. string buffer */
3383	int i = 0, j = 0;	3336	int i = 0, j = 0;
3384		3337
3385	/* get the appropriate treasurelist */	3338	/* get the appropriate treasurelist */
3386	if (atnr == ATNR_FIRE)	3339	if (atnr == ATNR_FIRE)
3387	trlist = find_treasurelist ("dragon_ability_fire");	3340	trlist = treasurelist::find ("dragon_ability_fire");
3388	else if (atnr == ATNR_COLD)	3341	else if (atnr == ATNR_COLD)
3389	trlist = find_treasurelist ("dragon_ability_cold");	3342	trlist = treasurelist::find ("dragon_ability_cold");
3390	else if (atnr == ATNR_ELECTRICITY)	3343	else if (atnr == ATNR_ELECTRICITY)
3391	trlist = find_treasurelist ("dragon_ability_elec");	3344	trlist = treasurelist::find ("dragon_ability_elec");
3392	else if (atnr == ATNR_POISON)	3345	else if (atnr == ATNR_POISON)
3393	trlist = find_treasurelist ("dragon_ability_poison");	3346	trlist = treasurelist::find ("dragon_ability_poison");
3394		3347
3395	if (trlist == NULL || who->type != PLAYER)	3348	if (trlist == NULL || who->type != PLAYER)
3396	return;	3349	return;
3397		3350
3398	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3351	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3402	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3355	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3403	return;	3356	return;
3404	}	3357	}
3405		3358
3406	/* everything seems okay - now bring on the gift: */	3359	/* everything seems okay - now bring on the gift: */
3407	item = &(tr->item->clone);	3360	item = tr->item;
3408		3361
3409	if (item->type == SPELL)	3362	if (item->type == SPELL)
3410	{	3363	{
3411	if (check_spell_known (who, item->name))	3364	if (check_spell_known (who, item->name))
3412	return;	3365	return;
…		…
3471	{	3424	{
3472	/* forces in the treasurelist can alter the player's stats */	3425	/* forces in the treasurelist can alter the player's stats */
3473	object *skin;	3426	object *skin;
3474		3427
3475	/* first get the dragon skin force */	3428	/* first get the dragon skin force */
3476	shstr_cmp dragon_skin_force ("dragon_skin_force");
3477	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3429	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3478	;	3430	;
3479		3431
3480	if (!skin)	3432	if (!skin)
3481	return;	3433	return;
3482		3434
…		…
3530	* not readied.	3482	* not readied.
3531	*/	3483	*/
3532	void	3484	void
3533	player_unready_range_ob (player *pl, object *ob)	3485	player_unready_range_ob (player *pl, object *ob)
3534	{	3486	{
3535	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3487	if (pl->ob->current_weapon == ob)
		3488	pl->ob->current_weapon = 0;
		3489
		3490	if (pl->combat_ob == ob)
		3491	pl->combat_ob = 0;
		3492
3536	if (pl->ranges[i] == ob)	3493	if (pl->ranged_ob == ob)
3537	{
3538	pl->ranges[i] = 0;	3494	pl->ranged_ob = 0;
3539	if (pl->shoottype == i)
3540	pl->shoottype = range_none;
3541	}
3542	}	3495	}
3543		3496
3544	sint8	3497	sint8
3545	player::visibility_at (maptile *map, int x, int y) const	3498	player::visibility_at (maptile *map, int x, int y) const
3546	{	3499	{

Diff Legend

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