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