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.60 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>
26	#include <sproto.h>	26	#include <sproto.h>
27	#include <sounds.h>	27	#include <sounds.h>
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32		32
33	#include <algorithm>	33	#include <algorithm>
34	#include <functional>	34	#include <functional>
35		35
36	player *	36	playervec players;
37	find_player (const char *plname)
38	{
39	player *pl;
40
41	for (pl = first_player; pl; pl = pl->next)
42	if (pl->ob && !strcmp (query_name (pl->ob), plname))
43	return pl;
44
45	return 0;
46	}
47		37
48	void	38	void
49	display_motd (const object *op)	39	display_motd (const object *op)
50	{	40	{
51	char buf[MAX_BUF];	41	char buf[MAX_BUF];
…		…
125		115
126	news[0] = '\0';	116	news[0] = '\0';
127	subject[0] = '\0';	117	subject[0] = '\0';
128	size = 0;	118	size = 0;
129		119
130	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
131	{	121	{
132	if (*buf == '#')	122	if (*buf == '#')
133	continue;	123	continue;
134		124
135	if (*buf == '%')	125	if (*buf == '%')
136	{ /* send one news */	126	{ /* send one news */
137	if (size > 0)	127	if (size > 0)
138	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */	128	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
		129
139	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
140	strip_endline (subject);	131	strip_endline (subject);
141	size = 0;	132	size = 0;
142	news[0] = '\0';	133	news[0] = '\0';
143	}	134	}
…		…
152	size += strlen (buf);	143	size += strlen (buf);
153	}	144	}
154	}	145	}
155		146
156	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
157	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
158	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
		150	}
		151
		152	float
		153	player::weapon_speed () const
		154	{
		155	return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
159	}	156	}
160		157
161	/* This loads the first map an puts the player on it. */	158	/* This loads the first map an puts the player on it. */
162	static void	159	static void
163	set_first_map (object *op)	160	set_first_map (object *op)
164	{	161	{
165	strcpy (op->contr->maplevel, first_map_path);	162	op->contr->maplevel = first_map_path;
166	op->x = -1;	163	op->x = -1;
167	op->y = -1;	164	op->y = -1;
		165	}
		166
		167	void
		168	player::enter_map ()
		169	{
		170	object *tmp = object::create ();
		171
		172	EXIT_PATH (tmp) = maplevel;
		173	EXIT_X (tmp) = ob->x;
		174	EXIT_Y (tmp) = ob->y;
168	enter_exit (op, 0);	175	ob->enter_exit (tmp);
		176
		177	tmp->destroy ();
		178	}
		179
		180	void
		181	player::activate ()
		182	{
		183	if (active)
		184	return;
		185
		186	players.insert (this);
		187	ob->remove ();
		188	ob->map = 0;
		189	ob->activate_recursive ();
		190	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		191	add_friendly_object (ob);
		192	enter_map ();
		193	}
		194
		195	void
		196	player::deactivate ()
		197	{
		198	if (!active)
		199	return;
		200
		201	terminate_all_pets (ob);
		202	remove_friendly_object (ob);
		203	ob->deactivate_recursive ();
		204
		205	if (ob->map)
		206	maplevel = ob->map->path;
		207
		208	ob->remove ();
		209	ob->map = 0;
		210	party = 0;
		211
		212	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		213
		214	players.erase (this);
169	}	215	}
170		216
171	// connect the player with a specific client	217	// connect the player with a specific client
172	// also changed, rationalises, and fixes some incorrect settings	218	// also changes, rationalises, and fixes some incorrect settings
173	void	219	void
174	player::connect (client *ns)	220	player::connect (client *ns)
175	{	221	{
176	this->ns = ns;	222	this->ns = ns;
177	ns->pl = this;	223	ns->pl = this;
178		224
179	next = first_player;	225	run_on = 0;
180	first_player = this;	226	fire_on = 0;
		227	ob->close_container (); //TODO: client-specific
181		228
182	ns->update_look = 0;	229	ns->update_look = 0;
183	ns->look_position = 0;	230	ns->look_position = 0;
184		231
185	clear_los (ob);	232	clear_los (ob);
		233
		234	ns->reset_stats ();
186		235
187	/* make sure he's a player -- needed because of class change. */	236	/* make sure he's a player -- needed because of class change. */
188	ob->type = PLAYER; // we are paranoid	237	ob->type = PLAYER; // we are paranoid
189	ob->race = ob->arch->clone.race;	238	ob->race = ob->arch->clone.race;
190		239
191	if (!legal_range (ob, shoottype))
192	shoottype = range_none;
193
194	ob->carrying = sum_weight (ob);	240	ob->carrying = sum_weight (ob);
195	link_player_skills (ob);	241	link_player_skills (ob);
196		242
197	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	243	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
198	update_ob_speed (ob);
199		244
200	assign (title, ob->arch->clone.name);	245	assign (title, ob->arch->clone.name);
201
202	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
203	* from the class, and not race. I don't see any way to get the class information
204	* to then update this. I don't think this will actually break anything - anyone
205	* that can use armour should be able to use a shield. What this may 'break'
206	* are features new characters get, eg, if someone starts up with a Q, they
207	* should be able to use a shield. However, old Q's won't get that advantage.
208	*/
209	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
210	SET_FLAG (ob, FLAG_USE_SHIELD);
211		246
212	/* if it's a dragon player, set the correct title here */	247	/* if it's a dragon player, set the correct title here */
213	if (is_dragon_pl (ob))	248	if (is_dragon_pl (ob))
214	{	249	{
215	object *tmp, *abil = 0, *skin = 0;	250	object *tmp, *abil = 0, *skin = 0;
…		…
225	skin = tmp;	260	skin = tmp;
226		261
227	set_dragon_name (ob, abil, skin);	262	set_dragon_name (ob, abil, skin);
228	}	263	}
229		264
230	CLEAR_FLAG (ob, FLAG_FRIENDLY);
231	add_friendly_object (ob);
232
233	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
234
235	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	265	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
236	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
237		266
238	esrv_new_player (this, ob->weight + ob->carrying);	267	esrv_new_player (this, ob->weight + ob->carrying);
239		268
		269	ob->flag [FLAG_READY_WEAPON] = false;
		270	ob->flag [FLAG_READY_SKILL] = false;
		271	ob->flag [FLAG_READY_BOW] = false;
		272
		273	for (object *op = ob->inv; op; op = op->below)
		274	if (op->flag [FLAG_APPLIED])
		275	switch (op->type)
		276	{
		277	case WAND:
		278	case ROD:
		279	case HORN:
		280	case BOW:
		281	case SKILL_TOOL:
		282	case WEAPON:
		283	op->flag [FLAG_APPLIED] = false;
		284	apply_special (ob, op, AP_APPLY);
		285	break;
		286
		287	case SKILL:
		288	op->flag [FLAG_APPLIED] = false;
		289	break;
		290	}
		291
		292	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
240	ob->update_stats ();	293	ob->update_stats ();
		294
241	ns->floorbox_update ();	295	ns->floorbox_update ();
242
243	esrv_send_inventory (ob, ob);	296	esrv_send_inventory (ob, ob);
244	esrv_add_spells (this, 0);	297	esrv_add_spells (this, 0);
245		298
246	enter_exit (ob, 0);	299	activate ();
247		300
248	send_rules (ob);	301	send_rules (ob);
249	send_news (ob);	302	send_news (ob);
250	display_motd (ob);	303	display_motd (ob);
		304
		305	INVOKE_PLAYER (CONNECT, this);
251	INVOKE_PLAYER (LOGIN, this);	306	INVOKE_PLAYER (LOGIN, this);
		307	}
		308
		309	void
		310	player::disconnect ()
		311	{
		312	if (ns)
		313	{
		314	if (active)
		315	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		316
		317	INVOKE_PLAYER (DISCONNECT, this);
		318
		319	ns->reset_stats ();
		320	ns->pl = 0;
		321	ns = 0;
		322	}
		323
		324	if (ob)
		325	ob->close_container (); //TODO: client-specific
		326
		327	deactivate ();
252	}	328	}
253		329
254	// the need for this function can be explained	330	// the need for this function can be explained
255	// by load_object not returning the object	331	// by load_object not returning the object
256	void	332	void
257	player::set_object (object *op)	333	player::set_object (object *op)
258	{	334	{
259	ob = op;	335	ob = op;
260	ob->contr = this; /* this aren't yet in archetype */	336	ob->contr = this; /* this aren't yet in archetype */
261		337
262	ob->speed_left = 0.5;	338	ob->speed_left = 0.5f;
263	ob->speed = 1.0;	339	ob->speed = 1.0f;
264	ob->direction = 5; /* So player faces south */	340	ob->direction = 5; /* So player faces south */
265	ob->stats.wc = 2;
266	ob->run_away = 25; /* Then we panick... */
267
268	set_first_map (ob);
269
270	ob->roll_stats ();
271	}	341	}
272		342
273	player::player ()	343	player::player ()
274	{	344	{
275	/* There are some elements we want initialized to non zero value -	345	/* There are some elements we want initialised to non zero value -
276	* we deal with that below this point.	346	* we deal with that below this point.
277	*/	347	*/
278	outputs_sync = 16; /* Every 2 seconds */	348	outputs_sync = 4;
279	outputs_count = 8; /* Keeps present behaviour */	349	outputs_count = 4;
280	unapply = unapply_nochoice;	350	unapply = unapply_nochoice;
281		351
282	assign (savebed_map, first_map_path); /* Init. respawn position */	352	savebed_map = first_map_path; /* Init. respawn position */
283		353
284	gen_sp_armour = 10;	354	gen_sp_armour = 10;
285	last_speed = -1;
286	shoottype = range_none;
287	bowtype = bow_normal;	355	bowtype = bow_normal;
288	petmode = pet_normal;	356	petmode = pet_normal;
289	listening = 10;	357	listening = 10;
290	usekeys = containers;	358	usekeys = containers;
291	last_weapon_sp = -1;
292	peaceful = 1; /* default peaceful */	359	peaceful = 1; /* default peaceful */
293	do_los = 1;	360	do_los = 1;
		361	}
294		362
295	/* we need to clear these to -1 and not zero - otherwise,	363	void
296	* if a player quits and starts a new character, we wont	364	player::do_destroy ()
297	* send new values to the client, as things like exp start	365	{
298	* at zero.	366	disconnect ();
299	*/
300	for (int i = 0; i < NUM_SKILLS; i++)
301	last_skill_exp[i] = -1;
302		367
303	for (int i = 0; i < NROFATTACKS; i++)	368	attachable::do_destroy ();
304	last_resist[i] = -1;
305		369
306	last_stats.exp = -1;	370	if (ob)
307	last_weight = (uint32) - 1;	371	{
		372	ob->destroy_inv (false);
		373	ob->destroy ();
		374	}
308	}	375	}
309		376
310	player::~player ()	377	player::~player ()
311	{	378	{
312	terminate_all_pets (ob);
313
314	if (first_player != this)
315	{
316	player *prev = first_player;
317
318	while (prev && prev->next && prev->next != this)
319	prev = prev->next;
320
321	if (prev->next != this)
322	{
323	LOG (llevError, "Free_player: Can't find previous player.\n");
324	abort ();
325	}
326
327	prev->next = next;
328	}
329	else
330	first_player = next;
331
332	if (ob)
333	{
334	ob->contr = 0;
335	ob->destroy (1);
336	}
337
338	if (ns)
339	{
340	ns->send_packet ("goodbye");
341	ns->flush ();
342	ns->pl = 0;
343	ns->destroy ();
344	}
345
346	/* Clear item stack */	379	/* Clear item stack */
347	free (stack_items);	380	free (stack_items);
348	}	381	}
349		382
350	/* Tries to add player on the connection passed in ns.	383	/* Tries to add player on the connection passed in ns.
…		…
355	player::create ()	388	player::create ()
356	{	389	{
357	player *pl = new player;	390	player *pl = new player;
358		391
359	pl->set_object (arch_to_object (get_player_archetype (0)));	392	pl->set_object (arch_to_object (get_player_archetype (0)));
		393
		394	pl->ob->roll_stats ();
		395	pl->ob->stats.wc = 2;
		396	pl->ob->run_away = 25; /* Then we panick... */
		397
		398	set_first_map (pl->ob);
360		399
361	return pl;	400	return pl;
362	}	401	}
363		402
364	/*	403	/*
…		…
391		430
392	object *	431	object *
393	get_nearest_player (object *mon)	432	get_nearest_player (object *mon)
394	{	433	{
395	object *op = NULL;	434	object *op = NULL;
396	player *pl = NULL;
397	objectlink *ol;	435	objectlink *ol;
398	unsigned lastdist;	436	unsigned lastdist;
399	rv_vector rv;	437	rv_vector rv;
400		438
401	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
402	{	440	{
403	/* We should not find free objects on this friendly list, but it	441	/* We should not find free objects on this friendly list, but it
404	* does periodically happen. Given that, lets deal with it.	442	* does periodically happen. Given that, lets deal with it.
405	* While unlikely, it is possible the next object on the friendly	443	* While unlikely, it is possible the next object on the friendly
406	* list is also free, so encapsulate this in a while loop.	444	* list is also free, so encapsulate this in a while loop.
…		…
410	object *tmp = ol->ob;	448	object *tmp = ol->ob;
411		449
412	/* Can't do much more other than log the fact, because the object	450	/* Can't do much more other than log the fact, because the object
413	* itself will have been cleared.	451	* itself will have been cleared.
414	*/	452	*/
415	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	453	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		454	tmp->debug_desc ());
416	ol = ol->next;	455	ol = ol->next;
417	remove_friendly_object (tmp);	456	remove_friendly_object (tmp);
418	if (!ol)	457	if (!ol)
419	return op;	458	return op;
420	}	459	}
…		…
433	{	472	{
434	op = ol->ob;	473	op = ol->ob;
435	lastdist = rv.distance;	474	lastdist = rv.distance;
436	}	475	}
437	}	476	}
438	for (pl = first_player; pl != NULL; pl = pl->next)	477
439	{	478	for_all_players (pl)
440	if (can_detect_enemy (mon, pl->ob, &rv))	479	if (can_detect_enemy (mon, pl->ob, &rv))
441	{
442
443	if (lastdist > rv.distance)	480	if (lastdist > rv.distance)
444	{	481	{
445	op = pl->ob;	482	op = pl->ob;
446	lastdist = rv.distance;	483	lastdist = rv.distance;
447	}	484	}
448	}	485
449	}
450	#if 0	486	#if 0
451	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	487	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
452	#endif	488	#endif
453	return op;	489	return op;
454	}	490	}
…		…
512	x = mon->x;	548	x = mon->x;
513	y = mon->y;	549	y = mon->y;
514	m = mon->map;	550	m = mon->map;
515	dir = rv.direction;	551	dir = rv.direction;
516	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	552	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
517	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	553	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		554
518	/* If we can't solve it within the search distance, return now. */	555	/* If we can't solve it within the search distance, return now. */
519	if (diff > max)	556	if (diff > max)
520	return 0;	557	return 0;
		558
521	while (diff > 1 && max > 0)	559	while (diff > 1 && max > 0)
522	{	560	{
523	lastx = x;	561	lastx = x;
524	lasty = y;	562	lasty = y;
525	lastmap = m;	563	lastmap = m;
…		…
607	max--;	645	max--;
608	lastdir = dir;	646	lastdir = dir;
609	if (!firstdir)	647	if (!firstdir)
610	firstdir = dir;	648	firstdir = dir;
611	}	649	}
		650
612	if (diff <= 1)	651	if (diff <= 1)
613	{	652	{
614	/* Recalculate diff (distance) because we may not have actually	653	/* Recalculate diff (distance) because we may not have actually
615	* headed toward player for entire distance.	654	* headed toward player for entire distance.
616	*/	655	*/
617	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	656	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
618	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	657	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
619	}	658	}
		659
620	if (diff > max)	660	if (diff > max)
621	return 0;	661	return 0;
622	}	662	}
		663
623	/* If we reached the max, didn't find a direction in time */	664	/* If we reached the max, didn't find a direction in time */
624	if (!max)	665	if (!max)
625	return 0;	666	return 0;
626		667
627	return firstdir;	668	return firstdir;
…		…
741	roll_stat (void)	782	roll_stat (void)
742	{	783	{
743	int a[4], i, j, k;	784	int a[4], i, j, k;
744		785
745	for (i = 0; i < 4; i++)	786	for (i = 0; i < 4; i++)
746	a[i] = (int) RANDOM () % 6 + 1;	787	a[i] = (int) rndm (6) + 1;
747		788
748	for (i = 0, j = 0, k = 7; i < 4; i++)	789	for (i = 0, j = 0, k = 7; i < 4; i++)
749	if (a[i] < k)	790	if (a[i] < k)
750	k = a[i], j = i;	791	k = a[i], j = i;
751		792
…		…
757	}	798	}
758		799
759	void	800	void
760	object::roll_stats ()	801	object::roll_stats ()
761	{	802	{
762	int statsort [7];	803	int statsort [NUM_STATS];
763		804
764	for (;;)	805	for (;;)
765	{	806	{
766	int sum = 0;	807	int sum = 0;
767	for (int i = 7; i--; )	808	for (int i = NUM_STATS; i--; )
768	sum += statsort [i] = roll_stat ();	809	sum += statsort [i] = roll_stat ();
769		810
770	if (sum >= 82 && sum <= 116)	811	if (sum >= 82 && sum <= 116)
771	break;	812	break;
772	}	813	}
773		814
774	// Sort the stats so that rerolling is easier...	815	// Sort the stats so that rerolling is easier...
775	std::sort (statsort, statsort + 7, std::greater<int>());	816	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
776		817
		818	for (int i = 0; i < NUM_STATS; ++i)
777	stats.Str = statsort[0];	819	stats.stat (i) = statsort [i];
778	stats.Dex = statsort[1];
779	stats.Con = statsort[2];
780	stats.Int = statsort[3];
781	stats.Wis = statsort[4];
782	stats.Pow = statsort[5];
783	stats.Cha = statsort[6];
784		820
785	stats.exp = 0;	821	stats.exp = 0;
786	stats.ac = 0;	822	stats.ac = 0;
787		823
788	stats.hp = stats.maxhp;	824	stats.hp = stats.maxhp;
…		…
800	}	836	}
801		837
802	void	838	void
803	object::swap_stats (int a, int b)	839	object::swap_stats (int a, int b)
804	{	840	{
805	int tmp = get_attr_value (&contr->orig_stats, a);	841	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
806	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
807	set_attr_value (&contr->orig_stats, b, tmp);
808		842
		843	for (int i = 0; i < NUM_STATS; ++i)
809	stats.Str = contr->orig_stats.Str;	844	stats.stat (i) = contr->orig_stats.stat (i);
810	stats.Dex = contr->orig_stats.Dex;
811	stats.Con = contr->orig_stats.Con;
812	stats.Int = contr->orig_stats.Int;
813	stats.Wis = contr->orig_stats.Wis;
814	stats.Pow = contr->orig_stats.Pow;
815	stats.Cha = contr->orig_stats.Cha;
816		845
817	//TODO: the following code looks so borked and should, at the very least,	846	//TODO: the following code looks so borked and should, at the very least,
818	// be merged with the similar code in roll_stats	847	// be merged with the similar code in roll_stats
819	stats.ac = 0;	848	stats.ac = 0;
820		849
…		…
832	contr->levsp[1] = 6;	861	contr->levsp[1] = 6;
833	contr->levgrace[1] = 3;	862	contr->levgrace[1] = 3;
834		863
835	contr->orig_stats = stats;	864	contr->orig_stats = stats;
836	}	865	}
		866	}
		867
		868	static void
		869	start_info (object *op)
		870	{
		871	char buf[MAX_BUF];
		872
		873	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		874	new_draw_info (NDI_UNIQUE, 0, op, buf);
		875	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		876	//new_draw_info (NDI_UNIQUE, 0, op, " ");
837	}	877	}
838		878
839	/* This function takes the key that is passed, and does the	879	/* This function takes the key that is passed, and does the
840	* appropriate action with it (change race, or other things).	880	* appropriate action with it (change race, or other things).
841	* The function name is for historical reasons - now we have	881	* The function name is for historical reasons - now we have
842	* separate race and class; this actually changes the RACE,	882	* separate race and class; this actually changes the RACE,
843	* not the class.	883	* not the class.
844	*/	884	*/
845	int	885	void
846	key_change_class (object *op, char key)	886	player::chargen_race_done ()
847	{	887	{
848	int tmp_loop;
849
850	if (key == 'd' || key == 'D')
851	{
852	char buf[MAX_BUF];
853
854	/* this must before then initial items are given */	888	/* this must before then initial items are given */
855	esrv_new_player (op->contr, op->weight + op->carrying);	889	esrv_new_player (ob->contr, ob->weight + ob->carrying);
856		890
857	treasurelist *tl = find_treasurelist ("starting_wealth");	891	treasurelist *tl = treasurelist::find ("starting_wealth");
858	if (tl)	892	if (tl)
859	create_treasure (tl, op, 0, 0, 0);	893	create_treasure (tl, ob, 0, 0, 0);
860		894
861	INVOKE_PLAYER (BIRTH, op->contr);	895	INVOKE_PLAYER (BIRTH, ob->contr);
862	INVOKE_PLAYER (LOGIN, op->contr);	896	INVOKE_PLAYER (LOGIN, ob->contr);
863		897
864	op->contr->ns->state = ST_PLAYING;	898	ob->contr->ns->state = ST_PLAYING;
865		899
866	if (op->msg)	900	if (ob->msg)
867	op->msg = NULL;	901	ob->msg = 0;
868		902
869	/* We create this now because some of the unique maps will need it	903	/* We create this now because some of the unique maps will need it
870	* to save here.	904	* to save here.
871	*/	905	*/
		906	{
		907	char buf[MAX_BUF];
872	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	908	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
873	make_path_to_file (buf);	909	make_path_to_file (buf);
		910	}
874		911
875	#ifdef AUTOSAVE
876	op->contr->last_save_tick = pticks;
877	#endif
878	start_info (op);	912	start_info (ob);
879	CLEAR_FLAG (op, FLAG_WIZ);	913	CLEAR_FLAG (ob, FLAG_WIZ);
880	give_initial_items (op, op->randomitems);	914	give_initial_items (ob, ob->randomitems);
881	link_player_skills (op);	915	link_player_skills (ob);
882	esrv_send_inventory (op, op);	916	esrv_send_inventory (ob, ob);
883	op->update_stats ();	917	ob->update_stats ();
884		918
885	/* This moves the player to a different start map, if there	919	/* This moves the player to a different start map, if there
886	* is one for this race	920	* is one for this race
887	*/	921	*/
888	if (*first_map_ext_path)	922	if (*first_map_ext_path)
889	{	923	{
890	object *tmp;	924	object *tmp;
891	char mapname[MAX_BUF];	925	char mapname[MAX_BUF];
892		926
893	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	927	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
894	tmp = object::create ();	928	tmp = object::create ();
895	EXIT_PATH (tmp) = mapname;	929	EXIT_PATH (tmp) = mapname;
896	EXIT_X (tmp) = op->x;	930	EXIT_X (tmp) = ob->x;
897	EXIT_Y (tmp) = op->y;	931	EXIT_Y (tmp) = ob->y;
898	enter_exit (op, tmp); /* we don't really care if it succeeded;	932	ob->enter_exit (tmp); /* we don't really care if it succeeded;
899	* if the map isn't there, then stay on the	933	* if the map isn't there, then stay on the
900	* default initial map */	934	* default initial map */
901	tmp->destroy ();	935	tmp->destroy ();
902	}	936	}
903	else	937	else
904	LOG (llevDebug, "first_map_ext_path not set\n");	938	LOG (llevDebug, "first_map_ext_path not set\n");
		939	}
905		940
906	return 0;	941	void
907	}	942	player::chargen_race_next ()
908		943	{
909	/* Following actually changes the race - this is the default command	944	/* Following actually changes the race - this is the default command
910	* if we don't match with one of the options above.	945	* if we don't match with one of the options above.
911	*/	946	*/
912		947
913	tmp_loop = 0;	948	do
914	while (!tmp_loop)
915	{	949	{
916	shstr name = op->name;	950	shstr name = ob->name;
917	int x = op->x, y = op->y;	951	int x = ob->x, y = ob->y;
918		952
919	op->remove_statbonus ();	953	ob->remove_statbonus ();
920	op->remove ();	954	ob->remove ();
921	op->arch = get_player_archetype (op->arch);	955	ob->arch = get_player_archetype (ob->arch);
922	op->arch->clone.copy_to (op);	956	ob->arch->clone.copy_to (ob);
923	op->instantiate ();	957	ob->instantiate ();
924	op->stats = op->contr->orig_stats;	958	ob->stats = ob->contr->orig_stats;
925	op->name = op->name_pl = name;	959	ob->name = ob->name_pl = name;
926	op->x = x;	960	ob->x = x;
927	op->y = y;	961	ob->y = y;
928	SET_ANIMATION (op, 2); /* So player faces south */	962	SET_ANIMATION (ob, 2); /* So player faces south */
929	insert_ob_in_map (op, op->map, op, 0);	963	insert_ob_in_map (ob, ob->map, ob, 0);
930	assign (op->contr->title, op->arch->clone.name);	964	assign (ob->contr->title, ob->arch->clone.name);
931	op->add_statbonus ();	965	ob->add_statbonus ();
932	tmp_loop = allowed_class (op);
933	}	966	}
		967	while (!allowed_class (ob));
934		968
935	update_object (op, UP_OBJ_FACE);	969	update_object (ob, UP_OBJ_FACE);
936	esrv_update_item (UPD_FACE, op, op);	970	esrv_update_item (UPD_FACE, ob, ob);
937	op->update_stats ();	971	ob->update_stats ();
938	op->stats.hp = op->stats.maxhp;	972	ob->stats.hp = ob->stats.maxhp;
939	op->stats.sp = op->stats.maxsp;	973	ob->stats.sp = ob->stats.maxsp;
940	op->stats.grace = 0;	974	ob->stats.grace = 0;
941
942	if (op->msg)
943	new_draw_info (NDI_BLUE, 0, op, op->msg);
944
945	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
946	return 0;
947	}
948
949	int
950	key_confirm_quit (object *op, char key)
951	{
952	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
953	{
954	op->contr->ns->state = ST_PLAYING;
955	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
956	return 1;
957	}
958
959	INVOKE_PLAYER (LOGOUT, op->contr);
960	INVOKE_PLAYER (QUIT, op->contr);
961
962	terminate_all_pets (op);
963	leave_map (op);
964	op->direction = 0;
965	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
966
967	strcpy (op->contr->killer, "quit");
968	check_score (op);
969	op->contr->party = 0;
970	op->contr->own_title[0] = '\0';
971
972	object_ptr ob = op;
973
974	delete ob->contr;
975
976	/* We need to hunt for any per player unique maps in memory and
977	* get rid of them. The trailing slash in the path is intentional,
978	* so that players named 'Ab' won't match against players 'Abe' pathname
979	*/
980	char buf[MAX_BUF];
981	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
982
983	for (maptile *next, *mp = first_map; mp; mp = next)
984	{
985	next = mp->next;
986
987	if (!strncmp (mp->path, buf, strlen (buf)))
988	delete_map (mp);
989	}
990
991	delete_character (ob->name, 1);
992
993	return 1;
994	}	975	}
995		976
996	void	977	void
997	flee_player (object *op)	978	flee_player (object *op)
998	{	979	{
…		…
1045	/* Cornered, get rid of scared */	1026	/* Cornered, get rid of scared */
1046	CLEAR_FLAG (op, FLAG_SCARED);	1027	CLEAR_FLAG (op, FLAG_SCARED);
1047	op->enemy = NULL;	1028	op->enemy = NULL;
1048	}	1029	}
1049		1030
1050
1051	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1031	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1052	* IT returns 1 if the player should keep on moving, 0 if he should	1032	* It returns 1 if the player should keep on moving, 0 if he should
1053	* stop.	1033	* stop.
1054	*/	1034	*/
1055	int	1035	int
1056	check_pick (object *op)	1036	check_pick (object *op)
1057	{	1037	{
1058	object *tmp, *next;	1038	object *tmp, *next;
1059	int stop = 0;	1039	int stop = 0;
1060	int j, k, wvratio;	1040	int wvratio;
1061	char putstring[128], tmpstr[16];	1041	char putstring[128];
1062		1042
1063	/* if you're flying, you cna't pick up anything */	1043	/* if you're flying, you cna't pick up anything */
1064	if (op->move_type & MOVE_FLYING)	1044	if (op->move_type & MOVE_FLYING)
1065	return 1;	1045	return 1;
1066		1046
…		…
1403	* found object is returned.	1383	* found object is returned.
1404	*/	1384	*/
1405	object *	1385	object *
1406	find_arrow (object *op, const char *type)	1386	find_arrow (object *op, const char *type)
1407	{	1387	{
1408	object *tmp = NULL;	1388	object *tmp = 0;
1409		1389
1410	for (op = op->inv; op; op = op->below)	1390	for (op = op->inv; op; op = op->below)
1411	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1391	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1412	tmp = find_arrow (op, type);	1392	tmp = find_arrow (op, type);
1413	else if (op->type == ARROW && op->race == type)	1393	else if (op->type == ARROW && op->race == type)
1414	return op;	1394	return op;
		1395
1415	return tmp;	1396	return tmp;
1416	}	1397	}
1417		1398
1418	/*	1399	/*
1419	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1400	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1420	* against the target. A full test is not performed, simply a basic test	1401	* against the target. A full test is not performed, simply a basic test
1421	* of resistances. The archer is making a quick guess at what he sees down	1402	* of resistances. The archer is making a quick guess at what he sees down
1422	* the hall. Failing that it does it's best to pick the highest plus arrow.	1403	* the hall. Failing that it does it's best to pick the highest plus arrow.
1423	*/	1404	*/
1424
1425	object *	1405	object *
1426	find_better_arrow (object *op, object *target, const char *type, int *better)	1406	find_better_arrow (object *op, object *target, const char *type, int *better)
1427	{	1407	{
1428	object *tmp = NULL, *arrow, *ntmp;	1408	object *tmp = NULL, *arrow, *ntmp;
1429	int attacknum, attacktype, betterby = 0, i;	1409	int attacknum, attacktype, betterby = 0, i;
…		…
1495	* find_better_arrow to find a decent arrow to use.	1475	* find_better_arrow to find a decent arrow to use.
1496	* op = the shooter	1476	* op = the shooter
1497	* type = bow->race	1477	* type = bow->race
1498	* dir = fire direction	1478	* dir = fire direction
1499	*/	1479	*/
1500
1501	object *	1480	object *
1502	pick_arrow_target (object *op, const char *type, int dir)	1481	pick_arrow_target (object *op, const char *type, int dir)
1503	{	1482	{
1504	object *tmp = NULL;	1483	object *tmp = NULL;
1505	maptile *m;	1484	maptile *m;
…		…
1570	*/	1549	*/
1571	int	1550	int
1572	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1551	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1573	{	1552	{
1574	object *left, *bow;	1553	object *left, *bow;
1575	int bowspeed, mflags;	1554	int mflags;
1576	maptile *m;	1555	maptile *m;
1577		1556
1578	if (!dir)	1557	if (!dir)
1579	{	1558	{
1580	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1559	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1581	return 0;	1560	return 0;
1582	}	1561	}
1583		1562
1584	if (op->type == PLAYER)	1563	if (op->contr)
1585	bow = op->contr->ranges[range_bow];	1564	bow = op->current_weapon;
1586	else	1565	else
1587	{	1566	{
1588	for (bow = op->inv; bow; bow = bow->below)	1567	for (bow = op->inv; bow; bow = bow->below)
1589	/* Don't check for applied - monsters don't apply bows - in that way, they	1568	/* Don't check for applied - monsters don't apply bows - in that way, they
1590	* don't need to switch back and forth between bows and weapons.	1569	* don't need to switch back and forth between bows and weapons.
…		…
1595	if (!bow)	1574	if (!bow)
1596	{	1575	{
1597	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1576	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1598	return 0;	1577	return 0;
1599	}	1578	}
		1579
		1580	// optimisation: move object to top so we will find it quickly again
		1581	if (bow->below)
		1582	{
		1583	bow->remove ();
		1584	op->insert (bow);
		1585	}
		1586
1600	}	1587	}
1601		1588
1602	if (!bow->race || !bow->skill)	1589	if (!bow->race || !bow->skill)
1603	{	1590	{
1604	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1591	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1605	return 0;	1592	return 0;
1606	}	1593	}
1607
1608	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1609
1610	/* penalize ROF for bestarrow */
1611	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1612	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1613
1614	if (bowspeed < 1)
1615	bowspeed = 1;
1616		1594
1617	if (arrow == NULL)	1595	if (arrow == NULL)
1618	{	1596	{
1619	if ((arrow = find_arrow (op, bow->race)) == NULL)	1597	if ((arrow = find_arrow (op, bow->race)) == NULL)
1620	{	1598	{
1621	if (op->type == PLAYER)	1599	if (op->type == PLAYER)
1622	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1600	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1623	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1601	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1624	else	1602	else
1625	CLEAR_FLAG (op, FLAG_READY_BOW);	1603	CLEAR_FLAG (op, FLAG_READY_BOW);
		1604
1626	return 0;	1605	return 0;
1627	}	1606	}
1628	}	1607	}
1629		1608
1630	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1609	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1652	return 0;	1631	return 0;
1653	}	1632	}
1654		1633
1655	arrow->set_owner (op);	1634	arrow->set_owner (op);
1656	arrow->skill = bow->skill;	1635	arrow->skill = bow->skill;
1657
1658	arrow->direction = dir;	1636	arrow->direction = dir;
1659	arrow->x = sx;	1637
1660	arrow->y = sy;	1638	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1639	arrow->stats.hp = arrow->stats.dam;
		1640	arrow->stats.grace = arrow->attacktype;
		1641
		1642	if (arrow->slaying)
		1643	arrow->spellarg = strdup (arrow->slaying);
		1644
		1645	if (player *pl = op->contr)
		1646	{
		1647	if (!pl->has_hit)
		1648	{
		1649	pl->has_hit = 1;
		1650	pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
		1651	}
		1652	#if 0
		1653	float speed = pl->weapon_sp;
		1654
		1655	/* penalize ROF for bestarrow */
		1656	if (pl->bowtype == bow_bestarrow)
		1657	speed *= .9f;
		1658	else
		1659	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1660
		1661	op->speed_left += speed - op->speed;
		1662	#endif
		1663	}
		1664
		1665	SET_ANIMATION (arrow, arrow->direction);
		1666
		1667	/* update the speed */
		1668	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1669	+ bow->stats.dam / 7.0;
		1670
		1671	arrow->set_speed (max (arrow->speed, 2.0));
		1672	arrow->speed_left = 0;
		1673
		1674	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661		1675
1662	if (op->type == PLAYER)	1676	if (op->type == PLAYER)
1663	{	1677	{
1664	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1665	op->update_stats ();
1666	}
1667
1668	SET_ANIMATION (arrow, arrow->direction);
1669	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1670	arrow->stats.hp = arrow->stats.dam;
1671	arrow->stats.grace = arrow->attacktype;
1672	if (arrow->slaying != NULL)
1673	arrow->spellarg = strdup (arrow->slaying);
1674
1675	/* Note that this was different for monsters - they got their level
1676	* added to the damage. I think the strength bonus is more proper.
1677	*/
1678
1679	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1680
1681	/* update the speed */
1682	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1683	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1684
1685	if (arrow->speed < 1.0)
1686	arrow->speed = 1.0;
1687	update_ob_speed (arrow);
1688	arrow->speed_left = 0;
1689
1690	if (op->type == PLAYER)
1691	{
1692	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1693	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1694	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1695
1696	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1678	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1679	wc -= dex_bonus[op->stats.Dex];
		1680
		1681	if (!arrow->slaying)
		1682	arrow->slaying = op->slaying;
		1683
		1684	arrow->attacktype |= op->attacktype;
1697	}	1685	}
1698	else	1686	else
1699	{	1687	{
1700	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1701	arrow->level = op->level;	1688	arrow->level = op->level;
1702	}	1689	arrow->stats.wc -= bow->magic;
1703		1690
1704	if (arrow->attacktype == AT_PHYSICAL)	1691	if (!arrow->slaying)
		1692	arrow->slaying = bow->slaying;
		1693
1705	arrow->attacktype |= bow->attacktype;	1694	arrow->attacktype |= bow->attacktype;
		1695	}
1706		1696
1707	if (bow->slaying)	1697	wc -= arrow->level;
1708	arrow->slaying = bow->slaying;	1698	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1709		1699
1710	arrow->map = m;	1700	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1711	arrow->move_type = MOVE_FLY_LOW;	1701	arrow->move_type = MOVE_FLY_LOW;
1712	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1702	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1713		1703
1714	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1704	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1715	insert_ob_in_map (arrow, m, op, 0);	1705	m->insert (arrow, sx, sy, op);
1716		1706
1717	if (!arrow->destroyed ())	1707	if (!arrow->destroyed ())
1718	move_arrow (arrow);	1708	move_arrow (arrow);
1719		1709
1720	if (op->type == PLAYER)	1710	if (op->type == PLAYER)
…		…
1740	{	1730	{
1741	int ret = 0, wcmod = 0;	1731	int ret = 0, wcmod = 0;
1742		1732
1743	if (op->contr->bowtype == bow_bestarrow)	1733	if (op->contr->bowtype == bow_bestarrow)
1744	{	1734	{
1745	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1735	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1746	}	1736	}
1747	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1737	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1748	{	1738	{
1749	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1739	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1750	wcmod = -1;	1740	wcmod = -1;
		1741
1751	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1742	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1752	}	1743	}
1753	else if (op->contr->bowtype == bow_threewide)	1744	else if (op->contr->bowtype == bow_threewide)
1754	{	1745	{
1755	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1746	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1759	else if (op->contr->bowtype == bow_spreadshot)	1750	else if (op->contr->bowtype == bow_spreadshot)
1760	{	1751	{
1761	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1752	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1762	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1753	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1763	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1754	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1764
1765	}	1755	}
1766	else	1756	else
1767	{	1757	{
1768	/* Simple case */	1758	/* Simple case */
1769	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1759	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1770	}	1760	}
		1761
1771	return ret;	1762	return ret;
1772	}	1763	}
1773
1774		1764
1775	/* Fires a misc (wand/rod/horn) object in 'dir'.	1765	/* Fires a misc (wand/rod/horn) object in 'dir'.
1776	* Broken apart from 'fire' to keep it more readable.	1766	* Broken apart from 'fire' to keep it more readable.
1777	*/	1767	*/
1778	void	1768	void
1779	fire_misc_object (object *op, int dir)	1769	fire_misc_object (object *op, int dir)
1780	{	1770	{
1781	object *item;	1771	object *item = op->contr->ranged_ob;
1782		1772
1783	if (!op->contr->ranges[range_misc])	1773	if (!item)
1784	{	1774	{
1785	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1775	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1786	return;	1776	return;
1787	}	1777	}
1788		1778
1789	item = op->contr->ranges[range_misc];
1790	if (!item->inv)	1779	if (!item->inv)
1791	{	1780	{
1792	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1781	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1793	return;	1782	return;
1794	}	1783	}
		1784
		1785	if (!op->change_weapon (item))
		1786	return;
		1787
1795	if (item->type == WAND)	1788	if (item->type == WAND)
1796	{	1789	{
1797	if (item->stats.food <= 0)	1790	if (item->stats.food <= 0)
1798	{	1791	{
1799	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1792	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1800	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1793	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1794
1801	return;	1795	return;
1802	}	1796	}
1803	}	1797	}
1804	else if (item->type == ROD || item->type == HORN)	1798	else if (item->type == ROD || item->type == HORN)
1805	{	1799	{
1806	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1800	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1807	{	1801	{
1808	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1802	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1803
1809	if (item->type == ROD)	1804	if (item->type == ROD)
1810	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1805	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1811	else	1806	else
1812	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1807	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1808
1813	return;	1809	return;
1814	}	1810	}
1815	}	1811	}
1816		1812
1817	if (cast_spell (op, item, dir, item->inv, NULL))	1813	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1825		1821
1826	if (item->arch)	1822	if (item->arch)
1827	{	1823	{
1828	CLEAR_FLAG (item, FLAG_ANIMATE);	1824	CLEAR_FLAG (item, FLAG_ANIMATE);
1829	item->face = item->arch->clone.face;	1825	item->face = item->arch->clone.face;
1830	item->speed = 0;	1826	item->set_speed (0);
1831	update_ob_speed (item);
1832	}	1827	}
		1828
1833	if ((tmp = item->in_player ()))	1829	if ((tmp = item->in_player ()))
1834	esrv_update_item (UPD_ANIM, tmp, item);	1830	esrv_update_item (UPD_ANIM, tmp, item);
1835	}	1831	}
1836	}	1832	}
1837	else if (item->type == ROD || item->type == HORN)	1833	else if (item->type == ROD || item->type == HORN)
1838	{
1839	drain_rod_charge (item);	1834	drain_rod_charge (item);
1840	}
1841	}	1835	}
1842	}	1836	}
1843		1837
1844	/* Received a fire command for the player - go and do it.	1838	/* Received a fire command for the player - go and do it.
1845	*/	1839	*/
…		…
1850		1844
1851	/* check for loss of invisiblity/hide */	1845	/* check for loss of invisiblity/hide */
1852	if (action_makes_visible (op))	1846	if (action_makes_visible (op))
1853	make_visible (op);	1847	make_visible (op);
1854		1848
1855	switch (op->contr->shoottype)	1849	player *pl = op->contr;
		1850
		1851	if (pl->golem)
1856	{	1852	{
1857	case range_none:	1853	control_golem (op->contr->golem, dir);
1858	return;	1854	return;
		1855	}
1859		1856
1860	case range_bow:	1857	object *ob = pl->ranged_ob;
		1858
		1859	if (!ob)
		1860	return;
		1861
		1862	if (!op->change_weapon (ob))
		1863	return;
		1864
		1865	switch (ob->type)
		1866	{
		1867	case BOW:
1861	player_fire_bow (op, dir);	1868	player_fire_bow (op, dir);
1862	return;	1869	break;
1863		1870
1864	case range_magic: /* Casting spells */	1871	case SPELL:
1865	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1872	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1866	return;	1873	break;
1867		1874
1868	case range_misc:	1875	case BUILDER:
		1876	apply_map_builder (op, dir);
		1877	break;
		1878
		1879	case SKILL:
		1880	do_skill (op, op, ob, dir, 0);
		1881	break;
		1882
		1883	default:
1869	fire_misc_object (op, dir);	1884	fire_misc_object (op, dir);
1870	return;	1885	break;
1871
1872	case range_golem: /* Control summoned monsters from scrolls */
1873	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1874	{
1875	op->contr->ranges[range_golem] = 0;
1876	op->contr->shoottype = range_none;
1877	}
1878	else
1879	control_golem (op->contr->ranges[range_golem], dir);
1880	return;
1881
1882	case range_skill:
1883	if (!op->chosen_skill)
1884	{
1885	if (op->type == PLAYER)
1886	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1887	return;
1888	}
1889	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1890	return;
1891	case range_builder:
1892	apply_map_builder (op, dir);
1893	return;
1894	default:
1895	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1896	return;
1897	}	1886	}
1898	}	1887	}
1899
1900
1901		1888
1902	/* find_key	1889	/* find_key
1903	* We try to find a key for the door as passed. If we find a key	1890	* We try to find a key for the door as passed. If we find a key
1904	* and successfully use it, we return the key, otherwise NULL	1891	* and successfully use it, we return the key, otherwise NULL
1905	* This function merges both normal and locked door, since the logic	1892	* This function merges both normal and locked door, since the logic
…		…
1907	* pl is the player,	1894	* pl is the player,
1908	* inv is the objects inventory to searched	1895	* inv is the objects inventory to searched
1909	* door is the door we are trying to match against.	1896	* door is the door we are trying to match against.
1910	* This function can be called recursively to search containers.	1897	* This function can be called recursively to search containers.
1911	*/	1898	*/
1912
1913	object *	1899	object *
1914	find_key (object *pl, object *container, object *door)	1900	find_key (object *pl, object *container, object *door)
1915	{	1901	{
1916	object *tmp, *key;	1902	object *tmp, *key;
1917		1903
1918	/* Should not happen, but sanity checking is never bad */	1904	/* Should not happen, but sanity checking is never bad */
1919	if (container->inv == NULL)	1905	if (!container->inv)
1920	return NULL;	1906	return 0;
1921		1907
1922	/* First, lets try to find a key in the top level inventory */	1908	/* First, lets try to find a key in the top level inventory */
1923	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1909	for (tmp = container->inv; tmp; tmp = tmp->below)
1924	{	1910	{
1925	if (door->type == DOOR && tmp->type == KEY)	1911	if (door->type == DOOR && tmp->type == KEY)
1926	break;	1912	break;
1927	/* For sanity, we should really check door type, but other stuff	1913	/* For sanity, we should really check door type, but other stuff
1928	* (like containers) can be locked with special keys	1914	* (like containers) can be locked with special keys
1929	*/	1915	*/
1930	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1916	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1931	break;	1917	break;
1932	}	1918	}
		1919
1933	/* No key found - lets search inventories now */	1920	/* No key found - lets search inventories now */
1934	/* If we find and use a key in an inventory, return at that time.	1921	/* If we find and use a key in an inventory, return at that time.
1935	* otherwise, if we search all the inventories and still don't find	1922	* otherwise, if we search all the inventories and still don't find
1936	* a key, return	1923	* a key, return
1937	*/	1924	*/
1938	if (!tmp)	1925	if (!tmp)
1939	{	1926	{
1940	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1927	for (tmp = container->inv; tmp; tmp = tmp->below)
1941	{	1928	{
1942	/* No reason to search empty containers */	1929	/* No reason to search empty containers */
1943	if (tmp->type == CONTAINER && tmp->inv)	1930	if (tmp->type == CONTAINER && tmp->inv)
1944	{	1931	{
1945	if ((key = find_key (pl, tmp, door)) != NULL)	1932	if ((key = find_key (pl, tmp, door)))
1946	return key;	1933	return key;
1947	}	1934	}
1948	}	1935	}
		1936
1949	if (!tmp)	1937	if (!tmp)
1950	return NULL;	1938	return NULL;
1951	}	1939	}
		1940
1952	/* We get down here if we have found a key. Now if its in a container,	1941	/* We get down here if we have found a key. Now if its in a container,
1953	* see if we actually want to use it	1942	* see if we actually want to use it
1954	*/	1943	*/
1955	if (pl != container)	1944	if (pl != container)
1956	{	1945	{
…		…
1977	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1966	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1978	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1967	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1979	return NULL;	1968	return NULL;
1980	}	1969	}
1981	}	1970	}
		1971
1982	return tmp;	1972	return tmp;
1983	}	1973	}
1984		1974
1985	/* moved door processing out of move_player_attack.	1975	/* moved door processing out of move_player_attack.
1986	* returns 1 if player has opened the door with a key	1976	* returns 1 if player has opened the door with a key
…		…
2000	if (key)	1990	if (key)
2001	{	1991	{
2002	object *container = key->env;	1992	object *container = key->env;
2003		1993
2004	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1994	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1995
2005	if (action_makes_visible (op))	1996	if (action_makes_visible (op))
2006	make_visible (op);	1997	make_visible (op);
		1998
2007	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1999	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2008	spring_trap (door->inv, op);	2000	spring_trap (door->inv, op);
		2001
2009	if (door->type == DOOR)	2002	if (door->type == DOOR)
2010	{
2011	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	2003	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2012	}
2013	else if (door->type == LOCKED_DOOR)	2004	else if (door->type == LOCKED_DOOR)
2014	{	2005	{
2015	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2006	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2016	remove_door2 (door); /* remove door without violence ;-) */	2007	remove_door2 (door); /* remove door without violence ;-) */
2017	}	2008	}
		2009
2018	/* Do this after we print the message */	2010	/* Do this after we print the message */
2019	decrease_ob (key); /* Use up one of the keys */	2011	decrease_ob (key); /* Use up one of the keys */
2020	/* Need to update the weight the container the key was in */	2012	/* Need to update the weight the container the key was in */
2021	if (container != op)	2013	if (container != op)
2022	esrv_update_item (UPD_WEIGHT, op, container);	2014	esrv_update_item (UPD_WEIGHT, op, container);
		2015
2023	return 1; /* Nothing more to do below */	2016	return 1; /* Nothing more to do below */
2024	}	2017	}
2025	else if (door->type == LOCKED_DOOR)	2018	else if (door->type == LOCKED_DOOR)
2026	{	2019	{
2027	/* Might as well return now - no other way to open this */	2020	/* Might as well return now - no other way to open this */
2028	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2021	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2029	return 1;	2022	return 1;
2030	}	2023	}
		2024
2031	return 0;	2025	return 0;
2032	}	2026	}
2033		2027
2034	/* This function is just part of a breakup from move_player.	2028	/* This function is just part of a breakup from move_player.
2035	* It should keep the code cleaner.	2029	* It should keep the code cleaner.
…		…
2039	*/	2033	*/
2040	void	2034	void
2041	move_player_attack (object *op, int dir)	2035	move_player_attack (object *op, int dir)
2042	{	2036	{
2043	object *tmp, *mon;	2037	object *tmp, *mon;
2044	sint16 nx, ny;
2045	int on_battleground;	2038	int on_battleground;
2046	maptile *m;	2039	maptile *m;
2047		2040
2048	nx = freearr_x[dir] + op->x;	2041	sint16 nx = freearr_x[dir] + op->x;
2049	ny = freearr_y[dir] + op->y;	2042	sint16 ny = freearr_y[dir] + op->y;
2050		2043
2051	on_battleground = op_on_battleground (op, 0, 0);	2044	on_battleground = op_on_battleground (op, 0, 0);
2052		2045
2053	/* If braced, or can't move to the square, and it is not out of the	2046	/* If braced, or can't move to the square, and it is not out of the
2054	* map, attack it. Note order of if statement is important - don't	2047	* map, attack it. Note order of if statement is important - don't
…		…
2061	*/	2054	*/
2062	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2055	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2063	{	2056	{
2064	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2057	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2065	{	2058	{
2066	m = get_map_from_coord (op->map, &nx, &ny);	2059	m = op->map->xy_find (nx, ny);
2067	if (!m)	2060	if (!m)
2068	return; /* Don't think this should happen */	2061	return; /* Don't think this should happen */
2069	}	2062	}
2070	else	2063	else
2071	m = op->map;	2064	m = op->map;
2072		2065
2073	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2066	if (!(tmp = m->at (nx, ny).bot))
2074	{
2075	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2076	return;	2067	return;
2077	}
2078		2068
2079	mon = 0;	2069	mon = 0;
2080	/* Go through all the objects, and find ones of interest. Only stop if	2070	/* Go through all the objects, and find ones of interest. Only stop if
2081	* we find a monster - that is something we know we want to attack.	2071	* we find a monster - that is something we know we want to attack.
2082	* if its a door or barrel (can roll) see if there may be monsters	2072	* if its a door or barrel (can roll) see if there may be monsters
…		…
2122		2112
2123	/* If the creature is a pet, push it even if the player is not	2113	/* If the creature is a pet, push it even if the player is not
2124	* peaceful. Our assumption is the creature is a pet if the	2114	* peaceful. Our assumption is the creature is a pet if the
2125	* player owns it and it is either friendly or unagressive.	2115	* player owns it and it is either friendly or unagressive.
2126	*/	2116	*/
2127	if ((op->type == PLAYER)	2117	if (op->type == PLAYER
2128	#if COZY_SERVER
2129	&&
2130	((mon->owner && mon->owner->contr	2118	&& ((mon->owner && mon->owner->contr
2131	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2119	&& same_party (mon->owner->contr->party, op->contr->party))
2132	#else
2133	&& mon->owner == op	2120	|| mon->owner == op)
2134	#endif
2135	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2121	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2136	{	2122	{
2137	/* If we're braced, we don't want to switch places with it */	2123	/* If we're braced, we don't want to switch places with it */
2138	if (op->contr->braced)	2124	if (op->contr->braced)
2139	return;	2125	return;
		2126
2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2127	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141	(void) push_ob (mon, dir, op);	2128	push_ob (mon, dir, op);
2142	if (op->contr->tmp_invis || op->hide)	2129	if (op->contr->tmp_invis || op->hide)
2143	make_visible (op);	2130	make_visible (op);
		2131
2144	return;	2132	return;
2145	}	2133	}
2146		2134
2147	/* in certain circumstances, you shouldn't attack friendly	2135	/* in certain circumstances, you shouldn't attack friendly
2148	* creatures. Note that if you are braced, you can't push	2136	* creatures. Note that if you are braced, you can't push
2149	* someone, but put it inside this loop so that you won't	2137	* someone, but put it inside this loop so that you won't
2150	* attack them either.	2138	* attack them either.
2151	*/	2139	*/
2152	if ((mon->type == PLAYER || mon->enemy != op) &&	2140	if ((mon->type == PLAYER || mon->enemy != op)
2153	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2141	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2154	#ifdef PROHIBIT_PLAYERKILL
2155	(op->contr->peaceful	2142	&& ((op->contr->peaceful
2156	|| (mon->type == PLAYER	2143	|| (mon->type == PLAYER && mon->contr->peaceful))
2157	&& mon->contr->
2158	peaceful)) &&
2159	#else
2160	op->contr->peaceful &&
2161	#endif
2162	!on_battleground))	2144	&& !on_battleground))
2163	{	2145	{
2164	if (!op->contr->braced)	2146	if (!op->contr->braced)
2165	{	2147	{
2166	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2148	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2167	(void) push_ob (mon, dir, op);	2149	push_ob (mon, dir, op);
2168	}	2150	}
2169	else	2151	else
2170	new_draw_info (0, 0, op, "You withhold your attack");	2152	new_draw_info (0, 0, op, "You withhold your attack");
2171		2153
2172	if (op->contr->tmp_invis || op->hide)	2154	if (op->contr->tmp_invis || op->hide)
…		…
2187	* Way it works is like this: First, it must have some hit points	2169	* Way it works is like this: First, it must have some hit points
2188	* and be living. Then, it must be one of the following:	2170	* and be living. Then, it must be one of the following:
2189	* 1) Not a player, 2) A player, but of a different party. Note	2171	* 1) Not a player, 2) A player, but of a different party. Note
2190	* that party_number -1 is no party, so attacks can still happen.	2172	* that party_number -1 is no party, so attacks can still happen.
2191	*/	2173	*/
2192
2193	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2174	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2194	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2175	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2195	{	2176	{
2196
2197	/* If the player hasn't hit something this tick, and does
2198	* so, give them speed boost based on weapon speed. Doing
2199	* it here is better than process_players2, which basically
2200	* incurred a 1 tick offset.
2201	*/
2202	if (!op->contr->has_hit)	2177	if (!op->contr->has_hit)
2203	{	2178	{
		2179	op->contr->has_hit = 1;
2204	op->speed_left += op->speed / op->contr->weapon_sp;	2180	op->speed_left += op->contr->weapon_speed () - op->speed;
2205
2206	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2207	}	2181	}
2208		2182
2209	skill_attack (mon, op, 0, 0, 0);	2183	skill_attack (mon, op, 0, 0, 0);
2210		2184
2211	/* If attacking another player, that player gets automatic	2185	/* If attacking another player, that player gets automatic
…		…
2231	int	2205	int
2232	move_player (object *op, int dir)	2206	move_player (object *op, int dir)
2233	{	2207	{
2234	int pick;	2208	int pick;
2235		2209
2236	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2210	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2237	return 0;	2211	return 0;
2238		2212
2239	/* Sanity check: make sure dir is valid */	2213	/* Sanity check: make sure dir is valid */
2240	if ((dir < 0) || (dir >= 9))	2214	if ((dir < 0) || (dir >= 9))
2241	{	2215	{
2242	LOG (llevError, "move_player: invalid direction %d\n", dir);	2216	LOG (llevError, "move_player: invalid direction %d\n", dir);
2243	return 0;	2217	return 0;
2244	}	2218	}
2245		2219
2246	/* peterm: added following line */	2220	/* peterm: added following line */
2247	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2221	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2248	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2222	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2249		2223
2250	op->facing = dir;	2224	op->facing = dir;
2251		2225
2252	if (op->hide)	2226	if (op->hide)
2253	do_hidden_move (op);	2227	do_hidden_move (op);
…		…
2286	* Returns true if there are more actions we can do.	2260	* Returns true if there are more actions we can do.
2287	*/	2261	*/
2288	int	2262	int
2289	handle_newcs_player (object *op)	2263	handle_newcs_player (object *op)
2290	{	2264	{
2291	if (op->contr->hidden)
2292	{
2293	op->invisible = 1000;
2294	/* the socket code flashes the player visible/invisible
2295	* depending on the value of invisible, so we need to
2296	* alternate it here for it to work correctly.
2297	*/
2298	if (pticks & 2)
2299	op->invisible--;
2300	}
2301	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2302	{
2303	op->invisible--;
2304	if (!op->invisible)
2305	{
2306	make_visible (op);
2307	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2308	}
2309	}
2310
2311	if (QUERY_FLAG (op, FLAG_SCARED))	2265	if (QUERY_FLAG (op, FLAG_SCARED))
2312	{	2266	{
2313	flee_player (op);	2267	flee_player (op);
		2268
2314	/* If player is still scared, that is his action for this tick */	2269	/* If player is still scared, that is his action for this tick */
2315	if (QUERY_FLAG (op, FLAG_SCARED))	2270	if (op->flag [FLAG_SCARED])
2316	{	2271	{
2317	op->speed_left--;	2272	--op->speed_left;
2318	return 0;	2273	return 0;
2319	}	2274	}
2320	}	2275	}
2321
2322	/* I've been seeing crashes where the golem has been destroyed, but
2323	* the player object still points to the defunct golem. The code that
2324	* destroys the golem looks correct, and it doesn't always happen, so
2325	* put this in a a workaround to clean up the golem pointer.
2326	*/
2327	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2328	op->contr->ranges[range_golem] = 0;
2329		2276
2330	/* call this here - we also will call this in do_ericserver, but	2277	/* call this here - we also will call this in do_ericserver, but
2331	* the players time has been increased when doericserver has been	2278	* the players time has been increased when doericserver has been
2332	* called, so we recheck it here.	2279	* called, so we recheck it here.
2333	*/	2280	*/
2334	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2281	if (op->contr->ns->handle_command ())
2335	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2336	;
2337
2338	if (op->speed_left < 0)
2339	return 0;	2282	return 1;
2340		2283
		2284	if (op->speed_left > 0.f)
		2285	{
2341	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2286	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2342	{	2287	{
2343	/* All move commands take 1 tick, at least for now */	2288	/* All move commands take 1 tick, at least for now */
2344	op->speed_left--;	2289	--op->speed_left;
2345		2290
2346	/* Instead of all the stuff below, let move_player take care	2291	/* Instead of all the stuff below, let move_player take care
2347	* of it. Also, some of the skill stuff is only put in	2292	* of it. Also, some of the skill stuff is only put in
2348	* there, as well as the confusion stuff.	2293	* there, as well as the confusion stuff.
2349	*/	2294	*/
2350	move_player (op, op->direction);	2295	move_player (op, op->direction);
2351	if (op->speed_left > 0)	2296
2352	return 1;	2297	return op->speed_left > 0.f;
2353	else	2298	}
2354	return 0;
2355	}	2299	}
2356		2300
2357	return 0;	2301	return 0;
2358	}	2302	}
2359		2303
…		…
2397	* from.	2341	* from.
2398	*/	2342	*/
2399	void	2343	void
2400	remove_unpaid_objects (object *op, object *env)	2344	remove_unpaid_objects (object *op, object *env)
2401	{	2345	{
2402	object *next;
2403
2404	while (op)	2346	while (op)
2405	{	2347	{
2406	next = op->below; /* Make sure we have a good value, in case	2348	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2407	* we remove object 'op'	2349
2408	*/
2409	if (QUERY_FLAG (op, FLAG_UNPAID))	2350	if (QUERY_FLAG (op, FLAG_UNPAID))
2410	{	2351	{
2411	op->remove ();
2412	op->x = env->x;
2413	op->y = env->y;
2414	if (env->type == PLAYER)	2352	if (env->type == PLAYER)
2415	esrv_del_item (env->contr, op->count);	2353	esrv_del_item (env->contr, op->count);
2416	insert_ob_in_map (op, env->map, NULL, 0);	2354
		2355	op->insert_at (env);
2417	}	2356	}
2418	else if (op->inv)	2357	else if (op->inv)
2419	remove_unpaid_objects (op->inv, env);	2358	remove_unpaid_objects (op->inv, env);
2420		2359
2421	op = next;	2360	op = next;
…		…
2477	int rate_grace = 2000;	2416	int rate_grace = 2000;
2478	const int max_hp = 1;	2417	const int max_hp = 1;
2479	const int max_sp = 1;	2418	const int max_sp = 1;
2480	const int max_grace = 1;	2419	const int max_grace = 1;
2481		2420
2482	if (op->contr->outputs_sync)	2421	if (op->contr->hidden)
		2422	{
		2423	op->invisible = 1000;
		2424	/* the socket code flashes the player visible/invisible
		2425	* depending on the value of invisible, so we need to
		2426	* alternate it here for it to work correctly.
		2427	*/
		2428	if (pticks & 2)
		2429	op->invisible--;
2483	{	2430	}
2484	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2431	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2485	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2432	{
2486	flush_output_element (op, &op->contr->outputs[i]);	2433	if (!op->invisible--)
		2434	{
		2435	make_visible (op);
		2436	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2437	}
2487	}	2438	}
2488		2439
2489	if (op->contr->ns->state == ST_PLAYING)	2440	if (op->contr->ns->state == ST_PLAYING)
2490	{	2441	{
2491	/* these next three if clauses make it possible to SLOW DOWN	2442	/* these next three if clauses make it possible to SLOW DOWN
…		…
2513	gen_grace = op->stats.maxgrace;	2464	gen_grace = op->stats.maxgrace;
2514	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2465	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2515	}	2466	}
2516		2467
2517	/* Regenerate Spell Points */	2468	/* Regenerate Spell Points */
2518	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2469	if (!op->contr->golem && --op->last_sp < 0)
2519	{	2470	{
2520	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2471	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2521	if (op->stats.sp < op->stats.maxsp)	2472	if (op->stats.sp < op->stats.maxsp)
2522	{	2473	{
2523	op->stats.sp++;	2474	op->stats.sp++;
…		…
2621	}	2572	}
2622		2573
2623	/* Digestion */	2574	/* Digestion */
2624	if (--op->last_eat < 0)	2575	if (--op->last_eat < 0)
2625	{	2576	{
2626	#ifdef COZY_SERVER
2627	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2628	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2629	#else
2630	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2577	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2631	#endif
2632		2578
2633	if (op->contr->gen_hp > 0)	2579	if (op->contr->gen_hp > 0)
2634	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2580	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2635	else	2581	else
2636	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2582	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2714	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2660	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2715	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2661	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2716		2662
2717	/* restore player */	2663	/* restore player */
2718	at = archetype::find ("poisoning");	2664	at = archetype::find ("poisoning");
2719	tmp = present_arch_in_ob (at, op);	2665	if (object *tmp = present_arch_in_ob (at, op))
2720	if (tmp)
2721	{	2666	{
2722	tmp->destroy ();	2667	tmp->destroy ();
2723	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2668	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2724	}	2669	}
2725		2670
2726	at = archetype::find ("confusion");	2671	at = archetype::find ("confusion");
2727	tmp = present_arch_in_ob (at, op);	2672	if (object *tmp = present_arch_in_ob (at, op))
2728	if (tmp)
2729	{	2673	{
2730	tmp->destroy ();	2674	tmp->destroy ();
2731	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2675	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2732	}	2676	}
2733		2677
…		…
2735	op->stats.hp = op->stats.maxhp;	2679	op->stats.hp = op->stats.maxhp;
2736	if (op->stats.food <= 0)	2680	if (op->stats.food <= 0)
2737	op->stats.food = 999;	2681	op->stats.food = 999;
2738		2682
2739	/* create a bodypart-trophy to make the winner happy */	2683	/* create a bodypart-trophy to make the winner happy */
2740	tmp = arch_to_object (archetype::find ("finger"));	2684	if (object *tmp = arch_to_object (archetype::find ("finger")))
2741	if (tmp != NULL)
2742	{	2685	{
2743	sprintf (buf, "%s's finger", &op->name);	2686	sprintf (buf, "%s's finger", &op->name);
2744	tmp->name = buf;	2687	tmp->name = buf;
2745	sprintf (buf, " This finger has been cut off %s\n"	2688	sprintf (buf, " This finger has been cut off %s\n"
2746	" the %s, when he was defeated at\n level %d by %s.\n",	2689	" the %s, when he was defeated at\n level %d by %s.\n",
2747	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2690	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2748	tmp->msg = buf;	2691	tmp->msg = buf;
2749	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2692	tmp->value = 0, tmp->type = 0;
2750	tmp->materialname = NULL;	2693	tmp->materialname = "organics";
2751	tmp->x = op->x, tmp->y = op->y;	2694	tmp->insert_at (op, tmp);
2752	insert_ob_in_map (tmp, op->map, op, 0);
2753	}	2695	}
2754		2696
2755	/* teleport defeated player to new destination */	2697	/* teleport defeated player to new destination */
2756	transfer_ob (op, x, y, 0, NULL);	2698	transfer_ob (op, x, y, 0, NULL);
2757	op->contr->braced = 0;	2699	op->contr->braced = 0;
…		…
2762		2704
2763	command_kill_pets (op, 0);	2705	command_kill_pets (op, 0);
2764		2706
2765	if (op->stats.food < 0)	2707	if (op->stats.food < 0)
2766	{	2708	{
2767	if (op->contr->explore)
2768	{
2769	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2770	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2771	op->stats.food = 999;
2772	return;
2773	}
2774	sprintf (buf, "%s starved to death.", &op->name);	2709	sprintf (buf, "%s starved to death.", &op->name);
2775	strcpy (op->contr->killer, "starvation");	2710	strcpy (op->contr->killer, "starvation");
2776	}	2711	}
2777	else	2712	else
2778	{
2779	if (op->contr->explore)
2780	{
2781	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2782	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783	op->stats.hp = op->stats.maxhp;
2784	return;
2785	}
2786	sprintf (buf, "%s died.", &op->name);	2713	sprintf (buf, "%s died.", &op->name);
2787	}	2714
2788	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2715	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2789		2716
2790	/* save the map location for corpse, gravestone */	2717	/* save the map location for corpse, gravestone */
2791	x = op->x;	2718	x = op->x;
2792	y = op->y;	2719	y = op->y;
2793	map = op->map;	2720	map = op->map;
2794
2795		2721
2796	/* NOT_PERMADEATH code. This basically brings the character back to	2722	/* NOT_PERMADEATH code. This basically brings the character back to
2797	* life if they are dead - it takes some exp and a random stat.	2723	* life if they are dead - it takes some exp and a random stat.
2798	* See the config.h file for a little more in depth detail about this.	2724	* See the config.h file for a little more in depth detail about this.
2799	*/	2725	*/
…		…
2816	num_stats_lose = 1;	2742	num_stats_lose = 1;
2817	else	2743	else
2818	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2744	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2819	}	2745	}
2820	else	2746	else
2821	{
2822	num_stats_lose = 1;	2747	num_stats_lose = 1;
2823	}	2748
2824	lost_a_stat = 0;	2749	lost_a_stat = 0;
2825		2750
2826	for (z = 0; z < num_stats_lose; z++)	2751	for (z = 0; z < num_stats_lose; z++)
2827	{	2752	{
2828	i = RANDOM () % NUM_STATS;	2753	i = RANDOM () % NUM_STATS;
…		…
2969	op->stats.hp = op->stats.maxhp;	2894	op->stats.hp = op->stats.maxhp;
2970	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2895	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2971	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2896	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2972		2897
2973	/*	2898	/*
2974	* Check to see if the player is in a shop. IF so, then check to see if
2975	* the player has any unpaid items. If so, remove them and put them back	2899	* Check to see if the player has any unpaid items. If so, remove them
2976	* in the map.	2900	* and put them back in the map.
2977	*/	2901	*/
2978
2979	if (is_in_shop (op))
2980	remove_unpaid_objects (op->inv, op);	2902	remove_unpaid_objects (op->inv, op);
2981		2903
2982	/****************************************/	2904	/****************************************/
2983	/* */	2905	/* */
2984	/* Move player to his current respawn- */	2906	/* Move player to his current respawn- */
2985	/* position (usually last savebed) */	2907	/* position (usually last savebed) */
2986	/* */	2908	/* */
2987	/****************************************/	2909	/****************************************/
2988		2910
2989	enter_player_savebed (op);	2911	enter_player_savebed (op);
2990		2912
2991	/* Save the player before inserting the force to reduce
2992	* chance of abuse.
2993	*/
2994	op->contr->braced = 0;	2913	op->contr->braced = 0;
2995	op->contr->save ();
2996		2914
2997	/* it is possible that the player has blown something up	2915	/* it is possible that the player has blown something up
2998	* at his savebed location, and that can have long lasting	2916	* at his savebed location, and that can have long lasting
2999	* spell effects. So first see if there is a spell effect	2917	* spell effects. So first see if there is a spell effect
3000	* on the space that might harm the player.	2918	* on the space that might harm the player.
…		…
3009	object *force;	2927	object *force;
3010	int at;	2928	int at;
3011		2929
3012	force = get_archetype (FORCE_NAME);	2930	force = get_archetype (FORCE_NAME);
3013	/* 50 ticks should be enough time for the spell to abate */	2931	/* 50 ticks should be enough time for the spell to abate */
3014	force->speed = 0.1;	2932	force->speed = 0.1f;
3015	force->speed_left = -5.0;	2933	force->speed_left = -5.f;
3016	SET_FLAG (force, FLAG_APPLIED);	2934	SET_FLAG (force, FLAG_APPLIED);
3017	for (at = 0; at < NROFATTACKS; at++)	2935	for (at = 0; at < NROFATTACKS; at++)
3018	if (will_kill_again & (1 << at))	2936	if (will_kill_again & (1 << at))
3019	force->resist[at] = 100;	2937	force->resist[at] = 100;
3020		2938
…		…
3029	void	2947	void
3030	loot_object (object *op)	2948	loot_object (object *op)
3031	{ /* Grab and destroy some treasure */	2949	{ /* Grab and destroy some treasure */
3032	object *tmp, *tmp2, *next;	2950	object *tmp, *tmp2, *next;
3033		2951
3034	if (op->container)	2952	op->close_container (); /* close open sack first */
3035	esrv_apply_container (op, op->container); /* close open sack first */
3036		2953
3037	for (tmp = op->inv; tmp; tmp = next)	2954	for (tmp = op->inv; tmp; tmp = next)
3038	{	2955	{
3039	next = tmp->below;	2956	next = tmp->below;
3040		2957
3041	if (tmp->invisible)	2958	if (tmp->invisible)
3042	continue;	2959	continue;
3043		2960
3044	tmp->remove ();	2961	tmp->remove ();
3045	tmp->x = op->x, tmp->y = op->y;	2962	tmp->x = op->x, tmp->y = op->y;
		2963
3046	if (tmp->type == CONTAINER)	2964	if (tmp->type == CONTAINER)
3047	{ /* empty container to ground */	2965	loot_object (tmp); /* empty container to ground */
3048	loot_object (tmp);	2966
3049	}
3050	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2967	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3051	{	2968	{
3052	if (tmp->nrof > 1)	2969	if (tmp->nrof > 1)
3053	{	2970	{
3054	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2971	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3055	tmp2->destroy ();	2972	tmp2->destroy ();
…		…
3066	/*	2983	/*
3067	* fix_weight(): Check recursively the weight of all players, and fix	2984	* fix_weight(): Check recursively the weight of all players, and fix
3068	* what needs to be fixed. Refresh windows and fix speed if anything	2985	* what needs to be fixed. Refresh windows and fix speed if anything
3069	* was changed.	2986	* was changed.
3070	*/	2987	*/
3071
3072	void	2988	void
3073	fix_weight (void)	2989	fix_weight (void)
3074	{	2990	{
3075	for (player *pl = first_player; pl; pl = pl->next)	2991	for_all_players (pl)
3076	{	2992	{
3077	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2993	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3078		2994
3079	if (old == sum)	2995	if (old == sum)
3080	continue;	2996	continue;
…		…
3084	}	3000	}
3085		3001
3086	void	3002	void
3087	fix_luck (void)	3003	fix_luck (void)
3088	{	3004	{
3089	for (player *pl = first_player; pl; pl = pl->next)	3005	for_all_players (pl)
3090	if (!pl->ob->contr->ns->state)	3006	if (!pl->ob->contr->ns->state)
3091	pl->ob->change_luck (0);	3007	pl->ob->change_luck (0);
3092	}	3008	}
3093		3009
3094	/* cast_dust() - handles op throwing objects of type 'DUST'.	3010	/* cast_dust() - handles op throwing objects of type 'DUST'.
…		…
3136	if (op->type == PLAYER)	3052	if (op->type == PLAYER)
3137	{	3053	{
3138	op->contr->tmp_invis = 0;	3054	op->contr->tmp_invis = 0;
3139	op->contr->invis_race = 0;	3055	op->contr->invis_race = 0;
3140	}	3056	}
		3057
3141	update_object (op, UP_OBJ_FACE);	3058	update_object (op, UP_OBJ_CHANGE);
3142	}	3059	}
3143		3060
3144	int	3061	int
3145	is_true_undead (object *op)	3062	is_true_undead (object *op)
3146	{	3063	{
3147	object *tmp = NULL;
3148
3149	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3064	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3150	return 1;	3065	return 1;
3151		3066
3152	return 0;	3067	return 0;
3153	}	3068	}
…		…
3212		3127
3213	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3128	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3214		3129
3215	/* its *extremely* hard to run and sneak/hide at the same time! */	3130	/* its *extremely* hard to run and sneak/hide at the same time! */
3216	if (op->type == PLAYER && op->contr->run_on)	3131	if (op->type == PLAYER && op->contr->run_on)
3217	{
3218	if (!skop || num >= skop->level)	3132	if (!skop || num >= skop->level)
3219	{	3133	{
3220	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3134	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3221	make_visible (op);	3135	make_visible (op);
3222	return;	3136	return;
3223	}	3137	}
3224	else	3138	else
3225	num += 20;	3139	num += 20;
3226	}	3140
3227	num += op->map->difficulty;	3141	num += op->map->difficulty;
3228	hide = hideability (op); /* modify by terrain hidden level */	3142	hide = hideability (op); /* modify by terrain hidden level */
3229	num -= hide;	3143	num -= hide;
		3144
3230	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3145	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3231	{	3146	{
3232	make_visible (op);	3147	make_visible (op);
3233	if (op->type == PLAYER)	3148	if (op->type == PLAYER)
3234	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3149	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3235	}	3150	}
3236	else if (op->type == PLAYER && skop)	3151	else if (op->type == PLAYER && skop)
3237	{
3238	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3152	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3239	}
3240	}	3153	}
3241		3154
3242	/* determine if who is standing near a hostile creature. */	3155	/* determine if who is standing near a hostile creature. */
3243		3156
3244	int	3157	int
…		…
3311	if (pl->type != PLAYER)	3224	if (pl->type != PLAYER)
3312	{	3225	{
3313	LOG (llevError, "player_can_view() called for non-player object\n");	3226	LOG (llevError, "player_can_view() called for non-player object\n");
3314	return -1;	3227	return -1;
3315	}	3228	}
		3229
3316	if (!pl || !op)	3230	if (!pl || !op)
3317	return 0;	3231	return 0;
3318		3232
3319	if (op->head)
3320	{
3321	op = op->head;	3233	op = op->head_ ();
3322	}	3234
3323	get_rangevector (pl, op, &rv, 0x1);	3235	get_rangevector (pl, op, &rv, 0x1);
3324		3236
3325	/* starting with the 'head' part, lets loop	3237	/* starting with the 'head' part, lets loop
3326	* through the object and find if it has any	3238	* through the object and find if it has any
3327	* part that is in the los array but isnt on	3239	* part that is in the los array but isnt on
…		…
3444	char buf[MAX_BUF]; /* tmp. string buffer */	3356	char buf[MAX_BUF]; /* tmp. string buffer */
3445	int i = 0, j = 0;	3357	int i = 0, j = 0;
3446		3358
3447	/* get the appropriate treasurelist */	3359	/* get the appropriate treasurelist */
3448	if (atnr == ATNR_FIRE)	3360	if (atnr == ATNR_FIRE)
3449	trlist = find_treasurelist ("dragon_ability_fire");	3361	trlist = treasurelist::find ("dragon_ability_fire");
3450	else if (atnr == ATNR_COLD)	3362	else if (atnr == ATNR_COLD)
3451	trlist = find_treasurelist ("dragon_ability_cold");	3363	trlist = treasurelist::find ("dragon_ability_cold");
3452	else if (atnr == ATNR_ELECTRICITY)	3364	else if (atnr == ATNR_ELECTRICITY)
3453	trlist = find_treasurelist ("dragon_ability_elec");	3365	trlist = treasurelist::find ("dragon_ability_elec");
3454	else if (atnr == ATNR_POISON)	3366	else if (atnr == ATNR_POISON)
3455	trlist = find_treasurelist ("dragon_ability_poison");	3367	trlist = treasurelist::find ("dragon_ability_poison");
3456		3368
3457	if (trlist == NULL || who->type != PLAYER)	3369	if (trlist == NULL || who->type != PLAYER)
3458	return;	3370	return;
3459		3371
3460	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3372	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3461		3373
3462	if (tr == NULL || tr->item == NULL)	3374	if (!tr || !tr->item)
3463	{	3375	{
3464	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3376	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3465	return;	3377	return;
3466	}	3378	}
3467		3379
…		…
3592	* not readied.	3504	* not readied.
3593	*/	3505	*/
3594	void	3506	void
3595	player_unready_range_ob (player *pl, object *ob)	3507	player_unready_range_ob (player *pl, object *ob)
3596	{	3508	{
3597	rangetype i;	3509	if (pl->ob->current_weapon == ob)
		3510	pl->ob->current_weapon = 0;
3598		3511
3599	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3512	if (pl->combat_ob == ob)
3600	{	3513	pl->combat_ob = 0;
		3514
3601	if (pl->ranges[i] == ob)	3515	if (pl->ranged_ob == ob)
3602	{	3516	pl->ranged_ob = 0;
3603	pl->ranges[i] = NULL;
3604	if (pl->shoottype == i)
3605	{
3606	pl->shoottype = range_none;
3607	}
3608	}
3609	}
3610	}	3517	}
		3518
		3519	sint8
		3520	player::visibility_at (maptile *map, int x, int y) const
		3521	{
		3522	if (!ns)
		3523	return 0;
		3524
		3525	int dx, dy;
		3526	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3527	return 0;
		3528
		3529	x += dx - ns->current_x + ns->mapx / 2;
		3530	y += dy - ns->current_y + ns->mapy / 2;
		3531
		3532	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3533	return 0;
		3534
		3535	return 100 - blocked_los [x][y];
		3536	}

Diff Legend

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