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.89 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

…		…
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author 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	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
261
262	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
263		246
264	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
265		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);
266	ob->update_stats ();	274	ob->update_stats ();
		275
267	ns->floorbox_update ();	276	ns->floorbox_update ();
268
269	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
270	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
271		279
272	activate ();	280	activate ();
273		281
…		…
280	}	288	}
281		289
282	void	290	void
283	player::disconnect ()	291	player::disconnect ()
284	{	292	{
285	//TODO: don't be so harsh and destroy :)
286	if (ns)	293	if (ns)
287	{	294	{
288	if (active)	295	if (active)
289	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
290		297
291	INVOKE_PLAYER (DISCONNECT, this);	298	INVOKE_PLAYER (DISCONNECT, this);
292		299
		300	ns->reset_stats ();
293	ns->pl = 0;	301	ns->pl = 0;
294	this->ns = 0;	302	ns = 0;
295	}	303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
296		307
297	deactivate ();	308	deactivate ();
298	}	309	}
299		310
300	// the need for this function can be explained	311	// the need for this function can be explained
301	// by load_object not returning the object	312	// by load_object not returning the object
302	void	313	void
303	player::set_object (object *op)	314	player::set_object (object *op)
304	{	315	{
305	ob = op;	316	ob = op;
306	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
307		318
		319	ob->speed = 1.0f;
308	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
309	ob->speed = 1.0;	321
310	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
311	ob->stats.wc = 2;
312	ob->run_away = 25; /* Then we panick... */
313
314	ob->roll_stats ();
315	}	323	}
316		324
317	player::player ()	325	player::player ()
318	{	326	{
319	/* There are some elements we want initialised to non zero value -	327	/* There are some elements we want initialised to non zero value -
320	* we deal with that below this point.	328	* we deal with that below this point.
321	*/	329	*/
322	outputs_sync = 16; /* Every 2 seconds */	330	outputs_sync = 4;
323	outputs_count = 8; /* Keeps present behaviour */	331	outputs_count = 4;
324	unapply = unapply_nochoice;	332	unapply = unapply_nochoice;
325		333
326	savebed_map = first_map_path; /* Init. respawn position */	334	savebed_map = first_map_path; /* Init. respawn position */
327		335
328	gen_sp_armour = 10;	336	gen_sp_armour = 10;
329	last_speed = -1;
330	shoottype = range_none;
331	bowtype = bow_normal;	337	bowtype = bow_normal;
332	petmode = pet_normal;	338	petmode = pet_normal;
333	listening = 10;	339	listening = 10;
334	usekeys = containers;	340	usekeys = containers;
335	last_weapon_sp = -1;
336	peaceful = 1; /* default peaceful */	341	peaceful = 1; /* default peaceful */
337	do_los = 1;	342	do_los = 1;
338		343
339	/* we need to clear these to -1 and not zero - otherwise,	344	weapon_sp = 1.0f;
340	* if a player quits and starts a new character, we wont	345	weapon_sp_left = 0.5f;
341	* send new values to the client, as things like exp start
342	* at zero.
343	*/
344	for (int i = 0; i < NUM_SKILLS; i++)
345	last_skill_exp[i] = -1;
346
347	for (int i = 0; i < NROFATTACKS; i++)
348	last_resist[i] = -1;
349
350	last_stats.exp = -1;
351	last_weight = (uint32) - 1;
352	}	346	}
353		347
354	void	348	void
355	player::do_destroy ()	349	player::do_destroy ()
356	{	350	{
…		…
379	player::create ()	373	player::create ()
380	{	374	{
381	player *pl = new player;	375	player *pl = new player;
382		376
383	pl->set_object (arch_to_object (get_player_archetype (0)));	377	pl->set_object (arch_to_object (get_player_archetype (0)));
		378
		379	pl->ob->roll_stats ();
		380	pl->ob->stats.wc = 2;
		381	pl->ob->run_away = 25; /* Then we panick... */
		382
384	set_first_map (pl->ob);	383	set_first_map (pl->ob);
385		384
386	return pl;	385	return pl;
387	}	386	}
388		387
…		…
420	object *op = NULL;	419	object *op = NULL;
421	objectlink *ol;	420	objectlink *ol;
422	unsigned lastdist;	421	unsigned lastdist;
423	rv_vector rv;	422	rv_vector rv;
424		423
425	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	424	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426	{	425	{
427	/* We should not find free objects on this friendly list, but it	426	/* We should not find free objects on this friendly list, but it
428	* does periodically happen. Given that, lets deal with it.	427	* does periodically happen. Given that, lets deal with it.
429	* While unlikely, it is possible the next object on the friendly	428	* While unlikely, it is possible the next object on the friendly
430	* list is also free, so encapsulate this in a while loop.	429	* list is also free, so encapsulate this in a while loop.
…		…
434	object *tmp = ol->ob;	433	object *tmp = ol->ob;
435		434
436	/* Can't do much more other than log the fact, because the object	435	/* Can't do much more other than log the fact, because the object
437	* itself will have been cleared.	436	* itself will have been cleared.
438	*/	437	*/
439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	438	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		439	tmp->debug_desc ());
440	ol = ol->next;	440	ol = ol->next;
441	remove_friendly_object (tmp);	441	remove_friendly_object (tmp);
442	if (!ol)	442	if (!ol)
443	return op;	443	return op;
444	}	444	}
…		…
533	x = mon->x;	533	x = mon->x;
534	y = mon->y;	534	y = mon->y;
535	m = mon->map;	535	m = mon->map;
536	dir = rv.direction;	536	dir = rv.direction;
537	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	537	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
538	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	538	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		539
539	/* If we can't solve it within the search distance, return now. */	540	/* If we can't solve it within the search distance, return now. */
540	if (diff > max)	541	if (diff > max)
541	return 0;	542	return 0;
		543
542	while (diff > 1 && max > 0)	544	while (diff > 1 && max > 0)
543	{	545	{
544	lastx = x;	546	lastx = x;
545	lasty = y;	547	lasty = y;
546	lastmap = m;	548	lastmap = m;
…		…
628	max--;	630	max--;
629	lastdir = dir;	631	lastdir = dir;
630	if (!firstdir)	632	if (!firstdir)
631	firstdir = dir;	633	firstdir = dir;
632	}	634	}
		635
633	if (diff <= 1)	636	if (diff <= 1)
634	{	637	{
635	/* Recalculate diff (distance) because we may not have actually	638	/* Recalculate diff (distance) because we may not have actually
636	* headed toward player for entire distance.	639	* headed toward player for entire distance.
637	*/	640	*/
638	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	641	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
639	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	642	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
640	}	643	}
		644
641	if (diff > max)	645	if (diff > max)
642	return 0;	646	return 0;
643	}	647	}
		648
644	/* If we reached the max, didn't find a direction in time */	649	/* If we reached the max, didn't find a direction in time */
645	if (!max)	650	if (!max)
646	return 0;	651	return 0;
647		652
648	return firstdir;	653	return firstdir;
…		…
762	roll_stat (void)	767	roll_stat (void)
763	{	768	{
764	int a[4], i, j, k;	769	int a[4], i, j, k;
765		770
766	for (i = 0; i < 4; i++)	771	for (i = 0; i < 4; i++)
767	a[i] = (int) RANDOM () % 6 + 1;	772	a[i] = (int) rndm (6) + 1;
768		773
769	for (i = 0, j = 0, k = 7; i < 4; i++)	774	for (i = 0, j = 0, k = 7; i < 4; i++)
770	if (a[i] < k)	775	if (a[i] < k)
771	k = a[i], j = i;	776	k = a[i], j = i;
772		777
…		…
778	}	783	}
779		784
780	void	785	void
781	object::roll_stats ()	786	object::roll_stats ()
782	{	787	{
783	int statsort [7];	788	int statsort [NUM_STATS];
784		789
785	for (;;)	790	for (;;)
786	{	791	{
787	int sum = 0;	792	int sum = 0;
788	for (int i = 7; i--; )	793	for (int i = NUM_STATS; i--; )
789	sum += statsort [i] = roll_stat ();	794	sum += statsort [i] = roll_stat ();
790		795
791	if (sum >= 82 && sum <= 116)	796	if (sum >= 82 && sum <= 116)
792	break;	797	break;
793	}	798	}
794		799
795	// Sort the stats so that rerolling is easier...	800	// Sort the stats so that rerolling is easier...
796	std::sort (statsort, statsort + 7, std::greater<int>());	801	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
797		802
		803	for (int i = 0; i < NUM_STATS; ++i)
798	stats.Str = statsort[0];	804	stats.stat (i) = statsort [i];
799	stats.Dex = statsort[1];
800	stats.Con = statsort[2];
801	stats.Int = statsort[3];
802	stats.Wis = statsort[4];
803	stats.Pow = statsort[5];
804	stats.Cha = statsort[6];
805		805
806	stats.exp = 0;	806	stats.exp = 0;
807	stats.ac = 0;	807	stats.ac = 0;
808		808
809	stats.hp = stats.maxhp;	809	stats.hp = stats.maxhp;
…		…
821	}	821	}
822		822
823	void	823	void
824	object::swap_stats (int a, int b)	824	object::swap_stats (int a, int b)
825	{	825	{
826	int tmp = get_attr_value (&contr->orig_stats, a);	826	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
827	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
828	set_attr_value (&contr->orig_stats, b, tmp);
829		827
		828	for (int i = 0; i < NUM_STATS; ++i)
830	stats.Str = contr->orig_stats.Str;	829	stats.stat (i) = contr->orig_stats.stat (i);
831	stats.Dex = contr->orig_stats.Dex;
832	stats.Con = contr->orig_stats.Con;
833	stats.Int = contr->orig_stats.Int;
834	stats.Wis = contr->orig_stats.Wis;
835	stats.Pow = contr->orig_stats.Pow;
836	stats.Cha = contr->orig_stats.Cha;
837		830
838	//TODO: the following code looks so borked and should, at the very least,	831	//TODO: the following code looks so borked and should, at the very least,
839	// be merged with the similar code in roll_stats	832	// be merged with the similar code in roll_stats
840	stats.ac = 0;	833	stats.ac = 0;
841		834
…		…
872	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
873	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
874	* separate race and class; this actually changes the RACE,	867	* separate race and class; this actually changes the RACE,
875	* not the class.	868	* not the class.
876	*/	869	*/
877	int	870	void
878	key_change_class (object *op, char key)	871	player::chargen_race_done ()
879	{	872	{
880	int tmp_loop;
881
882	if (key == 'd' || key == 'D')
883	{
884	char buf[MAX_BUF];
885
886	/* this must before then initial items are given */	873	/* this must before then initial items are given */
887	esrv_new_player (op->contr, op->weight + op->carrying);	874	esrv_new_player (ob->contr, ob->weight + ob->carrying);
888		875
889	treasurelist *tl = find_treasurelist ("starting_wealth");	876	treasurelist *tl = treasurelist::find ("starting_wealth");
890	if (tl)	877	if (tl)
891	create_treasure (tl, op, 0, 0, 0);	878	create_treasure (tl, ob, 0, 0, 0);
892		879
893	INVOKE_PLAYER (BIRTH, op->contr);	880	INVOKE_PLAYER (BIRTH, ob->contr);
894	INVOKE_PLAYER (LOGIN, op->contr);	881	INVOKE_PLAYER (LOGIN, ob->contr);
895		882
896	op->contr->ns->state = ST_PLAYING;	883	ob->contr->ns->state = ST_PLAYING;
897		884
898	if (op->msg)	885	if (ob->msg)
899	op->msg = NULL;	886	ob->msg = 0;
900		887
901	/* We create this now because some of the unique maps will need it	888	/* We create this now because some of the unique maps will need it
902	* to save here.	889	* to save here.
903	*/	890	*/
		891	{
		892	char buf[MAX_BUF];
904	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	893	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
905	make_path_to_file (buf);	894	make_path_to_file (buf);
		895	}
906		896
907	#ifdef AUTOSAVE
908	op->contr->last_save_tick = pticks;
909	#endif
910	start_info (op);	897	start_info (ob);
911	CLEAR_FLAG (op, FLAG_WIZ);	898	CLEAR_FLAG (ob, FLAG_WIZ);
912	give_initial_items (op, op->randomitems);	899	give_initial_items (ob, ob->randomitems);
913	link_player_skills (op);	900	link_player_skills (ob);
914	esrv_send_inventory (op, op);	901	esrv_send_inventory (ob, ob);
915	op->update_stats ();	902	ob->update_stats ();
916		903
917	/* This moves the player to a different start map, if there	904	/* This moves the player to a different start map, if there
918	* is one for this race	905	* is one for this race
919	*/	906	*/
920	if (*first_map_ext_path)	907	if (*first_map_ext_path)
921	{	908	{
922	object *tmp;	909	object *tmp;
923	char mapname[MAX_BUF];	910	char mapname[MAX_BUF];
924		911
925	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
926	tmp = object::create ();	913	tmp = object::create ();
927	EXIT_PATH (tmp) = mapname;	914	EXIT_PATH (tmp) = mapname;
928	EXIT_X (tmp) = op->x;	915	EXIT_X (tmp) = ob->x;
929	EXIT_Y (tmp) = op->y;	916	EXIT_Y (tmp) = ob->y;
930	op->enter_exit (tmp); /* we don't really care if it succeeded;	917	ob->enter_exit (tmp); /* we don't really care if it succeeded;
931	* if the map isn't there, then stay on the	918	* if the map isn't there, then stay on the
932	* default initial map */	919	* default initial map */
933	tmp->destroy ();	920	tmp->destroy ();
934	}	921	}
935	else	922	else
936	LOG (llevDebug, "first_map_ext_path not set\n");	923	LOG (llevDebug, "first_map_ext_path not set\n");
		924	}
937		925
938	return 0;	926	void
939	}	927	player::chargen_race_next ()
940		928	{
941	/* Following actually changes the race - this is the default command	929	/* Following actually changes the race - this is the default command
942	* if we don't match with one of the options above.	930	* if we don't match with one of the options above.
943	*/	931	*/
944		932
945	tmp_loop = 0;	933	do
946	while (!tmp_loop)
947	{	934	{
948	shstr name = op->name;	935	shstr name = ob->name;
949	int x = op->x, y = op->y;	936	int x = ob->x, y = ob->y;
950		937
951	op->remove_statbonus ();	938	ob->remove_statbonus ();
952	op->remove ();	939	ob->remove ();
953	op->arch = get_player_archetype (op->arch);	940	ob->arch = get_player_archetype (ob->arch);
954	op->arch->clone.copy_to (op);	941	ob->arch->clone.copy_to (ob);
955	op->instantiate ();	942	ob->instantiate ();
956	op->stats = op->contr->orig_stats;	943	ob->stats = ob->contr->orig_stats;
957	op->name = op->name_pl = name;	944	ob->name = ob->name_pl = name;
958	op->x = x;	945	ob->x = x;
959	op->y = y;	946	ob->y = y;
960	SET_ANIMATION (op, 2); /* So player faces south */	947	SET_ANIMATION (ob, 2); /* So player faces south */
961	insert_ob_in_map (op, op->map, op, 0);	948	insert_ob_in_map (ob, ob->map, ob, 0);
962	assign (op->contr->title, op->arch->clone.name);	949	assign (ob->contr->title, ob->arch->clone.name);
963	op->add_statbonus ();	950	ob->add_statbonus ();
964	tmp_loop = allowed_class (op);
965	}	951	}
		952	while (!allowed_class (ob));
966		953
967	update_object (op, UP_OBJ_FACE);	954	update_object (ob, UP_OBJ_FACE);
968	esrv_update_item (UPD_FACE, op, op);	955	esrv_update_item (UPD_FACE, ob, ob);
969	op->update_stats ();	956	ob->update_stats ();
970	op->stats.hp = op->stats.maxhp;	957	ob->stats.hp = ob->stats.maxhp;
971	op->stats.sp = op->stats.maxsp;	958	ob->stats.sp = ob->stats.maxsp;
972	op->stats.grace = 0;	959	ob->stats.grace = 0;
973
974	if (op->msg)
975	new_draw_info (NDI_BLUE, 0, op, op->msg);
976
977	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
978	return 0;
979	}	960	}
980		961
981	void	962	void
982	flee_player (object *op)	963	flee_player (object *op)
983	{	964	{
…		…
1030	/* Cornered, get rid of scared */	1011	/* Cornered, get rid of scared */
1031	CLEAR_FLAG (op, FLAG_SCARED);	1012	CLEAR_FLAG (op, FLAG_SCARED);
1032	op->enemy = NULL;	1013	op->enemy = NULL;
1033	}	1014	}
1034		1015
1035
1036	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1016	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1037	* IT returns 1 if the player should keep on moving, 0 if he should	1017	* It returns 1 if the player should keep on moving, 0 if he should
1038	* stop.	1018	* stop.
1039	*/	1019	*/
1040	int	1020	int
1041	check_pick (object *op)	1021	check_pick (object *op)
1042	{	1022	{
1043	object *tmp, *next;	1023	object *tmp, *next;
1044	int stop = 0;	1024	int stop = 0;
1045	int j, k, wvratio;	1025	int wvratio;
1046	char putstring[128], tmpstr[16];	1026	char putstring[128];
1047		1027
1048	/* if you're flying, you cna't pick up anything */	1028	/* if you're flying, you cna't pick up anything */
1049	if (op->move_type & MOVE_FLYING)	1029	if (op->move_type & MOVE_FLYING)
1050	return 1;	1030	return 1;
1051		1031
…		…
1388	* found object is returned.	1368	* found object is returned.
1389	*/	1369	*/
1390	object *	1370	object *
1391	find_arrow (object *op, const char *type)	1371	find_arrow (object *op, const char *type)
1392	{	1372	{
1393	object *tmp = NULL;	1373	object *tmp = 0;
1394		1374
1395	for (op = op->inv; op; op = op->below)	1375	for (op = op->inv; op; op = op->below)
1396	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1376	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1397	tmp = find_arrow (op, type);	1377	tmp = find_arrow (op, type);
1398	else if (op->type == ARROW && op->race == type)	1378	else if (op->type == ARROW && op->race == type)
1399	return op;	1379	return op;
		1380
1400	return tmp;	1381	return tmp;
1401	}	1382	}
1402		1383
1403	/*	1384	/*
1404	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1385	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1405	* against the target. A full test is not performed, simply a basic test	1386	* against the target. A full test is not performed, simply a basic test
1406	* of resistances. The archer is making a quick guess at what he sees down	1387	* of resistances. The archer is making a quick guess at what he sees down
1407	* the hall. Failing that it does it's best to pick the highest plus arrow.	1388	* the hall. Failing that it does it's best to pick the highest plus arrow.
1408	*/	1389	*/
1409
1410	object *	1390	object *
1411	find_better_arrow (object *op, object *target, const char *type, int *better)	1391	find_better_arrow (object *op, object *target, const char *type, int *better)
1412	{	1392	{
1413	object *tmp = NULL, *arrow, *ntmp;	1393	object *tmp = NULL, *arrow, *ntmp;
1414	int attacknum, attacktype, betterby = 0, i;	1394	int attacknum, attacktype, betterby = 0, i;
…		…
1480	* find_better_arrow to find a decent arrow to use.	1460	* find_better_arrow to find a decent arrow to use.
1481	* op = the shooter	1461	* op = the shooter
1482	* type = bow->race	1462	* type = bow->race
1483	* dir = fire direction	1463	* dir = fire direction
1484	*/	1464	*/
1485
1486	object *	1465	object *
1487	pick_arrow_target (object *op, const char *type, int dir)	1466	pick_arrow_target (object *op, const char *type, int dir)
1488	{	1467	{
1489	object *tmp = NULL;	1468	object *tmp = NULL;
1490	maptile *m;	1469	maptile *m;
…		…
1555	*/	1534	*/
1556	int	1535	int
1557	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1536	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1558	{	1537	{
1559	object *left, *bow;	1538	object *left, *bow;
1560	int bowspeed, mflags;	1539	int mflags;
1561	maptile *m;	1540	maptile *m;
1562		1541
1563	if (!dir)	1542	if (!dir)
1564	{	1543	{
1565	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1544	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1566	return 0;	1545	return 0;
1567	}	1546	}
1568		1547
1569	if (op->type == PLAYER)	1548	if (op->contr)
1570	bow = op->contr->ranges[range_bow];	1549	bow = op->current_weapon;
1571	else	1550	else
1572	{	1551	{
1573	for (bow = op->inv; bow; bow = bow->below)	1552	for (bow = op->inv; bow; bow = bow->below)
1574	/* Don't check for applied - monsters don't apply bows - in that way, they	1553	/* Don't check for applied - monsters don't apply bows - in that way, they
1575	* don't need to switch back and forth between bows and weapons.	1554	* don't need to switch back and forth between bows and weapons.
…		…
1580	if (!bow)	1559	if (!bow)
1581	{	1560	{
1582	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1561	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1583	return 0;	1562	return 0;
1584	}	1563	}
		1564
		1565	// optimisation: move object to top so we will find it quickly again
		1566	if (bow->below)
		1567	{
		1568	bow->remove ();
		1569	op->insert (bow);
		1570	}
		1571
1585	}	1572	}
1586		1573
1587	if (!bow->race || !bow->skill)	1574	if (!bow->race || !bow->skill)
1588	{	1575	{
1589	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1576	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1590	return 0;	1577	return 0;
1591	}	1578	}
1592
1593	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1594
1595	/* penalize ROF for bestarrow */
1596	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1597	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1598
1599	if (bowspeed < 1)
1600	bowspeed = 1;
1601		1579
1602	if (arrow == NULL)	1580	if (arrow == NULL)
1603	{	1581	{
1604	if ((arrow = find_arrow (op, bow->race)) == NULL)	1582	if ((arrow = find_arrow (op, bow->race)) == NULL)
1605	{	1583	{
1606	if (op->type == PLAYER)	1584	if (op->type == PLAYER)
1607	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1585	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1608	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1586	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1609	else	1587	else
1610	CLEAR_FLAG (op, FLAG_READY_BOW);	1588	CLEAR_FLAG (op, FLAG_READY_BOW);
		1589
1611	return 0;	1590	return 0;
1612	}	1591	}
1613	}	1592	}
1614		1593
1615	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1594	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1639		1618
1640	arrow->set_owner (op);	1619	arrow->set_owner (op);
1641	arrow->skill = bow->skill;	1620	arrow->skill = bow->skill;
1642	arrow->direction = dir;	1621	arrow->direction = dir;
1643		1622
		1623	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1624	arrow->stats.hp = arrow->stats.dam;
		1625	arrow->stats.grace = arrow->attacktype;
		1626
		1627	if (arrow->slaying)
		1628	arrow->spellarg = strdup (arrow->slaying);
		1629
		1630	#if 0
		1631	if (player *pl = op->contr)
		1632	{
		1633	float speed = pl->weapon_sp;
		1634
		1635	/* penalize ROF for bestarrow */
		1636	if (pl->bowtype == bow_bestarrow)
		1637	speed *= .9f;
		1638	else
		1639	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1640
		1641	op->speed_left += speed - op->speed;
		1642	}
		1643	#endif
		1644
		1645	SET_ANIMATION (arrow, arrow->direction);
		1646
		1647	/* update the speed */
		1648	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1649	+ bow->stats.dam / 7.f;
		1650
		1651	arrow->set_speed (max (arrow->speed, 2.f));
		1652	arrow->speed_left = 0;
		1653
		1654	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1655
1644	if (op->type == PLAYER)	1656	if (op->type == PLAYER)
1645	{	1657	{
1646	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1647	op->update_stats ();
1648	}
1649
1650	SET_ANIMATION (arrow, arrow->direction);
1651	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1652	arrow->stats.hp = arrow->stats.dam;
1653	arrow->stats.grace = arrow->attacktype;
1654	if (arrow->slaying != NULL)
1655	arrow->spellarg = strdup (arrow->slaying);
1656
1657	/* Note that this was different for monsters - they got their level
1658	* added to the damage. I think the strength bonus is more proper.
1659	*/
1660
1661	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1662
1663	/* update the speed */
1664	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1665	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1666
1667	arrow->set_speed (max (arrow->speed, 1.0));
1668	arrow->speed_left = 0;
1669
1670	if (op->type == PLAYER)
1671	{
1672	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1673	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1674	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1675
1676	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1658	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1659	wc -= dex_bonus[op->stats.Dex];
		1660
		1661	if (!arrow->slaying)
		1662	arrow->slaying = op->slaying;
		1663
		1664	arrow->attacktype |= op->attacktype;
1677	}	1665	}
1678	else	1666	else
1679	{	1667	{
1680	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1681	arrow->level = op->level;	1668	arrow->level = op->level;
1682	}	1669	arrow->stats.wc -= bow->magic;
1683		1670
1684	if (arrow->attacktype == AT_PHYSICAL)	1671	if (!arrow->slaying)
		1672	arrow->slaying = bow->slaying;
		1673
1685	arrow->attacktype |= bow->attacktype;	1674	arrow->attacktype |= bow->attacktype;
		1675	}
1686		1676
1687	if (bow->slaying)	1677	wc -= arrow->level;
1688	arrow->slaying = bow->slaying;	1678	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1689		1679
		1680	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1690	arrow->move_type = MOVE_FLY_LOW;	1681	arrow->move_type = MOVE_FLY_LOW;
1691	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1682	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1692		1683
1693	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1684	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1694	m->insert (arrow, sx, sy, op);	1685	m->insert (arrow, sx, sy, op);
…		…
1719	{	1710	{
1720	int ret = 0, wcmod = 0;	1711	int ret = 0, wcmod = 0;
1721		1712
1722	if (op->contr->bowtype == bow_bestarrow)	1713	if (op->contr->bowtype == bow_bestarrow)
1723	{	1714	{
1724	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1715	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1725	}	1716	}
1726	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1717	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1727	{	1718	{
1728	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1719	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1729	wcmod = -1;	1720	wcmod = -1;
…		…
1739	else if (op->contr->bowtype == bow_spreadshot)	1730	else if (op->contr->bowtype == bow_spreadshot)
1740	{	1731	{
1741	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1732	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1742	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1733	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1743	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1734	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1744
1745	}	1735	}
1746	else	1736	else
1747	{	1737	{
1748	/* Simple case */	1738	/* Simple case */
1749	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1739	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1750	}	1740	}
		1741
1751	return ret;	1742	return ret;
1752	}	1743	}
1753
1754		1744
1755	/* Fires a misc (wand/rod/horn) object in 'dir'.	1745	/* Fires a misc (wand/rod/horn) object in 'dir'.
1756	* Broken apart from 'fire' to keep it more readable.	1746	* Broken apart from 'fire' to keep it more readable.
1757	*/	1747	*/
1758	void	1748	void
1759	fire_misc_object (object *op, int dir)	1749	fire_misc_object (object *op, int dir)
1760	{	1750	{
1761	object *item;	1751	object *item = op->contr->ranged_ob;
1762		1752
1763	if (!op->contr->ranges[range_misc])	1753	if (!item)
1764	{	1754	{
1765	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1755	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1766	return;	1756	return;
1767	}	1757	}
1768		1758
1769	item = op->contr->ranges[range_misc];
1770	if (!item->inv)	1759	if (!item->inv)
1771	{	1760	{
1772	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1761	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1773	return;	1762	return;
1774	}	1763	}
		1764
		1765	if (!op->change_weapon (item))
		1766	return;
		1767
1775	if (item->type == WAND)	1768	if (item->type == WAND)
1776	{	1769	{
1777	if (item->stats.food <= 0)	1770	if (item->stats.food <= 0)
1778	{	1771	{
1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1772	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1773	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1774
1781	return;	1775	return;
1782	}	1776	}
1783	}	1777	}
1784	else if (item->type == ROD || item->type == HORN)	1778	else if (item->type == ROD || item->type == HORN)
1785	{	1779	{
1786	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1780	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1787	{	1781	{
1788	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1782	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1783
1789	if (item->type == ROD)	1784	if (item->type == ROD)
1790	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1791	else	1786	else
1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1788
1793	return;	1789	return;
1794	}	1790	}
1795	}	1791	}
1796		1792
1797	if (cast_spell (op, item, dir, item->inv, NULL))	1793	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1819	}	1815	}
1820	}	1816	}
1821		1817
1822	/* Received a fire command for the player - go and do it.	1818	/* Received a fire command for the player - go and do it.
1823	*/	1819	*/
1824	void	1820	bool
1825	fire (object *op, int dir)	1821	fire (object *op, int dir)
1826	{	1822	{
1827	int spellcost = 0;	1823	int spellcost = 0;
1828		1824
1829	/* check for loss of invisiblity/hide */	1825	/* check for loss of invisiblity/hide */
1830	if (action_makes_visible (op))	1826	if (action_makes_visible (op))
1831	make_visible (op);	1827	make_visible (op);
1832		1828
1833	switch (op->contr->shoottype)	1829	player *pl = op->contr;
		1830
		1831	if (pl->golem)
		1832	{
		1833	control_golem (op->contr->golem, dir);
		1834	return false;
1834	{	1835	}
1835	case range_none:
1836	return;
1837		1836
1838	case range_bow:	1837	object *ob = pl->ranged_ob;
		1838
		1839	if (!ob)
		1840	return false;
		1841
		1842	if (!op->change_weapon (ob))
		1843	return false;
		1844
		1845	if (op->speed_left > 0.f)
		1846	--op->speed_left;
		1847	else
		1848	return false;
		1849
		1850	switch (ob->type)
		1851	{
		1852	case BOW:
1839	player_fire_bow (op, dir);	1853	player_fire_bow (op, dir);
1840	return;	1854	break;
1841		1855
1842	case range_magic: /* Casting spells */	1856	case SPELL:
1843	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1857	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1844	return;	1858	break;
1845		1859
1846	case range_misc:	1860	case BUILDER:
		1861	apply_map_builder (op, dir);
		1862	break;
		1863
		1864	case SKILL:
		1865	do_skill (op, op, ob, dir, 0);
		1866	break;
		1867
		1868	default:
1847	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1848	return;	1870	break;
1849
1850	case range_golem: /* Control summoned monsters from scrolls */
1851	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1852	{
1853	op->contr->ranges[range_golem] = 0;
1854	op->contr->shoottype = range_none;
1855	}
1856	else
1857	control_golem (op->contr->ranges[range_golem], dir);
1858	return;
1859
1860	case range_skill:
1861	if (!op->chosen_skill)
1862	{
1863	if (op->type == PLAYER)
1864	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1865	return;
1866	}
1867	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1868	return;
1869	case range_builder:
1870	apply_map_builder (op, dir);
1871	return;
1872	default:
1873	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1874	return;
1875	}	1871	}
1876	}
1877		1872
1878		1873	return true;
		1874	}
1879		1875
1880	/* find_key	1876	/* find_key
1881	* We try to find a key for the door as passed. If we find a key	1877	* We try to find a key for the door as passed. If we find a key
1882	* and successfully use it, we return the key, otherwise NULL	1878	* and successfully use it, we return the key, otherwise NULL
1883	* This function merges both normal and locked door, since the logic	1879	* This function merges both normal and locked door, since the logic
…		…
1885	* pl is the player,	1881	* pl is the player,
1886	* inv is the objects inventory to searched	1882	* inv is the objects inventory to searched
1887	* door is the door we are trying to match against.	1883	* door is the door we are trying to match against.
1888	* This function can be called recursively to search containers.	1884	* This function can be called recursively to search containers.
1889	*/	1885	*/
1890
1891	object *	1886	object *
1892	find_key (object *pl, object *container, object *door)	1887	find_key (object *pl, object *container, object *door)
1893	{	1888	{
1894	object *tmp, *key;	1889	object *tmp, *key;
1895		1890
1896	/* Should not happen, but sanity checking is never bad */	1891	/* Should not happen, but sanity checking is never bad */
1897	if (container->inv == NULL)	1892	if (!container->inv)
1898	return NULL;	1893	return 0;
1899		1894
1900	/* First, lets try to find a key in the top level inventory */	1895	/* First, lets try to find a key in the top level inventory */
1901	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1896	for (tmp = container->inv; tmp; tmp = tmp->below)
1902	{	1897	{
1903	if (door->type == DOOR && tmp->type == KEY)	1898	if (door->type == DOOR && tmp->type == KEY)
1904	break;	1899	break;
1905	/* For sanity, we should really check door type, but other stuff	1900	/* For sanity, we should really check door type, but other stuff
1906	* (like containers) can be locked with special keys	1901	* (like containers) can be locked with special keys
1907	*/	1902	*/
1908	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1903	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1909	break;	1904	break;
1910	}	1905	}
		1906
1911	/* No key found - lets search inventories now */	1907	/* No key found - lets search inventories now */
1912	/* If we find and use a key in an inventory, return at that time.	1908	/* If we find and use a key in an inventory, return at that time.
1913	* otherwise, if we search all the inventories and still don't find	1909	* otherwise, if we search all the inventories and still don't find
1914	* a key, return	1910	* a key, return
1915	*/	1911	*/
1916	if (!tmp)	1912	if (!tmp)
1917	{	1913	{
1918	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1914	for (tmp = container->inv; tmp; tmp = tmp->below)
1919	{	1915	{
1920	/* No reason to search empty containers */	1916	/* No reason to search empty containers */
1921	if (tmp->type == CONTAINER && tmp->inv)	1917	if (tmp->type == CONTAINER && tmp->inv)
1922	{	1918	{
1923	if ((key = find_key (pl, tmp, door)) != NULL)	1919	if ((key = find_key (pl, tmp, door)))
1924	return key;	1920	return key;
1925	}	1921	}
1926	}	1922	}
		1923
1927	if (!tmp)	1924	if (!tmp)
1928	return NULL;	1925	return NULL;
1929	}	1926	}
		1927
1930	/* We get down here if we have found a key. Now if its in a container,	1928	/* We get down here if we have found a key. Now if its in a container,
1931	* see if we actually want to use it	1929	* see if we actually want to use it
1932	*/	1930	*/
1933	if (pl != container)	1931	if (pl != container)
1934	{	1932	{
…		…
1955	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1953	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1956	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1954	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1957	return NULL;	1955	return NULL;
1958	}	1956	}
1959	}	1957	}
		1958
1960	return tmp;	1959	return tmp;
1961	}	1960	}
1962		1961
1963	/* moved door processing out of move_player_attack.	1962	/* moved door processing out of move_player_attack.
1964	* returns 1 if player has opened the door with a key	1963	* returns 1 if player has opened the door with a key
…		…
1966	* 0 otherwise	1965	* 0 otherwise
1967	*/	1966	*/
1968	static int	1967	static int
1969	player_attack_door (object *op, object *door)	1968	player_attack_door (object *op, object *door)
1970	{	1969	{
1971	/* If its a door, try to find a use a key. If we do destroy the door,	1970	/* If its a door, try to find a key. If we do destroy the door,
1972	* might as well return immediately as there is nothing more to do -	1971	* might as well return immediately as there is nothing more to do -
1973	* otherwise, we fall through to the rest of the code.	1972	* otherwise, we fall through to the rest of the code.
1974	*/	1973	*/
1975	object *key = find_key (op, op, door);	1974	object *key = find_key (op, op, door);
1976		1975
1977	/* IF we found a key, do some extra work */	1976	/* If we found a key, do some extra work */
1978	if (key)	1977	if (key)
1979	{	1978	{
1980	object *container = key->env;	1979	object *container = key->env;
1981		1980
1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1981	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1982
1983	if (action_makes_visible (op))	1983	if (action_makes_visible (op))
1984	make_visible (op);	1984	make_visible (op);
		1985
1985	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1986	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1986	spring_trap (door->inv, op);	1987	spring_trap (door->inv, op);
		1988
1987	if (door->type == DOOR)	1989	if (door->type == DOOR)
1988	{
1989	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1990	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1990	}
1991	else if (door->type == LOCKED_DOOR)	1991	else if (door->type == LOCKED_DOOR)
1992	{	1992	{
1993	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1993	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1994	remove_door2 (door); /* remove door without violence ;-) */	1994	remove_door2 (door); /* remove door without violence ;-) */
1995	}	1995	}
		1996
1996	/* Do this after we print the message */	1997	/* Do this after we print the message */
1997	decrease_ob (key); /* Use up one of the keys */	1998	decrease_ob (key); /* Use up one of the keys */
1998	/* Need to update the weight the container the key was in */	1999	/* Need to update the weight the container the key was in */
1999	if (container != op)	2000	if (container != op)
2000	esrv_update_item (UPD_WEIGHT, op, container);	2001	esrv_update_item (UPD_WEIGHT, op, container);
		2002
2001	return 1; /* Nothing more to do below */	2003	return 1; /* Nothing more to do below */
2002	}	2004	}
2003	else if (door->type == LOCKED_DOOR)	2005	else if (door->type == LOCKED_DOOR)
2004	{	2006	{
2005	/* Might as well return now - no other way to open this */	2007	/* Might as well return now - no other way to open this */
2006	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2008	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2007	return 1;	2009	return 1;
2008	}	2010	}
		2011
2009	return 0;	2012	return 0;
2010	}	2013	}
2011		2014
2012	/* This function is just part of a breakup from move_player.	2015	/* This function is just part of a breakup from move_player.
2013	* It should keep the code cleaner.	2016	* It should keep the code cleaner.
2014	* When this is called, the players direction has been updated	2017	* When this is called, the players direction has been updated
2015	* (taking into account confusion.) The player is also actually	2018	* (taking into account confusion.) The player is also actually
2016	* going to try and move (not fire weapons).	2019	* going to try and move (not fire weapons).
2017	*/	2020	*/
2018	void	2021	bool
2019	move_player_attack (object *op, int dir)	2022	move_player_attack (object *op, int dir)
2020	{	2023	{
2021	object *tmp, *mon;
2022	sint16 nx, ny;
2023	int on_battleground;	2024	int on_battleground;
2024	maptile *m;
2025		2025
2026	nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2027	ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2028		2028
2029	on_battleground = op_on_battleground (op, 0, 0);	2029	on_battleground = op_on_battleground (op, 0, 0);
		2030
		2031	if (out_of_map (op->map, nx, ny))
		2032	return false;
		2033
		2034	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2035	{
		2036	--op->speed_left;
		2037	return true;
		2038	}
2030		2039
2031	/* If braced, or can't move to the square, and it is not out of the	2040	/* 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	2041	* 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	2042	* 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	2043	* 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	2044	* 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	2045	* 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	2046	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	2047	* move_ob uses.
2039	*/	2048	*/
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);	2049	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		2050
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	2051	/* 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.	2052	* 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	2053	* if its a door or barrel (can roll) see if there may be monsters
2058	* on the space	2054	* on the space
2059	*/	2055	*/
2060	while (tmp)	2056	object *mon;
2061	{	2057	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2062	if (tmp == op)	2058	{
2063	{	2059	if ((mon->flag [FLAG_ALIVE]
2064	tmp = tmp->above;	2060	|| mon->type == LOCKED_DOOR
2065	continue;	2061	|| mon->flag [FLAG_CAN_ROLL])
2066	}
2067
2068	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2069	{
2070	mon = tmp;	2062	&& mon != op)
2071	break;	2063	break;
2072	}	2064	}
2073		2065
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 */	2066	if (!mon) /* This happens anytime the player tries to move */
2081	return; /* into a wall */	2067	return false; /* into a wall */
2082		2068
2083	if (mon->head)
2084	mon = mon->head;	2069	mon = mon->head_ ();
2085		2070
2086	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2071	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2072	if (op->contr->weapon_sp_left > 0.f)
2087	if (player_attack_door (op, mon))	2073	if (player_attack_door (op, mon))
		2074	{
		2075	--op->contr->weapon_sp_left;
2088	return;	2076	return true;
		2077	}
2089		2078
2090	/* The following deals with possibly attacking peaceful	2079	/* The following deals with possibly attacking peaceful
2091	* or frienddly creatures. Basically, all players are considered	2080	* or friendly creatures. Basically, all players are considered
2092	* unaggressive. If the moving player has peaceful set, then the	2081	* unaggressive. If the moving player has peaceful set, then the
2093	* object should be pushed instead of attacked. It is assumed that	2082	* object should be pushed instead of attacked. It is assumed that
2094	* if you are braced, you will not attack friends accidently,	2083	* if you are braced, you will not attack friends accidently,
2095	* and thus will not push them.	2084	* and thus will not push them.
2096	*/	2085	*/
2097		2086
2098	/* If the creature is a pet, push it even if the player is not	2087	/* 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	2088	* peaceful. Our assumption is the creature is a pet if the
2100	* player owns it and it is either friendly or unagressive.	2089	* player owns it and it is either friendly or unagressive.
2101	*/	2090	*/
2102	if ((op->type == PLAYER)	2091	if (op->type == PLAYER
2103	#if COZY_SERVER
2104	&&
2105	((mon->owner && mon->owner->contr	2092	&& ((mon->owner && mon->owner->contr
2106	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2093	&& same_party (mon->owner->contr->party, op->contr->party))
2107	#else
2108	&& mon->owner == op	2094	|| mon->owner == op)
2109	#endif
2110	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2111	{	2096	{
2112	/* If we're braced, we don't want to switch places with it */	2097	/* If we're braced, we don't want to switch places with it */
2113	if (op->contr->braced)	2098	if (op->contr->braced)
2114	return;	2099	return false;
		2100
		2101	if (op->speed_left > 0.f)
		2102	{
		2103	--op->speed_left;
2115		2104
2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2105	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2117	(void) push_ob (mon, dir, op);	2106	push_ob (mon, dir, op);
		2107
2118	if (op->contr->tmp_invis || op->hide)	2108	if (op->contr->tmp_invis || op->hide)
2119	make_visible (op);	2109	make_visible (op);
2120		2110
2121	return;	2111	return true;
2122	}	2112	}
		2113	else
		2114	return false;
		2115	}
2123		2116
2124	/* in certain circumstances, you shouldn't attack friendly	2117	/* in certain circumstances, you shouldn't attack friendly
2125	* creatures. Note that if you are braced, you can't push	2118	* creatures. Note that if you are braced, you can't push
2126	* someone, but put it inside this loop so that you won't	2119	* someone, but put it inside this loop so that you won't
2127	* attack them either.	2120	* attack them either.
2128	*/	2121	*/
2129	if ((mon->type == PLAYER || mon->enemy != op) &&	2122	if ((mon->type == PLAYER || mon->enemy != op)
2130	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2123	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2131	#ifdef PROHIBIT_PLAYERKILL
2132	(op->contr->peaceful	2124	&& ((op->contr->peaceful
2133	|| (mon->type == PLAYER	2125	|| (mon->type == PLAYER && mon->contr->peaceful))
2134	&& mon->contr->
2135	peaceful)) &&
2136	#else
2137	op->contr->peaceful &&
2138	#endif
2139	!on_battleground))	2126	&& !on_battleground))
		2127	{
		2128	if (op->speed_left > 0.f)
2140	{	2129	{
		2130	--op->speed_left;
		2131
2141	if (!op->contr->braced)	2132	if (!op->contr->braced)
2142	{	2133	{
2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2134	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2144	push_ob (mon, dir, op);	2135	push_ob (mon, dir, op);
2145	}	2136	}
2146	else	2137	else
2147	new_draw_info (0, 0, op, "You withhold your attack");	2138	new_draw_info (0, 0, op, "You withhold your attack");
2148		2139
2149	if (op->contr->tmp_invis || op->hide)	2140	if (op->contr->tmp_invis || op->hide)
2150	make_visible (op);	2141	make_visible (op);
2151	}
2152		2142
		2143	return true;
		2144	}
		2145	}
2153	/* If the object is a boulder or other rollable object, then	2146	/* 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.	2147	* roll it if not braced. You can't roll it if you are braced.
2155	*/	2148	*/
2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2149	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2150	{
		2151	if (op->speed_left > 0.f)
2157	{	2152	{
		2153	--op->speed_left;
		2154
2158	recursive_roll (mon, dir, op);	2155	recursive_roll (mon, dir, op);
2159	if (action_makes_visible (op))	2156	if (action_makes_visible (op))
2160	make_visible (op);	2157	make_visible (op);
2161	}
2162		2158
		2159	return true;
		2160	}
		2161	}
2163	/* Any generic living creature. Including things like doors.	2162	/* Any generic living creature. Including things like doors.
2164	* Way it works is like this: First, it must have some hit points	2163	* 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:	2164	* 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	2165	* 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.	2166	* that party_number -1 is no party, so attacks can still happen.
2168	*/	2167	*/
2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2168	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)))	2169	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2171	{	2170	{
2172		2171	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	{	2172	{
2180	op->speed_left += op->speed / op->contr->weapon_sp;	2173	--op->contr->weapon_sp_left;
2181
2182	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2183	}
2184		2174
2185	skill_attack (mon, op, 0, 0, 0);	2175	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		2176
2201	if (action_makes_visible (op))	2177	if (action_makes_visible (op))
2202	make_visible (op);	2178	make_visible (op);
2203	}
2204	} /* if player should attack something */
2205	}
2206		2179
2207	int	2180	return true;
		2181	}
		2182	}
		2183
		2184	return false;
		2185	}
		2186
		2187	bool
2208	move_player (object *op, int dir)	2188	move_player (object *op, int dir)
2209	{	2189	{
2210	int pick;	2190	int pick;
2211		2191
2212	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2192	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
…		…
2219	return 0;	2199	return 0;
2220	}	2200	}
2221		2201
2222	/* peterm: added following line */	2202	/* peterm: added following line */
2223	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2203	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2224	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2204	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2225		2205
2226	op->facing = dir;	2206	op->facing = dir;
2227		2207
2228	if (op->hide)	2208	if (op->hide)
2229	do_hidden_move (op);	2209	do_hidden_move (op);
2230		2210
		2211	bool retval;
		2212
2231	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2213	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2232	/*nop */ ;	2214	retval = RESULT_INT (0);
2233	else if (op->contr->fire_on)	2215	else if (op->contr->fire_on)
2234	fire (op, dir);	2216	retval = fire (op, dir);
2235	else	2217	else
2236	{	2218	{
2237	move_player_attack (op, dir);	2219	retval = move_player_attack (op, dir);
2238	pick = check_pick (op);	2220	pick = check_pick (op);
2239	}	2221	}
2240		2222
2241	/* Add special check for newcs players and fire on - this way, the	2223	/* Add special check for newcs players and fire on - this way, the
2242	* server can handle repeat firing.	2224	* server can handle repeat firing.
…		…
2249	/* Update how the player looks. Use the facing, so direction may	2231	/* Update how the player looks. Use the facing, so direction may
2250	* get reset to zero. This allows for full animation capabilities	2232	* get reset to zero. This allows for full animation capabilities
2251	* for players.	2233	* for players.
2252	*/	2234	*/
2253	animate_object (op, op->facing);	2235	animate_object (op, op->facing);
2254	return 0;	2236
		2237	return retval;
2255	}	2238	}
2256		2239
2257	/* This is similar to handle_player, below, but is only used by the	2240	/* This is similar to handle_player, below, but is only used by the
2258	* new client/server stuff.	2241	* new client/server stuff.
2259	* This is sort of special, in that the new client/server actually uses	2242	* This is sort of special, in that the new client/server actually uses
2260	* the new speed values for commands.	2243	* the new speed values for commands.
2261	*	2244	*
2262	* Returns true if there are more actions we can do.	2245	* Returns true if there are more actions we can do. Should not do
		2246	* many actions in a row, as that would be too unfair to other
		2247	* players.
2263	*/	2248	*/
2264	int	2249	bool
2265	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2266	{	2251	{
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))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2288	{	2253	{
2289	flee_player (op);	2254	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	{	2255	{
2293	op->speed_left--;	2256	--op->speed_left;
		2257	flee_player (op);
		2258
2294	return 0;	2259	return true;
2295	}	2260	}
		2261	else
		2262	return false;
2296	}	2263	}
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		2264
2306	/* call this here - we also will call this in do_ericserver, but	2265	/* call this here - we also will call this in do_ericserver, but
2307	* the players time has been increased when doericserver has been	2266	* the players time has been increased when doericserver has been
2308	* called, so we recheck it here.	2267	* called, so we recheck it here.
2309	*/	2268	*/
2310	if (op->contr->ns->handle_command ())	2269	if (op->contr->ns->handle_command ())
2311	return 1;	2270	return true;
2312		2271
2313	if (op->speed_left > 0)
2314	{
2315	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2272	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);	2273	return move_player (op, op->direction);
2325		2274
2326	return op->speed_left > 0;
2327	}
2328	}
2329
2330	return 0;	2275	return false;
2331	}	2276	}
2332		2277
2333	int	2278	int
2334	save_life (object *op)	2279	save_life (object *op)
2335	{	2280	{
…		…
2370	* from.	2315	* from.
2371	*/	2316	*/
2372	void	2317	void
2373	remove_unpaid_objects (object *op, object *env)	2318	remove_unpaid_objects (object *op, object *env)
2374	{	2319	{
2375	object *next;
2376
2377	while (op)	2320	while (op)
2378	{	2321	{
2379	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2322	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2380		2323
2381	if (QUERY_FLAG (op, FLAG_UNPAID))	2324	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2447	int rate_grace = 2000;	2390	int rate_grace = 2000;
2448	const int max_hp = 1;	2391	const int max_hp = 1;
2449	const int max_sp = 1;	2392	const int max_sp = 1;
2450	const int max_grace = 1;	2393	const int max_grace = 1;
2451		2394
2452	if (op->contr->outputs_sync)	2395	if (op->contr->hidden)
		2396	{
		2397	op->invisible = 1000;
		2398	/* the socket code flashes the player visible/invisible
		2399	* depending on the value of invisible, so we need to
		2400	* alternate it here for it to work correctly.
		2401	*/
		2402	if (pticks & 2)
		2403	op->invisible--;
2453	{	2404	}
2454	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2405	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2455	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2406	{
2456	flush_output_element (op, &op->contr->outputs[i]);	2407	if (!op->invisible--)
		2408	{
		2409	make_visible (op);
		2410	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2411	}
2457	}	2412	}
2458		2413
2459	if (op->contr->ns->state == ST_PLAYING)	2414	if (op->contr->ns->state == ST_PLAYING)
2460	{	2415	{
2461	/* these next three if clauses make it possible to SLOW DOWN	2416	/* these next three if clauses make it possible to SLOW DOWN
…		…
2483	gen_grace = op->stats.maxgrace;	2438	gen_grace = op->stats.maxgrace;
2484	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2439	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2485	}	2440	}
2486		2441
2487	/* Regenerate Spell Points */	2442	/* Regenerate Spell Points */
2488	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2443	if (!op->contr->golem && --op->last_sp < 0)
2489	{	2444	{
2490	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2445	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2491	if (op->stats.sp < op->stats.maxsp)	2446	if (op->stats.sp < op->stats.maxsp)
2492	{	2447	{
2493	op->stats.sp++;	2448	op->stats.sp++;
…		…
2591	}	2546	}
2592		2547
2593	/* Digestion */	2548	/* Digestion */
2594	if (--op->last_eat < 0)	2549	if (--op->last_eat < 0)
2595	{	2550	{
2596	#ifdef COZY_SERVER
2597	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2598	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2599	#else
2600	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2551	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2601	#endif
2602		2552
2603	if (op->contr->gen_hp > 0)	2553	if (op->contr->gen_hp > 0)
2604	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2554	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2605	else	2555	else
2606	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2556	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2711	tmp->name = buf;	2661	tmp->name = buf;
2712	sprintf (buf, " This finger has been cut off %s\n"	2662	sprintf (buf, " This finger has been cut off %s\n"
2713	" the %s, when he was defeated at\n level %d by %s.\n",	2663	" the %s, when he was defeated at\n level %d by %s.\n",
2714	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2664	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2715	tmp->msg = buf;	2665	tmp->msg = buf;
2716	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2666	tmp->value = 0, tmp->type = 0;
2717	tmp->materialname = NULL;	2667	tmp->materialname = "organics";
2718	tmp->insert_at (op, tmp);	2668	tmp->insert_at (op, tmp);
2719	}	2669	}
2720		2670
2721	/* teleport defeated player to new destination */	2671	/* teleport defeated player to new destination */
2722	transfer_ob (op, x, y, 0, NULL);	2672	transfer_ob (op, x, y, 0, NULL);
…		…
2918	op->stats.hp = op->stats.maxhp;	2868	op->stats.hp = op->stats.maxhp;
2919	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2869	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2920	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2870	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2921		2871
2922	/*	2872	/*
2923	* Check to see if the player is in a shop. IF so, then check to see if
2924	* the player has any unpaid items. If so, remove them and put them back	2873	* Check to see if the player has any unpaid items. If so, remove them
2925	* in the map.	2874	* and put them back in the map.
2926	*/	2875	*/
2927
2928	if (is_in_shop (op))
2929	remove_unpaid_objects (op->inv, op);	2876	remove_unpaid_objects (op->inv, op);
2930		2877
2931	/****************************************/	2878	/****************************************/
2932	/* */	2879	/* */
2933	/* Move player to his current respawn- */	2880	/* Move player to his current respawn- */
2934	/* position (usually last savebed) */	2881	/* position (usually last savebed) */
…		…
2954	object *force;	2901	object *force;
2955	int at;	2902	int at;
2956		2903
2957	force = get_archetype (FORCE_NAME);	2904	force = get_archetype (FORCE_NAME);
2958	/* 50 ticks should be enough time for the spell to abate */	2905	/* 50 ticks should be enough time for the spell to abate */
2959	force->speed = 0.1;	2906	force->speed = 0.1f;
2960	force->speed_left = -5.0;	2907	force->speed_left = -5.f;
2961	SET_FLAG (force, FLAG_APPLIED);	2908	SET_FLAG (force, FLAG_APPLIED);
2962	for (at = 0; at < NROFATTACKS; at++)	2909	for (at = 0; at < NROFATTACKS; at++)
2963	if (will_kill_again & (1 << at))	2910	if (will_kill_again & (1 << at))
2964	force->resist[at] = 100;	2911	force->resist[at] = 100;
2965		2912
…		…
2974	void	2921	void
2975	loot_object (object *op)	2922	loot_object (object *op)
2976	{ /* Grab and destroy some treasure */	2923	{ /* Grab and destroy some treasure */
2977	object *tmp, *tmp2, *next;	2924	object *tmp, *tmp2, *next;
2978		2925
2979	if (op->container)	2926	op->close_container (); /* close open sack first */
2980	esrv_apply_container (op, op->container); /* close open sack first */
2981		2927
2982	for (tmp = op->inv; tmp; tmp = next)	2928	for (tmp = op->inv; tmp; tmp = next)
2983	{	2929	{
2984	next = tmp->below;	2930	next = tmp->below;
2985		2931
2986	if (tmp->invisible)	2932	if (tmp->invisible)
2987	continue;	2933	continue;
2988		2934
2989	tmp->remove ();	2935	tmp->remove ();
2990	tmp->x = op->x, tmp->y = op->y;	2936	tmp->x = op->x, tmp->y = op->y;
		2937
2991	if (tmp->type == CONTAINER)	2938	if (tmp->type == CONTAINER)
2992	{ /* empty container to ground */	2939	loot_object (tmp); /* empty container to ground */
2993	loot_object (tmp);	2940
2994	}
2995	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2941	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2996	{	2942	{
2997	if (tmp->nrof > 1)	2943	if (tmp->nrof > 1)
2998	{	2944	{
2999	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2945	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3000	tmp2->destroy ();	2946	tmp2->destroy ();
…		…
3011	/*	2957	/*
3012	* fix_weight(): Check recursively the weight of all players, and fix	2958	* fix_weight(): Check recursively the weight of all players, and fix
3013	* what needs to be fixed. Refresh windows and fix speed if anything	2959	* what needs to be fixed. Refresh windows and fix speed if anything
3014	* was changed.	2960	* was changed.
3015	*/	2961	*/
3016
3017	void	2962	void
3018	fix_weight (void)	2963	fix_weight (void)
3019	{	2964	{
3020	for_all_players (pl)	2965	for_all_players (pl)
3021	{	2966	{
…		…
3081	if (op->type == PLAYER)	3026	if (op->type == PLAYER)
3082	{	3027	{
3083	op->contr->tmp_invis = 0;	3028	op->contr->tmp_invis = 0;
3084	op->contr->invis_race = 0;	3029	op->contr->invis_race = 0;
3085	}	3030	}
		3031
3086	update_object (op, UP_OBJ_FACE);	3032	update_object (op, UP_OBJ_CHANGE);
3087	}	3033	}
3088		3034
3089	int	3035	int
3090	is_true_undead (object *op)	3036	is_true_undead (object *op)
3091	{	3037	{
3092	object *tmp = NULL;
3093
3094	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3038	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3095	return 1;	3039	return 1;
3096		3040
3097	return 0;	3041	return 0;
3098	}	3042	}
…		…
3143	/* For Hidden creatures - a chance of becoming 'unhidden'	3087	/* For Hidden creatures - a chance of becoming 'unhidden'
3144	* every time they move - as we subtract off 'invisibility'	3088	* every time they move - as we subtract off 'invisibility'
3145	* AND, for players, if they move into a ridiculously unhideable	3089	* AND, for players, if they move into a ridiculously unhideable
3146	* spot (surrounded by clear terrain in broad daylight). -b.t.	3090	* spot (surrounded by clear terrain in broad daylight). -b.t.
3147	*/	3091	*/
3148
3149	void	3092	void
3150	do_hidden_move (object *op)	3093	do_hidden_move (object *op)
3151	{	3094	{
3152	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3095	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3153	object *skop;	3096	object *skop;
…		…
3386	char buf[MAX_BUF]; /* tmp. string buffer */	3329	char buf[MAX_BUF]; /* tmp. string buffer */
3387	int i = 0, j = 0;	3330	int i = 0, j = 0;
3388		3331
3389	/* get the appropriate treasurelist */	3332	/* get the appropriate treasurelist */
3390	if (atnr == ATNR_FIRE)	3333	if (atnr == ATNR_FIRE)
3391	trlist = find_treasurelist ("dragon_ability_fire");	3334	trlist = treasurelist::find ("dragon_ability_fire");
3392	else if (atnr == ATNR_COLD)	3335	else if (atnr == ATNR_COLD)
3393	trlist = find_treasurelist ("dragon_ability_cold");	3336	trlist = treasurelist::find ("dragon_ability_cold");
3394	else if (atnr == ATNR_ELECTRICITY)	3337	else if (atnr == ATNR_ELECTRICITY)
3395	trlist = find_treasurelist ("dragon_ability_elec");	3338	trlist = treasurelist::find ("dragon_ability_elec");
3396	else if (atnr == ATNR_POISON)	3339	else if (atnr == ATNR_POISON)
3397	trlist = find_treasurelist ("dragon_ability_poison");	3340	trlist = treasurelist::find ("dragon_ability_poison");
3398		3341
3399	if (trlist == NULL || who->type != PLAYER)	3342	if (trlist == NULL || who->type != PLAYER)
3400	return;	3343	return;
3401		3344
3402	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3345	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3534	* not readied.	3477	* not readied.
3535	*/	3478	*/
3536	void	3479	void
3537	player_unready_range_ob (player *pl, object *ob)	3480	player_unready_range_ob (player *pl, object *ob)
3538	{	3481	{
3539	rangetype i;	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
3540		3484
3541	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3485	if (pl->combat_ob == ob)
3542	{	3486	pl->combat_ob = 0;
		3487
3543	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3544	{	3489	pl->ranged_ob = 0;
3545	pl->ranges[i] = NULL;
3546	if (pl->shoottype == i)
3547	{
3548	pl->shoottype = range_none;
3549	}
3550	}
3551	}
3552	}	3490	}
		3491
		3492	sint8
		3493	player::visibility_at (maptile *map, int x, int y) const
		3494	{
		3495	if (!ns)
		3496	return 0;
		3497
		3498	int dx, dy;
		3499	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3500	return 0;
		3501
		3502	x += dx - ns->current_x + ns->mapx / 2;
		3503	y += dy - ns->current_y + ns->mapy / 2;
		3504
		3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3506	return 0;
		3507
		3508	return 100 - blocked_los [x][y];
		3509	}

Diff Legend

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