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.82 by elmex, Wed Jan 3 02:30:52 2007 UTC vs.
Revision 1.123 by root, Fri May 11 21:07:14 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	for_all_players (pl)
40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
41	return pl;
42
43	return 0;
44	}
45		37
46	void	38	void
47	display_motd (const object *op)	39	display_motd (const object *op)
48	{	40	{
49	char buf[MAX_BUF];	41	char buf[MAX_BUF];
…		…
123		115
124	news[0] = '\0';	116	news[0] = '\0';
125	subject[0] = '\0';	117	subject[0] = '\0';
126	size = 0;	118	size = 0;
127		119
128	while (fgets (buf, MAX_BUF, fp) != NULL)	120	while (fgets (buf, MAX_BUF, fp))
129	{	121	{
130	if (*buf == '#')	122	if (*buf == '#')
131	continue;	123	continue;
132		124
133	if (*buf == '%')	125	if (*buf == '%')
134	{ /* send one news */	126	{ /* send one news */
135	if (size > 0)	127	if (size > 0)
136	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */	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
137	strcpy (subject, buf + 1);	130	strcpy (subject, buf + 1);
138	strip_endline (subject);	131	strip_endline (subject);
139	size = 0;	132	size = 0;
140	news[0] = '\0';	133	news[0] = '\0';
141	}	134	}
…		…
150	size += strlen (buf);	143	size += strlen (buf);
151	}	144	}
152	}	145	}
153		146
154	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	147	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	148	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156	close_and_delete (fp, comp);	149	close_and_delete (fp, comp);
157	}	150	}
158		151
159	/* This loads the first map an puts the player on it. */	152	/* This loads the first map an puts the player on it. */
160	static void	153	static void
…		…
176	ob->enter_exit (tmp);	169	ob->enter_exit (tmp);
177		170
178	tmp->destroy ();	171	tmp->destroy ();
179	}	172	}
180		173
		174	void
		175	player::activate ()
		176	{
		177	if (active)
		178	return;
		179
		180	players.insert (this);
		181	ob->remove ();
		182	ob->map = 0;
		183	ob->activate_recursive ();
		184	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		185	add_friendly_object (ob);
		186	enter_map ();
		187	}
		188
		189	void
		190	player::deactivate ()
		191	{
		192	if (!active)
		193	return;
		194
		195	terminate_all_pets (ob);
		196	remove_friendly_object (ob);
		197	ob->deactivate_recursive ();
		198
		199	if (ob->map)
		200	maplevel = ob->map->path;
		201
		202	ob->remove ();
		203	ob->map = 0;
		204	party = 0;
		205
		206	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		207
		208	players.erase (this);
		209	}
		210
181	// connect the player with a specific client	211	// connect the player with a specific client
182	// also changed, rationalises, and fixes some incorrect settings	212	// also changes, rationalises, and fixes some incorrect settings
183	void	213	void
184	player::connect (client *ns)	214	player::connect (client *ns)
185	{	215	{
186	this->ns = ns;	216	this->ns = ns;
187	ns->pl = this;	217	ns->pl = this;
188		218
189	next = first_player;	219	run_on = 0;
190	first_player = this;	220	fire_on = 0;
		221	ob->close_container (); //TODO: client-specific
191		222
192	ns->update_look = 0;	223	ns->update_look = 0;
193	ns->look_position = 0;	224	ns->look_position = 0;
194		225
195	clear_los (ob);	226	clear_los (ob);
		227
		228	ns->reset_stats ();
196		229
197	/* make sure he's a player -- needed because of class change. */	230	/* make sure he's a player -- needed because of class change. */
198	ob->type = PLAYER; // we are paranoid	231	ob->type = PLAYER; // we are paranoid
199	ob->race = ob->arch->clone.race;	232	ob->race = ob->arch->clone.race;
200		233
201	if (!legal_range (ob, shoottype))
202	shoottype = range_none;
203
204	ob->carrying = sum_weight (ob);	234	ob->carrying = sum_weight (ob);
205	link_player_skills (ob);	235	link_player_skills (ob);
206		236
207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	237	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208		238
209	assign (title, ob->arch->clone.name);	239	assign (title, ob->arch->clone.name);
210
211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
212	* from the class, and not race. I don't see any way to get the class information
213	* to then update this. I don't think this will actually break anything - anyone
214	* that can use armour should be able to use a shield. What this may 'break'
215	* are features new characters get, eg, if someone starts up with a Q, they
216	* should be able to use a shield. However, old Q's won't get that advantage.
217	*/
218	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219	SET_FLAG (ob, FLAG_USE_SHIELD);
220		240
221	/* if it's a dragon player, set the correct title here */	241	/* if it's a dragon player, set the correct title here */
222	if (is_dragon_pl (ob))	242	if (is_dragon_pl (ob))
223	{	243	{
224	object *tmp, *abil = 0, *skin = 0;	244	object *tmp, *abil = 0, *skin = 0;
…		…
234	skin = tmp;	254	skin = tmp;
235		255
236	set_dragon_name (ob, abil, skin);	256	set_dragon_name (ob, abil, skin);
237	}	257	}
238		258
239	CLEAR_FLAG (ob, FLAG_FRIENDLY);
240	add_friendly_object (ob);
241
242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	259	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		260
246	esrv_new_player (this, ob->weight + ob->carrying);	261	esrv_new_player (this, ob->weight + ob->carrying);
		262
		263	for (object *op = ob->inv; op; op = op->below)
		264	if (op->flag [FLAG_APPLIED])
		265	switch (op->type)
		266	{
		267	case WAND:
		268	case ROD:
		269	case HORN:
		270	case BOW:
		271	case SKILL:
		272	case SKILL_TOOL:
		273	case WEAPON:
		274	apply_special (ob, op, AP_UNAPPLY);
		275	apply_special (ob, op, AP_APPLY);
		276	break;
		277	}
247		278
248	ob->update_stats ();	279	ob->update_stats ();
249	ns->floorbox_update ();	280	ns->floorbox_update ();
250		281
251	esrv_send_inventory (ob, ob);	282	esrv_send_inventory (ob, ob);
252	esrv_add_spells (this, 0);	283	esrv_add_spells (this, 0);
253		284
254	ob->activate_recursive ();	285	activate ();
255	enter_map ();
256		286
257	send_rules (ob);	287	send_rules (ob);
258	send_news (ob);	288	send_news (ob);
259	display_motd (ob);	289	display_motd (ob);
260		290
…		…
263	}	293	}
264		294
265	void	295	void
266	player::disconnect ()	296	player::disconnect ()
267	{	297	{
		298	if (ns)
		299	{
		300	if (active)
		301	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		302
		303	INVOKE_PLAYER (DISCONNECT, this);
		304
		305	ns->reset_stats ();
		306	ns->pl = 0;
		307	ns = 0;
		308	}
		309
268	if (ob)	310	if (ob)
269	ob->deactivate_recursive ();	311	ob->close_container (); //TODO: client-specific
270		312
271	//TODO: don't be so harsh and destroy :)	313	deactivate ();
272	if (ns)
273	{
274	if (enable_save)
275	{
276	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277	save (true);
278	}
279
280	INVOKE_PLAYER (DISCONNECT, this);
281
282	client *ns = this->ns;
283	ns->send_packet ("goodbye");
284	ns->flush ();
285	ns->pl = 0;
286	this->ns = 0;
287
288	ns->destroy ();
289	destroy ();
290	}
291	}	314	}
292		315
293	// the need for this function can be explained	316	// the need for this function can be explained
294	// by load_object not returning the object	317	// by load_object not returning the object
295	void	318	void
296	player::set_object (object *op)	319	player::set_object (object *op)
297	{	320	{
298	ob = op;	321	ob = op;
299	ob->contr = this; /* this aren't yet in archetype */	322	ob->contr = this; /* this aren't yet in archetype */
300		323
301	ob->speed_left = 0.5;	324	ob->speed_left = 0.5;
302	ob->speed = 1.0;	325	ob->speed = 1.0;
303	ob->direction = 5; /* So player faces south */	326	ob->direction = 5; /* So player faces south */
304	ob->stats.wc = 2;
305	ob->run_away = 25; /* Then we panick... */
306
307	ob->roll_stats ();
308	}	327	}
309		328
310	player::player ()	329	player::player ()
311	{	330	{
312	/* There are some elements we want initialised to non zero value -	331	/* There are some elements we want initialised to non zero value -
313	* we deal with that below this point.	332	* we deal with that below this point.
314	*/	333	*/
315	outputs_sync = 16; /* Every 2 seconds */	334	outputs_sync = 4;
316	outputs_count = 8; /* Keeps present behaviour */	335	outputs_count = 4;
317	unapply = unapply_nochoice;	336	unapply = unapply_nochoice;
318		337
319	savebed_map = first_map_path; /* Init. respawn position */	338	savebed_map = first_map_path; /* Init. respawn position */
320		339
321	gen_sp_armour = 10;	340	gen_sp_armour = 10;
322	last_speed = -1;
323	shoottype = range_none;
324	bowtype = bow_normal;	341	bowtype = bow_normal;
325	petmode = pet_normal;	342	petmode = pet_normal;
326	listening = 10;	343	listening = 10;
327	usekeys = containers;	344	usekeys = containers;
328	last_weapon_sp = -1;
329	peaceful = 1; /* default peaceful */	345	peaceful = 1; /* default peaceful */
330	do_los = 1;	346	do_los = 1;
331
332	/* we need to clear these to -1 and not zero - otherwise,
333	* if a player quits and starts a new character, we wont
334	* send new values to the client, as things like exp start
335	* at zero.
336	*/
337	for (int i = 0; i < NUM_SKILLS; i++)
338	last_skill_exp[i] = -1;
339
340	for (int i = 0; i < NROFATTACKS; i++)
341	last_resist[i] = -1;
342
343	last_stats.exp = -1;
344	last_weight = (uint32) - 1;
345	}	347	}
346		348
347	void	349	void
348	player::do_destroy ()	350	player::do_destroy ()
349	{	351	{
350	disconnect ();	352	disconnect ();
351		353
352	save (false);
353	enable_save = false;
354
355	attachable::do_destroy ();	354	attachable::do_destroy ();
356
357	terminate_all_pets (ob);
358
359	if (first_player != this)
360	{
361	player *prev = first_player;
362
363	while (prev && prev->next && prev->next != this)
364	prev = prev->next;
365
366	if (prev->next != this)
367	{
368	LOG (llevError, "Free_player: Can't find previous player.\n");
369	abort ();
370	}
371
372	prev->next = next;
373	}
374	else
375	first_player = next;
376		355
377	if (ob)	356	if (ob)
378	{	357	{
379	ob->destroy_inv (false);	358	ob->destroy_inv (false);
380	ob->destroy ();	359	ob->destroy ();
…		…
395	player::create ()	374	player::create ()
396	{	375	{
397	player *pl = new player;	376	player *pl = new player;
398		377
399	pl->set_object (arch_to_object (get_player_archetype (0)));	378	pl->set_object (arch_to_object (get_player_archetype (0)));
		379
		380	pl->ob->roll_stats ();
		381	pl->ob->stats.wc = 2;
		382	pl->ob->run_away = 25; /* Then we panick... */
		383
400	set_first_map (pl->ob);	384	set_first_map (pl->ob);
401		385
402	return pl;	386	return pl;
403	}	387	}
404		388
…		…
436	object *op = NULL;	420	object *op = NULL;
437	objectlink *ol;	421	objectlink *ol;
438	unsigned lastdist;	422	unsigned lastdist;
439	rv_vector rv;	423	rv_vector rv;
440		424
441	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	425	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442	{	426	{
443	/* We should not find free objects on this friendly list, but it	427	/* We should not find free objects on this friendly list, but it
444	* does periodically happen. Given that, lets deal with it.	428	* does periodically happen. Given that, lets deal with it.
445	* While unlikely, it is possible the next object on the friendly	429	* While unlikely, it is possible the next object on the friendly
446	* list is also free, so encapsulate this in a while loop.	430	* list is also free, so encapsulate this in a while loop.
…		…
450	object *tmp = ol->ob;	434	object *tmp = ol->ob;
451		435
452	/* Can't do much more other than log the fact, because the object	436	/* Can't do much more other than log the fact, because the object
453	* itself will have been cleared.	437	* itself will have been cleared.
454	*/	438	*/
455	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	439	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		440	tmp->debug_desc ());
456	ol = ol->next;	441	ol = ol->next;
457	remove_friendly_object (tmp);	442	remove_friendly_object (tmp);
458	if (!ol)	443	if (!ol)
459	return op;	444	return op;
460	}	445	}
…		…
549	x = mon->x;	534	x = mon->x;
550	y = mon->y;	535	y = mon->y;
551	m = mon->map;	536	m = mon->map;
552	dir = rv.direction;	537	dir = rv.direction;
553	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	538	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
554	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	539	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		540
555	/* If we can't solve it within the search distance, return now. */	541	/* If we can't solve it within the search distance, return now. */
556	if (diff > max)	542	if (diff > max)
557	return 0;	543	return 0;
		544
558	while (diff > 1 && max > 0)	545	while (diff > 1 && max > 0)
559	{	546	{
560	lastx = x;	547	lastx = x;
561	lasty = y;	548	lasty = y;
562	lastmap = m;	549	lastmap = m;
…		…
644	max--;	631	max--;
645	lastdir = dir;	632	lastdir = dir;
646	if (!firstdir)	633	if (!firstdir)
647	firstdir = dir;	634	firstdir = dir;
648	}	635	}
		636
649	if (diff <= 1)	637	if (diff <= 1)
650	{	638	{
651	/* Recalculate diff (distance) because we may not have actually	639	/* Recalculate diff (distance) because we may not have actually
652	* headed toward player for entire distance.	640	* headed toward player for entire distance.
653	*/	641	*/
654	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	642	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	643	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
656	}	644	}
		645
657	if (diff > max)	646	if (diff > max)
658	return 0;	647	return 0;
659	}	648	}
		649
660	/* If we reached the max, didn't find a direction in time */	650	/* If we reached the max, didn't find a direction in time */
661	if (!max)	651	if (!max)
662	return 0;	652	return 0;
663		653
664	return firstdir;	654	return firstdir;
…		…
778	roll_stat (void)	768	roll_stat (void)
779	{	769	{
780	int a[4], i, j, k;	770	int a[4], i, j, k;
781		771
782	for (i = 0; i < 4; i++)	772	for (i = 0; i < 4; i++)
783	a[i] = (int) RANDOM () % 6 + 1;	773	a[i] = (int) rndm (6) + 1;
784		774
785	for (i = 0, j = 0, k = 7; i < 4; i++)	775	for (i = 0, j = 0, k = 7; i < 4; i++)
786	if (a[i] < k)	776	if (a[i] < k)
787	k = a[i], j = i;	777	k = a[i], j = i;
788		778
…		…
888	* appropriate action with it (change race, or other things).	878	* appropriate action with it (change race, or other things).
889	* The function name is for historical reasons - now we have	879	* The function name is for historical reasons - now we have
890	* separate race and class; this actually changes the RACE,	880	* separate race and class; this actually changes the RACE,
891	* not the class.	881	* not the class.
892	*/	882	*/
893	int	883	void
894	key_change_class (object *op, char key)	884	player::chargen_race_done ()
895	{	885	{
896	int tmp_loop;
897
898	if (key == 'd' || key == 'D')
899	{
900	char buf[MAX_BUF];
901
902	/* this must before then initial items are given */	886	/* this must before then initial items are given */
903	esrv_new_player (op->contr, op->weight + op->carrying);	887	esrv_new_player (ob->contr, ob->weight + ob->carrying);
904		888
905	treasurelist *tl = find_treasurelist ("starting_wealth");	889	treasurelist *tl = treasurelist::find ("starting_wealth");
906	if (tl)	890	if (tl)
907	create_treasure (tl, op, 0, 0, 0);	891	create_treasure (tl, ob, 0, 0, 0);
908		892
909	INVOKE_PLAYER (BIRTH, op->contr);	893	INVOKE_PLAYER (BIRTH, ob->contr);
910	INVOKE_PLAYER (LOGIN, op->contr);	894	INVOKE_PLAYER (LOGIN, ob->contr);
911		895
912	op->contr->ns->state = ST_PLAYING;	896	ob->contr->ns->state = ST_PLAYING;
913		897
914	if (op->msg)	898	if (ob->msg)
915	op->msg = NULL;	899	ob->msg = 0;
916		900
917	/* We create this now because some of the unique maps will need it	901	/* We create this now because some of the unique maps will need it
918	* to save here.	902	* to save here.
919	*/	903	*/
		904	{
		905	char buf[MAX_BUF];
920	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	906	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921	make_path_to_file (buf);	907	make_path_to_file (buf);
		908	}
922		909
923	#ifdef AUTOSAVE
924	op->contr->last_save_tick = pticks;
925	#endif
926	start_info (op);	910	start_info (ob);
927	CLEAR_FLAG (op, FLAG_WIZ);	911	CLEAR_FLAG (ob, FLAG_WIZ);
928	give_initial_items (op, op->randomitems);	912	give_initial_items (ob, ob->randomitems);
929	link_player_skills (op);	913	link_player_skills (ob);
930	esrv_send_inventory (op, op);	914	esrv_send_inventory (ob, ob);
931	op->update_stats ();	915	ob->update_stats ();
932		916
933	/* This moves the player to a different start map, if there	917	/* This moves the player to a different start map, if there
934	* is one for this race	918	* is one for this race
935	*/	919	*/
936	if (*first_map_ext_path)	920	if (*first_map_ext_path)
937	{	921	{
938	object *tmp;	922	object *tmp;
939	char mapname[MAX_BUF];	923	char mapname[MAX_BUF];
940		924
941	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	925	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
942	tmp = object::create ();	926	tmp = object::create ();
943	EXIT_PATH (tmp) = mapname;	927	EXIT_PATH (tmp) = mapname;
944	EXIT_X (tmp) = op->x;	928	EXIT_X (tmp) = ob->x;
945	EXIT_Y (tmp) = op->y;	929	EXIT_Y (tmp) = ob->y;
946	op->enter_exit (tmp); /* we don't really care if it succeeded;	930	ob->enter_exit (tmp); /* we don't really care if it succeeded;
947	* if the map isn't there, then stay on the	931	* if the map isn't there, then stay on the
948	* default initial map */	932	* default initial map */
949	tmp->destroy ();	933	tmp->destroy ();
950	}	934	}
951	else	935	else
952	LOG (llevDebug, "first_map_ext_path not set\n");	936	LOG (llevDebug, "first_map_ext_path not set\n");
		937	}
953		938
954	return 0;	939	void
955	}	940	player::chargen_race_next ()
956		941	{
957	/* Following actually changes the race - this is the default command	942	/* Following actually changes the race - this is the default command
958	* if we don't match with one of the options above.	943	* if we don't match with one of the options above.
959	*/	944	*/
960		945
961	tmp_loop = 0;	946	do
962	while (!tmp_loop)
963	{	947	{
964	shstr name = op->name;	948	shstr name = ob->name;
965	int x = op->x, y = op->y;	949	int x = ob->x, y = ob->y;
966		950
967	op->remove_statbonus ();	951	ob->remove_statbonus ();
968	op->remove ();	952	ob->remove ();
969	op->arch = get_player_archetype (op->arch);	953	ob->arch = get_player_archetype (ob->arch);
970	op->arch->clone.copy_to (op);	954	ob->arch->clone.copy_to (ob);
971	op->instantiate ();	955	ob->instantiate ();
972	op->stats = op->contr->orig_stats;	956	ob->stats = ob->contr->orig_stats;
973	op->name = op->name_pl = name;	957	ob->name = ob->name_pl = name;
974	op->x = x;	958	ob->x = x;
975	op->y = y;	959	ob->y = y;
976	SET_ANIMATION (op, 2); /* So player faces south */	960	SET_ANIMATION (ob, 2); /* So player faces south */
977	insert_ob_in_map (op, op->map, op, 0);	961	insert_ob_in_map (ob, ob->map, ob, 0);
978	assign (op->contr->title, op->arch->clone.name);	962	assign (ob->contr->title, ob->arch->clone.name);
979	op->add_statbonus ();	963	ob->add_statbonus ();
980	tmp_loop = allowed_class (op);
981	}	964	}
		965	while (!allowed_class (ob));
982		966
983	update_object (op, UP_OBJ_FACE);	967	update_object (ob, UP_OBJ_FACE);
984	esrv_update_item (UPD_FACE, op, op);	968	esrv_update_item (UPD_FACE, ob, ob);
985	op->update_stats ();	969	ob->update_stats ();
986	op->stats.hp = op->stats.maxhp;	970	ob->stats.hp = ob->stats.maxhp;
987	op->stats.sp = op->stats.maxsp;	971	ob->stats.sp = ob->stats.maxsp;
988	op->stats.grace = 0;	972	ob->stats.grace = 0;
989
990	if (op->msg)
991	new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994	return 0;
995	}
996
997	int
998	key_confirm_quit (object *op, char key)
999	{
1000	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001	{
1002	op->contr->ns->state = ST_PLAYING;
1003	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004	return 1;
1005	}
1006
1007	INVOKE_PLAYER (LOGOUT, op->contr);
1008	INVOKE_PLAYER (QUIT, op->contr);
1009
1010	op->contr->enable_save = false;
1011
1012	terminate_all_pets (op);
1013	op->remove ();
1014	op->direction = 0;
1015	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1016
1017	strcpy (op->contr->killer, "quit");
1018	check_score (op);
1019	op->contr->party = 0;
1020	op->contr->own_title[0] = '\0';
1021	op->contr->destroy ();
1022
1023	return 1;
1024	}	973	}
1025		974
1026	void	975	void
1027	flee_player (object *op)	976	flee_player (object *op)
1028	{	977	{
…		…
1075	/* Cornered, get rid of scared */	1024	/* Cornered, get rid of scared */
1076	CLEAR_FLAG (op, FLAG_SCARED);	1025	CLEAR_FLAG (op, FLAG_SCARED);
1077	op->enemy = NULL;	1026	op->enemy = NULL;
1078	}	1027	}
1079		1028
1080
1081	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1029	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1082	* IT returns 1 if the player should keep on moving, 0 if he should	1030	* It returns 1 if the player should keep on moving, 0 if he should
1083	* stop.	1031	* stop.
1084	*/	1032	*/
1085	int	1033	int
1086	check_pick (object *op)	1034	check_pick (object *op)
1087	{	1035	{
1088	object *tmp, *next;	1036	object *tmp, *next;
1089	int stop = 0;	1037	int stop = 0;
1090	int j, k, wvratio;	1038	int wvratio;
1091	char putstring[128], tmpstr[16];	1039	char putstring[128];
1092		1040
1093	/* if you're flying, you cna't pick up anything */	1041	/* if you're flying, you cna't pick up anything */
1094	if (op->move_type & MOVE_FLYING)	1042	if (op->move_type & MOVE_FLYING)
1095	return 1;	1043	return 1;
1096		1044
…		…
1433	* found object is returned.	1381	* found object is returned.
1434	*/	1382	*/
1435	object *	1383	object *
1436	find_arrow (object *op, const char *type)	1384	find_arrow (object *op, const char *type)
1437	{	1385	{
1438	object *tmp = NULL;	1386	object *tmp = 0;
1439		1387
1440	for (op = op->inv; op; op = op->below)	1388	for (op = op->inv; op; op = op->below)
1441	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1389	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1442	tmp = find_arrow (op, type);	1390	tmp = find_arrow (op, type);
1443	else if (op->type == ARROW && op->race == type)	1391	else if (op->type == ARROW && op->race == type)
1444	return op;	1392	return op;
		1393
1445	return tmp;	1394	return tmp;
1446	}	1395	}
1447		1396
1448	/*	1397	/*
1449	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1398	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1450	* against the target. A full test is not performed, simply a basic test	1399	* against the target. A full test is not performed, simply a basic test
1451	* of resistances. The archer is making a quick guess at what he sees down	1400	* of resistances. The archer is making a quick guess at what he sees down
1452	* the hall. Failing that it does it's best to pick the highest plus arrow.	1401	* the hall. Failing that it does it's best to pick the highest plus arrow.
1453	*/	1402	*/
1454
1455	object *	1403	object *
1456	find_better_arrow (object *op, object *target, const char *type, int *better)	1404	find_better_arrow (object *op, object *target, const char *type, int *better)
1457	{	1405	{
1458	object *tmp = NULL, *arrow, *ntmp;	1406	object *tmp = NULL, *arrow, *ntmp;
1459	int attacknum, attacktype, betterby = 0, i;	1407	int attacknum, attacktype, betterby = 0, i;
…		…
1525	* find_better_arrow to find a decent arrow to use.	1473	* find_better_arrow to find a decent arrow to use.
1526	* op = the shooter	1474	* op = the shooter
1527	* type = bow->race	1475	* type = bow->race
1528	* dir = fire direction	1476	* dir = fire direction
1529	*/	1477	*/
1530
1531	object *	1478	object *
1532	pick_arrow_target (object *op, const char *type, int dir)	1479	pick_arrow_target (object *op, const char *type, int dir)
1533	{	1480	{
1534	object *tmp = NULL;	1481	object *tmp = NULL;
1535	maptile *m;	1482	maptile *m;
…		…
1609	{	1556	{
1610	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1557	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1611	return 0;	1558	return 0;
1612	}	1559	}
1613		1560
1614	if (op->type == PLAYER)	1561	if (player *pl = op->contr)
1615	bow = op->contr->ranges[range_bow];	1562	{
		1563	bow = pl->ranged_ob;
		1564	op->set_weapon (bow);
		1565	}
1616	else	1566	else
1617	{	1567	{
1618	for (bow = op->inv; bow; bow = bow->below)	1568	for (bow = op->inv; bow; bow = bow->below)
1619	/* Don't check for applied - monsters don't apply bows - in that way, they	1569	/* Don't check for applied - monsters don't apply bows - in that way, they
1620	* don't need to switch back and forth between bows and weapons.	1570	* don't need to switch back and forth between bows and weapons.
…		…
1625	if (!bow)	1575	if (!bow)
1626	{	1576	{
1627	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1577	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1628	return 0;	1578	return 0;
1629	}	1579	}
		1580
		1581	// optimisation: move object to top so we will find it quickly again
		1582	if (bow->below)
		1583	{
		1584	bow->remove ();
		1585	op->insert (bow);
		1586	}
		1587
1630	}	1588	}
1631		1589
1632	if (!bow->race || !bow->skill)	1590	if (!bow->race || !bow->skill)
1633	{	1591	{
1634	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1651	if (op->type == PLAYER)	1609	if (op->type == PLAYER)
1652	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1610	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1653	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1611	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1654	else	1612	else
1655	CLEAR_FLAG (op, FLAG_READY_BOW);	1613	CLEAR_FLAG (op, FLAG_READY_BOW);
		1614
1656	return 0;	1615	return 0;
1657	}	1616	}
1658	}	1617	}
1659		1618
1660	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1619	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1691	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1650	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1692	op->update_stats ();	1651	op->update_stats ();
1693	}	1652	}
1694		1653
1695	SET_ANIMATION (arrow, arrow->direction);	1654	SET_ANIMATION (arrow, arrow->direction);
		1655
1696	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1656	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1697	arrow->stats.hp = arrow->stats.dam;	1657	arrow->stats.hp = arrow->stats.dam;
1698	arrow->stats.grace = arrow->attacktype;	1658	arrow->stats.grace = arrow->attacktype;
		1659
1699	if (arrow->slaying != NULL)	1660	if (arrow->slaying)
1700	arrow->spellarg = strdup (arrow->slaying);	1661	arrow->spellarg = strdup (arrow->slaying);
1701		1662
1702	/* Note that this was different for monsters - they got their level	1663	arrow->stats.dam += op->stats.dam + arrow->magic;
1703	* added to the damage. I think the strength bonus is more proper.
1704	*/
1705
1706	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1707		1664
1708	/* update the speed */	1665	/* update the speed */
1709	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1666	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1710	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1667	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1711		1668
1712	arrow->set_speed (max (arrow->speed, 1.0));	1669	arrow->set_speed (max (arrow->speed, 1.0));
1713	arrow->speed_left = 0;	1670	arrow->speed_left = 0;
1714		1671
		1672	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1673
1715	if (op->type == PLAYER)	1674	if (op->type == PLAYER)
1716	{	1675	{
1717	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1719	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1676	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1677	arrow->stats.wc -= dex_bonus[op->stats.Dex];
		1678
		1679	if (!arrow->slaying)
		1680	arrow->slaying = op->slaying;
1722	}	1681	}
1723	else	1682	else
1724	{	1683	{
1725	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726	arrow->level = op->level;	1684	arrow->level = op->level;
1727	}	1685	arrow->stats.wc -= bow->magic;
1728		1686
1729	if (arrow->attacktype == AT_PHYSICAL)	1687	if (!arrow->slaying)
		1688	arrow->slaying = bow->slaying;
		1689	}
		1690
		1691	arrow->stats.wc -= arrow->level;
		1692
1730	arrow->attacktype |= bow->attacktype;	1693	arrow->attacktype |= bow->attacktype;
1731
1732	if (bow->slaying)
1733	arrow->slaying = bow->slaying;
1734		1694
1735	arrow->move_type = MOVE_FLY_LOW;	1695	arrow->move_type = MOVE_FLY_LOW;
1736	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1696	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1737		1697
1738	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1698	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
…		…
1764	{	1724	{
1765	int ret = 0, wcmod = 0;	1725	int ret = 0, wcmod = 0;
1766		1726
1767	if (op->contr->bowtype == bow_bestarrow)	1727	if (op->contr->bowtype == bow_bestarrow)
1768	{	1728	{
1769	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1729	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1770	}	1730	}
1771	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1731	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1772	{	1732	{
1773	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1733	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1774	wcmod = -1;	1734	wcmod = -1;
…		…
1784	else if (op->contr->bowtype == bow_spreadshot)	1744	else if (op->contr->bowtype == bow_spreadshot)
1785	{	1745	{
1786	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);
1787	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1747	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1788	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1748	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1789
1790	}	1749	}
1791	else	1750	else
1792	{	1751	{
1793	/* Simple case */	1752	/* Simple case */
1794	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1753	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1795	}	1754	}
		1755
1796	return ret;	1756	return ret;
1797	}	1757	}
1798		1758
1799		1759
1800	/* Fires a misc (wand/rod/horn) object in 'dir'.	1760	/* Fires a misc (wand/rod/horn) object in 'dir'.
1801	* Broken apart from 'fire' to keep it more readable.	1761	* Broken apart from 'fire' to keep it more readable.
1802	*/	1762	*/
1803	void	1763	void
1804	fire_misc_object (object *op, int dir)	1764	fire_misc_object (object *op, int dir)
1805	{	1765	{
1806	object *item;	1766	object *item = op->contr->ranged_ob;
1807		1767
1808	if (!op->contr->ranges[range_misc])	1768	if (!item)
1809	{	1769	{
1810	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1770	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1811	return;	1771	return;
1812	}	1772	}
1813		1773
1814	item = op->contr->ranges[range_misc];
1815	if (!item->inv)	1774	if (!item->inv)
1816	{	1775	{
1817	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1776	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1818	return;	1777	return;
1819	}	1778	}
		1779
		1780	op->set_weapon (item);
		1781
1820	if (item->type == WAND)	1782	if (item->type == WAND)
1821	{	1783	{
1822	if (item->stats.food <= 0)	1784	if (item->stats.food <= 0)
1823	{	1785	{
1824	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1786	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1825	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1787	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1788
1826	return;	1789	return;
1827	}	1790	}
1828	}	1791	}
1829	else if (item->type == ROD || item->type == HORN)	1792	else if (item->type == ROD || item->type == HORN)
1830	{	1793	{
1831	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1794	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1832	{	1795	{
1833	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1796	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1797
1834	if (item->type == ROD)	1798	if (item->type == ROD)
1835	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1799	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1836	else	1800	else
1837	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1801	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1802
1838	return;	1803	return;
1839	}	1804	}
1840	}	1805	}
1841		1806
1842	if (cast_spell (op, item, dir, item->inv, NULL))	1807	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1873		1838
1874	/* check for loss of invisiblity/hide */	1839	/* check for loss of invisiblity/hide */
1875	if (action_makes_visible (op))	1840	if (action_makes_visible (op))
1876	make_visible (op);	1841	make_visible (op);
1877		1842
1878	switch (op->contr->shoottype)	1843	player *pl = op->contr;
		1844
		1845	if (pl->golem)
1879	{	1846	{
1880	case range_none:	1847	control_golem (op->contr->golem, dir);
1881	return;	1848	return;
		1849	}
1882		1850
1883	case range_bow:	1851	object *ob = pl->ranged_ob;
		1852
		1853	if (!ob)
		1854	return;
		1855
		1856	switch (ob->type)
		1857	{
		1858	case BOW:
1884	player_fire_bow (op, dir);	1859	player_fire_bow (op, dir);
1885	return;	1860	break;
1886		1861
1887	case range_magic: /* Casting spells */	1862	case SPELL:
1888	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1863	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1889	return;	1864	break;
1890		1865
1891	case range_misc:	1866	case BUILDER:
		1867	apply_map_builder (op, dir);
		1868	break;
		1869
		1870	case SKILL:
		1871	case SKILL_TOOL:
		1872	do_skill (op, op, ob, dir, 0);
		1873	break;
		1874
		1875	default:
1892	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1893	return;	1877	break;
1894
1895	case range_golem: /* Control summoned monsters from scrolls */
1896	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1897	{
1898	op->contr->ranges[range_golem] = 0;
1899	op->contr->shoottype = range_none;
1900	}
1901	else
1902	control_golem (op->contr->ranges[range_golem], dir);
1903	return;
1904
1905	case range_skill:
1906	if (!op->chosen_skill)
1907	{
1908	if (op->type == PLAYER)
1909	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1910	return;
1911	}
1912	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1913	return;
1914	case range_builder:
1915	apply_map_builder (op, dir);
1916	return;
1917	default:
1918	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1919	return;
1920	}	1878	}
1921	}	1879	}
1922
1923
1924		1880
1925	/* find_key	1881	/* find_key
1926	* We try to find a key for the door as passed. If we find a key	1882	* We try to find a key for the door as passed. If we find a key
1927	* and successfully use it, we return the key, otherwise NULL	1883	* and successfully use it, we return the key, otherwise NULL
1928	* This function merges both normal and locked door, since the logic	1884	* This function merges both normal and locked door, since the logic
…		…
1930	* pl is the player,	1886	* pl is the player,
1931	* inv is the objects inventory to searched	1887	* inv is the objects inventory to searched
1932	* door is the door we are trying to match against.	1888	* door is the door we are trying to match against.
1933	* This function can be called recursively to search containers.	1889	* This function can be called recursively to search containers.
1934	*/	1890	*/
1935
1936	object *	1891	object *
1937	find_key (object *pl, object *container, object *door)	1892	find_key (object *pl, object *container, object *door)
1938	{	1893	{
1939	object *tmp, *key;	1894	object *tmp, *key;
1940		1895
1941	/* Should not happen, but sanity checking is never bad */	1896	/* Should not happen, but sanity checking is never bad */
1942	if (container->inv == NULL)	1897	if (!container->inv)
1943	return NULL;	1898	return 0;
1944		1899
1945	/* First, lets try to find a key in the top level inventory */	1900	/* First, lets try to find a key in the top level inventory */
1946	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1901	for (tmp = container->inv; tmp; tmp = tmp->below)
1947	{	1902	{
1948	if (door->type == DOOR && tmp->type == KEY)	1903	if (door->type == DOOR && tmp->type == KEY)
1949	break;	1904	break;
1950	/* For sanity, we should really check door type, but other stuff	1905	/* For sanity, we should really check door type, but other stuff
1951	* (like containers) can be locked with special keys	1906	* (like containers) can be locked with special keys
1952	*/	1907	*/
1953	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1908	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954	break;	1909	break;
1955	}	1910	}
		1911
1956	/* No key found - lets search inventories now */	1912	/* No key found - lets search inventories now */
1957	/* If we find and use a key in an inventory, return at that time.	1913	/* If we find and use a key in an inventory, return at that time.
1958	* otherwise, if we search all the inventories and still don't find	1914	* otherwise, if we search all the inventories and still don't find
1959	* a key, return	1915	* a key, return
1960	*/	1916	*/
1961	if (!tmp)	1917	if (!tmp)
1962	{	1918	{
1963	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1919	for (tmp = container->inv; tmp; tmp = tmp->below)
1964	{	1920	{
1965	/* No reason to search empty containers */	1921	/* No reason to search empty containers */
1966	if (tmp->type == CONTAINER && tmp->inv)	1922	if (tmp->type == CONTAINER && tmp->inv)
1967	{	1923	{
1968	if ((key = find_key (pl, tmp, door)) != NULL)	1924	if ((key = find_key (pl, tmp, door)))
1969	return key;	1925	return key;
1970	}	1926	}
1971	}	1927	}
		1928
1972	if (!tmp)	1929	if (!tmp)
1973	return NULL;	1930	return NULL;
1974	}	1931	}
		1932
1975	/* We get down here if we have found a key. Now if its in a container,	1933	/* We get down here if we have found a key. Now if its in a container,
1976	* see if we actually want to use it	1934	* see if we actually want to use it
1977	*/	1935	*/
1978	if (pl != container)	1936	if (pl != container)
1979	{	1937	{
…		…
2000	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1958	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2001	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1959	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2002	return NULL;	1960	return NULL;
2003	}	1961	}
2004	}	1962	}
		1963
2005	return tmp;	1964	return tmp;
2006	}	1965	}
2007		1966
2008	/* moved door processing out of move_player_attack.	1967	/* moved door processing out of move_player_attack.
2009	* returns 1 if player has opened the door with a key	1968	* returns 1 if player has opened the door with a key
…		…
2023	if (key)	1982	if (key)
2024	{	1983	{
2025	object *container = key->env;	1984	object *container = key->env;
2026		1985
2027	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1986	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1987
2028	if (action_makes_visible (op))	1988	if (action_makes_visible (op))
2029	make_visible (op);	1989	make_visible (op);
		1990
2030	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1991	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2031	spring_trap (door->inv, op);	1992	spring_trap (door->inv, op);
		1993
2032	if (door->type == DOOR)	1994	if (door->type == DOOR)
2033	{
2034	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1995	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035	}
2036	else if (door->type == LOCKED_DOOR)	1996	else if (door->type == LOCKED_DOOR)
2037	{	1997	{
2038	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1998	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2039	remove_door2 (door); /* remove door without violence ;-) */	1999	remove_door2 (door); /* remove door without violence ;-) */
2040	}	2000	}
		2001
2041	/* Do this after we print the message */	2002	/* Do this after we print the message */
2042	decrease_ob (key); /* Use up one of the keys */	2003	decrease_ob (key); /* Use up one of the keys */
2043	/* Need to update the weight the container the key was in */	2004	/* Need to update the weight the container the key was in */
2044	if (container != op)	2005	if (container != op)
2045	esrv_update_item (UPD_WEIGHT, op, container);	2006	esrv_update_item (UPD_WEIGHT, op, container);
		2007
2046	return 1; /* Nothing more to do below */	2008	return 1; /* Nothing more to do below */
2047	}	2009	}
2048	else if (door->type == LOCKED_DOOR)	2010	else if (door->type == LOCKED_DOOR)
2049	{	2011	{
2050	/* Might as well return now - no other way to open this */	2012	/* Might as well return now - no other way to open this */
2051	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2013	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2052	return 1;	2014	return 1;
2053	}	2015	}
		2016
2054	return 0;	2017	return 0;
2055	}	2018	}
2056		2019
2057	/* This function is just part of a breakup from move_player.	2020	/* This function is just part of a breakup from move_player.
2058	* It should keep the code cleaner.	2021	* It should keep the code cleaner.
…		…
2062	*/	2025	*/
2063	void	2026	void
2064	move_player_attack (object *op, int dir)	2027	move_player_attack (object *op, int dir)
2065	{	2028	{
2066	object *tmp, *mon;	2029	object *tmp, *mon;
2067	sint16 nx, ny;
2068	int on_battleground;	2030	int on_battleground;
2069	maptile *m;	2031	maptile *m;
2070		2032
2071	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2072	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2073		2035
2074	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
2075		2037
2076	/* If braced, or can't move to the square, and it is not out of the	2038	/* If braced, or can't move to the square, and it is not out of the
2077	* map, attack it. Note order of if statement is important - don't	2039	* map, attack it. Note order of if statement is important - don't
…		…
2084	*/	2046	*/
2085	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2047	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2086	{	2048	{
2087	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2049	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2088	{	2050	{
2089	m = get_map_from_coord (op->map, &nx, &ny);	2051	m = op->map->xy_find (nx, ny);
2090	if (!m)	2052	if (!m)
2091	return; /* Don't think this should happen */	2053	return; /* Don't think this should happen */
2092	}	2054	}
2093	else	2055	else
2094	m = op->map;	2056	m = op->map;
2095		2057
2096	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2058	if (!(tmp = m->at (nx, ny).bot))
2097	{
2098	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099	return;	2059	return;
2100	}
2101		2060
2102	mon = 0;	2061	mon = 0;
2103	/* Go through all the objects, and find ones of interest. Only stop if	2062	/* Go through all the objects, and find ones of interest. Only stop if
2104	* we find a monster - that is something we know we want to attack.	2063	* we find a monster - that is something we know we want to attack.
2105	* if its a door or barrel (can roll) see if there may be monsters	2064	* if its a door or barrel (can roll) see if there may be monsters
…		…
2158	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2117	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159	{	2118	{
2160	/* If we're braced, we don't want to switch places with it */	2119	/* If we're braced, we don't want to switch places with it */
2161	if (op->contr->braced)	2120	if (op->contr->braced)
2162	return;	2121	return;
		2122
2163	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2123	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2164	(void) push_ob (mon, dir, op);	2124	push_ob (mon, dir, op);
2165	if (op->contr->tmp_invis || op->hide)	2125	if (op->contr->tmp_invis || op->hide)
2166	make_visible (op);	2126	make_visible (op);
		2127
2167	return;	2128	return;
2168	}	2129	}
2169		2130
2170	/* in certain circumstances, you shouldn't attack friendly	2131	/* in certain circumstances, you shouldn't attack friendly
2171	* creatures. Note that if you are braced, you can't push	2132	* creatures. Note that if you are braced, you can't push
…		…
2185	!on_battleground))	2146	!on_battleground))
2186	{	2147	{
2187	if (!op->contr->braced)	2148	if (!op->contr->braced)
2188	{	2149	{
2189	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2150	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190	(void) push_ob (mon, dir, op);	2151	push_ob (mon, dir, op);
2191	}	2152	}
2192	else	2153	else
2193	new_draw_info (0, 0, op, "You withhold your attack");	2154	new_draw_info (0, 0, op, "You withhold your attack");
2194		2155
2195	if (op->contr->tmp_invis || op->hide)	2156	if (op->contr->tmp_invis || op->hide)
…		…
2210	* Way it works is like this: First, it must have some hit points	2171	* Way it works is like this: First, it must have some hit points
2211	* and be living. Then, it must be one of the following:	2172	* and be living. Then, it must be one of the following:
2212	* 1) Not a player, 2) A player, but of a different party. Note	2173	* 1) Not a player, 2) A player, but of a different party. Note
2213	* that party_number -1 is no party, so attacks can still happen.	2174	* that party_number -1 is no party, so attacks can still happen.
2214	*/	2175	*/
2215
2216	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2176	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2177	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2218	{	2178	{
2219		2179
2220	/* If the player hasn't hit something this tick, and does	2180	/* If the player hasn't hit something this tick, and does
…		…
2254	int	2214	int
2255	move_player (object *op, int dir)	2215	move_player (object *op, int dir)
2256	{	2216	{
2257	int pick;	2217	int pick;
2258		2218
2259	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2219	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2260	return 0;	2220	return 0;
2261		2221
2262	/* Sanity check: make sure dir is valid */	2222	/* Sanity check: make sure dir is valid */
2263	if ((dir < 0) || (dir >= 9))	2223	if ((dir < 0) || (dir >= 9))
2264	{	2224	{
2265	LOG (llevError, "move_player: invalid direction %d\n", dir);	2225	LOG (llevError, "move_player: invalid direction %d\n", dir);
2266	return 0;	2226	return 0;
2267	}	2227	}
2268		2228
2269	/* peterm: added following line */	2229	/* peterm: added following line */
2270	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2230	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2231	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272		2232
2273	op->facing = dir;	2233	op->facing = dir;
2274		2234
2275	if (op->hide)	2235	if (op->hide)
2276	do_hidden_move (op);	2236	do_hidden_move (op);
…		…
2309	* Returns true if there are more actions we can do.	2269	* Returns true if there are more actions we can do.
2310	*/	2270	*/
2311	int	2271	int
2312	handle_newcs_player (object *op)	2272	handle_newcs_player (object *op)
2313	{	2273	{
2314	if (op->contr->hidden)
2315	{
2316	op->invisible = 1000;
2317	/* the socket code flashes the player visible/invisible
2318	* depending on the value of invisible, so we need to
2319	* alternate it here for it to work correctly.
2320	*/
2321	if (pticks & 2)
2322	op->invisible--;
2323	}
2324	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2325	{
2326	op->invisible--;
2327	if (!op->invisible)
2328	{
2329	make_visible (op);
2330	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2331	}
2332	}
2333
2334	if (QUERY_FLAG (op, FLAG_SCARED))	2274	if (QUERY_FLAG (op, FLAG_SCARED))
2335	{	2275	{
2336	flee_player (op);	2276	flee_player (op);
2337	/* If player is still scared, that is his action for this tick */	2277	/* If player is still scared, that is his action for this tick */
2338	if (QUERY_FLAG (op, FLAG_SCARED))	2278	if (QUERY_FLAG (op, FLAG_SCARED))
2339	{	2279	{
2340	op->speed_left--;	2280	op->speed_left--;
2341	return 0;	2281	return 0;
2342	}	2282	}
2343	}	2283	}
2344
2345	/* I've been seeing crashes where the golem has been destroyed, but
2346	* the player object still points to the defunct golem. The code that
2347	* destroys the golem looks correct, and it doesn't always happen, so
2348	* put this in a a workaround to clean up the golem pointer.
2349	*/
2350	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2351	op->contr->ranges[range_golem] = 0;
2352		2284
2353	/* call this here - we also will call this in do_ericserver, but	2285	/* call this here - we also will call this in do_ericserver, but
2354	* the players time has been increased when doericserver has been	2286	* the players time has been increased when doericserver has been
2355	* called, so we recheck it here.	2287	* called, so we recheck it here.
2356	*/	2288	*/
2357	op->contr->ns->handle_command ();	2289	if (op->contr->ns->handle_command ())
		2290	return 1;
2358		2291
2359	if (op->speed_left < 0)	2292	if (op->speed_left > 0)
2360	return 0;	2293	{
2361
2362	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2294	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2363	{	2295	{
2364	/* All move commands take 1 tick, at least for now */	2296	/* All move commands take 1 tick, at least for now */
2365	op->speed_left--;	2297	op->speed_left--;
2366		2298
2367	/* Instead of all the stuff below, let move_player take care	2299	/* Instead of all the stuff below, let move_player take care
2368	* of it. Also, some of the skill stuff is only put in	2300	* of it. Also, some of the skill stuff is only put in
2369	* there, as well as the confusion stuff.	2301	* there, as well as the confusion stuff.
2370	*/	2302	*/
2371	move_player (op, op->direction);	2303	move_player (op, op->direction);
2372	if (op->speed_left > 0)	2304
2373	return 1;	2305	return op->speed_left > 0;
2374	else	2306	}
2375	return 0;
2376	}	2307	}
2377		2308
2378	return 0;	2309	return 0;
2379	}	2310	}
2380		2311
…		…
2418	* from.	2349	* from.
2419	*/	2350	*/
2420	void	2351	void
2421	remove_unpaid_objects (object *op, object *env)	2352	remove_unpaid_objects (object *op, object *env)
2422	{	2353	{
2423	object *next;
2424
2425	while (op)	2354	while (op)
2426	{	2355	{
2427	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2356	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2428		2357
2429	if (QUERY_FLAG (op, FLAG_UNPAID))	2358	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2495	int rate_grace = 2000;	2424	int rate_grace = 2000;
2496	const int max_hp = 1;	2425	const int max_hp = 1;
2497	const int max_sp = 1;	2426	const int max_sp = 1;
2498	const int max_grace = 1;	2427	const int max_grace = 1;
2499		2428
2500	if (op->contr->outputs_sync)	2429	if (op->contr->hidden)
		2430	{
		2431	op->invisible = 1000;
		2432	/* the socket code flashes the player visible/invisible
		2433	* depending on the value of invisible, so we need to
		2434	* alternate it here for it to work correctly.
		2435	*/
		2436	if (pticks & 2)
		2437	op->invisible--;
2501	{	2438	}
2502	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2439	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2503	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2440	{
2504	flush_output_element (op, &op->contr->outputs[i]);	2441	if (!op->invisible--)
		2442	{
		2443	make_visible (op);
		2444	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2445	}
2505	}	2446	}
2506		2447
2507	if (op->contr->ns->state == ST_PLAYING)	2448	if (op->contr->ns->state == ST_PLAYING)
2508	{	2449	{
2509	/* these next three if clauses make it possible to SLOW DOWN	2450	/* these next three if clauses make it possible to SLOW DOWN
…		…
2531	gen_grace = op->stats.maxgrace;	2472	gen_grace = op->stats.maxgrace;
2532	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2473	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2533	}	2474	}
2534		2475
2535	/* Regenerate Spell Points */	2476	/* Regenerate Spell Points */
2536	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2477	if (!op->contr->golem && --op->last_sp < 0)
2537	{	2478	{
2538	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2479	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2539	if (op->stats.sp < op->stats.maxsp)	2480	if (op->stats.sp < op->stats.maxsp)
2540	{	2481	{
2541	op->stats.sp++;	2482	op->stats.sp++;
…		…
2759	tmp->name = buf;	2700	tmp->name = buf;
2760	sprintf (buf, " This finger has been cut off %s\n"	2701	sprintf (buf, " This finger has been cut off %s\n"
2761	" the %s, when he was defeated at\n level %d by %s.\n",	2702	" the %s, when he was defeated at\n level %d by %s.\n",
2762	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2703	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2763	tmp->msg = buf;	2704	tmp->msg = buf;
2764	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2705	tmp->value = 0, tmp->type = 0;
2765	tmp->materialname = NULL;	2706	tmp->materialname = "organics";
2766	op->insert_at (tmp, op);	2707	tmp->insert_at (op, tmp);
2767	}	2708	}
2768		2709
2769	/* teleport defeated player to new destination */	2710	/* teleport defeated player to new destination */
2770	transfer_ob (op, x, y, 0, NULL);	2711	transfer_ob (op, x, y, 0, NULL);
2771	op->contr->braced = 0;	2712	op->contr->braced = 0;
…		…
2776		2717
2777	command_kill_pets (op, 0);	2718	command_kill_pets (op, 0);
2778		2719
2779	if (op->stats.food < 0)	2720	if (op->stats.food < 0)
2780	{	2721	{
2781	if (op->contr->explore)
2782	{
2783	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785	op->stats.food = 999;
2786	return;
2787	}
2788	sprintf (buf, "%s starved to death.", &op->name);	2722	sprintf (buf, "%s starved to death.", &op->name);
2789	strcpy (op->contr->killer, "starvation");	2723	strcpy (op->contr->killer, "starvation");
2790	}	2724	}
2791	else	2725	else
2792	{
2793	if (op->contr->explore)
2794	{
2795	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797	op->stats.hp = op->stats.maxhp;
2798	return;
2799	}
2800	sprintf (buf, "%s died.", &op->name);	2726	sprintf (buf, "%s died.", &op->name);
2801	}
2802		2727
2803	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2728	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2804		2729
2805	/* save the map location for corpse, gravestone */	2730	/* save the map location for corpse, gravestone */
2806	x = op->x;	2731	x = op->x;
…		…
2982	op->stats.hp = op->stats.maxhp;	2907	op->stats.hp = op->stats.maxhp;
2983	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2908	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2984	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2909	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2985		2910
2986	/*	2911	/*
2987	* Check to see if the player is in a shop. IF so, then check to see if
2988	* the player has any unpaid items. If so, remove them and put them back	2912	* Check to see if the player has any unpaid items. If so, remove them
2989	* in the map.	2913	* and put them back in the map.
2990	*/	2914	*/
2991
2992	if (is_in_shop (op))
2993	remove_unpaid_objects (op->inv, op);	2915	remove_unpaid_objects (op->inv, op);
2994		2916
2995	/****************************************/	2917	/****************************************/
2996	/* */	2918	/* */
2997	/* Move player to his current respawn- */	2919	/* Move player to his current respawn- */
2998	/* position (usually last savebed) */	2920	/* position (usually last savebed) */
2999	/* */	2921	/* */
3000	/****************************************/	2922	/****************************************/
3001		2923
3002	enter_player_savebed (op);	2924	enter_player_savebed (op);
3003		2925
3004	/* Save the player before inserting the force to reduce
3005	* chance of abuse.
3006	*/
3007	op->contr->braced = 0;	2926	op->contr->braced = 0;
3008	op->contr->save ();
3009		2927
3010	/* it is possible that the player has blown something up	2928	/* it is possible that the player has blown something up
3011	* at his savebed location, and that can have long lasting	2929	* at his savebed location, and that can have long lasting
3012	* spell effects. So first see if there is a spell effect	2930	* spell effects. So first see if there is a spell effect
3013	* on the space that might harm the player.	2931	* on the space that might harm the player.
…		…
3042	void	2960	void
3043	loot_object (object *op)	2961	loot_object (object *op)
3044	{ /* Grab and destroy some treasure */	2962	{ /* Grab and destroy some treasure */
3045	object *tmp, *tmp2, *next;	2963	object *tmp, *tmp2, *next;
3046		2964
3047	if (op->container)	2965	op->close_container (); /* close open sack first */
3048	esrv_apply_container (op, op->container); /* close open sack first */
3049		2966
3050	for (tmp = op->inv; tmp; tmp = next)	2967	for (tmp = op->inv; tmp; tmp = next)
3051	{	2968	{
3052	next = tmp->below;	2969	next = tmp->below;
3053		2970
3054	if (tmp->invisible)	2971	if (tmp->invisible)
3055	continue;	2972	continue;
3056		2973
3057	tmp->remove ();	2974	tmp->remove ();
3058	tmp->x = op->x, tmp->y = op->y;	2975	tmp->x = op->x, tmp->y = op->y;
		2976
3059	if (tmp->type == CONTAINER)	2977	if (tmp->type == CONTAINER)
3060	{ /* empty container to ground */	2978	loot_object (tmp); /* empty container to ground */
3061	loot_object (tmp);	2979
3062	}
3063	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2980	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3064	{	2981	{
3065	if (tmp->nrof > 1)	2982	if (tmp->nrof > 1)
3066	{	2983	{
3067	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2984	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3068	tmp2->destroy ();	2985	tmp2->destroy ();
…		…
3079	/*	2996	/*
3080	* fix_weight(): Check recursively the weight of all players, and fix	2997	* fix_weight(): Check recursively the weight of all players, and fix
3081	* what needs to be fixed. Refresh windows and fix speed if anything	2998	* what needs to be fixed. Refresh windows and fix speed if anything
3082	* was changed.	2999	* was changed.
3083	*/	3000	*/
3084
3085	void	3001	void
3086	fix_weight (void)	3002	fix_weight (void)
3087	{	3003	{
3088	for_all_players (pl)	3004	for_all_players (pl)
3089	{	3005	{
…		…
3149	if (op->type == PLAYER)	3065	if (op->type == PLAYER)
3150	{	3066	{
3151	op->contr->tmp_invis = 0;	3067	op->contr->tmp_invis = 0;
3152	op->contr->invis_race = 0;	3068	op->contr->invis_race = 0;
3153	}	3069	}
		3070
3154	update_object (op, UP_OBJ_FACE);	3071	update_object (op, UP_OBJ_CHANGE);
3155	}	3072	}
3156		3073
3157	int	3074	int
3158	is_true_undead (object *op)	3075	is_true_undead (object *op)
3159	{	3076	{
3160	object *tmp = NULL;
3161
3162	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3077	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3163	return 1;	3078	return 1;
3164		3079
3165	return 0;	3080	return 0;
3166	}	3081	}
…		…
3225		3140
3226	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3141	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3227		3142
3228	/* its *extremely* hard to run and sneak/hide at the same time! */	3143	/* its *extremely* hard to run and sneak/hide at the same time! */
3229	if (op->type == PLAYER && op->contr->run_on)	3144	if (op->type == PLAYER && op->contr->run_on)
3230	{
3231	if (!skop || num >= skop->level)	3145	if (!skop || num >= skop->level)
3232	{	3146	{
3233	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3147	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3234	make_visible (op);	3148	make_visible (op);
3235	return;	3149	return;
3236	}	3150	}
3237	else	3151	else
3238	num += 20;	3152	num += 20;
3239	}	3153
3240	num += op->map->difficulty;	3154	num += op->map->difficulty;
3241	hide = hideability (op); /* modify by terrain hidden level */	3155	hide = hideability (op); /* modify by terrain hidden level */
3242	num -= hide;	3156	num -= hide;
		3157
3243	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3158	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3244	{	3159	{
3245	make_visible (op);	3160	make_visible (op);
3246	if (op->type == PLAYER)	3161	if (op->type == PLAYER)
3247	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3162	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3248	}	3163	}
3249	else if (op->type == PLAYER && skop)	3164	else if (op->type == PLAYER && skop)
3250	{
3251	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3165	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3252	}
3253	}	3166	}
3254		3167
3255	/* determine if who is standing near a hostile creature. */	3168	/* determine if who is standing near a hostile creature. */
3256		3169
3257	int	3170	int
…		…
3456	char buf[MAX_BUF]; /* tmp. string buffer */	3369	char buf[MAX_BUF]; /* tmp. string buffer */
3457	int i = 0, j = 0;	3370	int i = 0, j = 0;
3458		3371
3459	/* get the appropriate treasurelist */	3372	/* get the appropriate treasurelist */
3460	if (atnr == ATNR_FIRE)	3373	if (atnr == ATNR_FIRE)
3461	trlist = find_treasurelist ("dragon_ability_fire");	3374	trlist = treasurelist::find ("dragon_ability_fire");
3462	else if (atnr == ATNR_COLD)	3375	else if (atnr == ATNR_COLD)
3463	trlist = find_treasurelist ("dragon_ability_cold");	3376	trlist = treasurelist::find ("dragon_ability_cold");
3464	else if (atnr == ATNR_ELECTRICITY)	3377	else if (atnr == ATNR_ELECTRICITY)
3465	trlist = find_treasurelist ("dragon_ability_elec");	3378	trlist = treasurelist::find ("dragon_ability_elec");
3466	else if (atnr == ATNR_POISON)	3379	else if (atnr == ATNR_POISON)
3467	trlist = find_treasurelist ("dragon_ability_poison");	3380	trlist = treasurelist::find ("dragon_ability_poison");
3468		3381
3469	if (trlist == NULL || who->type != PLAYER)	3382	if (trlist == NULL || who->type != PLAYER)
3470	return;	3383	return;
3471		3384
3472	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3385	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3604	* not readied.	3517	* not readied.
3605	*/	3518	*/
3606	void	3519	void
3607	player_unready_range_ob (player *pl, object *ob)	3520	player_unready_range_ob (player *pl, object *ob)
3608	{	3521	{
3609	rangetype i;	3522	if (pl->ob->current_weapon == ob)
		3523	pl->ob->current_weapon = 0;
3610		3524
3611	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3525	if (pl->combat_ob == ob)
3612	{	3526	pl->combat_ob = 0;
		3527
3613	if (pl->ranges[i] == ob)	3528	if (pl->ranged_ob == ob)
3614	{	3529	pl->ranged_ob = 0;
3615	pl->ranges[i] = NULL;
3616	if (pl->shoottype == i)
3617	{
3618	pl->shoottype = range_none;
3619	}
3620	}
3621	}
3622	}	3530	}
		3531
		3532	sint8
		3533	player::visibility_at (maptile *map, int x, int y) const
		3534	{
		3535	if (!ns)
		3536	return 0;
		3537
		3538	int dx, dy;
		3539	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3540	return 0;
		3541
		3542	x += dx - ns->current_x + ns->mapx / 2;
		3543	y += dy - ns->current_y + ns->mapy / 2;
		3544
		3545	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3546	return 0;
		3547
		3548	return 100 - blocked_los [x][y];
		3549	}

Diff Legend

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