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.75 by root, Sat Dec 30 21:15:59 2006 UTC vs.
Revision 1.153 by root, Tue Jul 10 05:51:38 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	}	158	}
167		159
168	void	160	void
169	player::enter_map ()	161	player::activate ()
170	{	162	{
171	object *tmp = object::create ();	163	if (active)
		164	return;
172		165
173	EXIT_PATH (tmp) = maplevel;	166	players.insert (this);
174	EXIT_X (tmp) = ob->x;	167	ob->remove ();
175	EXIT_Y (tmp) = ob->y;	168	ob->map = 0;
176	ob->enter_exit (tmp);	169	ob->activate_recursive ();
		170	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		171	add_friendly_object (ob);
		172	}
177		173
178	tmp->destroy ();	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);
179	}	194	}
180		195
181	// connect the player with a specific client	196	// connect the player with a specific client
182	// also changed, rationalises, and fixes some incorrect settings	197	// also changes, rationalises, and fixes some incorrect settings
183	void	198	void
184	player::connect (client *ns)	199	player::connect (client *ns)
185	{	200	{
186	this->ns = ns;	201	this->ns = ns;
187	ns->pl = this;	202	ns->pl = this;
188		203
189	next = first_player;	204	run_on = 0;
190	first_player = this;	205	fire_on = 0;
		206	ob->close_container (); //TODO: client-specific
191		207
192	ns->update_look = 0;	208	ns->update_look = 0;
193	ns->look_position = 0;	209	ns->look_position = 0;
194		210
195	clear_los (ob);	211	clear_los (this);
		212
		213	ns->reset_stats ();
196		214
197	/* make sure he's a player -- needed because of class change. */	215	/* make sure he's a player -- needed because of class change. */
198	ob->type = PLAYER; // we are paranoid	216	ob->type = PLAYER; // we are paranoid
199	ob->race = ob->arch->clone.race;	217	ob->race = ob->arch->race;
200
201	if (!legal_range (ob, shoottype))
202	shoottype = range_none;
203		218
204	ob->carrying = sum_weight (ob);	219	ob->carrying = sum_weight (ob);
205	link_player_skills (ob);	220	link_player_skills (ob);
206		221
207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208		223
209	assign (title, ob->arch->clone.name);	224	assign (title, ob->arch->object::name);
210
211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
212	* from the class, and not race. I don't see any way to get the class information
213	* to then update this. I don't think this will actually break anything - anyone
214	* that can use armour should be able to use a shield. What this may 'break'
215	* are features new characters get, eg, if someone starts up with a Q, they
216	* should be able to use a shield. However, old Q's won't get that advantage.
217	*/
218	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219	SET_FLAG (ob, FLAG_USE_SHIELD);
220		225
221	/* if it's a dragon player, set the correct title here */	226	/* if it's a dragon player, set the correct title here */
222	if (is_dragon_pl (ob))	227	if (is_dragon_pl (ob))
223	{	228	{
224	object *tmp, *abil = 0, *skin = 0;	229	object *tmp, *abil = 0, *skin = 0;
225		230
226	shstr_cmp dragon_ability_force ("dragon_ability_force");
227	shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229	for (tmp = ob->inv; tmp; tmp = tmp->below)	231	for (tmp = ob->inv; tmp; tmp = tmp->below)
230	if (tmp->type == FORCE)	232	if (tmp->type == FORCE)
231	if (tmp->arch->name == dragon_ability_force)	233	if (tmp->arch->archname == shstr_dragon_ability_force)
232	abil = tmp;	234	abil = tmp;
233	else if (tmp->arch->name == dragon_skin_force)	235	else if (tmp->arch->archname == shstr_dragon_skin_force)
234	skin = tmp;	236	skin = tmp;
235		237
236	set_dragon_name (ob, abil, skin);	238	set_dragon_name (ob, abil, skin);
237	}	239	}
238		240
239	CLEAR_FLAG (ob, FLAG_FRIENDLY);
240	add_friendly_object (ob);
241
242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		242
246	esrv_new_player (this, ob->weight + ob->carrying);	243	esrv_new_player (this, ob->weight + ob->carrying);
247		244
		245	ob->flag [FLAG_READY_WEAPON] = false;
		246	ob->flag [FLAG_READY_SKILL] = false;
		247	ob->flag [FLAG_READY_BOW] = false;
		248
		249	for (object *op = ob->inv; op; op = op->below)
		250	if (op->flag [FLAG_APPLIED])
		251	switch (op->type)
		252	{
		253	case SKILL:
		254	ob->flag [FLAG_APPLIED] = false;
		255	break;
		256
		257	case WAND:
		258	case ROD:
		259	case HORN:
		260	case BOW:
		261	ranged_ob = op;
		262	break;
		263
		264	case WEAPON:
		265	combat_ob = op;
		266	break;
		267	}
		268
		269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
248	ob->update_stats ();	270	ob->update_stats ();
		271
249	ns->floorbox_update ();	272	ns->floorbox_update ();
250
251	esrv_send_inventory (ob, ob);	273	esrv_send_inventory (ob, ob);
252	esrv_add_spells (this, 0);	274	esrv_add_spells (this, 0);
253		275
254	ob->activate (1);	276	activate ();
255	enter_map ();
256		277
257	send_rules (ob);	278	send_rules (ob);
258	send_news (ob);	279	send_news (ob);
259	display_motd (ob);	280	display_motd (ob);
		281
		282	INVOKE_PLAYER (CONNECT, this);
260	INVOKE_PLAYER (LOGIN, this);	283	INVOKE_PLAYER (LOGIN, this);
261	}	284	}
262		285
263	void	286	void
264	player::disconnect ()	287	player::disconnect ()
265	{	288	{
		289	if (ns)
		290	{
		291	if (active)
		292	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		293
		294	INVOKE_PLAYER (DISCONNECT, this);
		295
		296	ns->reset_stats ();
		297	ns->pl = 0;
		298	ns = 0;
		299	}
		300
266	if (ob)	301	if (ob)
		302	ob->close_container (); //TODO: client-specific
		303
		304	observe = ob;
		305
267	ob->deactivate (1);	306	deactivate ();
268
269	//TODO: don't be so harsh and destroy :)
270	if (ns)
271	{
272	if (enable_save)
273	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274
275	client *ns = this->ns;
276	ns->send_packet ("goodbye");
277	ns->flush ();
278	ns->pl = 0;
279	this->ns = 0;
280
281	ns->destroy ();
282	destroy ();
283	}
284	}	307	}
285		308
286	// the need for this function can be explained	309	// the need for this function can be explained
287	// by load_object not returning the object	310	// by load_object not returning the object
288	void	311	void
289	player::set_object (object *op)	312	player::set_object (object *op)
290	{	313	{
291	ob = op;	314	ob = observe = op;
292	ob->contr = this; /* this aren't yet in archetype */	315	ob->contr = this; /* this aren't yet in archetype */
293		316
		317	ob->speed = 1.0f;
294	ob->speed_left = 0.5;	318	ob->speed_left = 0.5f;
295	ob->speed = 1.0;	319
296	ob->direction = 5; /* So player faces south */	320	ob->direction = 5; /* So player faces south */
297	ob->stats.wc = 2;	321	}
298	ob->run_away = 25; /* Then we panick... */
299		322
300	set_first_map (ob);	323	void
301	enter_map ();	324	player::set_observe (object *op)
302		325	{
303	ob->roll_stats ();	326	observe = op ? op : ob;
		327	do_los = 1;
304	}	328	}
305		329
306	player::player ()	330	player::player ()
307	{	331	{
308	/* There are some elements we want initialized to non zero value -	332	/* There are some elements we want initialised to non zero value -
309	* we deal with that below this point.	333	* we deal with that below this point.
310	*/	334	*/
311	outputs_sync = 16; /* Every 2 seconds */	335	outputs_sync = 4;
312	outputs_count = 8; /* Keeps present behaviour */	336	outputs_count = 4;
313	unapply = unapply_nochoice;	337	unapply = unapply_nochoice;
314		338
315	assign (savebed_map, first_map_path); /* Init. respawn position */	339	savebed_map = first_map_path; /* Init. respawn position */
316		340
317	gen_sp_armour = 10;	341	gen_sp_armour = 10;
318	last_speed = -1;
319	shoottype = range_none;
320	bowtype = bow_normal;	342	bowtype = bow_normal;
321	petmode = pet_normal;	343	petmode = pet_normal;
322	listening = 10;	344	listening = 10;
323	usekeys = containers;	345	usekeys = containers;
324	last_weapon_sp = -1;
325	peaceful = 1; /* default peaceful */	346	peaceful = 1; /* default peaceful */
326	do_los = 1;	347	do_los = 1;
327		348
328	/* we need to clear these to -1 and not zero - otherwise,	349	weapon_sp = 1.0f;
329	* if a player quits and starts a new character, we wont	350	weapon_sp_left = 0.5f;
330	* send new values to the client, as things like exp start
331	* at zero.
332	*/
333	for (int i = 0; i < NUM_SKILLS; i++)
334	last_skill_exp[i] = -1;
335
336	for (int i = 0; i < NROFATTACKS; i++)
337	last_resist[i] = -1;
338
339	last_stats.exp = -1;
340	last_weight = (uint32) - 1;
341	}	351	}
342		352
343	void	353	void
344	player::do_destroy ()	354	player::do_destroy ()
345	{	355	{
346	disconnect ();	356	disconnect ();
347		357
348	save (false);
349	enable_save = false;
350
351	attachable::do_destroy ();	358	attachable::do_destroy ();
352
353	terminate_all_pets (ob);
354
355	if (first_player != this)
356	{
357	player *prev = first_player;
358
359	while (prev && prev->next && prev->next != this)
360	prev = prev->next;
361
362	if (prev->next != this)
363	{
364	LOG (llevError, "Free_player: Can't find previous player.\n");
365	abort ();
366	}
367
368	prev->next = next;
369	}
370	else
371	first_player = next;
372		359
373	if (ob)	360	if (ob)
374	{	361	{
375	ob->destroy_inv (false);	362	ob->destroy_inv (false);
376	ob->destroy ();	363	ob->destroy ();
377	}	364	}
		365
		366	ob = observe = 0;
378	}	367	}
379		368
380	player::~player ()	369	player::~player ()
381	{	370	{
382	/* Clear item stack */	371	/* Clear item stack */
…		…
391	player::create ()	380	player::create ()
392	{	381	{
393	player *pl = new player;	382	player *pl = new player;
394		383
395	pl->set_object (arch_to_object (get_player_archetype (0)));	384	pl->set_object (arch_to_object (get_player_archetype (0)));
		385
		386	pl->ob->roll_stats ();
		387	pl->ob->stats.wc = 2;
		388	pl->ob->run_away = 25; /* Then we panick... */
		389
		390	set_first_map (pl->ob);
396		391
397	return pl;	392	return pl;
398	}	393	}
399		394
400	/*	395	/*
…		…
403	* Note: there MUST be at least one player archetype!	398	* Note: there MUST be at least one player archetype!
404	*/	399	*/
405	archetype *	400	archetype *
406	get_player_archetype (archetype *at)	401	get_player_archetype (archetype *at)
407	{	402	{
408	archetype *start = at;	403	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
409		404
410	for (;;)	405	for (;;)
411	{	406	{
412	if (at == NULL || at->next == NULL)	407	if (++i == archetypes.end ())
413	at = first_archetype;	408	i = archetypes.begin ();
414	else	409	else if (*i == at)
415	at = at->next;	410	cleanup ("not a single player archetype found");
416		411
417	if (at->clone.type == PLAYER)	412	if ((*i)->type == PLAYER)
418	return at;	413	return *i;
419
420	if (at == start)
421	{
422	LOG (llevError, "No Player archetypes\n");
423	exit (-1);
424	}
425	}	414	}
426	}	415	}
427		416
428	object *	417	object *
429	get_nearest_player (object *mon)	418	get_nearest_player (object *mon)
…		…
431	object *op = NULL;	420	object *op = NULL;
432	objectlink *ol;	421	objectlink *ol;
433	unsigned lastdist;	422	unsigned lastdist;
434	rv_vector rv;	423	rv_vector rv;
435		424
436	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
437	{	426	{
438	/* We should not find free objects on this friendly list, but it	427	/* We should not find free objects on this friendly list, but it
439	* does periodically happen. Given that, lets deal with it.	428	* does periodically happen. Given that, lets deal with it.
440	* While unlikely, it is possible the next object on the friendly	429	* While unlikely, it is possible the next object on the friendly
441	* list is also free, so encapsulate this in a while loop.	430	* list is also free, so encapsulate this in a while loop.
…		…
445	object *tmp = ol->ob;	434	object *tmp = ol->ob;
446		435
447	/* Can't do much more other than log the fact, because the object	436	/* Can't do much more other than log the fact, because the object
448	* itself will have been cleared.	437	* itself will have been cleared.
449	*/	438	*/
450	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		440	tmp->debug_desc ());
451	ol = ol->next;	441	ol = ol->next;
452	remove_friendly_object (tmp);	442	remove_friendly_object (tmp);
453	if (!ol)	443	if (!ol)
454	return op;	444	return op;
455	}	445	}
…		…
544	x = mon->x;	534	x = mon->x;
545	y = mon->y;	535	y = mon->y;
546	m = mon->map;	536	m = mon->map;
547	dir = rv.direction;	537	dir = rv.direction;
548	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	538	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
549	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	539	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		540
550	/* If we can't solve it within the search distance, return now. */	541	/* If we can't solve it within the search distance, return now. */
551	if (diff > max)	542	if (diff > max)
552	return 0;	543	return 0;
		544
553	while (diff > 1 && max > 0)	545	while (diff > 1 && max > 0)
554	{	546	{
555	lastx = x;	547	lastx = x;
556	lasty = y;	548	lasty = y;
557	lastmap = m;	549	lastmap = m;
…		…
639	max--;	631	max--;
640	lastdir = dir;	632	lastdir = dir;
641	if (!firstdir)	633	if (!firstdir)
642	firstdir = dir;	634	firstdir = dir;
643	}	635	}
		636
644	if (diff <= 1)	637	if (diff <= 1)
645	{	638	{
646	/* Recalculate diff (distance) because we may not have actually	639	/* Recalculate diff (distance) because we may not have actually
647	* headed toward player for entire distance.	640	* headed toward player for entire distance.
648	*/	641	*/
649	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	642	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
650	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	643	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
651	}	644	}
		645
652	if (diff > max)	646	if (diff > max)
653	return 0;	647	return 0;
654	}	648	}
		649
655	/* If we reached the max, didn't find a direction in time */	650	/* If we reached the max, didn't find a direction in time */
656	if (!max)	651	if (!max)
657	return 0;	652	return 0;
658		653
659	return firstdir;	654	return firstdir;
…		…
773	roll_stat (void)	768	roll_stat (void)
774	{	769	{
775	int a[4], i, j, k;	770	int a[4], i, j, k;
776		771
777	for (i = 0; i < 4; i++)	772	for (i = 0; i < 4; i++)
778	a[i] = (int) RANDOM () % 6 + 1;	773	a[i] = (int) rndm (6) + 1;
779		774
780	for (i = 0, j = 0, k = 7; i < 4; i++)	775	for (i = 0, j = 0, k = 7; i < 4; i++)
781	if (a[i] < k)	776	if (a[i] < k)
782	k = a[i], j = i;	777	k = a[i], j = i;
783		778
…		…
789	}	784	}
790		785
791	void	786	void
792	object::roll_stats ()	787	object::roll_stats ()
793	{	788	{
794	int statsort [7];	789	int statsort [NUM_STATS];
795		790
796	for (;;)	791	for (;;)
797	{	792	{
798	int sum = 0;	793	int sum = 0;
799	for (int i = 7; i--; )	794	for (int i = NUM_STATS; i--; )
800	sum += statsort [i] = roll_stat ();	795	sum += statsort [i] = roll_stat ();
801		796
802	if (sum >= 82 && sum <= 116)	797	if (sum >= 82 && sum <= 116)
803	break;	798	break;
804	}	799	}
805		800
806	// Sort the stats so that rerolling is easier...	801	// Sort the stats so that rerolling is easier...
807	std::sort (statsort, statsort + 7, std::greater<int>());	802	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
808		803
		804	for (int i = 0; i < NUM_STATS; ++i)
809	stats.Str = statsort[0];	805	stats.stat (i) = statsort [i];
810	stats.Dex = statsort[1];
811	stats.Con = statsort[2];
812	stats.Int = statsort[3];
813	stats.Wis = statsort[4];
814	stats.Pow = statsort[5];
815	stats.Cha = statsort[6];
816		806
817	stats.exp = 0;	807	stats.exp = 0;
818	stats.ac = 0;	808	stats.ac = 0;
819		809
820	stats.hp = stats.maxhp;	810	stats.hp = stats.maxhp;
…		…
832	}	822	}
833		823
834	void	824	void
835	object::swap_stats (int a, int b)	825	object::swap_stats (int a, int b)
836	{	826	{
837	int tmp = get_attr_value (&contr->orig_stats, a);	827	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
838	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
839	set_attr_value (&contr->orig_stats, b, tmp);
840		828
		829	for (int i = 0; i < NUM_STATS; ++i)
841	stats.Str = contr->orig_stats.Str;	830	stats.stat (i) = contr->orig_stats.stat (i);
842	stats.Dex = contr->orig_stats.Dex;
843	stats.Con = contr->orig_stats.Con;
844	stats.Int = contr->orig_stats.Int;
845	stats.Wis = contr->orig_stats.Wis;
846	stats.Pow = contr->orig_stats.Pow;
847	stats.Cha = contr->orig_stats.Cha;
848		831
849	//TODO: the following code looks so borked and should, at the very least,	832	//TODO: the following code looks so borked and should, at the very least,
850	// be merged with the similar code in roll_stats	833	// be merged with the similar code in roll_stats
851	stats.ac = 0;	834	stats.ac = 0;
852		835
…		…
883	* appropriate action with it (change race, or other things).	866	* appropriate action with it (change race, or other things).
884	* The function name is for historical reasons - now we have	867	* The function name is for historical reasons - now we have
885	* separate race and class; this actually changes the RACE,	868	* separate race and class; this actually changes the RACE,
886	* not the class.	869	* not the class.
887	*/	870	*/
888	int	871	void
889	key_change_class (object *op, char key)	872	player::chargen_race_done ()
890	{	873	{
891	int tmp_loop;
892
893	if (key == 'd' || key == 'D')
894	{
895	char buf[MAX_BUF];
896
897	/* this must before then initial items are given */	874	/* this must before then initial items are given */
898	esrv_new_player (op->contr, op->weight + op->carrying);	875	esrv_new_player (ob->contr, ob->weight + ob->carrying);
899		876
900	treasurelist *tl = find_treasurelist ("starting_wealth");	877	treasurelist *tl = treasurelist::find ("starting_wealth");
901	if (tl)	878	if (tl)
902	create_treasure (tl, op, 0, 0, 0);	879	create_treasure (tl, ob, 0, 0, 0);
903		880
904	INVOKE_PLAYER (BIRTH, op->contr);	881	INVOKE_PLAYER (BIRTH, ob->contr);
905	INVOKE_PLAYER (LOGIN, op->contr);	882	INVOKE_PLAYER (LOGIN, ob->contr);
906		883
907	op->contr->ns->state = ST_PLAYING;	884	ob->contr->ns->state = ST_PLAYING;
908		885
909	if (op->msg)	886	if (ob->msg)
910	op->msg = NULL;	887	ob->msg = 0;
911		888
912	/* We create this now because some of the unique maps will need it	889	/* We create this now because some of the unique maps will need it
913	* to save here.	890	* to save here.
914	*/	891	*/
		892	{
		893	char buf[MAX_BUF];
915	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
916	make_path_to_file (buf);	895	make_path_to_file (buf);
		896	}
917		897
918	#ifdef AUTOSAVE
919	op->contr->last_save_tick = pticks;
920	#endif
921	start_info (op);	898	start_info (ob);
922	CLEAR_FLAG (op, FLAG_WIZ);	899	CLEAR_FLAG (ob, FLAG_WIZ);
923	give_initial_items (op, op->randomitems);	900	give_initial_items (ob, ob->randomitems);
924	link_player_skills (op);	901	link_player_skills (ob);
925	esrv_send_inventory (op, op);	902	esrv_send_inventory (ob, ob);
926	op->update_stats ();	903	ob->update_stats ();
927		904
928	/* This moves the player to a different start map, if there	905	/* This moves the player to a different start map, if there
929	* is one for this race	906	* is one for this race
930	*/	907	*/
931	if (*first_map_ext_path)	908	if (*first_map_ext_path)
932	{	909	{
933	object *tmp;	910	object *tmp;
934	char mapname[MAX_BUF];	911	char mapname[MAX_BUF];
935		912
936	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
937	tmp = object::create ();	914	tmp = object::create ();
938	EXIT_PATH (tmp) = mapname;	915	EXIT_PATH (tmp) = mapname;
939	EXIT_X (tmp) = op->x;	916	EXIT_X (tmp) = ob->x;
940	EXIT_Y (tmp) = op->y;	917	EXIT_Y (tmp) = ob->y;
941	op->enter_exit (tmp); /* we don't really care if it succeeded;	918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
942	* if the map isn't there, then stay on the	919	* if the map isn't there, then stay on the
943	* default initial map */	920	* default initial map */
944	tmp->destroy ();	921	tmp->destroy ();
945	}	922	}
946	else	923	else
947	LOG (llevDebug, "first_map_ext_path not set\n");	924	LOG (llevDebug, "first_map_ext_path not set\n");
		925	}
948		926
949	return 0;	927	void
950	}	928	player::chargen_race_next ()
951		929	{
952	/* Following actually changes the race - this is the default command	930	/* Following actually changes the race - this is the default command
953	* if we don't match with one of the options above.	931	* if we don't match with one of the options above.
954	*/	932	*/
955		933
956	tmp_loop = 0;	934	do
957	while (!tmp_loop)
958	{	935	{
959	shstr name = op->name;	936	shstr name = ob->name;
960	int x = op->x, y = op->y;	937	int x = ob->x, y = ob->y;
961		938
962	op->remove_statbonus ();	939	ob->remove_statbonus ();
963	op->remove ();	940	ob->remove ();
964	op->arch = get_player_archetype (op->arch);	941	ob->arch = get_player_archetype (ob->arch);
965	op->arch->clone.copy_to (op);	942	ob->arch->copy_to (ob);
966	op->instantiate ();	943	ob->instantiate ();
967	op->stats = op->contr->orig_stats;	944	ob->stats = ob->contr->orig_stats;
968	op->name = op->name_pl = name;	945	ob->name = ob->name_pl = name;
969	op->x = x;	946	ob->x = x;
970	op->y = y;	947	ob->y = y;
971	SET_ANIMATION (op, 2); /* So player faces south */	948	SET_ANIMATION (ob, 2); /* So player faces south */
972	insert_ob_in_map (op, op->map, op, 0);	949	insert_ob_in_map (ob, ob->map, ob, 0);
973	assign (op->contr->title, op->arch->clone.name);	950	assign (ob->contr->title, ob->arch->object::name);
974	op->add_statbonus ();	951	ob->add_statbonus ();
975	tmp_loop = allowed_class (op);
976	}	952	}
		953	while (!allowed_class (ob));
977		954
978	update_object (op, UP_OBJ_FACE);	955	update_object (ob, UP_OBJ_FACE);
979	esrv_update_item (UPD_FACE, op, op);	956	esrv_update_item (UPD_FACE, ob, ob);
980	op->update_stats ();	957	ob->update_stats ();
981	op->stats.hp = op->stats.maxhp;	958	ob->stats.hp = ob->stats.maxhp;
982	op->stats.sp = op->stats.maxsp;	959	ob->stats.sp = ob->stats.maxsp;
983	op->stats.grace = 0;	960	ob->stats.grace = 0;
984
985	if (op->msg)
986	new_draw_info (NDI_BLUE, 0, op, op->msg);
987
988	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
989	return 0;
990	}
991
992	int
993	key_confirm_quit (object *op, char key)
994	{
995	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
996	{
997	op->contr->ns->state = ST_PLAYING;
998	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
999	return 1;
1000	}
1001
1002	INVOKE_PLAYER (LOGOUT, op->contr);
1003	INVOKE_PLAYER (QUIT, op->contr);
1004
1005	op->contr->enable_save = false;
1006
1007	terminate_all_pets (op);
1008	op->remove ();
1009	op->direction = 0;
1010	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1011
1012	strcpy (op->contr->killer, "quit");
1013	check_score (op);
1014	op->contr->party = 0;
1015	op->contr->own_title[0] = '\0';
1016	op->contr->destroy ();
1017
1018	return 1;
1019	}	961	}
1020		962
1021	void	963	void
1022	flee_player (object *op)	964	flee_player (object *op)
1023	{	965	{
…		…
1070	/* Cornered, get rid of scared */	1012	/* Cornered, get rid of scared */
1071	CLEAR_FLAG (op, FLAG_SCARED);	1013	CLEAR_FLAG (op, FLAG_SCARED);
1072	op->enemy = NULL;	1014	op->enemy = NULL;
1073	}	1015	}
1074		1016
1075
1076	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1017	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1077	* IT returns 1 if the player should keep on moving, 0 if he should	1018	* It returns 1 if the player should keep on moving, 0 if he should
1078	* stop.	1019	* stop.
1079	*/	1020	*/
1080	int	1021	int
1081	check_pick (object *op)	1022	check_pick (object *op)
1082	{	1023	{
1083	object *tmp, *next;	1024	object *tmp, *next;
1084	int stop = 0;	1025	int stop = 0;
1085	int j, k, wvratio;	1026	int wvratio;
1086	char putstring[128], tmpstr[16];	1027	char putstring[128];
1087		1028
1088	/* if you're flying, you cna't pick up anything */	1029	/* if you're flying, you cna't pick up anything */
1089	if (op->move_type & MOVE_FLYING)	1030	if (op->move_type & MOVE_FLYING)
1090	return 1;	1031	return 1;
1091		1032
…		…
1159	if (tmp->name != NULL)	1100	if (tmp->name != NULL)
1160	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1101	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1161	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1102	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1162	else	1103	else
1163	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1164	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1105	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1165		1106
1166	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1107	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1167	}	1108	}
1168		1109
1169	/* philosophy:	1110	/* philosophy:
…		…
1362	/* careful: chairs and tables are weapons! */	1303	/* careful: chairs and tables are weapons! */
1363	if (op->contr->mode & PU_ALLWEAPON)	1304	if (op->contr->mode & PU_ALLWEAPON)
1364	{	1305	{
1365	if (tmp->type == WEAPON && tmp->name != NULL)	1306	if (tmp->type == WEAPON && tmp->name != NULL)
1366	{	1307	{
1367	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1308	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1368	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1309	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1369	{	1310	{
1370	pick_up (op, tmp);	1311	pick_up (op, tmp);
1371	continue;	1312	continue;
1372	}	1313	}
1373	}	1314	}
1374		1315
1375	if (tmp->type == WEAPON && tmp->name == NULL)	1316	if (tmp->type == WEAPON && tmp->name == NULL)
1376	{	1317	{
1377	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1318	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1378	{	1319	{
1379	pick_up (op, tmp);	1320	pick_up (op, tmp);
1380	continue;	1321	continue;
1381	}	1322	}
1382	}	1323	}
…		…
1407	if (tmp->name != NULL)	1348	if (tmp->name != NULL)
1408	{	1349	{
1409	fprintf (stderr, "%s", tmp->name);	1350	fprintf (stderr, "%s", tmp->name);
1410	}	1351	}
1411	else	1352	else
1412	fprintf (stderr, "%s", tmp->arch->name);	1353	fprintf (stderr, "%s", tmp->arch->archname);
1413	fprintf (stderr, ",%d] = ", tmp->type);	1354	fprintf (stderr, ",%d] = ", tmp->type);
1414	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1355	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1415	#endif	1356	#endif
1416	continue;	1357	continue;
1417	}	1358	}
…		…
1428	* found object is returned.	1369	* found object is returned.
1429	*/	1370	*/
1430	object *	1371	object *
1431	find_arrow (object *op, const char *type)	1372	find_arrow (object *op, const char *type)
1432	{	1373	{
1433	object *tmp = NULL;	1374	object *tmp = 0;
1434		1375
1435	for (op = op->inv; op; op = op->below)	1376	for (op = op->inv; op; op = op->below)
1436	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1437	tmp = find_arrow (op, type);	1378	tmp = find_arrow (op, type);
1438	else if (op->type == ARROW && op->race == type)	1379	else if (op->type == ARROW && op->race == type)
1439	return op;	1380	return op;
		1381
1440	return tmp;	1382	return tmp;
1441	}	1383	}
1442		1384
1443	/*	1385	/*
1444	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1386	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1445	* against the target. A full test is not performed, simply a basic test	1387	* against the target. A full test is not performed, simply a basic test
1446	* of resistances. The archer is making a quick guess at what he sees down	1388	* of resistances. The archer is making a quick guess at what he sees down
1447	* the hall. Failing that it does it's best to pick the highest plus arrow.	1389	* the hall. Failing that it does it's best to pick the highest plus arrow.
1448	*/	1390	*/
1449
1450	object *	1391	object *
1451	find_better_arrow (object *op, object *target, const char *type, int *better)	1392	find_better_arrow (object *op, object *target, const char *type, int *better)
1452	{	1393	{
1453	object *tmp = NULL, *arrow, *ntmp;	1394	object *tmp = NULL, *arrow, *ntmp;
1454	int attacknum, attacktype, betterby = 0, i;	1395	int attacknum, attacktype, betterby = 0, i;
…		…
1487	else	1428	else
1488	{	1429	{
1489	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)	1430	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1490	{	1431	{
1491	attacktype = 1 << attacknum;	1432	attacktype = 1 << attacknum;
1492	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)	1433	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1493	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)	1434	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1494	{	1435	{
1495	tmp = arrow;	1436	tmp = arrow;
1496	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;	1437	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1497	}	1438	}
1498	}	1439	}
1499	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1440	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1500	{	1441	{
1501	tmp = arrow;	1442	tmp = arrow;
…		…
1520	* find_better_arrow to find a decent arrow to use.	1461	* find_better_arrow to find a decent arrow to use.
1521	* op = the shooter	1462	* op = the shooter
1522	* type = bow->race	1463	* type = bow->race
1523	* dir = fire direction	1464	* dir = fire direction
1524	*/	1465	*/
1525
1526	object *	1466	object *
1527	pick_arrow_target (object *op, const char *type, int dir)	1467	pick_arrow_target (object *op, const char *type, int dir)
1528	{	1468	{
1529	object *tmp = NULL;	1469	object *tmp = NULL;
1530	maptile *m;	1470	maptile *m;
…		…
1595	*/	1535	*/
1596	int	1536	int
1597	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1537	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1598	{	1538	{
1599	object *left, *bow;	1539	object *left, *bow;
1600	int bowspeed, mflags;	1540	int mflags;
1601	maptile *m;	1541	maptile *m;
1602		1542
1603	if (!dir)	1543	if (!dir)
1604	{	1544	{
1605	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606	return 0;	1546	return 0;
1607	}	1547	}
1608		1548
1609	if (op->type == PLAYER)	1549	if (op->contr)
1610	bow = op->contr->ranges[range_bow];	1550	bow = op->current_weapon;
1611	else	1551	else
1612	{	1552	{
1613	for (bow = op->inv; bow; bow = bow->below)	1553	for (bow = op->inv; bow; bow = bow->below)
1614	/* Don't check for applied - monsters don't apply bows - in that way, they	1554	/* Don't check for applied - monsters don't apply bows - in that way, they
1615	* don't need to switch back and forth between bows and weapons.	1555	* don't need to switch back and forth between bows and weapons.
…		…
1620	if (!bow)	1560	if (!bow)
1621	{	1561	{
1622	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1562	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1623	return 0;	1563	return 0;
1624	}	1564	}
		1565
		1566	// optimisation: move object to top so we will find it quickly again
		1567	if (bow->below)
		1568	{
		1569	bow->remove ();
		1570	op->insert (bow);
		1571	}
		1572
1625	}	1573	}
1626		1574
1627	if (!bow->race || !bow->skill)	1575	if (!bow->race || !bow->skill)
1628	{	1576	{
1629	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1577	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1630	return 0;	1578	return 0;
1631	}	1579	}
1632
1633	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1634
1635	/* penalize ROF for bestarrow */
1636	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1637	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1638
1639	if (bowspeed < 1)
1640	bowspeed = 1;
1641		1580
1642	if (arrow == NULL)	1581	if (arrow == NULL)
1643	{	1582	{
1644	if ((arrow = find_arrow (op, bow->race)) == NULL)	1583	if ((arrow = find_arrow (op, bow->race)) == NULL)
1645	{	1584	{
1646	if (op->type == PLAYER)	1585	if (op->type == PLAYER)
1647	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1586	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1648	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1587	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1649	else	1588	else
1650	CLEAR_FLAG (op, FLAG_READY_BOW);	1589	CLEAR_FLAG (op, FLAG_READY_BOW);
		1590
1651	return 0;	1591	return 0;
1652	}	1592	}
1653	}	1593	}
1654		1594
1655	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1595	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1679		1619
1680	arrow->set_owner (op);	1620	arrow->set_owner (op);
1681	arrow->skill = bow->skill;	1621	arrow->skill = bow->skill;
1682	arrow->direction = dir;	1622	arrow->direction = dir;
1683		1623
		1624	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1625	arrow->stats.hp = arrow->stats.dam;
		1626	arrow->stats.grace = arrow->attacktype;
		1627
		1628	if (arrow->slaying)
		1629	arrow->spellarg = strdup (arrow->slaying);
		1630
		1631	#if 0
		1632	if (player *pl = op->contr)
		1633	{
		1634	float speed = pl->weapon_sp;
		1635
		1636	/* penalize ROF for bestarrow */
		1637	if (pl->bowtype == bow_bestarrow)
		1638	speed *= .9f;
		1639	else
		1640	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1641
		1642	op->speed_left += speed - op->speed;
		1643	}
		1644	#endif
		1645
		1646	SET_ANIMATION (arrow, arrow->direction);
		1647
		1648	/* update the speed */
		1649	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1650	+ bow->stats.dam / 7.f;
		1651
		1652	arrow->set_speed (max (arrow->speed, 2.f));
		1653	arrow->speed_left = 0;
		1654
		1655	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1656
1684	if (op->type == PLAYER)	1657	if (op->type == PLAYER)
1685	{	1658	{
1686	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1687	op->update_stats ();
1688	}
1689
1690	SET_ANIMATION (arrow, arrow->direction);
1691	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1692	arrow->stats.hp = arrow->stats.dam;
1693	arrow->stats.grace = arrow->attacktype;
1694	if (arrow->slaying != NULL)
1695	arrow->spellarg = strdup (arrow->slaying);
1696
1697	/* Note that this was different for monsters - they got their level
1698	* added to the damage. I think the strength bonus is more proper.
1699	*/
1700
1701	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1702
1703	/* update the speed */
1704	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1705	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1706
1707	arrow->set_speed (max (arrow->speed, 1.0));
1708	arrow->speed_left = 0;
1709
1710	if (op->type == PLAYER)
1711	{
1712	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1713	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1714	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1715
1716	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1659	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1660	wc -= dex_bonus[op->stats.Dex];
		1661
		1662	if (!arrow->slaying)
		1663	arrow->slaying = op->slaying;
		1664
		1665	arrow->attacktype |= op->attacktype;
1717	}	1666	}
1718	else	1667	else
1719	{	1668	{
1720	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1721	arrow->level = op->level;	1669	arrow->level = op->level;
1722	}	1670	arrow->stats.wc -= bow->magic;
1723		1671
1724	if (arrow->attacktype == AT_PHYSICAL)	1672	if (!arrow->slaying)
		1673	arrow->slaying = bow->slaying;
		1674
1725	arrow->attacktype |= bow->attacktype;	1675	arrow->attacktype |= bow->attacktype;
		1676	}
1726		1677
1727	if (bow->slaying)	1678	wc -= arrow->level;
1728	arrow->slaying = bow->slaying;	1679	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1729		1680
		1681	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1730	arrow->move_type = MOVE_FLY_LOW;	1682	arrow->move_type = MOVE_FLY_LOW;
1731	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1683	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1732		1684
1733	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1685	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1734	m->insert (arrow, sx, sy, op);	1686	m->insert (arrow, sx, sy, op);
…		…
1759	{	1711	{
1760	int ret = 0, wcmod = 0;	1712	int ret = 0, wcmod = 0;
1761		1713
1762	if (op->contr->bowtype == bow_bestarrow)	1714	if (op->contr->bowtype == bow_bestarrow)
1763	{	1715	{
1764	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1716	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1765	}	1717	}
1766	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1718	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1767	{	1719	{
1768	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1720	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1769	wcmod = -1;	1721	wcmod = -1;
…		…
1779	else if (op->contr->bowtype == bow_spreadshot)	1731	else if (op->contr->bowtype == bow_spreadshot)
1780	{	1732	{
1781	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1733	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1782	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1734	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1783	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1735	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1784
1785	}	1736	}
1786	else	1737	else
1787	{	1738	{
1788	/* Simple case */	1739	/* Simple case */
1789	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1740	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1790	}	1741	}
		1742
1791	return ret;	1743	return ret;
1792	}	1744	}
1793
1794		1745
1795	/* Fires a misc (wand/rod/horn) object in 'dir'.	1746	/* Fires a misc (wand/rod/horn) object in 'dir'.
1796	* Broken apart from 'fire' to keep it more readable.	1747	* Broken apart from 'fire' to keep it more readable.
1797	*/	1748	*/
1798	void	1749	void
1799	fire_misc_object (object *op, int dir)	1750	fire_misc_object (object *op, int dir)
1800	{	1751	{
1801	object *item;	1752	object *item = op->contr->ranged_ob;
1802		1753
1803	if (!op->contr->ranges[range_misc])	1754	if (!item)
1804	{	1755	{
1805	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1756	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1806	return;	1757	return;
1807	}	1758	}
1808		1759
1809	item = op->contr->ranges[range_misc];
1810	if (!item->inv)	1760	if (!item->inv)
1811	{	1761	{
1812	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1762	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1813	return;	1763	return;
1814	}	1764	}
		1765
		1766	if (!op->change_weapon (item))
		1767	return;
		1768
1815	if (item->type == WAND)	1769	if (item->type == WAND)
1816	{	1770	{
1817	if (item->stats.food <= 0)	1771	if (item->stats.food <= 0)
1818	{	1772	{
1819	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1773	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1820	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1774	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1775
1821	return;	1776	return;
1822	}	1777	}
1823	}	1778	}
1824	else if (item->type == ROD || item->type == HORN)	1779	else if (item->type == ROD || item->type == HORN)
1825	{	1780	{
1826	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1781	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1827	{	1782	{
1828	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1783	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1784
1829	if (item->type == ROD)	1785	if (item->type == ROD)
1830	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1786	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1831	else	1787	else
1832	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1788	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1789
1833	return;	1790	return;
1834	}	1791	}
1835	}	1792	}
1836		1793
1837	if (cast_spell (op, item, dir, item->inv, NULL))	1794	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1844	object *tmp;	1801	object *tmp;
1845		1802
1846	if (item->arch)	1803	if (item->arch)
1847	{	1804	{
1848	CLEAR_FLAG (item, FLAG_ANIMATE);	1805	CLEAR_FLAG (item, FLAG_ANIMATE);
1849	item->face = item->arch->clone.face;	1806	item->face = item->arch->face;
1850	item->set_speed (0);	1807	item->set_speed (0);
1851	}	1808	}
1852		1809
1853	if ((tmp = item->in_player ()))	1810	if ((tmp = item->in_player ()))
1854	esrv_update_item (UPD_ANIM, tmp, item);	1811	esrv_update_item (UPD_ANIM, tmp, item);
…		…
1859	}	1816	}
1860	}	1817	}
1861		1818
1862	/* Received a fire command for the player - go and do it.	1819	/* Received a fire command for the player - go and do it.
1863	*/	1820	*/
1864	void	1821	bool
1865	fire (object *op, int dir)	1822	fire (object *op, int dir)
1866	{	1823	{
1867	int spellcost = 0;	1824	int spellcost = 0;
1868		1825
1869	/* check for loss of invisiblity/hide */	1826	/* check for loss of invisiblity/hide */
1870	if (action_makes_visible (op))	1827	if (action_makes_visible (op))
1871	make_visible (op);	1828	make_visible (op);
1872		1829
1873	switch (op->contr->shoottype)	1830	player *pl = op->contr;
		1831
		1832	if (pl->golem)
		1833	{
		1834	control_golem (op->contr->golem, dir);
		1835	return false;
1874	{	1836	}
1875	case range_none:
1876	return;
1877		1837
1878	case range_bow:	1838	object *ob = pl->ranged_ob;
		1839
		1840	if (!ob)
		1841	return false;
		1842
		1843	if (!op->change_weapon (ob))
		1844	return false;
		1845
		1846	if (op->speed_left > 0.f)
		1847	--op->speed_left;
		1848	else
		1849	return false;
		1850
		1851	switch (ob->type)
		1852	{
		1853	case BOW:
1879	player_fire_bow (op, dir);	1854	player_fire_bow (op, dir);
1880	return;	1855	break;
1881		1856
1882	case range_magic: /* Casting spells */	1857	case SPELL:
1883	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1858	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1884	return;	1859	break;
1885		1860
1886	case range_misc:	1861	case BUILDER:
		1862	apply_map_builder (op, dir);
		1863	break;
		1864
		1865	case SKILL:
		1866	do_skill (op, op, ob, dir, 0);
		1867	break;
		1868
		1869	default:
1887	fire_misc_object (op, dir);	1870	fire_misc_object (op, dir);
1888	return;	1871	break;
1889
1890	case range_golem: /* Control summoned monsters from scrolls */
1891	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1892	{
1893	op->contr->ranges[range_golem] = 0;
1894	op->contr->shoottype = range_none;
1895	}
1896	else
1897	control_golem (op->contr->ranges[range_golem], dir);
1898	return;
1899
1900	case range_skill:
1901	if (!op->chosen_skill)
1902	{
1903	if (op->type == PLAYER)
1904	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1905	return;
1906	}
1907	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1908	return;
1909	case range_builder:
1910	apply_map_builder (op, dir);
1911	return;
1912	default:
1913	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1914	return;
1915	}	1872	}
1916	}
1917		1873
1918		1874	return true;
		1875	}
1919		1876
1920	/* find_key	1877	/* find_key
1921	* We try to find a key for the door as passed. If we find a key	1878	* We try to find a key for the door as passed. If we find a key
1922	* and successfully use it, we return the key, otherwise NULL	1879	* and successfully use it, we return the key, otherwise NULL
1923	* This function merges both normal and locked door, since the logic	1880	* This function merges both normal and locked door, since the logic
…		…
1925	* pl is the player,	1882	* pl is the player,
1926	* inv is the objects inventory to searched	1883	* inv is the objects inventory to searched
1927	* door is the door we are trying to match against.	1884	* door is the door we are trying to match against.
1928	* This function can be called recursively to search containers.	1885	* This function can be called recursively to search containers.
1929	*/	1886	*/
1930
1931	object *	1887	object *
1932	find_key (object *pl, object *container, object *door)	1888	find_key (object *pl, object *container, object *door)
1933	{	1889	{
1934	object *tmp, *key;	1890	object *tmp, *key;
1935		1891
1936	/* Should not happen, but sanity checking is never bad */	1892	/* Should not happen, but sanity checking is never bad */
1937	if (container->inv == NULL)	1893	if (!container->inv)
1938	return NULL;	1894	return 0;
1939		1895
1940	/* First, lets try to find a key in the top level inventory */	1896	/* First, lets try to find a key in the top level inventory */
1941	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1897	for (tmp = container->inv; tmp; tmp = tmp->below)
1942	{	1898	{
1943	if (door->type == DOOR && tmp->type == KEY)	1899	if (door->type == DOOR && tmp->type == KEY)
1944	break;	1900	break;
1945	/* For sanity, we should really check door type, but other stuff	1901	/* For sanity, we should really check door type, but other stuff
1946	* (like containers) can be locked with special keys	1902	* (like containers) can be locked with special keys
1947	*/	1903	*/
1948	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1904	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1949	break;	1905	break;
1950	}	1906	}
		1907
1951	/* No key found - lets search inventories now */	1908	/* No key found - lets search inventories now */
1952	/* If we find and use a key in an inventory, return at that time.	1909	/* If we find and use a key in an inventory, return at that time.
1953	* otherwise, if we search all the inventories and still don't find	1910	* otherwise, if we search all the inventories and still don't find
1954	* a key, return	1911	* a key, return
1955	*/	1912	*/
1956	if (!tmp)	1913	if (!tmp)
1957	{	1914	{
1958	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1915	for (tmp = container->inv; tmp; tmp = tmp->below)
1959	{	1916	{
1960	/* No reason to search empty containers */	1917	/* No reason to search empty containers */
1961	if (tmp->type == CONTAINER && tmp->inv)	1918	if (tmp->type == CONTAINER && tmp->inv)
1962	{	1919	{
1963	if ((key = find_key (pl, tmp, door)) != NULL)	1920	if ((key = find_key (pl, tmp, door)))
1964	return key;	1921	return key;
1965	}	1922	}
1966	}	1923	}
		1924
1967	if (!tmp)	1925	if (!tmp)
1968	return NULL;	1926	return NULL;
1969	}	1927	}
		1928
1970	/* We get down here if we have found a key. Now if its in a container,	1929	/* We get down here if we have found a key. Now if its in a container,
1971	* see if we actually want to use it	1930	* see if we actually want to use it
1972	*/	1931	*/
1973	if (pl != container)	1932	if (pl != container)
1974	{	1933	{
…		…
1995	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1954	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1996	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1955	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1997	return NULL;	1956	return NULL;
1998	}	1957	}
1999	}	1958	}
		1959
2000	return tmp;	1960	return tmp;
2001	}	1961	}
2002		1962
2003	/* moved door processing out of move_player_attack.	1963	/* moved door processing out of move_player_attack.
2004	* returns 1 if player has opened the door with a key	1964	* returns 1 if player has opened the door with a key
…		…
2006	* 0 otherwise	1966	* 0 otherwise
2007	*/	1967	*/
2008	static int	1968	static int
2009	player_attack_door (object *op, object *door)	1969	player_attack_door (object *op, object *door)
2010	{	1970	{
2011	/* If its a door, try to find a use a key. If we do destroy the door,	1971	/* If its a door, try to find a key. If we do destroy the door,
2012	* might as well return immediately as there is nothing more to do -	1972	* might as well return immediately as there is nothing more to do -
2013	* otherwise, we fall through to the rest of the code.	1973	* otherwise, we fall through to the rest of the code.
2014	*/	1974	*/
2015	object *key = find_key (op, op, door);	1975	object *key = find_key (op, op, door);
2016		1976
2017	/* IF we found a key, do some extra work */	1977	/* If we found a key, do some extra work */
2018	if (key)	1978	if (key)
2019	{	1979	{
2020	object *container = key->env;	1980	object *container = key->env;
2021		1981
2022	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1982	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1983
2023	if (action_makes_visible (op))	1984	if (action_makes_visible (op))
2024	make_visible (op);	1985	make_visible (op);
		1986
2025	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1987	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2026	spring_trap (door->inv, op);	1988	spring_trap (door->inv, op);
		1989
2027	if (door->type == DOOR)	1990	if (door->type == DOOR)
2028	{
2029	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1991	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2030	}
2031	else if (door->type == LOCKED_DOOR)	1992	else if (door->type == LOCKED_DOOR)
2032	{	1993	{
2033	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1994	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2034	remove_door2 (door); /* remove door without violence ;-) */	1995	remove_door2 (door); /* remove door without violence ;-) */
2035	}	1996	}
		1997
2036	/* Do this after we print the message */	1998	/* Do this after we print the message */
2037	decrease_ob (key); /* Use up one of the keys */	1999	decrease_ob (key); /* Use up one of the keys */
2038	/* Need to update the weight the container the key was in */	2000	/* Need to update the weight the container the key was in */
2039	if (container != op)	2001	if (container != op)
2040	esrv_update_item (UPD_WEIGHT, op, container);	2002	esrv_update_item (UPD_WEIGHT, op, container);
		2003
2041	return 1; /* Nothing more to do below */	2004	return 1; /* Nothing more to do below */
2042	}	2005	}
2043	else if (door->type == LOCKED_DOOR)	2006	else if (door->type == LOCKED_DOOR)
2044	{	2007	{
2045	/* Might as well return now - no other way to open this */	2008	/* Might as well return now - no other way to open this */
2046	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2009	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2047	return 1;	2010	return 1;
2048	}	2011	}
		2012
2049	return 0;	2013	return 0;
2050	}	2014	}
2051		2015
2052	/* This function is just part of a breakup from move_player.	2016	/* This function is just part of a breakup from move_player.
2053	* It should keep the code cleaner.	2017	* It should keep the code cleaner.
2054	* When this is called, the players direction has been updated	2018	* When this is called, the players direction has been updated
2055	* (taking into account confusion.) The player is also actually	2019	* (taking into account confusion.) The player is also actually
2056	* going to try and move (not fire weapons).	2020	* going to try and move (not fire weapons).
2057	*/	2021	*/
2058	void	2022	bool
2059	move_player_attack (object *op, int dir)	2023	move_player_attack (object *op, int dir)
2060	{	2024	{
2061	object *tmp, *mon;
2062	sint16 nx, ny;
2063	int on_battleground;	2025	int on_battleground;
2064	maptile *m;
2065		2026
2066	nx = freearr_x[dir] + op->x;	2027	sint16 nx = freearr_x[dir] + op->x;
2067	ny = freearr_y[dir] + op->y;	2028	sint16 ny = freearr_y[dir] + op->y;
2068		2029
2069	on_battleground = op_on_battleground (op, 0, 0);	2030	on_battleground = op_on_battleground (op, 0, 0);
		2031
		2032	if (out_of_map (op->map, nx, ny))
		2033	return false;
		2034
		2035	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2036	{
		2037	--op->speed_left;
		2038	return true;
		2039	}
2070		2040
2071	/* If braced, or can't move to the square, and it is not out of the	2041	/* If braced, or can't move to the square, and it is not out of the
2072	* map, attack it. Note order of if statement is important - don't	2042	* map, attack it. Note order of if statement is important - don't
2073	* want to be calling move_ob if braced, because move_ob will move the	2043	* want to be calling move_ob if braced, because move_ob will move the
2074	* player. This is a pretty nasty hack, because if we could	2044	* player. This is a pretty nasty hack, because if we could
2075	* move to some space, it then means that if we are braced, we should	2045	* move to some space, it then means that if we are braced, we should
2076	* do nothing at all. As it is, if we are braced, we go through	2046	* do nothing at all. As it is, if we are braced, we go through
2077	* quite a bit of processing. However, it probably is less than what	2047	* quite a bit of processing. However, it probably is less than what
2078	* move_ob uses.	2048	* move_ob uses.
2079	*/	2049	*/
2080	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2050	maptile *m = op->map->xy_find (nx, ny);
2081	{
2082	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2083	{
2084	m = get_map_from_coord (op->map, &nx, &ny);
2085	if (!m)
2086	return; /* Don't think this should happen */
2087	}
2088	else
2089	m = op->map;
2090		2051
2091	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2092	{
2093	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2094	return;
2095	}
2096
2097	mon = 0;
2098	/* Go through all the objects, and find ones of interest. Only stop if	2052	/* Go through all the objects, and find ones of interest. Only stop if
2099	* we find a monster - that is something we know we want to attack.	2053	* we find a monster - that is something we know we want to attack.
2100	* if its a door or barrel (can roll) see if there may be monsters	2054	* if its a door or barrel (can roll) see if there may be monsters
2101	* on the space	2055	* on the space
2102	*/	2056	*/
2103	while (tmp)	2057	object *mon;
2104	{	2058	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2105	if (tmp == op)	2059	{
2106	{	2060	if ((mon->flag [FLAG_ALIVE]
2107	tmp = tmp->above;	2061	|| mon->type == LOCKED_DOOR
2108	continue;	2062	|| mon->flag [FLAG_CAN_ROLL])
2109	}
2110
2111	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2112	{
2113	mon = tmp;	2063	&& mon != op)
2114	break;	2064	break;
2115	}	2065	}
2116		2066
2117	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2118	mon = tmp;
2119
2120	tmp = tmp->above;
2121	}
2122
2123	if (!mon) /* This happens anytime the player tries to move */	2067	if (!mon) /* This happens anytime the player tries to move */
2124	return; /* into a wall */	2068	return false; /* into a wall */
2125		2069
2126	if (mon->head)
2127	mon = mon->head;	2070	mon = mon->head_ ();
2128		2071
2129	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2072	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2073	if (op->contr->weapon_sp_left > 0.f)
2130	if (player_attack_door (op, mon))	2074	if (player_attack_door (op, mon))
		2075	{
		2076	--op->contr->weapon_sp_left;
2131	return;	2077	return true;
		2078	}
2132		2079
2133	/* The following deals with possibly attacking peaceful	2080	/* The following deals with possibly attacking peaceful
2134	* or frienddly creatures. Basically, all players are considered	2081	* or friendly creatures. Basically, all players are considered
2135	* unaggressive. If the moving player has peaceful set, then the	2082	* unaggressive. If the moving player has peaceful set, then the
2136	* object should be pushed instead of attacked. It is assumed that	2083	* object should be pushed instead of attacked. It is assumed that
2137	* if you are braced, you will not attack friends accidently,	2084	* if you are braced, you will not attack friends accidently,
2138	* and thus will not push them.	2085	* and thus will not push them.
2139	*/	2086	*/
2140		2087
2141	/* If the creature is a pet, push it even if the player is not	2088	/* If the creature is a pet, push it even if the player is not
2142	* peaceful. Our assumption is the creature is a pet if the	2089	* peaceful. Our assumption is the creature is a pet if the
2143	* player owns it and it is either friendly or unagressive.	2090	* player owns it and it is either friendly or unagressive.
2144	*/	2091	*/
2145	if ((op->type == PLAYER)	2092	if (op->type == PLAYER
2146	#if COZY_SERVER
2147	&&
2148	((mon->owner && mon->owner->contr	2093	&& ((mon->owner && mon->owner->contr
2149	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2094	&& same_party (mon->owner->contr->party, op->contr->party))
2150	#else
2151	&& mon->owner == op	2095	|| mon->owner == op)
2152	#endif
2153	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2096	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2154	{	2097	{
2155	/* If we're braced, we don't want to switch places with it */	2098	/* If we're braced, we don't want to switch places with it */
2156	if (op->contr->braced)	2099	if (op->contr->braced)
2157	return;	2100	return false;
		2101
		2102	if (op->speed_left > 0.f)
		2103	{
		2104	--op->speed_left;
		2105
2158	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2106	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2159	(void) push_ob (mon, dir, op);	2107	push_ob (mon, dir, op);
		2108
2160	if (op->contr->tmp_invis || op->hide)	2109	if (op->contr->tmp_invis || op->hide)
2161	make_visible (op);	2110	make_visible (op);
		2111
2162	return;	2112	return true;
2163	}	2113	}
		2114	else
		2115	return false;
		2116	}
2164		2117
2165	/* in certain circumstances, you shouldn't attack friendly	2118	/* in certain circumstances, you shouldn't attack friendly
2166	* creatures. Note that if you are braced, you can't push	2119	* creatures. Note that if you are braced, you can't push
2167	* someone, but put it inside this loop so that you won't	2120	* someone, but put it inside this loop so that you won't
2168	* attack them either.	2121	* attack them either.
2169	*/	2122	*/
2170	if ((mon->type == PLAYER || mon->enemy != op) &&	2123	if ((mon->type == PLAYER || mon->enemy != op)
2171	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2124	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2172	#ifdef PROHIBIT_PLAYERKILL
2173	(op->contr->peaceful	2125	&& ((op->contr->peaceful
2174	|| (mon->type == PLAYER	2126	|| (mon->type == PLAYER && mon->contr->peaceful))
2175	&& mon->contr->
2176	peaceful)) &&
2177	#else
2178	op->contr->peaceful &&
2179	#endif
2180	!on_battleground))	2127	&& !on_battleground))
		2128	{
		2129	if (op->speed_left > 0.f)
2181	{	2130	{
		2131	--op->speed_left;
		2132
2182	if (!op->contr->braced)	2133	if (!op->contr->braced)
2183	{	2134	{
2184	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2135	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2185	(void) push_ob (mon, dir, op);	2136	push_ob (mon, dir, op);
2186	}	2137	}
2187	else	2138	else
2188	new_draw_info (0, 0, op, "You withhold your attack");	2139	new_draw_info (0, 0, op, "You withhold your attack");
2189		2140
2190	if (op->contr->tmp_invis || op->hide)	2141	if (op->contr->tmp_invis || op->hide)
2191	make_visible (op);	2142	make_visible (op);
2192	}
2193		2143
		2144	return true;
		2145	}
		2146	}
2194	/* If the object is a boulder or other rollable object, then	2147	/* If the object is a boulder or other rollable object, then
2195	* roll it if not braced. You can't roll it if you are braced.	2148	* roll it if not braced. You can't roll it if you are braced.
2196	*/	2149	*/
2197	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2150	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2151	{
		2152	if (op->speed_left > 0.f)
2198	{	2153	{
		2154	--op->speed_left;
		2155
2199	recursive_roll (mon, dir, op);	2156	recursive_roll (mon, dir, op);
2200	if (action_makes_visible (op))	2157	if (action_makes_visible (op))
2201	make_visible (op);	2158	make_visible (op);
2202	}
2203		2159
		2160	return true;
		2161	}
		2162	}
2204	/* Any generic living creature. Including things like doors.	2163	/* Any generic living creature. Including things like doors.
2205	* Way it works is like this: First, it must have some hit points	2164	* Way it works is like this: First, it must have some hit points
2206	* and be living. Then, it must be one of the following:	2165	* and be living. Then, it must be one of the following:
2207	* 1) Not a player, 2) A player, but of a different party. Note	2166	* 1) Not a player, 2) A player, but of a different party. Note
2208	* that party_number -1 is no party, so attacks can still happen.	2167	* that party_number -1 is no party, so attacks can still happen.
2209	*/	2168	*/
2210
2211	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2212	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2213	{	2171	{
2214		2172	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2215	/* If the player hasn't hit something this tick, and does
2216	* so, give them speed boost based on weapon speed. Doing
2217	* it here is better than process_players2, which basically
2218	* incurred a 1 tick offset.
2219	*/
2220	if (!op->contr->has_hit)
2221	{	2173	{
2222	op->speed_left += op->speed / op->contr->weapon_sp;	2174	--op->contr->weapon_sp_left;
2223
2224	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2225	}
2226		2175
2227	skill_attack (mon, op, 0, 0, 0);	2176	skill_attack (mon, op, 0, 0, 0);
2228
2229	/* If attacking another player, that player gets automatic
2230	* hitback, and doesn't loose luck either.
2231	* Disable hitback on the battleground or if the target is
2232	* the wiz.
2233	*/
2234	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2235	{
2236	short luck = mon->stats.luck;
2237
2238	mon->contr->has_hit = 1;
2239	skill_attack (op, mon, 0, 0, 0);
2240	mon->stats.luck = luck;
2241	}
2242		2177
2243	if (action_makes_visible (op))	2178	if (action_makes_visible (op))
2244	make_visible (op);	2179	make_visible (op);
2245	}
2246	} /* if player should attack something */
2247	}
2248		2180
2249	int	2181	return true;
		2182	}
		2183	}
		2184
		2185	return false;
		2186	}
		2187
		2188	bool
2250	move_player (object *op, int dir)	2189	move_player (object *op, int dir)
2251	{	2190	{
2252	int pick;	2191	int pick;
2253		2192
2254	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2193	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2255	return 0;	2194	return 0;
2256		2195
2257	/* Sanity check: make sure dir is valid */	2196	/* Sanity check: make sure dir is valid */
2258	if ((dir < 0) || (dir >= 9))	2197	if ((dir < 0) || (dir >= 9))
2259	{	2198	{
2260	LOG (llevError, "move_player: invalid direction %d\n", dir);	2199	LOG (llevError, "move_player: invalid direction %d\n", dir);
2261	return 0;	2200	return 0;
2262	}	2201	}
2263		2202
2264	/* peterm: added following line */	2203	/* peterm: added following line */
2265	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2204	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2266	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2205	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2267		2206
2268	op->facing = dir;	2207	op->facing = dir;
2269		2208
2270	if (op->hide)	2209	if (op->hide)
2271	do_hidden_move (op);	2210	do_hidden_move (op);
2272		2211
		2212	bool retval;
		2213
2273	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2214	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2274	/*nop */ ;	2215	retval = RESULT_INT (0);
2275	else if (op->contr->fire_on)	2216	else if (op->contr->fire_on)
2276	fire (op, dir);	2217	retval = fire (op, dir);
2277	else	2218	else
2278	{	2219	{
2279	move_player_attack (op, dir);	2220	retval = move_player_attack (op, dir);
2280	pick = check_pick (op);	2221	pick = check_pick (op);
2281	}	2222	}
2282		2223
2283	/* Add special check for newcs players and fire on - this way, the	2224	/* Add special check for newcs players and fire on - this way, the
2284	* server can handle repeat firing.	2225	* server can handle repeat firing.
…		…
2291	/* Update how the player looks. Use the facing, so direction may	2232	/* Update how the player looks. Use the facing, so direction may
2292	* get reset to zero. This allows for full animation capabilities	2233	* get reset to zero. This allows for full animation capabilities
2293	* for players.	2234	* for players.
2294	*/	2235	*/
2295	animate_object (op, op->facing);	2236	animate_object (op, op->facing);
2296	return 0;	2237
		2238	return retval;
2297	}	2239	}
2298		2240
2299	/* This is similar to handle_player, below, but is only used by the	2241	/* This is similar to handle_player, below, but is only used by the
2300	* new client/server stuff.	2242	* new client/server stuff.
2301	* This is sort of special, in that the new client/server actually uses	2243	* This is sort of special, in that the new client/server actually uses
2302	* the new speed values for commands.	2244	* the new speed values for commands.
2303	*	2245	*
2304	* Returns true if there are more actions we can do.	2246	* Returns true if there are more actions we can do. Should not do
		2247	* many actions in a row, as that would be too unfair to other
		2248	* players.
2305	*/	2249	*/
2306	int	2250	bool
2307	handle_newcs_player (object *op)	2251	handle_newcs_player (object *op)
2308	{	2252	{
2309	if (op->contr->hidden)
2310	{
2311	op->invisible = 1000;
2312	/* the socket code flashes the player visible/invisible
2313	* depending on the value of invisible, so we need to
2314	* alternate it here for it to work correctly.
2315	*/
2316	if (pticks & 2)
2317	op->invisible--;
2318	}
2319	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2320	{
2321	op->invisible--;
2322	if (!op->invisible)
2323	{
2324	make_visible (op);
2325	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2326	}
2327	}
2328
2329	if (QUERY_FLAG (op, FLAG_SCARED))	2253	if (QUERY_FLAG (op, FLAG_SCARED))
2330	{	2254	{
2331	flee_player (op);	2255	if (op->speed_left > 0.f)
2332	/* If player is still scared, that is his action for this tick */
2333	if (QUERY_FLAG (op, FLAG_SCARED))
2334	{	2256	{
2335	op->speed_left--;	2257	--op->speed_left;
		2258	flee_player (op);
		2259
2336	return 0;	2260	return true;
2337	}	2261	}
		2262	else
		2263	return false;
2338	}	2264	}
2339
2340	/* I've been seeing crashes where the golem has been destroyed, but
2341	* the player object still points to the defunct golem. The code that
2342	* destroys the golem looks correct, and it doesn't always happen, so
2343	* put this in a a workaround to clean up the golem pointer.
2344	*/
2345	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2346	op->contr->ranges[range_golem] = 0;
2347		2265
2348	/* call this here - we also will call this in do_ericserver, but	2266	/* call this here - we also will call this in do_ericserver, but
2349	* the players time has been increased when doericserver has been	2267	* the players time has been increased when doericserver has been
2350	* called, so we recheck it here.	2268	* called, so we recheck it here.
2351	*/	2269	*/
2352	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2270	if (op->contr->ns->handle_command ())
2353	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2354	;
2355
2356	if (op->speed_left < 0)
2357	return 0;	2271	return true;
2358		2272
2359	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2273	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2360	{
2361	/* All move commands take 1 tick, at least for now */
2362	op->speed_left--;
2363
2364	/* Instead of all the stuff below, let move_player take care
2365	* of it. Also, some of the skill stuff is only put in
2366	* there, as well as the confusion stuff.
2367	*/
2368	move_player (op, op->direction);	2274	return move_player (op, op->direction);
2369	if (op->speed_left > 0)
2370	return 1;
2371	else
2372	return 0;
2373	}
2374		2275
2375	return 0;	2276	return false;
2376	}	2277	}
2377		2278
2378	int	2279	int
2379	save_life (object *op)	2280	save_life (object *op)
2380	{	2281	{
…		…
2415	* from.	2316	* from.
2416	*/	2317	*/
2417	void	2318	void
2418	remove_unpaid_objects (object *op, object *env)	2319	remove_unpaid_objects (object *op, object *env)
2419	{	2320	{
2420	object *next;
2421
2422	while (op)	2321	while (op)
2423	{	2322	{
2424	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2323	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2425		2324
2426	if (QUERY_FLAG (op, FLAG_UNPAID))	2325	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2492	int rate_grace = 2000;	2391	int rate_grace = 2000;
2493	const int max_hp = 1;	2392	const int max_hp = 1;
2494	const int max_sp = 1;	2393	const int max_sp = 1;
2495	const int max_grace = 1;	2394	const int max_grace = 1;
2496		2395
2497	if (op->contr->outputs_sync)	2396	if (op->contr->hidden)
		2397	{
		2398	op->invisible = 1000;
		2399	/* the socket code flashes the player visible/invisible
		2400	* depending on the value of invisible, so we need to
		2401	* alternate it here for it to work correctly.
		2402	*/
		2403	if (pticks & 2)
		2404	op->invisible--;
2498	{	2405	}
2499	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2406	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2500	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2407	{
2501	flush_output_element (op, &op->contr->outputs[i]);	2408	if (!op->invisible--)
		2409	{
		2410	make_visible (op);
		2411	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2412	}
2502	}	2413	}
2503		2414
2504	if (op->contr->ns->state == ST_PLAYING)	2415	if (op->contr->ns->state == ST_PLAYING)
2505	{	2416	{
2506	/* these next three if clauses make it possible to SLOW DOWN	2417	/* these next three if clauses make it possible to SLOW DOWN
…		…
2528	gen_grace = op->stats.maxgrace;	2439	gen_grace = op->stats.maxgrace;
2529	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2440	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2530	}	2441	}
2531		2442
2532	/* Regenerate Spell Points */	2443	/* Regenerate Spell Points */
2533	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2444	if (!op->contr->golem && --op->last_sp < 0)
2534	{	2445	{
2535	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2446	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2536	if (op->stats.sp < op->stats.maxsp)	2447	if (op->stats.sp < op->stats.maxsp)
2537	{	2448	{
2538	op->stats.sp++;	2449	op->stats.sp++;
…		…
2636	}	2547	}
2637		2548
2638	/* Digestion */	2549	/* Digestion */
2639	if (--op->last_eat < 0)	2550	if (--op->last_eat < 0)
2640	{	2551	{
2641	#ifdef COZY_SERVER
2642	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2643	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2644	#else
2645	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2552	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2646	#endif
2647		2553
2648	if (op->contr->gen_hp > 0)	2554	if (op->contr->gen_hp > 0)
2649	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2555	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2650	else	2556	else
2651	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2557	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2756	tmp->name = buf;	2662	tmp->name = buf;
2757	sprintf (buf, " This finger has been cut off %s\n"	2663	sprintf (buf, " This finger has been cut off %s\n"
2758	" the %s, when he was defeated at\n level %d by %s.\n",	2664	" the %s, when he was defeated at\n level %d by %s.\n",
2759	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2665	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2760	tmp->msg = buf;	2666	tmp->msg = buf;
2761	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2667	tmp->value = 0, tmp->type = 0;
2762	tmp->materialname = NULL;	2668	tmp->materialname = "organics";
2763	op->insert_at (tmp, op);	2669	tmp->insert_at (op, tmp);
2764	}	2670	}
2765		2671
2766	/* teleport defeated player to new destination */	2672	/* teleport defeated player to new destination */
2767	transfer_ob (op, x, y, 0, NULL);	2673	transfer_ob (op, x, y, 0, NULL);
2768	op->contr->braced = 0;	2674	op->contr->braced = 0;
…		…
2773		2679
2774	command_kill_pets (op, 0);	2680	command_kill_pets (op, 0);
2775		2681
2776	if (op->stats.food < 0)	2682	if (op->stats.food < 0)
2777	{	2683	{
2778	if (op->contr->explore)
2779	{
2780	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2781	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2782	op->stats.food = 999;
2783	return;
2784	}
2785	sprintf (buf, "%s starved to death.", &op->name);	2684	sprintf (buf, "%s starved to death.", &op->name);
2786	strcpy (op->contr->killer, "starvation");	2685	strcpy (op->contr->killer, "starvation");
2787	}	2686	}
2788	else	2687	else
2789	{
2790	if (op->contr->explore)
2791	{
2792	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2793	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2794	op->stats.hp = op->stats.maxhp;
2795	return;
2796	}
2797	sprintf (buf, "%s died.", &op->name);	2688	sprintf (buf, "%s died.", &op->name);
2798	}
2799		2689
2800	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2690	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2801		2691
2802	/* save the map location for corpse, gravestone */	2692	/* save the map location for corpse, gravestone */
2803	x = op->x;	2693	x = op->x;
…		…
2979	op->stats.hp = op->stats.maxhp;	2869	op->stats.hp = op->stats.maxhp;
2980	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2870	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2981	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2871	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2982		2872
2983	/*	2873	/*
2984	* Check to see if the player is in a shop. IF so, then check to see if
2985	* the player has any unpaid items. If so, remove them and put them back	2874	* Check to see if the player has any unpaid items. If so, remove them
2986	* in the map.	2875	* and put them back in the map.
2987	*/	2876	*/
2988
2989	if (is_in_shop (op))
2990	remove_unpaid_objects (op->inv, op);	2877	remove_unpaid_objects (op->inv, op);
2991		2878
2992	/****************************************/	2879	/****************************************/
2993	/* */	2880	/* */
2994	/* Move player to his current respawn- */	2881	/* Move player to his current respawn- */
2995	/* position (usually last savebed) */	2882	/* position (usually last savebed) */
2996	/* */	2883	/* */
2997	/****************************************/	2884	/****************************************/
2998		2885
2999	enter_player_savebed (op);	2886	enter_player_savebed (op);
3000		2887
3001	/* Save the player before inserting the force to reduce
3002	* chance of abuse.
3003	*/
3004	op->contr->braced = 0;	2888	op->contr->braced = 0;
3005	op->contr->save ();
3006		2889
3007	/* it is possible that the player has blown something up	2890	/* it is possible that the player has blown something up
3008	* at his savebed location, and that can have long lasting	2891	* at his savebed location, and that can have long lasting
3009	* spell effects. So first see if there is a spell effect	2892	* spell effects. So first see if there is a spell effect
3010	* on the space that might harm the player.	2893	* on the space that might harm the player.
…		…
3019	object *force;	2902	object *force;
3020	int at;	2903	int at;
3021		2904
3022	force = get_archetype (FORCE_NAME);	2905	force = get_archetype (FORCE_NAME);
3023	/* 50 ticks should be enough time for the spell to abate */	2906	/* 50 ticks should be enough time for the spell to abate */
3024	force->speed = 0.1;	2907	force->speed = 0.1f;
3025	force->speed_left = -5.0;	2908	force->speed_left = -5.f;
3026	SET_FLAG (force, FLAG_APPLIED);	2909	SET_FLAG (force, FLAG_APPLIED);
3027	for (at = 0; at < NROFATTACKS; at++)	2910	for (at = 0; at < NROFATTACKS; at++)
3028	if (will_kill_again & (1 << at))	2911	if (will_kill_again & (1 << at))
3029	force->resist[at] = 100;	2912	force->resist[at] = 100;
3030		2913
…		…
3039	void	2922	void
3040	loot_object (object *op)	2923	loot_object (object *op)
3041	{ /* Grab and destroy some treasure */	2924	{ /* Grab and destroy some treasure */
3042	object *tmp, *tmp2, *next;	2925	object *tmp, *tmp2, *next;
3043		2926
3044	if (op->container)	2927	op->close_container (); /* close open sack first */
3045	esrv_apply_container (op, op->container); /* close open sack first */
3046		2928
3047	for (tmp = op->inv; tmp; tmp = next)	2929	for (tmp = op->inv; tmp; tmp = next)
3048	{	2930	{
3049	next = tmp->below;	2931	next = tmp->below;
3050		2932
3051	if (tmp->invisible)	2933	if (tmp->invisible)
3052	continue;	2934	continue;
3053		2935
3054	tmp->remove ();	2936	tmp->remove ();
3055	tmp->x = op->x, tmp->y = op->y;	2937	tmp->x = op->x, tmp->y = op->y;
		2938
3056	if (tmp->type == CONTAINER)	2939	if (tmp->type == CONTAINER)
3057	{ /* empty container to ground */	2940	loot_object (tmp); /* empty container to ground */
3058	loot_object (tmp);	2941
3059	}
3060	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2942	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3061	{	2943	{
3062	if (tmp->nrof > 1)	2944	if (tmp->nrof > 1)
3063	{	2945	{
3064	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2946	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3065	tmp2->destroy ();	2947	tmp2->destroy ();
…		…
3076	/*	2958	/*
3077	* fix_weight(): Check recursively the weight of all players, and fix	2959	* fix_weight(): Check recursively the weight of all players, and fix
3078	* what needs to be fixed. Refresh windows and fix speed if anything	2960	* what needs to be fixed. Refresh windows and fix speed if anything
3079	* was changed.	2961	* was changed.
3080	*/	2962	*/
3081
3082	void	2963	void
3083	fix_weight (void)	2964	fix_weight (void)
3084	{	2965	{
3085	for_all_players (pl)	2966	for_all_players (pl)
3086	{	2967	{
…		…
3146	if (op->type == PLAYER)	3027	if (op->type == PLAYER)
3147	{	3028	{
3148	op->contr->tmp_invis = 0;	3029	op->contr->tmp_invis = 0;
3149	op->contr->invis_race = 0;	3030	op->contr->invis_race = 0;
3150	}	3031	}
		3032
3151	update_object (op, UP_OBJ_FACE);	3033	update_object (op, UP_OBJ_CHANGE);
3152	}	3034	}
3153		3035
3154	int	3036	int
3155	is_true_undead (object *op)	3037	is_true_undead (object *op)
3156	{	3038	{
3157	object *tmp = NULL;
3158
3159	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3039	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3160	return 1;	3040	return 1;
3161		3041
3162	return 0;	3042	return 0;
3163	}	3043	}
3164		3044
…		…
3208	/* For Hidden creatures - a chance of becoming 'unhidden'	3088	/* For Hidden creatures - a chance of becoming 'unhidden'
3209	* every time they move - as we subtract off 'invisibility'	3089	* every time they move - as we subtract off 'invisibility'
3210	* AND, for players, if they move into a ridiculously unhideable	3090	* AND, for players, if they move into a ridiculously unhideable
3211	* spot (surrounded by clear terrain in broad daylight). -b.t.	3091	* spot (surrounded by clear terrain in broad daylight). -b.t.
3212	*/	3092	*/
3213
3214	void	3093	void
3215	do_hidden_move (object *op)	3094	do_hidden_move (object *op)
3216	{	3095	{
3217	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3096	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3218	object *skop;	3097	object *skop;
…		…
3222		3101
3223	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3102	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3224		3103
3225	/* its *extremely* hard to run and sneak/hide at the same time! */	3104	/* its *extremely* hard to run and sneak/hide at the same time! */
3226	if (op->type == PLAYER && op->contr->run_on)	3105	if (op->type == PLAYER && op->contr->run_on)
3227	{
3228	if (!skop || num >= skop->level)	3106	if (!skop || num >= skop->level)
3229	{	3107	{
3230	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3108	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3231	make_visible (op);	3109	make_visible (op);
3232	return;	3110	return;
3233	}	3111	}
3234	else	3112	else
3235	num += 20;	3113	num += 20;
3236	}	3114
3237	num += op->map->difficulty;	3115	num += op->map->difficulty;
3238	hide = hideability (op); /* modify by terrain hidden level */	3116	hide = hideability (op); /* modify by terrain hidden level */
3239	num -= hide;	3117	num -= hide;
		3118
3240	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3119	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3241	{	3120	{
3242	make_visible (op);	3121	make_visible (op);
3243	if (op->type == PLAYER)	3122	if (op->type == PLAYER)
3244	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3123	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3245	}	3124	}
3246	else if (op->type == PLAYER && skop)	3125	else if (op->type == PLAYER && skop)
3247	{
3248	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3126	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3249	}
3250	}	3127	}
3251		3128
3252	/* determine if who is standing near a hostile creature. */	3129	/* determine if who is standing near a hostile creature. */
3253		3130
3254	int	3131	int
…		…
3337	* a blocked los square.	3214	* a blocked los square.
3338	* we use the archetype to figure out offsets.	3215	* we use the archetype to figure out offsets.
3339	*/	3216	*/
3340	while (op)	3217	while (op)
3341	{	3218	{
3342	dx = rv.distance_x + op->arch->clone.x;	3219	dx = rv.distance_x + op->arch->x;
3343	dy = rv.distance_y + op->arch->clone.y;	3220	dy = rv.distance_y + op->arch->y;
3344		3221
3345	/* only the viewable area the player sees is updated by LOS	3222	/* only the viewable area the player sees is updated by LOS
3346	* code, so we need to restrict ourselves to that range of values	3223	* code, so we need to restrict ourselves to that range of values
3347	* for any meaningful values.	3224	* for any meaningful values.
3348	*/	3225	*/
…		…
3453	char buf[MAX_BUF]; /* tmp. string buffer */	3330	char buf[MAX_BUF]; /* tmp. string buffer */
3454	int i = 0, j = 0;	3331	int i = 0, j = 0;
3455		3332
3456	/* get the appropriate treasurelist */	3333	/* get the appropriate treasurelist */
3457	if (atnr == ATNR_FIRE)	3334	if (atnr == ATNR_FIRE)
3458	trlist = find_treasurelist ("dragon_ability_fire");	3335	trlist = treasurelist::find ("dragon_ability_fire");
3459	else if (atnr == ATNR_COLD)	3336	else if (atnr == ATNR_COLD)
3460	trlist = find_treasurelist ("dragon_ability_cold");	3337	trlist = treasurelist::find ("dragon_ability_cold");
3461	else if (atnr == ATNR_ELECTRICITY)	3338	else if (atnr == ATNR_ELECTRICITY)
3462	trlist = find_treasurelist ("dragon_ability_elec");	3339	trlist = treasurelist::find ("dragon_ability_elec");
3463	else if (atnr == ATNR_POISON)	3340	else if (atnr == ATNR_POISON)
3464	trlist = find_treasurelist ("dragon_ability_poison");	3341	trlist = treasurelist::find ("dragon_ability_poison");
3465		3342
3466	if (trlist == NULL || who->type != PLAYER)	3343	if (trlist == NULL || who->type != PLAYER)
3467	return;	3344	return;
3468		3345
3469	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3346	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470		3347
3471	if (tr == NULL || tr->item == NULL)	3348	if (!tr || !tr->item)
3472	{	3349	{
3473	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3350	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474	return;	3351	return;
3475	}	3352	}
3476		3353
3477	/* everything seems okay - now bring on the gift: */	3354	/* everything seems okay - now bring on the gift: */
3478	item = &(tr->item->clone);	3355	item = tr->item;
3479		3356
3480	if (item->type == SPELL)	3357	if (item->type == SPELL)
3481	{	3358	{
3482	if (check_spell_known (who, item->name))	3359	if (check_spell_known (who, item->name))
3483	return;	3360	return;
…		…
3542	{	3419	{
3543	/* forces in the treasurelist can alter the player's stats */	3420	/* forces in the treasurelist can alter the player's stats */
3544	object *skin;	3421	object *skin;
3545		3422
3546	/* first get the dragon skin force */	3423	/* first get the dragon skin force */
3547	shstr_cmp dragon_skin_force ("dragon_skin_force");
3548	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3424	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3549	;	3425	;
3550		3426
3551	if (!skin)	3427	if (!skin)
3552	return;	3428	return;
3553		3429
…		…
3601	* not readied.	3477	* not readied.
3602	*/	3478	*/
3603	void	3479	void
3604	player_unready_range_ob (player *pl, object *ob)	3480	player_unready_range_ob (player *pl, object *ob)
3605	{	3481	{
3606	rangetype i;	3482	if (pl->ob->current_weapon == ob)
		3483	pl->ob->current_weapon = 0;
3607		3484
3608	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3485	if (pl->combat_ob == ob)
3609	{	3486	pl->combat_ob = 0;
		3487
3610	if (pl->ranges[i] == ob)	3488	if (pl->ranged_ob == ob)
3611	{	3489	pl->ranged_ob = 0;
3612	pl->ranges[i] = NULL;
3613	if (pl->shoottype == i)
3614	{
3615	pl->shoottype = range_none;
3616	}
3617	}
3618	}
3619	}	3490	}
		3491
		3492	sint8
		3493	player::visibility_at (maptile *map, int x, int y) const
		3494	{
		3495	if (!ns)
		3496	return 0;
		3497
		3498	int dx, dy;
		3499	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3500	return 0;
		3501
		3502	x += dx - ns->current_x + ns->mapx / 2;
		3503	y += dy - ns->current_y + ns->mapy / 2;
		3504
		3505	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3506	return 0;
		3507
		3508	return 100 - blocked_los [x][y];
		3509	}

Diff Legend

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