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.64 by root, Tue Dec 26 03:35:59 2006 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* 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, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* 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 along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
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);
157	}	150	}
158		151
159	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
160	static void	153	static void
161	set_first_map (object *op)	154	set_first_map (object *op)
162	{	155	{
163	strcpy (op->contr->maplevel, first_map_path);	156	op->contr->maplevel = first_map_path;
164	op->x = -1;	157	op->x = -1;
165	op->y = -1;	158	op->y = -1;
166	enter_exit (op, 0);	159	}
		160
		161	void
		162	player::activate ()
		163	{
		164	if (active)
		165	return;
		166
		167	players.insert (this);
		168	ob->remove ();
		169	ob->map = 0;
		170	ob->activate_recursive ();
		171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
		173	}
		174
		175	void
		176	player::deactivate ()
		177	{
		178	if (!active)
		179	return;
		180
		181	terminate_all_pets (ob);
		182	remove_friendly_object (ob);
		183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
		188	ob->remove ();
		189	ob->map = 0;
		190	party = 0;
		191
		192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		193
		194	players.erase (this);
167	}	195	}
168		196
169	// connect the player with a specific client	197	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
171	void	199	void
172	player::connect (client *ns)	200	player::connect (client *ns)
173	{	201	{
174	this->ns = ns;	202	this->ns = ns;
175	ns->pl = this;	203	ns->pl = this;
176		204
177	next = first_player;	205	run_on = 0;
178	first_player = this;	206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
179		208
180	ns->update_look = 0;	209	ns->update_look = 0;
181	ns->look_position = 0;	210	ns->look_position = 0;
182		211
183	clear_los (ob);	212	clear_los (this);
		213
		214	ns->reset_stats ();
184		215
185	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
188		219
189	if (!legal_range (ob, shoottype))
190	shoottype = range_none;
191
192	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	221	link_player_skills (ob);
194		222
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	update_ob_speed (ob);
197		224
198	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
199
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information
202	* to then update this. I don't think this will actually break anything - anyone
203	* that can use armour should be able to use a shield. What this may 'break'
204	* are features new characters get, eg, if someone starts up with a Q, they
205	* should be able to use a shield. However, old Q's won't get that advantage.
206	*/
207	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208	SET_FLAG (ob, FLAG_USE_SHIELD);
209		226
210	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
211	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
212	{	229	{
213	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
…		…
215	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
216	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
217		234
218	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
219	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
220	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
221	abil = tmp;	238	abil = tmp;
222	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
223	skin = tmp;	240	skin = tmp;
224		241
225	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
226	}	243	}
227		244
228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
229	add_friendly_object (ob);
230
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		246
236	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
237		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);
238	ob->update_stats ();	274	ob->update_stats ();
		275
239	ns->floorbox_update ();	276	ns->floorbox_update ();
240
241	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
243		279
244	enter_exit (ob, 0);	280	activate ();
245		281
246	send_rules (ob);	282	send_rules (ob);
247	send_news (ob);	283	send_news (ob);
248	display_motd (ob);	284	display_motd (ob);
		285
		286	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	287	INVOKE_PLAYER (LOGIN, this);
250	}	288	}
251		289
252	void	290	void
253	player::disconnect ()	291	player::disconnect ()
254	{	292	{
255	//TODO: don't be so harsh and destroy :)
256	if (ns)	293	if (ns)
257	destroy ();	294	{
		295	if (active)
		296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		297
		298	INVOKE_PLAYER (DISCONNECT, this);
		299
		300	ns->reset_stats ();
		301	ns->pl = 0;
		302	ns = 0;
		303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
		307
		308	deactivate ();
258	}	309	}
259		310
260	// the need for this function can be explained	311	// the need for this function can be explained
261	// by load_object not returning the object	312	// by load_object not returning the object
262	void	313	void
263	player::set_object (object *op)	314	player::set_object (object *op)
264	{	315	{
265	ob = op;	316	ob = observe = op;
266	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
267		318
		319	ob->speed = 1.0f;
268	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
269	ob->speed = 1.0;	321
270	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
271	ob->stats.wc = 2;	323	}
272	ob->run_away = 25; /* Then we panick... */
273		324
274	set_first_map (ob);	325	void
275		326	player::set_observe (object *op)
276	ob->roll_stats ();	327	{
		328	observe = op ? op : ob;
		329	do_los = 1;
277	}	330	}
278		331
279	player::player ()	332	player::player ()
280	{	333	{
281	/* There are some elements we want initialized to non zero value -	334	/* There are some elements we want initialised to non zero value -
282	* we deal with that below this point.	335	* we deal with that below this point.
283	*/	336	*/
284	outputs_sync = 16; /* Every 2 seconds */	337	outputs_sync = 4;
285	outputs_count = 8; /* Keeps present behaviour */	338	outputs_count = 4;
286	unapply = unapply_nochoice;	339	unapply = unapply_nochoice;
287		340
288	assign (savebed_map, first_map_path); /* Init. respawn position */	341	savebed_map = first_map_path; /* Init. respawn position */
289		342
290	gen_sp_armour = 10;	343	gen_sp_armour = 10;
291	last_speed = -1;
292	shoottype = range_none;
293	bowtype = bow_normal;	344	bowtype = bow_normal;
294	petmode = pet_normal;	345	petmode = pet_normal;
295	listening = 10;	346	listening = 10;
296	usekeys = containers;	347	usekeys = containers;
297	last_weapon_sp = -1;
298	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
299	do_los = 1;	349	do_los = 1;
300		350
301	/* we need to clear these to -1 and not zero - otherwise,	351	weapon_sp = 1.0f;
302	* if a player quits and starts a new character, we wont	352	weapon_sp_left = 0.5f;
303	* send new values to the client, as things like exp start
304	* at zero.
305	*/
306	for (int i = 0; i < NUM_SKILLS; i++)
307	last_skill_exp[i] = -1;
308
309	for (int i = 0; i < NROFATTACKS; i++)
310	last_resist[i] = -1;
311
312	last_stats.exp = -1;
313	last_weight = (uint32) - 1;
314	}	353	}
315		354
316	void	355	void
317	player::do_destroy ()	356	player::do_destroy ()
318	{	357	{
		358	disconnect ();
		359
319	attachable::do_destroy ();	360	attachable::do_destroy ();
320		361
321	disconnect ();
322
323	terminate_all_pets (ob);
324
325	if (first_player != this)
326	{
327	player *prev = first_player;
328
329	while (prev && prev->next && prev->next != this)
330	prev = prev->next;
331
332	if (prev->next != this)
333	{
334	LOG (llevError, "Free_player: Can't find previous player.\n");
335	abort ();
336	}
337
338	prev->next = next;
339	}
340	else
341	first_player = next;
342
343	if (ob)	362	if (ob)
		363	{
344	ob->destroy (true);	364	ob->destroy_inv (false);
345
346	if (ns)
347	{
348	client *ns = this->ns;
349	ns->send_packet ("goodbye");
350	ns->flush ();
351	ns->pl = 0;
352	this->ns = 0;
353	ns->destroy ();	365	ob->destroy ();
354	}	366	}
355	}	367	}
356		368
357	player::~player ()	369	player::~player ()
358	{	370	{
…		…
368	player::create ()	380	player::create ()
369	{	381	{
370	player *pl = new player;	382	player *pl = new player;
371		383
372	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
		390	set_first_map (pl->ob);
373		391
374	return pl;	392	return pl;
375	}	393	}
376		394
377	/*	395	/*
…		…
408	object *op = NULL;	426	object *op = NULL;
409	objectlink *ol;	427	objectlink *ol;
410	unsigned lastdist;	428	unsigned lastdist;
411	rv_vector rv;	429	rv_vector rv;
412		430
413	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	431	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
414	{	432	{
415	/* 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
416	* does periodically happen. Given that, lets deal with it.	434	* does periodically happen. Given that, lets deal with it.
417	* While unlikely, it is possible the next object on the friendly	435	* While unlikely, it is possible the next object on the friendly
418	* list is also free, so encapsulate this in a while loop.	436	* list is also free, so encapsulate this in a while loop.
…		…
422	object *tmp = ol->ob;	440	object *tmp = ol->ob;
423		441
424	/* 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
425	* itself will have been cleared.	443	* itself will have been cleared.
426	*/	444	*/
427	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 ());
428	ol = ol->next;	447	ol = ol->next;
429	remove_friendly_object (tmp);	448	remove_friendly_object (tmp);
430	if (!ol)	449	if (!ol)
431	return op;	450	return op;
432	}	451	}
…		…
521	x = mon->x;	540	x = mon->x;
522	y = mon->y;	541	y = mon->y;
523	m = mon->map;	542	m = mon->map;
524	dir = rv.direction;	543	dir = rv.direction;
525	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 */
526	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
527	/* 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. */
528	if (diff > max)	548	if (diff > max)
529	return 0;	549	return 0;
		550
530	while (diff > 1 && max > 0)	551	while (diff > 1 && max > 0)
531	{	552	{
532	lastx = x;	553	lastx = x;
533	lasty = y;	554	lasty = y;
534	lastmap = m;	555	lastmap = m;
…		…
616	max--;	637	max--;
617	lastdir = dir;	638	lastdir = dir;
618	if (!firstdir)	639	if (!firstdir)
619	firstdir = dir;	640	firstdir = dir;
620	}	641	}
		642
621	if (diff <= 1)	643	if (diff <= 1)
622	{	644	{
623	/* Recalculate diff (distance) because we may not have actually	645	/* Recalculate diff (distance) because we may not have actually
624	* headed toward player for entire distance.	646	* headed toward player for entire distance.
625	*/	647	*/
626	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	648	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
627	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));
628	}	650	}
		651
629	if (diff > max)	652	if (diff > max)
630	return 0;	653	return 0;
631	}	654	}
		655
632	/* 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 */
633	if (!max)	657	if (!max)
634	return 0;	658	return 0;
635		659
636	return firstdir;	660	return firstdir;
…		…
750	roll_stat (void)	774	roll_stat (void)
751	{	775	{
752	int a[4], i, j, k;	776	int a[4], i, j, k;
753		777
754	for (i = 0; i < 4; i++)	778	for (i = 0; i < 4; i++)
755	a[i] = (int) RANDOM () % 6 + 1;	779	a[i] = (int) rndm (6) + 1;
756		780
757	for (i = 0, j = 0, k = 7; i < 4; i++)	781	for (i = 0, j = 0, k = 7; i < 4; i++)
758	if (a[i] < k)	782	if (a[i] < k)
759	k = a[i], j = i;	783	k = a[i], j = i;
760		784
…		…
766	}	790	}
767		791
768	void	792	void
769	object::roll_stats ()	793	object::roll_stats ()
770	{	794	{
771	int statsort [7];	795	int statsort [NUM_STATS];
772		796
773	for (;;)	797	for (;;)
774	{	798	{
775	int sum = 0;	799	int sum = 0;
776	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
777	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
778		802
779	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
780	break;	804	break;
781	}	805	}
782		806
783	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
784	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
785		809
		810	for (int i = 0; i < NUM_STATS; ++i)
786	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
787	stats.Dex = statsort[1];
788	stats.Con = statsort[2];
789	stats.Int = statsort[3];
790	stats.Wis = statsort[4];
791	stats.Pow = statsort[5];
792	stats.Cha = statsort[6];
793		812
794	stats.exp = 0;	813	stats.exp = 0;
795	stats.ac = 0;	814	stats.ac = 0;
796		815
797	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
809	}	828	}
810		829
811	void	830	void
812	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
813	{	832	{
814	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
815	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
816	set_attr_value (&contr->orig_stats, b, tmp);
817		834
		835	for (int i = 0; i < NUM_STATS; ++i)
818	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
819	stats.Dex = contr->orig_stats.Dex;
820	stats.Con = contr->orig_stats.Con;
821	stats.Int = contr->orig_stats.Int;
822	stats.Wis = contr->orig_stats.Wis;
823	stats.Pow = contr->orig_stats.Pow;
824	stats.Cha = contr->orig_stats.Cha;
825		837
826	//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,
827	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
828	stats.ac = 0;	840	stats.ac = 0;
829		841
…		…
841	contr->levsp[1] = 6;	853	contr->levsp[1] = 6;
842	contr->levgrace[1] = 3;	854	contr->levgrace[1] = 3;
843		855
844	contr->orig_stats = stats;	856	contr->orig_stats = stats;
845	}	857	}
		858	}
		859
		860	static void
		861	start_info (object *op)
		862	{
		863	char buf[MAX_BUF];
		864
		865	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		866	new_draw_info (NDI_UNIQUE, 0, op, buf);
		867	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		868	//new_draw_info (NDI_UNIQUE, 0, op, " ");
846	}	869	}
847		870
848	/* This function takes the key that is passed, and does the	871	/* This function takes the key that is passed, and does the
849	* appropriate action with it (change race, or other things).	872	* appropriate action with it (change race, or other things).
850	* The function name is for historical reasons - now we have	873	* The function name is for historical reasons - now we have
851	* separate race and class; this actually changes the RACE,	874	* separate race and class; this actually changes the RACE,
852	* not the class.	875	* not the class.
853	*/	876	*/
854	int	877	void
855	key_change_class (object *op, char key)	878	player::chargen_race_done ()
856	{	879	{
857	int tmp_loop;
858
859	if (key == 'd' || key == 'D')
860	{
861	char buf[MAX_BUF];
862
863	/* this must before then initial items are given */	880	/* this must before then initial items are given */
864	esrv_new_player (op->contr, op->weight + op->carrying);	881	esrv_new_player (ob->contr, ob->weight + ob->carrying);
865		882
866	treasurelist *tl = find_treasurelist ("starting_wealth");	883	treasurelist *tl = treasurelist::find ("starting_wealth");
867	if (tl)	884	if (tl)
868	create_treasure (tl, op, 0, 0, 0);	885	create_treasure (tl, ob, 0, 0, 0);
869		886
870	INVOKE_PLAYER (BIRTH, op->contr);	887	INVOKE_PLAYER (BIRTH, ob->contr);
871	INVOKE_PLAYER (LOGIN, op->contr);	888	INVOKE_PLAYER (LOGIN, ob->contr);
872		889
873	op->contr->ns->state = ST_PLAYING;	890	ob->contr->ns->state = ST_PLAYING;
874		891
875	if (op->msg)	892	if (ob->msg)
876	op->msg = NULL;	893	ob->msg = 0;
877		894
878	/* 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
879	* to save here.	896	* to save here.
880	*/	897	*/
		898	{
		899	char buf[MAX_BUF];
881	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	900	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
882	make_path_to_file (buf);	901	make_path_to_file (buf);
		902	}
883		903
884	#ifdef AUTOSAVE
885	op->contr->last_save_tick = pticks;
886	#endif
887	start_info (op);	904	start_info (ob);
888	CLEAR_FLAG (op, FLAG_WIZ);	905	CLEAR_FLAG (ob, FLAG_WIZ);
889	give_initial_items (op, op->randomitems);	906	give_initial_items (ob, ob->randomitems);
890	link_player_skills (op);	907	link_player_skills (ob);
891	esrv_send_inventory (op, op);	908	esrv_send_inventory (ob, ob);
892	op->update_stats ();	909	ob->update_stats ();
893		910
894	/* This moves the player to a different start map, if there	911	/* This moves the player to a different start map, if there
895	* is one for this race	912	* is one for this race
896	*/	913	*/
897	if (*first_map_ext_path)	914	if (*first_map_ext_path)
898	{	915	{
899	object *tmp;	916	object *tmp;
900	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
901		918
902	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->archname);
903	tmp = object::create ();	920	tmp = object::create ();
904	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
905	EXIT_X (tmp) = op->x;	922	EXIT_X (tmp) = ob->x;
906	EXIT_Y (tmp) = op->y;	923	EXIT_Y (tmp) = ob->y;
907	enter_exit (op, tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
908	* if the map isn't there, then stay on the	925	* if the map isn't there, then stay on the
909	* default initial map */	926	* default initial map */
910	tmp->destroy ();	927	tmp->destroy ();
911	}	928	}
912	else	929	else
913	LOG (llevDebug, "first_map_ext_path not set\n");	930	LOG (llevDebug, "first_map_ext_path not set\n");
		931	}
914		932
915	return 0;	933	void
916	}	934	player::chargen_race_next ()
917		935	{
918	/* Following actually changes the race - this is the default command	936	/* Following actually changes the race - this is the default command
919	* if we don't match with one of the options above.	937	* if we don't match with one of the options above.
920	*/	938	*/
921		939
922	tmp_loop = 0;	940	do
923	while (!tmp_loop)
924	{	941	{
925	shstr name = op->name;	942	shstr name = ob->name;
926	int x = op->x, y = op->y;	943	int x = ob->x, y = ob->y;
927		944
928	op->remove_statbonus ();	945	ob->remove_statbonus ();
929	op->remove ();	946	ob->remove ();
930	op->arch = get_player_archetype (op->arch);	947	ob->arch = get_player_archetype (ob->arch);
931	op->arch->clone.copy_to (op);	948	ob->arch->clone.copy_to (ob);
932	op->instantiate ();	949	ob->instantiate ();
933	op->stats = op->contr->orig_stats;	950	ob->stats = ob->contr->orig_stats;
934	op->name = op->name_pl = name;	951	ob->name = ob->name_pl = name;
935	op->x = x;	952	ob->x = x;
936	op->y = y;	953	ob->y = y;
937	SET_ANIMATION (op, 2); /* So player faces south */	954	SET_ANIMATION (ob, 2); /* So player faces south */
938	insert_ob_in_map (op, op->map, op, 0);	955	insert_ob_in_map (ob, ob->map, ob, 0);
939	assign (op->contr->title, op->arch->clone.name);	956	assign (ob->contr->title, ob->arch->clone.name);
940	op->add_statbonus ();	957	ob->add_statbonus ();
941	tmp_loop = allowed_class (op);
942	}	958	}
		959	while (!allowed_class (ob));
943		960
944	update_object (op, UP_OBJ_FACE);	961	update_object (ob, UP_OBJ_FACE);
945	esrv_update_item (UPD_FACE, op, op);	962	esrv_update_item (UPD_FACE, ob, ob);
946	op->update_stats ();	963	ob->update_stats ();
947	op->stats.hp = op->stats.maxhp;	964	ob->stats.hp = ob->stats.maxhp;
948	op->stats.sp = op->stats.maxsp;	965	ob->stats.sp = ob->stats.maxsp;
949	op->stats.grace = 0;	966	ob->stats.grace = 0;
950
951	if (op->msg)
952	new_draw_info (NDI_BLUE, 0, op, op->msg);
953
954	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
955	return 0;
956	}
957
958	int
959	key_confirm_quit (object *op, char key)
960	{
961	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
962	{
963	op->contr->ns->state = ST_PLAYING;
964	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
965	return 1;
966	}
967
968	INVOKE_PLAYER (LOGOUT, op->contr);
969	INVOKE_PLAYER (QUIT, op->contr);
970
971	terminate_all_pets (op);
972	leave_map (op);
973	op->direction = 0;
974	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
975
976	strcpy (op->contr->killer, "quit");
977	check_score (op);
978	op->contr->party = 0;
979	op->contr->own_title[0] = '\0';
980
981	object_ptr ob = op;
982
983	delete ob->contr;
984
985	/* We need to hunt for any per player unique maps in memory and
986	* get rid of them. The trailing slash in the path is intentional,
987	* so that players named 'Ab' won't match against players 'Abe' pathname
988	*/
989	char buf[MAX_BUF];
990	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
991
992	for (maptile *next, *mp = first_map; mp; mp = next)
993	{
994	next = mp->next;
995
996	if (!strncmp (mp->path, buf, strlen (buf)))
997	delete_map (mp);
998	}
999
1000	delete_character (ob->name, 1);
1001
1002	return 1;
1003	}	967	}
1004		968
1005	void	969	void
1006	flee_player (object *op)	970	flee_player (object *op)
1007	{	971	{
…		…
1054	/* Cornered, get rid of scared */	1018	/* Cornered, get rid of scared */
1055	CLEAR_FLAG (op, FLAG_SCARED);	1019	CLEAR_FLAG (op, FLAG_SCARED);
1056	op->enemy = NULL;	1020	op->enemy = NULL;
1057	}	1021	}
1058		1022
1059
1060	/* 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.
1061	* 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
1062	* stop.	1025	* stop.
1063	*/	1026	*/
1064	int	1027	int
1065	check_pick (object *op)	1028	check_pick (object *op)
1066	{	1029	{
1067	object *tmp, *next;	1030	object *tmp, *next;
1068	int stop = 0;	1031	int stop = 0;
1069	int j, k, wvratio;	1032	int wvratio;
1070	char putstring[128], tmpstr[16];	1033	char putstring[128];
1071		1034
1072	/* if you're flying, you cna't pick up anything */	1035	/* if you're flying, you cna't pick up anything */
1073	if (op->move_type & MOVE_FLYING)	1036	if (op->move_type & MOVE_FLYING)
1074	return 1;	1037	return 1;
1075		1038
…		…
1143	if (tmp->name != NULL)	1106	if (tmp->name != NULL)
1144	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1145	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1146	else	1109	else
1147	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1148	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1149		1112
1150	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1151	}	1114	}
1152		1115
1153	/* philosophy:	1116	/* philosophy:
…		…
1346	/* careful: chairs and tables are weapons! */	1309	/* careful: chairs and tables are weapons! */
1347	if (op->contr->mode & PU_ALLWEAPON)	1310	if (op->contr->mode & PU_ALLWEAPON)
1348	{	1311	{
1349	if (tmp->type == WEAPON && tmp->name != NULL)	1312	if (tmp->type == WEAPON && tmp->name != NULL)
1350	{	1313	{
1351	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1352	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1315	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1353	{	1316	{
1354	pick_up (op, tmp);	1317	pick_up (op, tmp);
1355	continue;	1318	continue;
1356	}	1319	}
1357	}	1320	}
1358		1321
1359	if (tmp->type == WEAPON && tmp->name == NULL)	1322	if (tmp->type == WEAPON && tmp->name == NULL)
1360	{	1323	{
1361	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1324	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1362	{	1325	{
1363	pick_up (op, tmp);	1326	pick_up (op, tmp);
1364	continue;	1327	continue;
1365	}	1328	}
1366	}	1329	}
…		…
1391	if (tmp->name != NULL)	1354	if (tmp->name != NULL)
1392	{	1355	{
1393	fprintf (stderr, "%s", tmp->name);	1356	fprintf (stderr, "%s", tmp->name);
1394	}	1357	}
1395	else	1358	else
1396	fprintf (stderr, "%s", tmp->arch->name);	1359	fprintf (stderr, "%s", tmp->arch->archname);
1397	fprintf (stderr, ",%d] = ", tmp->type);	1360	fprintf (stderr, ",%d] = ", tmp->type);
1398	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1399	#endif	1362	#endif
1400	continue;	1363	continue;
1401	}	1364	}
…		…
1412	* found object is returned.	1375	* found object is returned.
1413	*/	1376	*/
1414	object *	1377	object *
1415	find_arrow (object *op, const char *type)	1378	find_arrow (object *op, const char *type)
1416	{	1379	{
1417	object *tmp = NULL;	1380	object *tmp = 0;
1418		1381
1419	for (op = op->inv; op; op = op->below)	1382	for (op = op->inv; op; op = op->below)
1420	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))
1421	tmp = find_arrow (op, type);	1384	tmp = find_arrow (op, type);
1422	else if (op->type == ARROW && op->race == type)	1385	else if (op->type == ARROW && op->race == type)
1423	return op;	1386	return op;
		1387
1424	return tmp;	1388	return tmp;
1425	}	1389	}
1426		1390
1427	/*	1391	/*
1428	* 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
1429	* 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
1430	* 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
1431	* 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.
1432	*/	1396	*/
1433
1434	object *	1397	object *
1435	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)
1436	{	1399	{
1437	object *tmp = NULL, *arrow, *ntmp;	1400	object *tmp = NULL, *arrow, *ntmp;
1438	int attacknum, attacktype, betterby = 0, i;	1401	int attacknum, attacktype, betterby = 0, i;
…		…
1504	* find_better_arrow to find a decent arrow to use.	1467	* find_better_arrow to find a decent arrow to use.
1505	* op = the shooter	1468	* op = the shooter
1506	* type = bow->race	1469	* type = bow->race
1507	* dir = fire direction	1470	* dir = fire direction
1508	*/	1471	*/
1509
1510	object *	1472	object *
1511	pick_arrow_target (object *op, const char *type, int dir)	1473	pick_arrow_target (object *op, const char *type, int dir)
1512	{	1474	{
1513	object *tmp = NULL;	1475	object *tmp = NULL;
1514	maptile *m;	1476	maptile *m;
…		…
1579	*/	1541	*/
1580	int	1542	int
1581	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)
1582	{	1544	{
1583	object *left, *bow;	1545	object *left, *bow;
1584	int bowspeed, mflags;	1546	int mflags;
1585	maptile *m;	1547	maptile *m;
1586		1548
1587	if (!dir)	1549	if (!dir)
1588	{	1550	{
1589	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!");
1590	return 0;	1552	return 0;
1591	}	1553	}
1592		1554
1593	if (op->type == PLAYER)	1555	if (op->contr)
1594	bow = op->contr->ranges[range_bow];	1556	bow = op->current_weapon;
1595	else	1557	else
1596	{	1558	{
1597	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1598	/* 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
1599	* 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.
…		…
1604	if (!bow)	1566	if (!bow)
1605	{	1567	{
1606	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1568	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1607	return 0;	1569	return 0;
1608	}	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
1609	}	1579	}
1610		1580
1611	if (!bow->race || !bow->skill)	1581	if (!bow->race || !bow->skill)
1612	{	1582	{
1613	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);
1614	return 0;	1584	return 0;
1615	}	1585	}
1616
1617	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1618
1619	/* penalize ROF for bestarrow */
1620	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1621	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1622
1623	if (bowspeed < 1)
1624	bowspeed = 1;
1625		1586
1626	if (arrow == NULL)	1587	if (arrow == NULL)
1627	{	1588	{
1628	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1629	{	1590	{
1630	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
1631	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);
1632	/* 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 */
1633	else	1594	else
1634	CLEAR_FLAG (op, FLAG_READY_BOW);	1595	CLEAR_FLAG (op, FLAG_READY_BOW);
		1596
1635	return 0;	1597	return 0;
1636	}	1598	}
1637	}	1599	}
1638		1600
1639	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1601	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1661	return 0;	1623	return 0;
1662	}	1624	}
1663		1625
1664	arrow->set_owner (op);	1626	arrow->set_owner (op);
1665	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1666
1667	arrow->direction = dir;	1628	arrow->direction = dir;
1668	arrow->x = sx;	1629
1669	arrow->y = sy;	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 0
		1638	if (player *pl = op->contr)
		1639	{
		1640	float speed = pl->weapon_sp;
		1641
		1642	/* penalize ROF for bestarrow */
		1643	if (pl->bowtype == bow_bestarrow)
		1644	speed *= .9f;
		1645	else
		1646	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1647
		1648	op->speed_left += speed - op->speed;
		1649	}
		1650	#endif
		1651
		1652	SET_ANIMATION (arrow, arrow->direction);
		1653
		1654	/* update the speed */
		1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1656	+ bow->stats.dam / 7.f;
		1657
		1658	arrow->set_speed (max (arrow->speed, 2.f));
		1659	arrow->speed_left = 0;
		1660
		1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1670		1662
1671	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
1672	{	1664	{
1673	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674	op->update_stats ();
1675	}
1676
1677	SET_ANIMATION (arrow, arrow->direction);
1678	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1679	arrow->stats.hp = arrow->stats.dam;
1680	arrow->stats.grace = arrow->attacktype;
1681	if (arrow->slaying != NULL)
1682	arrow->spellarg = strdup (arrow->slaying);
1683
1684	/* Note that this was different for monsters - they got their level
1685	* added to the damage. I think the strength bonus is more proper.
1686	*/
1687
1688	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1689
1690	/* update the speed */
1691	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1692	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1693
1694	if (arrow->speed < 1.0)
1695	arrow->speed = 1.0;
1696	update_ob_speed (arrow);
1697	arrow->speed_left = 0;
1698
1699	if (op->type == PLAYER)
1700	{
1701	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1702	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1703	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1704
1705	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1666	wc -= dex_bonus[op->stats.Dex];
		1667
		1668	if (!arrow->slaying)
		1669	arrow->slaying = op->slaying;
		1670
		1671	arrow->attacktype |= op->attacktype;
1706	}	1672	}
1707	else	1673	else
1708	{	1674	{
1709	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1710	arrow->level = op->level;	1675	arrow->level = op->level;
1711	}	1676	arrow->stats.wc -= bow->magic;
1712		1677
1713	if (arrow->attacktype == AT_PHYSICAL)	1678	if (!arrow->slaying)
		1679	arrow->slaying = bow->slaying;
		1680
1714	arrow->attacktype |= bow->attacktype;	1681	arrow->attacktype |= bow->attacktype;
		1682	}
1715		1683
1716	if (bow->slaying)	1684	wc -= arrow->level;
1717	arrow->slaying = bow->slaying;	1685	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1718		1686
1719	arrow->map = m;	1687	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1720	arrow->move_type = MOVE_FLY_LOW;	1688	arrow->move_type = MOVE_FLY_LOW;
1721	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1689	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1722		1690
1723	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1691	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1724	insert_ob_in_map (arrow, m, op, 0);	1692	m->insert (arrow, sx, sy, op);
1725		1693
1726	if (!arrow->destroyed ())	1694	if (!arrow->destroyed ())
1727	move_arrow (arrow);	1695	move_arrow (arrow);
1728		1696
1729	if (op->type == PLAYER)	1697	if (op->type == PLAYER)
…		…
1749	{	1717	{
1750	int ret = 0, wcmod = 0;	1718	int ret = 0, wcmod = 0;
1751		1719
1752	if (op->contr->bowtype == bow_bestarrow)	1720	if (op->contr->bowtype == bow_bestarrow)
1753	{	1721	{
1754	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1722	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1755	}	1723	}
1756	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1724	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1757	{	1725	{
1758	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1726	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1759	wcmod = -1;	1727	wcmod = -1;
		1728
1760	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1729	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1761	}	1730	}
1762	else if (op->contr->bowtype == bow_threewide)	1731	else if (op->contr->bowtype == bow_threewide)
1763	{	1732	{
1764	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1733	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1768	else if (op->contr->bowtype == bow_spreadshot)	1737	else if (op->contr->bowtype == bow_spreadshot)
1769	{	1738	{
1770	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);
1771	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1740	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1772	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1741	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1773
1774	}	1742	}
1775	else	1743	else
1776	{	1744	{
1777	/* Simple case */	1745	/* Simple case */
1778	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1779	}	1747	}
		1748
1780	return ret;	1749	return ret;
1781	}	1750	}
1782
1783		1751
1784	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1785	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1786	*/	1754	*/
1787	void	1755	void
1788	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
1789	{	1757	{
1790	object *item;	1758	object *item = op->contr->ranged_ob;
1791		1759
1792	if (!op->contr->ranges[range_misc])	1760	if (!item)
1793	{	1761	{
1794	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1795	return;	1763	return;
1796	}	1764	}
1797		1765
1798	item = op->contr->ranges[range_misc];
1799	if (!item->inv)	1766	if (!item->inv)
1800	{	1767	{
1801	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1802	return;	1769	return;
1803	}	1770	}
		1771
		1772	if (!op->change_weapon (item))
		1773	return;
		1774
1804	if (item->type == WAND)	1775	if (item->type == WAND)
1805	{	1776	{
1806	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1807	{	1778	{
1808	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1809	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1781
1810	return;	1782	return;
1811	}	1783	}
1812	}	1784	}
1813	else if (item->type == ROD || item->type == HORN)	1785	else if (item->type == ROD || item->type == HORN)
1814	{	1786	{
1815	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1816	{	1788	{
1817	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1790
1818	if (item->type == ROD)	1791	if (item->type == ROD)
1819	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1820	else	1793	else
1821	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1795
1822	return;	1796	return;
1823	}	1797	}
1824	}	1798	}
1825		1799
1826	if (cast_spell (op, item, dir, item->inv, NULL))	1800	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1834		1808
1835	if (item->arch)	1809	if (item->arch)
1836	{	1810	{
1837	CLEAR_FLAG (item, FLAG_ANIMATE);	1811	CLEAR_FLAG (item, FLAG_ANIMATE);
1838	item->face = item->arch->clone.face;	1812	item->face = item->arch->clone.face;
1839	item->speed = 0;	1813	item->set_speed (0);
1840	update_ob_speed (item);
1841	}	1814	}
		1815
1842	if ((tmp = item->in_player ()))	1816	if ((tmp = item->in_player ()))
1843	esrv_update_item (UPD_ANIM, tmp, item);	1817	esrv_update_item (UPD_ANIM, tmp, item);
1844	}	1818	}
1845	}	1819	}
1846	else if (item->type == ROD || item->type == HORN)	1820	else if (item->type == ROD || item->type == HORN)
1847	{
1848	drain_rod_charge (item);	1821	drain_rod_charge (item);
1849	}
1850	}	1822	}
1851	}	1823	}
1852		1824
1853	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1854	*/	1826	*/
1855	void	1827	bool
1856	fire (object *op, int dir)	1828	fire (object *op, int dir)
1857	{	1829	{
1858	int spellcost = 0;	1830	int spellcost = 0;
1859		1831
1860	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
1861	if (action_makes_visible (op))	1833	if (action_makes_visible (op))
1862	make_visible (op);	1834	make_visible (op);
1863		1835
1864	switch (op->contr->shoottype)	1836	player *pl = op->contr;
		1837
		1838	if (pl->golem)
		1839	{
		1840	control_golem (op->contr->golem, dir);
		1841	return false;
1865	{	1842	}
1866	case range_none:
1867	return;
1868		1843
1869	case range_bow:	1844	object *ob = pl->ranged_ob;
		1845
		1846	if (!ob)
		1847	return false;
		1848
		1849	if (!op->change_weapon (ob))
		1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
		1856
		1857	switch (ob->type)
		1858	{
		1859	case BOW:
1870	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
1871	return;	1861	break;
1872		1862
1873	case range_magic: /* Casting spells */	1863	case SPELL:
1874	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);
1875	return;	1865	break;
1876		1866
1877	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:
1878	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1879	return;	1877	break;
1880
1881	case range_golem: /* Control summoned monsters from scrolls */
1882	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1883	{
1884	op->contr->ranges[range_golem] = 0;
1885	op->contr->shoottype = range_none;
1886	}
1887	else
1888	control_golem (op->contr->ranges[range_golem], dir);
1889	return;
1890
1891	case range_skill:
1892	if (!op->chosen_skill)
1893	{
1894	if (op->type == PLAYER)
1895	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1896	return;
1897	}
1898	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1899	return;
1900	case range_builder:
1901	apply_map_builder (op, dir);
1902	return;
1903	default:
1904	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1905	return;
1906	}	1878	}
1907	}
1908		1879
1909		1880	return true;
		1881	}
1910		1882
1911	/* find_key	1883	/* find_key
1912	* We try to find a key for the door as passed. If we find a key	1884	* We try to find a key for the door as passed. If we find a key
1913	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
1914	* This function merges both normal and locked door, since the logic	1886	* This function merges both normal and locked door, since the logic
…		…
1916	* pl is the player,	1888	* pl is the player,
1917	* inv is the objects inventory to searched	1889	* inv is the objects inventory to searched
1918	* door is the door we are trying to match against.	1890	* door is the door we are trying to match against.
1919	* This function can be called recursively to search containers.	1891	* This function can be called recursively to search containers.
1920	*/	1892	*/
1921
1922	object *	1893	object *
1923	find_key (object *pl, object *container, object *door)	1894	find_key (object *pl, object *container, object *door)
1924	{	1895	{
1925	object *tmp, *key;	1896	object *tmp, *key;
1926		1897
1927	/* Should not happen, but sanity checking is never bad */	1898	/* Should not happen, but sanity checking is never bad */
1928	if (container->inv == NULL)	1899	if (!container->inv)
1929	return NULL;	1900	return 0;
1930		1901
1931	/* First, lets try to find a key in the top level inventory */	1902	/* First, lets try to find a key in the top level inventory */
1932	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1903	for (tmp = container->inv; tmp; tmp = tmp->below)
1933	{	1904	{
1934	if (door->type == DOOR && tmp->type == KEY)	1905	if (door->type == DOOR && tmp->type == KEY)
1935	break;	1906	break;
1936	/* For sanity, we should really check door type, but other stuff	1907	/* For sanity, we should really check door type, but other stuff
1937	* (like containers) can be locked with special keys	1908	* (like containers) can be locked with special keys
1938	*/	1909	*/
1939	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1910	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1940	break;	1911	break;
1941	}	1912	}
		1913
1942	/* No key found - lets search inventories now */	1914	/* No key found - lets search inventories now */
1943	/* If we find and use a key in an inventory, return at that time.	1915	/* If we find and use a key in an inventory, return at that time.
1944	* otherwise, if we search all the inventories and still don't find	1916	* otherwise, if we search all the inventories and still don't find
1945	* a key, return	1917	* a key, return
1946	*/	1918	*/
1947	if (!tmp)	1919	if (!tmp)
1948	{	1920	{
1949	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1921	for (tmp = container->inv; tmp; tmp = tmp->below)
1950	{	1922	{
1951	/* No reason to search empty containers */	1923	/* No reason to search empty containers */
1952	if (tmp->type == CONTAINER && tmp->inv)	1924	if (tmp->type == CONTAINER && tmp->inv)
1953	{	1925	{
1954	if ((key = find_key (pl, tmp, door)) != NULL)	1926	if ((key = find_key (pl, tmp, door)))
1955	return key;	1927	return key;
1956	}	1928	}
1957	}	1929	}
		1930
1958	if (!tmp)	1931	if (!tmp)
1959	return NULL;	1932	return NULL;
1960	}	1933	}
		1934
1961	/* We get down here if we have found a key. Now if its in a container,	1935	/* We get down here if we have found a key. Now if its in a container,
1962	* see if we actually want to use it	1936	* see if we actually want to use it
1963	*/	1937	*/
1964	if (pl != container)	1938	if (pl != container)
1965	{	1939	{
…		…
1986	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1960	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1987	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1961	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1988	return NULL;	1962	return NULL;
1989	}	1963	}
1990	}	1964	}
		1965
1991	return tmp;	1966	return tmp;
1992	}	1967	}
1993		1968
1994	/* moved door processing out of move_player_attack.	1969	/* moved door processing out of move_player_attack.
1995	* returns 1 if player has opened the door with a key	1970	* returns 1 if player has opened the door with a key
…		…
1997	* 0 otherwise	1972	* 0 otherwise
1998	*/	1973	*/
1999	static int	1974	static int
2000	player_attack_door (object *op, object *door)	1975	player_attack_door (object *op, object *door)
2001	{	1976	{
2002	/* If its a door, try to find a use a key. If we do destroy the door,	1977	/* If its a door, try to find a key. If we do destroy the door,
2003	* might as well return immediately as there is nothing more to do -	1978	* might as well return immediately as there is nothing more to do -
2004	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
2005	*/	1980	*/
2006	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
2007		1982
2008	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
2009	if (key)	1984	if (key)
2010	{	1985	{
2011	object *container = key->env;	1986	object *container = key->env;
2012		1987
2013	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1989
2014	if (action_makes_visible (op))	1990	if (action_makes_visible (op))
2015	make_visible (op);	1991	make_visible (op);
		1992
2016	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1993	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2017	spring_trap (door->inv, op);	1994	spring_trap (door->inv, op);
		1995
2018	if (door->type == DOOR)	1996	if (door->type == DOOR)
2019	{
2020	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1997	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2021	}
2022	else if (door->type == LOCKED_DOOR)	1998	else if (door->type == LOCKED_DOOR)
2023	{	1999	{
2024	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2000	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2025	remove_door2 (door); /* remove door without violence ;-) */	2001	remove_door2 (door); /* remove door without violence ;-) */
2026	}	2002	}
		2003
2027	/* Do this after we print the message */	2004	/* Do this after we print the message */
2028	decrease_ob (key); /* Use up one of the keys */	2005	decrease_ob (key); /* Use up one of the keys */
2029	/* Need to update the weight the container the key was in */	2006	/* Need to update the weight the container the key was in */
2030	if (container != op)	2007	if (container != op)
2031	esrv_update_item (UPD_WEIGHT, op, container);	2008	esrv_update_item (UPD_WEIGHT, op, container);
		2009
2032	return 1; /* Nothing more to do below */	2010	return 1; /* Nothing more to do below */
2033	}	2011	}
2034	else if (door->type == LOCKED_DOOR)	2012	else if (door->type == LOCKED_DOOR)
2035	{	2013	{
2036	/* Might as well return now - no other way to open this */	2014	/* Might as well return now - no other way to open this */
2037	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2015	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2038	return 1;	2016	return 1;
2039	}	2017	}
		2018
2040	return 0;	2019	return 0;
2041	}	2020	}
2042		2021
2043	/* This function is just part of a breakup from move_player.	2022	/* This function is just part of a breakup from move_player.
2044	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
2045	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
2046	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
2047	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2048	*/	2027	*/
2049	void	2028	bool
2050	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2051	{	2030	{
2052	object *tmp, *mon;
2053	sint16 nx, ny;
2054	int on_battleground;	2031	int on_battleground;
2055	maptile *m;
2056		2032
2057	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2058	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2059		2035
2060	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
		2037
		2038	if (out_of_map (op->map, nx, ny))
		2039	return false;
		2040
		2041	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2042	{
		2043	--op->speed_left;
		2044	return true;
		2045	}
2061		2046
2062	/* If braced, or can't move to the square, and it is not out of the	2047	/* If braced, or can't move to the square, and it is not out of the
2063	* map, attack it. Note order of if statement is important - don't	2048	* map, attack it. Note order of if statement is important - don't
2064	* want to be calling move_ob if braced, because move_ob will move the	2049	* want to be calling move_ob if braced, because move_ob will move the
2065	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2066	* move to some space, it then means that if we are braced, we should	2051	* move to some space, it then means that if we are braced, we should
2067	* do nothing at all. As it is, if we are braced, we go through	2052	* do nothing at all. As it is, if we are braced, we go through
2068	* quite a bit of processing. However, it probably is less than what	2053	* quite a bit of processing. However, it probably is less than what
2069	* move_ob uses.	2054	* move_ob uses.
2070	*/	2055	*/
2071	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2056	maptile *m = op->map->xy_find (nx, ny);
2072	{
2073	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2074	{
2075	m = get_map_from_coord (op->map, &nx, &ny);
2076	if (!m)
2077	return; /* Don't think this should happen */
2078	}
2079	else
2080	m = op->map;
2081		2057
2082	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2083	{
2084	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2085	return;
2086	}
2087
2088	mon = 0;
2089	/* Go through all the objects, and find ones of interest. Only stop if	2058	/* Go through all the objects, and find ones of interest. Only stop if
2090	* we find a monster - that is something we know we want to attack.	2059	* we find a monster - that is something we know we want to attack.
2091	* if its a door or barrel (can roll) see if there may be monsters	2060	* if its a door or barrel (can roll) see if there may be monsters
2092	* on the space	2061	* on the space
2093	*/	2062	*/
2094	while (tmp)	2063	object *mon;
2095	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2096	if (tmp == op)	2065	{
2097	{	2066	if ((mon->flag [FLAG_ALIVE]
2098	tmp = tmp->above;	2067	|| mon->type == LOCKED_DOOR
2099	continue;	2068	|| mon->flag [FLAG_CAN_ROLL])
2100	}
2101
2102	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2103	{
2104	mon = tmp;	2069	&& mon != op)
2105	break;	2070	break;
2106	}	2071	}
2107		2072
2108	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2109	mon = tmp;
2110
2111	tmp = tmp->above;
2112	}
2113
2114	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2115	return; /* into a wall */	2074	return false; /* into a wall */
2116		2075
2117	if (mon->head)
2118	mon = mon->head;	2076	mon = mon->head_ ();
2119		2077
2120	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2078	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2079	if (op->contr->weapon_sp_left > 0.f)
2121	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2122	return;	2083	return true;
		2084	}
2123		2085
2124	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2125	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2126	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2127	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2128	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2129	* and thus will not push them.	2091	* and thus will not push them.
2130	*/	2092	*/
2131		2093
2132	/* If the creature is a pet, push it even if the player is not	2094	/* If the creature is a pet, push it even if the player is not
2133	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2134	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2135	*/	2097	*/
2136	if ((op->type == PLAYER)	2098	if (op->type == PLAYER
2137	#if COZY_SERVER
2138	&&
2139	((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2140	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2141	#else
2142	&& mon->owner == op	2101	|| mon->owner == op)
2143	#endif
2144	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2145	{	2103	{
2146	/* If we're braced, we don't want to switch places with it */	2104	/* If we're braced, we don't want to switch places with it */
2147	if (op->contr->braced)	2105	if (op->contr->braced)
2148	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
		2111
2149	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2112	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2150	(void) push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2151	if (op->contr->tmp_invis || op->hide)	2115	if (op->contr->tmp_invis || op->hide)
2152	make_visible (op);	2116	make_visible (op);
		2117
2153	return;	2118	return true;
2154	}	2119	}
		2120	else
		2121	return false;
		2122	}
2155		2123
2156	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2157	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2158	* someone, but put it inside this loop so that you won't	2126	* someone, but put it inside this loop so that you won't
2159	* attack them either.	2127	* attack them either.
2160	*/	2128	*/
2161	if ((mon->type == PLAYER || mon->enemy != op) &&	2129	if ((mon->type == PLAYER || mon->enemy != op)
2162	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2130	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2163	#ifdef PROHIBIT_PLAYERKILL
2164	(op->contr->peaceful	2131	&& ((op->contr->peaceful
2165	|| (mon->type == PLAYER	2132	|| (mon->type == PLAYER && mon->contr->peaceful))
2166	&& mon->contr->
2167	peaceful)) &&
2168	#else
2169	op->contr->peaceful &&
2170	#endif
2171	!on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2172	{	2136	{
		2137	--op->speed_left;
		2138
2173	if (!op->contr->braced)	2139	if (!op->contr->braced)
2174	{	2140	{
2175	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2141	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2176	(void) push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2177	}	2143	}
2178	else	2144	else
2179	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2180		2146
2181	if (op->contr->tmp_invis || op->hide)	2147	if (op->contr->tmp_invis || op->hide)
2182	make_visible (op);	2148	make_visible (op);
2183	}
2184		2149
		2150	return true;
		2151	}
		2152	}
2185	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2186	* roll it if not braced. You can't roll it if you are braced.	2154	* roll it if not braced. You can't roll it if you are braced.
2187	*/	2155	*/
2188	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2157	{
		2158	if (op->speed_left > 0.f)
2189	{	2159	{
		2160	--op->speed_left;
		2161
2190	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2191	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2192	make_visible (op);	2164	make_visible (op);
2193	}
2194		2165
		2166	return true;
		2167	}
		2168	}
2195	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2196	* Way it works is like this: First, it must have some hit points	2170	* Way it works is like this: First, it must have some hit points
2197	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2198	* 1) Not a player, 2) A player, but of a different party. Note	2172	* 1) Not a player, 2) A player, but of a different party. Note
2199	* that party_number -1 is no party, so attacks can still happen.	2173	* that party_number -1 is no party, so attacks can still happen.
2200	*/	2174	*/
2201
2202	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2203	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2176	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2204	{	2177	{
2205		2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2206	/* If the player hasn't hit something this tick, and does
2207	* so, give them speed boost based on weapon speed. Doing
2208	* it here is better than process_players2, which basically
2209	* incurred a 1 tick offset.
2210	*/
2211	if (!op->contr->has_hit)
2212	{	2179	{
2213	op->speed_left += op->speed / op->contr->weapon_sp;	2180	--op->contr->weapon_sp_left;
2214
2215	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2216	}
2217		2181
2218	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2219
2220	/* If attacking another player, that player gets automatic
2221	* hitback, and doesn't loose luck either.
2222	* Disable hitback on the battleground or if the target is
2223	* the wiz.
2224	*/
2225	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2226	{
2227	short luck = mon->stats.luck;
2228
2229	mon->contr->has_hit = 1;
2230	skill_attack (op, mon, 0, 0, 0);
2231	mon->stats.luck = luck;
2232	}
2233		2183
2234	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2235	make_visible (op);	2185	make_visible (op);
2236	}
2237	} /* if player should attack something */
2238	}
2239		2186
2240	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2241	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2242	{	2196	{
2243	int pick;	2197	int pick;
2244		2198
2245	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2246	return 0;	2200	return 0;
2247		2201
2248	/* Sanity check: make sure dir is valid */	2202	/* Sanity check: make sure dir is valid */
2249	if ((dir < 0) || (dir >= 9))	2203	if ((dir < 0) || (dir >= 9))
2250	{	2204	{
2251	LOG (llevError, "move_player: invalid direction %d\n", dir);	2205	LOG (llevError, "move_player: invalid direction %d\n", dir);
2252	return 0;	2206	return 0;
2253	}	2207	}
2254		2208
2255	/* peterm: added following line */	2209	/* peterm: added following line */
2256	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2210	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2257	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2211	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2258		2212
2259	op->facing = dir;	2213	op->facing = dir;
2260		2214
2261	if (op->hide)	2215	if (op->hide)
2262	do_hidden_move (op);	2216	do_hidden_move (op);
2263		2217
		2218	bool retval;
		2219
2264	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2265	/*nop */ ;	2221	retval = RESULT_INT (0);
2266	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2267	fire (op, dir);	2223	retval = fire (op, dir);
2268	else	2224	else
2269	{	2225	{
2270	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2271	pick = check_pick (op);	2227	pick = check_pick (op);
2272	}	2228	}
2273		2229
2274	/* Add special check for newcs players and fire on - this way, the	2230	/* Add special check for newcs players and fire on - this way, the
2275	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2282	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2283	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2284	* for players.	2240	* for players.
2285	*/	2241	*/
2286	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2287	return 0;	2243
		2244	return retval;
2288	}	2245	}
2289		2246
2290	/* This is similar to handle_player, below, but is only used by the	2247	/* This is similar to handle_player, below, but is only used by the
2291	* new client/server stuff.	2248	* new client/server stuff.
2292	* This is sort of special, in that the new client/server actually uses	2249	* This is sort of special, in that the new client/server actually uses
2293	* the new speed values for commands.	2250	* the new speed values for commands.
2294	*	2251	*
2295	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do. Should not do
		2253	* many actions in a row, as that would be too unfair to other
		2254	* players.
2296	*/	2255	*/
2297	int	2256	bool
2298	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2299	{	2258	{
2300	if (op->contr->hidden)
2301	{
2302	op->invisible = 1000;
2303	/* the socket code flashes the player visible/invisible
2304	* depending on the value of invisible, so we need to
2305	* alternate it here for it to work correctly.
2306	*/
2307	if (pticks & 2)
2308	op->invisible--;
2309	}
2310	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2311	{
2312	op->invisible--;
2313	if (!op->invisible)
2314	{
2315	make_visible (op);
2316	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2317	}
2318	}
2319
2320	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2321	{	2260	{
2322	flee_player (op);	2261	if (op->speed_left > 0.f)
2323	/* If player is still scared, that is his action for this tick */
2324	if (QUERY_FLAG (op, FLAG_SCARED))
2325	{	2262	{
2326	op->speed_left--;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2327	return 0;	2266	return true;
2328	}	2267	}
		2268	else
		2269	return false;
2329	}	2270	}
2330
2331	/* I've been seeing crashes where the golem has been destroyed, but
2332	* the player object still points to the defunct golem. The code that
2333	* destroys the golem looks correct, and it doesn't always happen, so
2334	* put this in a a workaround to clean up the golem pointer.
2335	*/
2336	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2337	op->contr->ranges[range_golem] = 0;
2338		2271
2339	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2340	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2341	* called, so we recheck it here.	2274	* called, so we recheck it here.
2342	*/	2275	*/
2343	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2276	if (op->contr->ns->handle_command ())
2344	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2345	;
2346
2347	if (op->speed_left < 0)
2348	return 0;	2277	return true;
2349		2278
2350	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2351	{
2352	/* All move commands take 1 tick, at least for now */
2353	op->speed_left--;
2354
2355	/* Instead of all the stuff below, let move_player take care
2356	* of it. Also, some of the skill stuff is only put in
2357	* there, as well as the confusion stuff.
2358	*/
2359	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2360	if (op->speed_left > 0)
2361	return 1;
2362	else
2363	return 0;
2364	}
2365		2281
2366	return 0;	2282	return false;
2367	}	2283	}
2368		2284
2369	int	2285	int
2370	save_life (object *op)	2286	save_life (object *op)
2371	{	2287	{
…		…
2406	* from.	2322	* from.
2407	*/	2323	*/
2408	void	2324	void
2409	remove_unpaid_objects (object *op, object *env)	2325	remove_unpaid_objects (object *op, object *env)
2410	{	2326	{
2411	object *next;
2412
2413	while (op)	2327	while (op)
2414	{	2328	{
2415	next = op->below; /* Make sure we have a good value, in case	2329	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2416	* we remove object 'op'	2330
2417	*/
2418	if (QUERY_FLAG (op, FLAG_UNPAID))	2331	if (QUERY_FLAG (op, FLAG_UNPAID))
2419	{	2332	{
2420	op->remove ();
2421	op->x = env->x;
2422	op->y = env->y;
2423	if (env->type == PLAYER)	2333	if (env->type == PLAYER)
2424	esrv_del_item (env->contr, op->count);	2334	esrv_del_item (env->contr, op->count);
2425	insert_ob_in_map (op, env->map, NULL, 0);	2335
		2336	op->insert_at (env);
2426	}	2337	}
2427	else if (op->inv)	2338	else if (op->inv)
2428	remove_unpaid_objects (op->inv, env);	2339	remove_unpaid_objects (op->inv, env);
2429		2340
2430	op = next;	2341	op = next;
…		…
2486	int rate_grace = 2000;	2397	int rate_grace = 2000;
2487	const int max_hp = 1;	2398	const int max_hp = 1;
2488	const int max_sp = 1;	2399	const int max_sp = 1;
2489	const int max_grace = 1;	2400	const int max_grace = 1;
2490		2401
2491	if (op->contr->outputs_sync)	2402	if (op->contr->hidden)
		2403	{
		2404	op->invisible = 1000;
		2405	/* the socket code flashes the player visible/invisible
		2406	* depending on the value of invisible, so we need to
		2407	* alternate it here for it to work correctly.
		2408	*/
		2409	if (pticks & 2)
		2410	op->invisible--;
2492	{	2411	}
2493	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2412	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2494	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2413	{
2495	flush_output_element (op, &op->contr->outputs[i]);	2414	if (!op->invisible--)
		2415	{
		2416	make_visible (op);
		2417	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2418	}
2496	}	2419	}
2497		2420
2498	if (op->contr->ns->state == ST_PLAYING)	2421	if (op->contr->ns->state == ST_PLAYING)
2499	{	2422	{
2500	/* these next three if clauses make it possible to SLOW DOWN	2423	/* these next three if clauses make it possible to SLOW DOWN
…		…
2522	gen_grace = op->stats.maxgrace;	2445	gen_grace = op->stats.maxgrace;
2523	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2446	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2524	}	2447	}
2525		2448
2526	/* Regenerate Spell Points */	2449	/* Regenerate Spell Points */
2527	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2450	if (!op->contr->golem && --op->last_sp < 0)
2528	{	2451	{
2529	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2452	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2530	if (op->stats.sp < op->stats.maxsp)	2453	if (op->stats.sp < op->stats.maxsp)
2531	{	2454	{
2532	op->stats.sp++;	2455	op->stats.sp++;
…		…
2630	}	2553	}
2631		2554
2632	/* Digestion */	2555	/* Digestion */
2633	if (--op->last_eat < 0)	2556	if (--op->last_eat < 0)
2634	{	2557	{
2635	#ifdef COZY_SERVER
2636	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2637	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2638	#else
2639	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2558	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2640	#endif
2641		2559
2642	if (op->contr->gen_hp > 0)	2560	if (op->contr->gen_hp > 0)
2643	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2644	else	2562	else
2645	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2723	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2641	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2724	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2642	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2725		2643
2726	/* restore player */	2644	/* restore player */
2727	at = archetype::find ("poisoning");	2645	at = archetype::find ("poisoning");
2728	tmp = present_arch_in_ob (at, op);	2646	if (object *tmp = present_arch_in_ob (at, op))
2729	if (tmp)
2730	{	2647	{
2731	tmp->destroy ();	2648	tmp->destroy ();
2732	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2649	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2733	}	2650	}
2734		2651
2735	at = archetype::find ("confusion");	2652	at = archetype::find ("confusion");
2736	tmp = present_arch_in_ob (at, op);	2653	if (object *tmp = present_arch_in_ob (at, op))
2737	if (tmp)
2738	{	2654	{
2739	tmp->destroy ();	2655	tmp->destroy ();
2740	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2656	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2741	}	2657	}
2742		2658
…		…
2744	op->stats.hp = op->stats.maxhp;	2660	op->stats.hp = op->stats.maxhp;
2745	if (op->stats.food <= 0)	2661	if (op->stats.food <= 0)
2746	op->stats.food = 999;	2662	op->stats.food = 999;
2747		2663
2748	/* create a bodypart-trophy to make the winner happy */	2664	/* create a bodypart-trophy to make the winner happy */
2749	tmp = arch_to_object (archetype::find ("finger"));	2665	if (object *tmp = arch_to_object (archetype::find ("finger")))
2750	if (tmp != NULL)
2751	{	2666	{
2752	sprintf (buf, "%s's finger", &op->name);	2667	sprintf (buf, "%s's finger", &op->name);
2753	tmp->name = buf;	2668	tmp->name = buf;
2754	sprintf (buf, " This finger has been cut off %s\n"	2669	sprintf (buf, " This finger has been cut off %s\n"
2755	" the %s, when he was defeated at\n level %d by %s.\n",	2670	" the %s, when he was defeated at\n level %d by %s.\n",
2756	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2671	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2757	tmp->msg = buf;	2672	tmp->msg = buf;
2758	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2673	tmp->value = 0, tmp->type = 0;
2759	tmp->materialname = NULL;	2674	tmp->materialname = "organics";
2760	tmp->x = op->x, tmp->y = op->y;	2675	tmp->insert_at (op, tmp);
2761	insert_ob_in_map (tmp, op->map, op, 0);
2762	}	2676	}
2763		2677
2764	/* teleport defeated player to new destination */	2678	/* teleport defeated player to new destination */
2765	transfer_ob (op, x, y, 0, NULL);	2679	transfer_ob (op, x, y, 0, NULL);
2766	op->contr->braced = 0;	2680	op->contr->braced = 0;
…		…
2771		2685
2772	command_kill_pets (op, 0);	2686	command_kill_pets (op, 0);
2773		2687
2774	if (op->stats.food < 0)	2688	if (op->stats.food < 0)
2775	{	2689	{
2776	if (op->contr->explore)
2777	{
2778	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2779	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2780	op->stats.food = 999;
2781	return;
2782	}
2783	sprintf (buf, "%s starved to death.", &op->name);	2690	sprintf (buf, "%s starved to death.", &op->name);
2784	strcpy (op->contr->killer, "starvation");	2691	strcpy (op->contr->killer, "starvation");
2785	}	2692	}
2786	else	2693	else
2787	{
2788	if (op->contr->explore)
2789	{
2790	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2791	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2792	op->stats.hp = op->stats.maxhp;
2793	return;
2794	}
2795	sprintf (buf, "%s died.", &op->name);	2694	sprintf (buf, "%s died.", &op->name);
2796	}	2695
2797	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2696	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2798		2697
2799	/* save the map location for corpse, gravestone */	2698	/* save the map location for corpse, gravestone */
2800	x = op->x;	2699	x = op->x;
2801	y = op->y;	2700	y = op->y;
2802	map = op->map;	2701	map = op->map;
2803
2804		2702
2805	/* NOT_PERMADEATH code. This basically brings the character back to	2703	/* NOT_PERMADEATH code. This basically brings the character back to
2806	* life if they are dead - it takes some exp and a random stat.	2704	* life if they are dead - it takes some exp and a random stat.
2807	* See the config.h file for a little more in depth detail about this.	2705	* See the config.h file for a little more in depth detail about this.
2808	*/	2706	*/
…		…
2825	num_stats_lose = 1;	2723	num_stats_lose = 1;
2826	else	2724	else
2827	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2725	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2828	}	2726	}
2829	else	2727	else
2830	{
2831	num_stats_lose = 1;	2728	num_stats_lose = 1;
2832	}	2729
2833	lost_a_stat = 0;	2730	lost_a_stat = 0;
2834		2731
2835	for (z = 0; z < num_stats_lose; z++)	2732	for (z = 0; z < num_stats_lose; z++)
2836	{	2733	{
2837	i = RANDOM () % NUM_STATS;	2734	i = RANDOM () % NUM_STATS;
…		…
2978	op->stats.hp = op->stats.maxhp;	2875	op->stats.hp = op->stats.maxhp;
2979	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2876	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2980	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2877	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2981		2878
2982	/*	2879	/*
2983	* Check to see if the player is in a shop. IF so, then check to see if
2984	* the player has any unpaid items. If so, remove them and put them back	2880	* Check to see if the player has any unpaid items. If so, remove them
2985	* in the map.	2881	* and put them back in the map.
2986	*/	2882	*/
2987
2988	if (is_in_shop (op))
2989	remove_unpaid_objects (op->inv, op);	2883	remove_unpaid_objects (op->inv, op);
2990		2884
2991	/****************************************/	2885	/****************************************/
2992	/* */	2886	/* */
2993	/* Move player to his current respawn- */	2887	/* Move player to his current respawn- */
2994	/* position (usually last savebed) */	2888	/* position (usually last savebed) */
2995	/* */	2889	/* */
2996	/****************************************/	2890	/****************************************/
2997		2891
2998	enter_player_savebed (op);	2892	enter_player_savebed (op);
2999		2893
3000	/* Save the player before inserting the force to reduce
3001	* chance of abuse.
3002	*/
3003	op->contr->braced = 0;	2894	op->contr->braced = 0;
3004	op->contr->save ();
3005		2895
3006	/* it is possible that the player has blown something up	2896	/* it is possible that the player has blown something up
3007	* at his savebed location, and that can have long lasting	2897	* at his savebed location, and that can have long lasting
3008	* spell effects. So first see if there is a spell effect	2898	* spell effects. So first see if there is a spell effect
3009	* on the space that might harm the player.	2899	* on the space that might harm the player.
…		…
3018	object *force;	2908	object *force;
3019	int at;	2909	int at;
3020		2910
3021	force = get_archetype (FORCE_NAME);	2911	force = get_archetype (FORCE_NAME);
3022	/* 50 ticks should be enough time for the spell to abate */	2912	/* 50 ticks should be enough time for the spell to abate */
3023	force->speed = 0.1;	2913	force->speed = 0.1f;
3024	force->speed_left = -5.0;	2914	force->speed_left = -5.f;
3025	SET_FLAG (force, FLAG_APPLIED);	2915	SET_FLAG (force, FLAG_APPLIED);
3026	for (at = 0; at < NROFATTACKS; at++)	2916	for (at = 0; at < NROFATTACKS; at++)
3027	if (will_kill_again & (1 << at))	2917	if (will_kill_again & (1 << at))
3028	force->resist[at] = 100;	2918	force->resist[at] = 100;
3029		2919
…		…
3038	void	2928	void
3039	loot_object (object *op)	2929	loot_object (object *op)
3040	{ /* Grab and destroy some treasure */	2930	{ /* Grab and destroy some treasure */
3041	object *tmp, *tmp2, *next;	2931	object *tmp, *tmp2, *next;
3042		2932
3043	if (op->container)	2933	op->close_container (); /* close open sack first */
3044	esrv_apply_container (op, op->container); /* close open sack first */
3045		2934
3046	for (tmp = op->inv; tmp; tmp = next)	2935	for (tmp = op->inv; tmp; tmp = next)
3047	{	2936	{
3048	next = tmp->below;	2937	next = tmp->below;
3049		2938
3050	if (tmp->invisible)	2939	if (tmp->invisible)
3051	continue;	2940	continue;
3052		2941
3053	tmp->remove ();	2942	tmp->remove ();
3054	tmp->x = op->x, tmp->y = op->y;	2943	tmp->x = op->x, tmp->y = op->y;
		2944
3055	if (tmp->type == CONTAINER)	2945	if (tmp->type == CONTAINER)
3056	{ /* empty container to ground */	2946	loot_object (tmp); /* empty container to ground */
3057	loot_object (tmp);	2947
3058	}
3059	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2948	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3060	{	2949	{
3061	if (tmp->nrof > 1)	2950	if (tmp->nrof > 1)
3062	{	2951	{
3063	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2952	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3064	tmp2->destroy ();	2953	tmp2->destroy ();
…		…
3075	/*	2964	/*
3076	* fix_weight(): Check recursively the weight of all players, and fix	2965	* fix_weight(): Check recursively the weight of all players, and fix
3077	* what needs to be fixed. Refresh windows and fix speed if anything	2966	* what needs to be fixed. Refresh windows and fix speed if anything
3078	* was changed.	2967	* was changed.
3079	*/	2968	*/
3080
3081	void	2969	void
3082	fix_weight (void)	2970	fix_weight (void)
3083	{	2971	{
3084	for_all_players (pl)	2972	for_all_players (pl)
3085	{	2973	{
…		…
3145	if (op->type == PLAYER)	3033	if (op->type == PLAYER)
3146	{	3034	{
3147	op->contr->tmp_invis = 0;	3035	op->contr->tmp_invis = 0;
3148	op->contr->invis_race = 0;	3036	op->contr->invis_race = 0;
3149	}	3037	}
		3038
3150	update_object (op, UP_OBJ_FACE);	3039	update_object (op, UP_OBJ_CHANGE);
3151	}	3040	}
3152		3041
3153	int	3042	int
3154	is_true_undead (object *op)	3043	is_true_undead (object *op)
3155	{	3044	{
3156	object *tmp = NULL;
3157
3158	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3045	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3159	return 1;	3046	return 1;
3160		3047
3161	return 0;	3048	return 0;
3162	}	3049	}
…		…
3207	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3208	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3209	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3210	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3211	*/	3098	*/
3212
3213	void	3099	void
3214	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3215	{	3101	{
3216	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3217	object *skop;	3103	object *skop;
…		…
3221		3107
3222	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3108	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3223		3109
3224	/* its *extremely* hard to run and sneak/hide at the same time! */	3110	/* its *extremely* hard to run and sneak/hide at the same time! */
3225	if (op->type == PLAYER && op->contr->run_on)	3111	if (op->type == PLAYER && op->contr->run_on)
3226	{
3227	if (!skop || num >= skop->level)	3112	if (!skop || num >= skop->level)
3228	{	3113	{
3229	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3114	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3230	make_visible (op);	3115	make_visible (op);
3231	return;	3116	return;
3232	}	3117	}
3233	else	3118	else
3234	num += 20;	3119	num += 20;
3235	}	3120
3236	num += op->map->difficulty;	3121	num += op->map->difficulty;
3237	hide = hideability (op); /* modify by terrain hidden level */	3122	hide = hideability (op); /* modify by terrain hidden level */
3238	num -= hide;	3123	num -= hide;
		3124
3239	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3125	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3240	{	3126	{
3241	make_visible (op);	3127	make_visible (op);
3242	if (op->type == PLAYER)	3128	if (op->type == PLAYER)
3243	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3129	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3244	}	3130	}
3245	else if (op->type == PLAYER && skop)	3131	else if (op->type == PLAYER && skop)
3246	{
3247	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3132	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3248	}
3249	}	3133	}
3250		3134
3251	/* determine if who is standing near a hostile creature. */	3135	/* determine if who is standing near a hostile creature. */
3252		3136
3253	int	3137	int
…		…
3320	if (pl->type != PLAYER)	3204	if (pl->type != PLAYER)
3321	{	3205	{
3322	LOG (llevError, "player_can_view() called for non-player object\n");	3206	LOG (llevError, "player_can_view() called for non-player object\n");
3323	return -1;	3207	return -1;
3324	}	3208	}
		3209
3325	if (!pl || !op)	3210	if (!pl || !op)
3326	return 0;	3211	return 0;
3327		3212
3328	if (op->head)
3329	{
3330	op = op->head;	3213	op = op->head_ ();
3331	}	3214
3332	get_rangevector (pl, op, &rv, 0x1);	3215	get_rangevector (pl, op, &rv, 0x1);
3333		3216
3334	/* starting with the 'head' part, lets loop	3217	/* starting with the 'head' part, lets loop
3335	* through the object and find if it has any	3218	* through the object and find if it has any
3336	* part that is in the los array but isnt on	3219	* part that is in the los array but isnt on
…		…
3453	char buf[MAX_BUF]; /* tmp. string buffer */	3336	char buf[MAX_BUF]; /* tmp. string buffer */
3454	int i = 0, j = 0;	3337	int i = 0, j = 0;
3455		3338
3456	/* get the appropriate treasurelist */	3339	/* get the appropriate treasurelist */
3457	if (atnr == ATNR_FIRE)	3340	if (atnr == ATNR_FIRE)
3458	trlist = find_treasurelist ("dragon_ability_fire");	3341	trlist = treasurelist::find ("dragon_ability_fire");
3459	else if (atnr == ATNR_COLD)	3342	else if (atnr == ATNR_COLD)
3460	trlist = find_treasurelist ("dragon_ability_cold");	3343	trlist = treasurelist::find ("dragon_ability_cold");
3461	else if (atnr == ATNR_ELECTRICITY)	3344	else if (atnr == ATNR_ELECTRICITY)
3462	trlist = find_treasurelist ("dragon_ability_elec");	3345	trlist = treasurelist::find ("dragon_ability_elec");
3463	else if (atnr == ATNR_POISON)	3346	else if (atnr == ATNR_POISON)
3464	trlist = find_treasurelist ("dragon_ability_poison");	3347	trlist = treasurelist::find ("dragon_ability_poison");
3465		3348
3466	if (trlist == NULL || who->type != PLAYER)	3349	if (trlist == NULL || who->type != PLAYER)
3467	return;	3350	return;
3468		3351
3469	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3352	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470		3353
3471	if (tr == NULL || tr->item == NULL)	3354	if (!tr || !tr->item)
3472	{	3355	{
3473	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3356	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474	return;	3357	return;
3475	}	3358	}
3476		3359
…		…
3543	/* forces in the treasurelist can alter the player's stats */	3426	/* forces in the treasurelist can alter the player's stats */
3544	object *skin;	3427	object *skin;
3545		3428
3546	/* first get the dragon skin force */	3429	/* first get the dragon skin force */
3547	shstr_cmp dragon_skin_force ("dragon_skin_force");	3430	shstr_cmp dragon_skin_force ("dragon_skin_force");
3548	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3431	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3549	;	3432	;
3550		3433
3551	if (!skin)	3434	if (!skin)
3552	return;	3435	return;
3553		3436
…		…
3601	* not readied.	3484	* not readied.
3602	*/	3485	*/
3603	void	3486	void
3604	player_unready_range_ob (player *pl, object *ob)	3487	player_unready_range_ob (player *pl, object *ob)
3605	{	3488	{
3606	rangetype i;	3489	if (pl->ob->current_weapon == ob)
		3490	pl->ob->current_weapon = 0;
3607		3491
3608	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3492	if (pl->combat_ob == ob)
3609	{	3493	pl->combat_ob = 0;
		3494
3610	if (pl->ranges[i] == ob)	3495	if (pl->ranged_ob == ob)
3611	{	3496	pl->ranged_ob = 0;
3612	pl->ranges[i] = NULL;
3613	if (pl->shoottype == i)
3614	{
3615	pl->shoottype = range_none;
3616	}
3617	}
3618	}
3619	}	3497	}
		3498
		3499	sint8
		3500	player::visibility_at (maptile *map, int x, int y) const
		3501	{
		3502	if (!ns)
		3503	return 0;
		3504
		3505	int dx, dy;
		3506	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3507	return 0;
		3508
		3509	x += dx - ns->current_x + ns->mapx / 2;
		3510	y += dy - ns->current_y + ns->mapy / 2;
		3511
		3512	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3513	return 0;
		3514
		3515	return 100 - blocked_los [x][y];
		3516	}

Diff Legend

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