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.74 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.152 by root, Sun Jul 1 05:00:20 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
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 3 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, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <pwd.h>
26	#include <sproto.h>	25	#include <sproto.h>
27	#include <sounds.h>	26	#include <sounds.h>
28	#include <living.h>	27	#include <living.h>
29	#include <object.h>	28	#include <object.h>
30	#include <spells.h>	29	#include <spells.h>
31	#include <skills.h>	30	#include <skills.h>
32		31
33	#include <algorithm>	32	#include <algorithm>
34	#include <functional>	33	#include <functional>
35		34
36	player *	35	playervec players;
37	find_player (const char *plname)
38	{
39	for_all_players (pl)
40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
41	return pl;
42
43	return 0;
44	}
45		36
46	void	37	void
47	display_motd (const object *op)	38	display_motd (const object *op)
48	{	39	{
49	char buf[MAX_BUF];	40	char buf[MAX_BUF];
…		…
123		114
124	news[0] = '\0';	115	news[0] = '\0';
125	subject[0] = '\0';	116	subject[0] = '\0';
126	size = 0;	117	size = 0;
127		118
128	while (fgets (buf, MAX_BUF, fp) != NULL)	119	while (fgets (buf, MAX_BUF, fp))
129	{	120	{
130	if (*buf == '#')	121	if (*buf == '#')
131	continue;	122	continue;
132		123
133	if (*buf == '%')	124	if (*buf == '%')
134	{ /* send one news */	125	{ /* send one news */
135	if (size > 0)	126	if (size > 0)
136	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */	127	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 */
		128
137	strcpy (subject, buf + 1);	129	strcpy (subject, buf + 1);
138	strip_endline (subject);	130	strip_endline (subject);
139	size = 0;	131	size = 0;
140	news[0] = '\0';	132	news[0] = '\0';
141	}	133	}
…		…
150	size += strlen (buf);	142	size += strlen (buf);
151	}	143	}
152	}	144	}
153		145
154	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156	close_and_delete (fp, comp);	148	close_and_delete (fp, comp);
157	}	149	}
158		150
159	/* This loads the first map an puts the player on it. */	151	/* This loads the first map an puts the player on it. */
160	static void	152	static void
161	set_first_map (object *op)	153	set_first_map (object *op)
162	{	154	{
163	strcpy (op->contr->maplevel, first_map_path);	155	op->contr->maplevel = first_map_path;
164	op->x = -1;	156	op->x = -1;
165	op->y = -1;	157	op->y = -1;
166	op->enter_exit (0);	158	}
		159
		160	void
		161	player::activate ()
		162	{
		163	if (active)
		164	return;
		165
		166	players.insert (this);
		167	ob->remove ();
		168	ob->map = 0;
		169	ob->activate_recursive ();
		170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		171	add_friendly_object (ob);
		172	}
		173
		174	void
		175	player::deactivate ()
		176	{
		177	if (!active)
		178	return;
		179
		180	terminate_all_pets (ob);
		181	remove_friendly_object (ob);
		182	ob->deactivate_recursive ();
		183
		184	if (ob->map)
		185	maplevel = ob->map->path;
		186
		187	ob->remove ();
		188	ob->map = 0;
		189	party = 0;
		190
		191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		192
		193	players.erase (this);
167	}	194	}
168		195
169	// connect the player with a specific client	196	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	197	// also changes, rationalises, and fixes some incorrect settings
171	void	198	void
172	player::connect (client *ns)	199	player::connect (client *ns)
173	{	200	{
174	this->ns = ns;	201	this->ns = ns;
175	ns->pl = this;	202	ns->pl = this;
176		203
177	next = first_player;	204	run_on = 0;
178	first_player = this;	205	fire_on = 0;
		206	ob->close_container (); //TODO: client-specific
179		207
180	ns->update_look = 0;	208	ns->update_look = 0;
181	ns->look_position = 0;	209	ns->look_position = 0;
182		210
183	clear_los (ob);	211	clear_los (this);
		212
		213	ns->reset_stats ();
184		214
185	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
188
189	if (!legal_range (ob, shoottype))
190	shoottype = range_none;
191		218
192	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	220	link_player_skills (ob);
194		221
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196		223
197	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
198
199	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
200	* from the class, and not race. I don't see any way to get the class information
201	* to then update this. I don't think this will actually break anything - anyone
202	* that can use armour should be able to use a shield. What this may 'break'
203	* are features new characters get, eg, if someone starts up with a Q, they
204	* should be able to use a shield. However, old Q's won't get that advantage.
205	*/
206	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
207	SET_FLAG (ob, FLAG_USE_SHIELD);
208		225
209	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
210	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
211	{	228	{
212	object *tmp, *abil = 0, *skin = 0;	229	object *tmp, *abil = 0, *skin = 0;
…		…
214	shstr_cmp dragon_ability_force ("dragon_ability_force");	231	shstr_cmp dragon_ability_force ("dragon_ability_force");
215	shstr_cmp dragon_skin_force ("dragon_skin_force");	232	shstr_cmp dragon_skin_force ("dragon_skin_force");
216		233
217	for (tmp = ob->inv; tmp; tmp = tmp->below)	234	for (tmp = ob->inv; tmp; tmp = tmp->below)
218	if (tmp->type == FORCE)	235	if (tmp->type == FORCE)
219	if (tmp->arch->name == dragon_ability_force)	236	if (tmp->arch->archname == dragon_ability_force)
220	abil = tmp;	237	abil = tmp;
221	else if (tmp->arch->name == dragon_skin_force)	238	else if (tmp->arch->archname == dragon_skin_force)
222	skin = tmp;	239	skin = tmp;
223		240
224	set_dragon_name (ob, abil, skin);	241	set_dragon_name (ob, abil, skin);
225	}	242	}
226		243
227	CLEAR_FLAG (ob, FLAG_FRIENDLY);
228	add_friendly_object (ob);
229
230	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
231
232	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
233		245
234	esrv_new_player (this, ob->weight + ob->carrying);	246	esrv_new_player (this, ob->weight + ob->carrying);
235		247
		248	ob->flag [FLAG_READY_WEAPON] = false;
		249	ob->flag [FLAG_READY_SKILL] = false;
		250	ob->flag [FLAG_READY_BOW] = false;
		251
		252	for (object *op = ob->inv; op; op = op->below)
		253	if (op->flag [FLAG_APPLIED])
		254	switch (op->type)
		255	{
		256	case SKILL:
		257	ob->flag [FLAG_APPLIED] = false;
		258	break;
		259
		260	case WAND:
		261	case ROD:
		262	case HORN:
		263	case BOW:
		264	ranged_ob = op;
		265	break;
		266
		267	case WEAPON:
		268	combat_ob = op;
		269	break;
		270	}
		271
		272	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
236	ob->update_stats ();	273	ob->update_stats ();
		274
237	ns->floorbox_update ();	275	ns->floorbox_update ();
238
239	esrv_send_inventory (ob, ob);	276	esrv_send_inventory (ob, ob);
240	esrv_add_spells (this, 0);	277	esrv_add_spells (this, 0);
241		278
242	ob->enter_exit (0);
243	ob->activate (1);	279	activate ();
244		280
245	send_rules (ob);	281	send_rules (ob);
246	send_news (ob);	282	send_news (ob);
247	display_motd (ob);	283	display_motd (ob);
		284
		285	INVOKE_PLAYER (CONNECT, this);
248	INVOKE_PLAYER (LOGIN, this);	286	INVOKE_PLAYER (LOGIN, this);
249	}	287	}
250		288
251	void	289	void
252	player::disconnect ()	290	player::disconnect ()
253	{	291	{
		292	if (ns)
		293	{
		294	if (active)
		295	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		296
		297	INVOKE_PLAYER (DISCONNECT, this);
		298
		299	ns->reset_stats ();
		300	ns->pl = 0;
		301	ns = 0;
		302	}
		303
254	if (ob)	304	if (ob)
		305	ob->close_container (); //TODO: client-specific
		306
		307	observe = ob;
		308
255	ob->deactivate (1);	309	deactivate ();
256
257	//TODO: don't be so harsh and destroy :)
258	if (ns)
259	{
260	if (enable_save)
261	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
262
263	client *ns = this->ns;
264	ns->send_packet ("goodbye");
265	ns->flush ();
266	ns->pl = 0;
267	this->ns = 0;
268
269	ns->destroy ();
270	destroy ();
271	}
272	}	310	}
273		311
274	// the need for this function can be explained	312	// the need for this function can be explained
275	// by load_object not returning the object	313	// by load_object not returning the object
276	void	314	void
277	player::set_object (object *op)	315	player::set_object (object *op)
278	{	316	{
279	ob = op;	317	ob = observe = op;
280	ob->contr = this; /* this aren't yet in archetype */	318	ob->contr = this; /* this aren't yet in archetype */
281		319
		320	ob->speed = 1.0f;
282	ob->speed_left = 0.5;	321	ob->speed_left = 0.5f;
283	ob->speed = 1.0;	322
284	ob->direction = 5; /* So player faces south */	323	ob->direction = 5; /* So player faces south */
285	ob->stats.wc = 2;	324	}
286	ob->run_away = 25; /* Then we panick... */
287		325
288	set_first_map (ob);	326	void
289		327	player::set_observe (object *op)
290	ob->roll_stats ();	328	{
		329	observe = op ? op : ob;
		330	do_los = 1;
291	}	331	}
292		332
293	player::player ()	333	player::player ()
294	{	334	{
295	/* There are some elements we want initialized to non zero value -	335	/* There are some elements we want initialised to non zero value -
296	* we deal with that below this point.	336	* we deal with that below this point.
297	*/	337	*/
298	outputs_sync = 16; /* Every 2 seconds */	338	outputs_sync = 4;
299	outputs_count = 8; /* Keeps present behaviour */	339	outputs_count = 4;
300	unapply = unapply_nochoice;	340	unapply = unapply_nochoice;
301		341
302	assign (savebed_map, first_map_path); /* Init. respawn position */	342	savebed_map = first_map_path; /* Init. respawn position */
303		343
304	gen_sp_armour = 10;	344	gen_sp_armour = 10;
305	last_speed = -1;
306	shoottype = range_none;
307	bowtype = bow_normal;	345	bowtype = bow_normal;
308	petmode = pet_normal;	346	petmode = pet_normal;
309	listening = 10;	347	listening = 10;
310	usekeys = containers;	348	usekeys = containers;
311	last_weapon_sp = -1;
312	peaceful = 1; /* default peaceful */	349	peaceful = 1; /* default peaceful */
313	do_los = 1;	350	do_los = 1;
314		351
315	/* we need to clear these to -1 and not zero - otherwise,	352	weapon_sp = 1.0f;
316	* if a player quits and starts a new character, we wont	353	weapon_sp_left = 0.5f;
317	* send new values to the client, as things like exp start
318	* at zero.
319	*/
320	for (int i = 0; i < NUM_SKILLS; i++)
321	last_skill_exp[i] = -1;
322
323	for (int i = 0; i < NROFATTACKS; i++)
324	last_resist[i] = -1;
325
326	last_stats.exp = -1;
327	last_weight = (uint32) - 1;
328	}	354	}
329		355
330	void	356	void
331	player::do_destroy ()	357	player::do_destroy ()
332	{	358	{
333	disconnect ();	359	disconnect ();
334		360
335	save (false);
336	enable_save = false;
337
338	attachable::do_destroy ();	361	attachable::do_destroy ();
339
340	terminate_all_pets (ob);
341
342	if (first_player != this)
343	{
344	player *prev = first_player;
345
346	while (prev && prev->next && prev->next != this)
347	prev = prev->next;
348
349	if (prev->next != this)
350	{
351	LOG (llevError, "Free_player: Can't find previous player.\n");
352	abort ();
353	}
354
355	prev->next = next;
356	}
357	else
358	first_player = next;
359		362
360	if (ob)	363	if (ob)
361	{	364	{
362	ob->destroy_inv (false);	365	ob->destroy_inv (false);
363	ob->destroy ();	366	ob->destroy ();
364	}	367	}
		368
		369	ob = observe = 0;
365	}	370	}
366		371
367	player::~player ()	372	player::~player ()
368	{	373	{
369	/* Clear item stack */	374	/* Clear item stack */
…		…
378	player::create ()	383	player::create ()
379	{	384	{
380	player *pl = new player;	385	player *pl = new player;
381		386
382	pl->set_object (arch_to_object (get_player_archetype (0)));	387	pl->set_object (arch_to_object (get_player_archetype (0)));
		388
		389	pl->ob->roll_stats ();
		390	pl->ob->stats.wc = 2;
		391	pl->ob->run_away = 25; /* Then we panick... */
		392
		393	set_first_map (pl->ob);
383		394
384	return pl;	395	return pl;
385	}	396	}
386		397
387	/*	398	/*
…		…
390	* Note: there MUST be at least one player archetype!	401	* Note: there MUST be at least one player archetype!
391	*/	402	*/
392	archetype *	403	archetype *
393	get_player_archetype (archetype *at)	404	get_player_archetype (archetype *at)
394	{	405	{
395	archetype *start = at;	406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
396		407
397	for (;;)	408	for (;;)
398	{	409	{
399	if (at == NULL || at->next == NULL)	410	if (++i == archetypes.end ())
400	at = first_archetype;	411	i = archetypes.begin ();
401	else	412	else if (*i == at)
402	at = at->next;	413	cleanup ("not a single player archetype found");
403		414
404	if (at->clone.type == PLAYER)	415	if ((*i)->type == PLAYER)
405	return at;	416	return *i;
406
407	if (at == start)
408	{
409	LOG (llevError, "No Player archetypes\n");
410	exit (-1);
411	}
412	}	417	}
413	}	418	}
414		419
415	object *	420	object *
416	get_nearest_player (object *mon)	421	get_nearest_player (object *mon)
…		…
418	object *op = NULL;	423	object *op = NULL;
419	objectlink *ol;	424	objectlink *ol;
420	unsigned lastdist;	425	unsigned lastdist;
421	rv_vector rv;	426	rv_vector rv;
422		427
423	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	428	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
424	{	429	{
425	/* We should not find free objects on this friendly list, but it	430	/* We should not find free objects on this friendly list, but it
426	* does periodically happen. Given that, lets deal with it.	431	* does periodically happen. Given that, lets deal with it.
427	* While unlikely, it is possible the next object on the friendly	432	* While unlikely, it is possible the next object on the friendly
428	* list is also free, so encapsulate this in a while loop.	433	* list is also free, so encapsulate this in a while loop.
…		…
432	object *tmp = ol->ob;	437	object *tmp = ol->ob;
433		438
434	/* Can't do much more other than log the fact, because the object	439	/* Can't do much more other than log the fact, because the object
435	* itself will have been cleared.	440	* itself will have been cleared.
436	*/	441	*/
437	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	442	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		443	tmp->debug_desc ());
438	ol = ol->next;	444	ol = ol->next;
439	remove_friendly_object (tmp);	445	remove_friendly_object (tmp);
440	if (!ol)	446	if (!ol)
441	return op;	447	return op;
442	}	448	}
…		…
531	x = mon->x;	537	x = mon->x;
532	y = mon->y;	538	y = mon->y;
533	m = mon->map;	539	m = mon->map;
534	dir = rv.direction;	540	dir = rv.direction;
535	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	541	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
536	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	542	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		543
537	/* If we can't solve it within the search distance, return now. */	544	/* If we can't solve it within the search distance, return now. */
538	if (diff > max)	545	if (diff > max)
539	return 0;	546	return 0;
		547
540	while (diff > 1 && max > 0)	548	while (diff > 1 && max > 0)
541	{	549	{
542	lastx = x;	550	lastx = x;
543	lasty = y;	551	lasty = y;
544	lastmap = m;	552	lastmap = m;
…		…
626	max--;	634	max--;
627	lastdir = dir;	635	lastdir = dir;
628	if (!firstdir)	636	if (!firstdir)
629	firstdir = dir;	637	firstdir = dir;
630	}	638	}
		639
631	if (diff <= 1)	640	if (diff <= 1)
632	{	641	{
633	/* Recalculate diff (distance) because we may not have actually	642	/* Recalculate diff (distance) because we may not have actually
634	* headed toward player for entire distance.	643	* headed toward player for entire distance.
635	*/	644	*/
636	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	645	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
637	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	646	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
638	}	647	}
		648
639	if (diff > max)	649	if (diff > max)
640	return 0;	650	return 0;
641	}	651	}
		652
642	/* If we reached the max, didn't find a direction in time */	653	/* If we reached the max, didn't find a direction in time */
643	if (!max)	654	if (!max)
644	return 0;	655	return 0;
645		656
646	return firstdir;	657	return firstdir;
…		…
760	roll_stat (void)	771	roll_stat (void)
761	{	772	{
762	int a[4], i, j, k;	773	int a[4], i, j, k;
763		774
764	for (i = 0; i < 4; i++)	775	for (i = 0; i < 4; i++)
765	a[i] = (int) RANDOM () % 6 + 1;	776	a[i] = (int) rndm (6) + 1;
766		777
767	for (i = 0, j = 0, k = 7; i < 4; i++)	778	for (i = 0, j = 0, k = 7; i < 4; i++)
768	if (a[i] < k)	779	if (a[i] < k)
769	k = a[i], j = i;	780	k = a[i], j = i;
770		781
…		…
776	}	787	}
777		788
778	void	789	void
779	object::roll_stats ()	790	object::roll_stats ()
780	{	791	{
781	int statsort [7];	792	int statsort [NUM_STATS];
782		793
783	for (;;)	794	for (;;)
784	{	795	{
785	int sum = 0;	796	int sum = 0;
786	for (int i = 7; i--; )	797	for (int i = NUM_STATS; i--; )
787	sum += statsort [i] = roll_stat ();	798	sum += statsort [i] = roll_stat ();
788		799
789	if (sum >= 82 && sum <= 116)	800	if (sum >= 82 && sum <= 116)
790	break;	801	break;
791	}	802	}
792		803
793	// Sort the stats so that rerolling is easier...	804	// Sort the stats so that rerolling is easier...
794	std::sort (statsort, statsort + 7, std::greater<int>());	805	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
795		806
		807	for (int i = 0; i < NUM_STATS; ++i)
796	stats.Str = statsort[0];	808	stats.stat (i) = statsort [i];
797	stats.Dex = statsort[1];
798	stats.Con = statsort[2];
799	stats.Int = statsort[3];
800	stats.Wis = statsort[4];
801	stats.Pow = statsort[5];
802	stats.Cha = statsort[6];
803		809
804	stats.exp = 0;	810	stats.exp = 0;
805	stats.ac = 0;	811	stats.ac = 0;
806		812
807	stats.hp = stats.maxhp;	813	stats.hp = stats.maxhp;
…		…
819	}	825	}
820		826
821	void	827	void
822	object::swap_stats (int a, int b)	828	object::swap_stats (int a, int b)
823	{	829	{
824	int tmp = get_attr_value (&contr->orig_stats, a);	830	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
825	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
826	set_attr_value (&contr->orig_stats, b, tmp);
827		831
		832	for (int i = 0; i < NUM_STATS; ++i)
828	stats.Str = contr->orig_stats.Str;	833	stats.stat (i) = contr->orig_stats.stat (i);
829	stats.Dex = contr->orig_stats.Dex;
830	stats.Con = contr->orig_stats.Con;
831	stats.Int = contr->orig_stats.Int;
832	stats.Wis = contr->orig_stats.Wis;
833	stats.Pow = contr->orig_stats.Pow;
834	stats.Cha = contr->orig_stats.Cha;
835		834
836	//TODO: the following code looks so borked and should, at the very least,	835	//TODO: the following code looks so borked and should, at the very least,
837	// be merged with the similar code in roll_stats	836	// be merged with the similar code in roll_stats
838	stats.ac = 0;	837	stats.ac = 0;
839		838
…		…
870	* appropriate action with it (change race, or other things).	869	* appropriate action with it (change race, or other things).
871	* The function name is for historical reasons - now we have	870	* The function name is for historical reasons - now we have
872	* separate race and class; this actually changes the RACE,	871	* separate race and class; this actually changes the RACE,
873	* not the class.	872	* not the class.
874	*/	873	*/
875	int	874	void
876	key_change_class (object *op, char key)	875	player::chargen_race_done ()
877	{	876	{
878	int tmp_loop;
879
880	if (key == 'd' || key == 'D')
881	{
882	char buf[MAX_BUF];
883
884	/* this must before then initial items are given */	877	/* this must before then initial items are given */
885	esrv_new_player (op->contr, op->weight + op->carrying);	878	esrv_new_player (ob->contr, ob->weight + ob->carrying);
886		879
887	treasurelist *tl = find_treasurelist ("starting_wealth");	880	treasurelist *tl = treasurelist::find ("starting_wealth");
888	if (tl)	881	if (tl)
889	create_treasure (tl, op, 0, 0, 0);	882	create_treasure (tl, ob, 0, 0, 0);
890		883
891	INVOKE_PLAYER (BIRTH, op->contr);	884	INVOKE_PLAYER (BIRTH, ob->contr);
892	INVOKE_PLAYER (LOGIN, op->contr);	885	INVOKE_PLAYER (LOGIN, ob->contr);
893		886
894	op->contr->ns->state = ST_PLAYING;	887	ob->contr->ns->state = ST_PLAYING;
895		888
896	if (op->msg)	889	if (ob->msg)
897	op->msg = NULL;	890	ob->msg = 0;
898		891
899	/* We create this now because some of the unique maps will need it	892	/* We create this now because some of the unique maps will need it
900	* to save here.	893	* to save here.
901	*/	894	*/
		895	{
		896	char buf[MAX_BUF];
902	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
903	make_path_to_file (buf);	898	make_path_to_file (buf);
		899	}
904		900
905	#ifdef AUTOSAVE
906	op->contr->last_save_tick = pticks;
907	#endif
908	start_info (op);	901	start_info (ob);
909	CLEAR_FLAG (op, FLAG_WIZ);	902	CLEAR_FLAG (ob, FLAG_WIZ);
910	give_initial_items (op, op->randomitems);	903	give_initial_items (ob, ob->randomitems);
911	link_player_skills (op);	904	link_player_skills (ob);
912	esrv_send_inventory (op, op);	905	esrv_send_inventory (ob, ob);
913	op->update_stats ();	906	ob->update_stats ();
914		907
915	/* This moves the player to a different start map, if there	908	/* This moves the player to a different start map, if there
916	* is one for this race	909	* is one for this race
917	*/	910	*/
918	if (*first_map_ext_path)	911	if (*first_map_ext_path)
919	{	912	{
920	object *tmp;	913	object *tmp;
921	char mapname[MAX_BUF];	914	char mapname[MAX_BUF];
922		915
923	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
924	tmp = object::create ();	917	tmp = object::create ();
925	EXIT_PATH (tmp) = mapname;	918	EXIT_PATH (tmp) = mapname;
926	EXIT_X (tmp) = op->x;	919	EXIT_X (tmp) = ob->x;
927	EXIT_Y (tmp) = op->y;	920	EXIT_Y (tmp) = ob->y;
928	op->enter_exit (tmp); /* we don't really care if it succeeded;	921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
929	* if the map isn't there, then stay on the	922	* if the map isn't there, then stay on the
930	* default initial map */	923	* default initial map */
931	tmp->destroy ();	924	tmp->destroy ();
932	}	925	}
933	else	926	else
934	LOG (llevDebug, "first_map_ext_path not set\n");	927	LOG (llevDebug, "first_map_ext_path not set\n");
		928	}
935		929
936	return 0;	930	void
937	}	931	player::chargen_race_next ()
938		932	{
939	/* Following actually changes the race - this is the default command	933	/* Following actually changes the race - this is the default command
940	* if we don't match with one of the options above.	934	* if we don't match with one of the options above.
941	*/	935	*/
942		936
943	tmp_loop = 0;	937	do
944	while (!tmp_loop)
945	{	938	{
946	shstr name = op->name;	939	shstr name = ob->name;
947	int x = op->x, y = op->y;	940	int x = ob->x, y = ob->y;
948		941
949	op->remove_statbonus ();	942	ob->remove_statbonus ();
950	op->remove ();	943	ob->remove ();
951	op->arch = get_player_archetype (op->arch);	944	ob->arch = get_player_archetype (ob->arch);
952	op->arch->clone.copy_to (op);	945	ob->arch->copy_to (ob);
953	op->instantiate ();	946	ob->instantiate ();
954	op->stats = op->contr->orig_stats;	947	ob->stats = ob->contr->orig_stats;
955	op->name = op->name_pl = name;	948	ob->name = ob->name_pl = name;
956	op->x = x;	949	ob->x = x;
957	op->y = y;	950	ob->y = y;
958	SET_ANIMATION (op, 2); /* So player faces south */	951	SET_ANIMATION (ob, 2); /* So player faces south */
959	insert_ob_in_map (op, op->map, op, 0);	952	insert_ob_in_map (ob, ob->map, ob, 0);
960	assign (op->contr->title, op->arch->clone.name);	953	assign (ob->contr->title, ob->arch->object::name);
961	op->add_statbonus ();	954	ob->add_statbonus ();
962	tmp_loop = allowed_class (op);
963	}	955	}
		956	while (!allowed_class (ob));
964		957
965	update_object (op, UP_OBJ_FACE);	958	update_object (ob, UP_OBJ_FACE);
966	esrv_update_item (UPD_FACE, op, op);	959	esrv_update_item (UPD_FACE, ob, ob);
967	op->update_stats ();	960	ob->update_stats ();
968	op->stats.hp = op->stats.maxhp;	961	ob->stats.hp = ob->stats.maxhp;
969	op->stats.sp = op->stats.maxsp;	962	ob->stats.sp = ob->stats.maxsp;
970	op->stats.grace = 0;	963	ob->stats.grace = 0;
971
972	if (op->msg)
973	new_draw_info (NDI_BLUE, 0, op, op->msg);
974
975	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
976	return 0;
977	}
978
979	int
980	key_confirm_quit (object *op, char key)
981	{
982	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
983	{
984	op->contr->ns->state = ST_PLAYING;
985	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
986	return 1;
987	}
988
989	INVOKE_PLAYER (LOGOUT, op->contr);
990	INVOKE_PLAYER (QUIT, op->contr);
991
992	op->contr->enable_save = false;
993
994	terminate_all_pets (op);
995	op->remove ();
996	op->direction = 0;
997	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
998
999	strcpy (op->contr->killer, "quit");
1000	check_score (op);
1001	op->contr->party = 0;
1002	op->contr->own_title[0] = '\0';
1003	op->contr->destroy ();
1004
1005	return 1;
1006	}	964	}
1007		965
1008	void	966	void
1009	flee_player (object *op)	967	flee_player (object *op)
1010	{	968	{
…		…
1057	/* Cornered, get rid of scared */	1015	/* Cornered, get rid of scared */
1058	CLEAR_FLAG (op, FLAG_SCARED);	1016	CLEAR_FLAG (op, FLAG_SCARED);
1059	op->enemy = NULL;	1017	op->enemy = NULL;
1060	}	1018	}
1061		1019
1062
1063	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1064	* IT returns 1 if the player should keep on moving, 0 if he should	1021	* It returns 1 if the player should keep on moving, 0 if he should
1065	* stop.	1022	* stop.
1066	*/	1023	*/
1067	int	1024	int
1068	check_pick (object *op)	1025	check_pick (object *op)
1069	{	1026	{
1070	object *tmp, *next;	1027	object *tmp, *next;
1071	int stop = 0;	1028	int stop = 0;
1072	int j, k, wvratio;	1029	int wvratio;
1073	char putstring[128], tmpstr[16];	1030	char putstring[128];
1074		1031
1075	/* if you're flying, you cna't pick up anything */	1032	/* if you're flying, you cna't pick up anything */
1076	if (op->move_type & MOVE_FLYING)	1033	if (op->move_type & MOVE_FLYING)
1077	return 1;	1034	return 1;
1078		1035
…		…
1146	if (tmp->name != NULL)	1103	if (tmp->name != NULL)
1147	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1148	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1149	else	1106	else
1150	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1151	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1152		1109
1153	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1154	}	1111	}
1155		1112
1156	/* philosophy:	1113	/* philosophy:
…		…
1349	/* careful: chairs and tables are weapons! */	1306	/* careful: chairs and tables are weapons! */
1350	if (op->contr->mode & PU_ALLWEAPON)	1307	if (op->contr->mode & PU_ALLWEAPON)
1351	{	1308	{
1352	if (tmp->type == WEAPON && tmp->name != NULL)	1309	if (tmp->type == WEAPON && tmp->name != NULL)
1353	{	1310	{
1354	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1355	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1356	{	1313	{
1357	pick_up (op, tmp);	1314	pick_up (op, tmp);
1358	continue;	1315	continue;
1359	}	1316	}
1360	}	1317	}
1361		1318
1362	if (tmp->type == WEAPON && tmp->name == NULL)	1319	if (tmp->type == WEAPON && tmp->name == NULL)
1363	{	1320	{
1364	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1365	{	1322	{
1366	pick_up (op, tmp);	1323	pick_up (op, tmp);
1367	continue;	1324	continue;
1368	}	1325	}
1369	}	1326	}
…		…
1394	if (tmp->name != NULL)	1351	if (tmp->name != NULL)
1395	{	1352	{
1396	fprintf (stderr, "%s", tmp->name);	1353	fprintf (stderr, "%s", tmp->name);
1397	}	1354	}
1398	else	1355	else
1399	fprintf (stderr, "%s", tmp->arch->name);	1356	fprintf (stderr, "%s", tmp->arch->archname);
1400	fprintf (stderr, ",%d] = ", tmp->type);	1357	fprintf (stderr, ",%d] = ", tmp->type);
1401	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1402	#endif	1359	#endif
1403	continue;	1360	continue;
1404	}	1361	}
…		…
1415	* found object is returned.	1372	* found object is returned.
1416	*/	1373	*/
1417	object *	1374	object *
1418	find_arrow (object *op, const char *type)	1375	find_arrow (object *op, const char *type)
1419	{	1376	{
1420	object *tmp = NULL;	1377	object *tmp = 0;
1421		1378
1422	for (op = op->inv; op; op = op->below)	1379	for (op = op->inv; op; op = op->below)
1423	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1424	tmp = find_arrow (op, type);	1381	tmp = find_arrow (op, type);
1425	else if (op->type == ARROW && op->race == type)	1382	else if (op->type == ARROW && op->race == type)
1426	return op;	1383	return op;
		1384
1427	return tmp;	1385	return tmp;
1428	}	1386	}
1429		1387
1430	/*	1388	/*
1431	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1432	* against the target. A full test is not performed, simply a basic test	1390	* against the target. A full test is not performed, simply a basic test
1433	* of resistances. The archer is making a quick guess at what he sees down	1391	* of resistances. The archer is making a quick guess at what he sees down
1434	* the hall. Failing that it does it's best to pick the highest plus arrow.	1392	* the hall. Failing that it does it's best to pick the highest plus arrow.
1435	*/	1393	*/
1436
1437	object *	1394	object *
1438	find_better_arrow (object *op, object *target, const char *type, int *better)	1395	find_better_arrow (object *op, object *target, const char *type, int *better)
1439	{	1396	{
1440	object *tmp = NULL, *arrow, *ntmp;	1397	object *tmp = NULL, *arrow, *ntmp;
1441	int attacknum, attacktype, betterby = 0, i;	1398	int attacknum, attacktype, betterby = 0, i;
…		…
1474	else	1431	else
1475	{	1432	{
1476	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1433	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1477	{	1434	{
1478	attacktype = 1 << attacknum;	1435	attacktype = 1 << attacknum;
1479	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1436	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1480	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1437	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1481	{	1438	{
1482	tmp = arrow;	1439	tmp = arrow;
1483	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1484	}	1441	}
1485	}	1442	}
1486	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1487	{	1444	{
1488	tmp = arrow;	1445	tmp = arrow;
…		…
1507	* find_better_arrow to find a decent arrow to use.	1464	* find_better_arrow to find a decent arrow to use.
1508	* op = the shooter	1465	* op = the shooter
1509	* type = bow->race	1466	* type = bow->race
1510	* dir = fire direction	1467	* dir = fire direction
1511	*/	1468	*/
1512
1513	object *	1469	object *
1514	pick_arrow_target (object *op, const char *type, int dir)	1470	pick_arrow_target (object *op, const char *type, int dir)
1515	{	1471	{
1516	object *tmp = NULL;	1472	object *tmp = NULL;
1517	maptile *m;	1473	maptile *m;
…		…
1582	*/	1538	*/
1583	int	1539	int
1584	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1540	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1585	{	1541	{
1586	object *left, *bow;	1542	object *left, *bow;
1587	int bowspeed, mflags;	1543	int mflags;
1588	maptile *m;	1544	maptile *m;
1589		1545
1590	if (!dir)	1546	if (!dir)
1591	{	1547	{
1592	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1548	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1593	return 0;	1549	return 0;
1594	}	1550	}
1595		1551
1596	if (op->type == PLAYER)	1552	if (op->contr)
1597	bow = op->contr->ranges[range_bow];	1553	bow = op->current_weapon;
1598	else	1554	else
1599	{	1555	{
1600	for (bow = op->inv; bow; bow = bow->below)	1556	for (bow = op->inv; bow; bow = bow->below)
1601	/* Don't check for applied - monsters don't apply bows - in that way, they	1557	/* Don't check for applied - monsters don't apply bows - in that way, they
1602	* don't need to switch back and forth between bows and weapons.	1558	* don't need to switch back and forth between bows and weapons.
…		…
1607	if (!bow)	1563	if (!bow)
1608	{	1564	{
1609	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1565	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1610	return 0;	1566	return 0;
1611	}	1567	}
		1568
		1569	// optimisation: move object to top so we will find it quickly again
		1570	if (bow->below)
		1571	{
		1572	bow->remove ();
		1573	op->insert (bow);
		1574	}
		1575
1612	}	1576	}
1613		1577
1614	if (!bow->race || !bow->skill)	1578	if (!bow->race || !bow->skill)
1615	{	1579	{
1616	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1617	return 0;	1581	return 0;
1618	}	1582	}
1619
1620	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1621
1622	/* penalize ROF for bestarrow */
1623	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1624	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1625
1626	if (bowspeed < 1)
1627	bowspeed = 1;
1628		1583
1629	if (arrow == NULL)	1584	if (arrow == NULL)
1630	{	1585	{
1631	if ((arrow = find_arrow (op, bow->race)) == NULL)	1586	if ((arrow = find_arrow (op, bow->race)) == NULL)
1632	{	1587	{
1633	if (op->type == PLAYER)	1588	if (op->type == PLAYER)
1634	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1589	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1635	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1590	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1636	else	1591	else
1637	CLEAR_FLAG (op, FLAG_READY_BOW);	1592	CLEAR_FLAG (op, FLAG_READY_BOW);
		1593
1638	return 0;	1594	return 0;
1639	}	1595	}
1640	}	1596	}
1641		1597
1642	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1598	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1666		1622
1667	arrow->set_owner (op);	1623	arrow->set_owner (op);
1668	arrow->skill = bow->skill;	1624	arrow->skill = bow->skill;
1669	arrow->direction = dir;	1625	arrow->direction = dir;
1670		1626
		1627	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1628	arrow->stats.hp = arrow->stats.dam;
		1629	arrow->stats.grace = arrow->attacktype;
		1630
		1631	if (arrow->slaying)
		1632	arrow->spellarg = strdup (arrow->slaying);
		1633
		1634	#if 0
		1635	if (player *pl = op->contr)
		1636	{
		1637	float speed = pl->weapon_sp;
		1638
		1639	/* penalize ROF for bestarrow */
		1640	if (pl->bowtype == bow_bestarrow)
		1641	speed *= .9f;
		1642	else
		1643	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1644
		1645	op->speed_left += speed - op->speed;
		1646	}
		1647	#endif
		1648
		1649	SET_ANIMATION (arrow, arrow->direction);
		1650
		1651	/* update the speed */
		1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1653	+ bow->stats.dam / 7.f;
		1654
		1655	arrow->set_speed (max (arrow->speed, 2.f));
		1656	arrow->speed_left = 0;
		1657
		1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1659
1671	if (op->type == PLAYER)	1660	if (op->type == PLAYER)
1672	{	1661	{
1673	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674	op->update_stats ();
1675	}
1676
1677	SET_ANIMATION (arrow, arrow->direction);
1678	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1679	arrow->stats.hp = arrow->stats.dam;
1680	arrow->stats.grace = arrow->attacktype;
1681	if (arrow->slaying != NULL)
1682	arrow->spellarg = strdup (arrow->slaying);
1683
1684	/* Note that this was different for monsters - they got their level
1685	* added to the damage. I think the strength bonus is more proper.
1686	*/
1687
1688	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1689
1690	/* update the speed */
1691	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1692	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1693
1694	arrow->set_speed (max (arrow->speed, 1.0));
1695	arrow->speed_left = 0;
1696
1697	if (op->type == PLAYER)
1698	{
1699	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1700	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1701	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1702
1703	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1662	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1663	wc -= dex_bonus[op->stats.Dex];
		1664
		1665	if (!arrow->slaying)
		1666	arrow->slaying = op->slaying;
		1667
		1668	arrow->attacktype |= op->attacktype;
1704	}	1669	}
1705	else	1670	else
1706	{	1671	{
1707	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1708	arrow->level = op->level;	1672	arrow->level = op->level;
1709	}	1673	arrow->stats.wc -= bow->magic;
1710		1674
1711	if (arrow->attacktype == AT_PHYSICAL)	1675	if (!arrow->slaying)
		1676	arrow->slaying = bow->slaying;
		1677
1712	arrow->attacktype |= bow->attacktype;	1678	arrow->attacktype |= bow->attacktype;
		1679	}
1713		1680
1714	if (bow->slaying)	1681	wc -= arrow->level;
1715	arrow->slaying = bow->slaying;	1682	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1716		1683
		1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1717	arrow->move_type = MOVE_FLY_LOW;	1685	arrow->move_type = MOVE_FLY_LOW;
1718	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1719		1687
1720	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1688	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1721	m->insert (arrow, sx, sy, op);	1689	m->insert (arrow, sx, sy, op);
…		…
1746	{	1714	{
1747	int ret = 0, wcmod = 0;	1715	int ret = 0, wcmod = 0;
1748		1716
1749	if (op->contr->bowtype == bow_bestarrow)	1717	if (op->contr->bowtype == bow_bestarrow)
1750	{	1718	{
1751	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1719	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1752	}	1720	}
1753	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1721	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1754	{	1722	{
1755	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1723	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1756	wcmod = -1;	1724	wcmod = -1;
…		…
1766	else if (op->contr->bowtype == bow_spreadshot)	1734	else if (op->contr->bowtype == bow_spreadshot)
1767	{	1735	{
1768	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1736	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1769	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1737	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1770	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1738	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1771
1772	}	1739	}
1773	else	1740	else
1774	{	1741	{
1775	/* Simple case */	1742	/* Simple case */
1776	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1743	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1777	}	1744	}
		1745
1778	return ret;	1746	return ret;
1779	}	1747	}
1780
1781		1748
1782	/* Fires a misc (wand/rod/horn) object in 'dir'.	1749	/* Fires a misc (wand/rod/horn) object in 'dir'.
1783	* Broken apart from 'fire' to keep it more readable.	1750	* Broken apart from 'fire' to keep it more readable.
1784	*/	1751	*/
1785	void	1752	void
1786	fire_misc_object (object *op, int dir)	1753	fire_misc_object (object *op, int dir)
1787	{	1754	{
1788	object *item;	1755	object *item = op->contr->ranged_ob;
1789		1756
1790	if (!op->contr->ranges[range_misc])	1757	if (!item)
1791	{	1758	{
1792	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1759	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1793	return;	1760	return;
1794	}	1761	}
1795		1762
1796	item = op->contr->ranges[range_misc];
1797	if (!item->inv)	1763	if (!item->inv)
1798	{	1764	{
1799	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1765	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1800	return;	1766	return;
1801	}	1767	}
		1768
		1769	if (!op->change_weapon (item))
		1770	return;
		1771
1802	if (item->type == WAND)	1772	if (item->type == WAND)
1803	{	1773	{
1804	if (item->stats.food <= 0)	1774	if (item->stats.food <= 0)
1805	{	1775	{
1806	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1776	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1777	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1778
1808	return;	1779	return;
1809	}	1780	}
1810	}	1781	}
1811	else if (item->type == ROD || item->type == HORN)	1782	else if (item->type == ROD || item->type == HORN)
1812	{	1783	{
1813	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1814	{	1785	{
1815	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1787
1816	if (item->type == ROD)	1788	if (item->type == ROD)
1817	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1818	else	1790	else
1819	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1791	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1792
1820	return;	1793	return;
1821	}	1794	}
1822	}	1795	}
1823		1796
1824	if (cast_spell (op, item, dir, item->inv, NULL))	1797	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1831	object *tmp;	1804	object *tmp;
1832		1805
1833	if (item->arch)	1806	if (item->arch)
1834	{	1807	{
1835	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
1836	item->face = item->arch->clone.face;	1809	item->face = item->arch->face;
1837	item->set_speed (0);	1810	item->set_speed (0);
1838	}	1811	}
1839		1812
1840	if ((tmp = item->in_player ()))	1813	if ((tmp = item->in_player ()))
1841	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1846	}	1819	}
1847	}	1820	}
1848		1821
1849	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
1850	*/	1823	*/
1851	void	1824	bool
1852	fire (object *op, int dir)	1825	fire (object *op, int dir)
1853	{	1826	{
1854	int spellcost = 0;	1827	int spellcost = 0;
1855		1828
1856	/* check for loss of invisiblity/hide */	1829	/* check for loss of invisiblity/hide */
1857	if (action_makes_visible (op))	1830	if (action_makes_visible (op))
1858	make_visible (op);	1831	make_visible (op);
1859		1832
1860	switch (op->contr->shoottype)	1833	player *pl = op->contr;
		1834
		1835	if (pl->golem)
		1836	{
		1837	control_golem (op->contr->golem, dir);
		1838	return false;
1861	{	1839	}
1862	case range_none:
1863	return;
1864		1840
1865	case range_bow:	1841	object *ob = pl->ranged_ob;
		1842
		1843	if (!ob)
		1844	return false;
		1845
		1846	if (!op->change_weapon (ob))
		1847	return false;
		1848
		1849	if (op->speed_left > 0.f)
		1850	--op->speed_left;
		1851	else
		1852	return false;
		1853
		1854	switch (ob->type)
		1855	{
		1856	case BOW:
1866	player_fire_bow (op, dir);	1857	player_fire_bow (op, dir);
1867	return;	1858	break;
1868		1859
1869	case range_magic: /* Casting spells */	1860	case SPELL:
1870	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1861	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1871	return;	1862	break;
1872		1863
1873	case range_misc:	1864	case BUILDER:
		1865	apply_map_builder (op, dir);
		1866	break;
		1867
		1868	case SKILL:
		1869	do_skill (op, op, ob, dir, 0);
		1870	break;
		1871
		1872	default:
1874	fire_misc_object (op, dir);	1873	fire_misc_object (op, dir);
1875	return;	1874	break;
1876
1877	case range_golem: /* Control summoned monsters from scrolls */
1878	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1879	{
1880	op->contr->ranges[range_golem] = 0;
1881	op->contr->shoottype = range_none;
1882	}
1883	else
1884	control_golem (op->contr->ranges[range_golem], dir);
1885	return;
1886
1887	case range_skill:
1888	if (!op->chosen_skill)
1889	{
1890	if (op->type == PLAYER)
1891	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1892	return;
1893	}
1894	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1895	return;
1896	case range_builder:
1897	apply_map_builder (op, dir);
1898	return;
1899	default:
1900	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1901	return;
1902	}	1875	}
1903	}
1904		1876
1905		1877	return true;
		1878	}
1906		1879
1907	/* find_key	1880	/* find_key
1908	* We try to find a key for the door as passed. If we find a key	1881	* We try to find a key for the door as passed. If we find a key
1909	* and successfully use it, we return the key, otherwise NULL	1882	* and successfully use it, we return the key, otherwise NULL
1910	* This function merges both normal and locked door, since the logic	1883	* This function merges both normal and locked door, since the logic
…		…
1912	* pl is the player,	1885	* pl is the player,
1913	* inv is the objects inventory to searched	1886	* inv is the objects inventory to searched
1914	* door is the door we are trying to match against.	1887	* door is the door we are trying to match against.
1915	* This function can be called recursively to search containers.	1888	* This function can be called recursively to search containers.
1916	*/	1889	*/
1917
1918	object *	1890	object *
1919	find_key (object *pl, object *container, object *door)	1891	find_key (object *pl, object *container, object *door)
1920	{	1892	{
1921	object *tmp, *key;	1893	object *tmp, *key;
1922		1894
1923	/* Should not happen, but sanity checking is never bad */	1895	/* Should not happen, but sanity checking is never bad */
1924	if (container->inv == NULL)	1896	if (!container->inv)
1925	return NULL;	1897	return 0;
1926		1898
1927	/* First, lets try to find a key in the top level inventory */	1899	/* First, lets try to find a key in the top level inventory */
1928	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1900	for (tmp = container->inv; tmp; tmp = tmp->below)
1929	{	1901	{
1930	if (door->type == DOOR && tmp->type == KEY)	1902	if (door->type == DOOR && tmp->type == KEY)
1931	break;	1903	break;
1932	/* For sanity, we should really check door type, but other stuff	1904	/* For sanity, we should really check door type, but other stuff
1933	* (like containers) can be locked with special keys	1905	* (like containers) can be locked with special keys
1934	*/	1906	*/
1935	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1907	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1936	break;	1908	break;
1937	}	1909	}
		1910
1938	/* No key found - lets search inventories now */	1911	/* No key found - lets search inventories now */
1939	/* If we find and use a key in an inventory, return at that time.	1912	/* If we find and use a key in an inventory, return at that time.
1940	* otherwise, if we search all the inventories and still don't find	1913	* otherwise, if we search all the inventories and still don't find
1941	* a key, return	1914	* a key, return
1942	*/	1915	*/
1943	if (!tmp)	1916	if (!tmp)
1944	{	1917	{
1945	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1918	for (tmp = container->inv; tmp; tmp = tmp->below)
1946	{	1919	{
1947	/* No reason to search empty containers */	1920	/* No reason to search empty containers */
1948	if (tmp->type == CONTAINER && tmp->inv)	1921	if (tmp->type == CONTAINER && tmp->inv)
1949	{	1922	{
1950	if ((key = find_key (pl, tmp, door)) != NULL)	1923	if ((key = find_key (pl, tmp, door)))
1951	return key;	1924	return key;
1952	}	1925	}
1953	}	1926	}
		1927
1954	if (!tmp)	1928	if (!tmp)
1955	return NULL;	1929	return NULL;
1956	}	1930	}
		1931
1957	/* We get down here if we have found a key. Now if its in a container,	1932	/* We get down here if we have found a key. Now if its in a container,
1958	* see if we actually want to use it	1933	* see if we actually want to use it
1959	*/	1934	*/
1960	if (pl != container)	1935	if (pl != container)
1961	{	1936	{
…		…
1982	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1957	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1983	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1958	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1984	return NULL;	1959	return NULL;
1985	}	1960	}
1986	}	1961	}
		1962
1987	return tmp;	1963	return tmp;
1988	}	1964	}
1989		1965
1990	/* moved door processing out of move_player_attack.	1966	/* moved door processing out of move_player_attack.
1991	* returns 1 if player has opened the door with a key	1967	* returns 1 if player has opened the door with a key
…		…
1993	* 0 otherwise	1969	* 0 otherwise
1994	*/	1970	*/
1995	static int	1971	static int
1996	player_attack_door (object *op, object *door)	1972	player_attack_door (object *op, object *door)
1997	{	1973	{
1998	/* If its a door, try to find a use a key. If we do destroy the door,	1974	/* If its a door, try to find a key. If we do destroy the door,
1999	* might as well return immediately as there is nothing more to do -	1975	* might as well return immediately as there is nothing more to do -
2000	* otherwise, we fall through to the rest of the code.	1976	* otherwise, we fall through to the rest of the code.
2001	*/	1977	*/
2002	object *key = find_key (op, op, door);	1978	object *key = find_key (op, op, door);
2003		1979
2004	/* IF we found a key, do some extra work */	1980	/* If we found a key, do some extra work */
2005	if (key)	1981	if (key)
2006	{	1982	{
2007	object *container = key->env;	1983	object *container = key->env;
2008		1984
2009	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1985	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1986
2010	if (action_makes_visible (op))	1987	if (action_makes_visible (op))
2011	make_visible (op);	1988	make_visible (op);
		1989
2012	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1990	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2013	spring_trap (door->inv, op);	1991	spring_trap (door->inv, op);
		1992
2014	if (door->type == DOOR)	1993	if (door->type == DOOR)
2015	{
2016	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1994	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2017	}
2018	else if (door->type == LOCKED_DOOR)	1995	else if (door->type == LOCKED_DOOR)
2019	{	1996	{
2020	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1997	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2021	remove_door2 (door); /* remove door without violence ;-) */	1998	remove_door2 (door); /* remove door without violence ;-) */
2022	}	1999	}
		2000
2023	/* Do this after we print the message */	2001	/* Do this after we print the message */
2024	decrease_ob (key); /* Use up one of the keys */	2002	decrease_ob (key); /* Use up one of the keys */
2025	/* Need to update the weight the container the key was in */	2003	/* Need to update the weight the container the key was in */
2026	if (container != op)	2004	if (container != op)
2027	esrv_update_item (UPD_WEIGHT, op, container);	2005	esrv_update_item (UPD_WEIGHT, op, container);
		2006
2028	return 1; /* Nothing more to do below */	2007	return 1; /* Nothing more to do below */
2029	}	2008	}
2030	else if (door->type == LOCKED_DOOR)	2009	else if (door->type == LOCKED_DOOR)
2031	{	2010	{
2032	/* Might as well return now - no other way to open this */	2011	/* Might as well return now - no other way to open this */
2033	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2012	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2034	return 1;	2013	return 1;
2035	}	2014	}
		2015
2036	return 0;	2016	return 0;
2037	}	2017	}
2038		2018
2039	/* This function is just part of a breakup from move_player.	2019	/* This function is just part of a breakup from move_player.
2040	* It should keep the code cleaner.	2020	* It should keep the code cleaner.
2041	* When this is called, the players direction has been updated	2021	* When this is called, the players direction has been updated
2042	* (taking into account confusion.) The player is also actually	2022	* (taking into account confusion.) The player is also actually
2043	* going to try and move (not fire weapons).	2023	* going to try and move (not fire weapons).
2044	*/	2024	*/
2045	void	2025	bool
2046	move_player_attack (object *op, int dir)	2026	move_player_attack (object *op, int dir)
2047	{	2027	{
2048	object *tmp, *mon;
2049	sint16 nx, ny;
2050	int on_battleground;	2028	int on_battleground;
2051	maptile *m;
2052		2029
2053	nx = freearr_x[dir] + op->x;	2030	sint16 nx = freearr_x[dir] + op->x;
2054	ny = freearr_y[dir] + op->y;	2031	sint16 ny = freearr_y[dir] + op->y;
2055		2032
2056	on_battleground = op_on_battleground (op, 0, 0);	2033	on_battleground = op_on_battleground (op, 0, 0);
		2034
		2035	if (out_of_map (op->map, nx, ny))
		2036	return false;
		2037
		2038	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2039	{
		2040	--op->speed_left;
		2041	return true;
		2042	}
2057		2043
2058	/* If braced, or can't move to the square, and it is not out of the	2044	/* If braced, or can't move to the square, and it is not out of the
2059	* map, attack it. Note order of if statement is important - don't	2045	* map, attack it. Note order of if statement is important - don't
2060	* want to be calling move_ob if braced, because move_ob will move the	2046	* want to be calling move_ob if braced, because move_ob will move the
2061	* player. This is a pretty nasty hack, because if we could	2047	* player. This is a pretty nasty hack, because if we could
2062	* move to some space, it then means that if we are braced, we should	2048	* move to some space, it then means that if we are braced, we should
2063	* do nothing at all. As it is, if we are braced, we go through	2049	* do nothing at all. As it is, if we are braced, we go through
2064	* quite a bit of processing. However, it probably is less than what	2050	* quite a bit of processing. However, it probably is less than what
2065	* move_ob uses.	2051	* move_ob uses.
2066	*/	2052	*/
2067	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2053	maptile *m = op->map->xy_find (nx, ny);
2068	{
2069	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2070	{
2071	m = get_map_from_coord (op->map, &nx, &ny);
2072	if (!m)
2073	return; /* Don't think this should happen */
2074	}
2075	else
2076	m = op->map;
2077		2054
2078	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2079	{
2080	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2081	return;
2082	}
2083
2084	mon = 0;
2085	/* Go through all the objects, and find ones of interest. Only stop if	2055	/* Go through all the objects, and find ones of interest. Only stop if
2086	* we find a monster - that is something we know we want to attack.	2056	* we find a monster - that is something we know we want to attack.
2087	* if its a door or barrel (can roll) see if there may be monsters	2057	* if its a door or barrel (can roll) see if there may be monsters
2088	* on the space	2058	* on the space
2089	*/	2059	*/
2090	while (tmp)	2060	object *mon;
2091	{	2061	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2092	if (tmp == op)	2062	{
2093	{	2063	if ((mon->flag [FLAG_ALIVE]
2094	tmp = tmp->above;	2064	|| mon->type == LOCKED_DOOR
2095	continue;	2065	|| mon->flag [FLAG_CAN_ROLL])
2096	}
2097
2098	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2099	{
2100	mon = tmp;	2066	&& mon != op)
2101	break;	2067	break;
2102	}	2068	}
2103		2069
2104	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2105	mon = tmp;
2106
2107	tmp = tmp->above;
2108	}
2109
2110	if (!mon) /* This happens anytime the player tries to move */	2070	if (!mon) /* This happens anytime the player tries to move */
2111	return; /* into a wall */	2071	return false; /* into a wall */
2112		2072
2113	if (mon->head)
2114	mon = mon->head;	2073	mon = mon->head_ ();
2115		2074
2116	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2075	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2076	if (op->contr->weapon_sp_left > 0.f)
2117	if (player_attack_door (op, mon))	2077	if (player_attack_door (op, mon))
		2078	{
		2079	--op->contr->weapon_sp_left;
2118	return;	2080	return true;
		2081	}
2119		2082
2120	/* The following deals with possibly attacking peaceful	2083	/* The following deals with possibly attacking peaceful
2121	* or frienddly creatures. Basically, all players are considered	2084	* or friendly creatures. Basically, all players are considered
2122	* unaggressive. If the moving player has peaceful set, then the	2085	* unaggressive. If the moving player has peaceful set, then the
2123	* object should be pushed instead of attacked. It is assumed that	2086	* object should be pushed instead of attacked. It is assumed that
2124	* if you are braced, you will not attack friends accidently,	2087	* if you are braced, you will not attack friends accidently,
2125	* and thus will not push them.	2088	* and thus will not push them.
2126	*/	2089	*/
2127		2090
2128	/* If the creature is a pet, push it even if the player is not	2091	/* If the creature is a pet, push it even if the player is not
2129	* peaceful. Our assumption is the creature is a pet if the	2092	* peaceful. Our assumption is the creature is a pet if the
2130	* player owns it and it is either friendly or unagressive.	2093	* player owns it and it is either friendly or unagressive.
2131	*/	2094	*/
2132	if ((op->type == PLAYER)	2095	if (op->type == PLAYER
2133	#if COZY_SERVER
2134	&&
2135	((mon->owner && mon->owner->contr	2096	&& ((mon->owner && mon->owner->contr
2136	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2097	&& same_party (mon->owner->contr->party, op->contr->party))
2137	#else
2138	&& mon->owner == op	2098	|| mon->owner == op)
2139	#endif
2140	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2099	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2141	{	2100	{
2142	/* If we're braced, we don't want to switch places with it */	2101	/* If we're braced, we don't want to switch places with it */
2143	if (op->contr->braced)	2102	if (op->contr->braced)
2144	return;	2103	return false;
		2104
		2105	if (op->speed_left > 0.f)
		2106	{
		2107	--op->speed_left;
		2108
2145	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2109	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2146	(void) push_ob (mon, dir, op);	2110	push_ob (mon, dir, op);
		2111
2147	if (op->contr->tmp_invis || op->hide)	2112	if (op->contr->tmp_invis || op->hide)
2148	make_visible (op);	2113	make_visible (op);
		2114
2149	return;	2115	return true;
2150	}	2116	}
		2117	else
		2118	return false;
		2119	}
2151		2120
2152	/* in certain circumstances, you shouldn't attack friendly	2121	/* in certain circumstances, you shouldn't attack friendly
2153	* creatures. Note that if you are braced, you can't push	2122	* creatures. Note that if you are braced, you can't push
2154	* someone, but put it inside this loop so that you won't	2123	* someone, but put it inside this loop so that you won't
2155	* attack them either.	2124	* attack them either.
2156	*/	2125	*/
2157	if ((mon->type == PLAYER || mon->enemy != op) &&	2126	if ((mon->type == PLAYER || mon->enemy != op)
2158	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2127	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2159	#ifdef PROHIBIT_PLAYERKILL
2160	(op->contr->peaceful	2128	&& ((op->contr->peaceful
2161	|| (mon->type == PLAYER	2129	|| (mon->type == PLAYER && mon->contr->peaceful))
2162	&& mon->contr->
2163	peaceful)) &&
2164	#else
2165	op->contr->peaceful &&
2166	#endif
2167	!on_battleground))	2130	&& !on_battleground))
		2131	{
		2132	if (op->speed_left > 0.f)
2168	{	2133	{
		2134	--op->speed_left;
		2135
2169	if (!op->contr->braced)	2136	if (!op->contr->braced)
2170	{	2137	{
2171	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2138	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2172	(void) push_ob (mon, dir, op);	2139	push_ob (mon, dir, op);
2173	}	2140	}
2174	else	2141	else
2175	new_draw_info (0, 0, op, "You withhold your attack");	2142	new_draw_info (0, 0, op, "You withhold your attack");
2176		2143
2177	if (op->contr->tmp_invis || op->hide)	2144	if (op->contr->tmp_invis || op->hide)
2178	make_visible (op);	2145	make_visible (op);
2179	}
2180		2146
		2147	return true;
		2148	}
		2149	}
2181	/* If the object is a boulder or other rollable object, then	2150	/* If the object is a boulder or other rollable object, then
2182	* roll it if not braced. You can't roll it if you are braced.	2151	* roll it if not braced. You can't roll it if you are braced.
2183	*/	2152	*/
2184	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2154	{
		2155	if (op->speed_left > 0.f)
2185	{	2156	{
		2157	--op->speed_left;
		2158
2186	recursive_roll (mon, dir, op);	2159	recursive_roll (mon, dir, op);
2187	if (action_makes_visible (op))	2160	if (action_makes_visible (op))
2188	make_visible (op);	2161	make_visible (op);
2189	}
2190		2162
		2163	return true;
		2164	}
		2165	}
2191	/* Any generic living creature. Including things like doors.	2166	/* Any generic living creature. Including things like doors.
2192	* Way it works is like this: First, it must have some hit points	2167	* Way it works is like this: First, it must have some hit points
2193	* and be living. Then, it must be one of the following:	2168	* and be living. Then, it must be one of the following:
2194	* 1) Not a player, 2) A player, but of a different party. Note	2169	* 1) Not a player, 2) A player, but of a different party. Note
2195	* that party_number -1 is no party, so attacks can still happen.	2170	* that party_number -1 is no party, so attacks can still happen.
2196	*/	2171	*/
2197
2198	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2172	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2199	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2173	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2200	{	2174	{
2201		2175	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2202	/* If the player hasn't hit something this tick, and does
2203	* so, give them speed boost based on weapon speed. Doing
2204	* it here is better than process_players2, which basically
2205	* incurred a 1 tick offset.
2206	*/
2207	if (!op->contr->has_hit)
2208	{	2176	{
2209	op->speed_left += op->speed / op->contr->weapon_sp;	2177	--op->contr->weapon_sp_left;
2210
2211	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2212	}
2213		2178
2214	skill_attack (mon, op, 0, 0, 0);	2179	skill_attack (mon, op, 0, 0, 0);
2215
2216	/* If attacking another player, that player gets automatic
2217	* hitback, and doesn't loose luck either.
2218	* Disable hitback on the battleground or if the target is
2219	* the wiz.
2220	*/
2221	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2222	{
2223	short luck = mon->stats.luck;
2224
2225	mon->contr->has_hit = 1;
2226	skill_attack (op, mon, 0, 0, 0);
2227	mon->stats.luck = luck;
2228	}
2229		2180
2230	if (action_makes_visible (op))	2181	if (action_makes_visible (op))
2231	make_visible (op);	2182	make_visible (op);
2232	}
2233	} /* if player should attack something */
2234	}
2235		2183
2236	int	2184	return true;
		2185	}
		2186	}
		2187
		2188	return false;
		2189	}
		2190
		2191	bool
2237	move_player (object *op, int dir)	2192	move_player (object *op, int dir)
2238	{	2193	{
2239	int pick;	2194	int pick;
2240		2195
2241	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2196	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2242	return 0;	2197	return 0;
2243		2198
2244	/* Sanity check: make sure dir is valid */	2199	/* Sanity check: make sure dir is valid */
2245	if ((dir < 0) || (dir >= 9))	2200	if ((dir < 0) || (dir >= 9))
2246	{	2201	{
2247	LOG (llevError, "move_player: invalid direction %d\n", dir);	2202	LOG (llevError, "move_player: invalid direction %d\n", dir);
2248	return 0;	2203	return 0;
2249	}	2204	}
2250		2205
2251	/* peterm: added following line */	2206	/* peterm: added following line */
2252	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2207	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2253	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2208	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2254		2209
2255	op->facing = dir;	2210	op->facing = dir;
2256		2211
2257	if (op->hide)	2212	if (op->hide)
2258	do_hidden_move (op);	2213	do_hidden_move (op);
2259		2214
		2215	bool retval;
		2216
2260	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2261	/*nop */ ;	2218	retval = RESULT_INT (0);
2262	else if (op->contr->fire_on)	2219	else if (op->contr->fire_on)
2263	fire (op, dir);	2220	retval = fire (op, dir);
2264	else	2221	else
2265	{	2222	{
2266	move_player_attack (op, dir);	2223	retval = move_player_attack (op, dir);
2267	pick = check_pick (op);	2224	pick = check_pick (op);
2268	}	2225	}
2269		2226
2270	/* Add special check for newcs players and fire on - this way, the	2227	/* Add special check for newcs players and fire on - this way, the
2271	* server can handle repeat firing.	2228	* server can handle repeat firing.
…		…
2278	/* Update how the player looks. Use the facing, so direction may	2235	/* Update how the player looks. Use the facing, so direction may
2279	* get reset to zero. This allows for full animation capabilities	2236	* get reset to zero. This allows for full animation capabilities
2280	* for players.	2237	* for players.
2281	*/	2238	*/
2282	animate_object (op, op->facing);	2239	animate_object (op, op->facing);
2283	return 0;	2240
		2241	return retval;
2284	}	2242	}
2285		2243
2286	/* This is similar to handle_player, below, but is only used by the	2244	/* This is similar to handle_player, below, but is only used by the
2287	* new client/server stuff.	2245	* new client/server stuff.
2288	* This is sort of special, in that the new client/server actually uses	2246	* This is sort of special, in that the new client/server actually uses
2289	* the new speed values for commands.	2247	* the new speed values for commands.
2290	*	2248	*
2291	* Returns true if there are more actions we can do.	2249	* Returns true if there are more actions we can do. Should not do
		2250	* many actions in a row, as that would be too unfair to other
		2251	* players.
2292	*/	2252	*/
2293	int	2253	bool
2294	handle_newcs_player (object *op)	2254	handle_newcs_player (object *op)
2295	{	2255	{
2296	if (op->contr->hidden)
2297	{
2298	op->invisible = 1000;
2299	/* the socket code flashes the player visible/invisible
2300	* depending on the value of invisible, so we need to
2301	* alternate it here for it to work correctly.
2302	*/
2303	if (pticks & 2)
2304	op->invisible--;
2305	}
2306	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2307	{
2308	op->invisible--;
2309	if (!op->invisible)
2310	{
2311	make_visible (op);
2312	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2313	}
2314	}
2315
2316	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2317	{	2257	{
2318	flee_player (op);	2258	if (op->speed_left > 0.f)
2319	/* If player is still scared, that is his action for this tick */
2320	if (QUERY_FLAG (op, FLAG_SCARED))
2321	{	2259	{
2322	op->speed_left--;	2260	--op->speed_left;
		2261	flee_player (op);
		2262
2323	return 0;	2263	return true;
2324	}	2264	}
		2265	else
		2266	return false;
2325	}	2267	}
2326
2327	/* I've been seeing crashes where the golem has been destroyed, but
2328	* the player object still points to the defunct golem. The code that
2329	* destroys the golem looks correct, and it doesn't always happen, so
2330	* put this in a a workaround to clean up the golem pointer.
2331	*/
2332	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2333	op->contr->ranges[range_golem] = 0;
2334		2268
2335	/* call this here - we also will call this in do_ericserver, but	2269	/* call this here - we also will call this in do_ericserver, but
2336	* the players time has been increased when doericserver has been	2270	* the players time has been increased when doericserver has been
2337	* called, so we recheck it here.	2271	* called, so we recheck it here.
2338	*/	2272	*/
2339	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2273	if (op->contr->ns->handle_command ())
2340	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2341	;
2342
2343	if (op->speed_left < 0)
2344	return 0;	2274	return true;
2345		2275
2346	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2276	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2347	{
2348	/* All move commands take 1 tick, at least for now */
2349	op->speed_left--;
2350
2351	/* Instead of all the stuff below, let move_player take care
2352	* of it. Also, some of the skill stuff is only put in
2353	* there, as well as the confusion stuff.
2354	*/
2355	move_player (op, op->direction);	2277	return move_player (op, op->direction);
2356	if (op->speed_left > 0)
2357	return 1;
2358	else
2359	return 0;
2360	}
2361		2278
2362	return 0;	2279	return false;
2363	}	2280	}
2364		2281
2365	int	2282	int
2366	save_life (object *op)	2283	save_life (object *op)
2367	{	2284	{
…		…
2402	* from.	2319	* from.
2403	*/	2320	*/
2404	void	2321	void
2405	remove_unpaid_objects (object *op, object *env)	2322	remove_unpaid_objects (object *op, object *env)
2406	{	2323	{
2407	object *next;
2408
2409	while (op)	2324	while (op)
2410	{	2325	{
2411	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2326	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2412		2327
2413	if (QUERY_FLAG (op, FLAG_UNPAID))	2328	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2479	int rate_grace = 2000;	2394	int rate_grace = 2000;
2480	const int max_hp = 1;	2395	const int max_hp = 1;
2481	const int max_sp = 1;	2396	const int max_sp = 1;
2482	const int max_grace = 1;	2397	const int max_grace = 1;
2483		2398
2484	if (op->contr->outputs_sync)	2399	if (op->contr->hidden)
		2400	{
		2401	op->invisible = 1000;
		2402	/* the socket code flashes the player visible/invisible
		2403	* depending on the value of invisible, so we need to
		2404	* alternate it here for it to work correctly.
		2405	*/
		2406	if (pticks & 2)
		2407	op->invisible--;
2485	{	2408	}
2486	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2409	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2487	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2410	{
2488	flush_output_element (op, &op->contr->outputs[i]);	2411	if (!op->invisible--)
		2412	{
		2413	make_visible (op);
		2414	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2415	}
2489	}	2416	}
2490		2417
2491	if (op->contr->ns->state == ST_PLAYING)	2418	if (op->contr->ns->state == ST_PLAYING)
2492	{	2419	{
2493	/* these next three if clauses make it possible to SLOW DOWN	2420	/* these next three if clauses make it possible to SLOW DOWN
…		…
2515	gen_grace = op->stats.maxgrace;	2442	gen_grace = op->stats.maxgrace;
2516	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2443	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2517	}	2444	}
2518		2445
2519	/* Regenerate Spell Points */	2446	/* Regenerate Spell Points */
2520	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2447	if (!op->contr->golem && --op->last_sp < 0)
2521	{	2448	{
2522	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2449	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2523	if (op->stats.sp < op->stats.maxsp)	2450	if (op->stats.sp < op->stats.maxsp)
2524	{	2451	{
2525	op->stats.sp++;	2452	op->stats.sp++;
…		…
2623	}	2550	}
2624		2551
2625	/* Digestion */	2552	/* Digestion */
2626	if (--op->last_eat < 0)	2553	if (--op->last_eat < 0)
2627	{	2554	{
2628	#ifdef COZY_SERVER
2629	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2630	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2631	#else
2632	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2555	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2633	#endif
2634		2556
2635	if (op->contr->gen_hp > 0)	2557	if (op->contr->gen_hp > 0)
2636	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2558	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2637	else	2559	else
2638	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2560	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2743	tmp->name = buf;	2665	tmp->name = buf;
2744	sprintf (buf, " This finger has been cut off %s\n"	2666	sprintf (buf, " This finger has been cut off %s\n"
2745	" the %s, when he was defeated at\n level %d by %s.\n",	2667	" the %s, when he was defeated at\n level %d by %s.\n",
2746	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2668	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2747	tmp->msg = buf;	2669	tmp->msg = buf;
2748	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2670	tmp->value = 0, tmp->type = 0;
2749	tmp->materialname = NULL;	2671	tmp->materialname = "organics";
2750	op->insert_at (tmp, op);	2672	tmp->insert_at (op, tmp);
2751	}	2673	}
2752		2674
2753	/* teleport defeated player to new destination */	2675	/* teleport defeated player to new destination */
2754	transfer_ob (op, x, y, 0, NULL);	2676	transfer_ob (op, x, y, 0, NULL);
2755	op->contr->braced = 0;	2677	op->contr->braced = 0;
…		…
2760		2682
2761	command_kill_pets (op, 0);	2683	command_kill_pets (op, 0);
2762		2684
2763	if (op->stats.food < 0)	2685	if (op->stats.food < 0)
2764	{	2686	{
2765	if (op->contr->explore)
2766	{
2767	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2768	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2769	op->stats.food = 999;
2770	return;
2771	}
2772	sprintf (buf, "%s starved to death.", &op->name);	2687	sprintf (buf, "%s starved to death.", &op->name);
2773	strcpy (op->contr->killer, "starvation");	2688	strcpy (op->contr->killer, "starvation");
2774	}	2689	}
2775	else	2690	else
2776	{
2777	if (op->contr->explore)
2778	{
2779	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2780	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2781	op->stats.hp = op->stats.maxhp;
2782	return;
2783	}
2784	sprintf (buf, "%s died.", &op->name);	2691	sprintf (buf, "%s died.", &op->name);
2785	}
2786		2692
2787	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2693	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2788		2694
2789	/* save the map location for corpse, gravestone */	2695	/* save the map location for corpse, gravestone */
2790	x = op->x;	2696	x = op->x;
…		…
2966	op->stats.hp = op->stats.maxhp;	2872	op->stats.hp = op->stats.maxhp;
2967	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2873	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2968	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2874	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2969		2875
2970	/*	2876	/*
2971	* Check to see if the player is in a shop. IF so, then check to see if
2972	* the player has any unpaid items. If so, remove them and put them back	2877	* Check to see if the player has any unpaid items. If so, remove them
2973	* in the map.	2878	* and put them back in the map.
2974	*/	2879	*/
2975
2976	if (is_in_shop (op))
2977	remove_unpaid_objects (op->inv, op);	2880	remove_unpaid_objects (op->inv, op);
2978		2881
2979	/****************************************/	2882	/****************************************/
2980	/* */	2883	/* */
2981	/* Move player to his current respawn- */	2884	/* Move player to his current respawn- */
2982	/* position (usually last savebed) */	2885	/* position (usually last savebed) */
2983	/* */	2886	/* */
2984	/****************************************/	2887	/****************************************/
2985		2888
2986	enter_player_savebed (op);	2889	enter_player_savebed (op);
2987		2890
2988	/* Save the player before inserting the force to reduce
2989	* chance of abuse.
2990	*/
2991	op->contr->braced = 0;	2891	op->contr->braced = 0;
2992	op->contr->save ();
2993		2892
2994	/* it is possible that the player has blown something up	2893	/* it is possible that the player has blown something up
2995	* at his savebed location, and that can have long lasting	2894	* at his savebed location, and that can have long lasting
2996	* spell effects. So first see if there is a spell effect	2895	* spell effects. So first see if there is a spell effect
2997	* on the space that might harm the player.	2896	* on the space that might harm the player.
…		…
3006	object *force;	2905	object *force;
3007	int at;	2906	int at;
3008		2907
3009	force = get_archetype (FORCE_NAME);	2908	force = get_archetype (FORCE_NAME);
3010	/* 50 ticks should be enough time for the spell to abate */	2909	/* 50 ticks should be enough time for the spell to abate */
3011	force->speed = 0.1;	2910	force->speed = 0.1f;
3012	force->speed_left = -5.0;	2911	force->speed_left = -5.f;
3013	SET_FLAG (force, FLAG_APPLIED);	2912	SET_FLAG (force, FLAG_APPLIED);
3014	for (at = 0; at < NROFATTACKS; at++)	2913	for (at = 0; at < NROFATTACKS; at++)
3015	if (will_kill_again & (1 << at))	2914	if (will_kill_again & (1 << at))
3016	force->resist[at] = 100;	2915	force->resist[at] = 100;
3017		2916
…		…
3026	void	2925	void
3027	loot_object (object *op)	2926	loot_object (object *op)
3028	{ /* Grab and destroy some treasure */	2927	{ /* Grab and destroy some treasure */
3029	object *tmp, *tmp2, *next;	2928	object *tmp, *tmp2, *next;
3030		2929
3031	if (op->container)	2930	op->close_container (); /* close open sack first */
3032	esrv_apply_container (op, op->container); /* close open sack first */
3033		2931
3034	for (tmp = op->inv; tmp; tmp = next)	2932	for (tmp = op->inv; tmp; tmp = next)
3035	{	2933	{
3036	next = tmp->below;	2934	next = tmp->below;
3037		2935
3038	if (tmp->invisible)	2936	if (tmp->invisible)
3039	continue;	2937	continue;
3040		2938
3041	tmp->remove ();	2939	tmp->remove ();
3042	tmp->x = op->x, tmp->y = op->y;	2940	tmp->x = op->x, tmp->y = op->y;
		2941
3043	if (tmp->type == CONTAINER)	2942	if (tmp->type == CONTAINER)
3044	{ /* empty container to ground */	2943	loot_object (tmp); /* empty container to ground */
3045	loot_object (tmp);	2944
3046	}
3047	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2945	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3048	{	2946	{
3049	if (tmp->nrof > 1)	2947	if (tmp->nrof > 1)
3050	{	2948	{
3051	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2949	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3052	tmp2->destroy ();	2950	tmp2->destroy ();
…		…
3063	/*	2961	/*
3064	* fix_weight(): Check recursively the weight of all players, and fix	2962	* fix_weight(): Check recursively the weight of all players, and fix
3065	* what needs to be fixed. Refresh windows and fix speed if anything	2963	* what needs to be fixed. Refresh windows and fix speed if anything
3066	* was changed.	2964	* was changed.
3067	*/	2965	*/
3068
3069	void	2966	void
3070	fix_weight (void)	2967	fix_weight (void)
3071	{	2968	{
3072	for_all_players (pl)	2969	for_all_players (pl)
3073	{	2970	{
…		…
3133	if (op->type == PLAYER)	3030	if (op->type == PLAYER)
3134	{	3031	{
3135	op->contr->tmp_invis = 0;	3032	op->contr->tmp_invis = 0;
3136	op->contr->invis_race = 0;	3033	op->contr->invis_race = 0;
3137	}	3034	}
		3035
3138	update_object (op, UP_OBJ_FACE);	3036	update_object (op, UP_OBJ_CHANGE);
3139	}	3037	}
3140		3038
3141	int	3039	int
3142	is_true_undead (object *op)	3040	is_true_undead (object *op)
3143	{	3041	{
3144	object *tmp = NULL;
3145
3146	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3042	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3147	return 1;	3043	return 1;
3148		3044
3149	return 0;	3045	return 0;
3150	}	3046	}
3151		3047
…		…
3195	/* For Hidden creatures - a chance of becoming 'unhidden'	3091	/* For Hidden creatures - a chance of becoming 'unhidden'
3196	* every time they move - as we subtract off 'invisibility'	3092	* every time they move - as we subtract off 'invisibility'
3197	* AND, for players, if they move into a ridiculously unhideable	3093	* AND, for players, if they move into a ridiculously unhideable
3198	* spot (surrounded by clear terrain in broad daylight). -b.t.	3094	* spot (surrounded by clear terrain in broad daylight). -b.t.
3199	*/	3095	*/
3200
3201	void	3096	void
3202	do_hidden_move (object *op)	3097	do_hidden_move (object *op)
3203	{	3098	{
3204	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3099	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3205	object *skop;	3100	object *skop;
…		…
3209		3104
3210	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3105	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3211		3106
3212	/* its *extremely* hard to run and sneak/hide at the same time! */	3107	/* its *extremely* hard to run and sneak/hide at the same time! */
3213	if (op->type == PLAYER && op->contr->run_on)	3108	if (op->type == PLAYER && op->contr->run_on)
3214	{
3215	if (!skop || num >= skop->level)	3109	if (!skop || num >= skop->level)
3216	{	3110	{
3217	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3111	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3218	make_visible (op);	3112	make_visible (op);
3219	return;	3113	return;
3220	}	3114	}
3221	else	3115	else
3222	num += 20;	3116	num += 20;
3223	}	3117
3224	num += op->map->difficulty;	3118	num += op->map->difficulty;
3225	hide = hideability (op); /* modify by terrain hidden level */	3119	hide = hideability (op); /* modify by terrain hidden level */
3226	num -= hide;	3120	num -= hide;
		3121
3227	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3122	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3228	{	3123	{
3229	make_visible (op);	3124	make_visible (op);
3230	if (op->type == PLAYER)	3125	if (op->type == PLAYER)
3231	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3126	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3232	}	3127	}
3233	else if (op->type == PLAYER && skop)	3128	else if (op->type == PLAYER && skop)
3234	{
3235	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3129	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3236	}
3237	}	3130	}
3238		3131
3239	/* determine if who is standing near a hostile creature. */	3132	/* determine if who is standing near a hostile creature. */
3240		3133
3241	int	3134	int
…		…
3324	* a blocked los square.	3217	* a blocked los square.
3325	* we use the archetype to figure out offsets.	3218	* we use the archetype to figure out offsets.
3326	*/	3219	*/
3327	while (op)	3220	while (op)
3328	{	3221	{
3329	dx = rv.distance_x + op->arch->clone.x;	3222	dx = rv.distance_x + op->arch->x;
3330	dy = rv.distance_y + op->arch->clone.y;	3223	dy = rv.distance_y + op->arch->y;
3331		3224
3332	/* only the viewable area the player sees is updated by LOS	3225	/* only the viewable area the player sees is updated by LOS
3333	* code, so we need to restrict ourselves to that range of values	3226	* code, so we need to restrict ourselves to that range of values
3334	* for any meaningful values.	3227	* for any meaningful values.
3335	*/	3228	*/
…		…
3440	char buf[MAX_BUF]; /* tmp. string buffer */	3333	char buf[MAX_BUF]; /* tmp. string buffer */
3441	int i = 0, j = 0;	3334	int i = 0, j = 0;
3442		3335
3443	/* get the appropriate treasurelist */	3336	/* get the appropriate treasurelist */
3444	if (atnr == ATNR_FIRE)	3337	if (atnr == ATNR_FIRE)
3445	trlist = find_treasurelist ("dragon_ability_fire");	3338	trlist = treasurelist::find ("dragon_ability_fire");
3446	else if (atnr == ATNR_COLD)	3339	else if (atnr == ATNR_COLD)
3447	trlist = find_treasurelist ("dragon_ability_cold");	3340	trlist = treasurelist::find ("dragon_ability_cold");
3448	else if (atnr == ATNR_ELECTRICITY)	3341	else if (atnr == ATNR_ELECTRICITY)
3449	trlist = find_treasurelist ("dragon_ability_elec");	3342	trlist = treasurelist::find ("dragon_ability_elec");
3450	else if (atnr == ATNR_POISON)	3343	else if (atnr == ATNR_POISON)
3451	trlist = find_treasurelist ("dragon_ability_poison");	3344	trlist = treasurelist::find ("dragon_ability_poison");
3452		3345
3453	if (trlist == NULL || who->type != PLAYER)	3346	if (trlist == NULL || who->type != PLAYER)
3454	return;	3347	return;
3455		3348
3456	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3349	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3457		3350
3458	if (tr == NULL || tr->item == NULL)	3351	if (!tr || !tr->item)
3459	{	3352	{
3460	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3353	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3461	return;	3354	return;
3462	}	3355	}
3463		3356
3464	/* everything seems okay - now bring on the gift: */	3357	/* everything seems okay - now bring on the gift: */
3465	item = &(tr->item->clone);	3358	item = tr->item;
3466		3359
3467	if (item->type == SPELL)	3360	if (item->type == SPELL)
3468	{	3361	{
3469	if (check_spell_known (who, item->name))	3362	if (check_spell_known (who, item->name))
3470	return;	3363	return;
…		…
3530	/* forces in the treasurelist can alter the player's stats */	3423	/* forces in the treasurelist can alter the player's stats */
3531	object *skin;	3424	object *skin;
3532		3425
3533	/* first get the dragon skin force */	3426	/* first get the dragon skin force */
3534	shstr_cmp dragon_skin_force ("dragon_skin_force");	3427	shstr_cmp dragon_skin_force ("dragon_skin_force");
3535	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3428	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3536	;	3429	;
3537		3430
3538	if (!skin)	3431	if (!skin)
3539	return;	3432	return;
3540		3433
…		…
3588	* not readied.	3481	* not readied.
3589	*/	3482	*/
3590	void	3483	void
3591	player_unready_range_ob (player *pl, object *ob)	3484	player_unready_range_ob (player *pl, object *ob)
3592	{	3485	{
3593	rangetype i;	3486	if (pl->ob->current_weapon == ob)
		3487	pl->ob->current_weapon = 0;
3594		3488
3595	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3489	if (pl->combat_ob == ob)
3596	{	3490	pl->combat_ob = 0;
		3491
3597	if (pl->ranges[i] == ob)	3492	if (pl->ranged_ob == ob)
3598	{	3493	pl->ranged_ob = 0;
3599	pl->ranges[i] = NULL;
3600	if (pl->shoottype == i)
3601	{
3602	pl->shoottype = range_none;
3603	}
3604	}
3605	}
3606	}	3494	}
		3495
		3496	sint8
		3497	player::visibility_at (maptile *map, int x, int y) const
		3498	{
		3499	if (!ns)
		3500	return 0;
		3501
		3502	int dx, dy;
		3503	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3504	return 0;
		3505
		3506	x += dx - ns->current_x + ns->mapx / 2;
		3507	y += dy - ns->current_y + ns->mapy / 2;
		3508
		3509	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3510	return 0;
		3511
		3512	return 100 - blocked_los [x][y];
		3513	}

Diff Legend

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