ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.87 by elmex, Fri Jan 5 16:17:29 2007 UTC vs.
Revision 1.133 by root, Sat May 12 22:04:20 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.5f;
302	ob->speed = 1.0;	325	ob->speed = 1.0f;
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
…		…
794	}	784	}
795		785
796	void	786	void
797	object::roll_stats ()	787	object::roll_stats ()
798	{	788	{
799	int statsort [7];	789	int statsort [NUM_STATS];
800		790
801	for (;;)	791	for (;;)
802	{	792	{
803	int sum = 0;	793	int sum = 0;
804	for (int i = 7; i--; )	794	for (int i = NUM_STATS; i--; )
805	sum += statsort [i] = roll_stat ();	795	sum += statsort [i] = roll_stat ();
806		796
807	if (sum >= 82 && sum <= 116)	797	if (sum >= 82 && sum <= 116)
808	break;	798	break;
809	}	799	}
810		800
811	// Sort the stats so that rerolling is easier...	801	// Sort the stats so that rerolling is easier...
812	std::sort (statsort, statsort + 7, std::greater<int>());	802	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813		803
		804	for (int i = 0; i < NUM_STATS; ++i)
814	stats.Str = statsort[0];	805	stats.stat (i) = statsort [i];
815	stats.Dex = statsort[1];
816	stats.Con = statsort[2];
817	stats.Int = statsort[3];
818	stats.Wis = statsort[4];
819	stats.Pow = statsort[5];
820	stats.Cha = statsort[6];
821		806
822	stats.exp = 0;	807	stats.exp = 0;
823	stats.ac = 0;	808	stats.ac = 0;
824		809
825	stats.hp = stats.maxhp;	810	stats.hp = stats.maxhp;
…		…
837	}	822	}
838		823
839	void	824	void
840	object::swap_stats (int a, int b)	825	object::swap_stats (int a, int b)
841	{	826	{
842	int tmp = get_attr_value (&contr->orig_stats, a);	827	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844	set_attr_value (&contr->orig_stats, b, tmp);
845		828
		829	for (int i = 0; i < NUM_STATS; ++i)
846	stats.Str = contr->orig_stats.Str;	830	stats.stat (i) = contr->orig_stats.stat (i);
847	stats.Dex = contr->orig_stats.Dex;
848	stats.Con = contr->orig_stats.Con;
849	stats.Int = contr->orig_stats.Int;
850	stats.Wis = contr->orig_stats.Wis;
851	stats.Pow = contr->orig_stats.Pow;
852	stats.Cha = contr->orig_stats.Cha;
853		831
854	//TODO: the following code looks so borked and should, at the very least,	832	//TODO: the following code looks so borked and should, at the very least,
855	// be merged with the similar code in roll_stats	833	// be merged with the similar code in roll_stats
856	stats.ac = 0;	834	stats.ac = 0;
857		835
…		…
888	* appropriate action with it (change race, or other things).	866	* appropriate action with it (change race, or other things).
889	* The function name is for historical reasons - now we have	867	* The function name is for historical reasons - now we have
890	* separate race and class; this actually changes the RACE,	868	* separate race and class; this actually changes the RACE,
891	* not the class.	869	* not the class.
892	*/	870	*/
893	int	871	void
894	key_change_class (object *op, char key)	872	player::chargen_race_done ()
895	{	873	{
896	int tmp_loop;
897
898	if (key == 'd' || key == 'D')
899	{
900	char buf[MAX_BUF];
901
902	/* this must before then initial items are given */	874	/* this must before then initial items are given */
903	esrv_new_player (op->contr, op->weight + op->carrying);	875	esrv_new_player (ob->contr, ob->weight + ob->carrying);
904		876
905	treasurelist *tl = find_treasurelist ("starting_wealth");	877	treasurelist *tl = treasurelist::find ("starting_wealth");
906	if (tl)	878	if (tl)
907	create_treasure (tl, op, 0, 0, 0);	879	create_treasure (tl, ob, 0, 0, 0);
908		880
909	INVOKE_PLAYER (BIRTH, op->contr);	881	INVOKE_PLAYER (BIRTH, ob->contr);
910	INVOKE_PLAYER (LOGIN, op->contr);	882	INVOKE_PLAYER (LOGIN, ob->contr);
911		883
912	op->contr->ns->state = ST_PLAYING;	884	ob->contr->ns->state = ST_PLAYING;
913		885
914	if (op->msg)	886	if (ob->msg)
915	op->msg = NULL;	887	ob->msg = 0;
916		888
917	/* We create this now because some of the unique maps will need it	889	/* We create this now because some of the unique maps will need it
918	* to save here.	890	* to save here.
919	*/	891	*/
		892	{
		893	char buf[MAX_BUF];
920	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921	make_path_to_file (buf);	895	make_path_to_file (buf);
		896	}
922		897
923	#ifdef AUTOSAVE
924	op->contr->last_save_tick = pticks;
925	#endif
926	start_info (op);	898	start_info (ob);
927	CLEAR_FLAG (op, FLAG_WIZ);	899	CLEAR_FLAG (ob, FLAG_WIZ);
928	give_initial_items (op, op->randomitems);	900	give_initial_items (ob, ob->randomitems);
929	link_player_skills (op);	901	link_player_skills (ob);
930	esrv_send_inventory (op, op);	902	esrv_send_inventory (ob, ob);
931	op->update_stats ();	903	ob->update_stats ();
932		904
933	/* This moves the player to a different start map, if there	905	/* This moves the player to a different start map, if there
934	* is one for this race	906	* is one for this race
935	*/	907	*/
936	if (*first_map_ext_path)	908	if (*first_map_ext_path)
937	{	909	{
938	object *tmp;	910	object *tmp;
939	char mapname[MAX_BUF];	911	char mapname[MAX_BUF];
940		912
941	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);	913	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
942	tmp = object::create ();	914	tmp = object::create ();
943	EXIT_PATH (tmp) = mapname;	915	EXIT_PATH (tmp) = mapname;
944	EXIT_X (tmp) = op->x;	916	EXIT_X (tmp) = ob->x;
945	EXIT_Y (tmp) = op->y;	917	EXIT_Y (tmp) = ob->y;
946	op->enter_exit (tmp); /* we don't really care if it succeeded;	918	ob->enter_exit (tmp); /* we don't really care if it succeeded;
947	* if the map isn't there, then stay on the	919	* if the map isn't there, then stay on the
948	* default initial map */	920	* default initial map */
949	tmp->destroy ();	921	tmp->destroy ();
950	}	922	}
951	else	923	else
952	LOG (llevDebug, "first_map_ext_path not set\n");	924	LOG (llevDebug, "first_map_ext_path not set\n");
		925	}
953		926
954	return 0;	927	void
955	}	928	player::chargen_race_next ()
956		929	{
957	/* Following actually changes the race - this is the default command	930	/* Following actually changes the race - this is the default command
958	* if we don't match with one of the options above.	931	* if we don't match with one of the options above.
959	*/	932	*/
960		933
961	tmp_loop = 0;	934	do
962	while (!tmp_loop)
963	{	935	{
964	shstr name = op->name;	936	shstr name = ob->name;
965	int x = op->x, y = op->y;	937	int x = ob->x, y = ob->y;
966		938
967	op->remove_statbonus ();	939	ob->remove_statbonus ();
968	op->remove ();	940	ob->remove ();
969	op->arch = get_player_archetype (op->arch);	941	ob->arch = get_player_archetype (ob->arch);
970	op->arch->clone.copy_to (op);	942	ob->arch->clone.copy_to (ob);
971	op->instantiate ();	943	ob->instantiate ();
972	op->stats = op->contr->orig_stats;	944	ob->stats = ob->contr->orig_stats;
973	op->name = op->name_pl = name;	945	ob->name = ob->name_pl = name;
974	op->x = x;	946	ob->x = x;
975	op->y = y;	947	ob->y = y;
976	SET_ANIMATION (op, 2); /* So player faces south */	948	SET_ANIMATION (ob, 2); /* So player faces south */
977	insert_ob_in_map (op, op->map, op, 0);	949	insert_ob_in_map (ob, ob->map, ob, 0);
978	assign (op->contr->title, op->arch->clone.name);	950	assign (ob->contr->title, ob->arch->clone.name);
979	op->add_statbonus ();	951	ob->add_statbonus ();
980	tmp_loop = allowed_class (op);
981	}	952	}
		953	while (!allowed_class (ob));
982		954
983	update_object (op, UP_OBJ_FACE);	955	update_object (ob, UP_OBJ_FACE);
984	esrv_update_item (UPD_FACE, op, op);	956	esrv_update_item (UPD_FACE, ob, ob);
985	op->update_stats ();	957	ob->update_stats ();
986	op->stats.hp = op->stats.maxhp;	958	ob->stats.hp = ob->stats.maxhp;
987	op->stats.sp = op->stats.maxsp;	959	ob->stats.sp = ob->stats.maxsp;
988	op->stats.grace = 0;	960	ob->stats.grace = 0;
989
990	if (op->msg)
991	new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994	return 0;
995	}
996
997	int
998	key_confirm_quit (object *op, char key)
999	{
1000	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001	{
1002	op->contr->ns->state = ST_PLAYING;
1003	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004	return 1;
1005	}
1006
1007	INVOKE_PLAYER (LOGOUT, op->contr);
1008	INVOKE_PLAYER (QUIT, op->contr);
1009
1010	op->contr->enable_save = false;
1011	delete_character (op->name);
1012
1013	terminate_all_pets (op);
1014	op->remove ();
1015	op->direction = 0;
1016	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1017
1018	strcpy (op->contr->killer, "quit");
1019	check_score (op);
1020	op->contr->party = 0;
1021	op->contr->own_title[0] = '\0';
1022	op->contr->destroy ();
1023
1024	return 1;
1025	}	961	}
1026		962
1027	void	963	void
1028	flee_player (object *op)	964	flee_player (object *op)
1029	{	965	{
…		…
1076	/* Cornered, get rid of scared */	1012	/* Cornered, get rid of scared */
1077	CLEAR_FLAG (op, FLAG_SCARED);	1013	CLEAR_FLAG (op, FLAG_SCARED);
1078	op->enemy = NULL;	1014	op->enemy = NULL;
1079	}	1015	}
1080		1016
1081
1082	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1017	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1083	* IT returns 1 if the player should keep on moving, 0 if he should	1018	* It returns 1 if the player should keep on moving, 0 if he should
1084	* stop.	1019	* stop.
1085	*/	1020	*/
1086	int	1021	int
1087	check_pick (object *op)	1022	check_pick (object *op)
1088	{	1023	{
1089	object *tmp, *next;	1024	object *tmp, *next;
1090	int stop = 0;	1025	int stop = 0;
1091	int j, k, wvratio;	1026	int wvratio;
1092	char putstring[128], tmpstr[16];	1027	char putstring[128];
1093		1028
1094	/* if you're flying, you cna't pick up anything */	1029	/* if you're flying, you cna't pick up anything */
1095	if (op->move_type & MOVE_FLYING)	1030	if (op->move_type & MOVE_FLYING)
1096	return 1;	1031	return 1;
1097		1032
…		…
1434	* found object is returned.	1369	* found object is returned.
1435	*/	1370	*/
1436	object *	1371	object *
1437	find_arrow (object *op, const char *type)	1372	find_arrow (object *op, const char *type)
1438	{	1373	{
1439	object *tmp = NULL;	1374	object *tmp = 0;
1440		1375
1441	for (op = op->inv; op; op = op->below)	1376	for (op = op->inv; op; op = op->below)
1442	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1377	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1443	tmp = find_arrow (op, type);	1378	tmp = find_arrow (op, type);
1444	else if (op->type == ARROW && op->race == type)	1379	else if (op->type == ARROW && op->race == type)
1445	return op;	1380	return op;
		1381
1446	return tmp;	1382	return tmp;
1447	}	1383	}
1448		1384
1449	/*	1385	/*
1450	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1386	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1451	* against the target. A full test is not performed, simply a basic test	1387	* against the target. A full test is not performed, simply a basic test
1452	* of resistances. The archer is making a quick guess at what he sees down	1388	* of resistances. The archer is making a quick guess at what he sees down
1453	* the hall. Failing that it does it's best to pick the highest plus arrow.	1389	* the hall. Failing that it does it's best to pick the highest plus arrow.
1454	*/	1390	*/
1455
1456	object *	1391	object *
1457	find_better_arrow (object *op, object *target, const char *type, int *better)	1392	find_better_arrow (object *op, object *target, const char *type, int *better)
1458	{	1393	{
1459	object *tmp = NULL, *arrow, *ntmp;	1394	object *tmp = NULL, *arrow, *ntmp;
1460	int attacknum, attacktype, betterby = 0, i;	1395	int attacknum, attacktype, betterby = 0, i;
…		…
1526	* find_better_arrow to find a decent arrow to use.	1461	* find_better_arrow to find a decent arrow to use.
1527	* op = the shooter	1462	* op = the shooter
1528	* type = bow->race	1463	* type = bow->race
1529	* dir = fire direction	1464	* dir = fire direction
1530	*/	1465	*/
1531
1532	object *	1466	object *
1533	pick_arrow_target (object *op, const char *type, int dir)	1467	pick_arrow_target (object *op, const char *type, int dir)
1534	{	1468	{
1535	object *tmp = NULL;	1469	object *tmp = NULL;
1536	maptile *m;	1470	maptile *m;
…		…
1601	*/	1535	*/
1602	int	1536	int
1603	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1537	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1604	{	1538	{
1605	object *left, *bow;	1539	object *left, *bow;
1606	int bowspeed, mflags;	1540	int mflags;
1607	maptile *m;	1541	maptile *m;
1608		1542
1609	if (!dir)	1543	if (!dir)
1610	{	1544	{
1611	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1545	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1612	return 0;	1546	return 0;
1613	}	1547	}
1614		1548
1615	if (op->type == PLAYER)	1549	if (player *pl = op->contr)
1616	bow = op->contr->ranges[range_bow];	1550	{
		1551	bow = pl->ranged_ob;
		1552	if (!op->change_weapon (bow))
		1553	return 0;
		1554	}
1617	else	1555	else
1618	{	1556	{
1619	for (bow = op->inv; bow; bow = bow->below)	1557	for (bow = op->inv; bow; bow = bow->below)
1620	/* Don't check for applied - monsters don't apply bows - in that way, they	1558	/* Don't check for applied - monsters don't apply bows - in that way, they
1621	* don't need to switch back and forth between bows and weapons.	1559	* don't need to switch back and forth between bows and weapons.
…		…
1626	if (!bow)	1564	if (!bow)
1627	{	1565	{
1628	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1566	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1629	return 0;	1567	return 0;
1630	}	1568	}
		1569
		1570	// optimisation: move object to top so we will find it quickly again
		1571	if (bow->below)
		1572	{
		1573	bow->remove ();
		1574	op->insert (bow);
		1575	}
		1576
1631	}	1577	}
1632		1578
1633	if (!bow->race || !bow->skill)	1579	if (!bow->race || !bow->skill)
1634	{	1580	{
1635	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1581	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1636	return 0;	1582	return 0;
1637	}	1583	}
1638
1639	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1640
1641	/* penalize ROF for bestarrow */
1642	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1643	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1644
1645	if (bowspeed < 1)
1646	bowspeed = 1;
1647		1584
1648	if (arrow == NULL)	1585	if (arrow == NULL)
1649	{	1586	{
1650	if ((arrow = find_arrow (op, bow->race)) == NULL)	1587	if ((arrow = find_arrow (op, bow->race)) == NULL)
1651	{	1588	{
1652	if (op->type == PLAYER)	1589	if (op->type == PLAYER)
1653	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1590	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1654	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1591	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1655	else	1592	else
1656	CLEAR_FLAG (op, FLAG_READY_BOW);	1593	CLEAR_FLAG (op, FLAG_READY_BOW);
		1594
1657	return 0;	1595	return 0;
1658	}	1596	}
1659	}	1597	}
1660		1598
1661	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1599	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1685		1623
1686	arrow->set_owner (op);	1624	arrow->set_owner (op);
1687	arrow->skill = bow->skill;	1625	arrow->skill = bow->skill;
1688	arrow->direction = dir;	1626	arrow->direction = dir;
1689		1627
		1628	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1629	arrow->stats.hp = arrow->stats.dam;
		1630	arrow->stats.grace = arrow->attacktype;
		1631
		1632	if (arrow->slaying)
		1633	arrow->spellarg = strdup (arrow->slaying);
		1634
		1635	if (player *pl = op->contr)
		1636	{
		1637	pl->has_hit = 1;
		1638	#if 0
		1639	float speed = pl->weapon_sp;
		1640
		1641	/* penalize ROF for bestarrow */
		1642	if (pl->bowtype == bow_bestarrow)
		1643	speed *= .9f;
		1644	else
		1645	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1646
		1647	op->speed_left += speed - op->speed;
		1648	#endif
		1649	}
		1650
		1651	SET_ANIMATION (arrow, arrow->direction);
		1652
		1653	/* update the speed */
		1654	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
		1655	+ bow->stats.dam / 7.0;
		1656
		1657	arrow->set_speed (max (arrow->speed, 2.0));
		1658	arrow->speed_left = 0;
		1659
		1660	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1661
1690	if (op->type == PLAYER)	1662	if (op->type == PLAYER)
1691	{	1663	{
1692	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1693	op->update_stats ();
1694	}
1695
1696	SET_ANIMATION (arrow, arrow->direction);
1697	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1698	arrow->stats.hp = arrow->stats.dam;
1699	arrow->stats.grace = arrow->attacktype;
1700	if (arrow->slaying != NULL)
1701	arrow->spellarg = strdup (arrow->slaying);
1702
1703	/* Note that this was different for monsters - they got their level
1704	* added to the damage. I think the strength bonus is more proper.
1705	*/
1706
1707	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1708
1709	/* update the speed */
1710	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1711	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1712
1713	arrow->set_speed (max (arrow->speed, 1.0));
1714	arrow->speed_left = 0;
1715
1716	if (op->type == PLAYER)
1717	{
1718	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1719	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1720	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1721
1722	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1664	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1665	wc -= dex_bonus[op->stats.Dex];
		1666
		1667	if (!arrow->slaying)
		1668	arrow->slaying = op->slaying;
		1669
		1670	arrow->attacktype |= op->attacktype;
1723	}	1671	}
1724	else	1672	else
1725	{	1673	{
1726	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1727	arrow->level = op->level;	1674	arrow->level = op->level;
1728	}	1675	arrow->stats.wc -= bow->magic;
1729		1676
1730	if (arrow->attacktype == AT_PHYSICAL)	1677	if (!arrow->slaying)
		1678	arrow->slaying = bow->slaying;
		1679
1731	arrow->attacktype |= bow->attacktype;	1680	arrow->attacktype |= bow->attacktype;
		1681	}
1732		1682
1733	if (bow->slaying)	1683	wc -= arrow->level;
1734	arrow->slaying = bow->slaying;	1684	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1735		1685
		1686	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736	arrow->move_type = MOVE_FLY_LOW;	1687	arrow->move_type = MOVE_FLY_LOW;
1737	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738		1689
1739	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1740	m->insert (arrow, sx, sy, op);	1691	m->insert (arrow, sx, sy, op);
…		…
1765	{	1716	{
1766	int ret = 0, wcmod = 0;	1717	int ret = 0, wcmod = 0;
1767		1718
1768	if (op->contr->bowtype == bow_bestarrow)	1719	if (op->contr->bowtype == bow_bestarrow)
1769	{	1720	{
1770	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1721	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771	}	1722	}
1772	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1723	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773	{	1724	{
1774	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1725	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775	wcmod = -1;	1726	wcmod = -1;
…		…
1785	else if (op->contr->bowtype == bow_spreadshot)	1736	else if (op->contr->bowtype == bow_spreadshot)
1786	{	1737	{
1787	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1738	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1788	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1739	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1789	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1740	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1790
1791	}	1741	}
1792	else	1742	else
1793	{	1743	{
1794	/* Simple case */	1744	/* Simple case */
1795	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1745	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1796	}	1746	}
		1747
1797	return ret;	1748	return ret;
1798	}	1749	}
1799		1750
1800		1751
1801	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1802	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1803	*/	1754	*/
1804	void	1755	void
1805	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
1806	{	1757	{
1807	object *item;	1758	object *item = op->contr->ranged_ob;
1808		1759
1809	if (!op->contr->ranges[range_misc])	1760	if (!item)
1810	{	1761	{
1811	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");	1762	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1812	return;	1763	return;
1813	}	1764	}
1814		1765
1815	item = op->contr->ranges[range_misc];
1816	if (!item->inv)	1766	if (!item->inv)
1817	{	1767	{
1818	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1819	return;	1769	return;
1820	}	1770	}
		1771
		1772	if (!op->change_weapon (item))
		1773	return;
		1774
1821	if (item->type == WAND)	1775	if (item->type == WAND)
1822	{	1776	{
1823	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1824	{	1778	{
1825	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1826	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));	1780	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1781
1827	return;	1782	return;
1828	}	1783	}
1829	}	1784	}
1830	else if (item->type == ROD || item->type == HORN)	1785	else if (item->type == ROD || item->type == HORN)
1831	{	1786	{
1832	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1787	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1833	{	1788	{
1834	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1790
1835	if (item->type == ROD)	1791	if (item->type == ROD)
1836	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1792	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1837	else	1793	else
1838	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));	1794	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
		1795
1839	return;	1796	return;
1840	}	1797	}
1841	}	1798	}
1842		1799
1843	if (cast_spell (op, item, dir, item->inv, NULL))	1800	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1874		1831
1875	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
1876	if (action_makes_visible (op))	1833	if (action_makes_visible (op))
1877	make_visible (op);	1834	make_visible (op);
1878		1835
1879	switch (op->contr->shoottype)	1836	player *pl = op->contr;
		1837
		1838	if (pl->golem)
1880	{	1839	{
1881	case range_none:	1840	control_golem (op->contr->golem, dir);
1882	return;	1841	return;
		1842	}
1883		1843
1884	case range_bow:	1844	object *ob = pl->ranged_ob;
		1845
		1846	if (!ob)
		1847	return;
		1848
		1849	switch (ob->type)
		1850	{
		1851	case BOW:
1885	player_fire_bow (op, dir);	1852	player_fire_bow (op, dir);
1886	return;	1853	break;
1887		1854
1888	case range_magic: /* Casting spells */	1855	case SPELL:
1889	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1856	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1890	return;	1857	break;
1891		1858
1892	case range_misc:	1859	case BUILDER:
		1860	apply_map_builder (op, dir);
		1861	break;
		1862
		1863	case SKILL:
		1864	case SKILL_TOOL:
		1865	do_skill (op, op, ob, dir, 0);
		1866	break;
		1867
		1868	default:
1893	fire_misc_object (op, dir);	1869	fire_misc_object (op, dir);
1894	return;	1870	break;
1895
1896	case range_golem: /* Control summoned monsters from scrolls */
1897	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1898	{
1899	op->contr->ranges[range_golem] = 0;
1900	op->contr->shoottype = range_none;
1901	}
1902	else
1903	control_golem (op->contr->ranges[range_golem], dir);
1904	return;
1905
1906	case range_skill:
1907	if (!op->chosen_skill)
1908	{
1909	if (op->type == PLAYER)
1910	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1911	return;
1912	}
1913	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1914	return;
1915	case range_builder:
1916	apply_map_builder (op, dir);
1917	return;
1918	default:
1919	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1920	return;
1921	}	1871	}
1922	}	1872	}
1923
1924
1925		1873
1926	/* find_key	1874	/* find_key
1927	* We try to find a key for the door as passed. If we find a key	1875	* We try to find a key for the door as passed. If we find a key
1928	* and successfully use it, we return the key, otherwise NULL	1876	* and successfully use it, we return the key, otherwise NULL
1929	* This function merges both normal and locked door, since the logic	1877	* This function merges both normal and locked door, since the logic
…		…
1931	* pl is the player,	1879	* pl is the player,
1932	* inv is the objects inventory to searched	1880	* inv is the objects inventory to searched
1933	* door is the door we are trying to match against.	1881	* door is the door we are trying to match against.
1934	* This function can be called recursively to search containers.	1882	* This function can be called recursively to search containers.
1935	*/	1883	*/
1936
1937	object *	1884	object *
1938	find_key (object *pl, object *container, object *door)	1885	find_key (object *pl, object *container, object *door)
1939	{	1886	{
1940	object *tmp, *key;	1887	object *tmp, *key;
1941		1888
1942	/* Should not happen, but sanity checking is never bad */	1889	/* Should not happen, but sanity checking is never bad */
1943	if (container->inv == NULL)	1890	if (!container->inv)
1944	return NULL;	1891	return 0;
1945		1892
1946	/* First, lets try to find a key in the top level inventory */	1893	/* First, lets try to find a key in the top level inventory */
1947	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1894	for (tmp = container->inv; tmp; tmp = tmp->below)
1948	{	1895	{
1949	if (door->type == DOOR && tmp->type == KEY)	1896	if (door->type == DOOR && tmp->type == KEY)
1950	break;	1897	break;
1951	/* For sanity, we should really check door type, but other stuff	1898	/* For sanity, we should really check door type, but other stuff
1952	* (like containers) can be locked with special keys	1899	* (like containers) can be locked with special keys
1953	*/	1900	*/
1954	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1901	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1955	break;	1902	break;
1956	}	1903	}
		1904
1957	/* No key found - lets search inventories now */	1905	/* No key found - lets search inventories now */
1958	/* If we find and use a key in an inventory, return at that time.	1906	/* If we find and use a key in an inventory, return at that time.
1959	* otherwise, if we search all the inventories and still don't find	1907	* otherwise, if we search all the inventories and still don't find
1960	* a key, return	1908	* a key, return
1961	*/	1909	*/
1962	if (!tmp)	1910	if (!tmp)
1963	{	1911	{
1964	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1912	for (tmp = container->inv; tmp; tmp = tmp->below)
1965	{	1913	{
1966	/* No reason to search empty containers */	1914	/* No reason to search empty containers */
1967	if (tmp->type == CONTAINER && tmp->inv)	1915	if (tmp->type == CONTAINER && tmp->inv)
1968	{	1916	{
1969	if ((key = find_key (pl, tmp, door)) != NULL)	1917	if ((key = find_key (pl, tmp, door)))
1970	return key;	1918	return key;
1971	}	1919	}
1972	}	1920	}
		1921
1973	if (!tmp)	1922	if (!tmp)
1974	return NULL;	1923	return NULL;
1975	}	1924	}
		1925
1976	/* We get down here if we have found a key. Now if its in a container,	1926	/* We get down here if we have found a key. Now if its in a container,
1977	* see if we actually want to use it	1927	* see if we actually want to use it
1978	*/	1928	*/
1979	if (pl != container)	1929	if (pl != container)
1980	{	1930	{
…		…
2001	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1951	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2002	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1952	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2003	return NULL;	1953	return NULL;
2004	}	1954	}
2005	}	1955	}
		1956
2006	return tmp;	1957	return tmp;
2007	}	1958	}
2008		1959
2009	/* moved door processing out of move_player_attack.	1960	/* moved door processing out of move_player_attack.
2010	* returns 1 if player has opened the door with a key	1961	* returns 1 if player has opened the door with a key
…		…
2024	if (key)	1975	if (key)
2025	{	1976	{
2026	object *container = key->env;	1977	object *container = key->env;
2027		1978
2028	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1979	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1980
2029	if (action_makes_visible (op))	1981	if (action_makes_visible (op))
2030	make_visible (op);	1982	make_visible (op);
		1983
2031	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1984	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2032	spring_trap (door->inv, op);	1985	spring_trap (door->inv, op);
		1986
2033	if (door->type == DOOR)	1987	if (door->type == DOOR)
2034	{
2035	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1988	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2036	}
2037	else if (door->type == LOCKED_DOOR)	1989	else if (door->type == LOCKED_DOOR)
2038	{	1990	{
2039	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1991	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2040	remove_door2 (door); /* remove door without violence ;-) */	1992	remove_door2 (door); /* remove door without violence ;-) */
2041	}	1993	}
		1994
2042	/* Do this after we print the message */	1995	/* Do this after we print the message */
2043	decrease_ob (key); /* Use up one of the keys */	1996	decrease_ob (key); /* Use up one of the keys */
2044	/* Need to update the weight the container the key was in */	1997	/* Need to update the weight the container the key was in */
2045	if (container != op)	1998	if (container != op)
2046	esrv_update_item (UPD_WEIGHT, op, container);	1999	esrv_update_item (UPD_WEIGHT, op, container);
		2000
2047	return 1; /* Nothing more to do below */	2001	return 1; /* Nothing more to do below */
2048	}	2002	}
2049	else if (door->type == LOCKED_DOOR)	2003	else if (door->type == LOCKED_DOOR)
2050	{	2004	{
2051	/* Might as well return now - no other way to open this */	2005	/* Might as well return now - no other way to open this */
2052	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2006	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2053	return 1;	2007	return 1;
2054	}	2008	}
		2009
2055	return 0;	2010	return 0;
2056	}	2011	}
2057		2012
2058	/* This function is just part of a breakup from move_player.	2013	/* This function is just part of a breakup from move_player.
2059	* It should keep the code cleaner.	2014	* It should keep the code cleaner.
…		…
2063	*/	2018	*/
2064	void	2019	void
2065	move_player_attack (object *op, int dir)	2020	move_player_attack (object *op, int dir)
2066	{	2021	{
2067	object *tmp, *mon;	2022	object *tmp, *mon;
2068	sint16 nx, ny;
2069	int on_battleground;	2023	int on_battleground;
2070	maptile *m;	2024	maptile *m;
2071		2025
2072	nx = freearr_x[dir] + op->x;	2026	sint16 nx = freearr_x[dir] + op->x;
2073	ny = freearr_y[dir] + op->y;	2027	sint16 ny = freearr_y[dir] + op->y;
2074		2028
2075	on_battleground = op_on_battleground (op, 0, 0);	2029	on_battleground = op_on_battleground (op, 0, 0);
2076		2030
2077	/* If braced, or can't move to the square, and it is not out of the	2031	/* If braced, or can't move to the square, and it is not out of the
2078	* map, attack it. Note order of if statement is important - don't	2032	* map, attack it. Note order of if statement is important - don't
…		…
2158	/* If we're braced, we don't want to switch places with it */	2112	/* If we're braced, we don't want to switch places with it */
2159	if (op->contr->braced)	2113	if (op->contr->braced)
2160	return;	2114	return;
2161		2115
2162	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2163	(void) push_ob (mon, dir, op);	2117	push_ob (mon, dir, op);
2164	if (op->contr->tmp_invis || op->hide)	2118	if (op->contr->tmp_invis || op->hide)
2165	make_visible (op);	2119	make_visible (op);
2166		2120
2167	return;	2121	return;
2168	}	2122	}
…		…
2213	* that party_number -1 is no party, so attacks can still happen.	2167	* that party_number -1 is no party, so attacks can still happen.
2214	*/	2168	*/
2215	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2216	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2217	{	2171	{
2218
2219	/* If the player hasn't hit something this tick, and does
2220	* so, give them speed boost based on weapon speed. Doing
2221	* it here is better than process_players2, which basically
2222	* incurred a 1 tick offset.
2223	*/
2224	if (!op->contr->has_hit)	2172	op->contr->has_hit = 1;
2225	{
2226	op->speed_left += op->speed / op->contr->weapon_sp;
2227
2228	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2229	}
2230		2173
2231	skill_attack (mon, op, 0, 0, 0);	2174	skill_attack (mon, op, 0, 0, 0);
2232		2175
2233	/* If attacking another player, that player gets automatic	2176	/* If attacking another player, that player gets automatic
2234	* hitback, and doesn't loose luck either.	2177	* hitback, and doesn't loose luck either.
…		…
2265	return 0;	2208	return 0;
2266	}	2209	}
2267		2210
2268	/* peterm: added following line */	2211	/* peterm: added following line */
2269	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2212	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2270	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2213	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2271		2214
2272	op->facing = dir;	2215	op->facing = dir;
2273		2216
2274	if (op->hide)	2217	if (op->hide)
2275	do_hidden_move (op);	2218	do_hidden_move (op);
…		…
2308	* Returns true if there are more actions we can do.	2251	* Returns true if there are more actions we can do.
2309	*/	2252	*/
2310	int	2253	int
2311	handle_newcs_player (object *op)	2254	handle_newcs_player (object *op)
2312	{	2255	{
2313	if (op->contr->hidden)
2314	{
2315	op->invisible = 1000;
2316	/* the socket code flashes the player visible/invisible
2317	* depending on the value of invisible, so we need to
2318	* alternate it here for it to work correctly.
2319	*/
2320	if (pticks & 2)
2321	op->invisible--;
2322	}
2323	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2324	{
2325	op->invisible--;
2326	if (!op->invisible)
2327	{
2328	make_visible (op);
2329	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2330	}
2331	}
2332
2333	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2334	{	2257	{
2335	flee_player (op);	2258	flee_player (op);
		2259
2336	/* If player is still scared, that is his action for this tick */	2260	/* If player is still scared, that is his action for this tick */
2337	if (QUERY_FLAG (op, FLAG_SCARED))	2261	if (op->flag [FLAG_SCARED])
2338	{	2262	{
2339	op->speed_left--;	2263	--op->speed_left;
2340	return 0;	2264	return 0;
2341	}	2265	}
2342	}	2266	}
2343
2344	/* I've been seeing crashes where the golem has been destroyed, but
2345	* the player object still points to the defunct golem. The code that
2346	* destroys the golem looks correct, and it doesn't always happen, so
2347	* put this in a a workaround to clean up the golem pointer.
2348	*/
2349	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2350	op->contr->ranges[range_golem] = 0;
2351		2267
2352	/* call this here - we also will call this in do_ericserver, but	2268	/* call this here - we also will call this in do_ericserver, but
2353	* the players time has been increased when doericserver has been	2269	* the players time has been increased when doericserver has been
2354	* called, so we recheck it here.	2270	* called, so we recheck it here.
2355	*/	2271	*/
2356	if (op->contr->ns->handle_command ())	2272	if (op->contr->ns->handle_command ())
2357	return 1;	2273	return 1;
2358		2274
2359	if (op->speed_left > 0)	2275	if (op->speed_left > 0.f)
2360	{	2276	{
2361	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2277	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2362	{	2278	{
2363	/* All move commands take 1 tick, at least for now */	2279	/* All move commands take 1 tick, at least for now */
2364	op->speed_left--;	2280	--op->speed_left;
2365		2281
2366	/* Instead of all the stuff below, let move_player take care	2282	/* Instead of all the stuff below, let move_player take care
2367	* of it. Also, some of the skill stuff is only put in	2283	* of it. Also, some of the skill stuff is only put in
2368	* there, as well as the confusion stuff.	2284	* there, as well as the confusion stuff.
2369	*/	2285	*/
2370	move_player (op, op->direction);	2286	move_player (op, op->direction);
2371		2287
2372	return op->speed_left > 0;	2288	return op->speed_left > 0.f;
2373	}	2289	}
2374	}	2290	}
2375		2291
2376	return 0;	2292	return 0;
2377	}	2293	}
…		…
2416	* from.	2332	* from.
2417	*/	2333	*/
2418	void	2334	void
2419	remove_unpaid_objects (object *op, object *env)	2335	remove_unpaid_objects (object *op, object *env)
2420	{	2336	{
2421	object *next;
2422
2423	while (op)	2337	while (op)
2424	{	2338	{
2425	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2339	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2426		2340
2427	if (QUERY_FLAG (op, FLAG_UNPAID))	2341	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2493	int rate_grace = 2000;	2407	int rate_grace = 2000;
2494	const int max_hp = 1;	2408	const int max_hp = 1;
2495	const int max_sp = 1;	2409	const int max_sp = 1;
2496	const int max_grace = 1;	2410	const int max_grace = 1;
2497		2411
2498	if (op->contr->outputs_sync)	2412	if (op->contr->hidden)
		2413	{
		2414	op->invisible = 1000;
		2415	/* the socket code flashes the player visible/invisible
		2416	* depending on the value of invisible, so we need to
		2417	* alternate it here for it to work correctly.
		2418	*/
		2419	if (pticks & 2)
		2420	op->invisible--;
2499	{	2421	}
2500	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2422	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2501	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2423	{
2502	flush_output_element (op, &op->contr->outputs[i]);	2424	if (!op->invisible--)
		2425	{
		2426	make_visible (op);
		2427	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2428	}
2503	}	2429	}
2504		2430
2505	if (op->contr->ns->state == ST_PLAYING)	2431	if (op->contr->ns->state == ST_PLAYING)
2506	{	2432	{
2507	/* these next three if clauses make it possible to SLOW DOWN	2433	/* these next three if clauses make it possible to SLOW DOWN
…		…
2529	gen_grace = op->stats.maxgrace;	2455	gen_grace = op->stats.maxgrace;
2530	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2456	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2531	}	2457	}
2532		2458
2533	/* Regenerate Spell Points */	2459	/* Regenerate Spell Points */
2534	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2460	if (!op->contr->golem && --op->last_sp < 0)
2535	{	2461	{
2536	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2462	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2537	if (op->stats.sp < op->stats.maxsp)	2463	if (op->stats.sp < op->stats.maxsp)
2538	{	2464	{
2539	op->stats.sp++;	2465	op->stats.sp++;
…		…
2757	tmp->name = buf;	2683	tmp->name = buf;
2758	sprintf (buf, " This finger has been cut off %s\n"	2684	sprintf (buf, " This finger has been cut off %s\n"
2759	" the %s, when he was defeated at\n level %d by %s.\n",	2685	" the %s, when he was defeated at\n level %d by %s.\n",
2760	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2686	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2761	tmp->msg = buf;	2687	tmp->msg = buf;
2762	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2688	tmp->value = 0, tmp->type = 0;
2763	tmp->materialname = NULL;	2689	tmp->materialname = "organics";
2764	tmp->insert_at (op, tmp);	2690	tmp->insert_at (op, tmp);
2765	}	2691	}
2766		2692
2767	/* teleport defeated player to new destination */	2693	/* teleport defeated player to new destination */
2768	transfer_ob (op, x, y, 0, NULL);	2694	transfer_ob (op, x, y, 0, NULL);
…		…
2774		2700
2775	command_kill_pets (op, 0);	2701	command_kill_pets (op, 0);
2776		2702
2777	if (op->stats.food < 0)	2703	if (op->stats.food < 0)
2778	{	2704	{
2779	if (op->contr->explore)
2780	{
2781	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2782	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783	op->stats.food = 999;
2784	return;
2785	}
2786	sprintf (buf, "%s starved to death.", &op->name);	2705	sprintf (buf, "%s starved to death.", &op->name);
2787	strcpy (op->contr->killer, "starvation");	2706	strcpy (op->contr->killer, "starvation");
2788	}	2707	}
2789	else	2708	else
2790	{
2791	if (op->contr->explore)
2792	{
2793	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2794	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795	op->stats.hp = op->stats.maxhp;
2796	return;
2797	}
2798	sprintf (buf, "%s died.", &op->name);	2709	sprintf (buf, "%s died.", &op->name);
2799	}
2800		2710
2801	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2711	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2802		2712
2803	/* save the map location for corpse, gravestone */	2713	/* save the map location for corpse, gravestone */
2804	x = op->x;	2714	x = op->x;
…		…
2980	op->stats.hp = op->stats.maxhp;	2890	op->stats.hp = op->stats.maxhp;
2981	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2891	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2982	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2892	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2983		2893
2984	/*	2894	/*
2985	* Check to see if the player is in a shop. IF so, then check to see if
2986	* the player has any unpaid items. If so, remove them and put them back	2895	* Check to see if the player has any unpaid items. If so, remove them
2987	* in the map.	2896	* and put them back in the map.
2988	*/	2897	*/
2989
2990	if (is_in_shop (op))
2991	remove_unpaid_objects (op->inv, op);	2898	remove_unpaid_objects (op->inv, op);
2992		2899
2993	/****************************************/	2900	/****************************************/
2994	/* */	2901	/* */
2995	/* Move player to his current respawn- */	2902	/* Move player to his current respawn- */
2996	/* position (usually last savebed) */	2903	/* position (usually last savebed) */
2997	/* */	2904	/* */
2998	/****************************************/	2905	/****************************************/
2999		2906
3000	enter_player_savebed (op);	2907	enter_player_savebed (op);
3001		2908
3002	/* Save the player before inserting the force to reduce
3003	* chance of abuse.
3004	*/
3005	op->contr->braced = 0;	2909	op->contr->braced = 0;
3006	op->contr->save ();
3007		2910
3008	/* it is possible that the player has blown something up	2911	/* it is possible that the player has blown something up
3009	* at his savebed location, and that can have long lasting	2912	* at his savebed location, and that can have long lasting
3010	* spell effects. So first see if there is a spell effect	2913	* spell effects. So first see if there is a spell effect
3011	* on the space that might harm the player.	2914	* on the space that might harm the player.
…		…
3020	object *force;	2923	object *force;
3021	int at;	2924	int at;
3022		2925
3023	force = get_archetype (FORCE_NAME);	2926	force = get_archetype (FORCE_NAME);
3024	/* 50 ticks should be enough time for the spell to abate */	2927	/* 50 ticks should be enough time for the spell to abate */
3025	force->speed = 0.1;	2928	force->speed = 0.1f;
3026	force->speed_left = -5.0;	2929	force->speed_left = -5.f;
3027	SET_FLAG (force, FLAG_APPLIED);	2930	SET_FLAG (force, FLAG_APPLIED);
3028	for (at = 0; at < NROFATTACKS; at++)	2931	for (at = 0; at < NROFATTACKS; at++)
3029	if (will_kill_again & (1 << at))	2932	if (will_kill_again & (1 << at))
3030	force->resist[at] = 100;	2933	force->resist[at] = 100;
3031		2934
…		…
3040	void	2943	void
3041	loot_object (object *op)	2944	loot_object (object *op)
3042	{ /* Grab and destroy some treasure */	2945	{ /* Grab and destroy some treasure */
3043	object *tmp, *tmp2, *next;	2946	object *tmp, *tmp2, *next;
3044		2947
3045	if (op->container)	2948	op->close_container (); /* close open sack first */
3046	esrv_apply_container (op, op->container); /* close open sack first */
3047		2949
3048	for (tmp = op->inv; tmp; tmp = next)	2950	for (tmp = op->inv; tmp; tmp = next)
3049	{	2951	{
3050	next = tmp->below;	2952	next = tmp->below;
3051		2953
3052	if (tmp->invisible)	2954	if (tmp->invisible)
3053	continue;	2955	continue;
3054		2956
3055	tmp->remove ();	2957	tmp->remove ();
3056	tmp->x = op->x, tmp->y = op->y;	2958	tmp->x = op->x, tmp->y = op->y;
		2959
3057	if (tmp->type == CONTAINER)	2960	if (tmp->type == CONTAINER)
3058	{ /* empty container to ground */	2961	loot_object (tmp); /* empty container to ground */
3059	loot_object (tmp);	2962
3060	}
3061	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2963	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3062	{	2964	{
3063	if (tmp->nrof > 1)	2965	if (tmp->nrof > 1)
3064	{	2966	{
3065	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2967	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3066	tmp2->destroy ();	2968	tmp2->destroy ();
…		…
3077	/*	2979	/*
3078	* fix_weight(): Check recursively the weight of all players, and fix	2980	* fix_weight(): Check recursively the weight of all players, and fix
3079	* what needs to be fixed. Refresh windows and fix speed if anything	2981	* what needs to be fixed. Refresh windows and fix speed if anything
3080	* was changed.	2982	* was changed.
3081	*/	2983	*/
3082
3083	void	2984	void
3084	fix_weight (void)	2985	fix_weight (void)
3085	{	2986	{
3086	for_all_players (pl)	2987	for_all_players (pl)
3087	{	2988	{
…		…
3147	if (op->type == PLAYER)	3048	if (op->type == PLAYER)
3148	{	3049	{
3149	op->contr->tmp_invis = 0;	3050	op->contr->tmp_invis = 0;
3150	op->contr->invis_race = 0;	3051	op->contr->invis_race = 0;
3151	}	3052	}
		3053
3152	update_object (op, UP_OBJ_FACE);	3054	update_object (op, UP_OBJ_CHANGE);
3153	}	3055	}
3154		3056
3155	int	3057	int
3156	is_true_undead (object *op)	3058	is_true_undead (object *op)
3157	{	3059	{
3158	object *tmp = NULL;
3159
3160	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3060	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3161	return 1;	3061	return 1;
3162		3062
3163	return 0;	3063	return 0;
3164	}	3064	}
…		…
3452	char buf[MAX_BUF]; /* tmp. string buffer */	3352	char buf[MAX_BUF]; /* tmp. string buffer */
3453	int i = 0, j = 0;	3353	int i = 0, j = 0;
3454		3354
3455	/* get the appropriate treasurelist */	3355	/* get the appropriate treasurelist */
3456	if (atnr == ATNR_FIRE)	3356	if (atnr == ATNR_FIRE)
3457	trlist = find_treasurelist ("dragon_ability_fire");	3357	trlist = treasurelist::find ("dragon_ability_fire");
3458	else if (atnr == ATNR_COLD)	3358	else if (atnr == ATNR_COLD)
3459	trlist = find_treasurelist ("dragon_ability_cold");	3359	trlist = treasurelist::find ("dragon_ability_cold");
3460	else if (atnr == ATNR_ELECTRICITY)	3360	else if (atnr == ATNR_ELECTRICITY)
3461	trlist = find_treasurelist ("dragon_ability_elec");	3361	trlist = treasurelist::find ("dragon_ability_elec");
3462	else if (atnr == ATNR_POISON)	3362	else if (atnr == ATNR_POISON)
3463	trlist = find_treasurelist ("dragon_ability_poison");	3363	trlist = treasurelist::find ("dragon_ability_poison");
3464		3364
3465	if (trlist == NULL || who->type != PLAYER)	3365	if (trlist == NULL || who->type != PLAYER)
3466	return;	3366	return;
3467		3367
3468	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3368	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3600	* not readied.	3500	* not readied.
3601	*/	3501	*/
3602	void	3502	void
3603	player_unready_range_ob (player *pl, object *ob)	3503	player_unready_range_ob (player *pl, object *ob)
3604	{	3504	{
3605	rangetype i;	3505	if (pl->ob->current_weapon == ob)
		3506	pl->ob->current_weapon = 0;
3606		3507
3607	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3508	if (pl->combat_ob == ob)
3608	{	3509	pl->combat_ob = 0;
		3510
3609	if (pl->ranges[i] == ob)	3511	if (pl->ranged_ob == ob)
3610	{	3512	pl->ranged_ob = 0;
3611	pl->ranges[i] = NULL;
3612	if (pl->shoottype == i)
3613	{
3614	pl->shoottype = range_none;
3615	}
3616	}
3617	}
3618	}	3513	}
		3514
		3515	sint8
		3516	player::visibility_at (maptile *map, int x, int y) const
		3517	{
		3518	if (!ns)
		3519	return 0;
		3520
		3521	int dx, dy;
		3522	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3523	return 0;
		3524
		3525	x += dx - ns->current_x + ns->mapx / 2;
		3526	y += dy - ns->current_y + ns->mapy / 2;
		3527
		3528	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3529	return 0;
		3530
		3531	return 100 - blocked_los [x][y];
		3532	}

Diff Legend

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