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.86 by root, Thu Jan 4 19:28:38 2007 UTC vs.
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	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>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32		32
33	#include <algorithm>	33	#include <algorithm>
34	#include <functional>	34	#include <functional>
35		35
36	player *	36	playervec players;
37	find_player (const char *plname)
38	{
39	for_all_players (pl)
40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
41	return pl;
42
43	return 0;
44	}
45		37
46	void	38	void
47	display_motd (const object *op)	39	display_motd (const object *op)
48	{	40	{
49	char buf[MAX_BUF];	41	char buf[MAX_BUF];
…		…
123		115
124	news[0] = '\0';	116	news[0] = '\0';
125	subject[0] = '\0';	117	subject[0] = '\0';
126	size = 0;	118	size = 0;
127		119
128	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
129	{	121	{
130	if (*buf == '#')	122	if (*buf == '#')
131	continue;	123	continue;
132		124
133	if (*buf == '%')	125	if (*buf == '%')
134	{ /* send one news */	126	{ /* send one news */
135	if (size > 0)	127	if (size > 0)
136	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 */
		129
137	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
138	strip_endline (subject);	131	strip_endline (subject);
139	size = 0;	132	size = 0;
140	news[0] = '\0';	133	news[0] = '\0';
141	}	134	}
…		…
150	size += strlen (buf);	143	size += strlen (buf);
151	}	144	}
152	}	145	}
153		146
154	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155	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);
156	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
		150	}
		151
		152	float
		153	player::weapon_speed () const
		154	{
		155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
157	}	156	}
158		157
159	/* This loads the first map an puts the player on it. */	158	/* This loads the first map an puts the player on it. */
160	static void	159	static void
161	set_first_map (object *op)	160	set_first_map (object *op)
…		…
176	ob->enter_exit (tmp);	175	ob->enter_exit (tmp);
177		176
178	tmp->destroy ();	177	tmp->destroy ();
179	}	178	}
180		179
		180	void
		181	player::activate ()
		182	{
		183	if (active)
		184	return;
		185
		186	players.insert (this);
		187	ob->remove ();
		188	ob->map = 0;
		189	ob->activate_recursive ();
		190	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		191	add_friendly_object (ob);
		192	enter_map ();
		193	}
		194
		195	void
		196	player::deactivate ()
		197	{
		198	if (!active)
		199	return;
		200
		201	terminate_all_pets (ob);
		202	remove_friendly_object (ob);
		203	ob->deactivate_recursive ();
		204
		205	if (ob->map)
		206	maplevel = ob->map->path;
		207
		208	ob->remove ();
		209	ob->map = 0;
		210	party = 0;
		211
		212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		213
		214	players.erase (this);
		215	}
		216
181	// connect the player with a specific client	217	// connect the player with a specific client
182	// also changed, rationalises, and fixes some incorrect settings	218	// also changes, rationalises, and fixes some incorrect settings
183	void	219	void
184	player::connect (client *ns)	220	player::connect (client *ns)
185	{	221	{
186	this->ns = ns;	222	this->ns = ns;
187	ns->pl = this;	223	ns->pl = this;
188		224
189	next = first_player;	225	run_on = 0;
190	first_player = this;	226	fire_on = 0;
		227	ob->close_container (); //TODO: client-specific
191		228
192	ns->update_look = 0;	229	ns->update_look = 0;
193	ns->look_position = 0;	230	ns->look_position = 0;
194		231
195	clear_los (ob);	232	clear_los (ob);
		233
		234	ns->reset_stats ();
196		235
197	/* make sure he's a player -- needed because of class change. */	236	/* make sure he's a player -- needed because of class change. */
198	ob->type = PLAYER; // we are paranoid	237	ob->type = PLAYER; // we are paranoid
199	ob->race = ob->arch->clone.race;	238	ob->race = ob->arch->clone.race;
200		239
201	if (!legal_range (ob, shoottype))
202	shoottype = range_none;
203
204	ob->carrying = sum_weight (ob);	240	ob->carrying = sum_weight (ob);
205	link_player_skills (ob);	241	link_player_skills (ob);
206		242
207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208		244
209	assign (title, ob->arch->clone.name);	245	assign (title, ob->arch->clone.name);
210
211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
212	* from the class, and not race. I don't see any way to get the class information
213	* to then update this. I don't think this will actually break anything - anyone
214	* that can use armour should be able to use a shield. What this may 'break'
215	* are features new characters get, eg, if someone starts up with a Q, they
216	* should be able to use a shield. However, old Q's won't get that advantage.
217	*/
218	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219	SET_FLAG (ob, FLAG_USE_SHIELD);
220		246
221	/* if it's a dragon player, set the correct title here */	247	/* if it's a dragon player, set the correct title here */
222	if (is_dragon_pl (ob))	248	if (is_dragon_pl (ob))
223	{	249	{
224	object *tmp, *abil = 0, *skin = 0;	250	object *tmp, *abil = 0, *skin = 0;
…		…
234	skin = tmp;	260	skin = tmp;
235		261
236	set_dragon_name (ob, abil, skin);	262	set_dragon_name (ob, abil, skin);
237	}	263	}
238		264
239	CLEAR_FLAG (ob, FLAG_FRIENDLY);
240	add_friendly_object (ob);
241
242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		266
246	esrv_new_player (this, ob->weight + ob->carrying);	267	esrv_new_player (this, ob->weight + ob->carrying);
		268
		269	for (object *op = ob->inv; op; op = op->below)
		270	if (op->flag [FLAG_APPLIED])
		271	switch (op->type)
		272	{
		273	case WAND:
		274	case ROD:
		275	case HORN:
		276	case BOW:
		277	case SKILL:
		278	case SKILL_TOOL:
		279	case WEAPON:
		280	apply_special (ob, op, AP_UNAPPLY);
		281	apply_special (ob, op, AP_APPLY);
		282	break;
		283	}
247		284
248	ob->update_stats ();	285	ob->update_stats ();
249	ns->floorbox_update ();	286	ns->floorbox_update ();
250		287
251	esrv_send_inventory (ob, ob);	288	esrv_send_inventory (ob, ob);
252	esrv_add_spells (this, 0);	289	esrv_add_spells (this, 0);
253		290
254	ob->activate_recursive ();	291	activate ();
255	enter_map ();
256		292
257	send_rules (ob);	293	send_rules (ob);
258	send_news (ob);	294	send_news (ob);
259	display_motd (ob);	295	display_motd (ob);
260		296
…		…
263	}	299	}
264		300
265	void	301	void
266	player::disconnect ()	302	player::disconnect ()
267	{	303	{
		304	if (ns)
		305	{
		306	if (active)
		307	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		308
		309	INVOKE_PLAYER (DISCONNECT, this);
		310
		311	ns->reset_stats ();
		312	ns->pl = 0;
		313	ns = 0;
		314	}
		315
268	if (ob)	316	if (ob)
269	ob->deactivate_recursive ();	317	ob->close_container (); //TODO: client-specific
270		318
271	//TODO: don't be so harsh and destroy :)	319	deactivate ();
272	if (ns)
273	{
274	if (enable_save)
275	{
276	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277	save (true);
278	}
279
280	INVOKE_PLAYER (DISCONNECT, this);
281
282	client *ns = this->ns;
283	ns->send_packet ("goodbye");
284	ns->flush ();
285	ns->pl = 0;
286	this->ns = 0;
287
288	ns->destroy ();
289	destroy ();
290	}
291	}	320	}
292		321
293	// the need for this function can be explained	322	// the need for this function can be explained
294	// by load_object not returning the object	323	// by load_object not returning the object
295	void	324	void
296	player::set_object (object *op)	325	player::set_object (object *op)
297	{	326	{
298	ob = op;	327	ob = op;
299	ob->contr = this; /* this aren't yet in archetype */	328	ob->contr = this; /* this aren't yet in archetype */
300		329
301	ob->speed_left = 0.5;	330	ob->speed_left = 0.5f;
302	ob->speed = 1.0;	331	ob->speed = 1.0f;
303	ob->direction = 5; /* So player faces south */	332	ob->direction = 5; /* So player faces south */
304	ob->stats.wc = 2;
305	ob->run_away = 25; /* Then we panick... */
306
307	ob->roll_stats ();
308	}	333	}
309		334
310	player::player ()	335	player::player ()
311	{	336	{
312	/* There are some elements we want initialised to non zero value -	337	/* There are some elements we want initialised to non zero value -
313	* we deal with that below this point.	338	* we deal with that below this point.
314	*/	339	*/
315	outputs_sync = 16; /* Every 2 seconds */	340	outputs_sync = 4;
316	outputs_count = 8; /* Keeps present behaviour */	341	outputs_count = 4;
317	unapply = unapply_nochoice;	342	unapply = unapply_nochoice;
318		343
319	savebed_map = first_map_path; /* Init. respawn position */	344	savebed_map = first_map_path; /* Init. respawn position */
320		345
321	gen_sp_armour = 10;	346	gen_sp_armour = 10;
322	last_speed = -1;
323	shoottype = range_none;
324	bowtype = bow_normal;	347	bowtype = bow_normal;
325	petmode = pet_normal;	348	petmode = pet_normal;
326	listening = 10;	349	listening = 10;
327	usekeys = containers;	350	usekeys = containers;
328	last_weapon_sp = -1;
329	peaceful = 1; /* default peaceful */	351	peaceful = 1; /* default peaceful */
330	do_los = 1;	352	do_los = 1;
331
332	/* we need to clear these to -1 and not zero - otherwise,
333	* if a player quits and starts a new character, we wont
334	* send new values to the client, as things like exp start
335	* at zero.
336	*/
337	for (int i = 0; i < NUM_SKILLS; i++)
338	last_skill_exp[i] = -1;
339
340	for (int i = 0; i < NROFATTACKS; i++)
341	last_resist[i] = -1;
342
343	last_stats.exp = -1;
344	last_weight = (uint32) - 1;
345	}	353	}
346		354
347	void	355	void
348	player::do_destroy ()	356	player::do_destroy ()
349	{	357	{
350	disconnect ();	358	disconnect ();
351		359
352	save (false);
353	enable_save = false;
354
355	attachable::do_destroy ();	360	attachable::do_destroy ();
356
357	terminate_all_pets (ob);
358
359	if (first_player != this)
360	{
361	player *prev = first_player;
362
363	while (prev && prev->next && prev->next != this)
364	prev = prev->next;
365
366	if (prev->next != this)
367	{
368	LOG (llevError, "Free_player: Can't find previous player.\n");
369	abort ();
370	}
371
372	prev->next = next;
373	}
374	else
375	first_player = next;
376		361
377	if (ob)	362	if (ob)
378	{	363	{
379	ob->destroy_inv (false);	364	ob->destroy_inv (false);
380	ob->destroy ();	365	ob->destroy ();
…		…
395	player::create ()	380	player::create ()
396	{	381	{
397	player *pl = new player;	382	player *pl = new player;
398		383
399	pl->set_object (arch_to_object (get_player_archetype (0)));	384	pl->set_object (arch_to_object (get_player_archetype (0)));
		385
		386	pl->ob->roll_stats ();
		387	pl->ob->stats.wc = 2;
		388	pl->ob->run_away = 25; /* Then we panick... */
		389
400	set_first_map (pl->ob);	390	set_first_map (pl->ob);
401		391
402	return pl;	392	return pl;
403	}	393	}
404		394
…		…
436	object *op = NULL;	426	object *op = NULL;
437	objectlink *ol;	427	objectlink *ol;
438	unsigned lastdist;	428	unsigned lastdist;
439	rv_vector rv;	429	rv_vector rv;
440		430
441	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	431	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442	{	432	{
443	/* We should not find free objects on this friendly list, but it	433	/* We should not find free objects on this friendly list, but it
444	* does periodically happen. Given that, lets deal with it.	434	* does periodically happen. Given that, lets deal with it.
445	* While unlikely, it is possible the next object on the friendly	435	* While unlikely, it is possible the next object on the friendly
446	* list is also free, so encapsulate this in a while loop.	436	* list is also free, so encapsulate this in a while loop.
…		…
450	object *tmp = ol->ob;	440	object *tmp = ol->ob;
451		441
452	/* Can't do much more other than log the fact, because the object	442	/* Can't do much more other than log the fact, because the object
453	* itself will have been cleared.	443	* itself will have been cleared.
454	*/	444	*/
455	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	445	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		446	tmp->debug_desc ());
456	ol = ol->next;	447	ol = ol->next;
457	remove_friendly_object (tmp);	448	remove_friendly_object (tmp);
458	if (!ol)	449	if (!ol)
459	return op;	450	return op;
460	}	451	}
…		…
549	x = mon->x;	540	x = mon->x;
550	y = mon->y;	541	y = mon->y;
551	m = mon->map;	542	m = mon->map;
552	dir = rv.direction;	543	dir = rv.direction;
553	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	544	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
554	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	545	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		546
555	/* If we can't solve it within the search distance, return now. */	547	/* If we can't solve it within the search distance, return now. */
556	if (diff > max)	548	if (diff > max)
557	return 0;	549	return 0;
		550
558	while (diff > 1 && max > 0)	551	while (diff > 1 && max > 0)
559	{	552	{
560	lastx = x;	553	lastx = x;
561	lasty = y;	554	lasty = y;
562	lastmap = m;	555	lastmap = m;
…		…
644	max--;	637	max--;
645	lastdir = dir;	638	lastdir = dir;
646	if (!firstdir)	639	if (!firstdir)
647	firstdir = dir;	640	firstdir = dir;
648	}	641	}
		642
649	if (diff <= 1)	643	if (diff <= 1)
650	{	644	{
651	/* Recalculate diff (distance) because we may not have actually	645	/* Recalculate diff (distance) because we may not have actually
652	* headed toward player for entire distance.	646	* headed toward player for entire distance.
653	*/	647	*/
654	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	648	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	649	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
656	}	650	}
		651
657	if (diff > max)	652	if (diff > max)
658	return 0;	653	return 0;
659	}	654	}
		655
660	/* If we reached the max, didn't find a direction in time */	656	/* If we reached the max, didn't find a direction in time */
661	if (!max)	657	if (!max)
662	return 0;	658	return 0;
663		659
664	return firstdir;	660	return firstdir;
…		…
778	roll_stat (void)	774	roll_stat (void)
779	{	775	{
780	int a[4], i, j, k;	776	int a[4], i, j, k;
781		777
782	for (i = 0; i < 4; i++)	778	for (i = 0; i < 4; i++)
783	a[i] = (int) RANDOM () % 6 + 1;	779	a[i] = (int) rndm (6) + 1;
784		780
785	for (i = 0, j = 0, k = 7; i < 4; i++)	781	for (i = 0, j = 0, k = 7; i < 4; i++)
786	if (a[i] < k)	782	if (a[i] < k)
787	k = a[i], j = i;	783	k = a[i], j = i;
788		784
…		…
794	}	790	}
795		791
796	void	792	void
797	object::roll_stats ()	793	object::roll_stats ()
798	{	794	{
799	int statsort [7];	795	int statsort [NUM_STATS];
800		796
801	for (;;)	797	for (;;)
802	{	798	{
803	int sum = 0;	799	int sum = 0;
804	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
805	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
806		802
807	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
808	break;	804	break;
809	}	805	}
810		806
811	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
812	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813		809
		810	for (int i = 0; i < NUM_STATS; ++i)
814	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
815	stats.Dex = statsort[1];
816	stats.Con = statsort[2];
817	stats.Int = statsort[3];
818	stats.Wis = statsort[4];
819	stats.Pow = statsort[5];
820	stats.Cha = statsort[6];
821		812
822	stats.exp = 0;	813	stats.exp = 0;
823	stats.ac = 0;	814	stats.ac = 0;
824		815
825	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
837	}	828	}
838		829
839	void	830	void
840	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
841	{	832	{
842	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844	set_attr_value (&contr->orig_stats, b, tmp);
845		834
		835	for (int i = 0; i < NUM_STATS; ++i)
846	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
847	stats.Dex = contr->orig_stats.Dex;
848	stats.Con = contr->orig_stats.Con;
849	stats.Int = contr->orig_stats.Int;
850	stats.Wis = contr->orig_stats.Wis;
851	stats.Pow = contr->orig_stats.Pow;
852	stats.Cha = contr->orig_stats.Cha;
853		837
854	//TODO: the following code looks so borked and should, at the very least,	838	//TODO: the following code looks so borked and should, at the very least,
855	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
856	stats.ac = 0;	840	stats.ac = 0;
857		841
…		…
888	* appropriate action with it (change race, or other things).	872	* appropriate action with it (change race, or other things).
889	* The function name is for historical reasons - now we have	873	* The function name is for historical reasons - now we have
890	* separate race and class; this actually changes the RACE,	874	* separate race and class; this actually changes the RACE,
891	* not the class.	875	* not the class.
892	*/	876	*/
893	int	877	void
894	key_change_class (object *op, char key)	878	player::chargen_race_done ()
895	{	879	{
896	int tmp_loop;
897
898	if (key == 'd' || key == 'D')
899	{
900	char buf[MAX_BUF];
901
902	/* this must before then initial items are given */	880	/* this must before then initial items are given */
903	esrv_new_player (op->contr, op->weight + op->carrying);	881	esrv_new_player (ob->contr, ob->weight + ob->carrying);
904		882
905	treasurelist *tl = find_treasurelist ("starting_wealth");	883	treasurelist *tl = treasurelist::find ("starting_wealth");
906	if (tl)	884	if (tl)
907	create_treasure (tl, op, 0, 0, 0);	885	create_treasure (tl, ob, 0, 0, 0);
908		886
909	INVOKE_PLAYER (BIRTH, op->contr);	887	INVOKE_PLAYER (BIRTH, ob->contr);
910	INVOKE_PLAYER (LOGIN, op->contr);	888	INVOKE_PLAYER (LOGIN, ob->contr);
911		889
912	op->contr->ns->state = ST_PLAYING;	890	ob->contr->ns->state = ST_PLAYING;
913		891
914	if (op->msg)	892	if (ob->msg)
915	op->msg = NULL;	893	ob->msg = 0;
916		894
917	/* We create this now because some of the unique maps will need it	895	/* We create this now because some of the unique maps will need it
918	* to save here.	896	* to save here.
919	*/	897	*/
		898	{
		899	char buf[MAX_BUF];
920	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	900	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921	make_path_to_file (buf);	901	make_path_to_file (buf);
		902	}
922		903
923	#ifdef AUTOSAVE
924	op->contr->last_save_tick = pticks;
925	#endif
926	start_info (op);	904	start_info (ob);
927	CLEAR_FLAG (op, FLAG_WIZ);	905	CLEAR_FLAG (ob, FLAG_WIZ);
928	give_initial_items (op, op->randomitems);	906	give_initial_items (ob, ob->randomitems);
929	link_player_skills (op);	907	link_player_skills (ob);
930	esrv_send_inventory (op, op);	908	esrv_send_inventory (ob, ob);
931	op->update_stats ();	909	ob->update_stats ();
932		910
933	/* This moves the player to a different start map, if there	911	/* This moves the player to a different start map, if there
934	* is one for this race	912	* is one for this race
935	*/	913	*/
936	if (*first_map_ext_path)	914	if (*first_map_ext_path)
937	{	915	{
938	object *tmp;	916	object *tmp;
939	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
940		918
941	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
942	tmp = object::create ();	920	tmp = object::create ();
943	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
944	EXIT_X (tmp) = op->x;	922	EXIT_X (tmp) = ob->x;
945	EXIT_Y (tmp) = op->y;	923	EXIT_Y (tmp) = ob->y;
946	op->enter_exit (tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
947	* if the map isn't there, then stay on the	925	* if the map isn't there, then stay on the
948	* default initial map */	926	* default initial map */
949	tmp->destroy ();	927	tmp->destroy ();
950	}	928	}
951	else	929	else
952	LOG (llevDebug, "first_map_ext_path not set\n");	930	LOG (llevDebug, "first_map_ext_path not set\n");
		931	}
953		932
954	return 0;	933	void
955	}	934	player::chargen_race_next ()
956		935	{
957	/* Following actually changes the race - this is the default command	936	/* Following actually changes the race - this is the default command
958	* if we don't match with one of the options above.	937	* if we don't match with one of the options above.
959	*/	938	*/
960		939
961	tmp_loop = 0;	940	do
962	while (!tmp_loop)
963	{	941	{
964	shstr name = op->name;	942	shstr name = ob->name;
965	int x = op->x, y = op->y;	943	int x = ob->x, y = ob->y;
966		944
967	op->remove_statbonus ();	945	ob->remove_statbonus ();
968	op->remove ();	946	ob->remove ();
969	op->arch = get_player_archetype (op->arch);	947	ob->arch = get_player_archetype (ob->arch);
970	op->arch->clone.copy_to (op);	948	ob->arch->clone.copy_to (ob);
971	op->instantiate ();	949	ob->instantiate ();
972	op->stats = op->contr->orig_stats;	950	ob->stats = ob->contr->orig_stats;
973	op->name = op->name_pl = name;	951	ob->name = ob->name_pl = name;
974	op->x = x;	952	ob->x = x;
975	op->y = y;	953	ob->y = y;
976	SET_ANIMATION (op, 2); /* So player faces south */	954	SET_ANIMATION (ob, 2); /* So player faces south */
977	insert_ob_in_map (op, op->map, op, 0);	955	insert_ob_in_map (ob, ob->map, ob, 0);
978	assign (op->contr->title, op->arch->clone.name);	956	assign (ob->contr->title, ob->arch->clone.name);
979	op->add_statbonus ();	957	ob->add_statbonus ();
980	tmp_loop = allowed_class (op);
981	}	958	}
		959	while (!allowed_class (ob));
982		960
983	update_object (op, UP_OBJ_FACE);	961	update_object (ob, UP_OBJ_FACE);
984	esrv_update_item (UPD_FACE, op, op);	962	esrv_update_item (UPD_FACE, ob, ob);
985	op->update_stats ();	963	ob->update_stats ();
986	op->stats.hp = op->stats.maxhp;	964	ob->stats.hp = ob->stats.maxhp;
987	op->stats.sp = op->stats.maxsp;	965	ob->stats.sp = ob->stats.maxsp;
988	op->stats.grace = 0;	966	ob->stats.grace = 0;
989
990	if (op->msg)
991	new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994	return 0;
995	}
996
997	int
998	key_confirm_quit (object *op, char key)
999	{
1000	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001	{
1002	op->contr->ns->state = ST_PLAYING;
1003	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004	return 1;
1005	}
1006
1007	INVOKE_PLAYER (LOGOUT, op->contr);
1008	INVOKE_PLAYER (QUIT, op->contr);
1009
1010	op->contr->enable_save = false;
1011	delete_character (op->name);
1012
1013	terminate_all_pets (op);
1014	op->remove ();
1015	op->direction = 0;
1016	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1017
1018	strcpy (op->contr->killer, "quit");
1019	check_score (op);
1020	op->contr->party = 0;
1021	op->contr->own_title[0] = '\0';
1022	op->contr->destroy ();
1023
1024	return 1;
1025	}	967	}
1026		968
1027	void	969	void
1028	flee_player (object *op)	970	flee_player (object *op)
1029	{	971	{
…		…
1076	/* Cornered, get rid of scared */	1018	/* Cornered, get rid of scared */
1077	CLEAR_FLAG (op, FLAG_SCARED);	1019	CLEAR_FLAG (op, FLAG_SCARED);
1078	op->enemy = NULL;	1020	op->enemy = NULL;
1079	}	1021	}
1080		1022
1081
1082	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1023	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1083	* IT returns 1 if the player should keep on moving, 0 if he should	1024	* It returns 1 if the player should keep on moving, 0 if he should
1084	* stop.	1025	* stop.
1085	*/	1026	*/
1086	int	1027	int
1087	check_pick (object *op)	1028	check_pick (object *op)
1088	{	1029	{
1089	object *tmp, *next;	1030	object *tmp, *next;
1090	int stop = 0;	1031	int stop = 0;
1091	int j, k, wvratio;	1032	int wvratio;
1092	char putstring[128], tmpstr[16];	1033	char putstring[128];
1093		1034
1094	/* if you're flying, you cna't pick up anything */	1035	/* if you're flying, you cna't pick up anything */
1095	if (op->move_type & MOVE_FLYING)	1036	if (op->move_type & MOVE_FLYING)
1096	return 1;	1037	return 1;
1097		1038
…		…
1434	* found object is returned.	1375	* found object is returned.
1435	*/	1376	*/
1436	object *	1377	object *
1437	find_arrow (object *op, const char *type)	1378	find_arrow (object *op, const char *type)
1438	{	1379	{
1439	object *tmp = NULL;	1380	object *tmp = 0;
1440		1381
1441	for (op = op->inv; op; op = op->below)	1382	for (op = op->inv; op; op = op->below)
1442	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1383	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1443	tmp = find_arrow (op, type);	1384	tmp = find_arrow (op, type);
1444	else if (op->type == ARROW && op->race == type)	1385	else if (op->type == ARROW && op->race == type)
1445	return op;	1386	return op;
		1387
1446	return tmp;	1388	return tmp;
1447	}	1389	}
1448		1390
1449	/*	1391	/*
1450	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1392	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1451	* against the target. A full test is not performed, simply a basic test	1393	* against the target. A full test is not performed, simply a basic test
1452	* of resistances. The archer is making a quick guess at what he sees down	1394	* of resistances. The archer is making a quick guess at what he sees down
1453	* the hall. Failing that it does it's best to pick the highest plus arrow.	1395	* the hall. Failing that it does it's best to pick the highest plus arrow.
1454	*/	1396	*/
1455
1456	object *	1397	object *
1457	find_better_arrow (object *op, object *target, const char *type, int *better)	1398	find_better_arrow (object *op, object *target, const char *type, int *better)
1458	{	1399	{
1459	object *tmp = NULL, *arrow, *ntmp;	1400	object *tmp = NULL, *arrow, *ntmp;
1460	int attacknum, attacktype, betterby = 0, i;	1401	int attacknum, attacktype, betterby = 0, i;
…		…
1526	* find_better_arrow to find a decent arrow to use.	1467	* find_better_arrow to find a decent arrow to use.
1527	* op = the shooter	1468	* op = the shooter
1528	* type = bow->race	1469	* type = bow->race
1529	* dir = fire direction	1470	* dir = fire direction
1530	*/	1471	*/
1531
1532	object *	1472	object *
1533	pick_arrow_target (object *op, const char *type, int dir)	1473	pick_arrow_target (object *op, const char *type, int dir)
1534	{	1474	{
1535	object *tmp = NULL;	1475	object *tmp = NULL;
1536	maptile *m;	1476	maptile *m;
…		…
1601	*/	1541	*/
1602	int	1542	int
1603	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1543	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1604	{	1544	{
1605	object *left, *bow;	1545	object *left, *bow;
1606	int bowspeed, mflags;	1546	int mflags;
1607	maptile *m;	1547	maptile *m;
1608		1548
1609	if (!dir)	1549	if (!dir)
1610	{	1550	{
1611	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1612	return 0;	1552	return 0;
1613	}	1553	}
1614		1554
1615	if (op->type == PLAYER)	1555	if (op->contr)
1616	bow = op->contr->ranges[range_bow];	1556	bow = op->current_weapon;
1617	else	1557	else
1618	{	1558	{
1619	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1620	/* Don't check for applied - monsters don't apply bows - in that way, they	1560	/* Don't check for applied - monsters don't apply bows - in that way, they
1621	* don't need to switch back and forth between bows and weapons.	1561	* don't need to switch back and forth between bows and weapons.
…		…
1626	if (!bow)	1566	if (!bow)
1627	{	1567	{
1628	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1568	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1629	return 0;	1569	return 0;
1630	}	1570	}
		1571
		1572	// optimisation: move object to top so we will find it quickly again
		1573	if (bow->below)
		1574	{
		1575	bow->remove ();
		1576	op->insert (bow);
		1577	}
		1578
1631	}	1579	}
1632		1580
1633	if (!bow->race || !bow->skill)	1581	if (!bow->race || !bow->skill)
1634	{	1582	{
1635	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1636	return 0;	1584	return 0;
1637	}	1585	}
1638
1639	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1640
1641	/* penalize ROF for bestarrow */
1642	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1643	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1644
1645	if (bowspeed < 1)
1646	bowspeed = 1;
1647		1586
1648	if (arrow == NULL)	1587	if (arrow == NULL)
1649	{	1588	{
1650	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1651	{	1590	{
1652	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
1653	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1654	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1593	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1655	else	1594	else
1656	CLEAR_FLAG (op, FLAG_READY_BOW);	1595	CLEAR_FLAG (op, FLAG_READY_BOW);
		1596
1657	return 0;	1597	return 0;
1658	}	1598	}
1659	}	1599	}
1660		1600
1661	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1601	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1685		1625
1686	arrow->set_owner (op);	1626	arrow->set_owner (op);
1687	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1688	arrow->direction = dir;	1628	arrow->direction = dir;
1689		1629
		1630	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1631	arrow->stats.hp = arrow->stats.dam;
		1632	arrow->stats.grace = arrow->attacktype;
		1633
		1634	if (arrow->slaying)
		1635	arrow->spellarg = strdup (arrow->slaying);
		1636
		1637	if (player *pl = op->contr)
		1638	{
		1639	if (!pl->has_hit)
		1640	{
		1641	pl->has_hit = 1;
		1642	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
		1643	}
		1644	#if 0
		1645	float speed = pl->weapon_sp;
		1646
		1647	/* penalize ROF for bestarrow */
		1648	if (pl->bowtype == bow_bestarrow)
		1649	speed *= .9f;
		1650	else
		1651	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1652
		1653	op->speed_left += speed - op->speed;
		1654	#endif
		1655	}
		1656
		1657	SET_ANIMATION (arrow, arrow->direction);
		1658
		1659	/* update the speed */
		1660	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1661	+ bow->stats.dam / 7.0;
		1662
		1663	arrow->set_speed (max (arrow->speed, 2.0));
		1664	arrow->speed_left = 0;
		1665
		1666	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1667
1690	if (op->type == PLAYER)	1668	if (op->type == PLAYER)
1691	{	1669	{
1692	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1693	op->update_stats ();
1694	}
1695
1696	SET_ANIMATION (arrow, arrow->direction);
1697	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1698	arrow->stats.hp = arrow->stats.dam;
1699	arrow->stats.grace = arrow->attacktype;
1700	if (arrow->slaying != NULL)
1701	arrow->spellarg = strdup (arrow->slaying);
1702
1703	/* Note that this was different for monsters - they got their level
1704	* added to the damage. I think the strength bonus is more proper.
1705	*/
1706
1707	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1708
1709	/* update the speed */
1710	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1711	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1712
1713	arrow->set_speed (max (arrow->speed, 1.0));
1714	arrow->speed_left = 0;
1715
1716	if (op->type == PLAYER)
1717	{
1718	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1719	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1720	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1721
1722	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1670	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1671	wc -= dex_bonus[op->stats.Dex];
		1672
		1673	if (!arrow->slaying)
		1674	arrow->slaying = op->slaying;
		1675
		1676	arrow->attacktype |= op->attacktype;
1723	}	1677	}
1724	else	1678	else
1725	{	1679	{
1726	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1727	arrow->level = op->level;	1680	arrow->level = op->level;
1728	}	1681	arrow->stats.wc -= bow->magic;
1729		1682
1730	if (arrow->attacktype == AT_PHYSICAL)	1683	if (!arrow->slaying)
		1684	arrow->slaying = bow->slaying;
		1685
1731	arrow->attacktype |= bow->attacktype;	1686	arrow->attacktype |= bow->attacktype;
		1687	}
1732		1688
1733	if (bow->slaying)	1689	wc -= arrow->level;
1734	arrow->slaying = bow->slaying;	1690	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1735		1691
		1692	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736	arrow->move_type = MOVE_FLY_LOW;	1693	arrow->move_type = MOVE_FLY_LOW;
1737	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1694	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738		1695
1739	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1696	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1740	m->insert (arrow, sx, sy, op);	1697	m->insert (arrow, sx, sy, op);
…		…
1765	{	1722	{
1766	int ret = 0, wcmod = 0;	1723	int ret = 0, wcmod = 0;
1767		1724
1768	if (op->contr->bowtype == bow_bestarrow)	1725	if (op->contr->bowtype == bow_bestarrow)
1769	{	1726	{
1770	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1727	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771	}	1728	}
1772	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1729	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773	{	1730	{
1774	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1731	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775	wcmod = -1;	1732	wcmod = -1;
…		…
1785	else if (op->contr->bowtype == bow_spreadshot)	1742	else if (op->contr->bowtype == bow_spreadshot)
1786	{	1743	{
1787	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1744	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1788	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1745	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1789	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1746	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1790
1791	}	1747	}
1792	else	1748	else
1793	{	1749	{
1794	/* Simple case */	1750	/* Simple case */
1795	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1751	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1796	}	1752	}
		1753
1797	return ret;	1754	return ret;
1798	}	1755	}
1799
1800		1756
1801	/* Fires a misc (wand/rod/horn) object in 'dir'.	1757	/* Fires a misc (wand/rod/horn) object in 'dir'.
1802	* Broken apart from 'fire' to keep it more readable.	1758	* Broken apart from 'fire' to keep it more readable.
1803	*/	1759	*/
1804	void	1760	void
1805	fire_misc_object (object *op, int dir)	1761	fire_misc_object (object *op, int dir)
1806	{	1762	{
1807	object *item;	1763	object *item = op->contr->ranged_ob;
1808		1764
1809	if (!op->contr->ranges[range_misc])	1765	if (!item)
1810	{	1766	{
1811	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1767	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1812	return;	1768	return;
1813	}	1769	}
1814		1770
1815	item = op->contr->ranges[range_misc];
1816	if (!item->inv)	1771	if (!item->inv)
1817	{	1772	{
1818	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1773	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1819	return;	1774	return;
1820	}	1775	}
		1776
		1777	if (!op->change_weapon (item))
		1778	return;
		1779
1821	if (item->type == WAND)	1780	if (item->type == WAND)
1822	{	1781	{
1823	if (item->stats.food <= 0)	1782	if (item->stats.food <= 0)
1824	{	1783	{
1825	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1784	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1826	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1785	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1786
1827	return;	1787	return;
1828	}	1788	}
1829	}	1789	}
1830	else if (item->type == ROD || item->type == HORN)	1790	else if (item->type == ROD || item->type == HORN)
1831	{	1791	{
1832	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1792	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1833	{	1793	{
1834	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1794	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1795
1835	if (item->type == ROD)	1796	if (item->type == ROD)
1836	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1797	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1837	else	1798	else
1838	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1799	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1800
1839	return;	1801	return;
1840	}	1802	}
1841	}	1803	}
1842		1804
1843	if (cast_spell (op, item, dir, item->inv, NULL))	1805	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1874		1836
1875	/* check for loss of invisiblity/hide */	1837	/* check for loss of invisiblity/hide */
1876	if (action_makes_visible (op))	1838	if (action_makes_visible (op))
1877	make_visible (op);	1839	make_visible (op);
1878		1840
1879	switch (op->contr->shoottype)	1841	player *pl = op->contr;
		1842
		1843	if (pl->golem)
1880	{	1844	{
1881	case range_none:	1845	control_golem (op->contr->golem, dir);
1882	return;	1846	return;
		1847	}
1883		1848
1884	case range_bow:	1849	object *ob = pl->ranged_ob;
		1850
		1851	if (!ob)
		1852	return;
		1853
		1854	if (!op->change_weapon (ob))
		1855	return;
		1856
		1857	switch (ob->type)
		1858	{
		1859	case BOW:
1885	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
1886	return;	1861	break;
1887		1862
1888	case range_magic: /* Casting spells */	1863	case SPELL:
1889	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1864	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1890	return;	1865	break;
1891		1866
1892	case range_misc:	1867	case BUILDER:
		1868	apply_map_builder (op, dir);
		1869	break;
		1870
		1871	case SKILL:
		1872	do_skill (op, op, ob, dir, 0);
		1873	break;
		1874
		1875	default:
1893	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1894	return;	1877	break;
1895
1896	case range_golem: /* Control summoned monsters from scrolls */
1897	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1898	{
1899	op->contr->ranges[range_golem] = 0;
1900	op->contr->shoottype = range_none;
1901	}
1902	else
1903	control_golem (op->contr->ranges[range_golem], dir);
1904	return;
1905
1906	case range_skill:
1907	if (!op->chosen_skill)
1908	{
1909	if (op->type == PLAYER)
1910	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1911	return;
1912	}
1913	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1914	return;
1915	case range_builder:
1916	apply_map_builder (op, dir);
1917	return;
1918	default:
1919	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1920	return;
1921	}	1878	}
1922	}	1879	}
1923
1924
1925		1880
1926	/* find_key	1881	/* find_key
1927	* We try to find a key for the door as passed. If we find a key	1882	* We try to find a key for the door as passed. If we find a key
1928	* and successfully use it, we return the key, otherwise NULL	1883	* and successfully use it, we return the key, otherwise NULL
1929	* This function merges both normal and locked door, since the logic	1884	* This function merges both normal and locked door, since the logic
…		…
1931	* pl is the player,	1886	* pl is the player,
1932	* inv is the objects inventory to searched	1887	* inv is the objects inventory to searched
1933	* door is the door we are trying to match against.	1888	* door is the door we are trying to match against.
1934	* This function can be called recursively to search containers.	1889	* This function can be called recursively to search containers.
1935	*/	1890	*/
1936
1937	object *	1891	object *
1938	find_key (object *pl, object *container, object *door)	1892	find_key (object *pl, object *container, object *door)
1939	{	1893	{
1940	object *tmp, *key;	1894	object *tmp, *key;
1941		1895
1942	/* Should not happen, but sanity checking is never bad */	1896	/* Should not happen, but sanity checking is never bad */
1943	if (container->inv == NULL)	1897	if (!container->inv)
1944	return NULL;	1898	return 0;
1945		1899
1946	/* First, lets try to find a key in the top level inventory */	1900	/* First, lets try to find a key in the top level inventory */
1947	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1901	for (tmp = container->inv; tmp; tmp = tmp->below)
1948	{	1902	{
1949	if (door->type == DOOR && tmp->type == KEY)	1903	if (door->type == DOOR && tmp->type == KEY)
1950	break;	1904	break;
1951	/* For sanity, we should really check door type, but other stuff	1905	/* For sanity, we should really check door type, but other stuff
1952	* (like containers) can be locked with special keys	1906	* (like containers) can be locked with special keys
1953	*/	1907	*/
1954	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1908	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1955	break;	1909	break;
1956	}	1910	}
		1911
1957	/* No key found - lets search inventories now */	1912	/* No key found - lets search inventories now */
1958	/* If we find and use a key in an inventory, return at that time.	1913	/* If we find and use a key in an inventory, return at that time.
1959	* otherwise, if we search all the inventories and still don't find	1914	* otherwise, if we search all the inventories and still don't find
1960	* a key, return	1915	* a key, return
1961	*/	1916	*/
1962	if (!tmp)	1917	if (!tmp)
1963	{	1918	{
1964	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1919	for (tmp = container->inv; tmp; tmp = tmp->below)
1965	{	1920	{
1966	/* No reason to search empty containers */	1921	/* No reason to search empty containers */
1967	if (tmp->type == CONTAINER && tmp->inv)	1922	if (tmp->type == CONTAINER && tmp->inv)
1968	{	1923	{
1969	if ((key = find_key (pl, tmp, door)) != NULL)	1924	if ((key = find_key (pl, tmp, door)))
1970	return key;	1925	return key;
1971	}	1926	}
1972	}	1927	}
		1928
1973	if (!tmp)	1929	if (!tmp)
1974	return NULL;	1930	return NULL;
1975	}	1931	}
		1932
1976	/* We get down here if we have found a key. Now if its in a container,	1933	/* We get down here if we have found a key. Now if its in a container,
1977	* see if we actually want to use it	1934	* see if we actually want to use it
1978	*/	1935	*/
1979	if (pl != container)	1936	if (pl != container)
1980	{	1937	{
…		…
2001	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1958	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2002	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1959	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2003	return NULL;	1960	return NULL;
2004	}	1961	}
2005	}	1962	}
		1963
2006	return tmp;	1964	return tmp;
2007	}	1965	}
2008		1966
2009	/* moved door processing out of move_player_attack.	1967	/* moved door processing out of move_player_attack.
2010	* returns 1 if player has opened the door with a key	1968	* returns 1 if player has opened the door with a key
…		…
2024	if (key)	1982	if (key)
2025	{	1983	{
2026	object *container = key->env;	1984	object *container = key->env;
2027		1985
2028	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1987
2029	if (action_makes_visible (op))	1988	if (action_makes_visible (op))
2030	make_visible (op);	1989	make_visible (op);
		1990
2031	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1991	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2032	spring_trap (door->inv, op);	1992	spring_trap (door->inv, op);
		1993
2033	if (door->type == DOOR)	1994	if (door->type == DOOR)
2034	{
2035	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1995	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2036	}
2037	else if (door->type == LOCKED_DOOR)	1996	else if (door->type == LOCKED_DOOR)
2038	{	1997	{
2039	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1998	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2040	remove_door2 (door); /* remove door without violence ;-) */	1999	remove_door2 (door); /* remove door without violence ;-) */
2041	}	2000	}
		2001
2042	/* Do this after we print the message */	2002	/* Do this after we print the message */
2043	decrease_ob (key); /* Use up one of the keys */	2003	decrease_ob (key); /* Use up one of the keys */
2044	/* Need to update the weight the container the key was in */	2004	/* Need to update the weight the container the key was in */
2045	if (container != op)	2005	if (container != op)
2046	esrv_update_item (UPD_WEIGHT, op, container);	2006	esrv_update_item (UPD_WEIGHT, op, container);
		2007
2047	return 1; /* Nothing more to do below */	2008	return 1; /* Nothing more to do below */
2048	}	2009	}
2049	else if (door->type == LOCKED_DOOR)	2010	else if (door->type == LOCKED_DOOR)
2050	{	2011	{
2051	/* Might as well return now - no other way to open this */	2012	/* Might as well return now - no other way to open this */
2052	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2013	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2053	return 1;	2014	return 1;
2054	}	2015	}
		2016
2055	return 0;	2017	return 0;
2056	}	2018	}
2057		2019
2058	/* This function is just part of a breakup from move_player.	2020	/* This function is just part of a breakup from move_player.
2059	* It should keep the code cleaner.	2021	* It should keep the code cleaner.
…		…
2063	*/	2025	*/
2064	void	2026	void
2065	move_player_attack (object *op, int dir)	2027	move_player_attack (object *op, int dir)
2066	{	2028	{
2067	object *tmp, *mon;	2029	object *tmp, *mon;
2068	sint16 nx, ny;
2069	int on_battleground;	2030	int on_battleground;
2070	maptile *m;	2031	maptile *m;
2071		2032
2072	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2073	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2074		2035
2075	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
2076		2037
2077	/* If braced, or can't move to the square, and it is not out of the	2038	/* If braced, or can't move to the square, and it is not out of the
2078	* map, attack it. Note order of if statement is important - don't	2039	* map, attack it. Note order of if statement is important - don't
…		…
2143		2104
2144	/* If the creature is a pet, push it even if the player is not	2105	/* If the creature is a pet, push it even if the player is not
2145	* peaceful. Our assumption is the creature is a pet if the	2106	* peaceful. Our assumption is the creature is a pet if the
2146	* player owns it and it is either friendly or unagressive.	2107	* player owns it and it is either friendly or unagressive.
2147	*/	2108	*/
2148	if ((op->type == PLAYER)	2109	if (op->type == PLAYER
2149	#if COZY_SERVER
2150	&&
2151	((mon->owner && mon->owner->contr	2110	&& ((mon->owner && mon->owner->contr
2152	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2111	&& same_party (mon->owner->contr->party, op->contr->party))
2153	#else
2154	&& mon->owner == op	2112	|| mon->owner == op)
2155	#endif
2156	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2113	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2157	{	2114	{
2158	/* If we're braced, we don't want to switch places with it */	2115	/* If we're braced, we don't want to switch places with it */
2159	if (op->contr->braced)	2116	if (op->contr->braced)
2160	return;	2117	return;
2161		2118
2162	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2119	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2163	(void) push_ob (mon, dir, op);	2120	push_ob (mon, dir, op);
2164	if (op->contr->tmp_invis || op->hide)	2121	if (op->contr->tmp_invis || op->hide)
2165	make_visible (op);	2122	make_visible (op);
2166		2123
2167	return;	2124	return;
2168	}	2125	}
…		…
2170	/* in certain circumstances, you shouldn't attack friendly	2127	/* in certain circumstances, you shouldn't attack friendly
2171	* creatures. Note that if you are braced, you can't push	2128	* creatures. Note that if you are braced, you can't push
2172	* someone, but put it inside this loop so that you won't	2129	* someone, but put it inside this loop so that you won't
2173	* attack them either.	2130	* attack them either.
2174	*/	2131	*/
2175	if ((mon->type == PLAYER || mon->enemy != op) &&	2132	if ((mon->type == PLAYER || mon->enemy != op)
2176	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2133	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177	#ifdef PROHIBIT_PLAYERKILL
2178	(op->contr->peaceful	2134	&& ((op->contr->peaceful
2179	|| (mon->type == PLAYER	2135	|| (mon->type == PLAYER && mon->contr->peaceful))
2180	&& mon->contr->
2181	peaceful)) &&
2182	#else
2183	op->contr->peaceful &&
2184	#endif
2185	!on_battleground))	2136	&& !on_battleground))
2186	{	2137	{
2187	if (!op->contr->braced)	2138	if (!op->contr->braced)
2188	{	2139	{
2189	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190	push_ob (mon, dir, op);	2141	push_ob (mon, dir, op);
…		…
2213	* that party_number -1 is no party, so attacks can still happen.	2164	* that party_number -1 is no party, so attacks can still happen.
2214	*/	2165	*/
2215	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2216	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2167	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2217	{	2168	{
2218
2219	/* If the player hasn't hit something this tick, and does
2220	* so, give them speed boost based on weapon speed. Doing
2221	* it here is better than process_players2, which basically
2222	* incurred a 1 tick offset.
2223	*/
2224	if (!op->contr->has_hit)	2169	if (!op->contr->has_hit)
2225	{	2170	{
		2171	op->contr->has_hit = 1;
2226	op->speed_left += op->speed / op->contr->weapon_sp;	2172	op->speed_left += op->contr->weapon_speed () - op->speed;
2227
2228	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2229	}	2173	}
2230		2174
2231	skill_attack (mon, op, 0, 0, 0);	2175	skill_attack (mon, op, 0, 0, 0);
2232		2176
2233	/* If attacking another player, that player gets automatic	2177	/* If attacking another player, that player gets automatic
…		…
2265	return 0;	2209	return 0;
2266	}	2210	}
2267		2211
2268	/* peterm: added following line */	2212	/* peterm: added following line */
2269	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2213	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2270	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2214	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2271		2215
2272	op->facing = dir;	2216	op->facing = dir;
2273		2217
2274	if (op->hide)	2218	if (op->hide)
2275	do_hidden_move (op);	2219	do_hidden_move (op);
…		…
2308	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do.
2309	*/	2253	*/
2310	int	2254	int
2311	handle_newcs_player (object *op)	2255	handle_newcs_player (object *op)
2312	{	2256	{
2313	if (op->contr->hidden)
2314	{
2315	op->invisible = 1000;
2316	/* the socket code flashes the player visible/invisible
2317	* depending on the value of invisible, so we need to
2318	* alternate it here for it to work correctly.
2319	*/
2320	if (pticks & 2)
2321	op->invisible--;
2322	}
2323	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2324	{
2325	op->invisible--;
2326	if (!op->invisible)
2327	{
2328	make_visible (op);
2329	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2330	}
2331	}
2332
2333	if (QUERY_FLAG (op, FLAG_SCARED))	2257	if (QUERY_FLAG (op, FLAG_SCARED))
2334	{	2258	{
2335	flee_player (op);	2259	flee_player (op);
		2260
2336	/* If player is still scared, that is his action for this tick */	2261	/* If player is still scared, that is his action for this tick */
2337	if (QUERY_FLAG (op, FLAG_SCARED))	2262	if (op->flag [FLAG_SCARED])
2338	{	2263	{
2339	op->speed_left--;	2264	--op->speed_left;
2340	return 0;	2265	return 0;
2341	}	2266	}
2342	}	2267	}
2343
2344	/* I've been seeing crashes where the golem has been destroyed, but
2345	* the player object still points to the defunct golem. The code that
2346	* destroys the golem looks correct, and it doesn't always happen, so
2347	* put this in a a workaround to clean up the golem pointer.
2348	*/
2349	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2350	op->contr->ranges[range_golem] = 0;
2351		2268
2352	/* call this here - we also will call this in do_ericserver, but	2269	/* call this here - we also will call this in do_ericserver, but
2353	* the players time has been increased when doericserver has been	2270	* the players time has been increased when doericserver has been
2354	* called, so we recheck it here.	2271	* called, so we recheck it here.
2355	*/	2272	*/
2356	if (op->contr->ns->handle_command ())	2273	if (op->contr->ns->handle_command ())
2357	return 1;	2274	return 1;
2358		2275
2359	if (op->speed_left > 0)	2276	if (op->speed_left > 0.f)
2360	{	2277	{
2361	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2278	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2362	{	2279	{
2363	/* All move commands take 1 tick, at least for now */	2280	/* All move commands take 1 tick, at least for now */
2364	op->speed_left--;	2281	--op->speed_left;
2365		2282
2366	/* Instead of all the stuff below, let move_player take care	2283	/* Instead of all the stuff below, let move_player take care
2367	* of it. Also, some of the skill stuff is only put in	2284	* of it. Also, some of the skill stuff is only put in
2368	* there, as well as the confusion stuff.	2285	* there, as well as the confusion stuff.
2369	*/	2286	*/
2370	move_player (op, op->direction);	2287	move_player (op, op->direction);
2371		2288
2372	return op->speed_left > 0;	2289	return op->speed_left > 0.f;
2373	}	2290	}
2374	}	2291	}
2375		2292
2376	return 0;	2293	return 0;
2377	}	2294	}
…		…
2416	* from.	2333	* from.
2417	*/	2334	*/
2418	void	2335	void
2419	remove_unpaid_objects (object *op, object *env)	2336	remove_unpaid_objects (object *op, object *env)
2420	{	2337	{
2421	object *next;
2422
2423	while (op)	2338	while (op)
2424	{	2339	{
2425	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2340	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2426		2341
2427	if (QUERY_FLAG (op, FLAG_UNPAID))	2342	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2493	int rate_grace = 2000;	2408	int rate_grace = 2000;
2494	const int max_hp = 1;	2409	const int max_hp = 1;
2495	const int max_sp = 1;	2410	const int max_sp = 1;
2496	const int max_grace = 1;	2411	const int max_grace = 1;
2497		2412
2498	if (op->contr->outputs_sync)	2413	if (op->contr->hidden)
		2414	{
		2415	op->invisible = 1000;
		2416	/* the socket code flashes the player visible/invisible
		2417	* depending on the value of invisible, so we need to
		2418	* alternate it here for it to work correctly.
		2419	*/
		2420	if (pticks & 2)
		2421	op->invisible--;
2499	{	2422	}
2500	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2423	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2501	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2424	{
2502	flush_output_element (op, &op->contr->outputs[i]);	2425	if (!op->invisible--)
		2426	{
		2427	make_visible (op);
		2428	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2429	}
2503	}	2430	}
2504		2431
2505	if (op->contr->ns->state == ST_PLAYING)	2432	if (op->contr->ns->state == ST_PLAYING)
2506	{	2433	{
2507	/* these next three if clauses make it possible to SLOW DOWN	2434	/* these next three if clauses make it possible to SLOW DOWN
…		…
2529	gen_grace = op->stats.maxgrace;	2456	gen_grace = op->stats.maxgrace;
2530	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2457	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2531	}	2458	}
2532		2459
2533	/* Regenerate Spell Points */	2460	/* Regenerate Spell Points */
2534	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2461	if (!op->contr->golem && --op->last_sp < 0)
2535	{	2462	{
2536	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2463	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2537	if (op->stats.sp < op->stats.maxsp)	2464	if (op->stats.sp < op->stats.maxsp)
2538	{	2465	{
2539	op->stats.sp++;	2466	op->stats.sp++;
…		…
2637	}	2564	}
2638		2565
2639	/* Digestion */	2566	/* Digestion */
2640	if (--op->last_eat < 0)	2567	if (--op->last_eat < 0)
2641	{	2568	{
2642	#ifdef COZY_SERVER
2643	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2644	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2645	#else
2646	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2569	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2647	#endif
2648		2570
2649	if (op->contr->gen_hp > 0)	2571	if (op->contr->gen_hp > 0)
2650	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2572	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2651	else	2573	else
2652	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2574	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2757	tmp->name = buf;	2679	tmp->name = buf;
2758	sprintf (buf, " This finger has been cut off %s\n"	2680	sprintf (buf, " This finger has been cut off %s\n"
2759	" the %s, when he was defeated at\n level %d by %s.\n",	2681	" the %s, when he was defeated at\n level %d by %s.\n",
2760	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2682	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2761	tmp->msg = buf;	2683	tmp->msg = buf;
2762	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2684	tmp->value = 0, tmp->type = 0;
2763	tmp->materialname = NULL;	2685	tmp->materialname = "organics";
2764	op->insert_at (tmp, op);	2686	tmp->insert_at (op, tmp);
2765	}	2687	}
2766		2688
2767	/* teleport defeated player to new destination */	2689	/* teleport defeated player to new destination */
2768	transfer_ob (op, x, y, 0, NULL);	2690	transfer_ob (op, x, y, 0, NULL);
2769	op->contr->braced = 0;	2691	op->contr->braced = 0;
…		…
2774		2696
2775	command_kill_pets (op, 0);	2697	command_kill_pets (op, 0);
2776		2698
2777	if (op->stats.food < 0)	2699	if (op->stats.food < 0)
2778	{	2700	{
2779	if (op->contr->explore)
2780	{
2781	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2782	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783	op->stats.food = 999;
2784	return;
2785	}
2786	sprintf (buf, "%s starved to death.", &op->name);	2701	sprintf (buf, "%s starved to death.", &op->name);
2787	strcpy (op->contr->killer, "starvation");	2702	strcpy (op->contr->killer, "starvation");
2788	}	2703	}
2789	else	2704	else
2790	{
2791	if (op->contr->explore)
2792	{
2793	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2794	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795	op->stats.hp = op->stats.maxhp;
2796	return;
2797	}
2798	sprintf (buf, "%s died.", &op->name);	2705	sprintf (buf, "%s died.", &op->name);
2799	}
2800		2706
2801	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2707	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2802		2708
2803	/* save the map location for corpse, gravestone */	2709	/* save the map location for corpse, gravestone */
2804	x = op->x;	2710	x = op->x;
…		…
2980	op->stats.hp = op->stats.maxhp;	2886	op->stats.hp = op->stats.maxhp;
2981	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2887	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2982	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2888	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2983		2889
2984	/*	2890	/*
2985	* Check to see if the player is in a shop. IF so, then check to see if
2986	* the player has any unpaid items. If so, remove them and put them back	2891	* Check to see if the player has any unpaid items. If so, remove them
2987	* in the map.	2892	* and put them back in the map.
2988	*/	2893	*/
2989
2990	if (is_in_shop (op))
2991	remove_unpaid_objects (op->inv, op);	2894	remove_unpaid_objects (op->inv, op);
2992		2895
2993	/****************************************/	2896	/****************************************/
2994	/* */	2897	/* */
2995	/* Move player to his current respawn- */	2898	/* Move player to his current respawn- */
2996	/* position (usually last savebed) */	2899	/* position (usually last savebed) */
2997	/* */	2900	/* */
2998	/****************************************/	2901	/****************************************/
2999		2902
3000	enter_player_savebed (op);	2903	enter_player_savebed (op);
3001		2904
3002	/* Save the player before inserting the force to reduce
3003	* chance of abuse.
3004	*/
3005	op->contr->braced = 0;	2905	op->contr->braced = 0;
3006	op->contr->save ();
3007		2906
3008	/* it is possible that the player has blown something up	2907	/* it is possible that the player has blown something up
3009	* at his savebed location, and that can have long lasting	2908	* at his savebed location, and that can have long lasting
3010	* spell effects. So first see if there is a spell effect	2909	* spell effects. So first see if there is a spell effect
3011	* on the space that might harm the player.	2910	* on the space that might harm the player.
…		…
3020	object *force;	2919	object *force;
3021	int at;	2920	int at;
3022		2921
3023	force = get_archetype (FORCE_NAME);	2922	force = get_archetype (FORCE_NAME);
3024	/* 50 ticks should be enough time for the spell to abate */	2923	/* 50 ticks should be enough time for the spell to abate */
3025	force->speed = 0.1;	2924	force->speed = 0.1f;
3026	force->speed_left = -5.0;	2925	force->speed_left = -5.f;
3027	SET_FLAG (force, FLAG_APPLIED);	2926	SET_FLAG (force, FLAG_APPLIED);
3028	for (at = 0; at < NROFATTACKS; at++)	2927	for (at = 0; at < NROFATTACKS; at++)
3029	if (will_kill_again & (1 << at))	2928	if (will_kill_again & (1 << at))
3030	force->resist[at] = 100;	2929	force->resist[at] = 100;
3031		2930
…		…
3040	void	2939	void
3041	loot_object (object *op)	2940	loot_object (object *op)
3042	{ /* Grab and destroy some treasure */	2941	{ /* Grab and destroy some treasure */
3043	object *tmp, *tmp2, *next;	2942	object *tmp, *tmp2, *next;
3044		2943
3045	if (op->container)	2944	op->close_container (); /* close open sack first */
3046	esrv_apply_container (op, op->container); /* close open sack first */
3047		2945
3048	for (tmp = op->inv; tmp; tmp = next)	2946	for (tmp = op->inv; tmp; tmp = next)
3049	{	2947	{
3050	next = tmp->below;	2948	next = tmp->below;
3051		2949
3052	if (tmp->invisible)	2950	if (tmp->invisible)
3053	continue;	2951	continue;
3054		2952
3055	tmp->remove ();	2953	tmp->remove ();
3056	tmp->x = op->x, tmp->y = op->y;	2954	tmp->x = op->x, tmp->y = op->y;
		2955
3057	if (tmp->type == CONTAINER)	2956	if (tmp->type == CONTAINER)
3058	{ /* empty container to ground */	2957	loot_object (tmp); /* empty container to ground */
3059	loot_object (tmp);	2958
3060	}
3061	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2959	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3062	{	2960	{
3063	if (tmp->nrof > 1)	2961	if (tmp->nrof > 1)
3064	{	2962	{
3065	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2963	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3066	tmp2->destroy ();	2964	tmp2->destroy ();
…		…
3077	/*	2975	/*
3078	* fix_weight(): Check recursively the weight of all players, and fix	2976	* fix_weight(): Check recursively the weight of all players, and fix
3079	* what needs to be fixed. Refresh windows and fix speed if anything	2977	* what needs to be fixed. Refresh windows and fix speed if anything
3080	* was changed.	2978	* was changed.
3081	*/	2979	*/
3082
3083	void	2980	void
3084	fix_weight (void)	2981	fix_weight (void)
3085	{	2982	{
3086	for_all_players (pl)	2983	for_all_players (pl)
3087	{	2984	{
…		…
3147	if (op->type == PLAYER)	3044	if (op->type == PLAYER)
3148	{	3045	{
3149	op->contr->tmp_invis = 0;	3046	op->contr->tmp_invis = 0;
3150	op->contr->invis_race = 0;	3047	op->contr->invis_race = 0;
3151	}	3048	}
		3049
3152	update_object (op, UP_OBJ_FACE);	3050	update_object (op, UP_OBJ_CHANGE);
3153	}	3051	}
3154		3052
3155	int	3053	int
3156	is_true_undead (object *op)	3054	is_true_undead (object *op)
3157	{	3055	{
3158	object *tmp = NULL;
3159
3160	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3056	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3161	return 1;	3057	return 1;
3162		3058
3163	return 0;	3059	return 0;
3164	}	3060	}
…		…
3452	char buf[MAX_BUF]; /* tmp. string buffer */	3348	char buf[MAX_BUF]; /* tmp. string buffer */
3453	int i = 0, j = 0;	3349	int i = 0, j = 0;
3454		3350
3455	/* get the appropriate treasurelist */	3351	/* get the appropriate treasurelist */
3456	if (atnr == ATNR_FIRE)	3352	if (atnr == ATNR_FIRE)
3457	trlist = find_treasurelist ("dragon_ability_fire");	3353	trlist = treasurelist::find ("dragon_ability_fire");
3458	else if (atnr == ATNR_COLD)	3354	else if (atnr == ATNR_COLD)
3459	trlist = find_treasurelist ("dragon_ability_cold");	3355	trlist = treasurelist::find ("dragon_ability_cold");
3460	else if (atnr == ATNR_ELECTRICITY)	3356	else if (atnr == ATNR_ELECTRICITY)
3461	trlist = find_treasurelist ("dragon_ability_elec");	3357	trlist = treasurelist::find ("dragon_ability_elec");
3462	else if (atnr == ATNR_POISON)	3358	else if (atnr == ATNR_POISON)
3463	trlist = find_treasurelist ("dragon_ability_poison");	3359	trlist = treasurelist::find ("dragon_ability_poison");
3464		3360
3465	if (trlist == NULL || who->type != PLAYER)	3361	if (trlist == NULL || who->type != PLAYER)
3466	return;	3362	return;
3467		3363
3468	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3364	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3600	* not readied.	3496	* not readied.
3601	*/	3497	*/
3602	void	3498	void
3603	player_unready_range_ob (player *pl, object *ob)	3499	player_unready_range_ob (player *pl, object *ob)
3604	{	3500	{
3605	rangetype i;	3501	if (pl->ob->current_weapon == ob)
		3502	pl->ob->current_weapon = 0;
3606		3503
3607	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3504	if (pl->combat_ob == ob)
3608	{	3505	pl->combat_ob = 0;
		3506
3609	if (pl->ranges[i] == ob)	3507	if (pl->ranged_ob == ob)
3610	{	3508	pl->ranged_ob = 0;
3611	pl->ranges[i] = NULL;
3612	if (pl->shoottype == i)
3613	{
3614	pl->shoottype = range_none;
3615	}
3616	}
3617	}
3618	}	3509	}
		3510
		3511	sint8
		3512	player::visibility_at (maptile *map, int x, int y) const
		3513	{
		3514	if (!ns)
		3515	return 0;
		3516
		3517	int dx, dy;
		3518	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3519	return 0;
		3520
		3521	x += dx - ns->current_x + ns->mapx / 2;
		3522	y += dy - ns->current_y + ns->mapy / 2;
		3523
		3524	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3525	return 0;
		3526
		3527	return 100 - blocked_los [x][y];
		3528	}

Diff Legend

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