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