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.56 by root, Sat Dec 23 05:25:18 2006 UTC vs.
Revision 1.143 by root, Fri May 18 21:12:40 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32		32
33	#include <algorithm>	33	#include <algorithm>
34	#include <functional>	34	#include <functional>
35		35
36	player *	36	playervec players;
37	find_player (const char *plname)
38	{
39	player *pl;
40
41	for (pl = first_player; pl; pl = pl->next)
42	if (pl->ob && !strcmp (query_name (pl->ob), plname))
43	return pl;
44
45	return 0;
46	}
47		37
48	void	38	void
49	display_motd (const object *op)	39	display_motd (const object *op)
50	{	40	{
51	char buf[MAX_BUF];	41	char buf[MAX_BUF];
…		…
125		115
126	news[0] = '\0';	116	news[0] = '\0';
127	subject[0] = '\0';	117	subject[0] = '\0';
128	size = 0;	118	size = 0;
129		119
130	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
131	{	121	{
132	if (*buf == '#')	122	if (*buf == '#')
133	continue;	123	continue;
134		124
135	if (*buf == '%')	125	if (*buf == '%')
136	{ /* send one news */	126	{ /* send one news */
137	if (size > 0)	127	if (size > 0)
138	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
139	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
140	strip_endline (subject);	131	strip_endline (subject);
141	size = 0;	132	size = 0;
142	news[0] = '\0';	133	news[0] = '\0';
143	}	134	}
…		…
152	size += strlen (buf);	143	size += strlen (buf);
153	}	144	}
154	}	145	}
155		146
156	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
157	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);
158	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
159	}	150	}
160		151
161	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
162	static void	153	static void
163	set_first_map (object *op)	154	set_first_map (object *op)
164	{	155	{
165	strcpy (op->contr->maplevel, first_map_path);	156	op->contr->maplevel = first_map_path;
166	op->x = -1;	157	op->x = -1;
167	op->y = -1;	158	op->y = -1;
		159	}
		160
		161	void
		162	player::enter_map ()
		163	{
		164	object *tmp = object::create ();
		165
		166	EXIT_PATH (tmp) = maplevel;
		167	EXIT_X (tmp) = ob->x;
		168	EXIT_Y (tmp) = ob->y;
168	enter_exit (op, 0);	169	ob->enter_exit (tmp);
		170
		171	tmp->destroy ();
		172	}
		173
		174	void
		175	player::activate ()
		176	{
		177	if (active)
		178	return;
		179
		180	players.insert (this);
		181	ob->remove ();
		182	ob->map = 0;
		183	ob->activate_recursive ();
		184	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		185	add_friendly_object (ob);
		186	enter_map ();
		187	}
		188
		189	void
		190	player::deactivate ()
		191	{
		192	if (!active)
		193	return;
		194
		195	terminate_all_pets (ob);
		196	remove_friendly_object (ob);
		197	ob->deactivate_recursive ();
		198
		199	if (ob->map)
		200	maplevel = ob->map->path;
		201
		202	ob->remove ();
		203	ob->map = 0;
		204	party = 0;
		205
		206	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		207
		208	players.erase (this);
169	}	209	}
170		210
171	// connect the player with a specific client	211	// connect the player with a specific client
172	// also changed, rationalises, and fixes some incorrect settings	212	// also changes, rationalises, and fixes some incorrect settings
173	void	213	void
174	player::connect (client *ns)	214	player::connect (client *ns)
175	{	215	{
176	this->ns = ns;	216	this->ns = ns;
177	ns->pl = this;	217	ns->pl = this;
178		218
179	next = first_player;	219	run_on = 0;
180	first_player = this;	220	fire_on = 0;
		221	ob->close_container (); //TODO: client-specific
181		222
182	ns->update_look = 0;	223	ns->update_look = 0;
183	ns->look_position = 0;	224	ns->look_position = 0;
184		225
185	clear_los (ob);	226	clear_los (ob);
186		227
		228	ns->reset_stats ();
		229
		230	/* make sure he's a player -- needed because of class change. */
187	ob->type = PLAYER; // we are paranoid	231	ob->type = PLAYER; // we are paranoid
188	ob->race = ob->arch->clone.race;	232	ob->race = ob->arch->clone.race;
189		233
190	if (!legal_range (ob, shoottype))
191	shoottype = range_none;
192
193	ob->carrying = sum_weight (ob);	234	ob->carrying = sum_weight (ob);
194	link_player_skills (ob);	235	link_player_skills (ob);
195		236
196	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
197	ob->update_stats ();
198	update_ob_speed (ob);
199		238
200	assign (title, ob->arch->clone.name);	239	assign (title, ob->arch->clone.name);
201
202	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
203	* from the class, and not race. I don't see any way to get the class information
204	* to then update this. I don't think this will actually break anything - anyone
205	* that can use armour should be able to use a shield. What this may 'break'
206	* are features new characters get, eg, if someone starts up with a Q, they
207	* should be able to use a shield. However, old Q's won't get that advantage.
208	*/
209	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
210	SET_FLAG (ob, FLAG_USE_SHIELD);
211		240
212	/* if it's a dragon player, set the correct title here */	241	/* if it's a dragon player, set the correct title here */
213	if (is_dragon_pl (ob))	242	if (is_dragon_pl (ob))
214	{	243	{
215	object *tmp, *abil = 0, *skin = 0;	244	object *tmp, *abil = 0, *skin = 0;
…		…
225	skin = tmp;	254	skin = tmp;
226		255
227	set_dragon_name (ob, abil, skin);	256	set_dragon_name (ob, abil, skin);
228	}	257	}
229		258
230	CLEAR_FLAG (ob, FLAG_FRIENDLY);
231	add_friendly_object (ob);
232
233	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
234
235	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
236	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);	260
		261	esrv_new_player (this, ob->weight + ob->carrying);
		262
		263	ob->flag [FLAG_READY_WEAPON] = false;
		264	ob->flag [FLAG_READY_SKILL] = false;
		265	ob->flag [FLAG_READY_BOW] = false;
		266
		267	for (object *op = ob->inv; op; op = op->below)
		268	if (op->flag [FLAG_APPLIED])
		269	switch (op->type)
		270	{
		271	case SKILL:
		272	ob->flag [FLAG_APPLIED] = false;
		273	break;
		274
		275	case WAND:
		276	case ROD:
		277	case HORN:
		278	case BOW:
		279	ranged_ob = op;
		280	break;
		281
		282	case WEAPON:
		283	combat_ob = op;
		284	break;
		285	}
		286
		287	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
		288	ob->update_stats ();
237		289
238	ns->floorbox_update ();	290	ns->floorbox_update ();
239
240	esrv_new_player (this, ob->weight + ob->carrying);
241	esrv_send_inventory (ob, ob);	291	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	292	esrv_add_spells (this, 0);
243		293
244	enter_exit (ob, 0);	294	activate ();
245		295
246	// send_rules (ob);//TODO	296	send_rules (ob);
247	// send_news (ob);//TODO	297	send_news (ob);
248	// display_motd (ob);//TODO	298	display_motd (ob);
		299
		300	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	301	INVOKE_PLAYER (LOGIN, this);
		302	}
		303
		304	void
		305	player::disconnect ()
		306	{
		307	if (ns)
		308	{
		309	if (active)
		310	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		311
		312	INVOKE_PLAYER (DISCONNECT, this);
		313
		314	ns->reset_stats ();
		315	ns->pl = 0;
		316	ns = 0;
		317	}
		318
		319	if (ob)
		320	ob->close_container (); //TODO: client-specific
		321
		322	deactivate ();
250	}	323	}
251		324
252	// the need for this function can be explained	325	// the need for this function can be explained
253	// by load_object not returning the object	326	// by load_object not returning the object
254	void	327	void
255	player::set_object (object *op)	328	player::set_object (object *op)
256	{	329	{
257	ob = op;	330	ob = op;
258	ob->contr = this; /* this aren't yet in archetype */	331	ob->contr = this; /* this aren't yet in archetype */
259		332
		333	ob->speed = 1.0f;
260	ob->speed_left = 0.5;	334	ob->speed_left = 0.5f;
261	ob->speed = 1.0;	335
262	ob->direction = 5; /* So player faces south */	336	ob->direction = 5; /* So player faces south */
263	ob->stats.wc = 2;
264	ob->run_away = 25; /* Then we panick... */
265
266	set_first_map (ob);
267
268	ob->roll_stats ();
269	}	337	}
270		338
271	player::player ()	339	player::player ()
272	{	340	{
273	/* There are some elements we want initialized to non zero value -	341	/* There are some elements we want initialised to non zero value -
274	* we deal with that below this point.	342	* we deal with that below this point.
275	*/	343	*/
276	outputs_sync = 16; /* Every 2 seconds */	344	outputs_sync = 4;
277	outputs_count = 8; /* Keeps present behaviour */	345	outputs_count = 4;
278	unapply = unapply_nochoice;	346	unapply = unapply_nochoice;
279		347
280	assign (savebed_map, first_map_path); /* Init. respawn position */	348	savebed_map = first_map_path; /* Init. respawn position */
281		349
282	gen_sp_armour = 10;	350	gen_sp_armour = 10;
283	last_speed = -1;
284	shoottype = range_none;
285	bowtype = bow_normal;	351	bowtype = bow_normal;
286	petmode = pet_normal;	352	petmode = pet_normal;
287	listening = 10;	353	listening = 10;
288	usekeys = containers;	354	usekeys = containers;
289	last_weapon_sp = -1;
290	peaceful = 1; /* default peaceful */	355	peaceful = 1; /* default peaceful */
291	do_los = 1;	356	do_los = 1;
292		357
293	/* we need to clear these to -1 and not zero - otherwise,	358	weapon_sp = 1.0f;
294	* if a player quits and starts a new character, we wont	359	weapon_sp_left = 0.5f;
295	* send new values to the client, as things like exp start	360	}
296	* at zero.
297	*/
298	for (int i = 0; i < NUM_SKILLS; i++)
299	last_skill_exp[i] = -1;
300		361
301	for (int i = 0; i < NROFATTACKS; i++)	362	void
302	last_resist[i] = -1;	363	player::do_destroy ()
		364	{
		365	disconnect ();
303		366
304	last_stats.exp = -1;	367	attachable::do_destroy ();
305	last_weight = (uint32) - 1;	368
		369	if (ob)
		370	{
		371	ob->destroy_inv (false);
		372	ob->destroy ();
		373	}
306	}	374	}
307		375
308	player::~player ()	376	player::~player ()
309	{	377	{
310	terminate_all_pets (ob);
311
312	if (first_player != this)
313	{
314	player *prev = first_player;
315
316	while (prev && prev->next && prev->next != this)
317	prev = prev->next;
318
319	if (prev->next != this)
320	{
321	LOG (llevError, "Free_player: Can't find previous player.\n");
322	abort ();
323	}
324
325	prev->next = next;
326	}
327	else
328	first_player = next;
329
330	if (ob)
331	{
332	ob->contr = 0;
333	ob->destroy (1);
334	}
335
336	if (ns)
337	{
338	ns->send_packet ("goodbye");
339	ns->flush ();
340	ns->pl = 0;
341	ns->destroy ();
342	}
343
344	/* Clear item stack */	378	/* Clear item stack */
345	free (stack_items);	379	free (stack_items);
346	}	380	}
347		381
348	/* Tries to add player on the connection passed in ns.	382	/* Tries to add player on the connection passed in ns.
…		…
353	player::create ()	387	player::create ()
354	{	388	{
355	player *pl = new player;	389	player *pl = new player;
356		390
357	pl->set_object (arch_to_object (get_player_archetype (0)));	391	pl->set_object (arch_to_object (get_player_archetype (0)));
		392
		393	pl->ob->roll_stats ();
		394	pl->ob->stats.wc = 2;
		395	pl->ob->run_away = 25; /* Then we panick... */
		396
		397	set_first_map (pl->ob);
358		398
359	return pl;	399	return pl;
360	}	400	}
361		401
362	/*	402	/*
…		…
389		429
390	object *	430	object *
391	get_nearest_player (object *mon)	431	get_nearest_player (object *mon)
392	{	432	{
393	object *op = NULL;	433	object *op = NULL;
394	player *pl = NULL;
395	objectlink *ol;	434	objectlink *ol;
396	unsigned lastdist;	435	unsigned lastdist;
397	rv_vector rv;	436	rv_vector rv;
398		437
399	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	438	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
400	{	439	{
401	/* We should not find free objects on this friendly list, but it	440	/* We should not find free objects on this friendly list, but it
402	* does periodically happen. Given that, lets deal with it.	441	* does periodically happen. Given that, lets deal with it.
403	* While unlikely, it is possible the next object on the friendly	442	* While unlikely, it is possible the next object on the friendly
404	* list is also free, so encapsulate this in a while loop.	443	* list is also free, so encapsulate this in a while loop.
…		…
408	object *tmp = ol->ob;	447	object *tmp = ol->ob;
409		448
410	/* Can't do much more other than log the fact, because the object	449	/* Can't do much more other than log the fact, because the object
411	* itself will have been cleared.	450	* itself will have been cleared.
412	*/	451	*/
413	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	452	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		453	tmp->debug_desc ());
414	ol = ol->next;	454	ol = ol->next;
415	remove_friendly_object (tmp);	455	remove_friendly_object (tmp);
416	if (!ol)	456	if (!ol)
417	return op;	457	return op;
418	}	458	}
…		…
431	{	471	{
432	op = ol->ob;	472	op = ol->ob;
433	lastdist = rv.distance;	473	lastdist = rv.distance;
434	}	474	}
435	}	475	}
436	for (pl = first_player; pl != NULL; pl = pl->next)	476
437	{	477	for_all_players (pl)
438	if (can_detect_enemy (mon, pl->ob, &rv))	478	if (can_detect_enemy (mon, pl->ob, &rv))
439	{
440
441	if (lastdist > rv.distance)	479	if (lastdist > rv.distance)
442	{	480	{
443	op = pl->ob;	481	op = pl->ob;
444	lastdist = rv.distance;	482	lastdist = rv.distance;
445	}	483	}
446	}	484
447	}
448	#if 0	485	#if 0
449	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	486	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
450	#endif	487	#endif
451	return op;	488	return op;
452	}	489	}
…		…
510	x = mon->x;	547	x = mon->x;
511	y = mon->y;	548	y = mon->y;
512	m = mon->map;	549	m = mon->map;
513	dir = rv.direction;	550	dir = rv.direction;
514	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	551	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
515	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	552	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		553
516	/* If we can't solve it within the search distance, return now. */	554	/* If we can't solve it within the search distance, return now. */
517	if (diff > max)	555	if (diff > max)
518	return 0;	556	return 0;
		557
519	while (diff > 1 && max > 0)	558	while (diff > 1 && max > 0)
520	{	559	{
521	lastx = x;	560	lastx = x;
522	lasty = y;	561	lasty = y;
523	lastmap = m;	562	lastmap = m;
…		…
605	max--;	644	max--;
606	lastdir = dir;	645	lastdir = dir;
607	if (!firstdir)	646	if (!firstdir)
608	firstdir = dir;	647	firstdir = dir;
609	}	648	}
		649
610	if (diff <= 1)	650	if (diff <= 1)
611	{	651	{
612	/* Recalculate diff (distance) because we may not have actually	652	/* Recalculate diff (distance) because we may not have actually
613	* headed toward player for entire distance.	653	* headed toward player for entire distance.
614	*/	654	*/
615	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	655	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
616	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	656	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
617	}	657	}
		658
618	if (diff > max)	659	if (diff > max)
619	return 0;	660	return 0;
620	}	661	}
		662
621	/* If we reached the max, didn't find a direction in time */	663	/* If we reached the max, didn't find a direction in time */
622	if (!max)	664	if (!max)
623	return 0;	665	return 0;
624		666
625	return firstdir;	667	return firstdir;
…		…
739	roll_stat (void)	781	roll_stat (void)
740	{	782	{
741	int a[4], i, j, k;	783	int a[4], i, j, k;
742		784
743	for (i = 0; i < 4; i++)	785	for (i = 0; i < 4; i++)
744	a[i] = (int) RANDOM () % 6 + 1;	786	a[i] = (int) rndm (6) + 1;
745		787
746	for (i = 0, j = 0, k = 7; i < 4; i++)	788	for (i = 0, j = 0, k = 7; i < 4; i++)
747	if (a[i] < k)	789	if (a[i] < k)
748	k = a[i], j = i;	790	k = a[i], j = i;
749		791
…		…
755	}	797	}
756		798
757	void	799	void
758	object::roll_stats ()	800	object::roll_stats ()
759	{	801	{
760	int statsort [7];	802	int statsort [NUM_STATS];
761		803
762	for (;;)	804	for (;;)
763	{	805	{
764	int sum = 0;	806	int sum = 0;
765	for (int i = 7; i--; )	807	for (int i = NUM_STATS; i--; )
766	sum += statsort [i] = roll_stat ();	808	sum += statsort [i] = roll_stat ();
767		809
768	if (sum >= 82 && sum <= 116)	810	if (sum >= 82 && sum <= 116)
769	break;	811	break;
770	}	812	}
771		813
772	// Sort the stats so that rerolling is easier...	814	// Sort the stats so that rerolling is easier...
773	std::sort (statsort, statsort + 7, std::greater<int>());	815	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
774		816
		817	for (int i = 0; i < NUM_STATS; ++i)
775	stats.Str = statsort[0];	818	stats.stat (i) = statsort [i];
776	stats.Dex = statsort[1];
777	stats.Con = statsort[2];
778	stats.Int = statsort[3];
779	stats.Wis = statsort[4];
780	stats.Pow = statsort[5];
781	stats.Cha = statsort[6];
782		819
783	stats.exp = 0;	820	stats.exp = 0;
784	stats.ac = 0;	821	stats.ac = 0;
785		822
786	stats.hp = stats.maxhp;	823	stats.hp = stats.maxhp;
…		…
798	}	835	}
799		836
800	void	837	void
801	object::swap_stats (int a, int b)	838	object::swap_stats (int a, int b)
802	{	839	{
803	int tmp = get_attr_value (&contr->orig_stats, a);	840	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
804	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
805	set_attr_value (&contr->orig_stats, b, tmp);
806		841
		842	for (int i = 0; i < NUM_STATS; ++i)
807	stats.Str = contr->orig_stats.Str;	843	stats.stat (i) = contr->orig_stats.stat (i);
808	stats.Dex = contr->orig_stats.Dex;
809	stats.Con = contr->orig_stats.Con;
810	stats.Int = contr->orig_stats.Int;
811	stats.Wis = contr->orig_stats.Wis;
812	stats.Pow = contr->orig_stats.Pow;
813	stats.Cha = contr->orig_stats.Cha;
814		844
815	//TODO: the following code looks so borked and should, at the very least,	845	//TODO: the following code looks so borked and should, at the very least,
816	// be merged with the similar code in roll_stats	846	// be merged with the similar code in roll_stats
817	stats.ac = 0;	847	stats.ac = 0;
818		848
…		…
830	contr->levsp[1] = 6;	860	contr->levsp[1] = 6;
831	contr->levgrace[1] = 3;	861	contr->levgrace[1] = 3;
832		862
833	contr->orig_stats = stats;	863	contr->orig_stats = stats;
834	}	864	}
		865	}
		866
		867	static void
		868	start_info (object *op)
		869	{
		870	char buf[MAX_BUF];
		871
		872	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		873	new_draw_info (NDI_UNIQUE, 0, op, buf);
		874	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		875	//new_draw_info (NDI_UNIQUE, 0, op, " ");
835	}	876	}
836		877
837	/* This function takes the key that is passed, and does the	878	/* This function takes the key that is passed, and does the
838	* appropriate action with it (change race, or other things).	879	* appropriate action with it (change race, or other things).
839	* The function name is for historical reasons - now we have	880	* The function name is for historical reasons - now we have
840	* separate race and class; this actually changes the RACE,	881	* separate race and class; this actually changes the RACE,
841	* not the class.	882	* not the class.
842	*/	883	*/
843	int	884	void
844	key_change_class (object *op, char key)	885	player::chargen_race_done ()
845	{	886	{
846	int tmp_loop;
847
848	if (key == 'd' || key == 'D')
849	{
850	char buf[MAX_BUF];
851
852	/* this must before then initial items are given */	887	/* this must before then initial items are given */
853	esrv_new_player (op->contr, op->weight + op->carrying);	888	esrv_new_player (ob->contr, ob->weight + ob->carrying);
854		889
855	treasurelist *tl = find_treasurelist ("starting_wealth");	890	treasurelist *tl = treasurelist::find ("starting_wealth");
856	if (tl)	891	if (tl)
857	create_treasure (tl, op, 0, 0, 0);	892	create_treasure (tl, ob, 0, 0, 0);
858		893
859	INVOKE_PLAYER (BIRTH, op->contr);	894	INVOKE_PLAYER (BIRTH, ob->contr);
860	INVOKE_PLAYER (LOGIN, op->contr);	895	INVOKE_PLAYER (LOGIN, ob->contr);
861		896
862	op->contr->ns->state = ST_PLAYING;	897	ob->contr->ns->state = ST_PLAYING;
863		898
864	if (op->msg)	899	if (ob->msg)
865	op->msg = NULL;	900	ob->msg = 0;
866		901
867	/* We create this now because some of the unique maps will need it	902	/* We create this now because some of the unique maps will need it
868	* to save here.	903	* to save here.
869	*/	904	*/
		905	{
		906	char buf[MAX_BUF];
870	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	907	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
871	make_path_to_file (buf);	908	make_path_to_file (buf);
		909	}
872		910
873	#ifdef AUTOSAVE
874	op->contr->last_save_tick = pticks;
875	#endif
876	start_info (op);	911	start_info (ob);
877	CLEAR_FLAG (op, FLAG_WIZ);	912	CLEAR_FLAG (ob, FLAG_WIZ);
878	give_initial_items (op, op->randomitems);	913	give_initial_items (ob, ob->randomitems);
879	link_player_skills (op);	914	link_player_skills (ob);
880	esrv_send_inventory (op, op);	915	esrv_send_inventory (ob, ob);
881	op->update_stats ();	916	ob->update_stats ();
882		917
883	/* This moves the player to a different start map, if there	918	/* This moves the player to a different start map, if there
884	* is one for this race	919	* is one for this race
885	*/	920	*/
886	if (*first_map_ext_path)	921	if (*first_map_ext_path)
887	{	922	{
888	object *tmp;	923	object *tmp;
889	char mapname[MAX_BUF];	924	char mapname[MAX_BUF];
890		925
891	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	926	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
892	tmp = object::create ();	927	tmp = object::create ();
893	EXIT_PATH (tmp) = mapname;	928	EXIT_PATH (tmp) = mapname;
894	EXIT_X (tmp) = op->x;	929	EXIT_X (tmp) = ob->x;
895	EXIT_Y (tmp) = op->y;	930	EXIT_Y (tmp) = ob->y;
896	enter_exit (op, tmp); /* we don't really care if it succeeded;	931	ob->enter_exit (tmp); /* we don't really care if it succeeded;
897	* if the map isn't there, then stay on the	932	* if the map isn't there, then stay on the
898	* default initial map */	933	* default initial map */
899	tmp->destroy ();	934	tmp->destroy ();
900	}	935	}
901	else	936	else
902	LOG (llevDebug, "first_map_ext_path not set\n");	937	LOG (llevDebug, "first_map_ext_path not set\n");
		938	}
903		939
904	return 0;	940	void
905	}	941	player::chargen_race_next ()
906		942	{
907	/* Following actually changes the race - this is the default command	943	/* Following actually changes the race - this is the default command
908	* if we don't match with one of the options above.	944	* if we don't match with one of the options above.
909	*/	945	*/
910		946
911	tmp_loop = 0;	947	do
912	while (!tmp_loop)
913	{	948	{
914	shstr name = op->name;	949	shstr name = ob->name;
915	int x = op->x, y = op->y;	950	int x = ob->x, y = ob->y;
916		951
917	op->remove_statbonus ();	952	ob->remove_statbonus ();
918	op->remove ();	953	ob->remove ();
919	op->arch = get_player_archetype (op->arch);	954	ob->arch = get_player_archetype (ob->arch);
920	op->arch->clone.copy_to (op);	955	ob->arch->clone.copy_to (ob);
921	op->instantiate ();	956	ob->instantiate ();
922	op->stats = op->contr->orig_stats;	957	ob->stats = ob->contr->orig_stats;
923	op->name = op->name_pl = name;	958	ob->name = ob->name_pl = name;
924	op->x = x;	959	ob->x = x;
925	op->y = y;	960	ob->y = y;
926	SET_ANIMATION (op, 2); /* So player faces south */	961	SET_ANIMATION (ob, 2); /* So player faces south */
927	insert_ob_in_map (op, op->map, op, 0);	962	insert_ob_in_map (ob, ob->map, ob, 0);
928	assign (op->contr->title, op->arch->clone.name);	963	assign (ob->contr->title, ob->arch->clone.name);
929	op->add_statbonus ();	964	ob->add_statbonus ();
930	tmp_loop = allowed_class (op);
931	}	965	}
		966	while (!allowed_class (ob));
932		967
933	update_object (op, UP_OBJ_FACE);	968	update_object (ob, UP_OBJ_FACE);
934	esrv_update_item (UPD_FACE, op, op);	969	esrv_update_item (UPD_FACE, ob, ob);
935	op->update_stats ();	970	ob->update_stats ();
936	op->stats.hp = op->stats.maxhp;	971	ob->stats.hp = ob->stats.maxhp;
937	op->stats.sp = op->stats.maxsp;	972	ob->stats.sp = ob->stats.maxsp;
938	op->stats.grace = 0;	973	ob->stats.grace = 0;
939
940	if (op->msg)
941	new_draw_info (NDI_BLUE, 0, op, op->msg);
942
943	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
944	return 0;
945	}
946
947	int
948	key_confirm_quit (object *op, char key)
949	{
950	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
951	{
952	op->contr->ns->state = ST_PLAYING;
953	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
954	return 1;
955	}
956
957	INVOKE_PLAYER (LOGOUT, op->contr);
958	INVOKE_PLAYER (QUIT, op->contr);
959
960	terminate_all_pets (op);
961	leave_map (op);
962	op->direction = 0;
963	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
964
965	strcpy (op->contr->killer, "quit");
966	check_score (op);
967	op->contr->party = 0;
968	op->contr->own_title[0] = '\0';
969
970	object_ptr ob = op;
971
972	delete ob->contr;
973
974	/* We need to hunt for any per player unique maps in memory and
975	* get rid of them. The trailing slash in the path is intentional,
976	* so that players named 'Ab' won't match against players 'Abe' pathname
977	*/
978	char buf[MAX_BUF];
979	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
980
981	for (maptile *next, *mp = first_map; mp; mp = next)
982	{
983	next = mp->next;
984
985	if (!strncmp (mp->path, buf, strlen (buf)))
986	delete_map (mp);
987	}
988
989	delete_character (ob->name, 1);
990
991	return 1;
992	}	974	}
993		975
994	void	976	void
995	flee_player (object *op)	977	flee_player (object *op)
996	{	978	{
…		…
1043	/* Cornered, get rid of scared */	1025	/* Cornered, get rid of scared */
1044	CLEAR_FLAG (op, FLAG_SCARED);	1026	CLEAR_FLAG (op, FLAG_SCARED);
1045	op->enemy = NULL;	1027	op->enemy = NULL;
1046	}	1028	}
1047		1029
1048
1049	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1030	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1050	* IT returns 1 if the player should keep on moving, 0 if he should	1031	* It returns 1 if the player should keep on moving, 0 if he should
1051	* stop.	1032	* stop.
1052	*/	1033	*/
1053	int	1034	int
1054	check_pick (object *op)	1035	check_pick (object *op)
1055	{	1036	{
1056	object *tmp, *next;	1037	object *tmp, *next;
1057	int stop = 0;	1038	int stop = 0;
1058	int j, k, wvratio;	1039	int wvratio;
1059	char putstring[128], tmpstr[16];	1040	char putstring[128];
1060		1041
1061	/* if you're flying, you cna't pick up anything */	1042	/* if you're flying, you cna't pick up anything */
1062	if (op->move_type & MOVE_FLYING)	1043	if (op->move_type & MOVE_FLYING)
1063	return 1;	1044	return 1;
1064		1045
…		…
1133	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1114	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1134	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1115	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1135	else	1116	else
1136	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1117	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1137	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1118	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1119
1138	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1120	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1139
1140	sprintf (putstring, "...flags: ");
1141	for (k = 0; k < 4; k++)
1142	{
1143	for (j = 0; j < 32; j++)
1144	{
1145	if ((tmp->flags[k] >> j) & 0x01)
1146	{
1147	sprintf (tmpstr, "%d ", k * 32 + j);
1148	strcat (putstring, tmpstr);
1149	}
1150	}
1151	}
1152	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1153
1154	#if 0
1155	/* print the flags too */
1156	for (k = 0; k < 4; k++)
1157	{
1158	fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1159	for (j = 0; j < 32; j++)
1160	{
1161	fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1162	if (!((j + 1) % 4))
1163	fprintf (stderr, " ");
1164	}
1165	fprintf (stderr, " [%d]\n", k * 32);
1166	}
1167	#endif
1168	}	1121	}
		1122
1169	/* philosophy:	1123	/* philosophy:
1170	* It's easy to grab an item type from a pile, as long as it's	1124	* It's easy to grab an item type from a pile, as long as it's
1171	* generic. This takes no game-time. For more detailed pickups	1125	* generic. This takes no game-time. For more detailed pickups
1172	* and selections, select-items shoul dbe used. This is a	1126	* and selections, select-items should be used. This is a
1173	* grab-as-you-run type mode that's really useful for arrows for	1127	* grab-as-you-run type mode that's really useful for arrows for
1174	* example.	1128	* example.
1175	* The drawback: right now it has no frontend, so you need to	1129	* The drawback: right now it has no frontend, so you need to
1176	* stick the bits you want into a calculator in hex mode and then	1130	* stick the bits you want into a calculator in hex mode and then
1177	* convert to decimal and then 'pickup <#>	1131	* convert to decimal and then 'pickup <#>
…		…
1428	* found object is returned.	1382	* found object is returned.
1429	*/	1383	*/
1430	object *	1384	object *
1431	find_arrow (object *op, const char *type)	1385	find_arrow (object *op, const char *type)
1432	{	1386	{
1433	object *tmp = NULL;	1387	object *tmp = 0;
1434		1388
1435	for (op = op->inv; op; op = op->below)	1389	for (op = op->inv; op; op = op->below)
1436	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1390	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437	tmp = find_arrow (op, type);	1391	tmp = find_arrow (op, type);
1438	else if (op->type == ARROW && op->race == type)	1392	else if (op->type == ARROW && op->race == type)
1439	return op;	1393	return op;
		1394
1440	return tmp;	1395	return tmp;
1441	}	1396	}
1442		1397
1443	/*	1398	/*
1444	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1399	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1445	* against the target. A full test is not performed, simply a basic test	1400	* against the target. A full test is not performed, simply a basic test
1446	* of resistances. The archer is making a quick guess at what he sees down	1401	* of resistances. The archer is making a quick guess at what he sees down
1447	* the hall. Failing that it does it's best to pick the highest plus arrow.	1402	* the hall. Failing that it does it's best to pick the highest plus arrow.
1448	*/	1403	*/
1449
1450	object *	1404	object *
1451	find_better_arrow (object *op, object *target, const char *type, int *better)	1405	find_better_arrow (object *op, object *target, const char *type, int *better)
1452	{	1406	{
1453	object *tmp = NULL, *arrow, *ntmp;	1407	object *tmp = NULL, *arrow, *ntmp;
1454	int attacknum, attacktype, betterby = 0, i;	1408	int attacknum, attacktype, betterby = 0, i;
…		…
1520	* find_better_arrow to find a decent arrow to use.	1474	* find_better_arrow to find a decent arrow to use.
1521	* op = the shooter	1475	* op = the shooter
1522	* type = bow->race	1476	* type = bow->race
1523	* dir = fire direction	1477	* dir = fire direction
1524	*/	1478	*/
1525
1526	object *	1479	object *
1527	pick_arrow_target (object *op, const char *type, int dir)	1480	pick_arrow_target (object *op, const char *type, int dir)
1528	{	1481	{
1529	object *tmp = NULL;	1482	object *tmp = NULL;
1530	maptile *m;	1483	maptile *m;
…		…
1595	*/	1548	*/
1596	int	1549	int
1597	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1550	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598	{	1551	{
1599	object *left, *bow;	1552	object *left, *bow;
1600	int bowspeed, mflags;	1553	int mflags;
1601	maptile *m;	1554	maptile *m;
1602		1555
1603	if (!dir)	1556	if (!dir)
1604	{	1557	{
1605	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1558	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606	return 0;	1559	return 0;
1607	}	1560	}
1608		1561
1609	if (op->type == PLAYER)	1562	if (op->contr)
1610	bow = op->contr->ranges[range_bow];	1563	bow = op->current_weapon;
1611	else	1564	else
1612	{	1565	{
1613	for (bow = op->inv; bow; bow = bow->below)	1566	for (bow = op->inv; bow; bow = bow->below)
1614	/* Don't check for applied - monsters don't apply bows - in that way, they	1567	/* Don't check for applied - monsters don't apply bows - in that way, they
1615	* don't need to switch back and forth between bows and weapons.	1568	* don't need to switch back and forth between bows and weapons.
…		…
1620	if (!bow)	1573	if (!bow)
1621	{	1574	{
1622	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1575	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623	return 0;	1576	return 0;
1624	}	1577	}
		1578
		1579	// optimisation: move object to top so we will find it quickly again
		1580	if (bow->below)
		1581	{
		1582	bow->remove ();
		1583	op->insert (bow);
		1584	}
		1585
1625	}	1586	}
1626		1587
1627	if (!bow->race || !bow->skill)	1588	if (!bow->race || !bow->skill)
1628	{	1589	{
1629	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630	return 0;	1591	return 0;
1631	}	1592	}
1632
1633	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635	/* penalize ROF for bestarrow */
1636	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639	if (bowspeed < 1)
1640	bowspeed = 1;
1641		1593
1642	if (arrow == NULL)	1594	if (arrow == NULL)
1643	{	1595	{
1644	if ((arrow = find_arrow (op, bow->race)) == NULL)	1596	if ((arrow = find_arrow (op, bow->race)) == NULL)
1645	{	1597	{
1646	if (op->type == PLAYER)	1598	if (op->type == PLAYER)
1647	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1599	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1600	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649	else	1601	else
1650	CLEAR_FLAG (op, FLAG_READY_BOW);	1602	CLEAR_FLAG (op, FLAG_READY_BOW);
		1603
1651	return 0;	1604	return 0;
1652	}	1605	}
1653	}	1606	}
1654		1607
1655	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1608	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1677	return 0;	1630	return 0;
1678	}	1631	}
1679		1632
1680	arrow->set_owner (op);	1633	arrow->set_owner (op);
1681	arrow->skill = bow->skill;	1634	arrow->skill = bow->skill;
1682
1683	arrow->direction = dir;	1635	arrow->direction = dir;
1684	arrow->x = sx;	1636
1685	arrow->y = sy;	1637	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1638	arrow->stats.hp = arrow->stats.dam;
		1639	arrow->stats.grace = arrow->attacktype;
		1640
		1641	if (arrow->slaying)
		1642	arrow->spellarg = strdup (arrow->slaying);
		1643
		1644	#if 0
		1645	if (player *pl = op->contr)
		1646	{
		1647	float speed = pl->weapon_sp;
		1648
		1649	/* penalize ROF for bestarrow */
		1650	if (pl->bowtype == bow_bestarrow)
		1651	speed *= .9f;
		1652	else
		1653	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1654
		1655	op->speed_left += speed - op->speed;
		1656	}
		1657	#endif
		1658
		1659	SET_ANIMATION (arrow, arrow->direction);
		1660
		1661	/* update the speed */
		1662	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1663	+ bow->stats.dam / 7.f;
		1664
		1665	arrow->set_speed (max (arrow->speed, 2.f));
		1666	arrow->speed_left = 0;
		1667
		1668	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1686		1669
1687	if (op->type == PLAYER)	1670	if (op->type == PLAYER)
1688	{	1671	{
1689	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1690	op->update_stats ();
1691	}
1692
1693	SET_ANIMATION (arrow, arrow->direction);
1694	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1695	arrow->stats.hp = arrow->stats.dam;
1696	arrow->stats.grace = arrow->attacktype;
1697	if (arrow->slaying != NULL)
1698	arrow->spellarg = strdup (arrow->slaying);
1699
1700	/* Note that this was different for monsters - they got their level
1701	* added to the damage. I think the strength bonus is more proper.
1702	*/
1703
1704	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1705
1706	/* update the speed */
1707	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1708	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1709
1710	if (arrow->speed < 1.0)
1711	arrow->speed = 1.0;
1712	update_ob_speed (arrow);
1713	arrow->speed_left = 0;
1714
1715	if (op->type == PLAYER)
1716	{
1717	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1719	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1672	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1673	wc -= dex_bonus[op->stats.Dex];
		1674
		1675	if (!arrow->slaying)
		1676	arrow->slaying = op->slaying;
		1677
		1678	arrow->attacktype |= op->attacktype;
1722	}	1679	}
1723	else	1680	else
1724	{	1681	{
1725	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726	arrow->level = op->level;	1682	arrow->level = op->level;
1727	}	1683	arrow->stats.wc -= bow->magic;
1728		1684
1729	if (arrow->attacktype == AT_PHYSICAL)	1685	if (!arrow->slaying)
		1686	arrow->slaying = bow->slaying;
		1687
1730	arrow->attacktype |= bow->attacktype;	1688	arrow->attacktype |= bow->attacktype;
		1689	}
1731		1690
1732	if (bow->slaying)	1691	wc -= arrow->level;
1733	arrow->slaying = bow->slaying;	1692	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1734		1693
1735	arrow->map = m;	1694	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736	arrow->move_type = MOVE_FLY_LOW;	1695	arrow->move_type = MOVE_FLY_LOW;
1737	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1696	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738		1697
1739	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1698	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1740	insert_ob_in_map (arrow, m, op, 0);	1699	m->insert (arrow, sx, sy, op);
1741		1700
1742	if (!arrow->destroyed ())	1701	if (!arrow->destroyed ())
1743	move_arrow (arrow);	1702	move_arrow (arrow);
1744		1703
1745	if (op->type == PLAYER)	1704	if (op->type == PLAYER)
…		…
1765	{	1724	{
1766	int ret = 0, wcmod = 0;	1725	int ret = 0, wcmod = 0;
1767		1726
1768	if (op->contr->bowtype == bow_bestarrow)	1727	if (op->contr->bowtype == bow_bestarrow)
1769	{	1728	{
1770	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1729	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771	}	1730	}
1772	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1731	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773	{	1732	{
1774	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1733	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775	wcmod = -1;	1734	wcmod = -1;
		1735
1776	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1736	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1777	}	1737	}
1778	else if (op->contr->bowtype == bow_threewide)	1738	else if (op->contr->bowtype == bow_threewide)
1779	{	1739	{
1780	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1740	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1784	else if (op->contr->bowtype == bow_spreadshot)	1744	else if (op->contr->bowtype == bow_spreadshot)
1785	{	1745	{
1786	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);
1787	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1747	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1748	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790	}	1749	}
1791	else	1750	else
1792	{	1751	{
1793	/* Simple case */	1752	/* Simple case */
1794	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1753	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795	}	1754	}
		1755
1796	return ret;	1756	return ret;
1797	}	1757	}
1798
1799		1758
1800	/* Fires a misc (wand/rod/horn) object in 'dir'.	1759	/* Fires a misc (wand/rod/horn) object in 'dir'.
1801	* Broken apart from 'fire' to keep it more readable.	1760	* Broken apart from 'fire' to keep it more readable.
1802	*/	1761	*/
1803	void	1762	void
1804	fire_misc_object (object *op, int dir)	1763	fire_misc_object (object *op, int dir)
1805	{	1764	{
1806	object *item;	1765	object *item = op->contr->ranged_ob;
1807		1766
1808	if (!op->contr->ranges[range_misc])	1767	if (!item)
1809	{	1768	{
1810	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1769	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811	return;	1770	return;
1812	}	1771	}
1813		1772
1814	item = op->contr->ranges[range_misc];
1815	if (!item->inv)	1773	if (!item->inv)
1816	{	1774	{
1817	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1775	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818	return;	1776	return;
1819	}	1777	}
		1778
		1779	if (!op->change_weapon (item))
		1780	return;
		1781
1820	if (item->type == WAND)	1782	if (item->type == WAND)
1821	{	1783	{
1822	if (item->stats.food <= 0)	1784	if (item->stats.food <= 0)
1823	{	1785	{
1824	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1825	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1788
1826	return;	1789	return;
1827	}	1790	}
1828	}	1791	}
1829	else if (item->type == ROD || item->type == HORN)	1792	else if (item->type == ROD || item->type == HORN)
1830	{	1793	{
1831	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1794	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832	{	1795	{
1833	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1796	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1797
1834	if (item->type == ROD)	1798	if (item->type == ROD)
1835	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1799	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836	else	1800	else
1837	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1801	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1802
1838	return;	1803	return;
1839	}	1804	}
1840	}	1805	}
1841		1806
1842	if (cast_spell (op, item, dir, item->inv, NULL))	1807	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1850		1815
1851	if (item->arch)	1816	if (item->arch)
1852	{	1817	{
1853	CLEAR_FLAG (item, FLAG_ANIMATE);	1818	CLEAR_FLAG (item, FLAG_ANIMATE);
1854	item->face = item->arch->clone.face;	1819	item->face = item->arch->clone.face;
1855	item->speed = 0;	1820	item->set_speed (0);
1856	update_ob_speed (item);
1857	}	1821	}
		1822
1858	if ((tmp = item->in_player ()))	1823	if ((tmp = item->in_player ()))
1859	esrv_update_item (UPD_ANIM, tmp, item);	1824	esrv_update_item (UPD_ANIM, tmp, item);
1860	}	1825	}
1861	}	1826	}
1862	else if (item->type == ROD || item->type == HORN)	1827	else if (item->type == ROD || item->type == HORN)
1863	{
1864	drain_rod_charge (item);	1828	drain_rod_charge (item);
1865	}
1866	}	1829	}
1867	}	1830	}
1868		1831
1869	/* Received a fire command for the player - go and do it.	1832	/* Received a fire command for the player - go and do it.
1870	*/	1833	*/
1871	void	1834	bool
1872	fire (object *op, int dir)	1835	fire (object *op, int dir)
1873	{	1836	{
1874	int spellcost = 0;	1837	int spellcost = 0;
1875		1838
1876	/* check for loss of invisiblity/hide */	1839	/* check for loss of invisiblity/hide */
1877	if (action_makes_visible (op))	1840	if (action_makes_visible (op))
1878	make_visible (op);	1841	make_visible (op);
1879		1842
1880	switch (op->contr->shoottype)	1843	player *pl = op->contr;
		1844
		1845	if (pl->golem)
		1846	{
		1847	control_golem (op->contr->golem, dir);
		1848	return false;
1881	{	1849	}
1882	case range_none:
1883	return;
1884		1850
1885	case range_bow:	1851	object *ob = pl->ranged_ob;
		1852
		1853	if (!ob)
		1854	return false;
		1855
		1856	if (!op->change_weapon (ob))
		1857	return false;
		1858
		1859	if (op->speed_left > 0.f)
		1860	--op->speed_left;
		1861	else
		1862	return false;
		1863
		1864	switch (ob->type)
		1865	{
		1866	case BOW:
1886	player_fire_bow (op, dir);	1867	player_fire_bow (op, dir);
1887	return;	1868	break;
1888		1869
1889	case range_magic: /* Casting spells */	1870	case SPELL:
1890	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1871	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1891	return;	1872	break;
1892		1873
1893	case range_misc:	1874	case BUILDER:
		1875	apply_map_builder (op, dir);
		1876	break;
		1877
		1878	case SKILL:
		1879	do_skill (op, op, ob, dir, 0);
		1880	break;
		1881
		1882	default:
1894	fire_misc_object (op, dir);	1883	fire_misc_object (op, dir);
1895	return;	1884	break;
1896
1897	case range_golem: /* Control summoned monsters from scrolls */
1898	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1899	{
1900	op->contr->ranges[range_golem] = 0;
1901	op->contr->shoottype = range_none;
1902	}
1903	else
1904	control_golem (op->contr->ranges[range_golem], dir);
1905	return;
1906
1907	case range_skill:
1908	if (!op->chosen_skill)
1909	{
1910	if (op->type == PLAYER)
1911	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1912	return;
1913	}
1914	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1915	return;
1916	case range_builder:
1917	apply_map_builder (op, dir);
1918	return;
1919	default:
1920	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1921	return;
1922	}	1885	}
1923	}
1924		1886
1925		1887	return true;
		1888	}
1926		1889
1927	/* find_key	1890	/* find_key
1928	* We try to find a key for the door as passed. If we find a key	1891	* We try to find a key for the door as passed. If we find a key
1929	* and successfully use it, we return the key, otherwise NULL	1892	* and successfully use it, we return the key, otherwise NULL
1930	* This function merges both normal and locked door, since the logic	1893	* This function merges both normal and locked door, since the logic
…		…
1932	* pl is the player,	1895	* pl is the player,
1933	* inv is the objects inventory to searched	1896	* inv is the objects inventory to searched
1934	* door is the door we are trying to match against.	1897	* door is the door we are trying to match against.
1935	* This function can be called recursively to search containers.	1898	* This function can be called recursively to search containers.
1936	*/	1899	*/
1937
1938	object *	1900	object *
1939	find_key (object *pl, object *container, object *door)	1901	find_key (object *pl, object *container, object *door)
1940	{	1902	{
1941	object *tmp, *key;	1903	object *tmp, *key;
1942		1904
1943	/* Should not happen, but sanity checking is never bad */	1905	/* Should not happen, but sanity checking is never bad */
1944	if (container->inv == NULL)	1906	if (!container->inv)
1945	return NULL;	1907	return 0;
1946		1908
1947	/* First, lets try to find a key in the top level inventory */	1909	/* First, lets try to find a key in the top level inventory */
1948	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1910	for (tmp = container->inv; tmp; tmp = tmp->below)
1949	{	1911	{
1950	if (door->type == DOOR && tmp->type == KEY)	1912	if (door->type == DOOR && tmp->type == KEY)
1951	break;	1913	break;
1952	/* For sanity, we should really check door type, but other stuff	1914	/* For sanity, we should really check door type, but other stuff
1953	* (like containers) can be locked with special keys	1915	* (like containers) can be locked with special keys
1954	*/	1916	*/
1955	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1917	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1956	break;	1918	break;
1957	}	1919	}
		1920
1958	/* No key found - lets search inventories now */	1921	/* No key found - lets search inventories now */
1959	/* If we find and use a key in an inventory, return at that time.	1922	/* If we find and use a key in an inventory, return at that time.
1960	* otherwise, if we search all the inventories and still don't find	1923	* otherwise, if we search all the inventories and still don't find
1961	* a key, return	1924	* a key, return
1962	*/	1925	*/
1963	if (!tmp)	1926	if (!tmp)
1964	{	1927	{
1965	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1928	for (tmp = container->inv; tmp; tmp = tmp->below)
1966	{	1929	{
1967	/* No reason to search empty containers */	1930	/* No reason to search empty containers */
1968	if (tmp->type == CONTAINER && tmp->inv)	1931	if (tmp->type == CONTAINER && tmp->inv)
1969	{	1932	{
1970	if ((key = find_key (pl, tmp, door)) != NULL)	1933	if ((key = find_key (pl, tmp, door)))
1971	return key;	1934	return key;
1972	}	1935	}
1973	}	1936	}
		1937
1974	if (!tmp)	1938	if (!tmp)
1975	return NULL;	1939	return NULL;
1976	}	1940	}
		1941
1977	/* We get down here if we have found a key. Now if its in a container,	1942	/* We get down here if we have found a key. Now if its in a container,
1978	* see if we actually want to use it	1943	* see if we actually want to use it
1979	*/	1944	*/
1980	if (pl != container)	1945	if (pl != container)
1981	{	1946	{
…		…
2002	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1967	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2003	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1968	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2004	return NULL;	1969	return NULL;
2005	}	1970	}
2006	}	1971	}
		1972
2007	return tmp;	1973	return tmp;
2008	}	1974	}
2009		1975
2010	/* moved door processing out of move_player_attack.	1976	/* moved door processing out of move_player_attack.
2011	* returns 1 if player has opened the door with a key	1977	* returns 1 if player has opened the door with a key
…		…
2013	* 0 otherwise	1979	* 0 otherwise
2014	*/	1980	*/
2015	static int	1981	static int
2016	player_attack_door (object *op, object *door)	1982	player_attack_door (object *op, object *door)
2017	{	1983	{
2018	/* If its a door, try to find a use a key. If we do destroy the door,	1984	/* If its a door, try to find a key. If we do destroy the door,
2019	* might as well return immediately as there is nothing more to do -	1985	* might as well return immediately as there is nothing more to do -
2020	* otherwise, we fall through to the rest of the code.	1986	* otherwise, we fall through to the rest of the code.
2021	*/	1987	*/
2022	object *key = find_key (op, op, door);	1988	object *key = find_key (op, op, door);
2023		1989
2024	/* IF we found a key, do some extra work */	1990	/* If we found a key, do some extra work */
2025	if (key)	1991	if (key)
2026	{	1992	{
2027	object *container = key->env;	1993	object *container = key->env;
2028		1994
2029	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1995	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1996
2030	if (action_makes_visible (op))	1997	if (action_makes_visible (op))
2031	make_visible (op);	1998	make_visible (op);
		1999
2032	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	2000	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2033	spring_trap (door->inv, op);	2001	spring_trap (door->inv, op);
		2002
2034	if (door->type == DOOR)	2003	if (door->type == DOOR)
2035	{
2036	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	2004	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2037	}
2038	else if (door->type == LOCKED_DOOR)	2005	else if (door->type == LOCKED_DOOR)
2039	{	2006	{
2040	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2007	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2041	remove_door2 (door); /* remove door without violence ;-) */	2008	remove_door2 (door); /* remove door without violence ;-) */
2042	}	2009	}
		2010
2043	/* Do this after we print the message */	2011	/* Do this after we print the message */
2044	decrease_ob (key); /* Use up one of the keys */	2012	decrease_ob (key); /* Use up one of the keys */
2045	/* Need to update the weight the container the key was in */	2013	/* Need to update the weight the container the key was in */
2046	if (container != op)	2014	if (container != op)
2047	esrv_update_item (UPD_WEIGHT, op, container);	2015	esrv_update_item (UPD_WEIGHT, op, container);
		2016
2048	return 1; /* Nothing more to do below */	2017	return 1; /* Nothing more to do below */
2049	}	2018	}
2050	else if (door->type == LOCKED_DOOR)	2019	else if (door->type == LOCKED_DOOR)
2051	{	2020	{
2052	/* Might as well return now - no other way to open this */	2021	/* Might as well return now - no other way to open this */
2053	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2022	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2054	return 1;	2023	return 1;
2055	}	2024	}
		2025
2056	return 0;	2026	return 0;
2057	}	2027	}
2058		2028
2059	/* This function is just part of a breakup from move_player.	2029	/* This function is just part of a breakup from move_player.
2060	* It should keep the code cleaner.	2030	* It should keep the code cleaner.
2061	* When this is called, the players direction has been updated	2031	* When this is called, the players direction has been updated
2062	* (taking into account confusion.) The player is also actually	2032	* (taking into account confusion.) The player is also actually
2063	* going to try and move (not fire weapons).	2033	* going to try and move (not fire weapons).
2064	*/	2034	*/
2065	void	2035	bool
2066	move_player_attack (object *op, int dir)	2036	move_player_attack (object *op, int dir)
2067	{	2037	{
2068	object *tmp, *mon;
2069	sint16 nx, ny;
2070	int on_battleground;	2038	int on_battleground;
2071	maptile *m;
2072		2039
2073	nx = freearr_x[dir] + op->x;	2040	sint16 nx = freearr_x[dir] + op->x;
2074	ny = freearr_y[dir] + op->y;	2041	sint16 ny = freearr_y[dir] + op->y;
2075		2042
2076	on_battleground = op_on_battleground (op, 0, 0);	2043	on_battleground = op_on_battleground (op, 0, 0);
		2044
		2045	if (out_of_map (op->map, nx, ny))
		2046	return false;
		2047
		2048	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2049	{
		2050	--op->speed_left;
		2051	return true;
		2052	}
2077		2053
2078	/* If braced, or can't move to the square, and it is not out of the	2054	/* If braced, or can't move to the square, and it is not out of the
2079	* map, attack it. Note order of if statement is important - don't	2055	* map, attack it. Note order of if statement is important - don't
2080	* want to be calling move_ob if braced, because move_ob will move the	2056	* want to be calling move_ob if braced, because move_ob will move the
2081	* player. This is a pretty nasty hack, because if we could	2057	* player. This is a pretty nasty hack, because if we could
2082	* move to some space, it then means that if we are braced, we should	2058	* move to some space, it then means that if we are braced, we should
2083	* do nothing at all. As it is, if we are braced, we go through	2059	* do nothing at all. As it is, if we are braced, we go through
2084	* quite a bit of processing. However, it probably is less than what	2060	* quite a bit of processing. However, it probably is less than what
2085	* move_ob uses.	2061	* move_ob uses.
2086	*/	2062	*/
2087	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2063	maptile *m = op->map->xy_find (nx, ny);
2088	{
2089	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2090	{
2091	m = get_map_from_coord (op->map, &nx, &ny);
2092	if (!m)
2093	return; /* Don't think this should happen */
2094	}
2095	else
2096	m = op->map;
2097		2064
2098	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2099	{
2100	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2101	return;
2102	}
2103
2104	mon = 0;
2105	/* Go through all the objects, and find ones of interest. Only stop if	2065	/* Go through all the objects, and find ones of interest. Only stop if
2106	* we find a monster - that is something we know we want to attack.	2066	* we find a monster - that is something we know we want to attack.
2107	* if its a door or barrel (can roll) see if there may be monsters	2067	* if its a door or barrel (can roll) see if there may be monsters
2108	* on the space	2068	* on the space
2109	*/	2069	*/
2110	while (tmp)	2070	object *mon;
2111	{	2071	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2112	if (tmp == op)	2072	{
2113	{	2073	if ((mon->flag [FLAG_ALIVE]
2114	tmp = tmp->above;	2074	|| mon->type == LOCKED_DOOR
2115	continue;	2075	|| mon->flag [FLAG_CAN_ROLL])
2116	}
2117
2118	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2119	{
2120	mon = tmp;	2076	&& mon != op)
2121	break;	2077	break;
2122	}	2078	}
2123		2079
2124	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2125	mon = tmp;
2126
2127	tmp = tmp->above;
2128	}
2129
2130	if (!mon) /* This happens anytime the player tries to move */	2080	if (!mon) /* This happens anytime the player tries to move */
2131	return; /* into a wall */	2081	return false; /* into a wall */
2132		2082
2133	if (mon->head)
2134	mon = mon->head;	2083	mon = mon->head_ ();
2135		2084
2136	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2085	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2086	if (op->contr->weapon_sp_left > 0.f)
2137	if (player_attack_door (op, mon))	2087	if (player_attack_door (op, mon))
		2088	{
		2089	--op->contr->weapon_sp_left;
2138	return;	2090	return true;
		2091	}
2139		2092
2140	/* The following deals with possibly attacking peaceful	2093	/* The following deals with possibly attacking peaceful
2141	* or frienddly creatures. Basically, all players are considered	2094	* or friendly creatures. Basically, all players are considered
2142	* unaggressive. If the moving player has peaceful set, then the	2095	* unaggressive. If the moving player has peaceful set, then the
2143	* object should be pushed instead of attacked. It is assumed that	2096	* object should be pushed instead of attacked. It is assumed that
2144	* if you are braced, you will not attack friends accidently,	2097	* if you are braced, you will not attack friends accidently,
2145	* and thus will not push them.	2098	* and thus will not push them.
2146	*/	2099	*/
2147		2100
2148	/* If the creature is a pet, push it even if the player is not	2101	/* If the creature is a pet, push it even if the player is not
2149	* peaceful. Our assumption is the creature is a pet if the	2102	* peaceful. Our assumption is the creature is a pet if the
2150	* player owns it and it is either friendly or unagressive.	2103	* player owns it and it is either friendly or unagressive.
2151	*/	2104	*/
2152	if ((op->type == PLAYER)	2105	if (op->type == PLAYER
2153	#if COZY_SERVER
2154	&&
2155	((mon->owner && mon->owner->contr	2106	&& ((mon->owner && mon->owner->contr
2156	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2107	&& same_party (mon->owner->contr->party, op->contr->party))
2157	#else
2158	&& mon->owner == op	2108	|| mon->owner == op)
2159	#endif
2160	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2109	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2161	{	2110	{
2162	/* If we're braced, we don't want to switch places with it */	2111	/* If we're braced, we don't want to switch places with it */
2163	if (op->contr->braced)	2112	if (op->contr->braced)
2164	return;	2113	return false;
		2114
		2115	if (op->speed_left > 0.f)
		2116	{
		2117	--op->speed_left;
		2118
2165	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2119	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2166	(void) push_ob (mon, dir, op);	2120	push_ob (mon, dir, op);
		2121
2167	if (op->contr->tmp_invis || op->hide)	2122	if (op->contr->tmp_invis || op->hide)
2168	make_visible (op);	2123	make_visible (op);
		2124
2169	return;	2125	return true;
2170	}	2126	}
		2127	else
		2128	return false;
		2129	}
2171		2130
2172	/* in certain circumstances, you shouldn't attack friendly	2131	/* in certain circumstances, you shouldn't attack friendly
2173	* creatures. Note that if you are braced, you can't push	2132	* creatures. Note that if you are braced, you can't push
2174	* someone, but put it inside this loop so that you won't	2133	* someone, but put it inside this loop so that you won't
2175	* attack them either.	2134	* attack them either.
2176	*/	2135	*/
2177	if ((mon->type == PLAYER || mon->enemy != op) &&	2136	if ((mon->type == PLAYER || mon->enemy != op)
2178	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2137	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2179	#ifdef PROHIBIT_PLAYERKILL
2180	(op->contr->peaceful	2138	&& ((op->contr->peaceful
2181	|| (mon->type == PLAYER	2139	|| (mon->type == PLAYER && mon->contr->peaceful))
2182	&& mon->contr->
2183	peaceful)) &&
2184	#else
2185	op->contr->peaceful &&
2186	#endif
2187	!on_battleground))	2140	&& !on_battleground))
		2141	{
		2142	if (op->speed_left > 0.f)
2188	{	2143	{
		2144	--op->speed_left;
		2145
2189	if (!op->contr->braced)	2146	if (!op->contr->braced)
2190	{	2147	{
2191	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2192	(void) push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
2193	}	2150	}
2194	else	2151	else
2195	new_draw_info (0, 0, op, "You withhold your attack");	2152	new_draw_info (0, 0, op, "You withhold your attack");
2196		2153
2197	if (op->contr->tmp_invis || op->hide)	2154	if (op->contr->tmp_invis || op->hide)
2198	make_visible (op);	2155	make_visible (op);
2199	}
2200		2156
		2157	return true;
		2158	}
		2159	}
2201	/* If the object is a boulder or other rollable object, then	2160	/* If the object is a boulder or other rollable object, then
2202	* roll it if not braced. You can't roll it if you are braced.	2161	* roll it if not braced. You can't roll it if you are braced.
2203	*/	2162	*/
2204	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2163	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2164	{
		2165	if (op->speed_left > 0.f)
2205	{	2166	{
		2167	--op->speed_left;
		2168
2206	recursive_roll (mon, dir, op);	2169	recursive_roll (mon, dir, op);
2207	if (action_makes_visible (op))	2170	if (action_makes_visible (op))
2208	make_visible (op);	2171	make_visible (op);
2209	}
2210		2172
		2173	return true;
		2174	}
		2175	}
2211	/* Any generic living creature. Including things like doors.	2176	/* Any generic living creature. Including things like doors.
2212	* Way it works is like this: First, it must have some hit points	2177	* Way it works is like this: First, it must have some hit points
2213	* and be living. Then, it must be one of the following:	2178	* and be living. Then, it must be one of the following:
2214	* 1) Not a player, 2) A player, but of a different party. Note	2179	* 1) Not a player, 2) A player, but of a different party. Note
2215	* that party_number -1 is no party, so attacks can still happen.	2180	* that party_number -1 is no party, so attacks can still happen.
2216	*/	2181	*/
2217
2218	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2182	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2219	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2183	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2220	{	2184	{
2221		2185	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2222	/* If the player hasn't hit something this tick, and does
2223	* so, give them speed boost based on weapon speed. Doing
2224	* it here is better than process_players2, which basically
2225	* incurred a 1 tick offset.
2226	*/
2227	if (!op->contr->has_hit)
2228	{	2186	{
2229	op->speed_left += op->speed / op->contr->weapon_sp;	2187	--op->contr->weapon_sp_left;
2230
2231	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2232	}
2233		2188
2234	skill_attack (mon, op, 0, 0, 0);	2189	skill_attack (mon, op, 0, 0, 0);
2235
2236	/* If attacking another player, that player gets automatic
2237	* hitback, and doesn't loose luck either.
2238	* Disable hitback on the battleground or if the target is
2239	* the wiz.
2240	*/
2241	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2242	{
2243	short luck = mon->stats.luck;
2244
2245	mon->contr->has_hit = 1;
2246	skill_attack (op, mon, 0, 0, 0);
2247	mon->stats.luck = luck;
2248	}
2249		2190
2250	if (action_makes_visible (op))	2191	if (action_makes_visible (op))
2251	make_visible (op);	2192	make_visible (op);
2252	}
2253	} /* if player should attack something */
2254	}
2255		2193
2256	int	2194	return true;
		2195	}
		2196	}
		2197
		2198	return false;
		2199	}
		2200
		2201	bool
2257	move_player (object *op, int dir)	2202	move_player (object *op, int dir)
2258	{	2203	{
2259	int pick;	2204	int pick;
2260		2205
2261	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2206	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2262	return 0;	2207	return 0;
2263		2208
2264	/* Sanity check: make sure dir is valid */	2209	/* Sanity check: make sure dir is valid */
2265	if ((dir < 0) || (dir >= 9))	2210	if ((dir < 0) || (dir >= 9))
2266	{	2211	{
2267	LOG (llevError, "move_player: invalid direction %d\n", dir);	2212	LOG (llevError, "move_player: invalid direction %d\n", dir);
2268	return 0;	2213	return 0;
2269	}	2214	}
2270		2215
2271	/* peterm: added following line */	2216	/* peterm: added following line */
2272	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2217	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2273	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2218	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2274		2219
2275	op->facing = dir;	2220	op->facing = dir;
2276		2221
2277	if (op->hide)	2222	if (op->hide)
2278	do_hidden_move (op);	2223	do_hidden_move (op);
2279		2224
		2225	bool retval;
		2226
2280	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2227	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2281	/*nop */ ;	2228	retval = RESULT_INT (0);
2282	else if (op->contr->fire_on)	2229	else if (op->contr->fire_on)
2283	fire (op, dir);	2230	retval = fire (op, dir);
2284	else	2231	else
2285	{	2232	{
2286	move_player_attack (op, dir);	2233	retval = move_player_attack (op, dir);
2287	pick = check_pick (op);	2234	pick = check_pick (op);
2288	}	2235	}
2289		2236
2290	/* Add special check for newcs players and fire on - this way, the	2237	/* Add special check for newcs players and fire on - this way, the
2291	* server can handle repeat firing.	2238	* server can handle repeat firing.
…		…
2298	/* Update how the player looks. Use the facing, so direction may	2245	/* Update how the player looks. Use the facing, so direction may
2299	* get reset to zero. This allows for full animation capabilities	2246	* get reset to zero. This allows for full animation capabilities
2300	* for players.	2247	* for players.
2301	*/	2248	*/
2302	animate_object (op, op->facing);	2249	animate_object (op, op->facing);
2303	return 0;	2250
		2251	return retval;
2304	}	2252	}
2305		2253
2306	/* This is similar to handle_player, below, but is only used by the	2254	/* This is similar to handle_player, below, but is only used by the
2307	* new client/server stuff.	2255	* new client/server stuff.
2308	* This is sort of special, in that the new client/server actually uses	2256	* This is sort of special, in that the new client/server actually uses
2309	* the new speed values for commands.	2257	* the new speed values for commands.
2310	*	2258	*
2311	* Returns true if there are more actions we can do.	2259	* Returns true if there are more actions we can do. Should not do
		2260	* many actions in a row, as that would be too unfair to other
		2261	* players.
2312	*/	2262	*/
2313	int	2263	bool
2314	handle_newcs_player (object *op)	2264	handle_newcs_player (object *op)
2315	{	2265	{
2316	if (op->contr->hidden)
2317	{
2318	op->invisible = 1000;
2319	/* the socket code flashes the player visible/invisible
2320	* depending on the value of invisible, so we need to
2321	* alternate it here for it to work correctly.
2322	*/
2323	if (pticks & 2)
2324	op->invisible--;
2325	}
2326	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2327	{
2328	op->invisible--;
2329	if (!op->invisible)
2330	{
2331	make_visible (op);
2332	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2333	}
2334	}
2335
2336	if (QUERY_FLAG (op, FLAG_SCARED))	2266	if (QUERY_FLAG (op, FLAG_SCARED))
2337	{	2267	{
2338	flee_player (op);	2268	if (op->speed_left > 0.f)
2339	/* If player is still scared, that is his action for this tick */
2340	if (QUERY_FLAG (op, FLAG_SCARED))
2341	{	2269	{
2342	op->speed_left--;	2270	--op->speed_left;
		2271	flee_player (op);
		2272
2343	return 0;	2273	return true;
2344	}	2274	}
		2275	else
		2276	return false;
2345	}	2277	}
2346
2347	/* I've been seeing crashes where the golem has been destroyed, but
2348	* the player object still points to the defunct golem. The code that
2349	* destroys the golem looks correct, and it doesn't always happen, so
2350	* put this in a a workaround to clean up the golem pointer.
2351	*/
2352	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2353	op->contr->ranges[range_golem] = 0;
2354		2278
2355	/* call this here - we also will call this in do_ericserver, but	2279	/* call this here - we also will call this in do_ericserver, but
2356	* the players time has been increased when doericserver has been	2280	* the players time has been increased when doericserver has been
2357	* called, so we recheck it here.	2281	* called, so we recheck it here.
2358	*/	2282	*/
2359	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2283	if (op->contr->ns->handle_command ())
2360	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2361	;
2362
2363	if (op->speed_left < 0)
2364	return 0;	2284	return true;
2365		2285
2366	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2367	{
2368	/* All move commands take 1 tick, at least for now */
2369	op->speed_left--;
2370
2371	/* Instead of all the stuff below, let move_player take care
2372	* of it. Also, some of the skill stuff is only put in
2373	* there, as well as the confusion stuff.
2374	*/
2375	move_player (op, op->direction);	2287	return move_player (op, op->direction);
2376	if (op->speed_left > 0)
2377	return 1;
2378	else
2379	return 0;
2380	}
2381		2288
2382	return 0;	2289	return false;
2383	}	2290	}
2384		2291
2385	int	2292	int
2386	save_life (object *op)	2293	save_life (object *op)
2387	{	2294	{
…		…
2422	* from.	2329	* from.
2423	*/	2330	*/
2424	void	2331	void
2425	remove_unpaid_objects (object *op, object *env)	2332	remove_unpaid_objects (object *op, object *env)
2426	{	2333	{
2427	object *next;
2428
2429	while (op)	2334	while (op)
2430	{	2335	{
2431	next = op->below; /* Make sure we have a good value, in case	2336	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2432	* we remove object 'op'	2337
2433	*/
2434	if (QUERY_FLAG (op, FLAG_UNPAID))	2338	if (QUERY_FLAG (op, FLAG_UNPAID))
2435	{	2339	{
2436	op->remove ();
2437	op->x = env->x;
2438	op->y = env->y;
2439	if (env->type == PLAYER)	2340	if (env->type == PLAYER)
2440	esrv_del_item (env->contr, op->count);	2341	esrv_del_item (env->contr, op->count);
2441	insert_ob_in_map (op, env->map, NULL, 0);	2342
		2343	op->insert_at (env);
2442	}	2344	}
2443	else if (op->inv)	2345	else if (op->inv)
2444	remove_unpaid_objects (op->inv, env);	2346	remove_unpaid_objects (op->inv, env);
2445		2347
2446	op = next;	2348	op = next;
…		…
2502	int rate_grace = 2000;	2404	int rate_grace = 2000;
2503	const int max_hp = 1;	2405	const int max_hp = 1;
2504	const int max_sp = 1;	2406	const int max_sp = 1;
2505	const int max_grace = 1;	2407	const int max_grace = 1;
2506		2408
2507	if (op->contr->outputs_sync)	2409	if (op->contr->hidden)
		2410	{
		2411	op->invisible = 1000;
		2412	/* the socket code flashes the player visible/invisible
		2413	* depending on the value of invisible, so we need to
		2414	* alternate it here for it to work correctly.
		2415	*/
		2416	if (pticks & 2)
		2417	op->invisible--;
2508	{	2418	}
2509	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2419	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2510	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2420	{
2511	flush_output_element (op, &op->contr->outputs[i]);	2421	if (!op->invisible--)
		2422	{
		2423	make_visible (op);
		2424	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2425	}
2512	}	2426	}
2513		2427
2514	if (op->contr->ns->state == ST_PLAYING)	2428	if (op->contr->ns->state == ST_PLAYING)
2515	{	2429	{
2516	/* these next three if clauses make it possible to SLOW DOWN	2430	/* these next three if clauses make it possible to SLOW DOWN
…		…
2538	gen_grace = op->stats.maxgrace;	2452	gen_grace = op->stats.maxgrace;
2539	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2453	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2540	}	2454	}
2541		2455
2542	/* Regenerate Spell Points */	2456	/* Regenerate Spell Points */
2543	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2457	if (!op->contr->golem && --op->last_sp < 0)
2544	{	2458	{
2545	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2459	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2546	if (op->stats.sp < op->stats.maxsp)	2460	if (op->stats.sp < op->stats.maxsp)
2547	{	2461	{
2548	op->stats.sp++;	2462	op->stats.sp++;
…		…
2646	}	2560	}
2647		2561
2648	/* Digestion */	2562	/* Digestion */
2649	if (--op->last_eat < 0)	2563	if (--op->last_eat < 0)
2650	{	2564	{
2651	#ifdef COZY_SERVER
2652	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2653	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2654	#else
2655	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2565	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2656	#endif
2657		2566
2658	if (op->contr->gen_hp > 0)	2567	if (op->contr->gen_hp > 0)
2659	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2568	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2660	else	2569	else
2661	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2570	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2739	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2648	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2740	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2649	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2741		2650
2742	/* restore player */	2651	/* restore player */
2743	at = archetype::find ("poisoning");	2652	at = archetype::find ("poisoning");
2744	tmp = present_arch_in_ob (at, op);	2653	if (object *tmp = present_arch_in_ob (at, op))
2745	if (tmp)
2746	{	2654	{
2747	tmp->destroy ();	2655	tmp->destroy ();
2748	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2656	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2749	}	2657	}
2750		2658
2751	at = archetype::find ("confusion");	2659	at = archetype::find ("confusion");
2752	tmp = present_arch_in_ob (at, op);	2660	if (object *tmp = present_arch_in_ob (at, op))
2753	if (tmp)
2754	{	2661	{
2755	tmp->destroy ();	2662	tmp->destroy ();
2756	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2663	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2757	}	2664	}
2758		2665
…		…
2760	op->stats.hp = op->stats.maxhp;	2667	op->stats.hp = op->stats.maxhp;
2761	if (op->stats.food <= 0)	2668	if (op->stats.food <= 0)
2762	op->stats.food = 999;	2669	op->stats.food = 999;
2763		2670
2764	/* create a bodypart-trophy to make the winner happy */	2671	/* create a bodypart-trophy to make the winner happy */
2765	tmp = arch_to_object (archetype::find ("finger"));	2672	if (object *tmp = arch_to_object (archetype::find ("finger")))
2766	if (tmp != NULL)
2767	{	2673	{
2768	sprintf (buf, "%s's finger", &op->name);	2674	sprintf (buf, "%s's finger", &op->name);
2769	tmp->name = buf;	2675	tmp->name = buf;
2770	sprintf (buf, " This finger has been cut off %s\n"	2676	sprintf (buf, " This finger has been cut off %s\n"
2771	" the %s, when he was defeated at\n level %d by %s.\n",	2677	" the %s, when he was defeated at\n level %d by %s.\n",
2772	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2678	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2773	tmp->msg = buf;	2679	tmp->msg = buf;
2774	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2680	tmp->value = 0, tmp->type = 0;
2775	tmp->materialname = NULL;	2681	tmp->materialname = "organics";
2776	tmp->x = op->x, tmp->y = op->y;	2682	tmp->insert_at (op, tmp);
2777	insert_ob_in_map (tmp, op->map, op, 0);
2778	}	2683	}
2779		2684
2780	/* teleport defeated player to new destination */	2685	/* teleport defeated player to new destination */
2781	transfer_ob (op, x, y, 0, NULL);	2686	transfer_ob (op, x, y, 0, NULL);
2782	op->contr->braced = 0;	2687	op->contr->braced = 0;
…		…
2787		2692
2788	command_kill_pets (op, 0);	2693	command_kill_pets (op, 0);
2789		2694
2790	if (op->stats.food < 0)	2695	if (op->stats.food < 0)
2791	{	2696	{
2792	if (op->contr->explore)
2793	{
2794	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2795	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2796	op->stats.food = 999;
2797	return;
2798	}
2799	sprintf (buf, "%s starved to death.", &op->name);	2697	sprintf (buf, "%s starved to death.", &op->name);
2800	strcpy (op->contr->killer, "starvation");	2698	strcpy (op->contr->killer, "starvation");
2801	}	2699	}
2802	else	2700	else
2803	{
2804	if (op->contr->explore)
2805	{
2806	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2807	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2808	op->stats.hp = op->stats.maxhp;
2809	return;
2810	}
2811	sprintf (buf, "%s died.", &op->name);	2701	sprintf (buf, "%s died.", &op->name);
2812	}	2702
2813	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2703	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2814		2704
2815	/* save the map location for corpse, gravestone */	2705	/* save the map location for corpse, gravestone */
2816	x = op->x;	2706	x = op->x;
2817	y = op->y;	2707	y = op->y;
2818	map = op->map;	2708	map = op->map;
2819
2820		2709
2821	/* NOT_PERMADEATH code. This basically brings the character back to	2710	/* NOT_PERMADEATH code. This basically brings the character back to
2822	* life if they are dead - it takes some exp and a random stat.	2711	* life if they are dead - it takes some exp and a random stat.
2823	* See the config.h file for a little more in depth detail about this.	2712	* See the config.h file for a little more in depth detail about this.
2824	*/	2713	*/
…		…
2841	num_stats_lose = 1;	2730	num_stats_lose = 1;
2842	else	2731	else
2843	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2732	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2844	}	2733	}
2845	else	2734	else
2846	{
2847	num_stats_lose = 1;	2735	num_stats_lose = 1;
2848	}	2736
2849	lost_a_stat = 0;	2737	lost_a_stat = 0;
2850		2738
2851	for (z = 0; z < num_stats_lose; z++)	2739	for (z = 0; z < num_stats_lose; z++)
2852	{	2740	{
2853	i = RANDOM () % NUM_STATS;	2741	i = RANDOM () % NUM_STATS;
…		…
2994	op->stats.hp = op->stats.maxhp;	2882	op->stats.hp = op->stats.maxhp;
2995	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2883	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2996	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2884	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2997		2885
2998	/*	2886	/*
2999	* Check to see if the player is in a shop. IF so, then check to see if
3000	* the player has any unpaid items. If so, remove them and put them back	2887	* Check to see if the player has any unpaid items. If so, remove them
3001	* in the map.	2888	* and put them back in the map.
3002	*/	2889	*/
3003
3004	if (is_in_shop (op))
3005	remove_unpaid_objects (op->inv, op);	2890	remove_unpaid_objects (op->inv, op);
3006		2891
3007	/****************************************/	2892	/****************************************/
3008	/* */	2893	/* */
3009	/* Move player to his current respawn- */	2894	/* Move player to his current respawn- */
3010	/* position (usually last savebed) */	2895	/* position (usually last savebed) */
3011	/* */	2896	/* */
3012	/****************************************/	2897	/****************************************/
3013		2898
3014	enter_player_savebed (op);	2899	enter_player_savebed (op);
3015		2900
3016	/* Save the player before inserting the force to reduce
3017	* chance of abuse.
3018	*/
3019	op->contr->braced = 0;	2901	op->contr->braced = 0;
3020	op->contr->save ();
3021		2902
3022	/* it is possible that the player has blown something up	2903	/* it is possible that the player has blown something up
3023	* at his savebed location, and that can have long lasting	2904	* at his savebed location, and that can have long lasting
3024	* spell effects. So first see if there is a spell effect	2905	* spell effects. So first see if there is a spell effect
3025	* on the space that might harm the player.	2906	* on the space that might harm the player.
…		…
3034	object *force;	2915	object *force;
3035	int at;	2916	int at;
3036		2917
3037	force = get_archetype (FORCE_NAME);	2918	force = get_archetype (FORCE_NAME);
3038	/* 50 ticks should be enough time for the spell to abate */	2919	/* 50 ticks should be enough time for the spell to abate */
3039	force->speed = 0.1;	2920	force->speed = 0.1f;
3040	force->speed_left = -5.0;	2921	force->speed_left = -5.f;
3041	SET_FLAG (force, FLAG_APPLIED);	2922	SET_FLAG (force, FLAG_APPLIED);
3042	for (at = 0; at < NROFATTACKS; at++)	2923	for (at = 0; at < NROFATTACKS; at++)
3043	if (will_kill_again & (1 << at))	2924	if (will_kill_again & (1 << at))
3044	force->resist[at] = 100;	2925	force->resist[at] = 100;
3045		2926
…		…
3054	void	2935	void
3055	loot_object (object *op)	2936	loot_object (object *op)
3056	{ /* Grab and destroy some treasure */	2937	{ /* Grab and destroy some treasure */
3057	object *tmp, *tmp2, *next;	2938	object *tmp, *tmp2, *next;
3058		2939
3059	if (op->container)	2940	op->close_container (); /* close open sack first */
3060	esrv_apply_container (op, op->container); /* close open sack first */
3061		2941
3062	for (tmp = op->inv; tmp; tmp = next)	2942	for (tmp = op->inv; tmp; tmp = next)
3063	{	2943	{
3064	next = tmp->below;	2944	next = tmp->below;
3065		2945
3066	if (tmp->invisible)	2946	if (tmp->invisible)
3067	continue;	2947	continue;
3068		2948
3069	tmp->remove ();	2949	tmp->remove ();
3070	tmp->x = op->x, tmp->y = op->y;	2950	tmp->x = op->x, tmp->y = op->y;
		2951
3071	if (tmp->type == CONTAINER)	2952	if (tmp->type == CONTAINER)
3072	{ /* empty container to ground */	2953	loot_object (tmp); /* empty container to ground */
3073	loot_object (tmp);	2954
3074	}
3075	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2955	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3076	{	2956	{
3077	if (tmp->nrof > 1)	2957	if (tmp->nrof > 1)
3078	{	2958	{
3079	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2959	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3080	tmp2->destroy ();	2960	tmp2->destroy ();
…		…
3091	/*	2971	/*
3092	* fix_weight(): Check recursively the weight of all players, and fix	2972	* fix_weight(): Check recursively the weight of all players, and fix
3093	* what needs to be fixed. Refresh windows and fix speed if anything	2973	* what needs to be fixed. Refresh windows and fix speed if anything
3094	* was changed.	2974	* was changed.
3095	*/	2975	*/
3096
3097	void	2976	void
3098	fix_weight (void)	2977	fix_weight (void)
3099	{	2978	{
3100	for (player *pl = first_player; pl; pl = pl->next)	2979	for_all_players (pl)
3101	{	2980	{
3102	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2981	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3103		2982
3104	if (old == sum)	2983	if (old == sum)
3105	continue;	2984	continue;
…		…
3109	}	2988	}
3110		2989
3111	void	2990	void
3112	fix_luck (void)	2991	fix_luck (void)
3113	{	2992	{
3114	for (player *pl = first_player; pl; pl = pl->next)	2993	for_all_players (pl)
3115	if (!pl->ob->contr->ns->state)	2994	if (!pl->ob->contr->ns->state)
3116	pl->ob->change_luck (0);	2995	pl->ob->change_luck (0);
3117	}	2996	}
3118		2997
3119	/* cast_dust() - handles op throwing objects of type 'DUST'.	2998	/* cast_dust() - handles op throwing objects of type 'DUST'.
…		…
3161	if (op->type == PLAYER)	3040	if (op->type == PLAYER)
3162	{	3041	{
3163	op->contr->tmp_invis = 0;	3042	op->contr->tmp_invis = 0;
3164	op->contr->invis_race = 0;	3043	op->contr->invis_race = 0;
3165	}	3044	}
		3045
3166	update_object (op, UP_OBJ_FACE);	3046	update_object (op, UP_OBJ_CHANGE);
3167	}	3047	}
3168		3048
3169	int	3049	int
3170	is_true_undead (object *op)	3050	is_true_undead (object *op)
3171	{	3051	{
3172	object *tmp = NULL;
3173
3174	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3052	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3175	return 1;	3053	return 1;
3176		3054
3177	return 0;	3055	return 0;
3178	}	3056	}
…		…
3223	/* For Hidden creatures - a chance of becoming 'unhidden'	3101	/* For Hidden creatures - a chance of becoming 'unhidden'
3224	* every time they move - as we subtract off 'invisibility'	3102	* every time they move - as we subtract off 'invisibility'
3225	* AND, for players, if they move into a ridiculously unhideable	3103	* AND, for players, if they move into a ridiculously unhideable
3226	* spot (surrounded by clear terrain in broad daylight). -b.t.	3104	* spot (surrounded by clear terrain in broad daylight). -b.t.
3227	*/	3105	*/
3228
3229	void	3106	void
3230	do_hidden_move (object *op)	3107	do_hidden_move (object *op)
3231	{	3108	{
3232	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3109	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3233	object *skop;	3110	object *skop;
…		…
3237		3114
3238	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3115	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3239		3116
3240	/* its *extremely* hard to run and sneak/hide at the same time! */	3117	/* its *extremely* hard to run and sneak/hide at the same time! */
3241	if (op->type == PLAYER && op->contr->run_on)	3118	if (op->type == PLAYER && op->contr->run_on)
3242	{
3243	if (!skop || num >= skop->level)	3119	if (!skop || num >= skop->level)
3244	{	3120	{
3245	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3121	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3246	make_visible (op);	3122	make_visible (op);
3247	return;	3123	return;
3248	}	3124	}
3249	else	3125	else
3250	num += 20;	3126	num += 20;
3251	}	3127
3252	num += op->map->difficulty;	3128	num += op->map->difficulty;
3253	hide = hideability (op); /* modify by terrain hidden level */	3129	hide = hideability (op); /* modify by terrain hidden level */
3254	num -= hide;	3130	num -= hide;
		3131
3255	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3132	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3256	{	3133	{
3257	make_visible (op);	3134	make_visible (op);
3258	if (op->type == PLAYER)	3135	if (op->type == PLAYER)
3259	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3136	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3260	}	3137	}
3261	else if (op->type == PLAYER && skop)	3138	else if (op->type == PLAYER && skop)
3262	{
3263	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3139	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3264	}
3265	}	3140	}
3266		3141
3267	/* determine if who is standing near a hostile creature. */	3142	/* determine if who is standing near a hostile creature. */
3268		3143
3269	int	3144	int
…		…
3336	if (pl->type != PLAYER)	3211	if (pl->type != PLAYER)
3337	{	3212	{
3338	LOG (llevError, "player_can_view() called for non-player object\n");	3213	LOG (llevError, "player_can_view() called for non-player object\n");
3339	return -1;	3214	return -1;
3340	}	3215	}
		3216
3341	if (!pl || !op)	3217	if (!pl || !op)
3342	return 0;	3218	return 0;
3343		3219
3344	if (op->head)
3345	{
3346	op = op->head;	3220	op = op->head_ ();
3347	}	3221
3348	get_rangevector (pl, op, &rv, 0x1);	3222	get_rangevector (pl, op, &rv, 0x1);
3349		3223
3350	/* starting with the 'head' part, lets loop	3224	/* starting with the 'head' part, lets loop
3351	* through the object and find if it has any	3225	* through the object and find if it has any
3352	* part that is in the los array but isnt on	3226	* part that is in the los array but isnt on
…		…
3469	char buf[MAX_BUF]; /* tmp. string buffer */	3343	char buf[MAX_BUF]; /* tmp. string buffer */
3470	int i = 0, j = 0;	3344	int i = 0, j = 0;
3471		3345
3472	/* get the appropriate treasurelist */	3346	/* get the appropriate treasurelist */
3473	if (atnr == ATNR_FIRE)	3347	if (atnr == ATNR_FIRE)
3474	trlist = find_treasurelist ("dragon_ability_fire");	3348	trlist = treasurelist::find ("dragon_ability_fire");
3475	else if (atnr == ATNR_COLD)	3349	else if (atnr == ATNR_COLD)
3476	trlist = find_treasurelist ("dragon_ability_cold");	3350	trlist = treasurelist::find ("dragon_ability_cold");
3477	else if (atnr == ATNR_ELECTRICITY)	3351	else if (atnr == ATNR_ELECTRICITY)
3478	trlist = find_treasurelist ("dragon_ability_elec");	3352	trlist = treasurelist::find ("dragon_ability_elec");
3479	else if (atnr == ATNR_POISON)	3353	else if (atnr == ATNR_POISON)
3480	trlist = find_treasurelist ("dragon_ability_poison");	3354	trlist = treasurelist::find ("dragon_ability_poison");
3481		3355
3482	if (trlist == NULL || who->type != PLAYER)	3356	if (trlist == NULL || who->type != PLAYER)
3483	return;	3357	return;
3484		3358
3485	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3359	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3486		3360
3487	if (tr == NULL || tr->item == NULL)	3361	if (!tr || !tr->item)
3488	{	3362	{
3489	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3363	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3490	return;	3364	return;
3491	}	3365	}
3492		3366
…		…
3617	* not readied.	3491	* not readied.
3618	*/	3492	*/
3619	void	3493	void
3620	player_unready_range_ob (player *pl, object *ob)	3494	player_unready_range_ob (player *pl, object *ob)
3621	{	3495	{
3622	rangetype i;	3496	if (pl->ob->current_weapon == ob)
		3497	pl->ob->current_weapon = 0;
3623		3498
3624	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3499	if (pl->combat_ob == ob)
3625	{	3500	pl->combat_ob = 0;
		3501
3626	if (pl->ranges[i] == ob)	3502	if (pl->ranged_ob == ob)
3627	{	3503	pl->ranged_ob = 0;
3628	pl->ranges[i] = NULL;
3629	if (pl->shoottype == i)
3630	{
3631	pl->shoottype = range_none;
3632	}
3633	}
3634	}
3635	}	3504	}
		3505
		3506	sint8
		3507	player::visibility_at (maptile *map, int x, int y) const
		3508	{
		3509	if (!ns)
		3510	return 0;
		3511
		3512	int dx, dy;
		3513	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3514	return 0;
		3515
		3516	x += dx - ns->current_x + ns->mapx / 2;
		3517	y += dy - ns->current_y + ns->mapy / 2;
		3518
		3519	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3520	return 0;
		3521
		3522	return 100 - blocked_los [x][y];
		3523	}

Diff Legend

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