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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.146 by root, Sun Jun 3 17:05:36 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <pwd.h>
27	#include <sproto.h>	26	#include <sproto.h>
28	#include <sounds.h>	27	#include <sounds.h>
29	#include <living.h>	28	#include <living.h>
30	#include <object.h>	29	#include <object.h>
31	#include <spells.h>	30	#include <spells.h>
116		115
117	news[0] = '\0';	116	news[0] = '\0';
118	subject[0] = '\0';	117	subject[0] = '\0';
119	size = 0;	118	size = 0;
120		119
121	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
122	{	121	{
123	if (*buf == '#')	122	if (*buf == '#')
124	continue;	123	continue;
125		124
126	if (*buf == '%')	125	if (*buf == '%')
127	{ /* send one news */	126	{ /* send one news */
128	if (size > 0)	127	if (size > 0)
129	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /send previously read news /	128	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char )"%s\n%s", subject, news); /send previously read news */
130		129
131	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
132	strip_endline (subject);	131	strip_endline (subject);
133	size = 0;	132	size = 0;
134	news[0] = '\0';	133	news[0] = '\0';
…		…
144	size += strlen (buf);	143	size += strlen (buf);
145	}	144	}
146	}	145	}
147		146
148	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
151	}	150	}
152		151
153	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
154	static void	153	static void
155	set_first_map (object *op)	154	set_first_map (object *op)
156	{	155	{
157	op->contr->maplevel = first_map_path;	156	op->contr->maplevel = first_map_path;
158	op->x = -1;	157	op->x = -1;
159	op->y = -1;	158	op->y = -1;
160	}
161
162	void
163	player::enter_map ()
164	{
165	object *tmp = object::create ();
166
167	EXIT_PATH (tmp) = maplevel;
168	EXIT_X (tmp) = ob->x;
169	EXIT_Y (tmp) = ob->y;
170	ob->enter_exit (tmp);
171
172	tmp->destroy ();
173	}	159	}
174		160
175	void	161	void
176	player::activate ()	162	player::activate ()
177	{	163	{
…		…
180		166
181	players.insert (this);	167	players.insert (this);
182	ob->remove ();	168	ob->remove ();
183	ob->map = 0;	169	ob->map = 0;
184	ob->activate_recursive ();	170	ob->activate_recursive ();
185	enter_map ();	171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
186	}	173	}
187		174
188	void	175	void
189	player::deactivate ()	176	player::deactivate ()
190	{	177	{
191	if (!active)	178	if (!active)
192	return;	179	return;
193		180
194	terminate_all_pets (ob);	181	terminate_all_pets (ob);
		182	remove_friendly_object (ob);
195	ob->deactivate_recursive ();	183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
196	ob->remove ();	188	ob->remove ();
197	ob->map = 0;	189	ob->map = 0;
		190	party = 0;
		191
		192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
198		193
199	players.erase (this);	194	players.erase (this);
200	}	195	}
201		196
202	// connect the player with a specific client	197	// connect the player with a specific client
203	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
204	void	199	void
205	player::connect (client *ns)	200	player::connect (client *ns)
206	{	201	{
207	this->ns = ns;	202	this->ns = ns;
208	ns->pl = this;	203	ns->pl = this;
209		204
		205	run_on = 0;
		206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
		208
210	ns->update_look = 0;	209	ns->update_look = 0;
211	ns->look_position = 0;	210	ns->look_position = 0;
212		211
213	clear_los (ob);	212	clear_los (ob);
		213
		214	ns->reset_stats ();
214		215
215	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
218		219
219	if (!legal_range (ob, shoottype))
220	shoottype = range_none;
221
222	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
223	link_player_skills (ob);	221	link_player_skills (ob);
224		222
225	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226		224
227	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
228
229	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
230	* from the class, and not race. I don't see any way to get the class information
231	* to then update this. I don't think this will actually break anything - anyone
232	* that can use armour should be able to use a shield. What this may 'break'
233	* are features new characters get, eg, if someone starts up with a Q, they
234	* should be able to use a shield. However, old Q's won't get that advantage.
235	*/
236	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237	SET_FLAG (ob, FLAG_USE_SHIELD);
238		226
239	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
240	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
241	{	229	{
242	object tmp, abil = 0, *skin = 0;	230	object tmp, abil = 0, *skin = 0;
…		…
252	skin = tmp;	240	skin = tmp;
253		241
254	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
255	}	243	}
256		244
257	CLEAR_FLAG (ob, FLAG_FRIENDLY);
258	add_friendly_object (ob);
259
260	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
261		246
262	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
263		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);
264	ob->update_stats ();	274	ob->update_stats ();
		275
265	ns->floorbox_update ();	276	ns->floorbox_update ();
266
267	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
268	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
269		279
270	activate ();	280	activate ();
271		281
…		…
285	if (active)	295	if (active)
286	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
287		297
288	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
289		299
		300	ns->reset_stats ();
290	ns->pl = 0;	301	ns->pl = 0;
291	this->ns = 0;	302	ns = 0;
292	}	303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
293		307
294	deactivate ();	308	deactivate ();
295	}	309	}
296		310
297	// the need for this function can be explained	311	// the need for this function can be explained
298	// by load_object not returning the object	312	// by load_object not returning the object
299	void	313	void
300	player::set_object (object *op)	314	player::set_object (object *op)
301	{	315	{
302	ob = op;	316	ob = observe = op;
303	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
304		318
		319	ob->speed = 1.0f;
305	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
306	ob->speed = 1.0;	321
307	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
308	ob->stats.wc = 2;	323	}
309	ob->run_away = 25; /* Then we panick... */
310		324
311	ob->roll_stats ();	325	void
		326	player::set_observe (object *op)
		327	{
		328	observe = op ? op : ob;
312	}	329	}
313		330
314	player::player ()	331	player::player ()
315	{	332	{
316	/* There are some elements we want initialised to non zero value -	333	/* There are some elements we want initialised to non zero value -
317	* we deal with that below this point.	334	* we deal with that below this point.
318	*/	335	*/
319	outputs_sync = 16; /* Every 2 seconds */	336	outputs_sync = 4;
320	outputs_count = 8; /* Keeps present behaviour */	337	outputs_count = 4;
321	unapply = unapply_nochoice;	338	unapply = unapply_nochoice;
322		339
323	savebed_map = first_map_path; /* Init. respawn position */	340	savebed_map = first_map_path; /* Init. respawn position */
324		341
325	gen_sp_armour = 10;	342	gen_sp_armour = 10;
326	last_speed = -1;
327	shoottype = range_none;
328	bowtype = bow_normal;	343	bowtype = bow_normal;
329	petmode = pet_normal;	344	petmode = pet_normal;
330	listening = 10;	345	listening = 10;
331	usekeys = containers;	346	usekeys = containers;
332	last_weapon_sp = -1;
333	peaceful = 1; /* default peaceful */	347	peaceful = 1; /* default peaceful */
334	do_los = 1;	348	do_los = 1;
335		349
336	/* we need to clear these to -1 and not zero - otherwise,	350	weapon_sp = 1.0f;
337	* if a player quits and starts a new character, we wont	351	weapon_sp_left = 0.5f;
338	* send new values to the client, as things like exp start
339	* at zero.
340	*/
341	for (int i = 0; i < NUM_SKILLS; i++)
342	last_skill_exp[i] = -1;
343
344	for (int i = 0; i < NROFATTACKS; i++)
345	last_resist[i] = -1;
346
347	last_stats.exp = -1;
348	last_weight = (uint32) - 1;
349	}	352	}
350		353
351	void	354	void
352	player::do_destroy ()	355	player::do_destroy ()
353	{	356	{
…		…
376	player::create ()	379	player::create ()
377	{	380	{
378	player *pl = new player;	381	player *pl = new player;
379		382
380	pl->set_object (arch_to_object (get_player_archetype (0)));	383	pl->set_object (arch_to_object (get_player_archetype (0)));
		384
		385	pl->ob->roll_stats ();
		386	pl->ob->stats.wc = 2;
		387	pl->ob->run_away = 25; /* Then we panick... */
		388
381	set_first_map (pl->ob);	389	set_first_map (pl->ob);
382		390
383	return pl;	391	return pl;
384	}	392	}
385		393
…		…
417	object *op = NULL;	425	object *op = NULL;
418	objectlink *ol;	426	objectlink *ol;
419	unsigned lastdist;	427	unsigned lastdist;
420	rv_vector rv;	428	rv_vector rv;
421		429
422	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	430	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
423	{	431	{
424	/* We should not find free objects on this friendly list, but it	432	/* We should not find free objects on this friendly list, but it
425	* does periodically happen. Given that, lets deal with it.	433	* does periodically happen. Given that, lets deal with it.
426	* While unlikely, it is possible the next object on the friendly	434	* While unlikely, it is possible the next object on the friendly
427	* list is also free, so encapsulate this in a while loop.	435	* list is also free, so encapsulate this in a while loop.
…		…
431	object *tmp = ol->ob;	439	object *tmp = ol->ob;
432		440
433	/* Can't do much more other than log the fact, because the object	441	/* Can't do much more other than log the fact, because the object
434	* itself will have been cleared.	442	* itself will have been cleared.
435	*/	443	*/
436	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	444	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		445	tmp->debug_desc ());
437	ol = ol->next;	446	ol = ol->next;
438	remove_friendly_object (tmp);	447	remove_friendly_object (tmp);
439	if (!ol)	448	if (!ol)
440	return op;	449	return op;
441	}	450	}
…		…
530	x = mon->x;	539	x = mon->x;
531	y = mon->y;	540	y = mon->y;
532	m = mon->map;	541	m = mon->map;
533	dir = rv.direction;	542	dir = rv.direction;
534	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	543	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
535	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	544	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		545
536	/* If we can't solve it within the search distance, return now. */	546	/* If we can't solve it within the search distance, return now. */
537	if (diff > max)	547	if (diff > max)
538	return 0;	548	return 0;
		549
539	while (diff > 1 && max > 0)	550	while (diff > 1 && max > 0)
540	{	551	{
541	lastx = x;	552	lastx = x;
542	lasty = y;	553	lasty = y;
543	lastmap = m;	554	lastmap = m;
…		…
625	max--;	636	max--;
626	lastdir = dir;	637	lastdir = dir;
627	if (!firstdir)	638	if (!firstdir)
628	firstdir = dir;	639	firstdir = dir;
629	}	640	}
		641
630	if (diff <= 1)	642	if (diff <= 1)
631	{	643	{
632	/* Recalculate diff (distance) because we may not have actually	644	/* Recalculate diff (distance) because we may not have actually
633	* headed toward player for entire distance.	645	* headed toward player for entire distance.
634	*/	646	*/
635	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	647	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
636	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	648	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
637	}	649	}
		650
638	if (diff > max)	651	if (diff > max)
639	return 0;	652	return 0;
640	}	653	}
		654
641	/* If we reached the max, didn't find a direction in time */	655	/* If we reached the max, didn't find a direction in time */
642	if (!max)	656	if (!max)
643	return 0;	657	return 0;
644		658
645	return firstdir;	659	return firstdir;
…		…
759	roll_stat (void)	773	roll_stat (void)
760	{	774	{
761	int a[4], i, j, k;	775	int a[4], i, j, k;
762		776
763	for (i = 0; i < 4; i++)	777	for (i = 0; i < 4; i++)
764	a[i] = (int) RANDOM () % 6 + 1;	778	a[i] = (int) rndm (6) + 1;
765		779
766	for (i = 0, j = 0, k = 7; i < 4; i++)	780	for (i = 0, j = 0, k = 7; i < 4; i++)
767	if (a[i] < k)	781	if (a[i] < k)
768	k = a[i], j = i;	782	k = a[i], j = i;
769		783
…		…
775	}	789	}
776		790
777	void	791	void
778	object::roll_stats ()	792	object::roll_stats ()
779	{	793	{
780	int statsort [7];	794	int statsort [NUM_STATS];
781		795
782	for (;;)	796	for (;;)
783	{	797	{
784	int sum = 0;	798	int sum = 0;
785	for (int i = 7; i--; )	799	for (int i = NUM_STATS; i--; )
786	sum += statsort [i] = roll_stat ();	800	sum += statsort [i] = roll_stat ();
787		801
788	if (sum >= 82 && sum <= 116)	802	if (sum >= 82 && sum <= 116)
789	break;	803	break;
790	}	804	}
791		805
792	// Sort the stats so that rerolling is easier...	806	// Sort the stats so that rerolling is easier...
793	std::sort (statsort, statsort + 7, std::greater<int>());	807	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
794		808
		809	for (int i = 0; i < NUM_STATS; ++i)
795	stats.Str = statsort[0];	810	stats.stat (i) = statsort [i];
796	stats.Dex = statsort[1];
797	stats.Con = statsort[2];
798	stats.Int = statsort[3];
799	stats.Wis = statsort[4];
800	stats.Pow = statsort[5];
801	stats.Cha = statsort[6];
802		811
803	stats.exp = 0;	812	stats.exp = 0;
804	stats.ac = 0;	813	stats.ac = 0;
805		814
806	stats.hp = stats.maxhp;	815	stats.hp = stats.maxhp;
…		…
818	}	827	}
819		828
820	void	829	void
821	object::swap_stats (int a, int b)	830	object::swap_stats (int a, int b)
822	{	831	{
823	int tmp = get_attr_value (&contr->orig_stats, a);	832	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
824	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
825	set_attr_value (&contr->orig_stats, b, tmp);
826		833
		834	for (int i = 0; i < NUM_STATS; ++i)
827	stats.Str = contr->orig_stats.Str;	835	stats.stat (i) = contr->orig_stats.stat (i);
828	stats.Dex = contr->orig_stats.Dex;
829	stats.Con = contr->orig_stats.Con;
830	stats.Int = contr->orig_stats.Int;
831	stats.Wis = contr->orig_stats.Wis;
832	stats.Pow = contr->orig_stats.Pow;
833	stats.Cha = contr->orig_stats.Cha;
834		836
835	//TODO: the following code looks so borked and should, at the very least,	837	//TODO: the following code looks so borked and should, at the very least,
836	// be merged with the similar code in roll_stats	838	// be merged with the similar code in roll_stats
837	stats.ac = 0;	839	stats.ac = 0;
838		840
…		…
869	* appropriate action with it (change race, or other things).	871	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	872	* The function name is for historical reasons - now we have
871	* separate race and class; this actually changes the RACE,	873	* separate race and class; this actually changes the RACE,
872	* not the class.	874	* not the class.
873	*/	875	*/
874	int	876	void
875	key_change_class (object *op, char key)	877	player::chargen_race_done ()
876	{	878	{
877	int tmp_loop;
878
879	if (key == 'd' \|\| key == 'D')
880	{
881	char buf[MAX_BUF];
882
883	/* this must before then initial items are given */	879	/* this must before then initial items are given */
884	esrv_new_player (op->contr, op->weight + op->carrying);	880	esrv_new_player (ob->contr, ob->weight + ob->carrying);
885		881
886	treasurelist *tl = find_treasurelist ("starting_wealth");	882	treasurelist *tl = treasurelist::find ("starting_wealth");
887	if (tl)	883	if (tl)
888	create_treasure (tl, op, 0, 0, 0);	884	create_treasure (tl, ob, 0, 0, 0);
889		885
890	INVOKE_PLAYER (BIRTH, op->contr);	886	INVOKE_PLAYER (BIRTH, ob->contr);
891	INVOKE_PLAYER (LOGIN, op->contr);	887	INVOKE_PLAYER (LOGIN, ob->contr);
892		888
893	op->contr->ns->state = ST_PLAYING;	889	ob->contr->ns->state = ST_PLAYING;
894		890
895	if (op->msg)	891	if (ob->msg)
896	op->msg = NULL;	892	ob->msg = 0;
897		893
898	/* We create this now because some of the unique maps will need it	894	/* We create this now because some of the unique maps will need it
899	* to save here.	895	* to save here.
900	*/	896	*/
		897	{
		898	char buf[MAX_BUF];
901	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	899	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
902	make_path_to_file (buf);	900	make_path_to_file (buf);
		901	}
903		902
904	#ifdef AUTOSAVE
905	op->contr->last_save_tick = pticks;
906	#endif
907	start_info (op);	903	start_info (ob);
908	CLEAR_FLAG (op, FLAG_WIZ);	904	CLEAR_FLAG (ob, FLAG_WIZ);
909	give_initial_items (op, op->randomitems);	905	give_initial_items (ob, ob->randomitems);
910	link_player_skills (op);	906	link_player_skills (ob);
911	esrv_send_inventory (op, op);	907	esrv_send_inventory (ob, ob);
912	op->update_stats ();	908	ob->update_stats ();
913		909
914	/* This moves the player to a different start map, if there	910	/* This moves the player to a different start map, if there
915	* is one for this race	911	* is one for this race
916	*/	912	*/
917	if (*first_map_ext_path)	913	if (*first_map_ext_path)
918	{	914	{
919	object *tmp;	915	object *tmp;
920	char mapname[MAX_BUF];	916	char mapname[MAX_BUF];
921		917
922	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	918	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
923	tmp = object::create ();	919	tmp = object::create ();
924	EXIT_PATH (tmp) = mapname;	920	EXIT_PATH (tmp) = mapname;
925	EXIT_X (tmp) = op->x;	921	EXIT_X (tmp) = ob->x;
926	EXIT_Y (tmp) = op->y;	922	EXIT_Y (tmp) = ob->y;
927	op->enter_exit (tmp); /* we don't really care if it succeeded;	923	ob->enter_exit (tmp); /* we don't really care if it succeeded;
928	* if the map isn't there, then stay on the	924	* if the map isn't there, then stay on the
929	* default initial map */	925	* default initial map */
930	tmp->destroy ();	926	tmp->destroy ();
931	}	927	}
932	else	928	else
933	LOG (llevDebug, "first_map_ext_path not set\n");	929	LOG (llevDebug, "first_map_ext_path not set\n");
		930	}
934		931
935	return 0;	932	void
936	}	933	player::chargen_race_next ()
937		934	{
938	/* Following actually changes the race - this is the default command	935	/* Following actually changes the race - this is the default command
939	* if we don't match with one of the options above.	936	* if we don't match with one of the options above.
940	*/	937	*/
941		938
942	tmp_loop = 0;	939	do
943	while (!tmp_loop)
944	{	940	{
945	shstr name = op->name;	941	shstr name = ob->name;
946	int x = op->x, y = op->y;	942	int x = ob->x, y = ob->y;
947		943
948	op->remove_statbonus ();	944	ob->remove_statbonus ();
949	op->remove ();	945	ob->remove ();
950	op->arch = get_player_archetype (op->arch);	946	ob->arch = get_player_archetype (ob->arch);
951	op->arch->clone.copy_to (op);	947	ob->arch->clone.copy_to (ob);
952	op->instantiate ();	948	ob->instantiate ();
953	op->stats = op->contr->orig_stats;	949	ob->stats = ob->contr->orig_stats;
954	op->name = op->name_pl = name;	950	ob->name = ob->name_pl = name;
955	op->x = x;	951	ob->x = x;
956	op->y = y;	952	ob->y = y;
957	SET_ANIMATION (op, 2); /* So player faces south */	953	SET_ANIMATION (ob, 2); /* So player faces south */
958	insert_ob_in_map (op, op->map, op, 0);	954	insert_ob_in_map (ob, ob->map, ob, 0);
959	assign (op->contr->title, op->arch->clone.name);	955	assign (ob->contr->title, ob->arch->clone.name);
960	op->add_statbonus ();	956	ob->add_statbonus ();
961	tmp_loop = allowed_class (op);
962	}	957	}
		958	while (!allowed_class (ob));
963		959
964	update_object (op, UP_OBJ_FACE);	960	update_object (ob, UP_OBJ_FACE);
965	esrv_update_item (UPD_FACE, op, op);	961	esrv_update_item (UPD_FACE, ob, ob);
966	op->update_stats ();	962	ob->update_stats ();
967	op->stats.hp = op->stats.maxhp;	963	ob->stats.hp = ob->stats.maxhp;
968	op->stats.sp = op->stats.maxsp;	964	ob->stats.sp = ob->stats.maxsp;
969	op->stats.grace = 0;	965	ob->stats.grace = 0;
970
971	if (op->msg)
972	new_draw_info (NDI_BLUE, 0, op, op->msg);
973
974	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
975	return 0;
976	}	966	}
977		967
978	void	968	void
979	flee_player (object *op)	969	flee_player (object *op)
980	{	970	{
…		…
1027	/* Cornered, get rid of scared */	1017	/* Cornered, get rid of scared */
1028	CLEAR_FLAG (op, FLAG_SCARED);	1018	CLEAR_FLAG (op, FLAG_SCARED);
1029	op->enemy = NULL;	1019	op->enemy = NULL;
1030	}	1020	}
1031		1021
1032
1033	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1022	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1034	* IT returns 1 if the player should keep on moving, 0 if he should	1023	* It returns 1 if the player should keep on moving, 0 if he should
1035	* stop.	1024	* stop.
1036	*/	1025	*/
1037	int	1026	int
1038	check_pick (object *op)	1027	check_pick (object *op)
1039	{	1028	{
1040	object tmp, next;	1029	object tmp, next;
1041	int stop = 0;	1030	int stop = 0;
1042	int j, k, wvratio;	1031	int wvratio;
1043	char putstring[128], tmpstr[16];	1032	char putstring[128];
1044		1033
1045	/* if you're flying, you cna't pick up anything */	1034	/* if you're flying, you cna't pick up anything */
1046	if (op->move_type & MOVE_FLYING)	1035	if (op->move_type & MOVE_FLYING)
1047	return 1;	1036	return 1;
1048		1037
…		…
1385	* found object is returned.	1374	* found object is returned.
1386	*/	1375	*/
1387	object *	1376	object *
1388	find_arrow (object op, const char type)	1377	find_arrow (object op, const char type)
1389	{	1378	{
1390	object *tmp = NULL;	1379	object *tmp = 0;
1391		1380
1392	for (op = op->inv; op; op = op->below)	1381	for (op = op->inv; op; op = op->below)
1393	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1382	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1394	tmp = find_arrow (op, type);	1383	tmp = find_arrow (op, type);
1395	else if (op->type == ARROW && op->race == type)	1384	else if (op->type == ARROW && op->race == type)
1396	return op;	1385	return op;
		1386
1397	return tmp;	1387	return tmp;
1398	}	1388	}
1399		1389
1400	/*	1390	/*
1401	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1391	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1402	* against the target. A full test is not performed, simply a basic test	1392	* against the target. A full test is not performed, simply a basic test
1403	* of resistances. The archer is making a quick guess at what he sees down	1393	* of resistances. The archer is making a quick guess at what he sees down
1404	* the hall. Failing that it does it's best to pick the highest plus arrow.	1394	* the hall. Failing that it does it's best to pick the highest plus arrow.
1405	*/	1395	*/
1406
1407	object *	1396	object *
1408	find_better_arrow (object op, object target, const char type, int better)	1397	find_better_arrow (object op, object target, const char type, int better)
1409	{	1398	{
1410	object tmp = NULL, arrow, *ntmp;	1399	object tmp = NULL, arrow, *ntmp;
1411	int attacknum, attacktype, betterby = 0, i;	1400	int attacknum, attacktype, betterby = 0, i;
…		…
1477	* find_better_arrow to find a decent arrow to use.	1466	* find_better_arrow to find a decent arrow to use.
1478	* op = the shooter	1467	* op = the shooter
1479	* type = bow->race	1468	* type = bow->race
1480	* dir = fire direction	1469	* dir = fire direction
1481	*/	1470	*/
1482
1483	object *	1471	object *
1484	pick_arrow_target (object op, const char type, int dir)	1472	pick_arrow_target (object op, const char type, int dir)
1485	{	1473	{
1486	object *tmp = NULL;	1474	object *tmp = NULL;
1487	maptile *m;	1475	maptile *m;
…		…
1552	*/	1540	*/
1553	int	1541	int
1554	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1542	fire_bow (object op, object part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1555	{	1543	{
1556	object left, bow;	1544	object left, bow;
1557	int bowspeed, mflags;	1545	int mflags;
1558	maptile *m;	1546	maptile *m;
1559		1547
1560	if (!dir)	1548	if (!dir)
1561	{	1549	{
1562	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1550	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1563	return 0;	1551	return 0;
1564	}	1552	}
1565		1553
1566	if (op->type == PLAYER)	1554	if (op->contr)
1567	bow = op->contr->ranges[range_bow];	1555	bow = op->current_weapon;
1568	else	1556	else
1569	{	1557	{
1570	for (bow = op->inv; bow; bow = bow->below)	1558	for (bow = op->inv; bow; bow = bow->below)
1571	/* Don't check for applied - monsters don't apply bows - in that way, they	1559	/* Don't check for applied - monsters don't apply bows - in that way, they
1572	* don't need to switch back and forth between bows and weapons.	1560	* don't need to switch back and forth between bows and weapons.
…		…
1577	if (!bow)	1565	if (!bow)
1578	{	1566	{
1579	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1567	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1580	return 0;	1568	return 0;
1581	}	1569	}
		1570
		1571	// optimisation: move object to top so we will find it quickly again
		1572	if (bow->below)
		1573	{
		1574	bow->remove ();
		1575	op->insert (bow);
		1576	}
		1577
1582	}	1578	}
1583		1579
1584	if (!bow->race \|\| !bow->skill)	1580	if (!bow->race \|\| !bow->skill)
1585	{	1581	{
1586	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1582	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1587	return 0;	1583	return 0;
1588	}	1584	}
1589
1590	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1591
1592	/* penalize ROF for bestarrow */
1593	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1594	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1595
1596	if (bowspeed < 1)
1597	bowspeed = 1;
1598		1585
1599	if (arrow == NULL)	1586	if (arrow == NULL)
1600	{	1587	{
1601	if ((arrow = find_arrow (op, bow->race)) == NULL)	1588	if ((arrow = find_arrow (op, bow->race)) == NULL)
1602	{	1589	{
1603	if (op->type == PLAYER)	1590	if (op->type == PLAYER)
1604	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1605	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1592	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1606	else	1593	else
1607	CLEAR_FLAG (op, FLAG_READY_BOW);	1594	CLEAR_FLAG (op, FLAG_READY_BOW);
		1595
1608	return 0;	1596	return 0;
1609	}	1597	}
1610	}	1598	}
1611		1599
1612	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1600	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1636		1624
1637	arrow->set_owner (op);	1625	arrow->set_owner (op);
1638	arrow->skill = bow->skill;	1626	arrow->skill = bow->skill;
1639	arrow->direction = dir;	1627	arrow->direction = dir;
1640		1628
		1629	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1630	arrow->stats.hp = arrow->stats.dam;
		1631	arrow->stats.grace = arrow->attacktype;
		1632
		1633	if (arrow->slaying)
		1634	arrow->spellarg = strdup (arrow->slaying);
		1635
		1636	#if 0
		1637	if (player *pl = op->contr)
		1638	{
		1639	float speed = pl->weapon_sp;
		1640
		1641	/* penalize ROF for bestarrow */
		1642	if (pl->bowtype == bow_bestarrow)
		1643	speed *= .9f;
		1644	else
		1645	speed = 1.f + dex_bonus[op->stats.Dex] .2f;
		1646
		1647	op->speed_left += speed - op->speed;
		1648	}
		1649	#endif
		1650
		1651	SET_ANIMATION (arrow, arrow->direction);
		1652
		1653	/* update the speed */
		1654	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1655	+ bow->stats.dam / 7.f;
		1656
		1657	arrow->set_speed (max (arrow->speed, 2.f));
		1658	arrow->speed_left = 0;
		1659
		1660	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1661
1641	if (op->type == PLAYER)	1662	if (op->type == PLAYER)
1642	{	1663	{
1643	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1644	op->update_stats ();
1645	}
1646
1647	SET_ANIMATION (arrow, arrow->direction);
1648	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1649	arrow->stats.hp = arrow->stats.dam;
1650	arrow->stats.grace = arrow->attacktype;
1651	if (arrow->slaying != NULL)
1652	arrow->spellarg = strdup (arrow->slaying);
1653
1654	/* Note that this was different for monsters - they got their level
1655	* added to the damage. I think the strength bonus is more proper.
1656	*/
1657
1658	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1659
1660	/* update the speed */
1661	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1662	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1663
1664	arrow->set_speed (max (arrow->speed, 1.0));
1665	arrow->speed_left = 0;
1666
1667	if (op->type == PLAYER)
1668	{
1669	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1670	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1671	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1672
1673	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1664	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1665	wc -= dex_bonus[op->stats.Dex];
		1666
		1667	if (!arrow->slaying)
		1668	arrow->slaying = op->slaying;
		1669
		1670	arrow->attacktype \|= op->attacktype;
1674	}	1671	}
1675	else	1672	else
1676	{	1673	{
1677	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1678	arrow->level = op->level;	1674	arrow->level = op->level;
1679	}	1675	arrow->stats.wc -= bow->magic;
1680		1676
1681	if (arrow->attacktype == AT_PHYSICAL)	1677	if (!arrow->slaying)
		1678	arrow->slaying = bow->slaying;
		1679
1682	arrow->attacktype \|= bow->attacktype;	1680	arrow->attacktype \|= bow->attacktype;
		1681	}
1683		1682
1684	if (bow->slaying)	1683	wc -= arrow->level;
1685	arrow->slaying = bow->slaying;	1684	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1686		1685
		1686	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687	arrow->move_type = MOVE_FLY_LOW;	1687	arrow->move_type = MOVE_FLY_LOW;
1688	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1688	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1689		1689
1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1691	m->insert (arrow, sx, sy, op);	1691	m->insert (arrow, sx, sy, op);
…		…
1716	{	1716	{
1717	int ret = 0, wcmod = 0;	1717	int ret = 0, wcmod = 0;
1718		1718
1719	if (op->contr->bowtype == bow_bestarrow)	1719	if (op->contr->bowtype == bow_bestarrow)
1720	{	1720	{
1721	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1721	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1722	}	1722	}
1723	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1723	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1724	{	1724	{
1725	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1725	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1726	wcmod = -1;	1726	wcmod = -1;
…		…
1736	else if (op->contr->bowtype == bow_spreadshot)	1736	else if (op->contr->bowtype == bow_spreadshot)
1737	{	1737	{
1738	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1738	ret \|= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1739	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);
1740	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1740	ret \|= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1741
1742	}	1741	}
1743	else	1742	else
1744	{	1743	{
1745	/* Simple case */	1744	/* Simple case */
1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1745	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747	}	1746	}
		1747
1748	return ret;	1748	return ret;
1749	}	1749	}
1750
1751		1750
1752	/* Fires a misc (wand/rod/horn) object in 'dir'.	1751	/* Fires a misc (wand/rod/horn) object in 'dir'.
1753	* Broken apart from 'fire' to keep it more readable.	1752	* Broken apart from 'fire' to keep it more readable.
1754	*/	1753	*/
1755	void	1754	void
1756	fire_misc_object (object *op, int dir)	1755	fire_misc_object (object *op, int dir)
1757	{	1756	{
1758	object *item;	1757	object *item = op->contr->ranged_ob;
1759		1758
1760	if (!op->contr->ranges[range_misc])	1759	if (!item)
1761	{	1760	{
1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1761	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1763	return;	1762	return;
1764	}	1763	}
1765		1764
1766	item = op->contr->ranges[range_misc];
1767	if (!item->inv)	1765	if (!item->inv)
1768	{	1766	{
1769	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1767	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1770	return;	1768	return;
1771	}	1769	}
		1770
		1771	if (!op->change_weapon (item))
		1772	return;
		1773
1772	if (item->type == WAND)	1774	if (item->type == WAND)
1773	{	1775	{
1774	if (item->stats.food <= 0)	1776	if (item->stats.food <= 0)
1775	{	1777	{
1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1778	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1779	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1780
1778	return;	1781	return;
1779	}	1782	}
1780	}	1783	}
1781	else if (item->type == ROD \|\| item->type == HORN)	1784	else if (item->type == ROD \|\| item->type == HORN)
1782	{	1785	{
1783	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1786	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1784	{	1787	{
1785	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1788	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1789
1786	if (item->type == ROD)	1790	if (item->type == ROD)
1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1788	else	1792	else
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1794
1790	return;	1795	return;
1791	}	1796	}
1792	}	1797	}
1793		1798
1794	if (cast_spell (op, item, dir, item->inv, NULL))	1799	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1816	}	1821	}
1817	}	1822	}
1818		1823
1819	/* Received a fire command for the player - go and do it.	1824	/* Received a fire command for the player - go and do it.
1820	*/	1825	*/
1821	void	1826	bool
1822	fire (object *op, int dir)	1827	fire (object *op, int dir)
1823	{	1828	{
1824	int spellcost = 0;	1829	int spellcost = 0;
1825		1830
1826	/* check for loss of invisiblity/hide */	1831	/* check for loss of invisiblity/hide */
1827	if (action_makes_visible (op))	1832	if (action_makes_visible (op))
1828	make_visible (op);	1833	make_visible (op);
1829		1834
1830	switch (op->contr->shoottype)	1835	player *pl = op->contr;
		1836
		1837	if (pl->golem)
		1838	{
		1839	control_golem (op->contr->golem, dir);
		1840	return false;
1831	{	1841	}
1832	case range_none:
1833	return;
1834		1842
1835	case range_bow:	1843	object *ob = pl->ranged_ob;
		1844
		1845	if (!ob)
		1846	return false;
		1847
		1848	if (!op->change_weapon (ob))
		1849	return false;
		1850
		1851	if (op->speed_left > 0.f)
		1852	--op->speed_left;
		1853	else
		1854	return false;
		1855
		1856	switch (ob->type)
		1857	{
		1858	case BOW:
1836	player_fire_bow (op, dir);	1859	player_fire_bow (op, dir);
1837	return;	1860	break;
1838		1861
1839	case range_magic: /* Casting spells */	1862	case SPELL:
1840	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1863	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1841	return;	1864	break;
1842		1865
1843	case range_misc:	1866	case BUILDER:
		1867	apply_map_builder (op, dir);
		1868	break;
		1869
		1870	case SKILL:
		1871	do_skill (op, op, ob, dir, 0);
		1872	break;
		1873
		1874	default:
1844	fire_misc_object (op, dir);	1875	fire_misc_object (op, dir);
1845	return;	1876	break;
1846
1847	case range_golem: /* Control summoned monsters from scrolls */
1848	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1849	{
1850	op->contr->ranges[range_golem] = 0;
1851	op->contr->shoottype = range_none;
1852	}
1853	else
1854	control_golem (op->contr->ranges[range_golem], dir);
1855	return;
1856
1857	case range_skill:
1858	if (!op->chosen_skill)
1859	{
1860	if (op->type == PLAYER)
1861	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1862	return;
1863	}
1864	(void) 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	}	1877	}
1873	}
1874		1878
1875		1879	return true;
		1880	}
1876		1881
1877	/* find_key	1882	/* find_key
1878	* We try to find a key for the door as passed. If we find a key	1883	* We try to find a key for the door as passed. If we find a key
1879	* and successfully use it, we return the key, otherwise NULL	1884	* and successfully use it, we return the key, otherwise NULL
1880	* This function merges both normal and locked door, since the logic	1885	* This function merges both normal and locked door, since the logic
…		…
1882	* pl is the player,	1887	* pl is the player,
1883	* inv is the objects inventory to searched	1888	* inv is the objects inventory to searched
1884	* door is the door we are trying to match against.	1889	* door is the door we are trying to match against.
1885	* This function can be called recursively to search containers.	1890	* This function can be called recursively to search containers.
1886	*/	1891	*/
1887
1888	object *	1892	object *
1889	find_key (object pl, object container, object *door)	1893	find_key (object pl, object container, object *door)
1890	{	1894	{
1891	object tmp, key;	1895	object tmp, key;
1892		1896
1893	/* Should not happen, but sanity checking is never bad */	1897	/* Should not happen, but sanity checking is never bad */
1894	if (container->inv == NULL)	1898	if (!container->inv)
1895	return NULL;	1899	return 0;
1896		1900
1897	/* First, lets try to find a key in the top level inventory */	1901	/* First, lets try to find a key in the top level inventory */
1898	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1902	for (tmp = container->inv; tmp; tmp = tmp->below)
1899	{	1903	{
1900	if (door->type == DOOR && tmp->type == KEY)	1904	if (door->type == DOOR && tmp->type == KEY)
1901	break;	1905	break;
1902	/* For sanity, we should really check door type, but other stuff	1906	/* For sanity, we should really check door type, but other stuff
1903	* (like containers) can be locked with special keys	1907	* (like containers) can be locked with special keys
1904	*/	1908	*/
1905	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1909	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1906	break;	1910	break;
1907	}	1911	}
		1912
1908	/* No key found - lets search inventories now */	1913	/* No key found - lets search inventories now */
1909	/* If we find and use a key in an inventory, return at that time.	1914	/* If we find and use a key in an inventory, return at that time.
1910	* otherwise, if we search all the inventories and still don't find	1915	* otherwise, if we search all the inventories and still don't find
1911	* a key, return	1916	* a key, return
1912	*/	1917	*/
1913	if (!tmp)	1918	if (!tmp)
1914	{	1919	{
1915	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1920	for (tmp = container->inv; tmp; tmp = tmp->below)
1916	{	1921	{
1917	/* No reason to search empty containers */	1922	/* No reason to search empty containers */
1918	if (tmp->type == CONTAINER && tmp->inv)	1923	if (tmp->type == CONTAINER && tmp->inv)
1919	{	1924	{
1920	if ((key = find_key (pl, tmp, door)) != NULL)	1925	if ((key = find_key (pl, tmp, door)))
1921	return key;	1926	return key;
1922	}	1927	}
1923	}	1928	}
		1929
1924	if (!tmp)	1930	if (!tmp)
1925	return NULL;	1931	return NULL;
1926	}	1932	}
		1933
1927	/* We get down here if we have found a key. Now if its in a container,	1934	/* We get down here if we have found a key. Now if its in a container,
1928	* see if we actually want to use it	1935	* see if we actually want to use it
1929	*/	1936	*/
1930	if (pl != container)	1937	if (pl != container)
1931	{	1938	{
…		…
1952	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1959	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1953	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1960	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1954	return NULL;	1961	return NULL;
1955	}	1962	}
1956	}	1963	}
		1964
1957	return tmp;	1965	return tmp;
1958	}	1966	}
1959		1967
1960	/* moved door processing out of move_player_attack.	1968	/* moved door processing out of move_player_attack.
1961	* returns 1 if player has opened the door with a key	1969	* returns 1 if player has opened the door with a key
…		…
1963	* 0 otherwise	1971	* 0 otherwise
1964	*/	1972	*/
1965	static int	1973	static int
1966	player_attack_door (object op, object door)	1974	player_attack_door (object op, object door)
1967	{	1975	{
1968	/* If its a door, try to find a use a key. If we do destroy the door,	1976	/* If its a door, try to find a key. If we do destroy the door,
1969	* might as well return immediately as there is nothing more to do -	1977	* might as well return immediately as there is nothing more to do -
1970	* otherwise, we fall through to the rest of the code.	1978	* otherwise, we fall through to the rest of the code.
1971	*/	1979	*/
1972	object *key = find_key (op, op, door);	1980	object *key = find_key (op, op, door);
1973		1981
1974	/* IF we found a key, do some extra work */	1982	/* If we found a key, do some extra work */
1975	if (key)	1983	if (key)
1976	{	1984	{
1977	object *container = key->env;	1985	object *container = key->env;
1978		1986
1979	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1987	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1988
1980	if (action_makes_visible (op))	1989	if (action_makes_visible (op))
1981	make_visible (op);	1990	make_visible (op);
		1991
1982	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1992	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
1983	spring_trap (door->inv, op);	1993	spring_trap (door->inv, op);
		1994
1984	if (door->type == DOOR)	1995	if (door->type == DOOR)
1985	{
1986	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1996	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1987	}
1988	else if (door->type == LOCKED_DOOR)	1997	else if (door->type == LOCKED_DOOR)
1989	{	1998	{
1990	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1999	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1991	remove_door2 (door); /* remove door without violence ;-) */	2000	remove_door2 (door); /* remove door without violence ;-) */
1992	}	2001	}
		2002
1993	/* Do this after we print the message */	2003	/* Do this after we print the message */
1994	decrease_ob (key); /* Use up one of the keys */	2004	decrease_ob (key); /* Use up one of the keys */
1995	/* Need to update the weight the container the key was in */	2005	/* Need to update the weight the container the key was in */
1996	if (container != op)	2006	if (container != op)
1997	esrv_update_item (UPD_WEIGHT, op, container);	2007	esrv_update_item (UPD_WEIGHT, op, container);
		2008
1998	return 1; /* Nothing more to do below */	2009	return 1; /* Nothing more to do below */
1999	}	2010	}
2000	else if (door->type == LOCKED_DOOR)	2011	else if (door->type == LOCKED_DOOR)
2001	{	2012	{
2002	/* Might as well return now - no other way to open this */	2013	/* Might as well return now - no other way to open this */
2003	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	2014	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2004	return 1;	2015	return 1;
2005	}	2016	}
		2017
2006	return 0;	2018	return 0;
2007	}	2019	}
2008		2020
2009	/* This function is just part of a breakup from move_player.	2021	/* This function is just part of a breakup from move_player.
2010	* It should keep the code cleaner.	2022	* It should keep the code cleaner.
2011	* When this is called, the players direction has been updated	2023	* When this is called, the players direction has been updated
2012	* (taking into account confusion.) The player is also actually	2024	* (taking into account confusion.) The player is also actually
2013	* going to try and move (not fire weapons).	2025	* going to try and move (not fire weapons).
2014	*/	2026	*/
2015	void	2027	bool
2016	move_player_attack (object *op, int dir)	2028	move_player_attack (object *op, int dir)
2017	{	2029	{
2018	object tmp, mon;
2019	sint16 nx, ny;
2020	int on_battleground;	2030	int on_battleground;
2021	maptile *m;
2022		2031
2023	nx = freearr_x[dir] + op->x;	2032	sint16 nx = freearr_x[dir] + op->x;
2024	ny = freearr_y[dir] + op->y;	2033	sint16 ny = freearr_y[dir] + op->y;
2025		2034
2026	on_battleground = op_on_battleground (op, 0, 0);	2035	on_battleground = op_on_battleground (op, 0, 0);
		2036
		2037	if (out_of_map (op->map, nx, ny))
		2038	return false;
		2039
		2040	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2041	{
		2042	--op->speed_left;
		2043	return true;
		2044	}
2027		2045
2028	/* If braced, or can't move to the square, and it is not out of the	2046	/* 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	2047	* 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	2048	* 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	2049	* 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	2050	* 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	2051	* 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	2052	* quite a bit of processing. However, it probably is less than what
2035	* move_ob uses.	2053	* move_ob uses.
2036	*/	2054	*/
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);	2055	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		2056
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	2057	/* 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.	2058	* 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	2059	* if its a door or barrel (can roll) see if there may be monsters
2055	* on the space	2060	* on the space
2056	*/	2061	*/
2057	while (tmp)	2062	object *mon;
2058	{	2063	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2059	if (tmp == op)	2064	{
2060	{	2065	if ((mon->flag [FLAG_ALIVE]
2061	tmp = tmp->above;	2066	\|\| mon->type == LOCKED_DOOR
2062	continue;	2067	\|\| mon->flag [FLAG_CAN_ROLL])
2063	}
2064
2065	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2066	{
2067	mon = tmp;	2068	&& mon != op)
2068	break;	2069	break;
2069	}	2070	}
2070		2071
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 */	2072	if (!mon) /* This happens anytime the player tries to move */
2078	return; /* into a wall */	2073	return false; /* into a wall */
2079		2074
2080	if (mon->head)
2081	mon = mon->head;	2075	mon = mon->head_ ();
2082		2076
2083	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	2077	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
		2078	if (op->contr->weapon_sp_left > 0.f)
2084	if (player_attack_door (op, mon))	2079	if (player_attack_door (op, mon))
		2080	{
		2081	--op->contr->weapon_sp_left;
2085	return;	2082	return true;
		2083	}
2086		2084
2087	/* The following deals with possibly attacking peaceful	2085	/* The following deals with possibly attacking peaceful
2088	* or frienddly creatures. Basically, all players are considered	2086	* or friendly creatures. Basically, all players are considered
2089	* unaggressive. If the moving player has peaceful set, then the	2087	* unaggressive. If the moving player has peaceful set, then the
2090	* object should be pushed instead of attacked. It is assumed that	2088	* object should be pushed instead of attacked. It is assumed that
2091	* if you are braced, you will not attack friends accidently,	2089	* if you are braced, you will not attack friends accidently,
2092	* and thus will not push them.	2090	* and thus will not push them.
2093	*/	2091	*/
2094		2092
2095	/* If the creature is a pet, push it even if the player is not	2093	/* 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	2094	* peaceful. Our assumption is the creature is a pet if the
2097	* player owns it and it is either friendly or unagressive.	2095	* player owns it and it is either friendly or unagressive.
2098	*/	2096	*/
2099	if ((op->type == PLAYER)	2097	if (op->type == PLAYER
2100	#if COZY_SERVER
2101	&&
2102	((mon->owner && mon->owner->contr	2098	&& ((mon->owner && mon->owner->contr
2103	&& same_party (mon->owner->contr->party, op->contr->party)) \|\| mon->owner == op)	2099	&& same_party (mon->owner->contr->party, op->contr->party))
2104	#else
2105	&& mon->owner == op	2100	\|\| mon->owner == op)
2106	#endif
2107	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2101	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108	{	2102	{
2109	/* If we're braced, we don't want to switch places with it */	2103	/* If we're braced, we don't want to switch places with it */
2110	if (op->contr->braced)	2104	if (op->contr->braced)
2111	return;	2105	return false;
		2106
		2107	if (op->speed_left > 0.f)
		2108	{
		2109	--op->speed_left;
2112		2110
2113	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2111	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2114	(void) push_ob (mon, dir, op);	2112	push_ob (mon, dir, op);
		2113
2115	if (op->contr->tmp_invis \|\| op->hide)	2114	if (op->contr->tmp_invis \|\| op->hide)
2116	make_visible (op);	2115	make_visible (op);
2117		2116
2118	return;	2117	return true;
2119	}	2118	}
		2119	else
		2120	return false;
		2121	}
2120		2122
2121	/* in certain circumstances, you shouldn't attack friendly	2123	/* in certain circumstances, you shouldn't attack friendly
2122	* creatures. Note that if you are braced, you can't push	2124	* creatures. Note that if you are braced, you can't push
2123	* someone, but put it inside this loop so that you won't	2125	* someone, but put it inside this loop so that you won't
2124	* attack them either.	2126	* attack them either.
2125	*/	2127	*/
2126	if ((mon->type == PLAYER \|\| mon->enemy != op) &&	2128	if ((mon->type == PLAYER \|\| mon->enemy != op)
2127	(mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2129	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))
2128	#ifdef PROHIBIT_PLAYERKILL
2129	(op->contr->peaceful	2130	&& ((op->contr->peaceful
2130	\|\| (mon->type == PLAYER	2131	\|\| (mon->type == PLAYER && mon->contr->peaceful))
2131	&& mon->contr->
2132	peaceful)) &&
2133	#else
2134	op->contr->peaceful &&
2135	#endif
2136	!on_battleground))	2132	&& !on_battleground))
		2133	{
		2134	if (op->speed_left > 0.f)
2137	{	2135	{
		2136	--op->speed_left;
		2137
2138	if (!op->contr->braced)	2138	if (!op->contr->braced)
2139	{	2139	{
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141	push_ob (mon, dir, op);	2141	push_ob (mon, dir, op);
2142	}	2142	}
2143	else	2143	else
2144	new_draw_info (0, 0, op, "You withhold your attack");	2144	new_draw_info (0, 0, op, "You withhold your attack");
2145		2145
2146	if (op->contr->tmp_invis \|\| op->hide)	2146	if (op->contr->tmp_invis \|\| op->hide)
2147	make_visible (op);	2147	make_visible (op);
2148	}
2149		2148
		2149	return true;
		2150	}
		2151	}
2150	/* If the object is a boulder or other rollable object, then	2152	/* 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.	2153	* roll it if not braced. You can't roll it if you are braced.
2152	*/	2154	*/
2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2155	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2156	{
		2157	if (op->speed_left > 0.f)
2154	{	2158	{
		2159	--op->speed_left;
		2160
2155	recursive_roll (mon, dir, op);	2161	recursive_roll (mon, dir, op);
2156	if (action_makes_visible (op))	2162	if (action_makes_visible (op))
2157	make_visible (op);	2163	make_visible (op);
2158	}
2159		2164
		2165	return true;
		2166	}
		2167	}
2160	/* Any generic living creature. Including things like doors.	2168	/* Any generic living creature. Including things like doors.
2161	* Way it works is like this: First, it must have some hit points	2169	* 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:	2170	* 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	2171	* 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.	2172	* that party_number -1 is no party, so attacks can still happen.
2165	*/	2173	*/
2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2174	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)))	2175	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2168	{	2176	{
2169		2177	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	{	2178	{
2177	op->speed_left += op->speed / op->contr->weapon_sp;	2179	--op->contr->weapon_sp_left;
2178
2179	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180	}
2181		2180
2182	skill_attack (mon, op, 0, 0, 0);	2181	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		2182
2198	if (action_makes_visible (op))	2183	if (action_makes_visible (op))
2199	make_visible (op);	2184	make_visible (op);
2200	}
2201	} /* if player should attack something */
2202	}
2203		2185
2204	int	2186	return true;
		2187	}
		2188	}
		2189
		2190	return false;
		2191	}
		2192
		2193	bool
2205	move_player (object *op, int dir)	2194	move_player (object *op, int dir)
2206	{	2195	{
2207	int pick;	2196	int pick;
2208		2197
2209	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)	2198	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
…		…
2216	return 0;	2205	return 0;
2217	}	2206	}
2218		2207
2219	/* peterm: added following line */	2208	/* peterm: added following line */
2220	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2209	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2221	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2210	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2222		2211
2223	op->facing = dir;	2212	op->facing = dir;
2224		2213
2225	if (op->hide)	2214	if (op->hide)
2226	do_hidden_move (op);	2215	do_hidden_move (op);
2227		2216
		2217	bool retval;
		2218
2228	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2219	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2229	/nop / ;	2220	retval = RESULT_INT (0);
2230	else if (op->contr->fire_on)	2221	else if (op->contr->fire_on)
2231	fire (op, dir);	2222	retval = fire (op, dir);
2232	else	2223	else
2233	{	2224	{
2234	move_player_attack (op, dir);	2225	retval = move_player_attack (op, dir);
2235	pick = check_pick (op);	2226	pick = check_pick (op);
2236	}	2227	}
2237		2228
2238	/* Add special check for newcs players and fire on - this way, the	2229	/* Add special check for newcs players and fire on - this way, the
2239	* server can handle repeat firing.	2230	* server can handle repeat firing.
…		…
2246	/* Update how the player looks. Use the facing, so direction may	2237	/* Update how the player looks. Use the facing, so direction may
2247	* get reset to zero. This allows for full animation capabilities	2238	* get reset to zero. This allows for full animation capabilities
2248	* for players.	2239	* for players.
2249	*/	2240	*/
2250	animate_object (op, op->facing);	2241	animate_object (op, op->facing);
2251	return 0;	2242
		2243	return retval;
2252	}	2244	}
2253		2245
2254	/* This is similar to handle_player, below, but is only used by the	2246	/* This is similar to handle_player, below, but is only used by the
2255	* new client/server stuff.	2247	* new client/server stuff.
2256	* This is sort of special, in that the new client/server actually uses	2248	* This is sort of special, in that the new client/server actually uses
2257	* the new speed values for commands.	2249	* the new speed values for commands.
2258	*	2250	*
2259	* Returns true if there are more actions we can do.	2251	* Returns true if there are more actions we can do. Should not do
		2252	* many actions in a row, as that would be too unfair to other
		2253	* players.
2260	*/	2254	*/
2261	int	2255	bool
2262	handle_newcs_player (object *op)	2256	handle_newcs_player (object *op)
2263	{	2257	{
2264	if (op->contr->hidden)
2265	{
2266	op->invisible = 1000;
2267	/* the socket code flashes the player visible/invisible
2268	* depending on the value of invisible, so we need to
2269	* alternate it here for it to work correctly.
2270	*/
2271	if (pticks & 2)
2272	op->invisible--;
2273	}
2274	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2275	{
2276	op->invisible--;
2277	if (!op->invisible)
2278	{
2279	make_visible (op);
2280	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2281	}
2282	}
2283
2284	if (QUERY_FLAG (op, FLAG_SCARED))	2258	if (QUERY_FLAG (op, FLAG_SCARED))
2285	{	2259	{
2286	flee_player (op);	2260	if (op->speed_left > 0.f)
2287	/* If player is still scared, that is his action for this tick */
2288	if (QUERY_FLAG (op, FLAG_SCARED))
2289	{	2261	{
2290	op->speed_left--;	2262	--op->speed_left;
		2263	flee_player (op);
		2264
2291	return 0;	2265	return true;
2292	}	2266	}
		2267	else
		2268	return false;
2293	}	2269	}
2294
2295	/* I've been seeing crashes where the golem has been destroyed, but
2296	* the player object still points to the defunct golem. The code that
2297	* destroys the golem looks correct, and it doesn't always happen, so
2298	* put this in a a workaround to clean up the golem pointer.
2299	*/
2300	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2301	op->contr->ranges[range_golem] = 0;
2302		2270
2303	/* call this here - we also will call this in do_ericserver, but	2271	/* call this here - we also will call this in do_ericserver, but
2304	* the players time has been increased when doericserver has been	2272	* the players time has been increased when doericserver has been
2305	* called, so we recheck it here.	2273	* called, so we recheck it here.
2306	*/	2274	*/
2307	if (op->contr->ns->handle_command ())	2275	if (op->contr->ns->handle_command ())
2308	return 1;	2276	return true;
2309		2277
2310	if (op->speed_left > 0)
2311	{
2312	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2278	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2313	{
2314	/* All move commands take 1 tick, at least for now */
2315	op->speed_left--;
2316
2317	/* Instead of all the stuff below, let move_player take care
2318	* of it. Also, some of the skill stuff is only put in
2319	* there, as well as the confusion stuff.
2320	*/
2321	move_player (op, op->direction);	2279	return move_player (op, op->direction);
2322		2280
2323	return op->speed_left > 0;
2324	}
2325	}
2326
2327	return 0;	2281	return false;
2328	}	2282	}
2329		2283
2330	int	2284	int
2331	save_life (object *op)	2285	save_life (object *op)
2332	{	2286	{
…		…
2367	* from.	2321	* from.
2368	*/	2322	*/
2369	void	2323	void
2370	remove_unpaid_objects (object op, object env)	2324	remove_unpaid_objects (object op, object env)
2371	{	2325	{
2372	object *next;
2373
2374	while (op)	2326	while (op)
2375	{	2327	{
2376	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2328	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2377		2329
2378	if (QUERY_FLAG (op, FLAG_UNPAID))	2330	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2444	int rate_grace = 2000;	2396	int rate_grace = 2000;
2445	const int max_hp = 1;	2397	const int max_hp = 1;
2446	const int max_sp = 1;	2398	const int max_sp = 1;
2447	const int max_grace = 1;	2399	const int max_grace = 1;
2448		2400
2449	if (op->contr->outputs_sync)	2401	if (op->contr->hidden)
		2402	{
		2403	op->invisible = 1000;
		2404	/* the socket code flashes the player visible/invisible
		2405	* depending on the value of invisible, so we need to
		2406	* alternate it here for it to work correctly.
		2407	*/
		2408	if (pticks & 2)
		2409	op->invisible--;
2450	{	2410	}
2451	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2411	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2452	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2412	{
2453	flush_output_element (op, &op->contr->outputs[i]);	2413	if (!op->invisible--)
		2414	{
		2415	make_visible (op);
		2416	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2417	}
2454	}	2418	}
2455		2419
2456	if (op->contr->ns->state == ST_PLAYING)	2420	if (op->contr->ns->state == ST_PLAYING)
2457	{	2421	{
2458	/* these next three if clauses make it possible to SLOW DOWN	2422	/* these next three if clauses make it possible to SLOW DOWN
…		…
2480	gen_grace = op->stats.maxgrace;	2444	gen_grace = op->stats.maxgrace;
2481	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2445	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2482	}	2446	}
2483		2447
2484	/* Regenerate Spell Points */	2448	/* Regenerate Spell Points */
2485	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2449	if (!op->contr->golem && --op->last_sp < 0)
2486	{	2450	{
2487	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2451	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2488	if (op->stats.sp < op->stats.maxsp)	2452	if (op->stats.sp < op->stats.maxsp)
2489	{	2453	{
2490	op->stats.sp++;	2454	op->stats.sp++;
…		…
2588	}	2552	}
2589		2553
2590	/* Digestion */	2554	/* Digestion */
2591	if (--op->last_eat < 0)	2555	if (--op->last_eat < 0)
2592	{	2556	{
2593	#ifdef COZY_SERVER
2594	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2595	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2596	#else
2597	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2557	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2598	#endif
2599		2558
2600	if (op->contr->gen_hp > 0)	2559	if (op->contr->gen_hp > 0)
2601	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2560	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2602	else	2561	else
2603	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2562	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2708	tmp->name = buf;	2667	tmp->name = buf;
2709	sprintf (buf, " This finger has been cut off %s\n"	2668	sprintf (buf, " This finger has been cut off %s\n"
2710	" the %s, when he was defeated at\n level %d by %s.\n",	2669	" the %s, when he was defeated at\n level %d by %s.\n",
2711	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2670	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2712	tmp->msg = buf;	2671	tmp->msg = buf;
2713	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2672	tmp->value = 0, tmp->type = 0;
2714	tmp->materialname = NULL;	2673	tmp->materialname = "organics";
2715	tmp->insert_at (op, tmp);	2674	tmp->insert_at (op, tmp);
2716	}	2675	}
2717		2676
2718	/* teleport defeated player to new destination */	2677	/* teleport defeated player to new destination */
2719	transfer_ob (op, x, y, 0, NULL);	2678	transfer_ob (op, x, y, 0, NULL);
…		…
2915	op->stats.hp = op->stats.maxhp;	2874	op->stats.hp = op->stats.maxhp;
2916	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2875	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2917	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2876	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2918		2877
2919	/*	2878	/*
2920	* Check to see if the player is in a shop. IF so, then check to see if
2921	* 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
2922	* in the map.	2880	* and put them back in the map.
2923	*/	2881	*/
2924
2925	if (is_in_shop (op))
2926	remove_unpaid_objects (op->inv, op);	2882	remove_unpaid_objects (op->inv, op);
2927		2883
2928	/****************************************/	2884	/****************************************/
2929	/* */	2885	/* */
2930	/* Move player to his current respawn- */	2886	/* Move player to his current respawn- */
2931	/* position (usually last savebed) */	2887	/* position (usually last savebed) */
…		…
2951	object *force;	2907	object *force;
2952	int at;	2908	int at;
2953		2909
2954	force = get_archetype (FORCE_NAME);	2910	force = get_archetype (FORCE_NAME);
2955	/* 50 ticks should be enough time for the spell to abate */	2911	/* 50 ticks should be enough time for the spell to abate */
2956	force->speed = 0.1;	2912	force->speed = 0.1f;
2957	force->speed_left = -5.0;	2913	force->speed_left = -5.f;
2958	SET_FLAG (force, FLAG_APPLIED);	2914	SET_FLAG (force, FLAG_APPLIED);
2959	for (at = 0; at < NROFATTACKS; at++)	2915	for (at = 0; at < NROFATTACKS; at++)
2960	if (will_kill_again & (1 << at))	2916	if (will_kill_again & (1 << at))
2961	force->resist[at] = 100;	2917	force->resist[at] = 100;
2962		2918
…		…
2971	void	2927	void
2972	loot_object (object *op)	2928	loot_object (object *op)
2973	{ /* Grab and destroy some treasure */	2929	{ /* Grab and destroy some treasure */
2974	object tmp, tmp2, *next;	2930	object tmp, tmp2, *next;
2975		2931
2976	if (op->container)	2932	op->close_container (); /* close open sack first */
2977	esrv_apply_container (op, op->container); /* close open sack first */
2978		2933
2979	for (tmp = op->inv; tmp; tmp = next)	2934	for (tmp = op->inv; tmp; tmp = next)
2980	{	2935	{
2981	next = tmp->below;	2936	next = tmp->below;
2982		2937
2983	if (tmp->invisible)	2938	if (tmp->invisible)
2984	continue;	2939	continue;
2985		2940
2986	tmp->remove ();	2941	tmp->remove ();
2987	tmp->x = op->x, tmp->y = op->y;	2942	tmp->x = op->x, tmp->y = op->y;
		2943
2988	if (tmp->type == CONTAINER)	2944	if (tmp->type == CONTAINER)
2989	{ /* empty container to ground */	2945	loot_object (tmp); /* empty container to ground */
2990	loot_object (tmp);	2946
2991	}
2992	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(RANDOM () % 3)))	2947	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
2993	{	2948	{
2994	if (tmp->nrof > 1)	2949	if (tmp->nrof > 1)
2995	{	2950	{
2996	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2951	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2997	tmp2->destroy ();	2952	tmp2->destroy ();
…		…
3008	/*	2963	/*
3009	* fix_weight(): Check recursively the weight of all players, and fix	2964	* fix_weight(): Check recursively the weight of all players, and fix
3010	* what needs to be fixed. Refresh windows and fix speed if anything	2965	* what needs to be fixed. Refresh windows and fix speed if anything
3011	* was changed.	2966	* was changed.
3012	*/	2967	*/
3013
3014	void	2968	void
3015	fix_weight (void)	2969	fix_weight (void)
3016	{	2970	{
3017	for_all_players (pl)	2971	for_all_players (pl)
3018	{	2972	{
…		…
3078	if (op->type == PLAYER)	3032	if (op->type == PLAYER)
3079	{	3033	{
3080	op->contr->tmp_invis = 0;	3034	op->contr->tmp_invis = 0;
3081	op->contr->invis_race = 0;	3035	op->contr->invis_race = 0;
3082	}	3036	}
		3037
3083	update_object (op, UP_OBJ_FACE);	3038	update_object (op, UP_OBJ_CHANGE);
3084	}	3039	}
3085		3040
3086	int	3041	int
3087	is_true_undead (object *op)	3042	is_true_undead (object *op)
3088	{	3043	{
3089	object *tmp = NULL;
3090
3091	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3044	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3092	return 1;	3045	return 1;
3093		3046
3094	return 0;	3047	return 0;
3095	}	3048	}
…		…
3140	/* For Hidden creatures - a chance of becoming 'unhidden'	3093	/* For Hidden creatures - a chance of becoming 'unhidden'
3141	* every time they move - as we subtract off 'invisibility'	3094	* every time they move - as we subtract off 'invisibility'
3142	* AND, for players, if they move into a ridiculously unhideable	3095	* AND, for players, if they move into a ridiculously unhideable
3143	* spot (surrounded by clear terrain in broad daylight). -b.t.	3096	* spot (surrounded by clear terrain in broad daylight). -b.t.
3144	*/	3097	*/
3145
3146	void	3098	void
3147	do_hidden_move (object *op)	3099	do_hidden_move (object *op)
3148	{	3100	{
3149	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3101	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3150	object *skop;	3102	object *skop;
…		…
3383	char buf[MAX_BUF]; /* tmp. string buffer */	3335	char buf[MAX_BUF]; /* tmp. string buffer */
3384	int i = 0, j = 0;	3336	int i = 0, j = 0;
3385		3337
3386	/* get the appropriate treasurelist */	3338	/* get the appropriate treasurelist */
3387	if (atnr == ATNR_FIRE)	3339	if (atnr == ATNR_FIRE)
3388	trlist = find_treasurelist ("dragon_ability_fire");	3340	trlist = treasurelist::find ("dragon_ability_fire");
3389	else if (atnr == ATNR_COLD)	3341	else if (atnr == ATNR_COLD)
3390	trlist = find_treasurelist ("dragon_ability_cold");	3342	trlist = treasurelist::find ("dragon_ability_cold");
3391	else if (atnr == ATNR_ELECTRICITY)	3343	else if (atnr == ATNR_ELECTRICITY)
3392	trlist = find_treasurelist ("dragon_ability_elec");	3344	trlist = treasurelist::find ("dragon_ability_elec");
3393	else if (atnr == ATNR_POISON)	3345	else if (atnr == ATNR_POISON)
3394	trlist = find_treasurelist ("dragon_ability_poison");	3346	trlist = treasurelist::find ("dragon_ability_poison");
3395		3347
3396	if (trlist == NULL \|\| who->type != PLAYER)	3348	if (trlist == NULL \|\| who->type != PLAYER)
3397	return;	3349	return;
3398		3350
3399	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++);
…		…
3531	* not readied.	3483	* not readied.
3532	*/	3484	*/
3533	void	3485	void
3534	player_unready_range_ob (player pl, object ob)	3486	player_unready_range_ob (player pl, object ob)
3535	{	3487	{
3536	rangetype i;	3488	if (pl->ob->current_weapon == ob)
		3489	pl->ob->current_weapon = 0;
3537		3490
3538	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3491	if (pl->combat_ob == ob)
3539	{	3492	pl->combat_ob = 0;
		3493
3540	if (pl->ranges[i] == ob)	3494	if (pl->ranged_ob == ob)
3541	{	3495	pl->ranged_ob = 0;
3542	pl->ranges[i] = NULL;
3543	if (pl->shoottype == i)
3544	{
3545	pl->shoottype = range_none;
3546	}
3547	}
3548	}
3549	}	3496	}
		3497
		3498	sint8
		3499	player::visibility_at (maptile *map, int x, int y) const
		3500	{
		3501	if (!ns)
		3502	return 0;
		3503
		3504	int dx, dy;
		3505	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3506	return 0;
		3507
		3508	x += dx - ns->current_x + ns->mapx / 2;
		3509	y += dy - ns->current_y + ns->mapy / 2;
		3510
		3511	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
		3512	return 0;
		3513
		3514	return 100 - blocked_los [x][y];
		3515	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs. Revision 1.146 by root, Sun Jun 3 17:05:36 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.146 by root, Sun Jun 3 17:05:36 2007 UTC