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.89 by root, Sun Jan 7 02:39:14 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <pwd.h>	26	#include <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	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
		261
		262	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
		263
		264	esrv_new_player (this, ob->weight + ob->carrying);
		265
		266	ob->update_stats ();
		267	ns->floorbox_update ();
		268
		269	esrv_send_inventory (ob, ob);
		270	esrv_add_spells (this, 0);
		271
		272	activate ();
		273
		274	send_rules (ob);
		275	send_news (ob);
		276	display_motd (ob);
		277
		278	INVOKE_PLAYER (CONNECT, this);
		279	INVOKE_PLAYER (LOGIN, this);
		280	}
		281
		282	void
		283	player::disconnect ()
		284	{
		285	//TODO: don't be so harsh and destroy :)
		286	if (ns)
		287	{
		288	if (active)
		289	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		290
		291	INVOKE_PLAYER (DISCONNECT, this);
		292
		293	ns->pl = 0;
		294	this->ns = 0;
		295	}
		296
		297	deactivate ();
		298	}
		299
		300	// the need for this function can be explained
		301	// by load_object not returning the object
		302	void
		303	player::set_object (object *op)
		304	{
		305	ob = op;
		306	ob->contr = this; /* this aren't yet in archetype */
		307
		308	ob->speed_left = 0.5;
		309	ob->speed = 1.0;
		310	ob->direction = 5; /* So player faces south */
		311	ob->stats.wc = 2;
		312	ob->run_away = 25; /* Then we panick... */
		313
		314	ob->roll_stats ();
		315	}
		316
		317	player::player ()
		318	{
225	/* There are some elements we want initialized to non zero value -	319	/* There are some elements we want initialised to non zero value -
226	* we deal with that below this point.	320	* we deal with that below this point.
227	*/	321	*/
228	p->party = NULL;
229	p->outputs_sync = 16; /* Every 2 seconds */	322	outputs_sync = 16; /* Every 2 seconds */
230	p->outputs_count = 8; /* Keeps present behaviour */	323	outputs_count = 8; /* Keeps present behaviour */
231	p->unapply = unapply_nochoice;	324	unapply = unapply_nochoice;
232	p->Swap_First = -1;
233		325
234	#ifdef AUTOSAVE
235	p->last_save_tick = 9999999;
236	#endif
237
238	strcpy (p->savebed_map, first_map_path); /* Init. respawn position */	326	savebed_map = first_map_path; /* Init. respawn position */
239		327
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;	328	gen_sp_armour = 10;
258	p->last_speed = -1;	329	last_speed = -1;
259	p->shoottype = range_none;	330	shoottype = range_none;
260	p->bowtype = bow_normal;	331	bowtype = bow_normal;
261	p->petmode = pet_normal;	332	petmode = pet_normal;
262	p->listening = 10;	333	listening = 10;
263	p->usekeys = containers;	334	usekeys = containers;
264	p->last_weapon_sp = -1;	335	last_weapon_sp = -1;
265	p->peaceful = 1; /* default peaceful */	336	peaceful = 1; /* default peaceful */
266	p->do_los = 1;	337	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		338
274	/* we need to clear these to -1 and not zero - otherwise,	339	/* we need to clear these to -1 and not zero - otherwise,
275	* if a player quits and starts a new character, we wont	340	* if a player quits and starts a new character, we wont
276	* send new values to the client, as things like exp start	341	* send new values to the client, as things like exp start
277	* at zero.	342	* at zero.
278	*/	343	*/
279	for (i = 0; i < NUM_SKILLS; i++)	344	for (int i = 0; i < NUM_SKILLS; i++)
280	{
281	p->last_skill_exp[i] = -1;	345	last_skill_exp[i] = -1;
282	p->last_skill_ob[i] = NULL;
283	}
284		346
285	for (i = 0; i < NROFATTACKS; i++)	347	for (int i = 0; i < NROFATTACKS; i++)
286	p->last_resist[i] = -1;	348	last_resist[i] = -1;
287		349
288	p->last_stats.exp = -1;	350	last_stats.exp = -1;
289	p->last_weight = (uint32) - 1;	351	last_weight = (uint32) - 1;
290
291	p->socket->update_look = 0;
292	p->socket->look_position = 0;
293
294	return p;
295	}	352	}
296		353
297	/* This loads the first map an puts the player on it. */	354	void
298	static void	355	player::do_destroy ()
299	set_first_map (object *op)
300	{	356	{
301	strcpy (op->contr->maplevel, first_map_path);	357	disconnect ();
302	op->x = -1;
303	op->y = -1;
304	enter_exit (op, 0);
305	}
306		358
		359	attachable::do_destroy ();
		360
		361	if (ob)
		362	{
		363	ob->destroy_inv (false);
		364	ob->destroy ();
		365	}
		366	}
		367
		368	player::~player ()
		369	{
		370	/* Clear item stack */
		371	free (stack_items);
		372	}
		373
307	/* Tries to add player on the connection passwd in ns.	374	/* 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	375	* All we can really get in this is some settings like host and display
309	* mode.	376	* mode.
310	*/	377	*/
311		378	player *
312	int	379	player::create ()
313	add_player (client *ns)
314	{	380	{
315	player *p = new player;	381	player *pl = new player;
316		382
317	p->socket = ns;	383	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);	384	set_first_map (pl->ob);
326		385
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;	386	return pl;
335	}	387	}
336		388
337	/*	389	/*
338	* get_player_archetype() return next player archetype from archetype	390	* get_player_archetype() return next player archetype from archetype
339	* list. Not very efficient routine, but used only creating new players.	391	* list. Not very efficient routine, but used only creating new players.
…		…
364		416
365	object *	417	object *
366	get_nearest_player (object *mon)	418	get_nearest_player (object *mon)
367	{	419	{
368	object *op = NULL;	420	object *op = NULL;
369	player *pl = NULL;
370	objectlink *ol;	421	objectlink *ol;
371	unsigned lastdist;	422	unsigned lastdist;
372	rv_vector rv;	423	rv_vector rv;
373		424
374	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	425	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
…		…
406	{	457	{
407	op = ol->ob;	458	op = ol->ob;
408	lastdist = rv.distance;	459	lastdist = rv.distance;
409	}	460	}
410	}	461	}
411	for (pl = first_player; pl != NULL; pl = pl->next)	462
412	{	463	for_all_players (pl)
413	if (can_detect_enemy (mon, pl->ob, &rv))	464	if (can_detect_enemy (mon, pl->ob, &rv))
414	{
415
416	if (lastdist > rv.distance)	465	if (lastdist > rv.distance)
417	{	466	{
418	op = pl->ob;	467	op = pl->ob;
419	lastdist = rv.distance;	468	lastdist = rv.distance;
420	}	469	}
421	}	470
422	}
423	#if 0	471	#if 0
424	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	472	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
425	#endif	473	#endif
426	return op;	474	return op;
427	}	475	}
…		…
445	* circling behaviour. Unfortunately, this function is also used to determined	493	* 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	494	* if the creature should cast a spell, so returning a direction in that case
447	* is probably not a good thing.	495	* is probably not a good thing.
448	*/	496	*/
449	#define MAX_SPACES 50	497	#define MAX_SPACES 50
450
451		498
452	/*	499	/*
453	* Returns the direction to the player, if valid. Returns 0 otherwise.	500	* 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	501	* 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	502	* player and if path is blocked then see if blockage is close enough to player that
…		…
694	/* Need to set up the skill pointers */	741	/* Need to set up the skill pointers */
695	link_player_skills (pl);	742	link_player_skills (pl);
696	}	743	}
697		744
698	void	745	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)	746	get_party_password (object *op, partylist *party)
783	{	747	{
784	if (party == NULL)	748	if (party == NULL)
785	{	749	{
786	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	750	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
787	return;	751	return;
788	}	752	}
		753
789	op->contr->write_buf[0] = '\0';	754	op->contr->write_buf[0] = '\0';
790	op->contr->state = ST_GET_PARTY_PASSWORD;	755	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
791	op->contr->party_to_join = party;	756	op->contr->party_to_join = party;
792	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	757	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
793	}	758	}
794
795		759
796	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	760	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
797	int	761	static int
798	roll_stat (void)	762	roll_stat (void)
799	{	763	{
800	int a[4], i, j, k;	764	int a[4], i, j, k;
801		765
802	for (i = 0; i < 4; i++)	766	for (i = 0; i < 4; i++)
…		…
805	for (i = 0, j = 0, k = 7; i < 4; i++)	769	for (i = 0, j = 0, k = 7; i < 4; i++)
806	if (a[i] < k)	770	if (a[i] < k)
807	k = a[i], j = i;	771	k = a[i], j = i;
808		772
809	for (i = 0, k = 0; i < 4; i++)	773	for (i = 0, k = 0; i < 4; i++)
810	{
811	if (i != j)	774	if (i != j)
812	k += a[i];	775	k += a[i];
813	}	776
814	return k;	777	return k;
815	}	778	}
816		779
817	void	780	void
818	roll_stats (object *op)	781	object::roll_stats ()
819	{	782	{
820	int sum = 0;
821	int i = 0, j = 0;
822	int statsort[7];	783	int statsort [7];
823		784
824	do	785	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	}	786	{
835	while (sum < 82 || sum > 116);	787	int sum = 0;
		788	for (int i = 7; i--; )
		789	sum += statsort [i] = roll_stat ();
836		790
		791	if (sum >= 82 && sum <= 116)
		792	break;
		793	}
		794
837	/* Sort the stats so that rerolling is easier... */	795	// Sort the stats so that rerolling is easier...
838	statsort[0] = op->stats.Str;	796	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		797
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];	798	stats.Str = statsort[0];
864	op->stats.Dex = statsort[1];	799	stats.Dex = statsort[1];
865	op->stats.Con = statsort[2];	800	stats.Con = statsort[2];
866	op->stats.Int = statsort[3];	801	stats.Int = statsort[3];
867	op->stats.Wis = statsort[4];	802	stats.Wis = statsort[4];
868	op->stats.Pow = statsort[5];	803	stats.Pow = statsort[5];
869	op->stats.Cha = statsort[6];	804	stats.Cha = statsort[6];
870		805
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;	806	stats.exp = 0;
882	op->stats.ac = 0;	807	stats.ac = 0;
883		808
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;	809	stats.hp = stats.maxhp;
890	op->stats.sp = op->stats.maxsp;	810	stats.sp = stats.maxsp;
891	op->stats.grace = op->stats.maxgrace;	811	stats.grace = stats.maxgrace;
		812
		813	if (contr)
		814	{
		815	contr->levhp[1] = 9;
		816	contr->levsp[1] = 6;
		817	contr->levgrace[1] = 3;
		818
892	op->contr->orig_stats = op->stats;	819	contr->orig_stats = stats;
		820	}
893	}	821	}
894		822
895	void	823	void
896	Roll_Again (object *op)	824	object::swap_stats (int a, int b)
897	{	825	{
898	esrv_new_player (op->contr, 0);	826	int tmp = get_attr_value (&contr->orig_stats, a);
899	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,	827	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)? ");	828	set_attr_value (&contr->orig_stats, b, tmp);
901	}
902		829
903	void	830	stats.Str = contr->orig_stats.Str;
904	Swap_Stat (object *op, int Swap_Second)	831	stats.Dex = contr->orig_stats.Dex;
		832	stats.Con = contr->orig_stats.Con;
		833	stats.Int = contr->orig_stats.Int;
		834	stats.Wis = contr->orig_stats.Wis;
		835	stats.Pow = contr->orig_stats.Pow;
		836	stats.Cha = contr->orig_stats.Cha;
		837
		838	//TODO: the following code looks so borked and should, at the very least,
		839	// be merged with the similar code in roll_stats
		840	stats.ac = 0;
		841
		842	level = 1;
		843	stats.exp = 0;
		844	stats.ac = 0;
		845
		846	stats.hp = stats.maxhp;
		847	stats.sp = stats.maxsp;
		848	stats.grace = stats.maxgrace;
		849
		850	if (contr)
		851	{
		852	contr->levhp[1] = 9;
		853	contr->levsp[1] = 6;
		854	contr->levgrace[1] = 3;
		855
		856	contr->orig_stats = stats;
		857	}
		858	}
		859
		860	static void
		861	start_info (object *op)
905	{	862	{
906	signed char tmp;
907	char buf[MAX_BUF];	863	char buf[MAX_BUF];
908		864
909	if (op->contr->Swap_First == -1)	865	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);	866	new_draw_info (NDI_UNIQUE, 0, op, buf);
925	op->stats.Str = op->contr->orig_stats.Str;	867	//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);	868	//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	}	869	}
1024		870
1025	/* This function takes the key that is passed, and does the	871	/* This function takes the key that is passed, and does the
1026	* appropriate action with it (change race, or other things).	872	* appropriate action with it (change race, or other things).
1027	* The function name is for historical reasons - now we have	873	* The function name is for historical reasons - now we have
1028	* separate race and class; this actually changes the RACE,	874	* separate race and class; this actually changes the RACE,
1029	* not the class.	875	* not the class.
1030	*/	876	*/
1031
1032	int	877	int
1033	key_change_class (object *op, char key)	878	key_change_class (object *op, char key)
1034	{	879	{
1035	int tmp_loop;	880	int tmp_loop;
1036		881
1037	if (key == 'q' || key == 'Q')
1038	{
1039	op->remove ();
1040	play_again (op);
1041	return 0;
1042	}
1043	if (key == 'd' || key == 'D')	882	if (key == 'd' || key == 'D')
1044	{	883	{
1045	char buf[MAX_BUF];	884	char buf[MAX_BUF];
1046		885
1047	/* this must before then initial items are given */	886	/* this must before then initial items are given */
…		…
1052	create_treasure (tl, op, 0, 0, 0);	891	create_treasure (tl, op, 0, 0, 0);
1053		892
1054	INVOKE_PLAYER (BIRTH, op->contr);	893	INVOKE_PLAYER (BIRTH, op->contr);
1055	INVOKE_PLAYER (LOGIN, op->contr);	894	INVOKE_PLAYER (LOGIN, op->contr);
1056		895
1057	op->contr->state = ST_PLAYING;	896	op->contr->ns->state = ST_PLAYING;
1058		897
1059	if (op->msg)	898	if (op->msg)
1060	op->msg = NULL;	899	op->msg = NULL;
1061		900
1062	/* We create this now because some of the unique maps will need it	901	/* We create this now because some of the unique maps will need it
…		…
1071	start_info (op);	910	start_info (op);
1072	CLEAR_FLAG (op, FLAG_WIZ);	911	CLEAR_FLAG (op, FLAG_WIZ);
1073	give_initial_items (op, op->randomitems);	912	give_initial_items (op, op->randomitems);
1074	link_player_skills (op);	913	link_player_skills (op);
1075	esrv_send_inventory (op, op);	914	esrv_send_inventory (op, op);
1076	fix_player (op);	915	op->update_stats ();
1077		916
1078	/* This moves the player to a different start map, if there	917	/* This moves the player to a different start map, if there
1079	* is one for this race	918	* is one for this race
1080	*/	919	*/
1081	if (*first_map_ext_path)	920	if (*first_map_ext_path)
1082	{	921	{
1083	object *tmp;	922	object *tmp;
1084	char mapname[MAX_BUF];	923	char mapname[MAX_BUF];
1085		924
1086	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	925	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
1087	tmp = object::create ();	926	tmp = object::create ();
1088	EXIT_PATH (tmp) = mapname;	927	EXIT_PATH (tmp) = mapname;
1089	EXIT_X (tmp) = op->x;	928	EXIT_X (tmp) = op->x;
1090	EXIT_Y (tmp) = op->y;	929	EXIT_Y (tmp) = op->y;
1091	enter_exit (op, tmp); /* we don't really care if it succeeded;	930	op->enter_exit (tmp); /* we don't really care if it succeeded;
1092	* if the map isn't there, then stay on the	931	* if the map isn't there, then stay on the
1093	* default initial map */	932	* default initial map */
1094	tmp->destroy ();	933	tmp->destroy ();
1095	}	934	}
1096	else	935	else
…		…
1107	while (!tmp_loop)	946	while (!tmp_loop)
1108	{	947	{
1109	shstr name = op->name;	948	shstr name = op->name;
1110	int x = op->x, y = op->y;	949	int x = op->x, y = op->y;
1111		950
1112	remove_statbonus (op);	951	op->remove_statbonus ();
1113	op->remove ();	952	op->remove ();
1114	op->arch = get_player_archetype (op->arch);	953	op->arch = get_player_archetype (op->arch);
1115	op->arch->clone.copy_to (op);	954	op->arch->clone.copy_to (op);
1116	op->instantiate ();	955	op->instantiate ();
1117	op->stats = op->contr->orig_stats;	956	op->stats = op->contr->orig_stats;
…		…
1119	op->x = x;	958	op->x = x;
1120	op->y = y;	959	op->y = y;
1121	SET_ANIMATION (op, 2); /* So player faces south */	960	SET_ANIMATION (op, 2); /* So player faces south */
1122	insert_ob_in_map (op, op->map, op, 0);	961	insert_ob_in_map (op, op->map, op, 0);
1123	assign (op->contr->title, op->arch->clone.name);	962	assign (op->contr->title, op->arch->clone.name);
1124	add_statbonus (op);	963	op->add_statbonus ();
1125	tmp_loop = allowed_class (op);	964	tmp_loop = allowed_class (op);
1126	}	965	}
1127		966
1128	update_object (op, UP_OBJ_FACE);	967	update_object (op, UP_OBJ_FACE);
1129	esrv_update_item (UPD_FACE, op, op);	968	esrv_update_item (UPD_FACE, op, op);
1130	fix_player (op);	969	op->update_stats ();
1131	op->stats.hp = op->stats.maxhp;	970	op->stats.hp = op->stats.maxhp;
1132	op->stats.sp = op->stats.maxsp;	971	op->stats.sp = op->stats.maxsp;
1133	op->stats.grace = 0;	972	op->stats.grace = 0;
1134		973
1135	if (op->msg)	974	if (op->msg)
1136	new_draw_info (NDI_BLUE, 0, op, op->msg);	975	new_draw_info (NDI_BLUE, 0, op, op->msg);
1137		976
1138	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	977	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;	978	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	}	979	}
1190		980
1191	void	981	void
1192	flee_player (object *op)	982	flee_player (object *op)
1193	{	983	{
…		…
1223	{	1013	{
1224	op->enemy = NULL;	1014	op->enemy = NULL;
1225	CLEAR_FLAG (op, FLAG_SCARED);	1015	CLEAR_FLAG (op, FLAG_SCARED);
1226	return;	1016	return;
1227	}	1017	}
		1018
1228	get_rangevector (op, op->enemy, &rv, 0);	1019	get_rangevector (op, op->enemy, &rv, 0);
1229		1020
1230	dir = absdir (4 + rv.direction);	1021	dir = absdir (4 + rv.direction);
1231	for (diff = 0; diff < 3; diff++)	1022	for (diff = 0; diff < 3; diff++)
1232	{	1023	{
1233	int m = 1 - (RANDOM () & 2);	1024	int m = 1 - (RANDOM () & 2);
1234		1025
1235	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	1026	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1236	{
1237	return;	1027	return;
1238	}
1239	}	1028	}
		1029
1240	/* Cornered, get rid of scared */	1030	/* Cornered, get rid of scared */
1241	CLEAR_FLAG (op, FLAG_SCARED);	1031	CLEAR_FLAG (op, FLAG_SCARED);
1242	op->enemy = NULL;	1032	op->enemy = NULL;
1243	}	1033	}
1244		1034
…		…
1330	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1120	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))));	1121	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1332	else	1122	else
1333	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1123	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))));	1124	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1125
1335	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1126	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	}	1127	}
		1128
1366	/* philosophy:	1129	/* philosophy:
1367	* It's easy to grab an item type from a pile, as long as it's	1130	* 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	1131	* generic. This takes no game-time. For more detailed pickups
1369	* and selections, select-items shoul dbe used. This is a	1132	* and selections, select-items should be used. This is a
1370	* grab-as-you-run type mode that's really useful for arrows for	1133	* grab-as-you-run type mode that's really useful for arrows for
1371	* example.	1134	* example.
1372	* The drawback: right now it has no frontend, so you need to	1135	* 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	1136	* stick the bits you want into a calculator in hex mode and then
1374	* convert to decimal and then 'pickup <#>	1137	* convert to decimal and then 'pickup <#>
…		…
1874	return 0;	1637	return 0;
1875	}	1638	}
1876		1639
1877	arrow->set_owner (op);	1640	arrow->set_owner (op);
1878	arrow->skill = bow->skill;	1641	arrow->skill = bow->skill;
1879
1880	arrow->direction = dir;	1642	arrow->direction = dir;
1881	arrow->x = sx;
1882	arrow->y = sy;
1883		1643
1884	if (op->type == PLAYER)	1644	if (op->type == PLAYER)
1885	{	1645	{
1886	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1646	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1887	fix_player (op);	1647	op->update_stats ();
1888	}	1648	}
1889		1649
1890	SET_ANIMATION (arrow, arrow->direction);	1650	SET_ANIMATION (arrow, arrow->direction);
1891	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1651	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1892	arrow->stats.hp = arrow->stats.dam;	1652	arrow->stats.hp = arrow->stats.dam;
…		…
1902		1662
1903	/* update the speed */	1663	/* update the speed */
1904	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1664	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;	1665	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1906		1666
1907	if (arrow->speed < 1.0)	1667	arrow->set_speed (max (arrow->speed, 1.0));
1908	arrow->speed = 1.0;
1909	update_ob_speed (arrow);
1910	arrow->speed_left = 0;	1668	arrow->speed_left = 0;
1911		1669
1912	if (op->type == PLAYER)	1670	if (op->type == PLAYER)
1913	{	1671	{
1914	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1672	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
1927	arrow->attacktype |= bow->attacktype;	1685	arrow->attacktype |= bow->attacktype;
1928		1686
1929	if (bow->slaying)	1687	if (bow->slaying)
1930	arrow->slaying = bow->slaying;	1688	arrow->slaying = bow->slaying;
1931		1689
1932	arrow->map = m;
1933	arrow->move_type = MOVE_FLY_LOW;	1690	arrow->move_type = MOVE_FLY_LOW;
1934	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1691	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1935		1692
1936	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1693	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1937	insert_ob_in_map (arrow, m, op, 0);	1694	m->insert (arrow, sx, sy, op);
1938		1695
1939	if (!arrow->destroyed ())	1696	if (!arrow->destroyed ())
1940	move_arrow (arrow);	1697	move_arrow (arrow);
1941		1698
1942	if (op->type == PLAYER)	1699	if (op->type == PLAYER)
…		…
1968	}	1725	}
1969	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1726	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1970	{	1727	{
1971	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1728	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1972	wcmod = -1;	1729	wcmod = -1;
		1730
1973	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1731	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1974	}	1732	}
1975	else if (op->contr->bowtype == bow_threewide)	1733	else if (op->contr->bowtype == bow_threewide)
1976	{	1734	{
1977	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1735	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
2047		1805
2048	if (item->arch)	1806	if (item->arch)
2049	{	1807	{
2050	CLEAR_FLAG (item, FLAG_ANIMATE);	1808	CLEAR_FLAG (item, FLAG_ANIMATE);
2051	item->face = item->arch->clone.face;	1809	item->face = item->arch->clone.face;
2052	item->speed = 0;	1810	item->set_speed (0);
2053	update_ob_speed (item);
2054	}	1811	}
		1812
2055	if ((tmp = is_player_inv (item)))	1813	if ((tmp = item->in_player ()))
2056	esrv_update_item (UPD_ANIM, tmp, item);	1814	esrv_update_item (UPD_ANIM, tmp, item);
2057	}	1815	}
2058	}	1816	}
2059	else if (item->type == ROD || item->type == HORN)	1817	else if (item->type == ROD || item->type == HORN)
2060	{
2061	drain_rod_charge (item);	1818	drain_rod_charge (item);
2062	}
2063	}	1819	}
2064	}	1820	}
2065		1821
2066	/* Received a fire command for the player - go and do it.	1822	/* Received a fire command for the player - go and do it.
2067	*/	1823	*/
…		…
2210	* 0 otherwise	1966	* 0 otherwise
2211	*/	1967	*/
2212	static int	1968	static int
2213	player_attack_door (object *op, object *door)	1969	player_attack_door (object *op, object *door)
2214	{	1970	{
2215
2216	/* If its a door, try to find a use a key. If we do destroy the door,	1971	/* 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 -	1972	* might as well return immediately as there is nothing more to do -
2218	* otherwise, we fall through to the rest of the code.	1973	* otherwise, we fall through to the rest of the code.
2219	*/	1974	*/
2220	object *key = find_key (op, op, door);	1975	object *key = find_key (op, op, door);
…		…
2258	* It should keep the code cleaner.	2013	* It should keep the code cleaner.
2259	* When this is called, the players direction has been updated	2014	* When this is called, the players direction has been updated
2260	* (taking into account confusion.) The player is also actually	2015	* (taking into account confusion.) The player is also actually
2261	* going to try and move (not fire weapons).	2016	* going to try and move (not fire weapons).
2262	*/	2017	*/
2263
2264	void	2018	void
2265	move_player_attack (object *op, int dir)	2019	move_player_attack (object *op, int dir)
2266	{	2020	{
2267	object *tmp, *mon;	2021	object *tmp, *mon;
2268	sint16 nx, ny;	2022	sint16 nx, ny;
…		…
2270	maptile *m;	2024	maptile *m;
2271		2025
2272	nx = freearr_x[dir] + op->x;	2026	nx = freearr_x[dir] + op->x;
2273	ny = freearr_y[dir] + op->y;	2027	ny = freearr_y[dir] + op->y;
2274		2028
2275	on_battleground = op_on_battleground (op, NULL, NULL);	2029	on_battleground = op_on_battleground (op, 0, 0);
2276		2030
2277	/* If braced, or can't move to the square, and it is not out of the	2031	/* If braced, or can't move to the square, and it is not out of the
2278	* map, attack it. Note order of if statement is important - don't	2032	* map, attack it. Note order of if statement is important - don't
2279	* want to be calling move_ob if braced, because move_ob will move the	2033	* 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	2034	* player. This is a pretty nasty hack, because if we could
…		…
2285	*/	2039	*/
2286	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2040	if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2287	{	2041	{
2288	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2042	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2289	{	2043	{
2290	m = get_map_from_coord (op->map, &nx, &ny);	2044	m = op->map->xy_find (nx, ny);
2291	if (!m)	2045	if (!m)
2292	return; /* Don't think this should happen */	2046	return; /* Don't think this should happen */
2293	}	2047	}
2294	else	2048	else
2295	m = op->map;	2049	m = op->map;
2296		2050
2297	if ((tmp = get_map_ob (m, nx, ny)) == NULL)	2051	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;	2052	return;
2301	}
2302		2053
2303	mon = NULL;	2054	mon = 0;
2304	/* Go through all the objects, and find ones of interest. Only stop if	2055	/* 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.	2056	* 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	2057	* if its a door or barrel (can roll) see if there may be monsters
2307	* on the space	2058	* on the space
2308	*/	2059	*/
2309	while (tmp != NULL)	2060	while (tmp)
2310	{	2061	{
2311	if (tmp == op)	2062	if (tmp == op)
2312	{	2063	{
2313	tmp = tmp->above;	2064	tmp = tmp->above;
2314	continue;	2065	continue;
…		…
2324	mon = tmp;	2075	mon = tmp;
2325		2076
2326	tmp = tmp->above;	2077	tmp = tmp->above;
2327	}	2078	}
2328		2079
2329	if (mon == NULL) /* This happens anytime the player tries to move */	2080	if (!mon) /* This happens anytime the player tries to move */
2330	return; /* into a wall */	2081	return; /* into a wall */
2331		2082
2332	if (mon->head != NULL)	2083	if (mon->head)
2333	mon = mon->head;	2084	mon = mon->head;
2334		2085
2335	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2086	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2336	if (player_attack_door (op, mon))	2087	if (player_attack_door (op, mon))
2337	return;	2088	return;
…		…
2359	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	2110	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2360	{	2111	{
2361	/* If we're braced, we don't want to switch places with it */	2112	/* If we're braced, we don't want to switch places with it */
2362	if (op->contr->braced)	2113	if (op->contr->braced)
2363	return;	2114	return;
		2115
2364	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2116	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2365	(void) push_ob (mon, dir, op);	2117	(void) push_ob (mon, dir, op);
2366	if (op->contr->tmp_invis || op->hide)	2118	if (op->contr->tmp_invis || op->hide)
2367	make_visible (op);	2119	make_visible (op);
		2120
2368	return;	2121	return;
2369	}	2122	}
2370		2123
2371	/* in certain circumstances, you shouldn't attack friendly	2124	/* in certain circumstances, you shouldn't attack friendly
2372	* creatures. Note that if you are braced, you can't push	2125	* creatures. Note that if you are braced, you can't push
…		…
2374	* attack them either.	2127	* attack them either.
2375	*/	2128	*/
2376	if ((mon->type == PLAYER || mon->enemy != op) &&	2129	if ((mon->type == PLAYER || mon->enemy != op) &&
2377	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2130	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2378	#ifdef PROHIBIT_PLAYERKILL	2131	#ifdef PROHIBIT_PLAYERKILL
2379	(op->contr->peaceful	2132	(op->contr->peaceful
2380	|| (mon->type == PLAYER	2133	|| (mon->type == PLAYER
2381	&& mon->contr->	2134	&& mon->contr->
2382	peaceful)) &&	2135	peaceful)) &&
2383	#else	2136	#else
2384	op->contr->peaceful &&	2137	op->contr->peaceful &&
2385	#endif	2138	#endif
2386	!on_battleground))	2139	!on_battleground))
2387	{	2140	{
2388	if (!op->contr->braced)	2141	if (!op->contr->braced)
2389	{	2142	{
2390	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2143	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2391	(void) push_ob (mon, dir, op);	2144	push_ob (mon, dir, op);
2392	}	2145	}
2393	else	2146	else
2394	{
2395	new_draw_info (0, 0, op, "You withhold your attack");	2147	new_draw_info (0, 0, op, "You withhold your attack");
2396	}	2148
2397	if (op->contr->tmp_invis || op->hide)	2149	if (op->contr->tmp_invis || op->hide)
2398	make_visible (op);	2150	make_visible (op);
2399	}	2151	}
2400		2152
2401	/* If the object is a boulder or other rollable object, then	2153	/* 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	2164	* 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:	2165	* 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	2166	* 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.	2167	* that party_number -1 is no party, so attacks can still happen.
2416	*/	2168	*/
2417
2418	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2169	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)))	2170	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2420	{	2171	{
2421		2172
2422	/* If the player hasn't hit something this tick, and does	2173	/* If the player hasn't hit something this tick, and does
…		…
2429	op->speed_left += op->speed / op->contr->weapon_sp;	2180	op->speed_left += op->speed / op->contr->weapon_sp;
2430		2181
2431	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2182	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2432	}	2183	}
2433		2184
2434	skill_attack (mon, op, 0, NULL, NULL);	2185	skill_attack (mon, op, 0, 0, 0);
2435		2186
2436	/* If attacking another player, that player gets automatic	2187	/* If attacking another player, that player gets automatic
2437	* hitback, and doesn't loose luck either.	2188	* hitback, and doesn't loose luck either.
2438	* Disable hitback on the battleground or if the target is	2189	* Disable hitback on the battleground or if the target is
2439	* the wiz.	2190	* the wiz.
…		…
2441	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))	2192	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2442	{	2193	{
2443	short luck = mon->stats.luck;	2194	short luck = mon->stats.luck;
2444		2195
2445	mon->contr->has_hit = 1;	2196	mon->contr->has_hit = 1;
2446	skill_attack (op, mon, 0, NULL, NULL);	2197	skill_attack (op, mon, 0, 0, 0);
2447	mon->stats.luck = luck;	2198	mon->stats.luck = luck;
2448	}	2199	}
		2200
2449	if (action_makes_visible (op))	2201	if (action_makes_visible (op))
2450	make_visible (op);	2202	make_visible (op);
2451	}	2203	}
2452	} /* if player should attack something */	2204	} /* if player should attack something */
2453	}	2205	}
…		…
2455	int	2207	int
2456	move_player (object *op, int dir)	2208	move_player (object *op, int dir)
2457	{	2209	{
2458	int pick;	2210	int pick;
2459		2211
2460	if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2212	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2461	return 0;	2213	return 0;
2462		2214
2463	/* Sanity check: make sure dir is valid */	2215	/* Sanity check: make sure dir is valid */
2464	if ((dir < 0) || (dir >= 9))	2216	if ((dir < 0) || (dir >= 9))
2465	{	2217	{
2466	LOG (llevError, "move_player: invalid direction %d\n", dir);	2218	LOG (llevError, "move_player: invalid direction %d\n", dir);
2467	return 0;	2219	return 0;
2468	}	2220	}
2469		2221
2470	/* peterm: added following line */	2222	/* peterm: added following line */
2471	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2223	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2472	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2224	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2473		2225
2474	op->facing = dir;	2226	op->facing = dir;
2475		2227
…		…
2488		2240
2489	/* Add special check for newcs players and fire on - this way, the	2241	/* Add special check for newcs players and fire on - this way, the
2490	* server can handle repeat firing.	2242	* server can handle repeat firing.
2491	*/	2243	*/
2492	if (op->contr->fire_on || (op->contr->run_on && pick != 0))	2244	if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2493	{
2494	op->direction = dir;	2245	op->direction = dir;
2495	}
2496	else	2246	else
2497	{
2498	op->direction = 0;	2247	op->direction = 0;
2499	}	2248
2500	/* Update how the player looks. Use the facing, so direction may	2249	/* Update how the player looks. Use the facing, so direction may
2501	* get reset to zero. This allows for full animation capabilities	2250	* get reset to zero. This allows for full animation capabilities
2502	* for players.	2251	* for players.
2503	*/	2252	*/
2504	animate_object (op, op->facing);	2253	animate_object (op, op->facing);
…		…
2556		2305
2557	/* call this here - we also will call this in do_ericserver, but	2306	/* call this here - we also will call this in do_ericserver, but
2558	* the players time has been increased when doericserver has been	2307	* the players time has been increased when doericserver has been
2559	* called, so we recheck it here.	2308	* called, so we recheck it here.
2560	*/	2309	*/
2561	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2310	if (op->contr->ns->handle_command ())
2562	for (int rep = 8; --rep && op->contr->socket->handle_command (); )	2311	return 1;
2563	;
2564		2312
2565	if (op->speed_left < 0)	2313	if (op->speed_left > 0)
2566	return 0;	2314	{
2567
2568	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2315	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2569	{	2316	{
2570	/* All move commands take 1 tick, at least for now */	2317	/* All move commands take 1 tick, at least for now */
2571	op->speed_left--;	2318	op->speed_left--;
2572		2319
2573	/* Instead of all the stuff below, let move_player take care	2320	/* Instead of all the stuff below, let move_player take care
2574	* of it. Also, some of the skill stuff is only put in	2321	* of it. Also, some of the skill stuff is only put in
2575	* there, as well as the confusion stuff.	2322	* there, as well as the confusion stuff.
2576	*/	2323	*/
2577	move_player (op, op->direction);	2324	move_player (op, op->direction);
2578	if (op->speed_left > 0)	2325
2579	return 1;	2326	return op->speed_left > 0;
2580	else	2327	}
2581	return 0;
2582	}	2328	}
2583		2329
2584	return 0;	2330	return 0;
2585	}	2331	}
2586		2332
…		…
2606	op->stats.hp = op->stats.maxhp;	2352	op->stats.hp = op->stats.maxhp;
2607		2353
2608	if (op->stats.food < 0)	2354	if (op->stats.food < 0)
2609	op->stats.food = 999;	2355	op->stats.food = 999;
2610		2356
2611	fix_player (op);	2357	op->update_stats ();
2612	return 1;	2358	return 1;
2613	}	2359	}
2614		2360
2615	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2361	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2616	CLEAR_FLAG (op, FLAG_LIFESAVE);	2362	CLEAR_FLAG (op, FLAG_LIFESAVE);
…		…
2628	{	2374	{
2629	object *next;	2375	object *next;
2630		2376
2631	while (op)	2377	while (op)
2632	{	2378	{
2633	next = op->below; /* Make sure we have a good value, in case	2379	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2634	* we remove object 'op'	2380
2635	*/
2636	if (QUERY_FLAG (op, FLAG_UNPAID))	2381	if (QUERY_FLAG (op, FLAG_UNPAID))
2637	{	2382	{
2638	op->remove ();
2639	op->x = env->x;
2640	op->y = env->y;
2641	if (env->type == PLAYER)	2383	if (env->type == PLAYER)
2642	esrv_del_item (env->contr, op->count);	2384	esrv_del_item (env->contr, op->count);
2643	insert_ob_in_map (op, env->map, NULL, 0);	2385
		2386	op->insert_at (env);
2644	}	2387	}
2645	else if (op->inv)	2388	else if (op->inv)
2646	remove_unpaid_objects (op->inv, env);	2389	remove_unpaid_objects (op->inv, env);
2647		2390
2648	op = next;	2391	op = next;
2649	}	2392	}
2650	}	2393	}
2651
2652		2394
2653	/*	2395	/*
2654	* Returns pointer a static string containing gravestone text	2396	* Returns pointer a static string containing gravestone text
2655	* Moved from apply.c to player.c - player.c is what	2397	* Moved from apply.c to player.c - player.c is what
2656	* actually uses this function. player.c may not be quite the	2398	* actually uses this function. player.c may not be quite the
…		…
2690	strncat (buf2, " ", 20 - strlen (buf) / 2);	2432	strncat (buf2, " ", 20 - strlen (buf) / 2);
2691	strcat (buf2, buf);	2433	strcat (buf2, buf);
2692		2434
2693	return buf2;	2435	return buf2;
2694	}	2436	}
2695
2696
2697		2437
2698	void	2438	void
2699	do_some_living (object *op)	2439	do_some_living (object *op)
2700	{	2440	{
2701	int last_food = op->stats.food;	2441	int last_food = op->stats.food;
…		…
2710	const int max_grace = 1;	2450	const int max_grace = 1;
2711		2451
2712	if (op->contr->outputs_sync)	2452	if (op->contr->outputs_sync)
2713	{	2453	{
2714	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2454	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)	2455	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]);	2456	flush_output_element (op, &op->contr->outputs[i]);
2717	}	2457	}
2718		2458
2719	if (op->contr->state == ST_PLAYING)	2459	if (op->contr->ns->state == ST_PLAYING)
2720	{	2460	{
2721
2722	/* these next three if clauses make it possible to SLOW DOWN	2461	/* these next three if clauses make it possible to SLOW DOWN
2723	hp/grace/spellpoint regeneration. */	2462	hp/grace/spellpoint regeneration. */
2724	if (op->contr->gen_hp >= 0)	2463	if (op->contr->gen_hp >= 0)
2725	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2464	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2726	else	2465	else
2727	{	2466	{
2728	gen_hp = op->stats.maxhp;	2467	gen_hp = op->stats.maxhp;
2729	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2468	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2730	}	2469	}
		2470
2731	if (op->contr->gen_sp >= 0)	2471	if (op->contr->gen_sp >= 0)
2732	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2472	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2733	else	2473	else
2734	{	2474	{
2735	gen_sp = op->stats.maxsp;	2475	gen_sp = op->stats.maxsp;
2736	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2476	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2737	}	2477	}
		2478
2738	if (op->contr->gen_grace >= 0)	2479	if (op->contr->gen_grace >= 0)
2739	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2480	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2740	else	2481	else
2741	{	2482	{
2742	gen_grace = op->stats.maxgrace;	2483	gen_grace = op->stats.maxgrace;
…		…
2758	op->stats.food += op->contr->digestion;	2499	op->stats.food += op->contr->digestion;
2759	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2500	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2760	op->stats.food = last_food;	2501	op->stats.food = last_food;
2761	}	2502	}
2762	}	2503	}
		2504
2763	if (max_sp > 1)	2505	if (max_sp > 1)
2764	{	2506	{
2765	over_sp = (gen_sp + 10) / rate_sp;	2507	over_sp = (gen_sp + 10) / rate_sp;
2766	if (over_sp > 0)	2508	if (over_sp > 0)
2767	{	2509	{
2768	if (op->stats.sp < op->stats.maxsp)	2510	if (op->stats.sp < op->stats.maxsp)
2769	{	2511	{
2770	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2512	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2513
2771	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2514	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2772	op->stats.sp--;	2515	op->stats.sp--;
		2516
2773	if (op->stats.sp > op->stats.maxsp)	2517	if (op->stats.sp > op->stats.maxsp)
2774	op->stats.sp = op->stats.maxsp;	2518	op->stats.sp = op->stats.maxsp;
2775	}	2519	}
2776	op->last_sp = 0;	2520	op->last_sp = 0;
2777	}	2521	}
2778	else	2522	else
2779	{
2780	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);
2781	}
2782	}	2524	}
2783	else	2525	else
2784	{
2785	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2526	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2786	}
2787	}	2527	}
2788		2528
2789	/* Regenerate Grace */	2529	/* Regenerate Grace */
2790	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2530	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2791	if (--op->last_grace < 0)	2531	if (--op->last_grace < 0)
2792	{	2532	{
2793	if (op->stats.grace < op->stats.maxgrace / 2)	2533	if (op->stats.grace < op->stats.maxgrace / 2)
2794	op->stats.grace++; /* no penalty in food for regaining grace */	2534	op->stats.grace++; /* no penalty in food for regaining grace */
		2535
2795	if (max_grace > 1)	2536	if (max_grace > 1)
2796	{	2537	{
2797	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2538	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2798	if (over_grace > 0)	2539	if (over_grace > 0)
2799	{	2540	{
…		…
2827	op->stats.food += op->contr->digestion;	2568	op->stats.food += op->contr->digestion;
2828	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2569	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2829	op->stats.food = last_food;	2570	op->stats.food = last_food;
2830	}	2571	}
2831	}	2572	}
		2573
2832	if (max_hp > 1)	2574	if (max_hp > 1)
2833	{	2575	{
2834	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2576	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2835	if (over_hp > 0)	2577	if (over_hp > 0)
2836	{	2578	{
…		…
2860		2602
2861	if (op->contr->gen_hp > 0)	2603	if (op->contr->gen_hp > 0)
2862	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2604	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2863	else	2605	else
2864	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2606	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2607
2865	/* dms do not consume food */	2608	/* dms do not consume food */
2866	if (!QUERY_FLAG (op, FLAG_WIZ))	2609	if (!QUERY_FLAG (op, FLAG_WIZ))
2867	op->stats.food--;	2610	op->stats.food--;
2868	}	2611	}
2869	}
2870		2612
2871	if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2613	if (op->stats.food < 0 && op->stats.hp >= 0)
2872	{	2614	{
2873	object *tmp, *flesh = NULL;	2615	object *tmp, *flesh = 0;
2874		2616
2875	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2617	for (tmp = op->inv; tmp; tmp = tmp->below)
2876	{	2618	{
2877	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2619	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2878	{
2879	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2880	{	2620	{
		2621	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2622	{
2881	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2623	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882	manual_apply (op, tmp, 0);	2624	manual_apply (op, tmp, 0);
2883	if (op->stats.food >= 0 || op->stats.hp < 0)	2625	if (op->stats.food >= 0 || op->stats.hp < 0)
2884	break;	2626	break;
2885	}	2627	}
2886	else if (tmp->type == FLESH)	2628	else if (tmp->type == FLESH)
2887	flesh = tmp;	2629	flesh = tmp;
2888	} /* End if paid for object */	2630	} /* End if paid for object */
2889	} /* end of for loop */	2631	} /* end of for loop */
		2632
2890	/* If player is still starving, it means they don't have any food, so	2633	/* If player is still starving, it means they don't have any food, so
2891	* eat flesh instead.	2634	* eat flesh instead.
2892	*/	2635	*/
2893	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2636	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2894	{	2637	{
2895	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2638	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2896	manual_apply (op, flesh, 0);	2639	manual_apply (op, flesh, 0);
2897	}	2640	}
2898	} /* end if player is starving */	2641	}
2899		2642
2900	while (op->stats.food < 0 && op->stats.hp > 0)	2643	while (op->stats.food < 0 && op->stats.hp >= 0)
2901	op->stats.food++, op->stats.hp--;	2644	op->stats.food++, op->stats.hp--;
2902		2645
2903	if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))	2646	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2904	kill_player (op);	2647	kill_player (op);
		2648	}
2905	}	2649	}
2906
2907
2908		2650
2909	/* If the player should die (lack of hp, food, etc), we call this.	2651	/* 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	2652	* 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	2653	* permadeath, no lifesave), this will take care of removing the player
2912	* file.	2654	* file.
…		…
2942	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2684	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...");	2685	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2944		2686
2945	/* restore player */	2687	/* restore player */
2946	at = archetype::find ("poisoning");	2688	at = archetype::find ("poisoning");
2947	tmp = present_arch_in_ob (at, op);	2689	if (object *tmp = present_arch_in_ob (at, op))
2948	if (tmp)
2949	{	2690	{
2950	tmp->destroy ();	2691	tmp->destroy ();
2951	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2692	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2952	}	2693	}
2953		2694
2954	at = archetype::find ("confusion");	2695	at = archetype::find ("confusion");
2955	tmp = present_arch_in_ob (at, op);	2696	if (object *tmp = present_arch_in_ob (at, op))
2956	if (tmp)
2957	{	2697	{
2958	tmp->destroy ();	2698	tmp->destroy ();
2959	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2699	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2960	}	2700	}
2961		2701
…		…
2963	op->stats.hp = op->stats.maxhp;	2703	op->stats.hp = op->stats.maxhp;
2964	if (op->stats.food <= 0)	2704	if (op->stats.food <= 0)
2965	op->stats.food = 999;	2705	op->stats.food = 999;
2966		2706
2967	/* create a bodypart-trophy to make the winner happy */	2707	/* create a bodypart-trophy to make the winner happy */
2968	tmp = arch_to_object (archetype::find ("finger"));	2708	if (object *tmp = arch_to_object (archetype::find ("finger")))
2969	if (tmp != NULL)
2970	{	2709	{
2971	sprintf (buf, "%s's finger", &op->name);	2710	sprintf (buf, "%s's finger", &op->name);
2972	tmp->name = buf;	2711	tmp->name = buf;
2973	sprintf (buf, " This finger has been cut off %s\n"	2712	sprintf (buf, " This finger has been cut off %s\n"
2974	" the %s, when he was defeated at\n level %d by %s.\n",	2713	" 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);	2714	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2976	tmp->msg = buf;	2715	tmp->msg = buf;
2977	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2716	tmp->value = 0, tmp->material = 0, tmp->type = 0;
2978	tmp->materialname = NULL;	2717	tmp->materialname = NULL;
2979	tmp->x = op->x, tmp->y = op->y;	2718	tmp->insert_at (op, tmp);
2980	insert_ob_in_map (tmp, op->map, op, 0);
2981	}	2719	}
2982		2720
2983	/* teleport defeated player to new destination */	2721	/* teleport defeated player to new destination */
2984	transfer_ob (op, x, y, 0, NULL);	2722	transfer_ob (op, x, y, 0, NULL);
2985	op->contr->braced = 0;	2723	op->contr->braced = 0;
…		…
2990		2728
2991	command_kill_pets (op, 0);	2729	command_kill_pets (op, 0);
2992		2730
2993	if (op->stats.food < 0)	2731	if (op->stats.food < 0)
2994	{	2732	{
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);	2733	sprintf (buf, "%s starved to death.", &op->name);
3003	strcpy (op->contr->killer, "starvation");	2734	strcpy (op->contr->killer, "starvation");
3004	}	2735	}
3005	else	2736	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);	2737	sprintf (buf, "%s died.", &op->name);
3015	}	2738
3016	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2739	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
3017		2740
3018	/* save the map location for corpse, gravestone */	2741	/* save the map location for corpse, gravestone */
3019	x = op->x;	2742	x = op->x;
3020	y = op->y;	2743	y = op->y;
3021	map = op->map;	2744	map = op->map;
3022		2745
3023
3024	if (settings.not_permadeth == TRUE)
3025	{
3026	/* NOT_PERMADEATH code. This basically brings the character back to	2746	/* NOT_PERMADEATH code. This basically brings the character back to
3027	* life if they are dead - it takes some exp and a random stat.	2747	* 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.	2748	* See the config.h file for a little more in depth detail about this.
3029	*/	2749	*/
3030		2750
3031	/* Basically two ways to go - remove a stat permanently, or just	2751	/* Basically two ways to go - remove a stat permanently, or just
3032	* make it depletion. This bunch of code deals with that aspect	2752	* make it depletion. This bunch of code deals with that aspect
3033	* of death.	2753	* of death.
3034	*/	2754	*/
3035	#ifndef COZY_SERVER	2755	#ifndef COZY_SERVER
3036	if (settings.balanced_stat_loss)	2756	if (settings.balanced_stat_loss)
3037	{	2757	{
3038	/* If stat loss is permanent, lose one stat only. */	2758	/* If stat loss is permanent, lose one stat only. */
3039	/* Lower level chars don't lose as many stats because they suffer	2759	/* Lower level chars don't lose as many stats because they suffer
3040	more if they do. */	2760	more if they do. */
3041	/* Higher level characters can afford things such as potions of	2761	/* Higher level characters can afford things such as potions of
3042	restoration, or better, stat potions. So we slug them that	2762	restoration, or better, stat potions. So we slug them that
3043	little bit harder. */	2763	little bit harder. */
3044	/* GD */	2764	/* GD */
3045	if (settings.stat_loss_on_death)	2765	if (settings.stat_loss_on_death)
3046	num_stats_lose = 1;	2766	num_stats_lose = 1;
3047	else
3048	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3049	}
3050	else	2767	else
3051	{	2768	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2769	}
		2770	else
3052	num_stats_lose = 1;	2771	num_stats_lose = 1;
3053	}	2772
3054	lost_a_stat = 0;	2773	lost_a_stat = 0;
3055		2774
3056	for (z = 0; z < num_stats_lose; z++)	2775	for (z = 0; z < num_stats_lose; z++)
3057	{	2776	{
3058	i = RANDOM () % NUM_STATS;	2777	i = RANDOM () % NUM_STATS;
3059		2778
3060	if (settings.stat_loss_on_death)	2779	if (settings.stat_loss_on_death)
3061	{	2780	{
3062	/* Pick a random stat and take a point off it. Tell the player	2781	/* Pick a random stat and take a point off it. Tell the player
3063	* what he lost.	2782	* what he lost.
3064	*/	2783	*/
3065	change_attr_value (&(op->stats), i, -1);	2784	change_attr_value (&(op->stats), i, -1);
3066	check_stat_bounds (&(op->stats));	2785	check_stat_bounds (&(op->stats));
3067	change_attr_value (&(op->contr->orig_stats), i, -1);	2786	change_attr_value (&(op->contr->orig_stats), i, -1);
3068	check_stat_bounds (&(op->contr->orig_stats));	2787	check_stat_bounds (&(op->contr->orig_stats));
3069	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2788	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3070	lost_a_stat = 1;	2789	lost_a_stat = 1;
		2790	}
		2791	else
		2792	{
		2793	/* deplete a stat */
		2794	archetype *deparch = archetype::find ("depletion");
		2795	object *dep;
		2796
		2797	dep = present_arch_in_ob (deparch, op);
		2798	if (!dep)
		2799	{
		2800	dep = arch_to_object (deparch);
		2801	insert_ob_in_ob (dep, op);
3071	}	2802	}
3072	else	2803	lose_this_stat = 1;
		2804	if (settings.balanced_stat_loss)
3073	{	2805	{
3074	/* deplete a stat */	2806	/* GD */
3075	archetype *deparch = archetype::find ("depletion");	2807	/* Get the stat that we're about to deplete. */
3076	object *dep;	2808	this_stat = get_attr_value (&(dep->stats), i);
3077		2809	if (this_stat < 0)
3078	dep = present_arch_in_ob (deparch, op);
3079	if (!dep)
3080	{	2810	{
3081	dep = arch_to_object (deparch);	2811	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3082	insert_ob_in_ob (dep, op);	2812	int keep_chance = this_stat * this_stat;
3083	}	2813
3084	lose_this_stat = 1;	2814	/* 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)	2815	if (keep_chance < 1)
		2816	keep_chance = 1;
		2817
		2818	/* There is a maximum depletion total per level. */
		2819	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3091	{	2820	{
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;	2821	lose_this_stat = 0;
3103	/* Take loss chance vs keep chance to see if we	2822	/* Take loss chance vs keep chance to see if we
3104	retain the stat. */	2823	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	}	2824	}
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	*/	2825	else
3126	if (this_stat >= -50)
3127	{	2826	{
3128	change_attr_value (&(dep->stats), i, -1);	2827	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;	2828	lose_this_stat = 0;
		2829	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2830	this_stat, keep_chance, loss_chance,
		2831	lose_this_stat?"LOSE":"KEEP"); */
3133	}	2832	}
3134	}	2833	}
3135	}	2834	}
		2835
		2836	if (lose_this_stat)
		2837	{
		2838	this_stat = get_attr_value (&(dep->stats), i);
		2839	/* We could try to do something clever like find another
		2840	* stat to reduce if this fails. But chances are, if
		2841	* stats have been depleted to -50, all are pretty low
		2842	* and should be roughly the same, so it shouldn't make a
		2843	* difference.
		2844	*/
		2845	if (this_stat >= -50)
		2846	{
		2847	change_attr_value (&(dep->stats), i, -1);
		2848	SET_FLAG (dep, FLAG_APPLIED);
		2849	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2850	op->update_stats ();
		2851	lost_a_stat = 1;
		2852	}
3136	}	2853	}
		2854	}
		2855	}
3137	/* If no stat lost, tell the player. */	2856	/* If no stat lost, tell the player. */
3138	if (!lost_a_stat)	2857	if (!lost_a_stat)
3139	{	2858	{
3140	/* determine_god() seems to not work sometimes... why is this?	2859	/* determine_god() seems to not work sometimes... why is this?
3141	Should I be using something else? GD */	2860	Should I be using something else? GD */
3142	const char *god = determine_god (op);	2861	const char *god = determine_god (op);
3143		2862
3144	if (god && (strcmp (god, "none")))	2863	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);	2864	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3146	else	2865	else
3147	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2866	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3148	}	2867	}
3149	#else	2868	#else
3150	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2869	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3151	#endif	2870	#endif
3152		2871
3153	/* Put a gravestone up where the character 'almost' died. List the	2872	/* Put a gravestone up where the character 'almost' died. List the
3154	* exp loss on the stone.	2873	* exp loss on the stone.
3155	*/	2874	*/
3156	tmp = arch_to_object (archetype::find ("gravestone"));	2875	tmp = arch_to_object (archetype::find ("gravestone"));
3157	sprintf (buf, "%s's gravestone", &op->name);	2876	sprintf (buf, "%s's gravestone", &op->name);
3158	tmp->name = buf;	2877	tmp->name = buf;
3159	sprintf (buf, "%s's gravestones", &op->name);	2878	sprintf (buf, "%s's gravestones", &op->name);
3160	tmp->name_pl = buf;	2879	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);	2880	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;	2881	tmp->msg = buf;
3163	tmp->x = op->x, tmp->y = op->y;	2882	tmp->x = op->x, tmp->y = op->y;
3164	insert_ob_in_map (tmp, op->map, NULL, 0);	2883	insert_ob_in_map (tmp, op->map, NULL, 0);
3165		2884
3166	/**************************************/	2885	/**************************************/
3167	/* */	2886	/* */
3168	/* Subtract the experience points, */	2887	/* Subtract the experience points, */
3169	/* if we died cause of food, give us */	2888	/* if we died cause of food, give us */
3170	/* food, and reset HP's... */	2889	/* food, and reset HP's... */
3171	/* */	2890	/* */
3172	/**************************************/	2891	/**************************************/
3173		2892
3174	/* remove any poisoning and confusion the character may be suffering. */	2893	/* remove any poisoning and confusion the character may be suffering. */
3175	/* restore player */	2894	/* restore player */
3176	at = archetype::find ("poisoning");	2895	at = archetype::find ("poisoning");
3177	tmp = present_arch_in_ob (at, op);	2896	tmp = present_arch_in_ob (at, op);
3178		2897
3179	if (tmp)	2898	if (tmp)
3180	{	2899	{
3181	tmp->destroy ();	2900	tmp->destroy ();
3182	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2901	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3183	}	2902	}
3184		2903
3185	at = archetype::find ("confusion");	2904	at = archetype::find ("confusion");
3186	tmp = present_arch_in_ob (at, op);	2905	tmp = present_arch_in_ob (at, op);
3187	if (tmp)	2906	if (tmp)
3188	{	2907	{
3189	tmp->destroy ();	2908	tmp->destroy ();
3190	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2909	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3191	}	2910	}
3192		2911
3193	cure_disease (op, 0); /* remove any disease */	2912	cure_disease (op, 0); /* remove any disease */
3194		2913
3195	/*add_exp(op, (op->stats.exp * -0.20)); */	2914	/*add_exp(op, (op->stats.exp * -0.20)); */
3196	apply_death_exp_penalty (op);	2915	apply_death_exp_penalty (op);
3197	if (op->stats.food < 100)	2916	if (op->stats.food < 100)
3198	op->stats.food = 900;	2917	op->stats.food = 900;
3199	op->stats.hp = op->stats.maxhp;	2918	op->stats.hp = op->stats.maxhp;
3200	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2919	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3201	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2920	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3202		2921
3203	/*	2922	/*
3204	* Check to see if the player is in a shop. IF so, then check to see if	2923	* 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	2924	* the player has any unpaid items. If so, remove them and put them back
3206	* in the map.	2925	* in the map.
3207	*/	2926	*/
3208		2927
3209	if (is_in_shop (op))	2928	if (is_in_shop (op))
3210	remove_unpaid_objects (op->inv, op);	2929	remove_unpaid_objects (op->inv, op);
3211		2930
3212	/****************************************/	2931	/****************************************/
3213	/* */	2932	/* */
3214	/* Move player to his current respawn- */	2933	/* Move player to his current respawn- */
3215	/* position (usually last savebed) */	2934	/* position (usually last savebed) */
3216	/* */	2935	/* */
3217	/****************************************/	2936	/****************************************/
3218		2937
3219	enter_player_savebed (op);	2938	enter_player_savebed (op);
3220		2939
3221	/* Save the player before inserting the force to reduce
3222	* chance of abuse.
3223	*/
3224	op->contr->braced = 0;	2940	op->contr->braced = 0;
3225	save_player (op, 1);
3226		2941
3227	/* it is possible that the player has blown something up	2942	/* it is possible that the player has blown something up
3228	* at his savebed location, and that can have long lasting	2943	* at his savebed location, and that can have long lasting
3229	* spell effects. So first see if there is a spell effect	2944	* spell effects. So first see if there is a spell effect
3230	* on the space that might harm the player.	2945	* on the space that might harm the player.
3231	*/	2946	*/
3232	will_kill_again = 0;	2947	will_kill_again = 0;
3233	for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)	2948	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3234	if (tmp->type == SPELL_EFFECT)	2949	if (tmp->type == SPELL_EFFECT)
3235	will_kill_again |= tmp->attacktype;	2950	will_kill_again |= tmp->attacktype;
3236		2951
3237	if (will_kill_again)	2952	if (will_kill_again)
3238	{	2953	{
3239	object *force;	2954	object *force;
3240	int at;	2955	int at;
3241		2956
3242	force = get_archetype (FORCE_NAME);	2957	force = get_archetype (FORCE_NAME);
3243	/* 50 ticks should be enough time for the spell to abate */	2958	/* 50 ticks should be enough time for the spell to abate */
3244	force->speed = 0.1;	2959	force->speed = 0.1;
3245	force->speed_left = -5.0;	2960	force->speed_left = -5.0;
3246	SET_FLAG (force, FLAG_APPLIED);	2961	SET_FLAG (force, FLAG_APPLIED);
3247	for (at = 0; at < NROFATTACKS; at++)	2962	for (at = 0; at < NROFATTACKS; at++)
3248	if (will_kill_again & (1 << at))	2963	if (will_kill_again & (1 << at))
3249	force->resist[at] = 100;	2964	force->resist[at] = 100;
3250		2965
3251	insert_ob_in_ob (force, op);	2966	insert_ob_in_ob (force, op);
3252	fix_player (op);	2967	op->update_stats ();
3253		2968
3254	}	2969	}
3255		2970
3256	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2971	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	}	2972	}
3325
3326		2973
3327	void	2974	void
3328	loot_object (object *op)	2975	loot_object (object *op)
3329	{ /* Grab and destroy some treasure */	2976	{ /* Grab and destroy some treasure */
3330	object *tmp, *tmp2, *next;	2977	object *tmp, *tmp2, *next;
3331		2978
3332	if (op->container)	2979	if (op->container)
3333	{ /* close open sack first */
3334	esrv_apply_container (op, op->container);	2980	esrv_apply_container (op, op->container); /* close open sack first */
3335	}
3336		2981
3337	for (tmp = op->inv; tmp != NULL; tmp = next)	2982	for (tmp = op->inv; tmp; tmp = next)
3338	{	2983	{
3339	next = tmp->below;	2984	next = tmp->below;
3340	if (tmp->type == EXPERIENCE || tmp->invisible)	2985
		2986	if (tmp->invisible)
3341	continue;	2987	continue;
		2988
3342	tmp->remove ();	2989	tmp->remove ();
3343	tmp->x = op->x, tmp->y = op->y;	2990	tmp->x = op->x, tmp->y = op->y;
3344	if (tmp->type == CONTAINER)	2991	if (tmp->type == CONTAINER)
3345	{ /* empty container to ground */	2992	{ /* empty container to ground */
3346	loot_object (tmp);	2993	loot_object (tmp);
…		…
3368	*/	3015	*/
3369		3016
3370	void	3017	void
3371	fix_weight (void)	3018	fix_weight (void)
3372	{	3019	{
3373	player *pl;	3020	for_all_players (pl)
3374
3375	for (pl = first_player; pl != NULL; pl = pl->next)
3376	{	3021	{
3377	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3022	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3378		3023
3379	if (old == sum)	3024	if (old == sum)
3380	continue;	3025	continue;
3381	fix_player (pl->ob);	3026	pl->ob->update_stats ();
3382	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	3027	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3383	}	3028	}
3384	}	3029	}
3385		3030
3386	void	3031	void
3387	fix_luck (void)	3032	fix_luck (void)
3388	{	3033	{
3389	player *pl;	3034	for_all_players (pl)
3390
3391	for (pl = first_player; pl != NULL; pl = pl->next)
3392	if (!pl->ob->contr->state)	3035	if (!pl->ob->contr->ns->state)
3393	change_luck (pl->ob, 0);	3036	pl->ob->change_luck (0);
3394	}	3037	}
3395
3396		3038
3397	/* cast_dust() - handles op throwing objects of type 'DUST'.	3039	/* cast_dust() - handles op throwing objects of type 'DUST'.
3398	* This is much simpler in the new spell code - we basically	3040	* This is much simpler in the new spell code - we basically
3399	* just treat this as any other spell casting object.	3041	* just treat this as any other spell casting object.
3400	*/	3042	*/
3401
3402	void	3043	void
3403	cast_dust (object *op, object *throw_ob, int dir)	3044	cast_dust (object *op, object *throw_ob, int dir)
3404	{	3045	{
3405	object *skop, *spob;	3046	object *skop, *spob;
3406		3047
…		…
3451	object *tmp = NULL;	3092	object *tmp = NULL;
3452		3093
3453	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3094	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3454	return 1;	3095	return 1;
3455		3096
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;	3097	return 0;
3462	}	3098	}
3463		3099
3464	/* look at the surrounding terrain to determine	3100	/* look at the surrounding terrain to determine
3465	* the hideability of this object. Positive levels	3101	* the hideability of this object. Positive levels
…		…
3521		3157
3522	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3158	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3523		3159
3524	/* its *extremely* hard to run and sneak/hide at the same time! */	3160	/* its *extremely* hard to run and sneak/hide at the same time! */
3525	if (op->type == PLAYER && op->contr->run_on)	3161	if (op->type == PLAYER && op->contr->run_on)
3526	{
3527	if (!skop || num >= skop->level)	3162	if (!skop || num >= skop->level)
3528	{	3163	{
3529	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3164	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3530	make_visible (op);	3165	make_visible (op);
3531	return;	3166	return;
3532	}	3167	}
3533	else	3168	else
3534	num += 20;	3169	num += 20;
3535	}	3170
3536	num += op->map->difficulty;	3171	num += op->map->difficulty;
3537	hide = hideability (op); /* modify by terrain hidden level */	3172	hide = hideability (op); /* modify by terrain hidden level */
3538	num -= hide;	3173	num -= hide;
		3174
3539	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	3175	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3540	{	3176	{
3541	make_visible (op);	3177	make_visible (op);
3542	if (op->type == PLAYER)	3178	if (op->type == PLAYER)
3543	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3179	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3544	}	3180	}
3545	else if (op->type == PLAYER && skop)	3181	else if (op->type == PLAYER && skop)
3546	{
3547	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3182	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3548	}
3549	}	3183	}
3550		3184
3551	/* determine if who is standing near a hostile creature. */	3185	/* determine if who is standing near a hostile creature. */
3552		3186
3553	int	3187	int
…		…
3580	if (mflags & P_OUT_OF_MAP)	3214	if (mflags & P_OUT_OF_MAP)
3581	continue;	3215	continue;
3582	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	3216	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3583	continue;	3217	continue;
3584		3218
3585	for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)	3219	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3586	{	3220	{
3587	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	3221	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3588	return 1;	3222	return 1;
3589	else if (tmp->type == PLAYER)	3223	else if (tmp->type == PLAYER)
3590	{	3224	{
…		…
3620	if (pl->type != PLAYER)	3254	if (pl->type != PLAYER)
3621	{	3255	{
3622	LOG (llevError, "player_can_view() called for non-player object\n");	3256	LOG (llevError, "player_can_view() called for non-player object\n");
3623	return -1;	3257	return -1;
3624	}	3258	}
		3259
3625	if (!pl || !op)	3260	if (!pl || !op)
3626	return 0;	3261	return 0;
3627		3262
3628	if (op->head)
3629	{
3630	op = op->head;	3263	op = op->head_ ();
3631	}	3264
3632	get_rangevector (pl, op, &rv, 0x1);	3265	get_rangevector (pl, op, &rv, 0x1);
3633		3266
3634	/* starting with the 'head' part, lets loop	3267	/* starting with the 'head' part, lets loop
3635	* through the object and find if it has any	3268	* through the object and find if it has any
3636	* part that is in the los array but isnt on	3269	* part that is in the los array but isnt on
…		…
3644		3277
3645	/* only the viewable area the player sees is updated by LOS	3278	/* only the viewable area the player sees is updated by LOS
3646	* code, so we need to restrict ourselves to that range of values	3279	* code, so we need to restrict ourselves to that range of values
3647	* for any meaningful values.	3280	* for any meaningful values.
3648	*/	3281	*/
3649	if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&	3282	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3650	FABS (dy) <= (pl->contr->socket->mapy / 2) &&	3283	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3651	!pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])	3284	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3652	return 1;	3285	return 1;
3653	op = op->more;	3286	op = op->more;
3654	}	3287	}
3655	return 0;	3288	return 0;
3656	}	3289	}
…		…
3766	if (trlist == NULL || who->type != PLAYER)	3399	if (trlist == NULL || who->type != PLAYER)
3767	return;	3400	return;
3768		3401
3769	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3402	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3770		3403
3771	if (tr == NULL || tr->item == NULL)	3404	if (!tr || !tr->item)
3772	{	3405	{
3773	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3406	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3774	return;	3407	return;
3775	}	3408	}
3776		3409
…		…
3842	{	3475	{
3843	/* forces in the treasurelist can alter the player's stats */	3476	/* forces in the treasurelist can alter the player's stats */
3844	object *skin;	3477	object *skin;
3845		3478
3846	/* first get the dragon skin force */	3479	/* first get the dragon skin force */
		3480	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);	3481	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
		3482	;
		3483
3848	if (skin == NULL)	3484	if (!skin)
3849	return;	3485	return;
3850		3486
3851	/* adding new spellpath attunements */	3487	/* adding new spellpath attunements */
3852	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))	3488	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3853	{	3489	{

Diff Legend

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