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