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.67 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* 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, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* 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 along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors 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
161	set_first_map (object *op)	154	set_first_map (object *op)
162	{	155	{
163	strcpy (op->contr->maplevel, first_map_path);	156	op->contr->maplevel = first_map_path;
164	op->x = -1;	157	op->x = -1;
165	op->y = -1;	158	op->y = -1;
166	enter_exit (op, 0);	159	}
		160
		161	void
		162	player::activate ()
		163	{
		164	if (active)
		165	return;
		166
		167	players.insert (this);
		168	ob->remove ();
		169	ob->map = 0;
		170	ob->activate_recursive ();
		171	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		172	add_friendly_object (ob);
		173	}
		174
		175	void
		176	player::deactivate ()
		177	{
		178	if (!active)
		179	return;
		180
		181	terminate_all_pets (ob);
		182	remove_friendly_object (ob);
		183	ob->deactivate_recursive ();
		184
		185	if (ob->map)
		186	maplevel = ob->map->path;
		187
		188	ob->remove ();
		189	ob->map = 0;
		190	party = 0;
		191
		192	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		193
		194	players.erase (this);
167	}	195	}
168		196
169	// connect the player with a specific client	197	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	198	// also changes, rationalises, and fixes some incorrect settings
171	void	199	void
172	player::connect (client *ns)	200	player::connect (client *ns)
173	{	201	{
174	this->ns = ns;	202	this->ns = ns;
175	ns->pl = this;	203	ns->pl = this;
176		204
177	next = first_player;	205	run_on = 0;
178	first_player = this;	206	fire_on = 0;
		207	ob->close_container (); //TODO: client-specific
179		208
180	ns->update_look = 0;	209	ns->update_look = 0;
181	ns->look_position = 0;	210	ns->look_position = 0;
182		211
183	clear_los (ob);	212	clear_los (this);
		213
		214	ns->reset_stats ();
184		215
185	/* make sure he's a player -- needed because of class change. */	216	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	217	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	218	ob->race = ob->arch->clone.race;
188		219
189	if (!legal_range (ob, shoottype))
190	shoottype = range_none;
191
192	ob->carrying = sum_weight (ob);	220	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	221	link_player_skills (ob);
194		222
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	223	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	ob->set_speed (ob->speed);
197		224
198	assign (title, ob->arch->clone.name);	225	assign (title, ob->arch->clone.name);
199
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information
202	* to then update this. I don't think this will actually break anything - anyone
203	* that can use armour should be able to use a shield. What this may 'break'
204	* are features new characters get, eg, if someone starts up with a Q, they
205	* should be able to use a shield. However, old Q's won't get that advantage.
206	*/
207	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208	SET_FLAG (ob, FLAG_USE_SHIELD);
209		226
210	/* if it's a dragon player, set the correct title here */	227	/* if it's a dragon player, set the correct title here */
211	if (is_dragon_pl (ob))	228	if (is_dragon_pl (ob))
212	{	229	{
213	object *tmp, *abil = 0, *skin = 0;	230	object *tmp, *abil = 0, *skin = 0;
…		…
215	shstr_cmp dragon_ability_force ("dragon_ability_force");	232	shstr_cmp dragon_ability_force ("dragon_ability_force");
216	shstr_cmp dragon_skin_force ("dragon_skin_force");	233	shstr_cmp dragon_skin_force ("dragon_skin_force");
217		234
218	for (tmp = ob->inv; tmp; tmp = tmp->below)	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
219	if (tmp->type == FORCE)	236	if (tmp->type == FORCE)
220	if (tmp->arch->name == dragon_ability_force)	237	if (tmp->arch->archname == dragon_ability_force)
221	abil = tmp;	238	abil = tmp;
222	else if (tmp->arch->name == dragon_skin_force)	239	else if (tmp->arch->archname == dragon_skin_force)
223	skin = tmp;	240	skin = tmp;
224		241
225	set_dragon_name (ob, abil, skin);	242	set_dragon_name (ob, abil, skin);
226	}	243	}
227		244
228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
229	add_friendly_object (ob);
230
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		246
236	esrv_new_player (this, ob->weight + ob->carrying);	247	esrv_new_player (this, ob->weight + ob->carrying);
237		248
		249	ob->flag [FLAG_READY_WEAPON] = false;
		250	ob->flag [FLAG_READY_SKILL] = false;
		251	ob->flag [FLAG_READY_BOW] = false;
		252
		253	for (object *op = ob->inv; op; op = op->below)
		254	if (op->flag [FLAG_APPLIED])
		255	switch (op->type)
		256	{
		257	case SKILL:
		258	ob->flag [FLAG_APPLIED] = false;
		259	break;
		260
		261	case WAND:
		262	case ROD:
		263	case HORN:
		264	case BOW:
		265	ranged_ob = op;
		266	break;
		267
		268	case WEAPON:
		269	combat_ob = op;
		270	break;
		271	}
		272
		273	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
238	ob->update_stats ();	274	ob->update_stats ();
		275
239	ns->floorbox_update ();	276	ns->floorbox_update ();
240
241	esrv_send_inventory (ob, ob);	277	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	278	esrv_add_spells (this, 0);
243		279
244	enter_exit (ob, 0);	280	activate ();
245		281
246	send_rules (ob);	282	send_rules (ob);
247	send_news (ob);	283	send_news (ob);
248	display_motd (ob);	284	display_motd (ob);
		285
		286	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	287	INVOKE_PLAYER (LOGIN, this);
250	}	288	}
251		289
252	void	290	void
253	player::disconnect ()	291	player::disconnect ()
254	{	292	{
255	//TODO: don't be so harsh and destroy :)
256	if (ns)	293	if (ns)
257	destroy ();	294	{
		295	if (active)
		296	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		297
		298	INVOKE_PLAYER (DISCONNECT, this);
		299
		300	ns->reset_stats ();
		301	ns->pl = 0;
		302	ns = 0;
		303	}
		304
		305	if (ob)
		306	ob->close_container (); //TODO: client-specific
		307
		308	deactivate ();
258	}	309	}
259		310
260	// the need for this function can be explained	311	// the need for this function can be explained
261	// by load_object not returning the object	312	// by load_object not returning the object
262	void	313	void
263	player::set_object (object *op)	314	player::set_object (object *op)
264	{	315	{
265	ob = op;	316	ob = observe = op;
266	ob->contr = this; /* this aren't yet in archetype */	317	ob->contr = this; /* this aren't yet in archetype */
267		318
		319	ob->speed = 1.0f;
268	ob->speed_left = 0.5;	320	ob->speed_left = 0.5f;
269	ob->speed = 1.0;	321
270	ob->direction = 5; /* So player faces south */	322	ob->direction = 5; /* So player faces south */
271	ob->stats.wc = 2;	323	}
272	ob->run_away = 25; /* Then we panick... */
273		324
274	set_first_map (ob);	325	void
275		326	player::set_observe (object *op)
276	ob->roll_stats ();	327	{
		328	observe = op ? op : ob;
		329	do_los = 1;
277	}	330	}
278		331
279	player::player ()	332	player::player ()
280	{	333	{
281	/* There are some elements we want initialized to non zero value -	334	/* There are some elements we want initialised to non zero value -
282	* we deal with that below this point.	335	* we deal with that below this point.
283	*/	336	*/
284	outputs_sync = 16; /* Every 2 seconds */	337	outputs_sync = 4;
285	outputs_count = 8; /* Keeps present behaviour */	338	outputs_count = 4;
286	unapply = unapply_nochoice;	339	unapply = unapply_nochoice;
287		340
288	assign (savebed_map, first_map_path); /* Init. respawn position */	341	savebed_map = first_map_path; /* Init. respawn position */
289		342
290	gen_sp_armour = 10;	343	gen_sp_armour = 10;
291	last_speed = -1;
292	shoottype = range_none;
293	bowtype = bow_normal;	344	bowtype = bow_normal;
294	petmode = pet_normal;	345	petmode = pet_normal;
295	listening = 10;	346	listening = 10;
296	usekeys = containers;	347	usekeys = containers;
297	last_weapon_sp = -1;
298	peaceful = 1; /* default peaceful */	348	peaceful = 1; /* default peaceful */
299	do_los = 1;	349	do_los = 1;
300		350
301	/* we need to clear these to -1 and not zero - otherwise,	351	weapon_sp = 1.0f;
302	* if a player quits and starts a new character, we wont	352	weapon_sp_left = 0.5f;
303	* send new values to the client, as things like exp start
304	* at zero.
305	*/
306	for (int i = 0; i < NUM_SKILLS; i++)
307	last_skill_exp[i] = -1;
308
309	for (int i = 0; i < NROFATTACKS; i++)
310	last_resist[i] = -1;
311
312	last_stats.exp = -1;
313	last_weight = (uint32) - 1;
314	}	353	}
315		354
316	void	355	void
317	player::do_destroy ()	356	player::do_destroy ()
318	{	357	{
		358	disconnect ();
		359
319	attachable::do_destroy ();	360	attachable::do_destroy ();
320		361
321	save (false);
322	enable_save = false;
323
324	disconnect ();
325
326	terminate_all_pets (ob);
327
328	if (first_player != this)
329	{
330	player *prev = first_player;
331
332	while (prev && prev->next && prev->next != this)
333	prev = prev->next;
334
335	if (prev->next != this)
336	{
337	LOG (llevError, "Free_player: Can't find previous player.\n");
338	abort ();
339	}
340
341	prev->next = next;
342	}
343	else
344	first_player = next;
345
346	if (ob)	362	if (ob)
347	{	363	{
348	ob->destroy_inv (false);	364	ob->destroy_inv (false);
349	ob->destroy (true);	365	ob->destroy ();
350	}
351
352	if (ns)
353	{
354	client *ns = this->ns;
355	ns->send_packet ("goodbye");
356	ns->flush ();
357	ns->pl = 0;
358	this->ns = 0;
359	ns->destroy ();
360	}	366	}
361	}	367	}
362		368
363	player::~player ()	369	player::~player ()
364	{	370	{
…		…
374	player::create ()	380	player::create ()
375	{	381	{
376	player *pl = new player;	382	player *pl = new player;
377		383
378	pl->set_object (arch_to_object (get_player_archetype (0)));	384	pl->set_object (arch_to_object (get_player_archetype (0)));
		385
		386	pl->ob->roll_stats ();
		387	pl->ob->stats.wc = 2;
		388	pl->ob->run_away = 25; /* Then we panick... */
		389
		390	set_first_map (pl->ob);
379		391
380	return pl;	392	return pl;
381	}	393	}
382		394
383	/*	395	/*
…		…
414	object *op = NULL;	426	object *op = NULL;
415	objectlink *ol;	427	objectlink *ol;
416	unsigned lastdist;	428	unsigned lastdist;
417	rv_vector rv;	429	rv_vector rv;
418		430
419	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	431	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
420	{	432	{
421	/* We should not find free objects on this friendly list, but it	433	/* We should not find free objects on this friendly list, but it
422	* does periodically happen. Given that, lets deal with it.	434	* does periodically happen. Given that, lets deal with it.
423	* While unlikely, it is possible the next object on the friendly	435	* While unlikely, it is possible the next object on the friendly
424	* list is also free, so encapsulate this in a while loop.	436	* list is also free, so encapsulate this in a while loop.
…		…
428	object *tmp = ol->ob;	440	object *tmp = ol->ob;
429		441
430	/* Can't do much more other than log the fact, because the object	442	/* Can't do much more other than log the fact, because the object
431	* itself will have been cleared.	443	* itself will have been cleared.
432	*/	444	*/
433	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	445	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		446	tmp->debug_desc ());
434	ol = ol->next;	447	ol = ol->next;
435	remove_friendly_object (tmp);	448	remove_friendly_object (tmp);
436	if (!ol)	449	if (!ol)
437	return op;	450	return op;
438	}	451	}
…		…
527	x = mon->x;	540	x = mon->x;
528	y = mon->y;	541	y = mon->y;
529	m = mon->map;	542	m = mon->map;
530	dir = rv.direction;	543	dir = rv.direction;
531	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	544	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
532	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	545	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		546
533	/* If we can't solve it within the search distance, return now. */	547	/* If we can't solve it within the search distance, return now. */
534	if (diff > max)	548	if (diff > max)
535	return 0;	549	return 0;
		550
536	while (diff > 1 && max > 0)	551	while (diff > 1 && max > 0)
537	{	552	{
538	lastx = x;	553	lastx = x;
539	lasty = y;	554	lasty = y;
540	lastmap = m;	555	lastmap = m;
…		…
622	max--;	637	max--;
623	lastdir = dir;	638	lastdir = dir;
624	if (!firstdir)	639	if (!firstdir)
625	firstdir = dir;	640	firstdir = dir;
626	}	641	}
		642
627	if (diff <= 1)	643	if (diff <= 1)
628	{	644	{
629	/* Recalculate diff (distance) because we may not have actually	645	/* Recalculate diff (distance) because we may not have actually
630	* headed toward player for entire distance.	646	* headed toward player for entire distance.
631	*/	647	*/
632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	648	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	649	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
634	}	650	}
		651
635	if (diff > max)	652	if (diff > max)
636	return 0;	653	return 0;
637	}	654	}
		655
638	/* If we reached the max, didn't find a direction in time */	656	/* If we reached the max, didn't find a direction in time */
639	if (!max)	657	if (!max)
640	return 0;	658	return 0;
641		659
642	return firstdir;	660	return firstdir;
…		…
756	roll_stat (void)	774	roll_stat (void)
757	{	775	{
758	int a[4], i, j, k;	776	int a[4], i, j, k;
759		777
760	for (i = 0; i < 4; i++)	778	for (i = 0; i < 4; i++)
761	a[i] = (int) RANDOM () % 6 + 1;	779	a[i] = (int) rndm (6) + 1;
762		780
763	for (i = 0, j = 0, k = 7; i < 4; i++)	781	for (i = 0, j = 0, k = 7; i < 4; i++)
764	if (a[i] < k)	782	if (a[i] < k)
765	k = a[i], j = i;	783	k = a[i], j = i;
766		784
…		…
772	}	790	}
773		791
774	void	792	void
775	object::roll_stats ()	793	object::roll_stats ()
776	{	794	{
777	int statsort [7];	795	int statsort [NUM_STATS];
778		796
779	for (;;)	797	for (;;)
780	{	798	{
781	int sum = 0;	799	int sum = 0;
782	for (int i = 7; i--; )	800	for (int i = NUM_STATS; i--; )
783	sum += statsort [i] = roll_stat ();	801	sum += statsort [i] = roll_stat ();
784		802
785	if (sum >= 82 && sum <= 116)	803	if (sum >= 82 && sum <= 116)
786	break;	804	break;
787	}	805	}
788		806
789	// Sort the stats so that rerolling is easier...	807	// Sort the stats so that rerolling is easier...
790	std::sort (statsort, statsort + 7, std::greater<int>());	808	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
791		809
		810	for (int i = 0; i < NUM_STATS; ++i)
792	stats.Str = statsort[0];	811	stats.stat (i) = statsort [i];
793	stats.Dex = statsort[1];
794	stats.Con = statsort[2];
795	stats.Int = statsort[3];
796	stats.Wis = statsort[4];
797	stats.Pow = statsort[5];
798	stats.Cha = statsort[6];
799		812
800	stats.exp = 0;	813	stats.exp = 0;
801	stats.ac = 0;	814	stats.ac = 0;
802		815
803	stats.hp = stats.maxhp;	816	stats.hp = stats.maxhp;
…		…
815	}	828	}
816		829
817	void	830	void
818	object::swap_stats (int a, int b)	831	object::swap_stats (int a, int b)
819	{	832	{
820	int tmp = get_attr_value (&contr->orig_stats, a);	833	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
821	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
822	set_attr_value (&contr->orig_stats, b, tmp);
823		834
		835	for (int i = 0; i < NUM_STATS; ++i)
824	stats.Str = contr->orig_stats.Str;	836	stats.stat (i) = contr->orig_stats.stat (i);
825	stats.Dex = contr->orig_stats.Dex;
826	stats.Con = contr->orig_stats.Con;
827	stats.Int = contr->orig_stats.Int;
828	stats.Wis = contr->orig_stats.Wis;
829	stats.Pow = contr->orig_stats.Pow;
830	stats.Cha = contr->orig_stats.Cha;
831		837
832	//TODO: the following code looks so borked and should, at the very least,	838	//TODO: the following code looks so borked and should, at the very least,
833	// be merged with the similar code in roll_stats	839	// be merged with the similar code in roll_stats
834	stats.ac = 0;	840	stats.ac = 0;
835		841
…		…
847	contr->levsp[1] = 6;	853	contr->levsp[1] = 6;
848	contr->levgrace[1] = 3;	854	contr->levgrace[1] = 3;
849		855
850	contr->orig_stats = stats;	856	contr->orig_stats = stats;
851	}	857	}
		858	}
		859
		860	static void
		861	start_info (object *op)
		862	{
		863	char buf[MAX_BUF];
		864
		865	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		866	new_draw_info (NDI_UNIQUE, 0, op, buf);
		867	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		868	//new_draw_info (NDI_UNIQUE, 0, op, " ");
852	}	869	}
853		870
854	/* This function takes the key that is passed, and does the	871	/* This function takes the key that is passed, and does the
855	* appropriate action with it (change race, or other things).	872	* appropriate action with it (change race, or other things).
856	* The function name is for historical reasons - now we have	873	* The function name is for historical reasons - now we have
857	* separate race and class; this actually changes the RACE,	874	* separate race and class; this actually changes the RACE,
858	* not the class.	875	* not the class.
859	*/	876	*/
860	int	877	void
861	key_change_class (object *op, char key)	878	player::chargen_race_done ()
862	{	879	{
863	int tmp_loop;
864
865	if (key == 'd' || key == 'D')
866	{
867	char buf[MAX_BUF];
868
869	/* this must before then initial items are given */	880	/* this must before then initial items are given */
870	esrv_new_player (op->contr, op->weight + op->carrying);	881	esrv_new_player (ob->contr, ob->weight + ob->carrying);
871		882
872	treasurelist *tl = find_treasurelist ("starting_wealth");	883	treasurelist *tl = treasurelist::find ("starting_wealth");
873	if (tl)	884	if (tl)
874	create_treasure (tl, op, 0, 0, 0);	885	create_treasure (tl, ob, 0, 0, 0);
875		886
876	INVOKE_PLAYER (BIRTH, op->contr);	887	INVOKE_PLAYER (BIRTH, ob->contr);
877	INVOKE_PLAYER (LOGIN, op->contr);	888	INVOKE_PLAYER (LOGIN, ob->contr);
878		889
879	op->contr->ns->state = ST_PLAYING;	890	ob->contr->ns->state = ST_PLAYING;
880		891
881	if (op->msg)	892	if (ob->msg)
882	op->msg = NULL;	893	ob->msg = 0;
883		894
884	/* We create this now because some of the unique maps will need it	895	/* We create this now because some of the unique maps will need it
885	* to save here.	896	* to save here.
886	*/	897	*/
		898	{
		899	char buf[MAX_BUF];
887	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	900	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
888	make_path_to_file (buf);	901	make_path_to_file (buf);
		902	}
889		903
890	#ifdef AUTOSAVE
891	op->contr->last_save_tick = pticks;
892	#endif
893	start_info (op);	904	start_info (ob);
894	CLEAR_FLAG (op, FLAG_WIZ);	905	CLEAR_FLAG (ob, FLAG_WIZ);
895	give_initial_items (op, op->randomitems);	906	give_initial_items (ob, ob->randomitems);
896	link_player_skills (op);	907	link_player_skills (ob);
897	esrv_send_inventory (op, op);	908	esrv_send_inventory (ob, ob);
898	op->update_stats ();	909	ob->update_stats ();
899		910
900	/* This moves the player to a different start map, if there	911	/* This moves the player to a different start map, if there
901	* is one for this race	912	* is one for this race
902	*/	913	*/
903	if (*first_map_ext_path)	914	if (*first_map_ext_path)
904	{	915	{
905	object *tmp;	916	object *tmp;
906	char mapname[MAX_BUF];	917	char mapname[MAX_BUF];
907		918
908	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	919	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
909	tmp = object::create ();	920	tmp = object::create ();
910	EXIT_PATH (tmp) = mapname;	921	EXIT_PATH (tmp) = mapname;
911	EXIT_X (tmp) = op->x;	922	EXIT_X (tmp) = ob->x;
912	EXIT_Y (tmp) = op->y;	923	EXIT_Y (tmp) = ob->y;
913	enter_exit (op, tmp); /* we don't really care if it succeeded;	924	ob->enter_exit (tmp); /* we don't really care if it succeeded;
914	* if the map isn't there, then stay on the	925	* if the map isn't there, then stay on the
915	* default initial map */	926	* default initial map */
916	tmp->destroy ();	927	tmp->destroy ();
917	}	928	}
918	else	929	else
919	LOG (llevDebug, "first_map_ext_path not set\n");	930	LOG (llevDebug, "first_map_ext_path not set\n");
		931	}
920		932
921	return 0;	933	void
922	}	934	player::chargen_race_next ()
923		935	{
924	/* Following actually changes the race - this is the default command	936	/* Following actually changes the race - this is the default command
925	* if we don't match with one of the options above.	937	* if we don't match with one of the options above.
926	*/	938	*/
927		939
928	tmp_loop = 0;	940	do
929	while (!tmp_loop)
930	{	941	{
931	shstr name = op->name;	942	shstr name = ob->name;
932	int x = op->x, y = op->y;	943	int x = ob->x, y = ob->y;
933		944
934	op->remove_statbonus ();	945	ob->remove_statbonus ();
935	op->remove ();	946	ob->remove ();
936	op->arch = get_player_archetype (op->arch);	947	ob->arch = get_player_archetype (ob->arch);
937	op->arch->clone.copy_to (op);	948	ob->arch->clone.copy_to (ob);
938	op->instantiate ();	949	ob->instantiate ();
939	op->stats = op->contr->orig_stats;	950	ob->stats = ob->contr->orig_stats;
940	op->name = op->name_pl = name;	951	ob->name = ob->name_pl = name;
941	op->x = x;	952	ob->x = x;
942	op->y = y;	953	ob->y = y;
943	SET_ANIMATION (op, 2); /* So player faces south */	954	SET_ANIMATION (ob, 2); /* So player faces south */
944	insert_ob_in_map (op, op->map, op, 0);	955	insert_ob_in_map (ob, ob->map, ob, 0);
945	assign (op->contr->title, op->arch->clone.name);	956	assign (ob->contr->title, ob->arch->clone.name);
946	op->add_statbonus ();	957	ob->add_statbonus ();
947	tmp_loop = allowed_class (op);
948	}	958	}
		959	while (!allowed_class (ob));
949		960
950	update_object (op, UP_OBJ_FACE);	961	update_object (ob, UP_OBJ_FACE);
951	esrv_update_item (UPD_FACE, op, op);	962	esrv_update_item (UPD_FACE, ob, ob);
952	op->update_stats ();	963	ob->update_stats ();
953	op->stats.hp = op->stats.maxhp;	964	ob->stats.hp = ob->stats.maxhp;
954	op->stats.sp = op->stats.maxsp;	965	ob->stats.sp = ob->stats.maxsp;
955	op->stats.grace = 0;	966	ob->stats.grace = 0;
956
957	if (op->msg)
958	new_draw_info (NDI_BLUE, 0, op, op->msg);
959
960	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
961	return 0;
962	}
963
964	int
965	key_confirm_quit (object *op, char key)
966	{
967	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
968	{
969	op->contr->ns->state = ST_PLAYING;
970	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
971	return 1;
972	}
973
974	INVOKE_PLAYER (LOGOUT, op->contr);
975	INVOKE_PLAYER (QUIT, op->contr);
976
977	op->contr->enable_save = false;
978
979	terminate_all_pets (op);
980	leave_map (op);
981	op->direction = 0;
982	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
983
984	strcpy (op->contr->killer, "quit");
985	check_score (op);
986	op->contr->party = 0;
987	op->contr->own_title[0] = '\0';
988
989	object_ptr ob = op;
990
991	/* We need to hunt for any per player unique maps in memory and
992	* get rid of them. The trailing slash in the path is intentional,
993	* so that players named 'Ab' won't match against players 'Abe' pathname
994	*/
995	char buf[MAX_BUF];
996	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
997
998	for (maptile *next, *mp = first_map; mp; mp = next)
999	{
1000	next = mp->next;
1001
1002	if (!strncmp (mp->path, buf, strlen (buf)))
1003	delete_map (mp);
1004	}
1005
1006	delete_character (ob->name, 1);
1007	ob->contr->destroy ();
1008
1009	return 1;
1010	}	967	}
1011		968
1012	void	969	void
1013	flee_player (object *op)	970	flee_player (object *op)
1014	{	971	{
…		…
1061	/* Cornered, get rid of scared */	1018	/* Cornered, get rid of scared */
1062	CLEAR_FLAG (op, FLAG_SCARED);	1019	CLEAR_FLAG (op, FLAG_SCARED);
1063	op->enemy = NULL;	1020	op->enemy = NULL;
1064	}	1021	}
1065		1022
1066
1067	/* check_pick sees if there is stuff to be picked up/picks up stuff.	1023	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1068	* IT returns 1 if the player should keep on moving, 0 if he should	1024	* It returns 1 if the player should keep on moving, 0 if he should
1069	* stop.	1025	* stop.
1070	*/	1026	*/
1071	int	1027	int
1072	check_pick (object *op)	1028	check_pick (object *op)
1073	{	1029	{
1074	object *tmp, *next;	1030	object *tmp, *next;
1075	int stop = 0;	1031	int stop = 0;
1076	int j, k, wvratio;	1032	int wvratio;
1077	char putstring[128], tmpstr[16];	1033	char putstring[128];
1078		1034
1079	/* if you're flying, you cna't pick up anything */	1035	/* if you're flying, you cna't pick up anything */
1080	if (op->move_type & MOVE_FLYING)	1036	if (op->move_type & MOVE_FLYING)
1081	return 1;	1037	return 1;
1082		1038
…		…
1150	if (tmp->name != NULL)	1106	if (tmp->name != NULL)
1151	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1152	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1108	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1153	else	1109	else
1154	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1110	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1155	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1111	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1156		1112
1157	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1113	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1158	}	1114	}
1159		1115
1160	/* philosophy:	1116	/* philosophy:
…		…
1353	/* careful: chairs and tables are weapons! */	1309	/* careful: chairs and tables are weapons! */
1354	if (op->contr->mode & PU_ALLWEAPON)	1310	if (op->contr->mode & PU_ALLWEAPON)
1355	{	1311	{
1356	if (tmp->type == WEAPON && tmp->name != NULL)	1312	if (tmp->type == WEAPON && tmp->name != NULL)
1357	{	1313	{
1358	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&	1314	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1359	strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)	1315	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1360	{	1316	{
1361	pick_up (op, tmp);	1317	pick_up (op, tmp);
1362	continue;	1318	continue;
1363	}	1319	}
1364	}	1320	}
1365		1321
1366	if (tmp->type == WEAPON && tmp->name == NULL)	1322	if (tmp->type == WEAPON && tmp->name == NULL)
1367	{	1323	{
1368	if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)	1324	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1369	{	1325	{
1370	pick_up (op, tmp);	1326	pick_up (op, tmp);
1371	continue;	1327	continue;
1372	}	1328	}
1373	}	1329	}
…		…
1398	if (tmp->name != NULL)	1354	if (tmp->name != NULL)
1399	{	1355	{
1400	fprintf (stderr, "%s", tmp->name);	1356	fprintf (stderr, "%s", tmp->name);
1401	}	1357	}
1402	else	1358	else
1403	fprintf (stderr, "%s", tmp->arch->name);	1359	fprintf (stderr, "%s", tmp->arch->archname);
1404	fprintf (stderr, ",%d] = ", tmp->type);	1360	fprintf (stderr, ",%d] = ", tmp->type);
1405	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1361	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1406	#endif	1362	#endif
1407	continue;	1363	continue;
1408	}	1364	}
…		…
1419	* found object is returned.	1375	* found object is returned.
1420	*/	1376	*/
1421	object *	1377	object *
1422	find_arrow (object *op, const char *type)	1378	find_arrow (object *op, const char *type)
1423	{	1379	{
1424	object *tmp = NULL;	1380	object *tmp = 0;
1425		1381
1426	for (op = op->inv; op; op = op->below)	1382	for (op = op->inv; op; op = op->below)
1427	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1383	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1428	tmp = find_arrow (op, type);	1384	tmp = find_arrow (op, type);
1429	else if (op->type == ARROW && op->race == type)	1385	else if (op->type == ARROW && op->race == type)
1430	return op;	1386	return op;
		1387
1431	return tmp;	1388	return tmp;
1432	}	1389	}
1433		1390
1434	/*	1391	/*
1435	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1392	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1436	* against the target. A full test is not performed, simply a basic test	1393	* against the target. A full test is not performed, simply a basic test
1437	* of resistances. The archer is making a quick guess at what he sees down	1394	* of resistances. The archer is making a quick guess at what he sees down
1438	* the hall. Failing that it does it's best to pick the highest plus arrow.	1395	* the hall. Failing that it does it's best to pick the highest plus arrow.
1439	*/	1396	*/
1440
1441	object *	1397	object *
1442	find_better_arrow (object *op, object *target, const char *type, int *better)	1398	find_better_arrow (object *op, object *target, const char *type, int *better)
1443	{	1399	{
1444	object *tmp = NULL, *arrow, *ntmp;	1400	object *tmp = NULL, *arrow, *ntmp;
1445	int attacknum, attacktype, betterby = 0, i;	1401	int attacknum, attacktype, betterby = 0, i;
…		…
1511	* find_better_arrow to find a decent arrow to use.	1467	* find_better_arrow to find a decent arrow to use.
1512	* op = the shooter	1468	* op = the shooter
1513	* type = bow->race	1469	* type = bow->race
1514	* dir = fire direction	1470	* dir = fire direction
1515	*/	1471	*/
1516
1517	object *	1472	object *
1518	pick_arrow_target (object *op, const char *type, int dir)	1473	pick_arrow_target (object *op, const char *type, int dir)
1519	{	1474	{
1520	object *tmp = NULL;	1475	object *tmp = NULL;
1521	maptile *m;	1476	maptile *m;
…		…
1586	*/	1541	*/
1587	int	1542	int
1588	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)	1543	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1589	{	1544	{
1590	object *left, *bow;	1545	object *left, *bow;
1591	int bowspeed, mflags;	1546	int mflags;
1592	maptile *m;	1547	maptile *m;
1593		1548
1594	if (!dir)	1549	if (!dir)
1595	{	1550	{
1596	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1551	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1597	return 0;	1552	return 0;
1598	}	1553	}
1599		1554
1600	if (op->type == PLAYER)	1555	if (op->contr)
1601	bow = op->contr->ranges[range_bow];	1556	bow = op->current_weapon;
1602	else	1557	else
1603	{	1558	{
1604	for (bow = op->inv; bow; bow = bow->below)	1559	for (bow = op->inv; bow; bow = bow->below)
1605	/* Don't check for applied - monsters don't apply bows - in that way, they	1560	/* Don't check for applied - monsters don't apply bows - in that way, they
1606	* don't need to switch back and forth between bows and weapons.	1561	* don't need to switch back and forth between bows and weapons.
…		…
1611	if (!bow)	1566	if (!bow)
1612	{	1567	{
1613	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1568	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1614	return 0;	1569	return 0;
1615	}	1570	}
		1571
		1572	// optimisation: move object to top so we will find it quickly again
		1573	if (bow->below)
		1574	{
		1575	bow->remove ();
		1576	op->insert (bow);
		1577	}
		1578
1616	}	1579	}
1617		1580
1618	if (!bow->race || !bow->skill)	1581	if (!bow->race || !bow->skill)
1619	{	1582	{
1620	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1583	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1621	return 0;	1584	return 0;
1622	}	1585	}
1623
1624	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1625
1626	/* penalize ROF for bestarrow */
1627	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1628	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1629
1630	if (bowspeed < 1)
1631	bowspeed = 1;
1632		1586
1633	if (arrow == NULL)	1587	if (arrow == NULL)
1634	{	1588	{
1635	if ((arrow = find_arrow (op, bow->race)) == NULL)	1589	if ((arrow = find_arrow (op, bow->race)) == NULL)
1636	{	1590	{
1637	if (op->type == PLAYER)	1591	if (op->type == PLAYER)
1638	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1592	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1639	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1593	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1640	else	1594	else
1641	CLEAR_FLAG (op, FLAG_READY_BOW);	1595	CLEAR_FLAG (op, FLAG_READY_BOW);
		1596
1642	return 0;	1597	return 0;
1643	}	1598	}
1644	}	1599	}
1645		1600
1646	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1601	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1668	return 0;	1623	return 0;
1669	}	1624	}
1670		1625
1671	arrow->set_owner (op);	1626	arrow->set_owner (op);
1672	arrow->skill = bow->skill;	1627	arrow->skill = bow->skill;
1673
1674	arrow->direction = dir;	1628	arrow->direction = dir;
1675	arrow->x = sx;	1629
1676	arrow->y = sy;	1630	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
		1631	arrow->stats.hp = arrow->stats.dam;
		1632	arrow->stats.grace = arrow->attacktype;
		1633
		1634	if (arrow->slaying)
		1635	arrow->spellarg = strdup (arrow->slaying);
		1636
		1637	#if 0
		1638	if (player *pl = op->contr)
		1639	{
		1640	float speed = pl->weapon_sp;
		1641
		1642	/* penalize ROF for bestarrow */
		1643	if (pl->bowtype == bow_bestarrow)
		1644	speed *= .9f;
		1645	else
		1646	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1647
		1648	op->speed_left += speed - op->speed;
		1649	}
		1650	#endif
		1651
		1652	SET_ANIMATION (arrow, arrow->direction);
		1653
		1654	/* update the speed */
		1655	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1656	+ bow->stats.dam / 7.f;
		1657
		1658	arrow->set_speed (max (arrow->speed, 2.f));
		1659	arrow->speed_left = 0;
		1660
		1661	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1677		1662
1678	if (op->type == PLAYER)	1663	if (op->type == PLAYER)
1679	{	1664	{
1680	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1681	op->update_stats ();
1682	}
1683
1684	SET_ANIMATION (arrow, arrow->direction);
1685	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1686	arrow->stats.hp = arrow->stats.dam;
1687	arrow->stats.grace = arrow->attacktype;
1688	if (arrow->slaying != NULL)
1689	arrow->spellarg = strdup (arrow->slaying);
1690
1691	/* Note that this was different for monsters - they got their level
1692	* added to the damage. I think the strength bonus is more proper.
1693	*/
1694
1695	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1696
1697	/* update the speed */
1698	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1699	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1700
1701	arrow->set_speed (max (arrow->speed, 1.0));
1702	arrow->speed_left = 0;
1703
1704	if (op->type == PLAYER)
1705	{
1706	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1707	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1708	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1709
1710	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;	1665	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
		1666	wc -= dex_bonus[op->stats.Dex];
		1667
		1668	if (!arrow->slaying)
		1669	arrow->slaying = op->slaying;
		1670
		1671	arrow->attacktype |= op->attacktype;
1711	}	1672	}
1712	else	1673	else
1713	{	1674	{
1714	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1715	arrow->level = op->level;	1675	arrow->level = op->level;
1716	}	1676	arrow->stats.wc -= bow->magic;
1717		1677
1718	if (arrow->attacktype == AT_PHYSICAL)	1678	if (!arrow->slaying)
		1679	arrow->slaying = bow->slaying;
		1680
1719	arrow->attacktype |= bow->attacktype;	1681	arrow->attacktype |= bow->attacktype;
		1682	}
1720		1683
1721	if (bow->slaying)	1684	wc -= arrow->level;
1722	arrow->slaying = bow->slaying;	1685	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1723		1686
1724	arrow->map = m;	1687	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1725	arrow->move_type = MOVE_FLY_LOW;	1688	arrow->move_type = MOVE_FLY_LOW;
1726	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1689	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1727		1690
1728	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1691	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1729	insert_ob_in_map (arrow, m, op, 0);	1692	m->insert (arrow, sx, sy, op);
1730		1693
1731	if (!arrow->destroyed ())	1694	if (!arrow->destroyed ())
1732	move_arrow (arrow);	1695	move_arrow (arrow);
1733		1696
1734	if (op->type == PLAYER)	1697	if (op->type == PLAYER)
…		…
1754	{	1717	{
1755	int ret = 0, wcmod = 0;	1718	int ret = 0, wcmod = 0;
1756		1719
1757	if (op->contr->bowtype == bow_bestarrow)	1720	if (op->contr->bowtype == bow_bestarrow)
1758	{	1721	{
1759	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);	1722	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1760	}	1723	}
1761	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1724	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1762	{	1725	{
1763	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1726	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1764	wcmod = -1;	1727	wcmod = -1;
		1728
1765	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1729	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1766	}	1730	}
1767	else if (op->contr->bowtype == bow_threewide)	1731	else if (op->contr->bowtype == bow_threewide)
1768	{	1732	{
1769	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1733	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1773	else if (op->contr->bowtype == bow_spreadshot)	1737	else if (op->contr->bowtype == bow_spreadshot)
1774	{	1738	{
1775	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1739	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1776	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);
1777	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1741	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1778
1779	}	1742	}
1780	else	1743	else
1781	{	1744	{
1782	/* Simple case */	1745	/* Simple case */
1783	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);
1784	}	1747	}
		1748
1785	return ret;	1749	return ret;
1786	}	1750	}
1787
1788		1751
1789	/* Fires a misc (wand/rod/horn) object in 'dir'.	1752	/* Fires a misc (wand/rod/horn) object in 'dir'.
1790	* Broken apart from 'fire' to keep it more readable.	1753	* Broken apart from 'fire' to keep it more readable.
1791	*/	1754	*/
1792	void	1755	void
1793	fire_misc_object (object *op, int dir)	1756	fire_misc_object (object *op, int dir)
1794	{	1757	{
1795	object *item;	1758	object *item = op->contr->ranged_ob;
1796		1759
1797	if (!op->contr->ranges[range_misc])	1760	if (!item)
1798	{	1761	{
1799	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.");
1800	return;	1763	return;
1801	}	1764	}
1802		1765
1803	item = op->contr->ranges[range_misc];
1804	if (!item->inv)	1766	if (!item->inv)
1805	{	1767	{
1806	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1768	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1807	return;	1769	return;
1808	}	1770	}
		1771
		1772	if (!op->change_weapon (item))
		1773	return;
		1774
1809	if (item->type == WAND)	1775	if (item->type == WAND)
1810	{	1776	{
1811	if (item->stats.food <= 0)	1777	if (item->stats.food <= 0)
1812	{	1778	{
1813	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1779	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1814	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
1815	return;	1782	return;
1816	}	1783	}
1817	}	1784	}
1818	else if (item->type == ROD || item->type == HORN)	1785	else if (item->type == ROD || item->type == HORN)
1819	{	1786	{
1820	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))
1821	{	1788	{
1822	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);	1789	play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
		1790
1823	if (item->type == ROD)	1791	if (item->type == ROD)
1824	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));
1825	else	1793	else
1826	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
1827	return;	1796	return;
1828	}	1797	}
1829	}	1798	}
1830		1799
1831	if (cast_spell (op, item, dir, item->inv, NULL))	1800	if (cast_spell (op, item, dir, item->inv, NULL))
…		…
1853	}	1822	}
1854	}	1823	}
1855		1824
1856	/* Received a fire command for the player - go and do it.	1825	/* Received a fire command for the player - go and do it.
1857	*/	1826	*/
1858	void	1827	bool
1859	fire (object *op, int dir)	1828	fire (object *op, int dir)
1860	{	1829	{
1861	int spellcost = 0;	1830	int spellcost = 0;
1862		1831
1863	/* check for loss of invisiblity/hide */	1832	/* check for loss of invisiblity/hide */
1864	if (action_makes_visible (op))	1833	if (action_makes_visible (op))
1865	make_visible (op);	1834	make_visible (op);
1866		1835
1867	switch (op->contr->shoottype)	1836	player *pl = op->contr;
		1837
		1838	if (pl->golem)
		1839	{
		1840	control_golem (op->contr->golem, dir);
		1841	return false;
1868	{	1842	}
1869	case range_none:
1870	return;
1871		1843
1872	case range_bow:	1844	object *ob = pl->ranged_ob;
		1845
		1846	if (!ob)
		1847	return false;
		1848
		1849	if (!op->change_weapon (ob))
		1850	return false;
		1851
		1852	if (op->speed_left > 0.f)
		1853	--op->speed_left;
		1854	else
		1855	return false;
		1856
		1857	switch (ob->type)
		1858	{
		1859	case BOW:
1873	player_fire_bow (op, dir);	1860	player_fire_bow (op, dir);
1874	return;	1861	break;
1875		1862
1876	case range_magic: /* Casting spells */	1863	case SPELL:
1877	spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));	1864	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1878	return;	1865	break;
1879		1866
1880	case range_misc:	1867	case BUILDER:
		1868	apply_map_builder (op, dir);
		1869	break;
		1870
		1871	case SKILL:
		1872	do_skill (op, op, ob, dir, 0);
		1873	break;
		1874
		1875	default:
1881	fire_misc_object (op, dir);	1876	fire_misc_object (op, dir);
1882	return;	1877	break;
1883
1884	case range_golem: /* Control summoned monsters from scrolls */
1885	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1886	{
1887	op->contr->ranges[range_golem] = 0;
1888	op->contr->shoottype = range_none;
1889	}
1890	else
1891	control_golem (op->contr->ranges[range_golem], dir);
1892	return;
1893
1894	case range_skill:
1895	if (!op->chosen_skill)
1896	{
1897	if (op->type == PLAYER)
1898	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1899	return;
1900	}
1901	(void) do_skill (op, op, op->chosen_skill, dir, NULL);
1902	return;
1903	case range_builder:
1904	apply_map_builder (op, dir);
1905	return;
1906	default:
1907	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1908	return;
1909	}	1878	}
1910	}
1911		1879
1912		1880	return true;
		1881	}
1913		1882
1914	/* find_key	1883	/* find_key
1915	* We try to find a key for the door as passed. If we find a key	1884	* We try to find a key for the door as passed. If we find a key
1916	* and successfully use it, we return the key, otherwise NULL	1885	* and successfully use it, we return the key, otherwise NULL
1917	* This function merges both normal and locked door, since the logic	1886	* This function merges both normal and locked door, since the logic
…		…
1919	* pl is the player,	1888	* pl is the player,
1920	* inv is the objects inventory to searched	1889	* inv is the objects inventory to searched
1921	* door is the door we are trying to match against.	1890	* door is the door we are trying to match against.
1922	* This function can be called recursively to search containers.	1891	* This function can be called recursively to search containers.
1923	*/	1892	*/
1924
1925	object *	1893	object *
1926	find_key (object *pl, object *container, object *door)	1894	find_key (object *pl, object *container, object *door)
1927	{	1895	{
1928	object *tmp, *key;	1896	object *tmp, *key;
1929		1897
1930	/* Should not happen, but sanity checking is never bad */	1898	/* Should not happen, but sanity checking is never bad */
1931	if (container->inv == NULL)	1899	if (!container->inv)
1932	return NULL;	1900	return 0;
1933		1901
1934	/* First, lets try to find a key in the top level inventory */	1902	/* First, lets try to find a key in the top level inventory */
1935	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1903	for (tmp = container->inv; tmp; tmp = tmp->below)
1936	{	1904	{
1937	if (door->type == DOOR && tmp->type == KEY)	1905	if (door->type == DOOR && tmp->type == KEY)
1938	break;	1906	break;
1939	/* For sanity, we should really check door type, but other stuff	1907	/* For sanity, we should really check door type, but other stuff
1940	* (like containers) can be locked with special keys	1908	* (like containers) can be locked with special keys
1941	*/	1909	*/
1942	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1910	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1943	break;	1911	break;
1944	}	1912	}
		1913
1945	/* No key found - lets search inventories now */	1914	/* No key found - lets search inventories now */
1946	/* If we find and use a key in an inventory, return at that time.	1915	/* If we find and use a key in an inventory, return at that time.
1947	* otherwise, if we search all the inventories and still don't find	1916	* otherwise, if we search all the inventories and still don't find
1948	* a key, return	1917	* a key, return
1949	*/	1918	*/
1950	if (!tmp)	1919	if (!tmp)
1951	{	1920	{
1952	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1921	for (tmp = container->inv; tmp; tmp = tmp->below)
1953	{	1922	{
1954	/* No reason to search empty containers */	1923	/* No reason to search empty containers */
1955	if (tmp->type == CONTAINER && tmp->inv)	1924	if (tmp->type == CONTAINER && tmp->inv)
1956	{	1925	{
1957	if ((key = find_key (pl, tmp, door)) != NULL)	1926	if ((key = find_key (pl, tmp, door)))
1958	return key;	1927	return key;
1959	}	1928	}
1960	}	1929	}
		1930
1961	if (!tmp)	1931	if (!tmp)
1962	return NULL;	1932	return NULL;
1963	}	1933	}
		1934
1964	/* We get down here if we have found a key. Now if its in a container,	1935	/* We get down here if we have found a key. Now if its in a container,
1965	* see if we actually want to use it	1936	* see if we actually want to use it
1966	*/	1937	*/
1967	if (pl != container)	1938	if (pl != container)
1968	{	1939	{
…		…
1989	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1960	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1990	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1961	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1991	return NULL;	1962	return NULL;
1992	}	1963	}
1993	}	1964	}
		1965
1994	return tmp;	1966	return tmp;
1995	}	1967	}
1996		1968
1997	/* moved door processing out of move_player_attack.	1969	/* moved door processing out of move_player_attack.
1998	* returns 1 if player has opened the door with a key	1970	* returns 1 if player has opened the door with a key
…		…
2000	* 0 otherwise	1972	* 0 otherwise
2001	*/	1973	*/
2002	static int	1974	static int
2003	player_attack_door (object *op, object *door)	1975	player_attack_door (object *op, object *door)
2004	{	1976	{
2005	/* If its a door, try to find a use a key. If we do destroy the door,	1977	/* If its a door, try to find a key. If we do destroy the door,
2006	* might as well return immediately as there is nothing more to do -	1978	* might as well return immediately as there is nothing more to do -
2007	* otherwise, we fall through to the rest of the code.	1979	* otherwise, we fall through to the rest of the code.
2008	*/	1980	*/
2009	object *key = find_key (op, op, door);	1981	object *key = find_key (op, op, door);
2010		1982
2011	/* IF we found a key, do some extra work */	1983	/* If we found a key, do some extra work */
2012	if (key)	1984	if (key)
2013	{	1985	{
2014	object *container = key->env;	1986	object *container = key->env;
2015		1987
2016	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1988	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
		1989
2017	if (action_makes_visible (op))	1990	if (action_makes_visible (op))
2018	make_visible (op);	1991	make_visible (op);
		1992
2019	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1993	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2020	spring_trap (door->inv, op);	1994	spring_trap (door->inv, op);
		1995
2021	if (door->type == DOOR)	1996	if (door->type == DOOR)
2022	{
2023	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1997	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2024	}
2025	else if (door->type == LOCKED_DOOR)	1998	else if (door->type == LOCKED_DOOR)
2026	{	1999	{
2027	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	2000	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2028	remove_door2 (door); /* remove door without violence ;-) */	2001	remove_door2 (door); /* remove door without violence ;-) */
2029	}	2002	}
		2003
2030	/* Do this after we print the message */	2004	/* Do this after we print the message */
2031	decrease_ob (key); /* Use up one of the keys */	2005	decrease_ob (key); /* Use up one of the keys */
2032	/* Need to update the weight the container the key was in */	2006	/* Need to update the weight the container the key was in */
2033	if (container != op)	2007	if (container != op)
2034	esrv_update_item (UPD_WEIGHT, op, container);	2008	esrv_update_item (UPD_WEIGHT, op, container);
		2009
2035	return 1; /* Nothing more to do below */	2010	return 1; /* Nothing more to do below */
2036	}	2011	}
2037	else if (door->type == LOCKED_DOOR)	2012	else if (door->type == LOCKED_DOOR)
2038	{	2013	{
2039	/* Might as well return now - no other way to open this */	2014	/* Might as well return now - no other way to open this */
2040	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	2015	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2041	return 1;	2016	return 1;
2042	}	2017	}
		2018
2043	return 0;	2019	return 0;
2044	}	2020	}
2045		2021
2046	/* This function is just part of a breakup from move_player.	2022	/* This function is just part of a breakup from move_player.
2047	* It should keep the code cleaner.	2023	* It should keep the code cleaner.
2048	* When this is called, the players direction has been updated	2024	* When this is called, the players direction has been updated
2049	* (taking into account confusion.) The player is also actually	2025	* (taking into account confusion.) The player is also actually
2050	* going to try and move (not fire weapons).	2026	* going to try and move (not fire weapons).
2051	*/	2027	*/
2052	void	2028	bool
2053	move_player_attack (object *op, int dir)	2029	move_player_attack (object *op, int dir)
2054	{	2030	{
2055	object *tmp, *mon;
2056	sint16 nx, ny;
2057	int on_battleground;	2031	int on_battleground;
2058	maptile *m;
2059		2032
2060	nx = freearr_x[dir] + op->x;	2033	sint16 nx = freearr_x[dir] + op->x;
2061	ny = freearr_y[dir] + op->y;	2034	sint16 ny = freearr_y[dir] + op->y;
2062		2035
2063	on_battleground = op_on_battleground (op, 0, 0);	2036	on_battleground = op_on_battleground (op, 0, 0);
		2037
		2038	if (out_of_map (op->map, nx, ny))
		2039	return false;
		2040
		2041	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		2042	{
		2043	--op->speed_left;
		2044	return true;
		2045	}
2064		2046
2065	/* If braced, or can't move to the square, and it is not out of the	2047	/* If braced, or can't move to the square, and it is not out of the
2066	* map, attack it. Note order of if statement is important - don't	2048	* map, attack it. Note order of if statement is important - don't
2067	* want to be calling move_ob if braced, because move_ob will move the	2049	* want to be calling move_ob if braced, because move_ob will move the
2068	* player. This is a pretty nasty hack, because if we could	2050	* player. This is a pretty nasty hack, because if we could
2069	* move to some space, it then means that if we are braced, we should	2051	* move to some space, it then means that if we are braced, we should
2070	* do nothing at all. As it is, if we are braced, we go through	2052	* do nothing at all. As it is, if we are braced, we go through
2071	* quite a bit of processing. However, it probably is less than what	2053	* quite a bit of processing. However, it probably is less than what
2072	* move_ob uses.	2054	* move_ob uses.
2073	*/	2055	*/
2074	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2056	maptile *m = op->map->xy_find (nx, ny);
2075	{
2076	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2077	{
2078	m = get_map_from_coord (op->map, &nx, &ny);
2079	if (!m)
2080	return; /* Don't think this should happen */
2081	}
2082	else
2083	m = op->map;
2084		2057
2085	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2086	{
2087	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2088	return;
2089	}
2090
2091	mon = 0;
2092	/* Go through all the objects, and find ones of interest. Only stop if	2058	/* Go through all the objects, and find ones of interest. Only stop if
2093	* we find a monster - that is something we know we want to attack.	2059	* we find a monster - that is something we know we want to attack.
2094	* if its a door or barrel (can roll) see if there may be monsters	2060	* if its a door or barrel (can roll) see if there may be monsters
2095	* on the space	2061	* on the space
2096	*/	2062	*/
2097	while (tmp)	2063	object *mon;
2098	{	2064	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2099	if (tmp == op)	2065	{
2100	{	2066	if ((mon->flag [FLAG_ALIVE]
2101	tmp = tmp->above;	2067	|| mon->type == LOCKED_DOOR
2102	continue;	2068	|| mon->flag [FLAG_CAN_ROLL])
2103	}
2104
2105	if (QUERY_FLAG (tmp, FLAG_ALIVE))
2106	{
2107	mon = tmp;	2069	&& mon != op)
2108	break;	2070	break;
2109	}	2071	}
2110		2072
2111	if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2112	mon = tmp;
2113
2114	tmp = tmp->above;
2115	}
2116
2117	if (!mon) /* This happens anytime the player tries to move */	2073	if (!mon) /* This happens anytime the player tries to move */
2118	return; /* into a wall */	2074	return false; /* into a wall */
2119		2075
2120	if (mon->head)
2121	mon = mon->head;	2076	mon = mon->head_ ();
2122		2077
2123	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2078	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		2079	if (op->contr->weapon_sp_left > 0.f)
2124	if (player_attack_door (op, mon))	2080	if (player_attack_door (op, mon))
		2081	{
		2082	--op->contr->weapon_sp_left;
2125	return;	2083	return true;
		2084	}
2126		2085
2127	/* The following deals with possibly attacking peaceful	2086	/* The following deals with possibly attacking peaceful
2128	* or frienddly creatures. Basically, all players are considered	2087	* or friendly creatures. Basically, all players are considered
2129	* unaggressive. If the moving player has peaceful set, then the	2088	* unaggressive. If the moving player has peaceful set, then the
2130	* object should be pushed instead of attacked. It is assumed that	2089	* object should be pushed instead of attacked. It is assumed that
2131	* if you are braced, you will not attack friends accidently,	2090	* if you are braced, you will not attack friends accidently,
2132	* and thus will not push them.	2091	* and thus will not push them.
2133	*/	2092	*/
2134		2093
2135	/* If the creature is a pet, push it even if the player is not	2094	/* If the creature is a pet, push it even if the player is not
2136	* peaceful. Our assumption is the creature is a pet if the	2095	* peaceful. Our assumption is the creature is a pet if the
2137	* player owns it and it is either friendly or unagressive.	2096	* player owns it and it is either friendly or unagressive.
2138	*/	2097	*/
2139	if ((op->type == PLAYER)	2098	if (op->type == PLAYER
2140	#if COZY_SERVER
2141	&&
2142	((mon->owner && mon->owner->contr	2099	&& ((mon->owner && mon->owner->contr
2143	&& same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)	2100	&& same_party (mon->owner->contr->party, op->contr->party))
2144	#else
2145	&& mon->owner == op	2101	|| mon->owner == op)
2146	#endif
2147	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2102	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2148	{	2103	{
2149	/* If we're braced, we don't want to switch places with it */	2104	/* If we're braced, we don't want to switch places with it */
2150	if (op->contr->braced)	2105	if (op->contr->braced)
2151	return;	2106	return false;
		2107
		2108	if (op->speed_left > 0.f)
		2109	{
		2110	--op->speed_left;
		2111
2152	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2112	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2153	(void) push_ob (mon, dir, op);	2113	push_ob (mon, dir, op);
		2114
2154	if (op->contr->tmp_invis || op->hide)	2115	if (op->contr->tmp_invis || op->hide)
2155	make_visible (op);	2116	make_visible (op);
		2117
2156	return;	2118	return true;
2157	}	2119	}
		2120	else
		2121	return false;
		2122	}
2158		2123
2159	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2160	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
2161	* someone, but put it inside this loop so that you won't	2126	* someone, but put it inside this loop so that you won't
2162	* attack them either.	2127	* attack them either.
2163	*/	2128	*/
2164	if ((mon->type == PLAYER || mon->enemy != op) &&	2129	if ((mon->type == PLAYER || mon->enemy != op)
2165	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2130	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2166	#ifdef PROHIBIT_PLAYERKILL
2167	(op->contr->peaceful	2131	&& ((op->contr->peaceful
2168	|| (mon->type == PLAYER	2132	|| (mon->type == PLAYER && mon->contr->peaceful))
2169	&& mon->contr->
2170	peaceful)) &&
2171	#else
2172	op->contr->peaceful &&
2173	#endif
2174	!on_battleground))	2133	&& !on_battleground))
		2134	{
		2135	if (op->speed_left > 0.f)
2175	{	2136	{
		2137	--op->speed_left;
		2138
2176	if (!op->contr->braced)	2139	if (!op->contr->braced)
2177	{	2140	{
2178	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2141	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2179	(void) push_ob (mon, dir, op);	2142	push_ob (mon, dir, op);
2180	}	2143	}
2181	else	2144	else
2182	new_draw_info (0, 0, op, "You withhold your attack");	2145	new_draw_info (0, 0, op, "You withhold your attack");
2183		2146
2184	if (op->contr->tmp_invis || op->hide)	2147	if (op->contr->tmp_invis || op->hide)
2185	make_visible (op);	2148	make_visible (op);
2186	}
2187		2149
		2150	return true;
		2151	}
		2152	}
2188	/* If the object is a boulder or other rollable object, then	2153	/* If the object is a boulder or other rollable object, then
2189	* roll it if not braced. You can't roll it if you are braced.	2154	* roll it if not braced. You can't roll it if you are braced.
2190	*/	2155	*/
2191	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2156	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2157	{
		2158	if (op->speed_left > 0.f)
2192	{	2159	{
		2160	--op->speed_left;
		2161
2193	recursive_roll (mon, dir, op);	2162	recursive_roll (mon, dir, op);
2194	if (action_makes_visible (op))	2163	if (action_makes_visible (op))
2195	make_visible (op);	2164	make_visible (op);
2196	}
2197		2165
		2166	return true;
		2167	}
		2168	}
2198	/* Any generic living creature. Including things like doors.	2169	/* Any generic living creature. Including things like doors.
2199	* Way it works is like this: First, it must have some hit points	2170	* Way it works is like this: First, it must have some hit points
2200	* and be living. Then, it must be one of the following:	2171	* and be living. Then, it must be one of the following:
2201	* 1) Not a player, 2) A player, but of a different party. Note	2172	* 1) Not a player, 2) A player, but of a different party. Note
2202	* that party_number -1 is no party, so attacks can still happen.	2173	* that party_number -1 is no party, so attacks can still happen.
2203	*/	2174	*/
2204
2205	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2175	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2206	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2176	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2207	{	2177	{
2208		2178	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2209	/* If the player hasn't hit something this tick, and does
2210	* so, give them speed boost based on weapon speed. Doing
2211	* it here is better than process_players2, which basically
2212	* incurred a 1 tick offset.
2213	*/
2214	if (!op->contr->has_hit)
2215	{	2179	{
2216	op->speed_left += op->speed / op->contr->weapon_sp;	2180	--op->contr->weapon_sp_left;
2217
2218	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2219	}
2220		2181
2221	skill_attack (mon, op, 0, 0, 0);	2182	skill_attack (mon, op, 0, 0, 0);
2222
2223	/* If attacking another player, that player gets automatic
2224	* hitback, and doesn't loose luck either.
2225	* Disable hitback on the battleground or if the target is
2226	* the wiz.
2227	*/
2228	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2229	{
2230	short luck = mon->stats.luck;
2231
2232	mon->contr->has_hit = 1;
2233	skill_attack (op, mon, 0, 0, 0);
2234	mon->stats.luck = luck;
2235	}
2236		2183
2237	if (action_makes_visible (op))	2184	if (action_makes_visible (op))
2238	make_visible (op);	2185	make_visible (op);
2239	}
2240	} /* if player should attack something */
2241	}
2242		2186
2243	int	2187	return true;
		2188	}
		2189	}
		2190
		2191	return false;
		2192	}
		2193
		2194	bool
2244	move_player (object *op, int dir)	2195	move_player (object *op, int dir)
2245	{	2196	{
2246	int pick;	2197	int pick;
2247		2198
2248	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2199	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2249	return 0;	2200	return 0;
2250		2201
2251	/* Sanity check: make sure dir is valid */	2202	/* Sanity check: make sure dir is valid */
2252	if ((dir < 0) || (dir >= 9))	2203	if ((dir < 0) || (dir >= 9))
2253	{	2204	{
2254	LOG (llevError, "move_player: invalid direction %d\n", dir);	2205	LOG (llevError, "move_player: invalid direction %d\n", dir);
2255	return 0;	2206	return 0;
2256	}	2207	}
2257		2208
2258	/* peterm: added following line */	2209	/* peterm: added following line */
2259	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2210	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2260	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2211	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2261		2212
2262	op->facing = dir;	2213	op->facing = dir;
2263		2214
2264	if (op->hide)	2215	if (op->hide)
2265	do_hidden_move (op);	2216	do_hidden_move (op);
2266		2217
		2218	bool retval;
		2219
2267	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2220	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2268	/*nop */ ;	2221	retval = RESULT_INT (0);
2269	else if (op->contr->fire_on)	2222	else if (op->contr->fire_on)
2270	fire (op, dir);	2223	retval = fire (op, dir);
2271	else	2224	else
2272	{	2225	{
2273	move_player_attack (op, dir);	2226	retval = move_player_attack (op, dir);
2274	pick = check_pick (op);	2227	pick = check_pick (op);
2275	}	2228	}
2276		2229
2277	/* Add special check for newcs players and fire on - this way, the	2230	/* Add special check for newcs players and fire on - this way, the
2278	* server can handle repeat firing.	2231	* server can handle repeat firing.
…		…
2285	/* Update how the player looks. Use the facing, so direction may	2238	/* Update how the player looks. Use the facing, so direction may
2286	* get reset to zero. This allows for full animation capabilities	2239	* get reset to zero. This allows for full animation capabilities
2287	* for players.	2240	* for players.
2288	*/	2241	*/
2289	animate_object (op, op->facing);	2242	animate_object (op, op->facing);
2290	return 0;	2243
		2244	return retval;
2291	}	2245	}
2292		2246
2293	/* This is similar to handle_player, below, but is only used by the	2247	/* This is similar to handle_player, below, but is only used by the
2294	* new client/server stuff.	2248	* new client/server stuff.
2295	* This is sort of special, in that the new client/server actually uses	2249	* This is sort of special, in that the new client/server actually uses
2296	* the new speed values for commands.	2250	* the new speed values for commands.
2297	*	2251	*
2298	* Returns true if there are more actions we can do.	2252	* Returns true if there are more actions we can do. Should not do
		2253	* many actions in a row, as that would be too unfair to other
		2254	* players.
2299	*/	2255	*/
2300	int	2256	bool
2301	handle_newcs_player (object *op)	2257	handle_newcs_player (object *op)
2302	{	2258	{
2303	if (op->contr->hidden)
2304	{
2305	op->invisible = 1000;
2306	/* the socket code flashes the player visible/invisible
2307	* depending on the value of invisible, so we need to
2308	* alternate it here for it to work correctly.
2309	*/
2310	if (pticks & 2)
2311	op->invisible--;
2312	}
2313	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2314	{
2315	op->invisible--;
2316	if (!op->invisible)
2317	{
2318	make_visible (op);
2319	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2320	}
2321	}
2322
2323	if (QUERY_FLAG (op, FLAG_SCARED))	2259	if (QUERY_FLAG (op, FLAG_SCARED))
2324	{	2260	{
2325	flee_player (op);	2261	if (op->speed_left > 0.f)
2326	/* If player is still scared, that is his action for this tick */
2327	if (QUERY_FLAG (op, FLAG_SCARED))
2328	{	2262	{
2329	op->speed_left--;	2263	--op->speed_left;
		2264	flee_player (op);
		2265
2330	return 0;	2266	return true;
2331	}	2267	}
		2268	else
		2269	return false;
2332	}	2270	}
2333
2334	/* I've been seeing crashes where the golem has been destroyed, but
2335	* the player object still points to the defunct golem. The code that
2336	* destroys the golem looks correct, and it doesn't always happen, so
2337	* put this in a a workaround to clean up the golem pointer.
2338	*/
2339	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2340	op->contr->ranges[range_golem] = 0;
2341		2271
2342	/* call this here - we also will call this in do_ericserver, but	2272	/* call this here - we also will call this in do_ericserver, but
2343	* the players time has been increased when doericserver has been	2273	* the players time has been increased when doericserver has been
2344	* called, so we recheck it here.	2274	* called, so we recheck it here.
2345	*/	2275	*/
2346	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2276	if (op->contr->ns->handle_command ())
2347	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2348	;
2349
2350	if (op->speed_left < 0)
2351	return 0;	2277	return true;
2352		2278
2353	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2279	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2354	{
2355	/* All move commands take 1 tick, at least for now */
2356	op->speed_left--;
2357
2358	/* Instead of all the stuff below, let move_player take care
2359	* of it. Also, some of the skill stuff is only put in
2360	* there, as well as the confusion stuff.
2361	*/
2362	move_player (op, op->direction);	2280	return move_player (op, op->direction);
2363	if (op->speed_left > 0)
2364	return 1;
2365	else
2366	return 0;
2367	}
2368		2281
2369	return 0;	2282	return false;
2370	}	2283	}
2371		2284
2372	int	2285	int
2373	save_life (object *op)	2286	save_life (object *op)
2374	{	2287	{
…		…
2409	* from.	2322	* from.
2410	*/	2323	*/
2411	void	2324	void
2412	remove_unpaid_objects (object *op, object *env)	2325	remove_unpaid_objects (object *op, object *env)
2413	{	2326	{
2414	object *next;
2415
2416	while (op)	2327	while (op)
2417	{	2328	{
2418	next = op->below; /* Make sure we have a good value, in case	2329	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2419	* we remove object 'op'	2330
2420	*/
2421	if (QUERY_FLAG (op, FLAG_UNPAID))	2331	if (QUERY_FLAG (op, FLAG_UNPAID))
2422	{	2332	{
2423	op->remove ();
2424	op->x = env->x;
2425	op->y = env->y;
2426	if (env->type == PLAYER)	2333	if (env->type == PLAYER)
2427	esrv_del_item (env->contr, op->count);	2334	esrv_del_item (env->contr, op->count);
2428	insert_ob_in_map (op, env->map, NULL, 0);	2335
		2336	op->insert_at (env);
2429	}	2337	}
2430	else if (op->inv)	2338	else if (op->inv)
2431	remove_unpaid_objects (op->inv, env);	2339	remove_unpaid_objects (op->inv, env);
2432		2340
2433	op = next;	2341	op = next;
…		…
2489	int rate_grace = 2000;	2397	int rate_grace = 2000;
2490	const int max_hp = 1;	2398	const int max_hp = 1;
2491	const int max_sp = 1;	2399	const int max_sp = 1;
2492	const int max_grace = 1;	2400	const int max_grace = 1;
2493		2401
2494	if (op->contr->outputs_sync)	2402	if (op->contr->hidden)
		2403	{
		2404	op->invisible = 1000;
		2405	/* the socket code flashes the player visible/invisible
		2406	* depending on the value of invisible, so we need to
		2407	* alternate it here for it to work correctly.
		2408	*/
		2409	if (pticks & 2)
		2410	op->invisible--;
2495	{	2411	}
2496	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2412	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2497	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2413	{
2498	flush_output_element (op, &op->contr->outputs[i]);	2414	if (!op->invisible--)
		2415	{
		2416	make_visible (op);
		2417	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2418	}
2499	}	2419	}
2500		2420
2501	if (op->contr->ns->state == ST_PLAYING)	2421	if (op->contr->ns->state == ST_PLAYING)
2502	{	2422	{
2503	/* these next three if clauses make it possible to SLOW DOWN	2423	/* these next three if clauses make it possible to SLOW DOWN
…		…
2525	gen_grace = op->stats.maxgrace;	2445	gen_grace = op->stats.maxgrace;
2526	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2446	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2527	}	2447	}
2528		2448
2529	/* Regenerate Spell Points */	2449	/* Regenerate Spell Points */
2530	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2450	if (!op->contr->golem && --op->last_sp < 0)
2531	{	2451	{
2532	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2452	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2533	if (op->stats.sp < op->stats.maxsp)	2453	if (op->stats.sp < op->stats.maxsp)
2534	{	2454	{
2535	op->stats.sp++;	2455	op->stats.sp++;
…		…
2633	}	2553	}
2634		2554
2635	/* Digestion */	2555	/* Digestion */
2636	if (--op->last_eat < 0)	2556	if (--op->last_eat < 0)
2637	{	2557	{
2638	#ifdef COZY_SERVER
2639	int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2640	int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2641	#else
2642	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;	2558	int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2643	#endif
2644		2559
2645	if (op->contr->gen_hp > 0)	2560	if (op->contr->gen_hp > 0)
2646	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2561	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2647	else	2562	else
2648	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2563	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
…		…
2726	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2641	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2727	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2642	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2728		2643
2729	/* restore player */	2644	/* restore player */
2730	at = archetype::find ("poisoning");	2645	at = archetype::find ("poisoning");
2731	tmp = present_arch_in_ob (at, op);	2646	if (object *tmp = present_arch_in_ob (at, op))
2732	if (tmp)
2733	{	2647	{
2734	tmp->destroy ();	2648	tmp->destroy ();
2735	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2649	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2736	}	2650	}
2737		2651
2738	at = archetype::find ("confusion");	2652	at = archetype::find ("confusion");
2739	tmp = present_arch_in_ob (at, op);	2653	if (object *tmp = present_arch_in_ob (at, op))
2740	if (tmp)
2741	{	2654	{
2742	tmp->destroy ();	2655	tmp->destroy ();
2743	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2656	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2744	}	2657	}
2745		2658
…		…
2747	op->stats.hp = op->stats.maxhp;	2660	op->stats.hp = op->stats.maxhp;
2748	if (op->stats.food <= 0)	2661	if (op->stats.food <= 0)
2749	op->stats.food = 999;	2662	op->stats.food = 999;
2750		2663
2751	/* create a bodypart-trophy to make the winner happy */	2664	/* create a bodypart-trophy to make the winner happy */
2752	tmp = arch_to_object (archetype::find ("finger"));	2665	if (object *tmp = arch_to_object (archetype::find ("finger")))
2753	if (tmp != NULL)
2754	{	2666	{
2755	sprintf (buf, "%s's finger", &op->name);	2667	sprintf (buf, "%s's finger", &op->name);
2756	tmp->name = buf;	2668	tmp->name = buf;
2757	sprintf (buf, " This finger has been cut off %s\n"	2669	sprintf (buf, " This finger has been cut off %s\n"
2758	" the %s, when he was defeated at\n level %d by %s.\n",	2670	" the %s, when he was defeated at\n level %d by %s.\n",
2759	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2671	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2760	tmp->msg = buf;	2672	tmp->msg = buf;
2761	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2673	tmp->value = 0, tmp->type = 0;
2762	tmp->materialname = NULL;	2674	tmp->materialname = "organics";
2763	tmp->x = op->x, tmp->y = op->y;	2675	tmp->insert_at (op, tmp);
2764	insert_ob_in_map (tmp, op->map, op, 0);
2765	}	2676	}
2766		2677
2767	/* teleport defeated player to new destination */	2678	/* teleport defeated player to new destination */
2768	transfer_ob (op, x, y, 0, NULL);	2679	transfer_ob (op, x, y, 0, NULL);
2769	op->contr->braced = 0;	2680	op->contr->braced = 0;
…		…
2774		2685
2775	command_kill_pets (op, 0);	2686	command_kill_pets (op, 0);
2776		2687
2777	if (op->stats.food < 0)	2688	if (op->stats.food < 0)
2778	{	2689	{
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);	2690	sprintf (buf, "%s starved to death.", &op->name);
2787	strcpy (op->contr->killer, "starvation");	2691	strcpy (op->contr->killer, "starvation");
2788	}	2692	}
2789	else	2693	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);	2694	sprintf (buf, "%s died.", &op->name);
2799	}	2695
2800	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2696	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2801		2697
2802	/* save the map location for corpse, gravestone */	2698	/* save the map location for corpse, gravestone */
2803	x = op->x;	2699	x = op->x;
2804	y = op->y;	2700	y = op->y;
2805	map = op->map;	2701	map = op->map;
2806
2807		2702
2808	/* NOT_PERMADEATH code. This basically brings the character back to	2703	/* NOT_PERMADEATH code. This basically brings the character back to
2809	* life if they are dead - it takes some exp and a random stat.	2704	* life if they are dead - it takes some exp and a random stat.
2810	* See the config.h file for a little more in depth detail about this.	2705	* See the config.h file for a little more in depth detail about this.
2811	*/	2706	*/
…		…
2828	num_stats_lose = 1;	2723	num_stats_lose = 1;
2829	else	2724	else
2830	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2725	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2831	}	2726	}
2832	else	2727	else
2833	{
2834	num_stats_lose = 1;	2728	num_stats_lose = 1;
2835	}	2729
2836	lost_a_stat = 0;	2730	lost_a_stat = 0;
2837		2731
2838	for (z = 0; z < num_stats_lose; z++)	2732	for (z = 0; z < num_stats_lose; z++)
2839	{	2733	{
2840	i = RANDOM () % NUM_STATS;	2734	i = RANDOM () % NUM_STATS;
…		…
2981	op->stats.hp = op->stats.maxhp;	2875	op->stats.hp = op->stats.maxhp;
2982	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2876	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2983	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2877	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2984		2878
2985	/*	2879	/*
2986	* Check to see if the player is in a shop. IF so, then check to see if
2987	* the player has any unpaid items. If so, remove them and put them back	2880	* Check to see if the player has any unpaid items. If so, remove them
2988	* in the map.	2881	* and put them back in the map.
2989	*/	2882	*/
2990
2991	if (is_in_shop (op))
2992	remove_unpaid_objects (op->inv, op);	2883	remove_unpaid_objects (op->inv, op);
2993		2884
2994	/****************************************/	2885	/****************************************/
2995	/* */	2886	/* */
2996	/* Move player to his current respawn- */	2887	/* Move player to his current respawn- */
2997	/* position (usually last savebed) */	2888	/* position (usually last savebed) */
2998	/* */	2889	/* */
2999	/****************************************/	2890	/****************************************/
3000		2891
3001	enter_player_savebed (op);	2892	enter_player_savebed (op);
3002		2893
3003	/* Save the player before inserting the force to reduce
3004	* chance of abuse.
3005	*/
3006	op->contr->braced = 0;	2894	op->contr->braced = 0;
3007	op->contr->save ();
3008		2895
3009	/* it is possible that the player has blown something up	2896	/* it is possible that the player has blown something up
3010	* at his savebed location, and that can have long lasting	2897	* at his savebed location, and that can have long lasting
3011	* spell effects. So first see if there is a spell effect	2898	* spell effects. So first see if there is a spell effect
3012	* on the space that might harm the player.	2899	* on the space that might harm the player.
…		…
3021	object *force;	2908	object *force;
3022	int at;	2909	int at;
3023		2910
3024	force = get_archetype (FORCE_NAME);	2911	force = get_archetype (FORCE_NAME);
3025	/* 50 ticks should be enough time for the spell to abate */	2912	/* 50 ticks should be enough time for the spell to abate */
3026	force->speed = 0.1;	2913	force->speed = 0.1f;
3027	force->speed_left = -5.0;	2914	force->speed_left = -5.f;
3028	SET_FLAG (force, FLAG_APPLIED);	2915	SET_FLAG (force, FLAG_APPLIED);
3029	for (at = 0; at < NROFATTACKS; at++)	2916	for (at = 0; at < NROFATTACKS; at++)
3030	if (will_kill_again & (1 << at))	2917	if (will_kill_again & (1 << at))
3031	force->resist[at] = 100;	2918	force->resist[at] = 100;
3032		2919
…		…
3041	void	2928	void
3042	loot_object (object *op)	2929	loot_object (object *op)
3043	{ /* Grab and destroy some treasure */	2930	{ /* Grab and destroy some treasure */
3044	object *tmp, *tmp2, *next;	2931	object *tmp, *tmp2, *next;
3045		2932
3046	if (op->container)	2933	op->close_container (); /* close open sack first */
3047	esrv_apply_container (op, op->container); /* close open sack first */
3048		2934
3049	for (tmp = op->inv; tmp; tmp = next)	2935	for (tmp = op->inv; tmp; tmp = next)
3050	{	2936	{
3051	next = tmp->below;	2937	next = tmp->below;
3052		2938
3053	if (tmp->invisible)	2939	if (tmp->invisible)
3054	continue;	2940	continue;
3055		2941
3056	tmp->remove ();	2942	tmp->remove ();
3057	tmp->x = op->x, tmp->y = op->y;	2943	tmp->x = op->x, tmp->y = op->y;
		2944
3058	if (tmp->type == CONTAINER)	2945	if (tmp->type == CONTAINER)
3059	{ /* empty container to ground */	2946	loot_object (tmp); /* empty container to ground */
3060	loot_object (tmp);	2947
3061	}
3062	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))	2948	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3063	{	2949	{
3064	if (tmp->nrof > 1)	2950	if (tmp->nrof > 1)
3065	{	2951	{
3066	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2952	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3067	tmp2->destroy ();	2953	tmp2->destroy ();
…		…
3078	/*	2964	/*
3079	* fix_weight(): Check recursively the weight of all players, and fix	2965	* fix_weight(): Check recursively the weight of all players, and fix
3080	* what needs to be fixed. Refresh windows and fix speed if anything	2966	* what needs to be fixed. Refresh windows and fix speed if anything
3081	* was changed.	2967	* was changed.
3082	*/	2968	*/
3083
3084	void	2969	void
3085	fix_weight (void)	2970	fix_weight (void)
3086	{	2971	{
3087	for_all_players (pl)	2972	for_all_players (pl)
3088	{	2973	{
…		…
3148	if (op->type == PLAYER)	3033	if (op->type == PLAYER)
3149	{	3034	{
3150	op->contr->tmp_invis = 0;	3035	op->contr->tmp_invis = 0;
3151	op->contr->invis_race = 0;	3036	op->contr->invis_race = 0;
3152	}	3037	}
		3038
3153	update_object (op, UP_OBJ_FACE);	3039	update_object (op, UP_OBJ_CHANGE);
3154	}	3040	}
3155		3041
3156	int	3042	int
3157	is_true_undead (object *op)	3043	is_true_undead (object *op)
3158	{	3044	{
3159	object *tmp = NULL;
3160
3161	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3045	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3162	return 1;	3046	return 1;
3163		3047
3164	return 0;	3048	return 0;
3165	}	3049	}
…		…
3210	/* For Hidden creatures - a chance of becoming 'unhidden'	3094	/* For Hidden creatures - a chance of becoming 'unhidden'
3211	* every time they move - as we subtract off 'invisibility'	3095	* every time they move - as we subtract off 'invisibility'
3212	* AND, for players, if they move into a ridiculously unhideable	3096	* AND, for players, if they move into a ridiculously unhideable
3213	* spot (surrounded by clear terrain in broad daylight). -b.t.	3097	* spot (surrounded by clear terrain in broad daylight). -b.t.
3214	*/	3098	*/
3215
3216	void	3099	void
3217	do_hidden_move (object *op)	3100	do_hidden_move (object *op)
3218	{	3101	{
3219	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	3102	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3220	object *skop;	3103	object *skop;
…		…
3224		3107
3225	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3108	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3226		3109
3227	/* its *extremely* hard to run and sneak/hide at the same time! */	3110	/* its *extremely* hard to run and sneak/hide at the same time! */
3228	if (op->type == PLAYER && op->contr->run_on)	3111	if (op->type == PLAYER && op->contr->run_on)
3229	{
3230	if (!skop || num >= skop->level)	3112	if (!skop || num >= skop->level)
3231	{	3113	{
3232	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3114	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3233	make_visible (op);	3115	make_visible (op);
3234	return;	3116	return;
3235	}	3117	}
3236	else	3118	else
3237	num += 20;	3119	num += 20;
3238	}	3120
3239	num += op->map->difficulty;	3121	num += op->map->difficulty;
3240	hide = hideability (op); /* modify by terrain hidden level */	3122	hide = hideability (op); /* modify by terrain hidden level */
3241	num -= hide;	3123	num -= hide;
		3124
3242	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3125	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3243	{	3126	{
3244	make_visible (op);	3127	make_visible (op);
3245	if (op->type == PLAYER)	3128	if (op->type == PLAYER)
3246	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3129	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3247	}	3130	}
3248	else if (op->type == PLAYER && skop)	3131	else if (op->type == PLAYER && skop)
3249	{
3250	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3132	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3251	}
3252	}	3133	}
3253		3134
3254	/* determine if who is standing near a hostile creature. */	3135	/* determine if who is standing near a hostile creature. */
3255		3136
3256	int	3137	int
…		…
3323	if (pl->type != PLAYER)	3204	if (pl->type != PLAYER)
3324	{	3205	{
3325	LOG (llevError, "player_can_view() called for non-player object\n");	3206	LOG (llevError, "player_can_view() called for non-player object\n");
3326	return -1;	3207	return -1;
3327	}	3208	}
		3209
3328	if (!pl || !op)	3210	if (!pl || !op)
3329	return 0;	3211	return 0;
3330		3212
3331	if (op->head)
3332	{
3333	op = op->head;	3213	op = op->head_ ();
3334	}	3214
3335	get_rangevector (pl, op, &rv, 0x1);	3215	get_rangevector (pl, op, &rv, 0x1);
3336		3216
3337	/* starting with the 'head' part, lets loop	3217	/* starting with the 'head' part, lets loop
3338	* through the object and find if it has any	3218	* through the object and find if it has any
3339	* part that is in the los array but isnt on	3219	* part that is in the los array but isnt on
…		…
3456	char buf[MAX_BUF]; /* tmp. string buffer */	3336	char buf[MAX_BUF]; /* tmp. string buffer */
3457	int i = 0, j = 0;	3337	int i = 0, j = 0;
3458		3338
3459	/* get the appropriate treasurelist */	3339	/* get the appropriate treasurelist */
3460	if (atnr == ATNR_FIRE)	3340	if (atnr == ATNR_FIRE)
3461	trlist = find_treasurelist ("dragon_ability_fire");	3341	trlist = treasurelist::find ("dragon_ability_fire");
3462	else if (atnr == ATNR_COLD)	3342	else if (atnr == ATNR_COLD)
3463	trlist = find_treasurelist ("dragon_ability_cold");	3343	trlist = treasurelist::find ("dragon_ability_cold");
3464	else if (atnr == ATNR_ELECTRICITY)	3344	else if (atnr == ATNR_ELECTRICITY)
3465	trlist = find_treasurelist ("dragon_ability_elec");	3345	trlist = treasurelist::find ("dragon_ability_elec");
3466	else if (atnr == ATNR_POISON)	3346	else if (atnr == ATNR_POISON)
3467	trlist = find_treasurelist ("dragon_ability_poison");	3347	trlist = treasurelist::find ("dragon_ability_poison");
3468		3348
3469	if (trlist == NULL || who->type != PLAYER)	3349	if (trlist == NULL || who->type != PLAYER)
3470	return;	3350	return;
3471		3351
3472	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3352	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3473		3353
3474	if (tr == NULL || tr->item == NULL)	3354	if (!tr || !tr->item)
3475	{	3355	{
3476	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3356	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3477	return;	3357	return;
3478	}	3358	}
3479		3359
…		…
3546	/* forces in the treasurelist can alter the player's stats */	3426	/* forces in the treasurelist can alter the player's stats */
3547	object *skin;	3427	object *skin;
3548		3428
3549	/* first get the dragon skin force */	3429	/* first get the dragon skin force */
3550	shstr_cmp dragon_skin_force ("dragon_skin_force");	3430	shstr_cmp dragon_skin_force ("dragon_skin_force");
3551	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)	3431	for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3552	;	3432	;
3553		3433
3554	if (!skin)	3434	if (!skin)
3555	return;	3435	return;
3556		3436
…		…
3604	* not readied.	3484	* not readied.
3605	*/	3485	*/
3606	void	3486	void
3607	player_unready_range_ob (player *pl, object *ob)	3487	player_unready_range_ob (player *pl, object *ob)
3608	{	3488	{
3609	rangetype i;	3489	if (pl->ob->current_weapon == ob)
		3490	pl->ob->current_weapon = 0;
3610		3491
3611	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3492	if (pl->combat_ob == ob)
3612	{	3493	pl->combat_ob = 0;
		3494
3613	if (pl->ranges[i] == ob)	3495	if (pl->ranged_ob == ob)
3614	{	3496	pl->ranged_ob = 0;
3615	pl->ranges[i] = NULL;
3616	if (pl->shoottype == i)
3617	{
3618	pl->shoottype = range_none;
3619	}
3620	}
3621	}
3622	}	3497	}
		3498
		3499	sint8
		3500	player::visibility_at (maptile *map, int x, int y) const
		3501	{
		3502	if (!ns)
		3503	return 0;
		3504
		3505	int dx, dy;
		3506	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3507	return 0;
		3508
		3509	x += dx - ns->current_x + ns->mapx / 2;
		3510	y += dy - ns->current_y + ns->mapy / 2;
		3511
		3512	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
		3513	return 0;
		3514
		3515	return 100 - blocked_los [x][y];
		3516	}

Diff Legend

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