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.48 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>	26	#include <pwd.h>
26	#include <sproto.h>	27	#include <sproto.h>
27	#include <sounds.h>	28	#include <sounds.h>
28	#include <living.h>	29	#include <living.h>
29	#include <object.h>	30	#include <object.h>
30	#include <spells.h>	31	#include <spells.h>
31	#include <skills.h>	32	#include <skills.h>
32		33
33	#ifdef COZY_SERVER	34	#include <algorithm>
34	extern int same_party (partylist *a, partylist *b);	35	#include <functional>
35	#endif
36		36
37	player *	37	playervec players;
38	find_player (const char *plname)
39	{
40	player *pl;
41
42	for (pl = first_player; pl != NULL; pl = pl->next)
43	{
44	if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
45	return pl;
46	};
47	return NULL;
48	}
49
50	player *
51	find_player_partial_name (const char *plname)
52	{
53	player *pl;
54	player *found = NULL;
55	size_t namelen = strlen (plname);
56
57	for (pl = first_player; pl != NULL; pl = pl->next)
58	{
59	if ((size_t) strlen (pl->ob->name) < namelen)
60	continue;
61
62	if (!strcmp (pl->ob->name, plname))
63	return pl;
64
65	if (!strncasecmp (pl->ob->name, plname, namelen))
66	{
67	if (found)
68	return NULL;
69
70	found = pl;
71	}
72	}
73	return found;
74	}
75		38
76	void	39	void
77	display_motd (const object *op)	40	display_motd (const object *op)
78	{	41	{
79	char buf[MAX_BUF];	42	char buf[MAX_BUF];
…		…
87	return;	50	return;
88		51
89	motd[0] = '\0';	52	motd[0] = '\0';
90	size = 0;	53	size = 0;
91		54
92	while (fgets (buf, MAX_BUF, fp) != NULL)	55	while (fgets (buf, MAX_BUF, fp))
93	{	56	{
94	if (*buf == '#')	57	if (*buf == '#')
95	continue;	58	continue;
96		59
97	strncat (motd + size, buf, HUGE_BUF - size);	60	strncat (motd + size, buf, HUGE_BUF - size);
…		…
116	return;	79	return;
117		80
118	rules[0] = '\0';	81	rules[0] = '\0';
119	size = 0;	82	size = 0;
120		83
121	while (fgets (buf, MAX_BUF, fp) != NULL)	84	while (fgets (buf, MAX_BUF, fp))
122	{	85	{
123	if (*buf == '#')	86	if (*buf == '#')
124	continue;	87	continue;
125		88
126	if (size + strlen (buf) >= HUGE_BUF)	89	if (size + strlen (buf) >= HUGE_BUF)
…		…
162		125
163	if (*buf == '%')	126	if (*buf == '%')
164	{ /* send one news */	127	{ /* send one news */
165	if (size > 0)	128	if (size > 0)
166	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 */	129	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 */
		130
167	strcpy (subject, buf + 1);	131	strcpy (subject, buf + 1);
168	strip_endline (subject);	132	strip_endline (subject);
169	size = 0;	133	size = 0;
170	news[0] = '\0';	134	news[0] = '\0';
171	}	135	}
…		…
184	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	148	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
185	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	149	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);
186	close_and_delete (fp, comp);	150	close_and_delete (fp, comp);
187	}	151	}
188		152
189	int	153	/* This loads the first map an puts the player on it. */
190	playername_ok (const char *cp)	154	static void
		155	set_first_map (object *op)
191	{	156	{
192	/* Don't allow - or _ as first character in the name */	157	op->contr->maplevel = first_map_path;
193	if (*cp == '-' || *cp == '_')	158	op->x = -1;
		159	op->y = -1;
		160	}
		161
		162	void
		163	player::enter_map ()
		164	{
		165	object *tmp = object::create ();
		166
		167	EXIT_PATH (tmp) = maplevel;
		168	EXIT_X (tmp) = ob->x;
		169	EXIT_Y (tmp) = ob->y;
		170	ob->enter_exit (tmp);
		171
		172	tmp->destroy ();
		173	}
		174
		175	void
		176	player::activate ()
		177	{
		178	if (active)
194	return 0;	179	return;
195		180
196	for (; *cp != '\0'; cp++)	181	players.insert (this);
197	if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')	182	ob->remove ();
		183	ob->map = 0;
		184	ob->activate_recursive ();
		185	enter_map ();
		186	}
		187
		188	void
		189	player::deactivate ()
		190	{
		191	if (!active)
198	return 0;	192	return;
199		193
200	return 1;	194	terminate_all_pets (ob);
201	}	195	ob->deactivate_recursive ();
		196	ob->remove ();
		197	ob->map = 0;
202		198
203	/* This no longer sets the player map. Also, it now updates	199	players.erase (this);
204	* all the pointers so the caller doesn't need to do that.	200	}
205	* Caller is responsible for setting the correct map.
206	*/
207		201
208	/* Redo this to do both get_player_ob and get_player.	202	// connect the player with a specific client
209	* Hopefully this will be less bugfree and simpler.	203	// also changed, rationalises, and fixes some incorrect settings
210	* Returns the player structure. If 'p' is null,	204	void
211	* we create a new one. Otherwise, we recycle	205	player::connect (client *ns)
212	* the one that is passed.
213	*/
214	static player *
215	get_player (player *p)
216	{	206	{
217	object *op = arch_to_object (get_player_archetype (0));	207	this->ns = ns;
218	int i;	208	ns->pl = this;
219		209
220	/* Clears basically the entire player structure except	210	ns->update_look = 0;
221	* for next and socket.	211	ns->look_position = 0;
		212
		213	clear_los (ob);
		214
		215	/* make sure he's a player -- needed because of class change. */
		216	ob->type = PLAYER; // we are paranoid
		217	ob->race = ob->arch->clone.race;
		218
		219	if (!legal_range (ob, shoottype))
		220	shoottype = range_none;
		221
		222	ob->carrying = sum_weight (ob);
		223	link_player_skills (ob);
		224
		225	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
		226
		227	assign (title, ob->arch->clone.name);
		228
		229	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
		230	* from the class, and not race. I don't see any way to get the class information
		231	* to then update this. I don't think this will actually break anything - anyone
		232	* that can use armour should be able to use a shield. What this may 'break'
		233	* are features new characters get, eg, if someone starts up with a Q, they
		234	* should be able to use a shield. However, old Q's won't get that advantage.
222	*/	235	*/
223	p->clear ();	236	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
		237	SET_FLAG (ob, FLAG_USE_SHIELD);
224		238
		239	/* if it's a dragon player, set the correct title here */
		240	if (is_dragon_pl (ob))
		241	{
		242	object *tmp, *abil = 0, *skin = 0;
		243
		244	shstr_cmp dragon_ability_force ("dragon_ability_force");
		245	shstr_cmp dragon_skin_force ("dragon_skin_force");
		246
		247	for (tmp = ob->inv; tmp; tmp = tmp->below)
		248	if (tmp->type == FORCE)
		249	if (tmp->arch->name == dragon_ability_force)
		250	abil = tmp;
		251	else if (tmp->arch->name == dragon_skin_force)
		252	skin = tmp;
		253
		254	set_dragon_name (ob, abil, skin);
		255	}
		256
		257	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		258	add_friendly_object (ob);
		259
		260	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
		261
		262	esrv_new_player (this, ob->weight + ob->carrying);
		263
		264	ob->update_stats ();
		265	ns->floorbox_update ();
		266
		267	esrv_send_inventory (ob, ob);
		268	esrv_add_spells (this, 0);
		269
		270	activate ();
		271
		272	send_rules (ob);
		273	send_news (ob);
		274	display_motd (ob);
		275
		276	INVOKE_PLAYER (CONNECT, this);
		277	INVOKE_PLAYER (LOGIN, this);
		278	}
		279
		280	void
		281	player::disconnect ()
		282	{
		283	if (ns)
		284	{
		285	if (active)
		286	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		287
		288	INVOKE_PLAYER (DISCONNECT, this);
		289
		290	ns->pl = 0;
		291	this->ns = 0;
		292	}
		293
		294	deactivate ();
		295	}
		296
		297	// the need for this function can be explained
		298	// by load_object not returning the object
		299	void
		300	player::set_object (object *op)
		301	{
		302	ob = op;
		303	ob->contr = this; /* this aren't yet in archetype */
		304
		305	ob->speed_left = 0.5;
		306	ob->speed = 1.0;
		307	ob->direction = 5; /* So player faces south */
		308	ob->stats.wc = 2;
		309	ob->run_away = 25; /* Then we panick... */
		310
		311	ob->roll_stats ();
		312	}
		313
		314	player::player ()
		315	{
225	/* There are some elements we want initialized to non zero value -	316	/* There are some elements we want initialised to non zero value -
226	* we deal with that below this point.	317	* we deal with that below this point.
227	*/	318	*/
228	p->party = NULL;
229	p->outputs_sync = 16; /* Every 2 seconds */	319	outputs_sync = 16; /* Every 2 seconds */
230	p->outputs_count = 8; /* Keeps present behaviour */	320	outputs_count = 8; /* Keeps present behaviour */
231	p->unapply = unapply_nochoice;	321	unapply = unapply_nochoice;
232	p->Swap_First = -1;
233		322
234	#ifdef AUTOSAVE
235	p->last_save_tick = 9999999;
236	#endif
237
238	strcpy (p->savebed_map, first_map_path); /* Init. respawn position */	323	savebed_map = first_map_path; /* Init. respawn position */
239		324
240	op->contr = p; /* this aren't yet in archetype */
241	p->ob = op;
242	op->speed_left = 0.5;
243	op->speed = 1.0;
244	op->direction = 5; /* So player faces south */
245	op->stats.wc = 2;
246	op->run_away = 25; /* Then we panick... */
247
248	{
249	int oldmon = p->socket->monitor_spells; // what a hack
250	p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
251	roll_stats (op);
252	p->socket->monitor_spells = oldmon;
253	}
254	p->state = ST_ROLL_STAT;
255	clear_los (op);
256
257	p->gen_sp_armour = 10;	325	gen_sp_armour = 10;
258	p->last_speed = -1;	326	last_speed = -1;
259	p->shoottype = range_none;	327	shoottype = range_none;
260	p->bowtype = bow_normal;	328	bowtype = bow_normal;
261	p->petmode = pet_normal;	329	petmode = pet_normal;
262	p->listening = 10;	330	listening = 10;
263	p->usekeys = containers;	331	usekeys = containers;
264	p->last_weapon_sp = -1;	332	last_weapon_sp = -1;
265	p->peaceful = 1; /* default peaceful */	333	peaceful = 1; /* default peaceful */
266	p->do_los = 1;	334	do_los = 1;
267	p->explore = 0;
268
269	assign (p->title, op->arch->clone.name);
270	op->race = op->arch->clone.race;
271
272	CLEAR_FLAG (op, FLAG_READY_SKILL);
273		335
274	/* we need to clear these to -1 and not zero - otherwise,	336	/* we need to clear these to -1 and not zero - otherwise,
275	* if a player quits and starts a new character, we wont	337	* if a player quits and starts a new character, we wont
276	* send new values to the client, as things like exp start	338	* send new values to the client, as things like exp start
277	* at zero.	339	* at zero.
278	*/	340	*/
279	for (i = 0; i < NUM_SKILLS; i++)	341	for (int i = 0; i < NUM_SKILLS; i++)
280	{
281	p->last_skill_exp[i] = -1;	342	last_skill_exp[i] = -1;
282	p->last_skill_ob[i] = NULL;
283	}
284		343
285	for (i = 0; i < NROFATTACKS; i++)	344	for (int i = 0; i < NROFATTACKS; i++)
286	p->last_resist[i] = -1;	345	last_resist[i] = -1;
287		346
288	p->last_stats.exp = -1;	347	last_stats.exp = -1;
289	p->last_weight = (uint32) - 1;	348	last_weight = (uint32) - 1;
290
291	p->socket->update_look = 0;
292	p->socket->look_position = 0;
293
294	return p;
295	}	349	}
296		350
297	/* This loads the first map an puts the player on it. */	351	void
298	static void	352	player::do_destroy ()
299	set_first_map (object *op)
300	{	353	{
301	strcpy (op->contr->maplevel, first_map_path);	354	disconnect ();
302	op->x = -1;
303	op->y = -1;
304	enter_exit (op, 0);
305	}
306		355
		356	attachable::do_destroy ();
		357
		358	if (ob)
		359	{
		360	ob->destroy_inv (false);
		361	ob->destroy ();
		362	}
		363	}
		364
		365	player::~player ()
		366	{
		367	/* Clear item stack */
		368	free (stack_items);
		369	}
		370
307	/* Tries to add player on the connection passwd in ns.	371	/* Tries to add player on the connection passed in ns.
308	* All we can really get in this is some settings like host and display	372	* All we can really get in this is some settings like host and display
309	* mode.	373	* mode.
310	*/	374	*/
311		375	player *
312	int	376	player::create ()
313	add_player (client *ns)
314	{	377	{
315	player *p = new player;	378	player *pl = new player;
316		379
317	p->socket = ns;	380	pl->set_object (arch_to_object (get_player_archetype (0)));
318	ns->pl = p;
319
320	p->next = first_player;
321	first_player = p;
322
323	p = get_player (p);
324
325	set_first_map (p->ob);	381	set_first_map (pl->ob);
326		382
327	CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
328	add_friendly_object (p->ob);
329	send_rules (p->ob);
330	send_news (p->ob);
331	display_motd (p->ob);
332	get_name (p->ob);
333
334	return 0;	383	return pl;
335	}	384	}
336		385
337	/*	386	/*
338	* get_player_archetype() return next player archetype from archetype	387	* get_player_archetype() return next player archetype from archetype
339	* list. Not very efficient routine, but used only creating new players.	388	* list. Not very efficient routine, but used only creating new players.
…		…
364		413
365	object *	414	object *
366	get_nearest_player (object *mon)	415	get_nearest_player (object *mon)
367	{	416	{
368	object *op = NULL;	417	object *op = NULL;
369	player *pl = NULL;
370	objectlink *ol;	418	objectlink *ol;
371	unsigned lastdist;	419	unsigned lastdist;
372	rv_vector rv;	420	rv_vector rv;
373		421
374	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	422	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
…		…
406	{	454	{
407	op = ol->ob;	455	op = ol->ob;
408	lastdist = rv.distance;	456	lastdist = rv.distance;
409	}	457	}
410	}	458	}
411	for (pl = first_player; pl != NULL; pl = pl->next)	459
412	{	460	for_all_players (pl)
413	if (can_detect_enemy (mon, pl->ob, &rv))	461	if (can_detect_enemy (mon, pl->ob, &rv))
414	{
415
416	if (lastdist > rv.distance)	462	if (lastdist > rv.distance)
417	{	463	{
418	op = pl->ob;	464	op = pl->ob;
419	lastdist = rv.distance;	465	lastdist = rv.distance;
420	}	466	}
421	}	467
422	}
423	#if 0	468	#if 0
424	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	469	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
425	#endif	470	#endif
426	return op;	471	return op;
427	}	472	}
…		…
445	* circling behaviour. Unfortunately, this function is also used to determined	490	* circling behaviour. Unfortunately, this function is also used to determined
446	* if the creature should cast a spell, so returning a direction in that case	491	* if the creature should cast a spell, so returning a direction in that case
447	* is probably not a good thing.	492	* is probably not a good thing.
448	*/	493	*/
449	#define MAX_SPACES 50	494	#define MAX_SPACES 50
450
451		495
452	/*	496	/*
453	* Returns the direction to the player, if valid. Returns 0 otherwise.	497	* Returns the direction to the player, if valid. Returns 0 otherwise.
454	* modified to verify there is a path to the player. Does this by stepping towards	498	* modified to verify there is a path to the player. Does this by stepping towards
455	* player and if path is blocked then see if blockage is close enough to player that	499	* player and if path is blocked then see if blockage is close enough to player that
…		…
694	/* Need to set up the skill pointers */	738	/* Need to set up the skill pointers */
695	link_player_skills (pl);	739	link_player_skills (pl);
696	}	740	}
697		741
698	void	742	void
699	get_name (object *op)
700	{
701	op->contr->write_buf[0] = '\0';
702	op->contr->state = ST_GET_NAME;
703	send_query (op->contr->socket, 0, "What is your name?\n:");
704	}
705
706	void
707	get_password (object *op)
708	{
709	op->contr->write_buf[0] = '\0';
710	op->contr->state = ST_GET_PASSWORD;
711	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
712	}
713
714	void
715	play_again (object *op)
716	{
717	op->contr->state = ST_PLAY_AGAIN;
718	op->chosen_skill = NULL;
719	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
720	/* a bit of a hack, but there are various places early in th
721	* player creation process that a user can quit (eg, roll
722	* stats) that isn't removing the player. Taking a quick
723	* look, there are many places that call play_again without
724	* removing the player - it probably makes more sense
725	* to leave it to play_again to remove the object in all
726	* cases.
727	*/
728	if (!QUERY_FLAG (op, FLAG_REMOVED))
729	op->remove ();
730	/* Need to set this to null - otherwise, it could point to garbage,
731	* and draw() doesn't check to see if the player is removed, only if
732	* the map is null or not swapped out.
733	*/
734	op->map = NULL;
735	}
736
737	int
738	receive_play_again (object *op, char key)
739	{
740	if (key == 'q' || key == 'Q')
741	{
742	remove_friendly_object (op);
743	leave (op->contr, 0); /* ericserver will draw the message */
744	return 2;
745	}
746	else if (key == 'a' || key == 'A')
747	{
748	player *pl = op->contr;
749	shstr name = op->name;
750
751	op->contr = 0;
752	op->type = 0;
753	op->destroy (1);
754	pl = get_player (pl);
755	op = pl->ob;
756	add_friendly_object (op);
757	op->contr->password[0] = '~';
758	op->name = op->name_pl = 0;
759	/* Lets put a space in here */
760	new_draw_info (NDI_UNIQUE, 0, op, "\n");
761	get_name (op);
762	op->name = op->name_pl = name;
763	set_first_map (op);
764	}
765	else
766	/* user pressed something else so just ask again... */
767	play_again (op);
768
769	return 0;
770	}
771
772	void
773	confirm_password (object *op)
774	{
775
776	op->contr->write_buf[0] = '\0';
777	op->contr->state = ST_CONFIRM_PASSWORD;
778	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
779	}
780
781	void
782	get_party_password (object *op, partylist *party)	743	get_party_password (object *op, partylist *party)
783	{	744	{
784	if (party == NULL)	745	if (party == NULL)
785	{	746	{
786	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	747	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
787	return;	748	return;
788	}	749	}
		750
789	op->contr->write_buf[0] = '\0';	751	op->contr->write_buf[0] = '\0';
790	op->contr->state = ST_GET_PARTY_PASSWORD;	752	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
791	op->contr->party_to_join = party;	753	op->contr->party_to_join = party;
792	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	754	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
793	}	755	}
794
795		756
796	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	757	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
797	int	758	static int
798	roll_stat (void)	759	roll_stat (void)
799	{	760	{
800	int a[4], i, j, k;	761	int a[4], i, j, k;
801		762
802	for (i = 0; i < 4; i++)	763	for (i = 0; i < 4; i++)
…		…
805	for (i = 0, j = 0, k = 7; i < 4; i++)	766	for (i = 0, j = 0, k = 7; i < 4; i++)
806	if (a[i] < k)	767	if (a[i] < k)
807	k = a[i], j = i;	768	k = a[i], j = i;
808		769
809	for (i = 0, k = 0; i < 4; i++)	770	for (i = 0, k = 0; i < 4; i++)
810	{
811	if (i != j)	771	if (i != j)
812	k += a[i];	772	k += a[i];
813	}	773
814	return k;	774	return k;
815	}	775	}
816		776
817	void	777	void
818	roll_stats (object *op)	778	object::roll_stats ()
819	{	779	{
820	int sum = 0;
821	int i = 0, j = 0;
822	int statsort[7];	780	int statsort [7];
823		781
824	do	782	for (;;)
825	{
826	op->stats.Str = roll_stat ();
827	op->stats.Dex = roll_stat ();
828	op->stats.Int = roll_stat ();
829	op->stats.Con = roll_stat ();
830	op->stats.Wis = roll_stat ();
831	op->stats.Pow = roll_stat ();
832	op->stats.Cha = roll_stat ();
833	sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
834	}	783	{
835	while (sum < 82 || sum > 116);	784	int sum = 0;
		785	for (int i = 7; i--; )
		786	sum += statsort [i] = roll_stat ();
836		787
		788	if (sum >= 82 && sum <= 116)
		789	break;
		790	}
		791
837	/* Sort the stats so that rerolling is easier... */	792	// Sort the stats so that rerolling is easier...
838	statsort[0] = op->stats.Str;	793	std::sort (statsort, statsort + 7, std::greater<int>());
839	statsort[1] = op->stats.Dex;
840	statsort[2] = op->stats.Int;
841	statsort[3] = op->stats.Con;
842	statsort[4] = op->stats.Wis;
843	statsort[5] = op->stats.Pow;
844	statsort[6] = op->stats.Cha;
845		794
846	/* a quick and dirty bubblesort? */
847	do
848	{
849	if (statsort[i] < statsort[i + 1])
850	{
851	j = statsort[i];
852	statsort[i] = statsort[i + 1];
853	statsort[i + 1] = j;
854	i = 0;
855	}
856	else
857	{
858	i++;
859	}
860	}
861	while (i < 6);
862
863	op->stats.Str = statsort[0];	795	stats.Str = statsort[0];
864	op->stats.Dex = statsort[1];	796	stats.Dex = statsort[1];
865	op->stats.Con = statsort[2];	797	stats.Con = statsort[2];
866	op->stats.Int = statsort[3];	798	stats.Int = statsort[3];
867	op->stats.Wis = statsort[4];	799	stats.Wis = statsort[4];
868	op->stats.Pow = statsort[5];	800	stats.Pow = statsort[5];
869	op->stats.Cha = statsort[6];	801	stats.Cha = statsort[6];
870		802
871
872	op->contr->orig_stats.Str = op->stats.Str;
873	op->contr->orig_stats.Dex = op->stats.Dex;
874	op->contr->orig_stats.Int = op->stats.Int;
875	op->contr->orig_stats.Con = op->stats.Con;
876	op->contr->orig_stats.Wis = op->stats.Wis;
877	op->contr->orig_stats.Pow = op->stats.Pow;
878	op->contr->orig_stats.Cha = op->stats.Cha;
879
880	op->level = 1;
881	op->stats.exp = 0;	803	stats.exp = 0;
882	op->stats.ac = 0;	804	stats.ac = 0;
883		805
884	op->contr->levhp[1] = 9;
885	op->contr->levsp[1] = 6;
886	op->contr->levgrace[1] = 3;
887
888	fix_player (op);
889	op->stats.hp = op->stats.maxhp;	806	stats.hp = stats.maxhp;
890	op->stats.sp = op->stats.maxsp;	807	stats.sp = stats.maxsp;
891	op->stats.grace = op->stats.maxgrace;	808	stats.grace = stats.maxgrace;
		809
		810	if (contr)
		811	{
		812	contr->levhp[1] = 9;
		813	contr->levsp[1] = 6;
		814	contr->levgrace[1] = 3;
		815
892	op->contr->orig_stats = op->stats;	816	contr->orig_stats = stats;
		817	}
893	}	818	}
894		819
895	void	820	void
896	Roll_Again (object *op)	821	object::swap_stats (int a, int b)
897	{	822	{
898	esrv_new_player (op->contr, 0);	823	int tmp = get_attr_value (&contr->orig_stats, a);
899	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,	824	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
900	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");	825	set_attr_value (&contr->orig_stats, b, tmp);
901	}
902		826
903	void	827	stats.Str = contr->orig_stats.Str;
904	Swap_Stat (object *op, int Swap_Second)	828	stats.Dex = contr->orig_stats.Dex;
		829	stats.Con = contr->orig_stats.Con;
		830	stats.Int = contr->orig_stats.Int;
		831	stats.Wis = contr->orig_stats.Wis;
		832	stats.Pow = contr->orig_stats.Pow;
		833	stats.Cha = contr->orig_stats.Cha;
		834
		835	//TODO: the following code looks so borked and should, at the very least,
		836	// be merged with the similar code in roll_stats
		837	stats.ac = 0;
		838
		839	level = 1;
		840	stats.exp = 0;
		841	stats.ac = 0;
		842
		843	stats.hp = stats.maxhp;
		844	stats.sp = stats.maxsp;
		845	stats.grace = stats.maxgrace;
		846
		847	if (contr)
		848	{
		849	contr->levhp[1] = 9;
		850	contr->levsp[1] = 6;
		851	contr->levgrace[1] = 3;
		852
		853	contr->orig_stats = stats;
		854	}
		855	}
		856
		857	static void
		858	start_info (object *op)
905	{	859	{
906	signed char tmp;
907	char buf[MAX_BUF];	860	char buf[MAX_BUF];
908		861
909	if (op->contr->Swap_First == -1)	862	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
910	{
911	new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
912	new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
913	new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
914	return;
915	}
916
917	tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
918
919	set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
920
921	set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
922
923	sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
924	new_draw_info (NDI_UNIQUE, 0, op, buf);	863	new_draw_info (NDI_UNIQUE, 0, op, buf);
925	op->stats.Str = op->contr->orig_stats.Str;	864	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
926	op->stats.Dex = op->contr->orig_stats.Dex;
927	op->stats.Con = op->contr->orig_stats.Con;
928	op->stats.Int = op->contr->orig_stats.Int;
929	op->stats.Wis = op->contr->orig_stats.Wis;
930	op->stats.Pow = op->contr->orig_stats.Pow;
931	op->stats.Cha = op->contr->orig_stats.Cha;
932	op->stats.ac = 0;
933
934	op->level = 1;
935	op->stats.exp = 0;
936	op->stats.ac = 0;
937
938	op->contr->levhp[1] = 9;
939	op->contr->levsp[1] = 6;
940	op->contr->levgrace[1] = 3;
941
942	fix_player (op);
943	op->stats.hp = op->stats.maxhp;
944	op->stats.sp = op->stats.maxsp;
945	op->stats.grace = op->stats.maxgrace;
946	op->contr->orig_stats = op->stats;
947	op->contr->Swap_First = -1;
948	}
949
950
951	/* This code has been greatly reduced, because with set_attr_value
952	* and get_attr_value, the stats can be accessed just numeric
953	* ids. stat_trans is a table that translate the number entered
954	* into the actual stat. It is needed because the order the stats
955	* are displayed in the stat window is not the same as how
956	* the number's access that stat. The table does that translation.
957	*/
958	int
959	key_roll_stat (object *op, char key)
960	{
961	int keynum = key - '0';
962	char buf[MAX_BUF];
963	static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
964
965	if (keynum > 0 && keynum <= 7)
966	{
967	if (op->contr->Swap_First == -1)
968	{
969	op->contr->Swap_First = stat_trans[keynum];
970	sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
971	new_draw_info (NDI_UNIQUE, 0, op, buf);	865	//new_draw_info (NDI_UNIQUE, 0, op, " ");
972	}
973	else
974	Swap_Stat (op, stat_trans[keynum]);
975
976	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
977	return 1;
978	}
979	switch (key)
980	{
981	case 'n':
982	case 'N':
983	{
984	SET_FLAG (op, FLAG_WIZ);
985	if (op->map == NULL)
986	{
987	LOG (llevError, "Map == NULL in state 2\n");
988	break;
989	}
990
991	#if 0
992	/* So that enter_exit will put us at startx/starty */
993	op->x = -1;
994
995	enter_exit (op, NULL);
996	#endif
997	SET_ANIMATION (op, 2); /* So player faces south */
998	/* Enter exit adds a player otherwise */
999	add_statbonus (op);
1000	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
1001	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1002	op->contr->state = ST_CHANGE_CLASS;
1003	if (op->msg)
1004	new_draw_info (NDI_BLUE, 0, op, op->msg);
1005	return 0;
1006	}
1007	case 'y':
1008	case 'Y':
1009	roll_stats (op);
1010	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1011	return 1;
1012
1013	case 'q':
1014	case 'Q':
1015	play_again (op);
1016	return 1;
1017
1018	default:
1019	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1020	return 0;
1021	}
1022	return 0;
1023	}	866	}
1024		867
1025	/* This function takes the key that is passed, and does the	868	/* This function takes the key that is passed, and does the
1026	* appropriate action with it (change race, or other things).	869	* appropriate action with it (change race, or other things).
1027	* The function name is for historical reasons - now we have	870	* The function name is for historical reasons - now we have
1028	* separate race and class; this actually changes the RACE,	871	* separate race and class; this actually changes the RACE,
1029	* not the class.	872	* not the class.
1030	*/	873	*/
1031
1032	int	874	int
1033	key_change_class (object *op, char key)	875	key_change_class (object *op, char key)
1034	{	876	{
1035	int tmp_loop;	877	int tmp_loop;
1036		878
1037	if (key == 'q' || key == 'Q')
1038	{
1039	op->remove ();
1040	play_again (op);
1041	return 0;
1042	}
1043	if (key == 'd' || key == 'D')	879	if (key == 'd' || key == 'D')
1044	{	880	{
1045	char buf[MAX_BUF];	881	char buf[MAX_BUF];
1046		882
1047	/* this must before then initial items are given */	883	/* this must before then initial items are given */
…		…
1052	create_treasure (tl, op, 0, 0, 0);	888	create_treasure (tl, op, 0, 0, 0);
1053		889
1054	INVOKE_PLAYER (BIRTH, op->contr);	890	INVOKE_PLAYER (BIRTH, op->contr);
1055	INVOKE_PLAYER (LOGIN, op->contr);	891	INVOKE_PLAYER (LOGIN, op->contr);
1056		892
1057	op->contr->state = ST_PLAYING;	893	op->contr->ns->state = ST_PLAYING;
1058		894
1059	if (op->msg)	895	if (op->msg)
1060	op->msg = NULL;	896	op->msg = NULL;
1061		897
1062	/* We create this now because some of the unique maps will need it	898	/* We create this now because some of the unique maps will need it
…		…
1071	start_info (op);	907	start_info (op);
1072	CLEAR_FLAG (op, FLAG_WIZ);	908	CLEAR_FLAG (op, FLAG_WIZ);
1073	give_initial_items (op, op->randomitems);	909	give_initial_items (op, op->randomitems);
1074	link_player_skills (op);	910	link_player_skills (op);
1075	esrv_send_inventory (op, op);	911	esrv_send_inventory (op, op);
1076	fix_player (op);	912	op->update_stats ();
1077		913
1078	/* This moves the player to a different start map, if there	914	/* This moves the player to a different start map, if there
1079	* is one for this race	915	* is one for this race
1080	*/	916	*/
1081	if (*first_map_ext_path)	917	if (*first_map_ext_path)
1082	{	918	{
1083	object *tmp;	919	object *tmp;
1084	char mapname[MAX_BUF];	920	char mapname[MAX_BUF];
1085		921
1086	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	922	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
1087	tmp = object::create ();	923	tmp = object::create ();
1088	EXIT_PATH (tmp) = mapname;	924	EXIT_PATH (tmp) = mapname;
1089	EXIT_X (tmp) = op->x;	925	EXIT_X (tmp) = op->x;
1090	EXIT_Y (tmp) = op->y;	926	EXIT_Y (tmp) = op->y;
1091	enter_exit (op, tmp); /* we don't really care if it succeeded;	927	op->enter_exit (tmp); /* we don't really care if it succeeded;
1092	* if the map isn't there, then stay on the	928	* if the map isn't there, then stay on the
1093	* default initial map */	929	* default initial map */
1094	tmp->destroy ();	930	tmp->destroy ();
1095	}	931	}
1096	else	932	else
…		…
1107	while (!tmp_loop)	943	while (!tmp_loop)
1108	{	944	{
1109	shstr name = op->name;	945	shstr name = op->name;
1110	int x = op->x, y = op->y;	946	int x = op->x, y = op->y;
1111		947
1112	remove_statbonus (op);	948	op->remove_statbonus ();
1113	op->remove ();	949	op->remove ();
1114	op->arch = get_player_archetype (op->arch);	950	op->arch = get_player_archetype (op->arch);
1115	op->arch->clone.copy_to (op);	951	op->arch->clone.copy_to (op);
1116	op->instantiate ();	952	op->instantiate ();
1117	op->stats = op->contr->orig_stats;	953	op->stats = op->contr->orig_stats;
…		…
1119	op->x = x;	955	op->x = x;
1120	op->y = y;	956	op->y = y;
1121	SET_ANIMATION (op, 2); /* So player faces south */	957	SET_ANIMATION (op, 2); /* So player faces south */
1122	insert_ob_in_map (op, op->map, op, 0);	958	insert_ob_in_map (op, op->map, op, 0);
1123	assign (op->contr->title, op->arch->clone.name);	959	assign (op->contr->title, op->arch->clone.name);
1124	add_statbonus (op);	960	op->add_statbonus ();
1125	tmp_loop = allowed_class (op);	961	tmp_loop = allowed_class (op);
1126	}	962	}
1127		963
1128	update_object (op, UP_OBJ_FACE);	964	update_object (op, UP_OBJ_FACE);
1129	esrv_update_item (UPD_FACE, op, op);	965	esrv_update_item (UPD_FACE, op, op);
1130	fix_player (op);	966	op->update_stats ();
1131	op->stats.hp = op->stats.maxhp;	967	op->stats.hp = op->stats.maxhp;
1132	op->stats.sp = op->stats.maxsp;	968	op->stats.sp = op->stats.maxsp;
1133	op->stats.grace = 0;	969	op->stats.grace = 0;
1134		970
1135	if (op->msg)	971	if (op->msg)
1136	new_draw_info (NDI_BLUE, 0, op, op->msg);	972	new_draw_info (NDI_BLUE, 0, op, op->msg);
1137		973
1138	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	974	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1139	return 0;	975	return 0;
1140	}
1141
1142	int
1143	key_confirm_quit (object *op, char key)
1144	{
1145	char buf[MAX_BUF];
1146
1147	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1148	{
1149	op->contr->state = ST_PLAYING;
1150	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1151	return 1;
1152	}
1153
1154	INVOKE_PLAYER (LOGOUT, op->contr);
1155	INVOKE_PLAYER (QUIT, op->contr);
1156
1157	terminate_all_pets (op);
1158	leave_map (op);
1159	op->direction = 0;
1160	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1161
1162	strcpy (op->contr->killer, "quit");
1163	check_score (op);
1164	op->contr->party = NULL;
1165	if (settings.set_title == TRUE)
1166	op->contr->own_title[0] = '\0';
1167
1168	if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1169	{
1170	maptile *mp, *next;
1171
1172	/* We need to hunt for any per player unique maps in memory and
1173	* get rid of them. The trailing slash in the path is intentional,
1174	* so that players named 'Ab' won't match against players 'Abe' pathname
1175	*/
1176	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1177	for (mp = first_map; mp != NULL; mp = next)
1178	{
1179	next = mp->next;
1180	if (!strncmp (mp->path, buf, strlen (buf)))
1181	delete_map (mp);
1182	}
1183
1184	delete_character (op->name, 1);
1185	}
1186
1187	play_again (op);
1188	return 1;
1189	}	976	}
1190		977
1191	void	978	void
1192	flee_player (object *op)	979	flee_player (object *op)
1193	{	980	{
…		…
1223	{	1010	{
1224	op->enemy = NULL;	1011	op->enemy = NULL;
1225	CLEAR_FLAG (op, FLAG_SCARED);	1012	CLEAR_FLAG (op, FLAG_SCARED);
1226	return;	1013	return;
1227	}	1014	}
		1015
1228	get_rangevector (op, op->enemy, &rv, 0);	1016	get_rangevector (op, op->enemy, &rv, 0);
1229		1017
1230	dir = absdir (4 + rv.direction);	1018	dir = absdir (4 + rv.direction);
1231	for (diff = 0; diff < 3; diff++)	1019	for (diff = 0; diff < 3; diff++)
1232	{	1020	{
1233	int m = 1 - (RANDOM () & 2);	1021	int m = 1 - (RANDOM () & 2);
1234		1022
1235	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	1023	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1236	{
1237	return;	1024	return;
1238	}
1239	}	1025	}
		1026
1240	/* Cornered, get rid of scared */	1027	/* Cornered, get rid of scared */
1241	CLEAR_FLAG (op, FLAG_SCARED);	1028	CLEAR_FLAG (op, FLAG_SCARED);
1242	op->enemy = NULL;	1029	op->enemy = NULL;
1243	}	1030	}
1244		1031
…		…
1330	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1117	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1331	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1118	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1332	else	1119	else
1333	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1120	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1334	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1121	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1122
1335	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1123	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1336
1337	sprintf (putstring, "...flags: ");
1338	for (k = 0; k < 4; k++)
1339	{
1340	for (j = 0; j < 32; j++)
1341	{
1342	if ((tmp->flags[k] >> j) & 0x01)
1343	{
1344	sprintf (tmpstr, "%d ", k * 32 + j);
1345	strcat (putstring, tmpstr);
1346	}
1347	}
1348	}
1349	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1350
1351	#if 0
1352	/* print the flags too */
1353	for (k = 0; k < 4; k++)
1354	{
1355	fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1356	for (j = 0; j < 32; j++)
1357	{
1358	fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1359	if (!((j + 1) % 4))
1360	fprintf (stderr, " ");
1361	}
1362	fprintf (stderr, " [%d]\n", k * 32);
1363	}
1364	#endif
1365	}	1124	}
		1125
1366	/* philosophy:	1126	/* philosophy:
1367	* It's easy to grab an item type from a pile, as long as it's	1127	* It's easy to grab an item type from a pile, as long as it's
1368	* generic. This takes no game-time. For more detailed pickups	1128	* generic. This takes no game-time. For more detailed pickups
1369	* and selections, select-items shoul dbe used. This is a	1129	* and selections, select-items should be used. This is a
1370	* grab-as-you-run type mode that's really useful for arrows for	1130	* grab-as-you-run type mode that's really useful for arrows for
1371	* example.	1131	* example.
1372	* The drawback: right now it has no frontend, so you need to	1132	* The drawback: right now it has no frontend, so you need to
1373	* stick the bits you want into a calculator in hex mode and then	1133	* stick the bits you want into a calculator in hex mode and then
1374	* convert to decimal and then 'pickup <#>	1134	* convert to decimal and then 'pickup <#>
…		…
1874	return 0;	1634	return 0;
1875	}	1635	}
1876		1636
1877	arrow->set_owner (op);	1637	arrow->set_owner (op);
1878	arrow->skill = bow->skill;	1638	arrow->skill = bow->skill;
1879
1880	arrow->direction = dir;	1639	arrow->direction = dir;
1881	arrow->x = sx;
1882	arrow->y = sy;
1883		1640
1884	if (op->type == PLAYER)	1641	if (op->type == PLAYER)
1885	{	1642	{
1886	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1643	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1887	fix_player (op);	1644	op->update_stats ();
1888	}	1645	}
1889		1646
1890	SET_ANIMATION (arrow, arrow->direction);	1647	SET_ANIMATION (arrow, arrow->direction);
1891	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1648	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1892	arrow->stats.hp = arrow->stats.dam;	1649	arrow->stats.hp = arrow->stats.dam;
…		…
1902		1659
1903	/* update the speed */	1660	/* update the speed */
1904	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1661	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1905	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1662	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1906		1663
1907	if (arrow->speed < 1.0)	1664	arrow->set_speed (max (arrow->speed, 1.0));
1908	arrow->speed = 1.0;
1909	update_ob_speed (arrow);
1910	arrow->speed_left = 0;	1665	arrow->speed_left = 0;
1911		1666
1912	if (op->type == PLAYER)	1667	if (op->type == PLAYER)
1913	{	1668	{
1914	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1669	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
1927	arrow->attacktype |= bow->attacktype;	1682	arrow->attacktype |= bow->attacktype;
1928		1683
1929	if (bow->slaying)	1684	if (bow->slaying)
1930	arrow->slaying = bow->slaying;	1685	arrow->slaying = bow->slaying;
1931		1686
1932	arrow->map = m;
1933	arrow->move_type = MOVE_FLY_LOW;	1687	arrow->move_type = MOVE_FLY_LOW;
1934	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1688	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1935		1689
1936	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1690	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1937	insert_ob_in_map (arrow, m, op, 0);	1691	m->insert (arrow, sx, sy, op);
1938		1692
1939	if (!arrow->destroyed ())	1693	if (!arrow->destroyed ())
1940	move_arrow (arrow);	1694	move_arrow (arrow);
1941		1695
1942	if (op->type == PLAYER)	1696	if (op->type == PLAYER)
…		…
1968	}	1722	}
1969	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1723	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1970	{	1724	{
1971	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1725	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1972	wcmod = -1;	1726	wcmod = -1;
		1727
1973	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1728	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1974	}	1729	}
1975	else if (op->contr->bowtype == bow_threewide)	1730	else if (op->contr->bowtype == bow_threewide)
1976	{	1731	{
1977	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1732	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
2047		1802
2048	if (item->arch)	1803	if (item->arch)
2049	{	1804	{
2050	CLEAR_FLAG (item, FLAG_ANIMATE);	1805	CLEAR_FLAG (item, FLAG_ANIMATE);
2051	item->face = item->arch->clone.face;	1806	item->face = item->arch->clone.face;
2052	item->speed = 0;	1807	item->set_speed (0);
2053	update_ob_speed (item);
2054	}	1808	}
		1809
2055	if ((tmp = is_player_inv (item)))	1810	if ((tmp = item->in_player ()))
2056	esrv_update_item (UPD_ANIM, tmp, item);	1811	esrv_update_item (UPD_ANIM, tmp, item);
2057	}	1812	}
2058	}	1813	}
2059	else if (item->type == ROD || item->type == HORN)	1814	else if (item->type == ROD || item->type == HORN)
2060	{
2061	drain_rod_charge (item);	1815	drain_rod_charge (item);
2062	}
2063	}	1816	}
2064	}	1817	}
2065		1818
2066	/* Received a fire command for the player - go and do it.	1819	/* Received a fire command for the player - go and do it.
2067	*/	1820	*/
…		…
2210	* 0 otherwise	1963	* 0 otherwise
2211	*/	1964	*/
2212	static int	1965	static int
2213	player_attack_door (object *op, object *door)	1966	player_attack_door (object *op, object *door)
2214	{	1967	{
2215
2216	/* If its a door, try to find a use a key. If we do destroy the door,	1968	/* If its a door, try to find a use a key. If we do destroy the door,
2217	* might as well return immediately as there is nothing more to do -	1969	* might as well return immediately as there is nothing more to do -
2218	* otherwise, we fall through to the rest of the code.	1970	* otherwise, we fall through to the rest of the code.
2219	*/	1971	*/
2220	object *key = find_key (op, op, door);	1972	object *key = find_key (op, op, door);
…		…
2258	* It should keep the code cleaner.	2010	* It should keep the code cleaner.
2259	* When this is called, the players direction has been updated	2011	* When this is called, the players direction has been updated
2260	* (taking into account confusion.) The player is also actually	2012	* (taking into account confusion.) The player is also actually
2261	* going to try and move (not fire weapons).	2013	* going to try and move (not fire weapons).
2262	*/	2014	*/
2263
2264	void	2015	void
2265	move_player_attack (object *op, int dir)	2016	move_player_attack (object *op, int dir)
2266	{	2017	{
2267	object *tmp, *mon;	2018	object *tmp, *mon;
2268	sint16 nx, ny;	2019	sint16 nx, ny;
…		…
2270	maptile *m;	2021	maptile *m;
2271		2022
2272	nx = freearr_x[dir] + op->x;	2023	nx = freearr_x[dir] + op->x;
2273	ny = freearr_y[dir] + op->y;	2024	ny = freearr_y[dir] + op->y;
2274		2025
2275	on_battleground = op_on_battleground (op, NULL, NULL);	2026	on_battleground = op_on_battleground (op, 0, 0);
2276		2027
2277	/* If braced, or can't move to the square, and it is not out of the	2028	/* If braced, or can't move to the square, and it is not out of the
2278	* map, attack it. Note order of if statement is important - don't	2029	* map, attack it. Note order of if statement is important - don't
2279	* want to be calling move_ob if braced, because move_ob will move the	2030	* want to be calling move_ob if braced, because move_ob will move the
2280	* player. This is a pretty nasty hack, because if we could	2031	* player. This is a pretty nasty hack, because if we could
…		…
2285	*/	2036	*/
2286	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2037	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2287	{	2038	{
2288	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2039	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2289	{	2040	{
2290	m = get_map_from_coord (op->map, &nx, &ny);	2041	m = op->map->xy_find (nx, ny);
2291	if (!m)	2042	if (!m)
2292	return; /* Don't think this should happen */	2043	return; /* Don't think this should happen */
2293	}	2044	}
2294	else	2045	else
2295	m = op->map;	2046	m = op->map;
2296		2047
2297	if ((tmp = get_map_ob (m, nx, ny)) == NULL)	2048	if (!(tmp = m->at (nx, ny).bot))
2298	{
2299	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2300	return;	2049	return;
2301	}
2302		2050
2303	mon = NULL;	2051	mon = 0;
2304	/* Go through all the objects, and find ones of interest. Only stop if	2052	/* Go through all the objects, and find ones of interest. Only stop if
2305	* we find a monster - that is something we know we want to attack.	2053	* we find a monster - that is something we know we want to attack.
2306	* if its a door or barrel (can roll) see if there may be monsters	2054	* if its a door or barrel (can roll) see if there may be monsters
2307	* on the space	2055	* on the space
2308	*/	2056	*/
2309	while (tmp != NULL)	2057	while (tmp)
2310	{	2058	{
2311	if (tmp == op)	2059	if (tmp == op)
2312	{	2060	{
2313	tmp = tmp->above;	2061	tmp = tmp->above;
2314	continue;	2062	continue;
…		…
2324	mon = tmp;	2072	mon = tmp;
2325		2073
2326	tmp = tmp->above;	2074	tmp = tmp->above;
2327	}	2075	}
2328		2076
2329	if (mon == NULL) /* This happens anytime the player tries to move */	2077	if (!mon) /* This happens anytime the player tries to move */
2330	return; /* into a wall */	2078	return; /* into a wall */
2331		2079
2332	if (mon->head != NULL)	2080	if (mon->head)
2333	mon = mon->head;	2081	mon = mon->head;
2334		2082
2335	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2083	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2336	if (player_attack_door (op, mon))	2084	if (player_attack_door (op, mon))
2337	return;	2085	return;
…		…
2359	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2107	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2360	{	2108	{
2361	/* If we're braced, we don't want to switch places with it */	2109	/* If we're braced, we don't want to switch places with it */
2362	if (op->contr->braced)	2110	if (op->contr->braced)
2363	return;	2111	return;
		2112
2364	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2113	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2365	(void) push_ob (mon, dir, op);	2114	(void) push_ob (mon, dir, op);
2366	if (op->contr->tmp_invis || op->hide)	2115	if (op->contr->tmp_invis || op->hide)
2367	make_visible (op);	2116	make_visible (op);
		2117
2368	return;	2118	return;
2369	}	2119	}
2370		2120
2371	/* in certain circumstances, you shouldn't attack friendly	2121	/* in certain circumstances, you shouldn't attack friendly
2372	* creatures. Note that if you are braced, you can't push	2122	* creatures. Note that if you are braced, you can't push
…		…
2374	* attack them either.	2124	* attack them either.
2375	*/	2125	*/
2376	if ((mon->type == PLAYER || mon->enemy != op) &&	2126	if ((mon->type == PLAYER || mon->enemy != op) &&
2377	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2127	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2378	#ifdef PROHIBIT_PLAYERKILL	2128	#ifdef PROHIBIT_PLAYERKILL
2379	(op->contr->peaceful	2129	(op->contr->peaceful
2380	|| (mon->type == PLAYER	2130	|| (mon->type == PLAYER
2381	&& mon->contr->	2131	&& mon->contr->
2382	peaceful)) &&	2132	peaceful)) &&
2383	#else	2133	#else
2384	op->contr->peaceful &&	2134	op->contr->peaceful &&
2385	#endif	2135	#endif
2386	!on_battleground))	2136	!on_battleground))
2387	{	2137	{
2388	if (!op->contr->braced)	2138	if (!op->contr->braced)
2389	{	2139	{
2390	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2140	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2391	(void) push_ob (mon, dir, op);	2141	push_ob (mon, dir, op);
2392	}	2142	}
2393	else	2143	else
2394	{
2395	new_draw_info (0, 0, op, "You withhold your attack");	2144	new_draw_info (0, 0, op, "You withhold your attack");
2396	}	2145
2397	if (op->contr->tmp_invis || op->hide)	2146	if (op->contr->tmp_invis || op->hide)
2398	make_visible (op);	2147	make_visible (op);
2399	}	2148	}
2400		2149
2401	/* If the object is a boulder or other rollable object, then	2150	/* If the object is a boulder or other rollable object, then
…		…
2412	* Way it works is like this: First, it must have some hit points	2161	* Way it works is like this: First, it must have some hit points
2413	* and be living. Then, it must be one of the following:	2162	* and be living. Then, it must be one of the following:
2414	* 1) Not a player, 2) A player, but of a different party. Note	2163	* 1) Not a player, 2) A player, but of a different party. Note
2415	* that party_number -1 is no party, so attacks can still happen.	2164	* that party_number -1 is no party, so attacks can still happen.
2416	*/	2165	*/
2417
2418	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2166	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2419	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2167	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2420	{	2168	{
2421		2169
2422	/* If the player hasn't hit something this tick, and does	2170	/* If the player hasn't hit something this tick, and does
…		…
2429	op->speed_left += op->speed / op->contr->weapon_sp;	2177	op->speed_left += op->speed / op->contr->weapon_sp;
2430		2178
2431	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2179	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2432	}	2180	}
2433		2181
2434	skill_attack (mon, op, 0, NULL, NULL);	2182	skill_attack (mon, op, 0, 0, 0);
2435		2183
2436	/* If attacking another player, that player gets automatic	2184	/* If attacking another player, that player gets automatic
2437	* hitback, and doesn't loose luck either.	2185	* hitback, and doesn't loose luck either.
2438	* Disable hitback on the battleground or if the target is	2186	* Disable hitback on the battleground or if the target is
2439	* the wiz.	2187	* the wiz.
…		…
2441	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))	2189	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2442	{	2190	{
2443	short luck = mon->stats.luck;	2191	short luck = mon->stats.luck;
2444		2192
2445	mon->contr->has_hit = 1;	2193	mon->contr->has_hit = 1;
2446	skill_attack (op, mon, 0, NULL, NULL);	2194	skill_attack (op, mon, 0, 0, 0);
2447	mon->stats.luck = luck;	2195	mon->stats.luck = luck;
2448	}	2196	}
		2197
2449	if (action_makes_visible (op))	2198	if (action_makes_visible (op))
2450	make_visible (op);	2199	make_visible (op);
2451	}	2200	}
2452	} /* if player should attack something */	2201	} /* if player should attack something */
2453	}	2202	}
…		…
2455	int	2204	int
2456	move_player (object *op, int dir)	2205	move_player (object *op, int dir)
2457	{	2206	{
2458	int pick;	2207	int pick;
2459		2208
2460	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2209	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2461	return 0;	2210	return 0;
2462		2211
2463	/* Sanity check: make sure dir is valid */	2212	/* Sanity check: make sure dir is valid */
2464	if ((dir < 0) || (dir >= 9))	2213	if ((dir < 0) || (dir >= 9))
2465	{	2214	{
2466	LOG (llevError, "move_player: invalid direction %d\n", dir);	2215	LOG (llevError, "move_player: invalid direction %d\n", dir);
2467	return 0;	2216	return 0;
2468	}	2217	}
2469		2218
2470	/* peterm: added following line */	2219	/* peterm: added following line */
2471	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2220	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2472	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2221	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2473		2222
2474	op->facing = dir;	2223	op->facing = dir;
2475		2224
…		…
2488		2237
2489	/* Add special check for newcs players and fire on - this way, the	2238	/* Add special check for newcs players and fire on - this way, the
2490	* server can handle repeat firing.	2239	* server can handle repeat firing.
2491	*/	2240	*/
2492	if (op->contr->fire_on || (op->contr->run_on && pick != 0))	2241	if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2493	{
2494	op->direction = dir;	2242	op->direction = dir;
2495	}
2496	else	2243	else
2497	{
2498	op->direction = 0;	2244	op->direction = 0;
2499	}	2245
2500	/* Update how the player looks. Use the facing, so direction may	2246	/* Update how the player looks. Use the facing, so direction may
2501	* get reset to zero. This allows for full animation capabilities	2247	* get reset to zero. This allows for full animation capabilities
2502	* for players.	2248	* for players.
2503	*/	2249	*/
2504	animate_object (op, op->facing);	2250	animate_object (op, op->facing);
…		…
2556		2302
2557	/* call this here - we also will call this in do_ericserver, but	2303	/* call this here - we also will call this in do_ericserver, but
2558	* the players time has been increased when doericserver has been	2304	* the players time has been increased when doericserver has been
2559	* called, so we recheck it here.	2305	* called, so we recheck it here.
2560	*/	2306	*/
2561	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2307	if (op->contr->ns->handle_command ())
2562	for (int rep = 8; --rep && op->contr->socket->handle_command (); )	2308	return 1;
2563	;
2564		2309
2565	if (op->speed_left < 0)	2310	if (op->speed_left > 0)
2566	return 0;	2311	{
2567
2568	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2312	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2569	{	2313	{
2570	/* All move commands take 1 tick, at least for now */	2314	/* All move commands take 1 tick, at least for now */
2571	op->speed_left--;	2315	op->speed_left--;
2572		2316
2573	/* Instead of all the stuff below, let move_player take care	2317	/* Instead of all the stuff below, let move_player take care
2574	* of it. Also, some of the skill stuff is only put in	2318	* of it. Also, some of the skill stuff is only put in
2575	* there, as well as the confusion stuff.	2319	* there, as well as the confusion stuff.
2576	*/	2320	*/
2577	move_player (op, op->direction);	2321	move_player (op, op->direction);
2578	if (op->speed_left > 0)	2322
2579	return 1;	2323	return op->speed_left > 0;
2580	else	2324	}
2581	return 0;
2582	}	2325	}
2583		2326
2584	return 0;	2327	return 0;
2585	}	2328	}
2586		2329
…		…
2606	op->stats.hp = op->stats.maxhp;	2349	op->stats.hp = op->stats.maxhp;
2607		2350
2608	if (op->stats.food < 0)	2351	if (op->stats.food < 0)
2609	op->stats.food = 999;	2352	op->stats.food = 999;
2610		2353
2611	fix_player (op);	2354	op->update_stats ();
2612	return 1;	2355	return 1;
2613	}	2356	}
2614		2357
2615	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2358	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2616	CLEAR_FLAG (op, FLAG_LIFESAVE);	2359	CLEAR_FLAG (op, FLAG_LIFESAVE);
…		…
2628	{	2371	{
2629	object *next;	2372	object *next;
2630		2373
2631	while (op)	2374	while (op)
2632	{	2375	{
2633	next = op->below; /* Make sure we have a good value, in case	2376	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2634	* we remove object 'op'	2377
2635	*/
2636	if (QUERY_FLAG (op, FLAG_UNPAID))	2378	if (QUERY_FLAG (op, FLAG_UNPAID))
2637	{	2379	{
2638	op->remove ();
2639	op->x = env->x;
2640	op->y = env->y;
2641	if (env->type == PLAYER)	2380	if (env->type == PLAYER)
2642	esrv_del_item (env->contr, op->count);	2381	esrv_del_item (env->contr, op->count);
2643	insert_ob_in_map (op, env->map, NULL, 0);	2382
		2383	op->insert_at (env);
2644	}	2384	}
2645	else if (op->inv)	2385	else if (op->inv)
2646	remove_unpaid_objects (op->inv, env);	2386	remove_unpaid_objects (op->inv, env);
2647		2387
2648	op = next;	2388	op = next;
2649	}	2389	}
2650	}	2390	}
2651
2652		2391
2653	/*	2392	/*
2654	* Returns pointer a static string containing gravestone text	2393	* Returns pointer a static string containing gravestone text
2655	* Moved from apply.c to player.c - player.c is what	2394	* Moved from apply.c to player.c - player.c is what
2656	* actually uses this function. player.c may not be quite the	2395	* actually uses this function. player.c may not be quite the
…		…
2690	strncat (buf2, " ", 20 - strlen (buf) / 2);	2429	strncat (buf2, " ", 20 - strlen (buf) / 2);
2691	strcat (buf2, buf);	2430	strcat (buf2, buf);
2692		2431
2693	return buf2;	2432	return buf2;
2694	}	2433	}
2695
2696
2697		2434
2698	void	2435	void
2699	do_some_living (object *op)	2436	do_some_living (object *op)
2700	{	2437	{
2701	int last_food = op->stats.food;	2438	int last_food = op->stats.food;
…		…
2710	const int max_grace = 1;	2447	const int max_grace = 1;
2711		2448
2712	if (op->contr->outputs_sync)	2449	if (op->contr->outputs_sync)
2713	{	2450	{
2714	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2451	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2715	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2452	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2716	flush_output_element (op, &op->contr->outputs[i]);	2453	flush_output_element (op, &op->contr->outputs[i]);
2717	}	2454	}
2718		2455
2719	if (op->contr->state == ST_PLAYING)	2456	if (op->contr->ns->state == ST_PLAYING)
2720	{	2457	{
2721
2722	/* these next three if clauses make it possible to SLOW DOWN	2458	/* these next three if clauses make it possible to SLOW DOWN
2723	hp/grace/spellpoint regeneration. */	2459	hp/grace/spellpoint regeneration. */
2724	if (op->contr->gen_hp >= 0)	2460	if (op->contr->gen_hp >= 0)
2725	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2461	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2726	else	2462	else
2727	{	2463	{
2728	gen_hp = op->stats.maxhp;	2464	gen_hp = op->stats.maxhp;
2729	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2465	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2730	}	2466	}
		2467
2731	if (op->contr->gen_sp >= 0)	2468	if (op->contr->gen_sp >= 0)
2732	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2469	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2733	else	2470	else
2734	{	2471	{
2735	gen_sp = op->stats.maxsp;	2472	gen_sp = op->stats.maxsp;
2736	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2473	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2737	}	2474	}
		2475
2738	if (op->contr->gen_grace >= 0)	2476	if (op->contr->gen_grace >= 0)
2739	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2477	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2740	else	2478	else
2741	{	2479	{
2742	gen_grace = op->stats.maxgrace;	2480	gen_grace = op->stats.maxgrace;
…		…
2758	op->stats.food += op->contr->digestion;	2496	op->stats.food += op->contr->digestion;
2759	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2497	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2760	op->stats.food = last_food;	2498	op->stats.food = last_food;
2761	}	2499	}
2762	}	2500	}
		2501
2763	if (max_sp > 1)	2502	if (max_sp > 1)
2764	{	2503	{
2765	over_sp = (gen_sp + 10) / rate_sp;	2504	over_sp = (gen_sp + 10) / rate_sp;
2766	if (over_sp > 0)	2505	if (over_sp > 0)
2767	{	2506	{
2768	if (op->stats.sp < op->stats.maxsp)	2507	if (op->stats.sp < op->stats.maxsp)
2769	{	2508	{
2770	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2509	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2510
2771	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2511	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2772	op->stats.sp--;	2512	op->stats.sp--;
		2513
2773	if (op->stats.sp > op->stats.maxsp)	2514	if (op->stats.sp > op->stats.maxsp)
2774	op->stats.sp = op->stats.maxsp;	2515	op->stats.sp = op->stats.maxsp;
2775	}	2516	}
2776	op->last_sp = 0;	2517	op->last_sp = 0;
2777	}	2518	}
2778	else	2519	else
2779	{
2780	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2520	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2781	}
2782	}	2521	}
2783	else	2522	else
2784	{
2785	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2523	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2786	}
2787	}	2524	}
2788		2525
2789	/* Regenerate Grace */	2526	/* Regenerate Grace */
2790	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2527	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2791	if (--op->last_grace < 0)	2528	if (--op->last_grace < 0)
2792	{	2529	{
2793	if (op->stats.grace < op->stats.maxgrace / 2)	2530	if (op->stats.grace < op->stats.maxgrace / 2)
2794	op->stats.grace++; /* no penalty in food for regaining grace */	2531	op->stats.grace++; /* no penalty in food for regaining grace */
		2532
2795	if (max_grace > 1)	2533	if (max_grace > 1)
2796	{	2534	{
2797	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2535	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2798	if (over_grace > 0)	2536	if (over_grace > 0)
2799	{	2537	{
…		…
2827	op->stats.food += op->contr->digestion;	2565	op->stats.food += op->contr->digestion;
2828	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2566	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2829	op->stats.food = last_food;	2567	op->stats.food = last_food;
2830	}	2568	}
2831	}	2569	}
		2570
2832	if (max_hp > 1)	2571	if (max_hp > 1)
2833	{	2572	{
2834	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2573	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2835	if (over_hp > 0)	2574	if (over_hp > 0)
2836	{	2575	{
…		…
2860		2599
2861	if (op->contr->gen_hp > 0)	2600	if (op->contr->gen_hp > 0)
2862	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2601	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2863	else	2602	else
2864	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2603	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2604
2865	/* dms do not consume food */	2605	/* dms do not consume food */
2866	if (!QUERY_FLAG (op, FLAG_WIZ))	2606	if (!QUERY_FLAG (op, FLAG_WIZ))
2867	op->stats.food--;	2607	op->stats.food--;
2868	}	2608	}
2869	}
2870		2609
2871	if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2610	if (op->stats.food < 0 && op->stats.hp >= 0)
2872	{	2611	{
2873	object *tmp, *flesh = NULL;	2612	object *tmp, *flesh = 0;
2874		2613
2875	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2614	for (tmp = op->inv; tmp; tmp = tmp->below)
2876	{	2615	{
2877	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2616	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2878	{
2879	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2880	{	2617	{
		2618	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2619	{
2881	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2620	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882	manual_apply (op, tmp, 0);	2621	manual_apply (op, tmp, 0);
2883	if (op->stats.food >= 0 || op->stats.hp < 0)	2622	if (op->stats.food >= 0 || op->stats.hp < 0)
2884	break;	2623	break;
2885	}	2624	}
2886	else if (tmp->type == FLESH)	2625	else if (tmp->type == FLESH)
2887	flesh = tmp;	2626	flesh = tmp;
2888	} /* End if paid for object */	2627	} /* End if paid for object */
2889	} /* end of for loop */	2628	} /* end of for loop */
		2629
2890	/* If player is still starving, it means they don't have any food, so	2630	/* If player is still starving, it means they don't have any food, so
2891	* eat flesh instead.	2631	* eat flesh instead.
2892	*/	2632	*/
2893	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2633	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2894	{	2634	{
2895	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2635	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2896	manual_apply (op, flesh, 0);	2636	manual_apply (op, flesh, 0);
2897	}	2637	}
2898	} /* end if player is starving */	2638	}
2899		2639
2900	while (op->stats.food < 0 && op->stats.hp > 0)	2640	while (op->stats.food < 0 && op->stats.hp >= 0)
2901	op->stats.food++, op->stats.hp--;	2641	op->stats.food++, op->stats.hp--;
2902		2642
2903	if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))	2643	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2904	kill_player (op);	2644	kill_player (op);
		2645	}
2905	}	2646	}
2906
2907
2908		2647
2909	/* If the player should die (lack of hp, food, etc), we call this.	2648	/* If the player should die (lack of hp, food, etc), we call this.
2910	* op is the player in jeopardy. If the player can not be saved (not	2649	* op is the player in jeopardy. If the player can not be saved (not
2911	* permadeath, no lifesave), this will take care of removing the player	2650	* permadeath, no lifesave), this will take care of removing the player
2912	* file.	2651	* file.
…		…
2942	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2681	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2943	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");	2682	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2944		2683
2945	/* restore player */	2684	/* restore player */
2946	at = archetype::find ("poisoning");	2685	at = archetype::find ("poisoning");
2947	tmp = present_arch_in_ob (at, op);	2686	if (object *tmp = present_arch_in_ob (at, op))
2948	if (tmp)
2949	{	2687	{
2950	tmp->destroy ();	2688	tmp->destroy ();
2951	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2689	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2952	}	2690	}
2953		2691
2954	at = archetype::find ("confusion");	2692	at = archetype::find ("confusion");
2955	tmp = present_arch_in_ob (at, op);	2693	if (object *tmp = present_arch_in_ob (at, op))
2956	if (tmp)
2957	{	2694	{
2958	tmp->destroy ();	2695	tmp->destroy ();
2959	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2696	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2960	}	2697	}
2961		2698
…		…
2963	op->stats.hp = op->stats.maxhp;	2700	op->stats.hp = op->stats.maxhp;
2964	if (op->stats.food <= 0)	2701	if (op->stats.food <= 0)
2965	op->stats.food = 999;	2702	op->stats.food = 999;
2966		2703
2967	/* create a bodypart-trophy to make the winner happy */	2704	/* create a bodypart-trophy to make the winner happy */
2968	tmp = arch_to_object (archetype::find ("finger"));	2705	if (object *tmp = arch_to_object (archetype::find ("finger")))
2969	if (tmp != NULL)
2970	{	2706	{
2971	sprintf (buf, "%s's finger", &op->name);	2707	sprintf (buf, "%s's finger", &op->name);
2972	tmp->name = buf;	2708	tmp->name = buf;
2973	sprintf (buf, " This finger has been cut off %s\n"	2709	sprintf (buf, " This finger has been cut off %s\n"
2974	" the %s, when he was defeated at\n level %d by %s.\n",	2710	" the %s, when he was defeated at\n level %d by %s.\n",
2975	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2711	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2976	tmp->msg = buf;	2712	tmp->msg = buf;
2977	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2713	tmp->value = 0, tmp->material = 0, tmp->type = 0;
2978	tmp->materialname = NULL;	2714	tmp->materialname = NULL;
2979	tmp->x = op->x, tmp->y = op->y;	2715	tmp->insert_at (op, tmp);
2980	insert_ob_in_map (tmp, op->map, op, 0);
2981	}	2716	}
2982		2717
2983	/* teleport defeated player to new destination */	2718	/* teleport defeated player to new destination */
2984	transfer_ob (op, x, y, 0, NULL);	2719	transfer_ob (op, x, y, 0, NULL);
2985	op->contr->braced = 0;	2720	op->contr->braced = 0;
…		…
2990		2725
2991	command_kill_pets (op, 0);	2726	command_kill_pets (op, 0);
2992		2727
2993	if (op->stats.food < 0)	2728	if (op->stats.food < 0)
2994	{	2729	{
2995	if (op->contr->explore)
2996	{
2997	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2998	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2999	op->stats.food = 999;
3000	return;
3001	}
3002	sprintf (buf, "%s starved to death.", &op->name);	2730	sprintf (buf, "%s starved to death.", &op->name);
3003	strcpy (op->contr->killer, "starvation");	2731	strcpy (op->contr->killer, "starvation");
3004	}	2732	}
3005	else	2733	else
3006	{
3007	if (op->contr->explore)
3008	{
3009	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
3010	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
3011	op->stats.hp = op->stats.maxhp;
3012	return;
3013	}
3014	sprintf (buf, "%s died.", &op->name);	2734	sprintf (buf, "%s died.", &op->name);
3015	}	2735
3016	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2736	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3017		2737
3018	/* save the map location for corpse, gravestone */	2738	/* save the map location for corpse, gravestone */
3019	x = op->x;	2739	x = op->x;
3020	y = op->y;	2740	y = op->y;
3021	map = op->map;	2741	map = op->map;
3022		2742
3023
3024	if (settings.not_permadeth == TRUE)
3025	{
3026	/* NOT_PERMADEATH code. This basically brings the character back to	2743	/* NOT_PERMADEATH code. This basically brings the character back to
3027	* life if they are dead - it takes some exp and a random stat.	2744	* life if they are dead - it takes some exp and a random stat.
3028	* See the config.h file for a little more in depth detail about this.	2745	* See the config.h file for a little more in depth detail about this.
3029	*/	2746	*/
3030		2747
3031	/* Basically two ways to go - remove a stat permanently, or just	2748	/* Basically two ways to go - remove a stat permanently, or just
3032	* make it depletion. This bunch of code deals with that aspect	2749	* make it depletion. This bunch of code deals with that aspect
3033	* of death.	2750	* of death.
3034	*/	2751	*/
3035	#ifndef COZY_SERVER	2752	#ifndef COZY_SERVER
3036	if (settings.balanced_stat_loss)	2753	if (settings.balanced_stat_loss)
3037	{	2754	{
3038	/* If stat loss is permanent, lose one stat only. */	2755	/* If stat loss is permanent, lose one stat only. */
3039	/* Lower level chars don't lose as many stats because they suffer	2756	/* Lower level chars don't lose as many stats because they suffer
3040	more if they do. */	2757	more if they do. */
3041	/* Higher level characters can afford things such as potions of	2758	/* Higher level characters can afford things such as potions of
3042	restoration, or better, stat potions. So we slug them that	2759	restoration, or better, stat potions. So we slug them that
3043	little bit harder. */	2760	little bit harder. */
3044	/* GD */	2761	/* GD */
3045	if (settings.stat_loss_on_death)	2762	if (settings.stat_loss_on_death)
3046	num_stats_lose = 1;	2763	num_stats_lose = 1;
3047	else
3048	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3049	}
3050	else	2764	else
3051	{	2765	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2766	}
		2767	else
3052	num_stats_lose = 1;	2768	num_stats_lose = 1;
3053	}	2769
3054	lost_a_stat = 0;	2770	lost_a_stat = 0;
3055		2771
3056	for (z = 0; z < num_stats_lose; z++)	2772	for (z = 0; z < num_stats_lose; z++)
3057	{	2773	{
3058	i = RANDOM () % NUM_STATS;	2774	i = RANDOM () % NUM_STATS;
3059		2775
3060	if (settings.stat_loss_on_death)	2776	if (settings.stat_loss_on_death)
3061	{	2777	{
3062	/* Pick a random stat and take a point off it. Tell the player	2778	/* Pick a random stat and take a point off it. Tell the player
3063	* what he lost.	2779	* what he lost.
3064	*/	2780	*/
3065	change_attr_value (&(op->stats), i, -1);	2781	change_attr_value (&(op->stats), i, -1);
3066	check_stat_bounds (&(op->stats));	2782	check_stat_bounds (&(op->stats));
3067	change_attr_value (&(op->contr->orig_stats), i, -1);	2783	change_attr_value (&(op->contr->orig_stats), i, -1);
3068	check_stat_bounds (&(op->contr->orig_stats));	2784	check_stat_bounds (&(op->contr->orig_stats));
3069	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2785	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3070	lost_a_stat = 1;	2786	lost_a_stat = 1;
		2787	}
		2788	else
		2789	{
		2790	/* deplete a stat */
		2791	archetype *deparch = archetype::find ("depletion");
		2792	object *dep;
		2793
		2794	dep = present_arch_in_ob (deparch, op);
		2795	if (!dep)
		2796	{
		2797	dep = arch_to_object (deparch);
		2798	insert_ob_in_ob (dep, op);
3071	}	2799	}
3072	else	2800	lose_this_stat = 1;
		2801	if (settings.balanced_stat_loss)
3073	{	2802	{
3074	/* deplete a stat */	2803	/* GD */
3075	archetype *deparch = archetype::find ("depletion");	2804	/* Get the stat that we're about to deplete. */
3076	object *dep;	2805	this_stat = get_attr_value (&(dep->stats), i);
3077		2806	if (this_stat < 0)
3078	dep = present_arch_in_ob (deparch, op);
3079	if (!dep)
3080	{	2807	{
3081	dep = arch_to_object (deparch);	2808	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3082	insert_ob_in_ob (dep, op);	2809	int keep_chance = this_stat * this_stat;
3083	}	2810
3084	lose_this_stat = 1;	2811	/* Yes, I am paranoid. Sue me. */
3085	if (settings.balanced_stat_loss)
3086	{
3087	/* GD */
3088	/* Get the stat that we're about to deplete. */
3089	this_stat = get_attr_value (&(dep->stats), i);
3090	if (this_stat < 0)	2812	if (keep_chance < 1)
		2813	keep_chance = 1;
		2814
		2815	/* There is a maximum depletion total per level. */
		2816	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3091	{	2817	{
3092	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3093	int keep_chance = this_stat * this_stat;
3094
3095	/* Yes, I am paranoid. Sue me. */
3096	if (keep_chance < 1)
3097	keep_chance = 1;
3098
3099	/* There is a maximum depletion total per level. */
3100	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3101	{
3102	lose_this_stat = 0;	2818	lose_this_stat = 0;
3103	/* Take loss chance vs keep chance to see if we	2819	/* Take loss chance vs keep chance to see if we
3104	retain the stat. */	2820	retain the stat. */
3105	}
3106	else
3107	{
3108	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3109	lose_this_stat = 0;
3110	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3111	this_stat, keep_chance, loss_chance,
3112	lose_this_stat?"LOSE":"KEEP"); */
3113	}
3114	}	2821	}
3115	}
3116
3117	if (lose_this_stat)
3118	{
3119	this_stat = get_attr_value (&(dep->stats), i);
3120	/* We could try to do something clever like find another
3121	* stat to reduce if this fails. But chances are, if
3122	* stats have been depleted to -50, all are pretty low
3123	* and should be roughly the same, so it shouldn't make a
3124	* difference.
3125	*/	2822	else
3126	if (this_stat >= -50)
3127	{	2823	{
3128	change_attr_value (&(dep->stats), i, -1);	2824	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3129	SET_FLAG (dep, FLAG_APPLIED);
3130	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3131	fix_player (op);
3132	lost_a_stat = 1;	2825	lose_this_stat = 0;
		2826	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2827	this_stat, keep_chance, loss_chance,
		2828	lose_this_stat?"LOSE":"KEEP"); */
3133	}	2829	}
3134	}	2830	}
3135	}	2831	}
		2832
		2833	if (lose_this_stat)
		2834	{
		2835	this_stat = get_attr_value (&(dep->stats), i);
		2836	/* We could try to do something clever like find another
		2837	* stat to reduce if this fails. But chances are, if
		2838	* stats have been depleted to -50, all are pretty low
		2839	* and should be roughly the same, so it shouldn't make a
		2840	* difference.
		2841	*/
		2842	if (this_stat >= -50)
		2843	{
		2844	change_attr_value (&(dep->stats), i, -1);
		2845	SET_FLAG (dep, FLAG_APPLIED);
		2846	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2847	op->update_stats ();
		2848	lost_a_stat = 1;
		2849	}
3136	}	2850	}
		2851	}
		2852	}
3137	/* If no stat lost, tell the player. */	2853	/* If no stat lost, tell the player. */
3138	if (!lost_a_stat)	2854	if (!lost_a_stat)
3139	{	2855	{
3140	/* determine_god() seems to not work sometimes... why is this?	2856	/* determine_god() seems to not work sometimes... why is this?
3141	Should I be using something else? GD */	2857	Should I be using something else? GD */
3142	const char *god = determine_god (op);	2858	const char *god = determine_god (op);
3143		2859
3144	if (god && (strcmp (god, "none")))	2860	if (god && (strcmp (god, "none")))
3145	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2861	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3146	else	2862	else
3147	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2863	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3148	}	2864	}
3149	#else	2865	#else
3150	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2866	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3151	#endif	2867	#endif
3152		2868
3153	/* Put a gravestone up where the character 'almost' died. List the	2869	/* Put a gravestone up where the character 'almost' died. List the
3154	* exp loss on the stone.	2870	* exp loss on the stone.
3155	*/	2871	*/
3156	tmp = arch_to_object (archetype::find ("gravestone"));	2872	tmp = arch_to_object (archetype::find ("gravestone"));
3157	sprintf (buf, "%s's gravestone", &op->name);	2873	sprintf (buf, "%s's gravestone", &op->name);
3158	tmp->name = buf;	2874	tmp->name = buf;
3159	sprintf (buf, "%s's gravestones", &op->name);	2875	sprintf (buf, "%s's gravestones", &op->name);
3160	tmp->name_pl = buf;	2876	tmp->name_pl = buf;
3161	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2877	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
3162	tmp->msg = buf;	2878	tmp->msg = buf;
3163	tmp->x = op->x, tmp->y = op->y;	2879	tmp->x = op->x, tmp->y = op->y;
3164	insert_ob_in_map (tmp, op->map, NULL, 0);	2880	insert_ob_in_map (tmp, op->map, NULL, 0);
3165		2881
3166	/**************************************/	2882	/**************************************/
3167	/* */	2883	/* */
3168	/* Subtract the experience points, */	2884	/* Subtract the experience points, */
3169	/* if we died cause of food, give us */	2885	/* if we died cause of food, give us */
3170	/* food, and reset HP's... */	2886	/* food, and reset HP's... */
3171	/* */	2887	/* */
3172	/**************************************/	2888	/**************************************/
3173		2889
3174	/* remove any poisoning and confusion the character may be suffering. */	2890	/* remove any poisoning and confusion the character may be suffering. */
3175	/* restore player */	2891	/* restore player */
3176	at = archetype::find ("poisoning");	2892	at = archetype::find ("poisoning");
3177	tmp = present_arch_in_ob (at, op);	2893	tmp = present_arch_in_ob (at, op);
3178		2894
3179	if (tmp)	2895	if (tmp)
3180	{	2896	{
3181	tmp->destroy ();	2897	tmp->destroy ();
3182	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2898	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3183	}	2899	}
3184		2900
3185	at = archetype::find ("confusion");	2901	at = archetype::find ("confusion");
3186	tmp = present_arch_in_ob (at, op);	2902	tmp = present_arch_in_ob (at, op);
3187	if (tmp)	2903	if (tmp)
3188	{	2904	{
3189	tmp->destroy ();	2905	tmp->destroy ();
3190	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2906	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3191	}	2907	}
3192		2908
3193	cure_disease (op, 0); /* remove any disease */	2909	cure_disease (op, 0); /* remove any disease */
3194		2910
3195	/*add_exp(op, (op->stats.exp * -0.20)); */	2911	/*add_exp(op, (op->stats.exp * -0.20)); */
3196	apply_death_exp_penalty (op);	2912	apply_death_exp_penalty (op);
3197	if (op->stats.food < 100)	2913	if (op->stats.food < 100)
3198	op->stats.food = 900;	2914	op->stats.food = 900;
3199	op->stats.hp = op->stats.maxhp;	2915	op->stats.hp = op->stats.maxhp;
3200	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2916	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3201	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2917	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3202		2918
3203	/*	2919	/*
3204	* Check to see if the player is in a shop. IF so, then check to see if	2920	* Check to see if the player is in a shop. IF so, then check to see if
3205	* the player has any unpaid items. If so, remove them and put them back	2921	* the player has any unpaid items. If so, remove them and put them back
3206	* in the map.	2922	* in the map.
3207	*/	2923	*/
3208		2924
3209	if (is_in_shop (op))	2925	if (is_in_shop (op))
3210	remove_unpaid_objects (op->inv, op);	2926	remove_unpaid_objects (op->inv, op);
3211		2927
3212	/****************************************/	2928	/****************************************/
3213	/* */	2929	/* */
3214	/* Move player to his current respawn- */	2930	/* Move player to his current respawn- */
3215	/* position (usually last savebed) */	2931	/* position (usually last savebed) */
3216	/* */	2932	/* */
3217	/****************************************/	2933	/****************************************/
3218		2934
3219	enter_player_savebed (op);	2935	enter_player_savebed (op);
3220		2936
3221	/* Save the player before inserting the force to reduce
3222	* chance of abuse.
3223	*/
3224	op->contr->braced = 0;	2937	op->contr->braced = 0;
3225	save_player (op, 1);
3226		2938
3227	/* it is possible that the player has blown something up	2939	/* it is possible that the player has blown something up
3228	* at his savebed location, and that can have long lasting	2940	* at his savebed location, and that can have long lasting
3229	* spell effects. So first see if there is a spell effect	2941	* spell effects. So first see if there is a spell effect
3230	* on the space that might harm the player.	2942	* on the space that might harm the player.
3231	*/	2943	*/
3232	will_kill_again = 0;	2944	will_kill_again = 0;
3233	for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)	2945	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3234	if (tmp->type == SPELL_EFFECT)	2946	if (tmp->type == SPELL_EFFECT)
3235	will_kill_again |= tmp->attacktype;	2947	will_kill_again |= tmp->attacktype;
3236		2948
3237	if (will_kill_again)	2949	if (will_kill_again)
3238	{	2950	{
3239	object *force;	2951	object *force;
3240	int at;	2952	int at;
3241		2953
3242	force = get_archetype (FORCE_NAME);	2954	force = get_archetype (FORCE_NAME);
3243	/* 50 ticks should be enough time for the spell to abate */	2955	/* 50 ticks should be enough time for the spell to abate */
3244	force->speed = 0.1;	2956	force->speed = 0.1;
3245	force->speed_left = -5.0;	2957	force->speed_left = -5.0;
3246	SET_FLAG (force, FLAG_APPLIED);	2958	SET_FLAG (force, FLAG_APPLIED);
3247	for (at = 0; at < NROFATTACKS; at++)	2959	for (at = 0; at < NROFATTACKS; at++)
3248	if (will_kill_again & (1 << at))	2960	if (will_kill_again & (1 << at))
3249	force->resist[at] = 100;	2961	force->resist[at] = 100;
3250		2962
3251	insert_ob_in_ob (force, op);	2963	insert_ob_in_ob (force, op);
3252	fix_player (op);	2964	op->update_stats ();
3253		2965
3254	}	2966	}
3255		2967
3256	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2968	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3257	return;
3258	} /* NOT_PERMADETH */
3259	else
3260	{
3261	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3262	* should probably be embedded in an else statement.
3263	*/
3264
3265	op->contr->party = NULL;
3266	if (settings.set_title == TRUE)
3267	op->contr->own_title[0] = '\0';
3268	new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3269	check_score (op);
3270
3271	if (op->contr->ranges[range_golem])
3272	{
3273	remove_friendly_object (op->contr->ranges[range_golem]);
3274	op->contr->ranges[range_golem]->destroy ();
3275	op->contr->ranges[range_golem] = 0;
3276	}
3277
3278	loot_object (op); /* Remove some of the items for good */
3279	op->remove ();
3280	op->direction = 0;
3281
3282	if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3283	{
3284	delete_character (op->name, 0);
3285	if (settings.resurrection == TRUE)
3286	{
3287	/* save playerfile sans equipment when player dies
3288	** then save it as player.pl.dead so that future resurrection
3289	** type spells will work on them nicely
3290	*/
3291	delete_character (op->name, 0);
3292	op->stats.hp = op->stats.maxhp;
3293	op->stats.food = 999;
3294
3295	/* set the location of where the person will reappear when */
3296	/* maybe resurrection code should fix map also */
3297	strcpy (op->contr->maplevel, settings.emergency_mapname);
3298	if (op->map != NULL)
3299	op->map = NULL;
3300	op->x = settings.emergency_x;
3301	op->y = settings.emergency_y;
3302	save_player (op, 0);
3303	op->map = map;
3304	/* please see resurrection.c: peterm */
3305	dead_player (op);
3306	}
3307	else
3308	delete_character (op->name, 1);
3309	}
3310
3311	play_again (op);
3312
3313	/* peterm: added to create a corpse at deathsite. */
3314	tmp = arch_to_object (archetype::find ("corpse_pl"));
3315	sprintf (buf, "%s", &op->name);
3316	tmp->name = tmp->name_pl = buf;
3317	tmp->level = op->level;
3318	tmp->x = x;
3319	tmp->y = y;
3320	tmp->msg = gravestone_text (op);
3321	SET_FLAG (tmp, FLAG_UNIQUE);
3322	insert_ob_in_map (tmp, map, NULL, 0);
3323	}
3324	}	2969	}
3325
3326		2970
3327	void	2971	void
3328	loot_object (object *op)	2972	loot_object (object *op)
3329	{ /* Grab and destroy some treasure */	2973	{ /* Grab and destroy some treasure */
3330	object *tmp, *tmp2, *next;	2974	object *tmp, *tmp2, *next;
3331		2975
3332	if (op->container)	2976	if (op->container)
3333	{ /* close open sack first */
3334	esrv_apply_container (op, op->container);	2977	esrv_apply_container (op, op->container); /* close open sack first */
3335	}
3336		2978
3337	for (tmp = op->inv; tmp != NULL; tmp = next)	2979	for (tmp = op->inv; tmp; tmp = next)
3338	{	2980	{
3339	next = tmp->below;	2981	next = tmp->below;
3340	if (tmp->type == EXPERIENCE || tmp->invisible)	2982
		2983	if (tmp->invisible)
3341	continue;	2984	continue;
		2985
3342	tmp->remove ();	2986	tmp->remove ();
3343	tmp->x = op->x, tmp->y = op->y;	2987	tmp->x = op->x, tmp->y = op->y;
3344	if (tmp->type == CONTAINER)	2988	if (tmp->type == CONTAINER)
3345	{ /* empty container to ground */	2989	{ /* empty container to ground */
3346	loot_object (tmp);	2990	loot_object (tmp);
…		…
3368	*/	3012	*/
3369		3013
3370	void	3014	void
3371	fix_weight (void)	3015	fix_weight (void)
3372	{	3016	{
3373	player *pl;	3017	for_all_players (pl)
3374
3375	for (pl = first_player; pl != NULL; pl = pl->next)
3376	{	3018	{
3377	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3019	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3378		3020
3379	if (old == sum)	3021	if (old == sum)
3380	continue;	3022	continue;
3381	fix_player (pl->ob);	3023	pl->ob->update_stats ();
3382	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	3024	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3383	}	3025	}
3384	}	3026	}
3385		3027
3386	void	3028	void
3387	fix_luck (void)	3029	fix_luck (void)
3388	{	3030	{
3389	player *pl;	3031	for_all_players (pl)
3390
3391	for (pl = first_player; pl != NULL; pl = pl->next)
3392	if (!pl->ob->contr->state)	3032	if (!pl->ob->contr->ns->state)
3393	change_luck (pl->ob, 0);	3033	pl->ob->change_luck (0);
3394	}	3034	}
3395
3396		3035
3397	/* cast_dust() - handles op throwing objects of type 'DUST'.	3036	/* cast_dust() - handles op throwing objects of type 'DUST'.
3398	* This is much simpler in the new spell code - we basically	3037	* This is much simpler in the new spell code - we basically
3399	* just treat this as any other spell casting object.	3038	* just treat this as any other spell casting object.
3400	*/	3039	*/
3401
3402	void	3040	void
3403	cast_dust (object *op, object *throw_ob, int dir)	3041	cast_dust (object *op, object *throw_ob, int dir)
3404	{	3042	{
3405	object *skop, *spob;	3043	object *skop, *spob;
3406		3044
…		…
3451	object *tmp = NULL;	3089	object *tmp = NULL;
3452		3090
3453	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3091	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3454	return 1;	3092	return 1;
3455		3093
3456	if (op->type == PLAYER)
3457	for (tmp = op->inv; tmp; tmp = tmp->below)
3458	if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3459	if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3460	return 1;
3461	return 0;	3094	return 0;
3462	}	3095	}
3463		3096
3464	/* look at the surrounding terrain to determine	3097	/* look at the surrounding terrain to determine
3465	* the hideability of this object. Positive levels	3098	* the hideability of this object. Positive levels
…		…
3521		3154
3522	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3155	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3523		3156
3524	/* its *extremely* hard to run and sneak/hide at the same time! */	3157	/* its *extremely* hard to run and sneak/hide at the same time! */
3525	if (op->type == PLAYER && op->contr->run_on)	3158	if (op->type == PLAYER && op->contr->run_on)
3526	{
3527	if (!skop || num >= skop->level)	3159	if (!skop || num >= skop->level)
3528	{	3160	{
3529	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3161	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3530	make_visible (op);	3162	make_visible (op);
3531	return;	3163	return;
3532	}	3164	}
3533	else	3165	else
3534	num += 20;	3166	num += 20;
3535	}	3167
3536	num += op->map->difficulty;	3168	num += op->map->difficulty;
3537	hide = hideability (op); /* modify by terrain hidden level */	3169	hide = hideability (op); /* modify by terrain hidden level */
3538	num -= hide;	3170	num -= hide;
		3171
3539	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3172	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3540	{	3173	{
3541	make_visible (op);	3174	make_visible (op);
3542	if (op->type == PLAYER)	3175	if (op->type == PLAYER)
3543	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3176	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3544	}	3177	}
3545	else if (op->type == PLAYER && skop)	3178	else if (op->type == PLAYER && skop)
3546	{
3547	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3179	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3548	}
3549	}	3180	}
3550		3181
3551	/* determine if who is standing near a hostile creature. */	3182	/* determine if who is standing near a hostile creature. */
3552		3183
3553	int	3184	int
…		…
3580	if (mflags & P_OUT_OF_MAP)	3211	if (mflags & P_OUT_OF_MAP)
3581	continue;	3212	continue;
3582	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	3213	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3583	continue;	3214	continue;
3584		3215
3585	for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)	3216	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3586	{	3217	{
3587	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	3218	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3588	return 1;	3219	return 1;
3589	else if (tmp->type == PLAYER)	3220	else if (tmp->type == PLAYER)
3590	{	3221	{
…		…
3620	if (pl->type != PLAYER)	3251	if (pl->type != PLAYER)
3621	{	3252	{
3622	LOG (llevError, "player_can_view() called for non-player object\n");	3253	LOG (llevError, "player_can_view() called for non-player object\n");
3623	return -1;	3254	return -1;
3624	}	3255	}
		3256
3625	if (!pl || !op)	3257	if (!pl || !op)
3626	return 0;	3258	return 0;
3627		3259
3628	if (op->head)
3629	{
3630	op = op->head;	3260	op = op->head_ ();
3631	}	3261
3632	get_rangevector (pl, op, &rv, 0x1);	3262	get_rangevector (pl, op, &rv, 0x1);
3633		3263
3634	/* starting with the 'head' part, lets loop	3264	/* starting with the 'head' part, lets loop
3635	* through the object and find if it has any	3265	* through the object and find if it has any
3636	* part that is in the los array but isnt on	3266	* part that is in the los array but isnt on
…		…
3644		3274
3645	/* only the viewable area the player sees is updated by LOS	3275	/* only the viewable area the player sees is updated by LOS
3646	* code, so we need to restrict ourselves to that range of values	3276	* code, so we need to restrict ourselves to that range of values
3647	* for any meaningful values.	3277	* for any meaningful values.
3648	*/	3278	*/
3649	if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&	3279	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3650	FABS (dy) <= (pl->contr->socket->mapy / 2) &&	3280	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3651	!pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])	3281	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3652	return 1;	3282	return 1;
3653	op = op->more;	3283	op = op->more;
3654	}	3284	}
3655	return 0;	3285	return 0;
3656	}	3286	}
…		…
3766	if (trlist == NULL || who->type != PLAYER)	3396	if (trlist == NULL || who->type != PLAYER)
3767	return;	3397	return;
3768		3398
3769	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3399	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3770		3400
3771	if (tr == NULL || tr->item == NULL)	3401	if (!tr || !tr->item)
3772	{	3402	{
3773	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3403	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3774	return;	3404	return;
3775	}	3405	}
3776		3406
…		…
3842	{	3472	{
3843	/* forces in the treasurelist can alter the player's stats */	3473	/* forces in the treasurelist can alter the player's stats */
3844	object *skin;	3474	object *skin;
3845		3475
3846	/* first get the dragon skin force */	3476	/* first get the dragon skin force */
		3477	shstr_cmp dragon_skin_force ("dragon_skin_force");
3847	for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);	3478	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
		3479	;
		3480
3848	if (skin == NULL)	3481	if (!skin)
3849	return;	3482	return;
3850		3483
3851	/* adding new spellpath attunements */	3484	/* adding new spellpath attunements */
3852	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))	3485	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3853	{	3486	{

Diff Legend

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