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.41 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.57 by root, Sat Dec 23 06:21:02 2006 UTC

…		…
27	#include <sounds.h>	27	#include <sounds.h>
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32	#include <newclient.h>
33		32
34	#ifdef COZY_SERVER	33	#include <algorithm>
35	extern int same_party (partylist *a, partylist *b);	34	#include <functional>
36	#endif
37		35
38	player *	36	player *
39	find_player (const char *plname)	37	find_player (const char *plname)
40	{	38	{
41	player *pl;	39	player *pl;
42		40
43	for (pl = first_player; pl != NULL; pl = pl->next)	41	for (pl = first_player; pl; pl = pl->next)
44	{
45	if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))	42	if (pl->ob && !strcmp (query_name (pl->ob), plname))
46	return pl;	43	return pl;
47	};	44
48	return NULL;	45	return 0;
49	}
50
51	player *
52	find_player_partial_name (const char *plname)
53	{
54	player *pl;
55	player *found = NULL;
56	size_t namelen = strlen (plname);
57
58	for (pl = first_player; pl != NULL; pl = pl->next)
59	{
60	if ((size_t) strlen (pl->ob->name) < namelen)
61	continue;
62
63	if (!strcmp (pl->ob->name, plname))
64	return pl;
65
66	if (!strncasecmp (pl->ob->name, plname, namelen))
67	{
68	if (found)
69	return NULL;
70
71	found = pl;
72	}
73	}
74	return found;
75	}	46	}
76		47
77	void	48	void
78	display_motd (const object *op)	49	display_motd (const object *op)
79	{	50	{
…		…
83	int comp;	54	int comp;
84	int size;	55	int size;
85		56
86	sprintf (buf, "%s/%s", settings.confdir, settings.motd);	57	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
87	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)	58	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
88	{
89	return;	59	return;
90	}	60
91	motd[0] = '\0';	61	motd[0] = '\0';
92	size = 0;	62	size = 0;
		63
93	while (fgets (buf, MAX_BUF, fp) != NULL)	64	while (fgets (buf, MAX_BUF, fp))
94	{	65	{
95	if (*buf == '#')	66	if (*buf == '#')
96	continue;	67	continue;
		68
97	strncat (motd + size, buf, HUGE_BUF - size);	69	strncat (motd + size, buf, HUGE_BUF - size);
98	size += strlen (buf);	70	size += strlen (buf);
99	}	71	}
		72
100	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);	73	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
101	close_and_delete (fp, comp);	74	close_and_delete (fp, comp);
102	}	75	}
103		76
104	void	77	void
…		…
110	int comp;	83	int comp;
111	int size;	84	int size;
112		85
113	sprintf (buf, "%s/%s", settings.confdir, settings.rules);	86	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
114	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)	87	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
115	{
116	return;	88	return;
117	}	89
118	rules[0] = '\0';	90	rules[0] = '\0';
119	size = 0;	91	size = 0;
		92
120	while (fgets (buf, MAX_BUF, fp) != NULL)	93	while (fgets (buf, MAX_BUF, fp))
121	{	94	{
122	if (*buf == '#')	95	if (*buf == '#')
123	continue;	96	continue;
		97
124	if (size + strlen (buf) >= HUGE_BUF)	98	if (size + strlen (buf) >= HUGE_BUF)
125	{	99	{
126	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);	100	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
127	break;	101	break;
128	}	102	}
		103
129	strncat (rules + size, buf, HUGE_BUF - size);	104	strncat (rules + size, buf, HUGE_BUF - size);
130	size += strlen (buf);	105	size += strlen (buf);
131	}	106	}
		107
132	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);	108	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
133	close_and_delete (fp, comp);	109	close_and_delete (fp, comp);
134	}	110	}
135		111
136	void	112	void
…		…
144	int size;	120	int size;
145		121
146	sprintf (buf, "%s/%s", settings.confdir, settings.news);	122	sprintf (buf, "%s/%s", settings.confdir, settings.news);
147	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)	123	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
148	return;	124	return;
		125
149	news[0] = '\0';	126	news[0] = '\0';
150	subject[0] = '\0';	127	subject[0] = '\0';
151	size = 0;	128	size = 0;
		129
152	while (fgets (buf, MAX_BUF, fp) != NULL)	130	while (fgets (buf, MAX_BUF, fp) != NULL)
153	{	131	{
154	if (*buf == '#')	132	if (*buf == '#')
155	continue;	133	continue;
		134
156	if (*buf == '%')	135	if (*buf == '%')
157	{ /* send one news */	136	{ /* send one news */
158	if (size > 0)	137	if (size > 0)
159	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 */	138	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 */
160	strcpy (subject, buf + 1);	139	strcpy (subject, buf + 1);
…		…
177	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	156	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
178	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);	157	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);
179	close_and_delete (fp, comp);	158	close_and_delete (fp, comp);
180	}	159	}
181		160
182	int	161	/* This loads the first map an puts the player on it. */
183	playername_ok (const char *cp)	162	static void
		163	set_first_map (object *op)
184	{	164	{
185	/* Don't allow - or _ as first character in the name */	165	strcpy (op->contr->maplevel, first_map_path);
186	if (*cp == '-' || *cp == '_')	166	op->x = -1;
187	return 0;	167	op->y = -1;
188		168	enter_exit (op, 0);
189	for (; *cp != '\0'; cp++)
190	if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
191	return 0;
192	return 1;
193	}	169	}
194		170
195	/* This no longer sets the player map. Also, it now updates	171	// connect the player with a specific client
196	* all the pointers so the caller doesn't need to do that.	172	// also changed, rationalises, and fixes some incorrect settings
197	* Caller is responsible for setting the correct map.	173	void
198	*/	174	player::connect (client *ns)
199
200	/* Redo this to do both get_player_ob and get_player.
201	* Hopefully this will be less bugfree and simpler.
202	* Returns the player structure. If 'p' is null,
203	* we create a new one. Otherwise, we recycle
204	* the one that is passed.
205	*/
206	static player *
207	get_player (player *p)
208	{	175	{
209	object *op = arch_to_object (get_player_archetype (0));	176	this->ns = ns;
210	int i;	177	ns->pl = this;
211		178
212	/* Clears basically the entire player structure except	179	next = first_player;
213	* for next and socket.	180	first_player = this;
		181
		182	ns->update_look = 0;
		183	ns->look_position = 0;
		184
		185	clear_los (ob);
		186
		187	/* make sure he's a player -- needed because of class change. */
		188	ob->type = PLAYER; // we are paranoid
		189	ob->race = ob->arch->clone.race;
		190
		191	if (!legal_range (ob, shoottype))
		192	shoottype = range_none;
		193
		194	ob->carrying = sum_weight (ob);
		195	link_player_skills (ob);
		196
		197	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
		198	ob->update_stats ();
		199	update_ob_speed (ob);
		200
		201	assign (title, ob->arch->clone.name);
		202
		203	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
		204	* from the class, and not race. I don't see any way to get the class information
		205	* to then update this. I don't think this will actually break anything - anyone
		206	* that can use armour should be able to use a shield. What this may 'break'
		207	* are features new characters get, eg, if someone starts up with a Q, they
		208	* should be able to use a shield. However, old Q's won't get that advantage.
214	*/	209	*/
215	p->clear ();	210	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
		211	SET_FLAG (ob, FLAG_USE_SHIELD);
216		212
		213	/* if it's a dragon player, set the correct title here */
		214	if (is_dragon_pl (ob))
		215	{
		216	object *tmp, *abil = 0, *skin = 0;
		217
		218	shstr_cmp dragon_ability_force ("dragon_ability_force");
		219	shstr_cmp dragon_skin_force ("dragon_skin_force");
		220
		221	for (tmp = ob->inv; tmp; tmp = tmp->below)
		222	if (tmp->type == FORCE)
		223	if (tmp->arch->name == dragon_ability_force)
		224	abil = tmp;
		225	else if (tmp->arch->name == dragon_skin_force)
		226	skin = tmp;
		227
		228	set_dragon_name (ob, abil, skin);
		229	}
		230
		231	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		232	add_friendly_object (ob);
		233
		234	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
		235
		236	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
		237	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
		238
		239	ns->floorbox_update ();
		240
		241	esrv_new_player (this, ob->weight + ob->carrying);
		242	esrv_send_inventory (ob, ob);
		243	esrv_add_spells (this, 0);
		244
		245	enter_exit (ob, 0);
		246
		247	// send_rules (ob);//TODO
		248	// send_news (ob);//TODO
		249	// display_motd (ob);//TODO
		250	INVOKE_PLAYER (LOGIN, this);
		251	}
		252
		253	// the need for this function can be explained
		254	// by load_object not returning the object
		255	void
		256	player::set_object (object *op)
		257	{
		258	ob = op;
		259	ob->contr = this; /* this aren't yet in archetype */
		260
		261	ob->speed_left = 0.5;
		262	ob->speed = 1.0;
		263	ob->direction = 5; /* So player faces south */
		264	ob->stats.wc = 2;
		265	ob->run_away = 25; /* Then we panick... */
		266
		267	set_first_map (ob);
		268
		269	ob->roll_stats ();
		270	}
		271
		272	player::player ()
		273	{
217	/* There are some elements we want initialized to non zero value -	274	/* There are some elements we want initialized to non zero value -
218	* we deal with that below this point.	275	* we deal with that below this point.
219	*/	276	*/
220	p->party = NULL;
221	p->outputs_sync = 16; /* Every 2 seconds */	277	outputs_sync = 16; /* Every 2 seconds */
222	p->outputs_count = 8; /* Keeps present behaviour */	278	outputs_count = 8; /* Keeps present behaviour */
223	p->unapply = unapply_nochoice;	279	unapply = unapply_nochoice;
224	p->Swap_First = -1;
225		280
226	#ifdef AUTOSAVE
227	p->last_save_tick = 9999999;
228	#endif
229
230	strcpy (p->savebed_map, first_map_path); /* Init. respawn position */	281	assign (savebed_map, first_map_path); /* Init. respawn position */
231		282
232	op->contr = p; /* this aren't yet in archetype */
233	p->ob = op;
234	op->speed_left = 0.5;
235	op->speed = 1.0;
236	op->direction = 5; /* So player faces south */
237	op->stats.wc = 2;
238	op->run_away = 25; /* Then we panick... */
239
240	{
241	int oldmon = p->socket->monitor_spells; // what a hack
242	p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
243	roll_stats (op);
244	p->socket->monitor_spells = oldmon;
245	}
246	p->state = ST_ROLL_STAT;
247	clear_los (op);
248
249	p->gen_sp_armour = 10;	283	gen_sp_armour = 10;
250	p->last_speed = -1;	284	last_speed = -1;
251	p->shoottype = range_none;	285	shoottype = range_none;
252	p->bowtype = bow_normal;	286	bowtype = bow_normal;
253	p->petmode = pet_normal;	287	petmode = pet_normal;
254	p->listening = 10;	288	listening = 10;
255	p->usekeys = containers;	289	usekeys = containers;
256	p->last_weapon_sp = -1;	290	last_weapon_sp = -1;
257	p->peaceful = 1; /* default peaceful */	291	peaceful = 1; /* default peaceful */
258	p->do_los = 1;	292	do_los = 1;
259	p->explore = 0;
260	p->no_shout = 0; /* default can shout */
261
262	assign (p->title, op->arch->clone.name);
263	op->race = op->arch->clone.race;
264
265	CLEAR_FLAG (op, FLAG_READY_SKILL);
266		293
267	/* we need to clear these to -1 and not zero - otherwise,	294	/* we need to clear these to -1 and not zero - otherwise,
268	* if a player quits and starts a new character, we wont	295	* if a player quits and starts a new character, we wont
269	* send new values to the client, as things like exp start	296	* send new values to the client, as things like exp start
270	* at zero.	297	* at zero.
271	*/	298	*/
272	for (i = 0; i < NUM_SKILLS; i++)	299	for (int i = 0; i < NUM_SKILLS; i++)
273	{
274	p->last_skill_exp[i] = -1;	300	last_skill_exp[i] = -1;
275	p->last_skill_ob[i] = NULL;
276	}
277		301
278	for (i = 0; i < NROFATTACKS; i++)	302	for (int i = 0; i < NROFATTACKS; i++)
279	p->last_resist[i] = -1;	303	last_resist[i] = -1;
280		304
281	p->last_stats.exp = -1;	305	last_stats.exp = -1;
282	p->last_weight = (uint32) - 1;	306	last_weight = (uint32) - 1;
283
284	p->socket->update_look = 0;
285	p->socket->look_position = 0;
286
287	return p;
288	}	307	}
289		308
290	/* This loads the first map an puts the player on it. */	309	player::~player ()
291	static void
292	set_first_map (object *op)
293	{	310	{
294	strcpy (op->contr->maplevel, first_map_path);	311	terminate_all_pets (ob);
295	op->x = -1;
296	op->y = -1;
297	enter_exit (op, NULL);
298	}
299		312
		313	if (first_player != this)
		314	{
		315	player *prev = first_player;
		316
		317	while (prev && prev->next && prev->next != this)
		318	prev = prev->next;
		319
		320	if (prev->next != this)
		321	{
		322	LOG (llevError, "Free_player: Can't find previous player.\n");
		323	abort ();
		324	}
		325
		326	prev->next = next;
		327	}
		328	else
		329	first_player = next;
		330
		331	if (ob)
		332	{
		333	ob->contr = 0;
		334	ob->destroy (1);
		335	}
		336
		337	if (ns)
		338	{
		339	ns->send_packet ("goodbye");
		340	ns->flush ();
		341	ns->pl = 0;
		342	ns->destroy ();
		343	}
		344
		345	/* Clear item stack */
		346	free (stack_items);
		347	}
		348
300	/* Tries to add player on the connection passwd in ns.	349	/* Tries to add player on the connection passed in ns.
301	* All we can really get in this is some settings like host and display	350	* All we can really get in this is some settings like host and display
302	* mode.	351	* mode.
303	*/	352	*/
304		353	player *
305	int	354	player::create ()
306	add_player (client_socket *ns)
307	{	355	{
308	player *p = new player;	356	player *pl = new player;
309		357
310	p->socket = ns;	358	pl->set_object (arch_to_object (get_player_archetype (0)));
311	ns->pl = p;
312		359
313	p->next = first_player;
314	first_player = p;
315
316	p = get_player (p);
317
318	set_first_map (p->ob);
319
320	CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
321	add_friendly_object (p->ob);
322	send_rules (p->ob);
323	send_news (p->ob);
324	display_motd (p->ob);
325	get_name (p->ob);
326
327	return 0;	360	return pl;
328	}	361	}
329		362
330	/*	363	/*
331	* get_player_archetype() return next player archetype from archetype	364	* get_player_archetype() return next player archetype from archetype
332	* list. Not very efficient routine, but used only creating new players.	365	* list. Not very efficient routine, but used only creating new players.
…		…
341	{	374	{
342	if (at == NULL || at->next == NULL)	375	if (at == NULL || at->next == NULL)
343	at = first_archetype;	376	at = first_archetype;
344	else	377	else
345	at = at->next;	378	at = at->next;
		379
346	if (at->clone.type == PLAYER)	380	if (at->clone.type == PLAYER)
347	return at;	381	return at;
		382
348	if (at == start)	383	if (at == start)
349	{	384	{
350	LOG (llevError, "No Player archetypes\n");	385	LOG (llevError, "No Player archetypes\n");
351	exit (-1);	386	exit (-1);
352	}	387	}
353	}	388	}
354	}	389	}
355
356		390
357	object *	391	object *
358	get_nearest_player (object *mon)	392	get_nearest_player (object *mon)
359	{	393	{
360	object *op = NULL;	394	object *op = NULL;
…		…
437	* circling behaviour. Unfortunately, this function is also used to determined	471	* circling behaviour. Unfortunately, this function is also used to determined
438	* if the creature should cast a spell, so returning a direction in that case	472	* if the creature should cast a spell, so returning a direction in that case
439	* is probably not a good thing.	473	* is probably not a good thing.
440	*/	474	*/
441	#define MAX_SPACES 50	475	#define MAX_SPACES 50
442
443		476
444	/*	477	/*
445	* Returns the direction to the player, if valid. Returns 0 otherwise.	478	* Returns the direction to the player, if valid. Returns 0 otherwise.
446	* modified to verify there is a path to the player. Does this by stepping towards	479	* modified to verify there is a path to the player. Does this by stepping towards
447	* player and if path is blocked then see if blockage is close enough to player that	480	* player and if path is blocked then see if blockage is close enough to player that
…		…
686	/* Need to set up the skill pointers */	719	/* Need to set up the skill pointers */
687	link_player_skills (pl);	720	link_player_skills (pl);
688	}	721	}
689		722
690	void	723	void
691	get_name (object *op)
692	{
693	op->contr->write_buf[0] = '\0';
694	op->contr->state = ST_GET_NAME;
695	send_query (op->contr->socket, 0, "What is your name?\n:");
696	}
697
698	void
699	get_password (object *op)
700	{
701	op->contr->write_buf[0] = '\0';
702	op->contr->state = ST_GET_PASSWORD;
703	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
704	}
705
706	void
707	play_again (object *op)
708	{
709	op->contr->state = ST_PLAY_AGAIN;
710	op->chosen_skill = NULL;
711	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
712	/* a bit of a hack, but there are various places early in th
713	* player creation process that a user can quit (eg, roll
714	* stats) that isn't removing the player. Taking a quick
715	* look, there are many places that call play_again without
716	* removing the player - it probably makes more sense
717	* to leave it to play_again to remove the object in all
718	* cases.
719	*/
720	if (!QUERY_FLAG (op, FLAG_REMOVED))
721	op->remove ();
722	/* Need to set this to null - otherwise, it could point to garbage,
723	* and draw() doesn't check to see if the player is removed, only if
724	* the map is null or not swapped out.
725	*/
726	op->map = NULL;
727	}
728
729	int
730	receive_play_again (object *op, char key)
731	{
732	if (key == 'q' || key == 'Q')
733	{
734	remove_friendly_object (op);
735	leave (op->contr, 0); /* ericserver will draw the message */
736	return 2;
737	}
738	else if (key == 'a' || key == 'A')
739	{
740	player *pl = op->contr;
741	shstr name = op->name;
742
743	op->contr = 0;
744	op->type = 0;
745	op->destroy (1);
746	pl = get_player (pl);
747	op = pl->ob;
748	add_friendly_object (op);
749	op->contr->password[0] = '~';
750	op->name = op->name_pl = 0;
751	/* Lets put a space in here */
752	new_draw_info (NDI_UNIQUE, 0, op, "\n");
753	get_name (op);
754	op->name = op->name_pl = name;
755	set_first_map (op);
756	}
757	else
758	/* user pressed something else so just ask again... */
759	play_again (op);
760
761	return 0;
762	}
763
764	void
765	confirm_password (object *op)
766	{
767
768	op->contr->write_buf[0] = '\0';
769	op->contr->state = ST_CONFIRM_PASSWORD;
770	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
771	}
772
773	void
774	get_party_password (object *op, partylist *party)	724	get_party_password (object *op, partylist *party)
775	{	725	{
776	if (party == NULL)	726	if (party == NULL)
777	{	727	{
778	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	728	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
779	return;	729	return;
780	}	730	}
		731
781	op->contr->write_buf[0] = '\0';	732	op->contr->write_buf[0] = '\0';
782	op->contr->state = ST_GET_PARTY_PASSWORD;	733	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
783	op->contr->party_to_join = party;	734	op->contr->party_to_join = party;
784	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	735	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
785	}	736	}
786
787		737
788	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	738	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
789	int	739	static int
790	roll_stat (void)	740	roll_stat (void)
791	{	741	{
792	int a[4], i, j, k;	742	int a[4], i, j, k;
793		743
794	for (i = 0; i < 4; i++)	744	for (i = 0; i < 4; i++)
…		…
797	for (i = 0, j = 0, k = 7; i < 4; i++)	747	for (i = 0, j = 0, k = 7; i < 4; i++)
798	if (a[i] < k)	748	if (a[i] < k)
799	k = a[i], j = i;	749	k = a[i], j = i;
800		750
801	for (i = 0, k = 0; i < 4; i++)	751	for (i = 0, k = 0; i < 4; i++)
802	{
803	if (i != j)	752	if (i != j)
804	k += a[i];	753	k += a[i];
805	}	754
806	return k;	755	return k;
807	}	756	}
808		757
809	void	758	void
810	roll_stats (object *op)	759	object::roll_stats ()
811	{	760	{
812	int sum = 0;
813	int i = 0, j = 0;
814	int statsort[7];	761	int statsort [7];
815		762
816	do	763	for (;;)
817	{
818	op->stats.Str = roll_stat ();
819	op->stats.Dex = roll_stat ();
820	op->stats.Int = roll_stat ();
821	op->stats.Con = roll_stat ();
822	op->stats.Wis = roll_stat ();
823	op->stats.Pow = roll_stat ();
824	op->stats.Cha = roll_stat ();
825	sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
826	}	764	{
827	while (sum < 82 || sum > 116);	765	int sum = 0;
		766	for (int i = 7; i--; )
		767	sum += statsort [i] = roll_stat ();
828		768
		769	if (sum >= 82 && sum <= 116)
		770	break;
		771	}
		772
829	/* Sort the stats so that rerolling is easier... */	773	// Sort the stats so that rerolling is easier...
830	statsort[0] = op->stats.Str;	774	std::sort (statsort, statsort + 7, std::greater<int>());
831	statsort[1] = op->stats.Dex;
832	statsort[2] = op->stats.Int;
833	statsort[3] = op->stats.Con;
834	statsort[4] = op->stats.Wis;
835	statsort[5] = op->stats.Pow;
836	statsort[6] = op->stats.Cha;
837		775
838	/* a quick and dirty bubblesort? */
839	do
840	{
841	if (statsort[i] < statsort[i + 1])
842	{
843	j = statsort[i];
844	statsort[i] = statsort[i + 1];
845	statsort[i + 1] = j;
846	i = 0;
847	}
848	else
849	{
850	i++;
851	}
852	}
853	while (i < 6);
854
855	op->stats.Str = statsort[0];	776	stats.Str = statsort[0];
856	op->stats.Dex = statsort[1];	777	stats.Dex = statsort[1];
857	op->stats.Con = statsort[2];	778	stats.Con = statsort[2];
858	op->stats.Int = statsort[3];	779	stats.Int = statsort[3];
859	op->stats.Wis = statsort[4];	780	stats.Wis = statsort[4];
860	op->stats.Pow = statsort[5];	781	stats.Pow = statsort[5];
861	op->stats.Cha = statsort[6];	782	stats.Cha = statsort[6];
862		783
863
864	op->contr->orig_stats.Str = op->stats.Str;
865	op->contr->orig_stats.Dex = op->stats.Dex;
866	op->contr->orig_stats.Int = op->stats.Int;
867	op->contr->orig_stats.Con = op->stats.Con;
868	op->contr->orig_stats.Wis = op->stats.Wis;
869	op->contr->orig_stats.Pow = op->stats.Pow;
870	op->contr->orig_stats.Cha = op->stats.Cha;
871
872	op->level = 1;
873	op->stats.exp = 0;	784	stats.exp = 0;
874	op->stats.ac = 0;	785	stats.ac = 0;
875		786
876	op->contr->levhp[1] = 9;
877	op->contr->levsp[1] = 6;
878	op->contr->levgrace[1] = 3;
879
880	fix_player (op);
881	op->stats.hp = op->stats.maxhp;	787	stats.hp = stats.maxhp;
882	op->stats.sp = op->stats.maxsp;	788	stats.sp = stats.maxsp;
883	op->stats.grace = op->stats.maxgrace;	789	stats.grace = stats.maxgrace;
		790
		791	if (contr)
		792	{
		793	contr->levhp[1] = 9;
		794	contr->levsp[1] = 6;
		795	contr->levgrace[1] = 3;
		796
884	op->contr->orig_stats = op->stats;	797	contr->orig_stats = stats;
		798	}
885	}	799	}
886		800
887	void	801	void
888	Roll_Again (object *op)	802	object::swap_stats (int a, int b)
889	{	803	{
890	esrv_new_player (op->contr, 0);
891	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
892	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
893	}
894
895	void
896	Swap_Stat (object *op, int Swap_Second)
897	{
898	signed char tmp;
899	char buf[MAX_BUF];
900
901	if (op->contr->Swap_First == -1)
902	{
903	new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
904	new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
905	new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
906	return;
907	}
908
909	tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);	804	int tmp = get_attr_value (&contr->orig_stats, a);
910
911	set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));	805	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
912
913	set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);	806	set_attr_value (&contr->orig_stats, b, tmp);
914		807
915	sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
916	new_draw_info (NDI_UNIQUE, 0, op, buf);
917	op->stats.Str = op->contr->orig_stats.Str;	808	stats.Str = contr->orig_stats.Str;
918	op->stats.Dex = op->contr->orig_stats.Dex;	809	stats.Dex = contr->orig_stats.Dex;
919	op->stats.Con = op->contr->orig_stats.Con;	810	stats.Con = contr->orig_stats.Con;
920	op->stats.Int = op->contr->orig_stats.Int;	811	stats.Int = contr->orig_stats.Int;
921	op->stats.Wis = op->contr->orig_stats.Wis;	812	stats.Wis = contr->orig_stats.Wis;
922	op->stats.Pow = op->contr->orig_stats.Pow;	813	stats.Pow = contr->orig_stats.Pow;
923	op->stats.Cha = op->contr->orig_stats.Cha;	814	stats.Cha = contr->orig_stats.Cha;
		815
		816	//TODO: the following code looks so borked and should, at the very least,
		817	// be merged with the similar code in roll_stats
924	op->stats.ac = 0;	818	stats.ac = 0;
925		819
926	op->level = 1;	820	level = 1;
927	op->stats.exp = 0;	821	stats.exp = 0;
928	op->stats.ac = 0;	822	stats.ac = 0;
929		823
930	op->contr->levhp[1] = 9;
931	op->contr->levsp[1] = 6;
932	op->contr->levgrace[1] = 3;
933
934	fix_player (op);
935	op->stats.hp = op->stats.maxhp;	824	stats.hp = stats.maxhp;
936	op->stats.sp = op->stats.maxsp;	825	stats.sp = stats.maxsp;
937	op->stats.grace = op->stats.maxgrace;	826	stats.grace = stats.maxgrace;
		827
		828	if (contr)
		829	{
		830	contr->levhp[1] = 9;
		831	contr->levsp[1] = 6;
		832	contr->levgrace[1] = 3;
		833
938	op->contr->orig_stats = op->stats;	834	contr->orig_stats = stats;
939	op->contr->Swap_First = -1;
940	}
941
942
943	/* This code has been greatly reduced, because with set_attr_value
944	* and get_attr_value, the stats can be accessed just numeric
945	* ids. stat_trans is a table that translate the number entered
946	* into the actual stat. It is needed because the order the stats
947	* are displayed in the stat window is not the same as how
948	* the number's access that stat. The table does that translation.
949	*/
950	int
951	key_roll_stat (object *op, char key)
952	{
953	int keynum = key - '0';
954	char buf[MAX_BUF];
955	static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
956
957	if (keynum > 0 && keynum <= 7)
958	{	835	}
959	if (op->contr->Swap_First == -1)
960	{
961	op->contr->Swap_First = stat_trans[keynum];
962	sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
963	new_draw_info (NDI_UNIQUE, 0, op, buf);
964	}
965	else
966	Swap_Stat (op, stat_trans[keynum]);
967
968	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
969	return 1;
970	}
971	switch (key)
972	{
973	case 'n':
974	case 'N':
975	{
976	SET_FLAG (op, FLAG_WIZ);
977	if (op->map == NULL)
978	{
979	LOG (llevError, "Map == NULL in state 2\n");
980	break;
981	}
982
983	#if 0
984	/* So that enter_exit will put us at startx/starty */
985	op->x = -1;
986
987	enter_exit (op, NULL);
988	#endif
989	SET_ANIMATION (op, 2); /* So player faces south */
990	/* Enter exit adds a player otherwise */
991	add_statbonus (op);
992	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
993	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
994	op->contr->state = ST_CHANGE_CLASS;
995	if (op->msg)
996	new_draw_info (NDI_BLUE, 0, op, op->msg);
997	return 0;
998	}
999	case 'y':
1000	case 'Y':
1001	roll_stats (op);
1002	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1003	return 1;
1004
1005	case 'q':
1006	case 'Q':
1007	play_again (op);
1008	return 1;
1009
1010	default:
1011	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1012	return 0;
1013	}
1014	return 0;
1015	}	836	}
1016		837
1017	/* This function takes the key that is passed, and does the	838	/* This function takes the key that is passed, and does the
1018	* appropriate action with it (change race, or other things).	839	* appropriate action with it (change race, or other things).
1019	* The function name is for historical reasons - now we have	840	* The function name is for historical reasons - now we have
1020	* separate race and class; this actually changes the RACE,	841	* separate race and class; this actually changes the RACE,
1021	* not the class.	842	* not the class.
1022	*/	843	*/
1023
1024	int	844	int
1025	key_change_class (object *op, char key)	845	key_change_class (object *op, char key)
1026	{	846	{
1027	int tmp_loop;	847	int tmp_loop;
1028		848
1029	if (key == 'q' || key == 'Q')
1030	{
1031	op->remove ();
1032	play_again (op);
1033	return 0;
1034	}
1035	if (key == 'd' || key == 'D')	849	if (key == 'd' || key == 'D')
1036	{	850	{
1037	char buf[MAX_BUF];	851	char buf[MAX_BUF];
1038		852
1039	/* this must before then initial items are given */	853	/* this must before then initial items are given */
…		…
1044	create_treasure (tl, op, 0, 0, 0);	858	create_treasure (tl, op, 0, 0, 0);
1045		859
1046	INVOKE_PLAYER (BIRTH, op->contr);	860	INVOKE_PLAYER (BIRTH, op->contr);
1047	INVOKE_PLAYER (LOGIN, op->contr);	861	INVOKE_PLAYER (LOGIN, op->contr);
1048		862
1049	op->contr->state = ST_PLAYING;	863	op->contr->ns->state = ST_PLAYING;
1050		864
1051	if (op->msg)	865	if (op->msg)
1052	op->msg = NULL;	866	op->msg = NULL;
1053		867
1054	/* We create this now because some of the unique maps will need it	868	/* We create this now because some of the unique maps will need it
…		…
1063	start_info (op);	877	start_info (op);
1064	CLEAR_FLAG (op, FLAG_WIZ);	878	CLEAR_FLAG (op, FLAG_WIZ);
1065	give_initial_items (op, op->randomitems);	879	give_initial_items (op, op->randomitems);
1066	link_player_skills (op);	880	link_player_skills (op);
1067	esrv_send_inventory (op, op);	881	esrv_send_inventory (op, op);
1068	fix_player (op);	882	op->update_stats ();
1069		883
1070	/* This moves the player to a different start map, if there	884	/* This moves the player to a different start map, if there
1071	* is one for this race	885	* is one for this race
1072	*/	886	*/
1073	if (*first_map_ext_path)	887	if (*first_map_ext_path)
…		…
1084	* if the map isn't there, then stay on the	898	* if the map isn't there, then stay on the
1085	* default initial map */	899	* default initial map */
1086	tmp->destroy ();	900	tmp->destroy ();
1087	}	901	}
1088	else	902	else
1089	{
1090	LOG (llevDebug, "first_map_ext_path not set\n");	903	LOG (llevDebug, "first_map_ext_path not set\n");
1091	}	904
1092	return 0;	905	return 0;
1093	}	906	}
1094		907
1095	/* Following actually changes the race - this is the default command	908	/* Following actually changes the race - this is the default command
1096	* if we don't match with one of the options above.	909	* if we don't match with one of the options above.
…		…
1100	while (!tmp_loop)	913	while (!tmp_loop)
1101	{	914	{
1102	shstr name = op->name;	915	shstr name = op->name;
1103	int x = op->x, y = op->y;	916	int x = op->x, y = op->y;
1104		917
1105	remove_statbonus (op);	918	op->remove_statbonus ();
1106	op->remove ();	919	op->remove ();
1107	op->arch = get_player_archetype (op->arch);	920	op->arch = get_player_archetype (op->arch);
1108	op->arch->clone.copy_to (op);	921	op->arch->clone.copy_to (op);
1109	op->instantiate ();	922	op->instantiate ();
1110	op->stats = op->contr->orig_stats;	923	op->stats = op->contr->orig_stats;
…		…
1112	op->x = x;	925	op->x = x;
1113	op->y = y;	926	op->y = y;
1114	SET_ANIMATION (op, 2); /* So player faces south */	927	SET_ANIMATION (op, 2); /* So player faces south */
1115	insert_ob_in_map (op, op->map, op, 0);	928	insert_ob_in_map (op, op->map, op, 0);
1116	assign (op->contr->title, op->arch->clone.name);	929	assign (op->contr->title, op->arch->clone.name);
1117	add_statbonus (op);	930	op->add_statbonus ();
1118	tmp_loop = allowed_class (op);	931	tmp_loop = allowed_class (op);
1119	}	932	}
1120		933
1121	update_object (op, UP_OBJ_FACE);	934	update_object (op, UP_OBJ_FACE);
1122	esrv_update_item (UPD_FACE, op, op);	935	esrv_update_item (UPD_FACE, op, op);
1123	fix_player (op);	936	op->update_stats ();
1124	op->stats.hp = op->stats.maxhp;	937	op->stats.hp = op->stats.maxhp;
1125	op->stats.sp = op->stats.maxsp;	938	op->stats.sp = op->stats.maxsp;
1126	op->stats.grace = 0;	939	op->stats.grace = 0;
1127		940
1128	if (op->msg)	941	if (op->msg)
1129	new_draw_info (NDI_BLUE, 0, op, op->msg);	942	new_draw_info (NDI_BLUE, 0, op, op->msg);
1130		943
1131	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	944	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1132	return 0;	945	return 0;
1133	}	946	}
1134		947
1135	int	948	int
1136	key_confirm_quit (object *op, char key)	949	key_confirm_quit (object *op, char key)
1137	{	950	{
1138	char buf[MAX_BUF];
1139
1140	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')	951	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1141	{	952	{
1142	op->contr->state = ST_PLAYING;	953	op->contr->ns->state = ST_PLAYING;
1143	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");	954	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1144	return 1;	955	return 1;
1145	}	956	}
1146		957
1147	INVOKE_PLAYER (LOGOUT, op->contr);	958	INVOKE_PLAYER (LOGOUT, op->contr);
…		…
1152	op->direction = 0;	963	op->direction = 0;
1153	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);	964	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1154		965
1155	strcpy (op->contr->killer, "quit");	966	strcpy (op->contr->killer, "quit");
1156	check_score (op);	967	check_score (op);
1157	op->contr->party = NULL;	968	op->contr->party = 0;
1158	if (settings.set_title == TRUE)
1159	op->contr->own_title[0] = '\0';	969	op->contr->own_title[0] = '\0';
1160		970
1161	if (!QUERY_FLAG (op, FLAG_WAS_WIZ))	971	object_ptr ob = op;
1162	{
1163	maptile *mp, *next;
1164		972
		973	delete ob->contr;
		974
1165	/* We need to hunt for any per player unique maps in memory and	975	/* We need to hunt for any per player unique maps in memory and
1166	* get rid of them. The trailing slash in the path is intentional,	976	* get rid of them. The trailing slash in the path is intentional,
1167	* so that players named 'Ab' won't match against players 'Abe' pathname	977	* so that players named 'Ab' won't match against players 'Abe' pathname
1168	*/	978	*/
		979	char buf[MAX_BUF];
1169	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);	980	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1170	for (mp = first_map; mp != NULL; mp = next)	981
1171	{	982	for (maptile *next, *mp = first_map; mp; mp = next)
		983	{
1172	next = mp->next;	984	next = mp->next;
		985
1173	if (!strncmp (mp->path, buf, strlen (buf)))	986	if (!strncmp (mp->path, buf, strlen (buf)))
1174	delete_map (mp);	987	delete_map (mp);
1175	}	988	}
1176		989
1177	delete_character (op->name, 1);	990	delete_character (ob->name, 1);
1178	}
1179		991
1180	play_again (op);
1181	return 1;	992	return 1;
1182	}	993	}
1183		994
1184	void	995	void
1185	flee_player (object *op)	996	flee_player (object *op)
…		…
1216	{	1027	{
1217	op->enemy = NULL;	1028	op->enemy = NULL;
1218	CLEAR_FLAG (op, FLAG_SCARED);	1029	CLEAR_FLAG (op, FLAG_SCARED);
1219	return;	1030	return;
1220	}	1031	}
		1032
1221	get_rangevector (op, op->enemy, &rv, 0);	1033	get_rangevector (op, op->enemy, &rv, 0);
1222		1034
1223	dir = absdir (4 + rv.direction);	1035	dir = absdir (4 + rv.direction);
1224	for (diff = 0; diff < 3; diff++)	1036	for (diff = 0; diff < 3; diff++)
1225	{	1037	{
1226	int m = 1 - (RANDOM () & 2);	1038	int m = 1 - (RANDOM () & 2);
1227		1039
1228	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	1040	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1229	{
1230	return;	1041	return;
1231	}
1232	}	1042	}
		1043
1233	/* Cornered, get rid of scared */	1044	/* Cornered, get rid of scared */
1234	CLEAR_FLAG (op, FLAG_SCARED);	1045	CLEAR_FLAG (op, FLAG_SCARED);
1235	op->enemy = NULL;	1046	op->enemy = NULL;
1236	}	1047	}
1237		1048
…		…
1793	if (!dir)	1604	if (!dir)
1794	{	1605	{
1795	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1606	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1796	return 0;	1607	return 0;
1797	}	1608	}
		1609
1798	if (op->type == PLAYER)	1610	if (op->type == PLAYER)
1799	bow = op->contr->ranges[range_bow];	1611	bow = op->contr->ranges[range_bow];
1800	else	1612	else
1801	{	1613	{
1802	for (bow = op->inv; bow; bow = bow->below)	1614	for (bow = op->inv; bow; bow = bow->below)
…		…
1810	{	1622	{
1811	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1623	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1812	return 0;	1624	return 0;
1813	}	1625	}
1814	}	1626	}
		1627
1815	if (!bow->race || !bow->skill)	1628	if (!bow->race || !bow->skill)
1816	{	1629	{
1817	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1630	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1818	return 0;	1631	return 0;
1819	}	1632	}
…		…
1821	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];	1634	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1822		1635
1823	/* penalize ROF for bestarrow */	1636	/* penalize ROF for bestarrow */
1824	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)	1637	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1825	bowspeed -= dex_bonus[op->stats.Dex] + 5;	1638	bowspeed -= dex_bonus[op->stats.Dex] + 5;
		1639
1826	if (bowspeed < 1)	1640	if (bowspeed < 1)
1827	bowspeed = 1;	1641	bowspeed = 1;
1828		1642
1829	if (arrow == NULL)	1643	if (arrow == NULL)
1830	{	1644	{
…		…
1836	else	1650	else
1837	CLEAR_FLAG (op, FLAG_READY_BOW);	1651	CLEAR_FLAG (op, FLAG_READY_BOW);
1838	return 0;	1652	return 0;
1839	}	1653	}
1840	}	1654	}
		1655
1841	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1656	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1842	if (mflags & P_OUT_OF_MAP)	1657	if (mflags & P_OUT_OF_MAP)
1843	{
1844	return 0;	1658	return 0;
1845	}	1659
1846	if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)	1660	if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1847	{	1661	{
1848	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	1662	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1849	return 0;	1663	return 0;
1850	}	1664	}
…		…
1856	return 0;	1670	return 0;
1857	}	1671	}
1858		1672
1859	left = arrow; /* these are arrows left to the player */	1673	left = arrow; /* these are arrows left to the player */
1860	arrow = get_split_ob (arrow, 1);	1674	arrow = get_split_ob (arrow, 1);
1861	if (arrow == NULL)	1675	if (!arrow)
1862	{	1676	{
1863	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1677	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1864	return 0;	1678	return 0;
1865	}	1679	}
		1680
1866	arrow->set_owner (op);	1681	arrow->set_owner (op);
1867	arrow->skill = bow->skill;	1682	arrow->skill = bow->skill;
1868		1683
1869	arrow->direction = dir;	1684	arrow->direction = dir;
1870	arrow->x = sx;	1685	arrow->x = sx;
1871	arrow->y = sy;	1686	arrow->y = sy;
1872		1687
1873	if (op->type == PLAYER)	1688	if (op->type == PLAYER)
1874	{	1689	{
1875	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1690	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1876	fix_player (op);	1691	op->update_stats ();
1877	}	1692	}
1878		1693
1879	SET_ANIMATION (arrow, arrow->direction);	1694	SET_ANIMATION (arrow, arrow->direction);
1880	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1695	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1881	arrow->stats.hp = arrow->stats.dam;	1696	arrow->stats.hp = arrow->stats.dam;
…		…
1913	}	1728	}
1914		1729
1915	if (arrow->attacktype == AT_PHYSICAL)	1730	if (arrow->attacktype == AT_PHYSICAL)
1916	arrow->attacktype |= bow->attacktype;	1731	arrow->attacktype |= bow->attacktype;
1917		1732
1918	if (bow->slaying != NULL)	1733	if (bow->slaying)
1919	arrow->slaying = bow->slaying;	1734	arrow->slaying = bow->slaying;
1920		1735
1921	arrow->map = m;	1736	arrow->map = m;
1922	arrow->move_type = MOVE_FLY_LOW;	1737	arrow->move_type = MOVE_FLY_LOW;
1923	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1738	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
…		…
2039	CLEAR_FLAG (item, FLAG_ANIMATE);	1854	CLEAR_FLAG (item, FLAG_ANIMATE);
2040	item->face = item->arch->clone.face;	1855	item->face = item->arch->clone.face;
2041	item->speed = 0;	1856	item->speed = 0;
2042	update_ob_speed (item);	1857	update_ob_speed (item);
2043	}	1858	}
2044	if ((tmp = is_player_inv (item)))	1859	if ((tmp = item->in_player ()))
2045	esrv_update_item (UPD_ANIM, tmp, item);	1860	esrv_update_item (UPD_ANIM, tmp, item);
2046	}	1861	}
2047	}	1862	}
2048	else if (item->type == ROD || item->type == HORN)	1863	else if (item->type == ROD || item->type == HORN)
2049	{	1864	{
…		…
2199	* 0 otherwise	2014	* 0 otherwise
2200	*/	2015	*/
2201	static int	2016	static int
2202	player_attack_door (object *op, object *door)	2017	player_attack_door (object *op, object *door)
2203	{	2018	{
2204
2205	/* If its a door, try to find a use a key. If we do destroy the door,	2019	/* If its a door, try to find a use a key. If we do destroy the door,
2206	* might as well return immediately as there is nothing more to do -	2020	* might as well return immediately as there is nothing more to do -
2207	* otherwise, we fall through to the rest of the code.	2021	* otherwise, we fall through to the rest of the code.
2208	*/	2022	*/
2209	object *key = find_key (op, op, door);	2023	object *key = find_key (op, op, door);
…		…
2247	* It should keep the code cleaner.	2061	* It should keep the code cleaner.
2248	* When this is called, the players direction has been updated	2062	* When this is called, the players direction has been updated
2249	* (taking into account confusion.) The player is also actually	2063	* (taking into account confusion.) The player is also actually
2250	* going to try and move (not fire weapons).	2064	* going to try and move (not fire weapons).
2251	*/	2065	*/
2252
2253	void	2066	void
2254	move_player_attack (object *op, int dir)	2067	move_player_attack (object *op, int dir)
2255	{	2068	{
2256	object *tmp, *mon;	2069	object *tmp, *mon;
2257	sint16 nx, ny;	2070	sint16 nx, ny;
…		…
2259	maptile *m;	2072	maptile *m;
2260		2073
2261	nx = freearr_x[dir] + op->x;	2074	nx = freearr_x[dir] + op->x;
2262	ny = freearr_y[dir] + op->y;	2075	ny = freearr_y[dir] + op->y;
2263		2076
2264	on_battleground = op_on_battleground (op, NULL, NULL);	2077	on_battleground = op_on_battleground (op, 0, 0);
2265		2078
2266	/* If braced, or can't move to the square, and it is not out of the	2079	/* If braced, or can't move to the square, and it is not out of the
2267	* map, attack it. Note order of if statement is important - don't	2080	* map, attack it. Note order of if statement is important - don't
2268	* want to be calling move_ob if braced, because move_ob will move the	2081	* want to be calling move_ob if braced, because move_ob will move the
2269	* player. This is a pretty nasty hack, because if we could	2082	* player. This is a pretty nasty hack, because if we could
…		…
2281	return; /* Don't think this should happen */	2094	return; /* Don't think this should happen */
2282	}	2095	}
2283	else	2096	else
2284	m = op->map;	2097	m = op->map;
2285		2098
2286	if ((tmp = get_map_ob (m, nx, ny)) == NULL)	2099	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2287	{	2100	{
2288	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */	2101	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2289	return;	2102	return;
2290	}	2103	}
2291		2104
2292	mon = NULL;	2105	mon = 0;
2293	/* Go through all the objects, and find ones of interest. Only stop if	2106	/* Go through all the objects, and find ones of interest. Only stop if
2294	* we find a monster - that is something we know we want to attack.	2107	* we find a monster - that is something we know we want to attack.
2295	* if its a door or barrel (can roll) see if there may be monsters	2108	* if its a door or barrel (can roll) see if there may be monsters
2296	* on the space	2109	* on the space
2297	*/	2110	*/
2298	while (tmp != NULL)	2111	while (tmp)
2299	{	2112	{
2300	if (tmp == op)	2113	if (tmp == op)
2301	{	2114	{
2302	tmp = tmp->above;	2115	tmp = tmp->above;
2303	continue;	2116	continue;
…		…
2313	mon = tmp;	2126	mon = tmp;
2314		2127
2315	tmp = tmp->above;	2128	tmp = tmp->above;
2316	}	2129	}
2317		2130
2318	if (mon == NULL) /* This happens anytime the player tries to move */	2131	if (!mon) /* This happens anytime the player tries to move */
2319	return; /* into a wall */	2132	return; /* into a wall */
2320		2133
2321	if (mon->head != NULL)	2134	if (mon->head)
2322	mon = mon->head;	2135	mon = mon->head;
2323		2136
2324	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2137	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2325	if (player_attack_door (op, mon))	2138	if (player_attack_door (op, mon))
2326	return;	2139	return;
…		…
2363	* attack them either.	2176	* attack them either.
2364	*/	2177	*/
2365	if ((mon->type == PLAYER || mon->enemy != op) &&	2178	if ((mon->type == PLAYER || mon->enemy != op) &&
2366	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2179	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2367	#ifdef PROHIBIT_PLAYERKILL	2180	#ifdef PROHIBIT_PLAYERKILL
2368	(op->contr->peaceful	2181	(op->contr->peaceful
2369	|| (mon->type == PLAYER	2182	|| (mon->type == PLAYER
2370	&& mon->contr->	2183	&& mon->contr->
2371	peaceful)) &&	2184	peaceful)) &&
2372	#else	2185	#else
2373	op->contr->peaceful &&	2186	op->contr->peaceful &&
2374	#endif	2187	#endif
2375	!on_battleground))	2188	!on_battleground))
2376	{	2189	{
2377	if (!op->contr->braced)	2190	if (!op->contr->braced)
2378	{	2191	{
2379	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2192	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2380	(void) push_ob (mon, dir, op);	2193	(void) push_ob (mon, dir, op);
2381	}	2194	}
2382	else	2195	else
2383	{
2384	new_draw_info (0, 0, op, "You withhold your attack");	2196	new_draw_info (0, 0, op, "You withhold your attack");
2385	}	2197
2386	if (op->contr->tmp_invis || op->hide)	2198	if (op->contr->tmp_invis || op->hide)
2387	make_visible (op);	2199	make_visible (op);
2388	}	2200	}
2389		2201
2390	/* If the object is a boulder or other rollable object, then	2202	/* If the object is a boulder or other rollable object, then
…		…
2418	op->speed_left += op->speed / op->contr->weapon_sp;	2230	op->speed_left += op->speed / op->contr->weapon_sp;
2419		2231
2420	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2232	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2421	}	2233	}
2422		2234
2423	skill_attack (mon, op, 0, NULL, NULL);	2235	skill_attack (mon, op, 0, 0, 0);
2424		2236
2425	/* If attacking another player, that player gets automatic	2237	/* If attacking another player, that player gets automatic
2426	* hitback, and doesn't loose luck either.	2238	* hitback, and doesn't loose luck either.
2427	* Disable hitback on the battleground or if the target is	2239	* Disable hitback on the battleground or if the target is
2428	* the wiz.	2240	* the wiz.
…		…
2430	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))	2242	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2431	{	2243	{
2432	short luck = mon->stats.luck;	2244	short luck = mon->stats.luck;
2433		2245
2434	mon->contr->has_hit = 1;	2246	mon->contr->has_hit = 1;
2435	skill_attack (op, mon, 0, NULL, NULL);	2247	skill_attack (op, mon, 0, 0, 0);
2436	mon->stats.luck = luck;	2248	mon->stats.luck = luck;
2437	}	2249	}
		2250
2438	if (action_makes_visible (op))	2251	if (action_makes_visible (op))
2439	make_visible (op);	2252	make_visible (op);
2440	}	2253	}
2441	} /* if player should attack something */	2254	} /* if player should attack something */
2442	}	2255	}
…		…
2477		2290
2478	/* Add special check for newcs players and fire on - this way, the	2291	/* Add special check for newcs players and fire on - this way, the
2479	* server can handle repeat firing.	2292	* server can handle repeat firing.
2480	*/	2293	*/
2481	if (op->contr->fire_on || (op->contr->run_on && pick != 0))	2294	if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2482	{
2483	op->direction = dir;	2295	op->direction = dir;
2484	}
2485	else	2296	else
2486	{
2487	op->direction = 0;	2297	op->direction = 0;
2488	}	2298
2489	/* Update how the player looks. Use the facing, so direction may	2299	/* Update how the player looks. Use the facing, so direction may
2490	* get reset to zero. This allows for full animation capabilities	2300	* get reset to zero. This allows for full animation capabilities
2491	* for players.	2301	* for players.
2492	*/	2302	*/
2493	animate_object (op, op->facing);	2303	animate_object (op, op->facing);
…		…
2545		2355
2546	/* call this here - we also will call this in do_ericserver, but	2356	/* call this here - we also will call this in do_ericserver, but
2547	* the players time has been increased when doericserver has been	2357	* the players time has been increased when doericserver has been
2548	* called, so we recheck it here.	2358	* called, so we recheck it here.
2549	*/	2359	*/
2550	HandleClient (op->contr->socket, op->contr);	2360	//TODO: better than handling 8 commands, use some more intelligent rate-limiting
		2361	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
		2362	;
		2363
2551	if (op->speed_left < 0)	2364	if (op->speed_left < 0)
2552	return 0;	2365	return 0;
2553		2366
2554	if (op->direction && (op->contr->run_on || op->contr->fire_on))	2367	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2555	{	2368	{
…		…
2592	op->stats.hp = op->stats.maxhp;	2405	op->stats.hp = op->stats.maxhp;
2593		2406
2594	if (op->stats.food < 0)	2407	if (op->stats.food < 0)
2595	op->stats.food = 999;	2408	op->stats.food = 999;
2596		2409
2597	fix_player (op);	2410	op->update_stats ();
2598	return 1;	2411	return 1;
2599	}	2412	}
2600		2413
2601	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2414	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2602	CLEAR_FLAG (op, FLAG_LIFESAVE);	2415	CLEAR_FLAG (op, FLAG_LIFESAVE);
…		…
2632	remove_unpaid_objects (op->inv, env);	2445	remove_unpaid_objects (op->inv, env);
2633		2446
2634	op = next;	2447	op = next;
2635	}	2448	}
2636	}	2449	}
2637
2638		2450
2639	/*	2451	/*
2640	* Returns pointer a static string containing gravestone text	2452	* Returns pointer a static string containing gravestone text
2641	* Moved from apply.c to player.c - player.c is what	2453	* Moved from apply.c to player.c - player.c is what
2642	* actually uses this function. player.c may not be quite the	2454	* actually uses this function. player.c may not be quite the
…		…
2676	strncat (buf2, " ", 20 - strlen (buf) / 2);	2488	strncat (buf2, " ", 20 - strlen (buf) / 2);
2677	strcat (buf2, buf);	2489	strcat (buf2, buf);
2678		2490
2679	return buf2;	2491	return buf2;
2680	}	2492	}
2681
2682
2683		2493
2684	void	2494	void
2685	do_some_living (object *op)	2495	do_some_living (object *op)
2686	{	2496	{
2687	int last_food = op->stats.food;	2497	int last_food = op->stats.food;
…		…
2696	const int max_grace = 1;	2506	const int max_grace = 1;
2697		2507
2698	if (op->contr->outputs_sync)	2508	if (op->contr->outputs_sync)
2699	{	2509	{
2700	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2510	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2701	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2511	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2702	flush_output_element (op, &op->contr->outputs[i]);	2512	flush_output_element (op, &op->contr->outputs[i]);
2703	}	2513	}
2704		2514
2705	if (op->contr->state == ST_PLAYING)	2515	if (op->contr->ns->state == ST_PLAYING)
2706	{	2516	{
2707
2708	/* these next three if clauses make it possible to SLOW DOWN	2517	/* these next three if clauses make it possible to SLOW DOWN
2709	hp/grace/spellpoint regeneration. */	2518	hp/grace/spellpoint regeneration. */
2710	if (op->contr->gen_hp >= 0)	2519	if (op->contr->gen_hp >= 0)
2711	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2520	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2712	else	2521	else
2713	{	2522	{
2714	gen_hp = op->stats.maxhp;	2523	gen_hp = op->stats.maxhp;
2715	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2524	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2716	}	2525	}
		2526
2717	if (op->contr->gen_sp >= 0)	2527	if (op->contr->gen_sp >= 0)
2718	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2528	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2719	else	2529	else
2720	{	2530	{
2721	gen_sp = op->stats.maxsp;	2531	gen_sp = op->stats.maxsp;
2722	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2532	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2723	}	2533	}
		2534
2724	if (op->contr->gen_grace >= 0)	2535	if (op->contr->gen_grace >= 0)
2725	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2536	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2726	else	2537	else
2727	{	2538	{
2728	gen_grace = op->stats.maxgrace;	2539	gen_grace = op->stats.maxgrace;
…		…
2744	op->stats.food += op->contr->digestion;	2555	op->stats.food += op->contr->digestion;
2745	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2556	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2746	op->stats.food = last_food;	2557	op->stats.food = last_food;
2747	}	2558	}
2748	}	2559	}
		2560
2749	if (max_sp > 1)	2561	if (max_sp > 1)
2750	{	2562	{
2751	over_sp = (gen_sp + 10) / rate_sp;	2563	over_sp = (gen_sp + 10) / rate_sp;
2752	if (over_sp > 0)	2564	if (over_sp > 0)
2753	{	2565	{
2754	if (op->stats.sp < op->stats.maxsp)	2566	if (op->stats.sp < op->stats.maxsp)
2755	{	2567	{
2756	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2568	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2569
2757	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2570	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2758	op->stats.sp--;	2571	op->stats.sp--;
		2572
2759	if (op->stats.sp > op->stats.maxsp)	2573	if (op->stats.sp > op->stats.maxsp)
2760	op->stats.sp = op->stats.maxsp;	2574	op->stats.sp = op->stats.maxsp;
2761	}	2575	}
2762	op->last_sp = 0;	2576	op->last_sp = 0;
2763	}	2577	}
2764	else	2578	else
2765	{
2766	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2579	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2767	}
2768	}	2580	}
2769	else	2581	else
2770	{
2771	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2582	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2772	}
2773	}	2583	}
2774		2584
2775	/* Regenerate Grace */	2585	/* Regenerate Grace */
2776	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2586	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2777	if (--op->last_grace < 0)	2587	if (--op->last_grace < 0)
2778	{	2588	{
2779	if (op->stats.grace < op->stats.maxgrace / 2)	2589	if (op->stats.grace < op->stats.maxgrace / 2)
2780	op->stats.grace++; /* no penalty in food for regaining grace */	2590	op->stats.grace++; /* no penalty in food for regaining grace */
		2591
2781	if (max_grace > 1)	2592	if (max_grace > 1)
2782	{	2593	{
2783	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2594	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2784	if (over_grace > 0)	2595	if (over_grace > 0)
2785	{	2596	{
…		…
2813	op->stats.food += op->contr->digestion;	2624	op->stats.food += op->contr->digestion;
2814	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2625	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2815	op->stats.food = last_food;	2626	op->stats.food = last_food;
2816	}	2627	}
2817	}	2628	}
		2629
2818	if (max_hp > 1)	2630	if (max_hp > 1)
2819	{	2631	{
2820	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2632	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2821	if (over_hp > 0)	2633	if (over_hp > 0)
2822	{	2634	{
…		…
2846		2658
2847	if (op->contr->gen_hp > 0)	2659	if (op->contr->gen_hp > 0)
2848	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2660	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2849	else	2661	else
2850	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2662	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2663
2851	/* dms do not consume food */	2664	/* dms do not consume food */
2852	if (!QUERY_FLAG (op, FLAG_WIZ))	2665	if (!QUERY_FLAG (op, FLAG_WIZ))
2853	op->stats.food--;	2666	op->stats.food--;
2854	}	2667	}
2855	}
2856		2668
2857	if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2669	if (op->stats.food < 0 && op->stats.hp >= 0)
2858	{	2670	{
2859	object *tmp, *flesh = NULL;	2671	object *tmp, *flesh = 0;
2860		2672
2861	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2673	for (tmp = op->inv; tmp; tmp = tmp->below)
2862	{	2674	{
2863	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2675	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2864	{
2865	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2866	{	2676	{
		2677	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2678	{
2867	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2679	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2868	manual_apply (op, tmp, 0);	2680	manual_apply (op, tmp, 0);
2869	if (op->stats.food >= 0 || op->stats.hp < 0)	2681	if (op->stats.food >= 0 || op->stats.hp < 0)
2870	break;	2682	break;
2871	}	2683	}
2872	else if (tmp->type == FLESH)	2684	else if (tmp->type == FLESH)
2873	flesh = tmp;	2685	flesh = tmp;
2874	} /* End if paid for object */	2686	} /* End if paid for object */
2875	} /* end of for loop */	2687	} /* end of for loop */
		2688
2876	/* If player is still starving, it means they don't have any food, so	2689	/* If player is still starving, it means they don't have any food, so
2877	* eat flesh instead.	2690	* eat flesh instead.
2878	*/	2691	*/
2879	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2692	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2880	{	2693	{
2881	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2694	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882	manual_apply (op, flesh, 0);	2695	manual_apply (op, flesh, 0);
2883	}	2696	}
2884	} /* end if player is starving */	2697	}
2885		2698
2886	while (op->stats.food < 0 && op->stats.hp > 0)	2699	while (op->stats.food < 0 && op->stats.hp >= 0)
2887	op->stats.food++, op->stats.hp--;	2700	op->stats.food++, op->stats.hp--;
2888		2701
2889	if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))	2702	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2890	kill_player (op);	2703	kill_player (op);
		2704	}
2891	}	2705	}
2892
2893
2894		2706
2895	/* If the player should die (lack of hp, food, etc), we call this.	2707	/* If the player should die (lack of hp, food, etc), we call this.
2896	* op is the player in jeopardy. If the player can not be saved (not	2708	* op is the player in jeopardy. If the player can not be saved (not
2897	* permadeath, no lifesave), this will take care of removing the player	2709	* permadeath, no lifesave), this will take care of removing the player
2898	* file.	2710	* file.
…		…
3005	x = op->x;	2817	x = op->x;
3006	y = op->y;	2818	y = op->y;
3007	map = op->map;	2819	map = op->map;
3008		2820
3009		2821
3010	if (settings.not_permadeth == TRUE)
3011	{
3012	/* NOT_PERMADEATH code. This basically brings the character back to	2822	/* NOT_PERMADEATH code. This basically brings the character back to
3013	* life if they are dead - it takes some exp and a random stat.	2823	* life if they are dead - it takes some exp and a random stat.
3014	* See the config.h file for a little more in depth detail about this.	2824	* See the config.h file for a little more in depth detail about this.
3015	*/	2825	*/
3016		2826
3017	/* Basically two ways to go - remove a stat permanently, or just	2827	/* Basically two ways to go - remove a stat permanently, or just
3018	* make it depletion. This bunch of code deals with that aspect	2828	* make it depletion. This bunch of code deals with that aspect
3019	* of death.	2829	* of death.
3020	*/	2830	*/
3021	#ifndef COZY_SERVER	2831	#ifndef COZY_SERVER
3022	if (settings.balanced_stat_loss)	2832	if (settings.balanced_stat_loss)
3023	{	2833	{
3024	/* If stat loss is permanent, lose one stat only. */	2834	/* If stat loss is permanent, lose one stat only. */
3025	/* Lower level chars don't lose as many stats because they suffer	2835	/* Lower level chars don't lose as many stats because they suffer
3026	more if they do. */	2836	more if they do. */
3027	/* Higher level characters can afford things such as potions of	2837	/* Higher level characters can afford things such as potions of
3028	restoration, or better, stat potions. So we slug them that	2838	restoration, or better, stat potions. So we slug them that
3029	little bit harder. */	2839	little bit harder. */
3030	/* GD */	2840	/* GD */
3031	if (settings.stat_loss_on_death)	2841	if (settings.stat_loss_on_death)
3032	num_stats_lose = 1;	2842	num_stats_lose = 1;
3033	else
3034	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3035	}
3036	else	2843	else
3037	{	2844	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2845	}
		2846	else
		2847	{
3038	num_stats_lose = 1;	2848	num_stats_lose = 1;
3039	}	2849	}
3040	lost_a_stat = 0;	2850	lost_a_stat = 0;
3041		2851
3042	for (z = 0; z < num_stats_lose; z++)	2852	for (z = 0; z < num_stats_lose; z++)
3043	{	2853	{
3044	i = RANDOM () % NUM_STATS;	2854	i = RANDOM () % NUM_STATS;
3045		2855
3046	if (settings.stat_loss_on_death)	2856	if (settings.stat_loss_on_death)
3047	{	2857	{
3048	/* Pick a random stat and take a point off it. Tell the player	2858	/* Pick a random stat and take a point off it. Tell the player
3049	* what he lost.	2859	* what he lost.
3050	*/	2860	*/
3051	change_attr_value (&(op->stats), i, -1);	2861	change_attr_value (&(op->stats), i, -1);
3052	check_stat_bounds (&(op->stats));	2862	check_stat_bounds (&(op->stats));
3053	change_attr_value (&(op->contr->orig_stats), i, -1);	2863	change_attr_value (&(op->contr->orig_stats), i, -1);
3054	check_stat_bounds (&(op->contr->orig_stats));	2864	check_stat_bounds (&(op->contr->orig_stats));
3055	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2865	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3056	lost_a_stat = 1;	2866	lost_a_stat = 1;
		2867	}
		2868	else
		2869	{
		2870	/* deplete a stat */
		2871	archetype *deparch = archetype::find ("depletion");
		2872	object *dep;
		2873
		2874	dep = present_arch_in_ob (deparch, op);
		2875	if (!dep)
		2876	{
		2877	dep = arch_to_object (deparch);
		2878	insert_ob_in_ob (dep, op);
3057	}	2879	}
3058	else	2880	lose_this_stat = 1;
		2881	if (settings.balanced_stat_loss)
3059	{	2882	{
3060	/* deplete a stat */	2883	/* GD */
3061	archetype *deparch = archetype::find ("depletion");	2884	/* Get the stat that we're about to deplete. */
3062	object *dep;	2885	this_stat = get_attr_value (&(dep->stats), i);
3063		2886	if (this_stat < 0)
3064	dep = present_arch_in_ob (deparch, op);
3065	if (!dep)
3066	{	2887	{
3067	dep = arch_to_object (deparch);	2888	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3068	insert_ob_in_ob (dep, op);	2889	int keep_chance = this_stat * this_stat;
3069	}	2890
3070	lose_this_stat = 1;	2891	/* Yes, I am paranoid. Sue me. */
3071	if (settings.balanced_stat_loss)
3072	{
3073	/* GD */
3074	/* Get the stat that we're about to deplete. */
3075	this_stat = get_attr_value (&(dep->stats), i);
3076	if (this_stat < 0)	2892	if (keep_chance < 1)
		2893	keep_chance = 1;
		2894
		2895	/* There is a maximum depletion total per level. */
		2896	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3077	{	2897	{
3078	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3079	int keep_chance = this_stat * this_stat;
3080
3081	/* Yes, I am paranoid. Sue me. */
3082	if (keep_chance < 1)
3083	keep_chance = 1;
3084
3085	/* There is a maximum depletion total per level. */
3086	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3087	{
3088	lose_this_stat = 0;	2898	lose_this_stat = 0;
3089	/* Take loss chance vs keep chance to see if we	2899	/* Take loss chance vs keep chance to see if we
3090	retain the stat. */	2900	retain the stat. */
3091	}
3092	else
3093	{
3094	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3095	lose_this_stat = 0;
3096	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3097	this_stat, keep_chance, loss_chance,
3098	lose_this_stat?"LOSE":"KEEP"); */
3099	}
3100	}	2901	}
3101	}
3102
3103	if (lose_this_stat)
3104	{
3105	this_stat = get_attr_value (&(dep->stats), i);
3106	/* We could try to do something clever like find another
3107	* stat to reduce if this fails. But chances are, if
3108	* stats have been depleted to -50, all are pretty low
3109	* and should be roughly the same, so it shouldn't make a
3110	* difference.
3111	*/	2902	else
3112	if (this_stat >= -50)
3113	{	2903	{
3114	change_attr_value (&(dep->stats), i, -1);	2904	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3115	SET_FLAG (dep, FLAG_APPLIED);
3116	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3117	fix_player (op);
3118	lost_a_stat = 1;	2905	lose_this_stat = 0;
		2906	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2907	this_stat, keep_chance, loss_chance,
		2908	lose_this_stat?"LOSE":"KEEP"); */
3119	}	2909	}
3120	}	2910	}
3121	}	2911	}
		2912
		2913	if (lose_this_stat)
		2914	{
		2915	this_stat = get_attr_value (&(dep->stats), i);
		2916	/* We could try to do something clever like find another
		2917	* stat to reduce if this fails. But chances are, if
		2918	* stats have been depleted to -50, all are pretty low
		2919	* and should be roughly the same, so it shouldn't make a
		2920	* difference.
		2921	*/
		2922	if (this_stat >= -50)
		2923	{
		2924	change_attr_value (&(dep->stats), i, -1);
		2925	SET_FLAG (dep, FLAG_APPLIED);
		2926	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2927	op->update_stats ();
		2928	lost_a_stat = 1;
		2929	}
3122	}	2930	}
		2931	}
		2932	}
3123	/* If no stat lost, tell the player. */	2933	/* If no stat lost, tell the player. */
3124	if (!lost_a_stat)	2934	if (!lost_a_stat)
3125	{	2935	{
3126	/* determine_god() seems to not work sometimes... why is this?	2936	/* determine_god() seems to not work sometimes... why is this?
3127	Should I be using something else? GD */	2937	Should I be using something else? GD */
3128	const char *god = determine_god (op);	2938	const char *god = determine_god (op);
3129		2939
3130	if (god && (strcmp (god, "none")))	2940	if (god && (strcmp (god, "none")))
3131	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2941	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3132	else	2942	else
3133	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2943	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3134	}	2944	}
3135	#else	2945	#else
3136	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2946	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3137	#endif	2947	#endif
3138		2948
3139	/* Put a gravestone up where the character 'almost' died. List the	2949	/* Put a gravestone up where the character 'almost' died. List the
3140	* exp loss on the stone.	2950	* exp loss on the stone.
3141	*/	2951	*/
3142	tmp = arch_to_object (archetype::find ("gravestone"));	2952	tmp = arch_to_object (archetype::find ("gravestone"));
3143	sprintf (buf, "%s's gravestone", &op->name);	2953	sprintf (buf, "%s's gravestone", &op->name);
3144	tmp->name = buf;	2954	tmp->name = buf;
3145	sprintf (buf, "%s's gravestones", &op->name);	2955	sprintf (buf, "%s's gravestones", &op->name);
3146	tmp->name_pl = buf;	2956	tmp->name_pl = buf;
3147	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);	2957	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);
3148	tmp->msg = buf;	2958	tmp->msg = buf;
3149	tmp->x = op->x, tmp->y = op->y;	2959	tmp->x = op->x, tmp->y = op->y;
3150	insert_ob_in_map (tmp, op->map, NULL, 0);	2960	insert_ob_in_map (tmp, op->map, NULL, 0);
3151		2961
3152	/**************************************/	2962	/**************************************/
3153	/* */	2963	/* */
3154	/* Subtract the experience points, */	2964	/* Subtract the experience points, */
3155	/* if we died cause of food, give us */	2965	/* if we died cause of food, give us */
3156	/* food, and reset HP's... */	2966	/* food, and reset HP's... */
3157	/* */	2967	/* */
3158	/**************************************/	2968	/**************************************/
3159		2969
3160	/* remove any poisoning and confusion the character may be suffering. */	2970	/* remove any poisoning and confusion the character may be suffering. */
3161	/* restore player */	2971	/* restore player */
3162	at = archetype::find ("poisoning");	2972	at = archetype::find ("poisoning");
3163	tmp = present_arch_in_ob (at, op);	2973	tmp = present_arch_in_ob (at, op);
3164		2974
3165	if (tmp)	2975	if (tmp)
3166	{	2976	{
3167	tmp->destroy ();	2977	tmp->destroy ();
3168	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2978	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3169	}	2979	}
3170		2980
3171	at = archetype::find ("confusion");	2981	at = archetype::find ("confusion");
3172	tmp = present_arch_in_ob (at, op);	2982	tmp = present_arch_in_ob (at, op);
3173	if (tmp)	2983	if (tmp)
3174	{	2984	{
3175	tmp->destroy ();	2985	tmp->destroy ();
3176	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2986	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3177	}	2987	}
3178		2988
3179	cure_disease (op, 0); /* remove any disease */	2989	cure_disease (op, 0); /* remove any disease */
3180		2990
3181	/*add_exp(op, (op->stats.exp * -0.20)); */	2991	/*add_exp(op, (op->stats.exp * -0.20)); */
3182	apply_death_exp_penalty (op);	2992	apply_death_exp_penalty (op);
3183	if (op->stats.food < 100)	2993	if (op->stats.food < 100)
3184	op->stats.food = 900;	2994	op->stats.food = 900;
3185	op->stats.hp = op->stats.maxhp;	2995	op->stats.hp = op->stats.maxhp;
3186	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2996	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3187	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2997	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3188		2998
3189	/*	2999	/*
3190	* Check to see if the player is in a shop. IF so, then check to see if	3000	* Check to see if the player is in a shop. IF so, then check to see if
3191	* the player has any unpaid items. If so, remove them and put them back	3001	* the player has any unpaid items. If so, remove them and put them back
3192	* in the map.	3002	* in the map.
3193	*/	3003	*/
3194		3004
3195	if (is_in_shop (op))	3005	if (is_in_shop (op))
3196	remove_unpaid_objects (op->inv, op);	3006	remove_unpaid_objects (op->inv, op);
3197		3007
3198	/****************************************/	3008	/****************************************/
3199	/* */	3009	/* */
3200	/* Move player to his current respawn- */	3010	/* Move player to his current respawn- */
3201	/* position (usually last savebed) */	3011	/* position (usually last savebed) */
3202	/* */	3012	/* */
3203	/****************************************/	3013	/****************************************/
3204		3014
3205	enter_player_savebed (op);	3015	enter_player_savebed (op);
3206		3016
3207	/* Save the player before inserting the force to reduce	3017	/* Save the player before inserting the force to reduce
3208	* chance of abuse.	3018	* chance of abuse.
3209	*/	3019	*/
3210	op->contr->braced = 0;	3020	op->contr->braced = 0;
3211	save_player (op, 1);	3021	op->contr->save ();
3212		3022
3213	/* it is possible that the player has blown something up	3023	/* it is possible that the player has blown something up
3214	* at his savebed location, and that can have long lasting	3024	* at his savebed location, and that can have long lasting
3215	* spell effects. So first see if there is a spell effect	3025	* spell effects. So first see if there is a spell effect
3216	* on the space that might harm the player.	3026	* on the space that might harm the player.
3217	*/	3027	*/
3218	will_kill_again = 0;	3028	will_kill_again = 0;
3219	for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)	3029	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3220	if (tmp->type == SPELL_EFFECT)	3030	if (tmp->type == SPELL_EFFECT)
3221	will_kill_again |= tmp->attacktype;	3031	will_kill_again |= tmp->attacktype;
3222		3032
3223	if (will_kill_again)	3033	if (will_kill_again)
3224	{	3034	{
3225	object *force;	3035	object *force;
3226	int at;	3036	int at;
3227		3037
3228	force = get_archetype (FORCE_NAME);	3038	force = get_archetype (FORCE_NAME);
3229	/* 50 ticks should be enough time for the spell to abate */	3039	/* 50 ticks should be enough time for the spell to abate */
3230	force->speed = 0.1;	3040	force->speed = 0.1;
3231	force->speed_left = -5.0;	3041	force->speed_left = -5.0;
3232	SET_FLAG (force, FLAG_APPLIED);	3042	SET_FLAG (force, FLAG_APPLIED);
3233	for (at = 0; at < NROFATTACKS; at++)	3043	for (at = 0; at < NROFATTACKS; at++)
3234	if (will_kill_again & (1 << at))	3044	if (will_kill_again & (1 << at))
3235	force->resist[at] = 100;	3045	force->resist[at] = 100;
3236		3046
3237	insert_ob_in_ob (force, op);	3047	insert_ob_in_ob (force, op);
3238	fix_player (op);	3048	op->update_stats ();
3239		3049
3240	}	3050	}
3241		3051
3242	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	3052	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3243	return;
3244	} /* NOT_PERMADETH */
3245	else
3246	{
3247	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3248	* should probably be embedded in an else statement.
3249	*/
3250
3251	op->contr->party = NULL;
3252	if (settings.set_title == TRUE)
3253	op->contr->own_title[0] = '\0';
3254	new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3255	check_score (op);
3256
3257	if (op->contr->ranges[range_golem])
3258	{
3259	remove_friendly_object (op->contr->ranges[range_golem]);
3260	op->contr->ranges[range_golem]->destroy ();
3261	op->contr->ranges[range_golem] = 0;
3262	}
3263
3264	loot_object (op); /* Remove some of the items for good */
3265	op->remove ();
3266	op->direction = 0;
3267
3268	if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3269	{
3270	delete_character (op->name, 0);
3271	if (settings.resurrection == TRUE)
3272	{
3273	/* save playerfile sans equipment when player dies
3274	** then save it as player.pl.dead so that future resurrection
3275	** type spells will work on them nicely
3276	*/
3277	delete_character (op->name, 0);
3278	op->stats.hp = op->stats.maxhp;
3279	op->stats.food = 999;
3280
3281	/* set the location of where the person will reappear when */
3282	/* maybe resurrection code should fix map also */
3283	strcpy (op->contr->maplevel, settings.emergency_mapname);
3284	if (op->map != NULL)
3285	op->map = NULL;
3286	op->x = settings.emergency_x;
3287	op->y = settings.emergency_y;
3288	save_player (op, 0);
3289	op->map = map;
3290	/* please see resurrection.c: peterm */
3291	dead_player (op);
3292	}
3293	else
3294	delete_character (op->name, 1);
3295	}
3296
3297	play_again (op);
3298
3299	/* peterm: added to create a corpse at deathsite. */
3300	tmp = arch_to_object (archetype::find ("corpse_pl"));
3301	sprintf (buf, "%s", &op->name);
3302	tmp->name = tmp->name_pl = buf;
3303	tmp->level = op->level;
3304	tmp->x = x;
3305	tmp->y = y;
3306	tmp->msg = gravestone_text (op);
3307	SET_FLAG (tmp, FLAG_UNIQUE);
3308	insert_ob_in_map (tmp, map, NULL, 0);
3309	}
3310	}	3053	}
3311
3312		3054
3313	void	3055	void
3314	loot_object (object *op)	3056	loot_object (object *op)
3315	{ /* Grab and destroy some treasure */	3057	{ /* Grab and destroy some treasure */
3316	object *tmp, *tmp2, *next;	3058	object *tmp, *tmp2, *next;
3317		3059
3318	if (op->container)	3060	if (op->container)
3319	{ /* close open sack first */
3320	esrv_apply_container (op, op->container);	3061	esrv_apply_container (op, op->container); /* close open sack first */
3321	}
3322		3062
3323	for (tmp = op->inv; tmp != NULL; tmp = next)	3063	for (tmp = op->inv; tmp; tmp = next)
3324	{	3064	{
3325	next = tmp->below;	3065	next = tmp->below;
3326	if (tmp->type == EXPERIENCE || tmp->invisible)	3066
		3067	if (tmp->invisible)
3327	continue;	3068	continue;
		3069
3328	tmp->remove ();	3070	tmp->remove ();
3329	tmp->x = op->x, tmp->y = op->y;	3071	tmp->x = op->x, tmp->y = op->y;
3330	if (tmp->type == CONTAINER)	3072	if (tmp->type == CONTAINER)
3331	{ /* empty container to ground */	3073	{ /* empty container to ground */
3332	loot_object (tmp);	3074	loot_object (tmp);
…		…
3354	*/	3096	*/
3355		3097
3356	void	3098	void
3357	fix_weight (void)	3099	fix_weight (void)
3358	{	3100	{
3359	player *pl;
3360
3361	for (pl = first_player; pl != NULL; pl = pl->next)	3101	for (player *pl = first_player; pl; pl = pl->next)
3362	{	3102	{
3363	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3103	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3364		3104
3365	if (old == sum)	3105	if (old == sum)
3366	continue;	3106	continue;
3367	fix_player (pl->ob);	3107	pl->ob->update_stats ();
3368	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	3108	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3369	}	3109	}
3370	}	3110	}
3371		3111
3372	void	3112	void
3373	fix_luck (void)	3113	fix_luck (void)
3374	{	3114	{
3375	player *pl;
3376
3377	for (pl = first_player; pl != NULL; pl = pl->next)	3115	for (player *pl = first_player; pl; pl = pl->next)
3378	if (!pl->ob->contr->state)	3116	if (!pl->ob->contr->ns->state)
3379	change_luck (pl->ob, 0);	3117	pl->ob->change_luck (0);
3380	}	3118	}
3381
3382		3119
3383	/* cast_dust() - handles op throwing objects of type 'DUST'.	3120	/* cast_dust() - handles op throwing objects of type 'DUST'.
3384	* This is much simpler in the new spell code - we basically	3121	* This is much simpler in the new spell code - we basically
3385	* just treat this as any other spell casting object.	3122	* just treat this as any other spell casting object.
3386	*/	3123	*/
3387
3388	void	3124	void
3389	cast_dust (object *op, object *throw_ob, int dir)	3125	cast_dust (object *op, object *throw_ob, int dir)
3390	{	3126	{
3391	object *skop, *spob;	3127	object *skop, *spob;
3392		3128
…		…
3437	object *tmp = NULL;	3173	object *tmp = NULL;
3438		3174
3439	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3175	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3440	return 1;	3176	return 1;
3441		3177
3442	if (op->type == PLAYER)
3443	for (tmp = op->inv; tmp; tmp = tmp->below)
3444	if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3445	if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3446	return 1;
3447	return 0;	3178	return 0;
3448	}	3179	}
3449		3180
3450	/* look at the surrounding terrain to determine	3181	/* look at the surrounding terrain to determine
3451	* the hideability of this object. Positive levels	3182	* the hideability of this object. Positive levels
…		…
3566	if (mflags & P_OUT_OF_MAP)	3297	if (mflags & P_OUT_OF_MAP)
3567	continue;	3298	continue;
3568	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	3299	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3569	continue;	3300	continue;
3570		3301
3571	for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)	3302	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3572	{	3303	{
3573	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	3304	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3574	return 1;	3305	return 1;
3575	else if (tmp->type == PLAYER)	3306	else if (tmp->type == PLAYER)
3576	{	3307	{
…		…
3630		3361
3631	/* only the viewable area the player sees is updated by LOS	3362	/* only the viewable area the player sees is updated by LOS
3632	* code, so we need to restrict ourselves to that range of values	3363	* code, so we need to restrict ourselves to that range of values
3633	* for any meaningful values.	3364	* for any meaningful values.
3634	*/	3365	*/
3635	if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&	3366	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3636	FABS (dy) <= (pl->contr->socket->mapy / 2) &&	3367	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3637	!pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])	3368	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3638	return 1;	3369	return 1;
3639	op = op->more;	3370	op = op->more;
3640	}	3371	}
3641	return 0;	3372	return 0;
3642	}	3373	}
…		…
3828	{	3559	{
3829	/* forces in the treasurelist can alter the player's stats */	3560	/* forces in the treasurelist can alter the player's stats */
3830	object *skin;	3561	object *skin;
3831		3562
3832	/* first get the dragon skin force */	3563	/* first get the dragon skin force */
		3564	shstr_cmp dragon_skin_force ("dragon_skin_force");
3833	for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);	3565	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
		3566	;
		3567
3834	if (skin == NULL)	3568	if (!skin)
3835	return;	3569	return;
3836		3570
3837	/* adding new spellpath attunements */	3571	/* adding new spellpath attunements */
3838	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))	3572	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3839	{	3573	{

Diff Legend

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