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.52 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.66 by root, Tue Dec 26 04:36:17 2006 UTC

…		…
28	#include <living.h>	28	#include <living.h>
29	#include <object.h>	29	#include <object.h>
30	#include <spells.h>	30	#include <spells.h>
31	#include <skills.h>	31	#include <skills.h>
32		32
33	#ifdef COZY_SERVER	33	#include <algorithm>
34	extern int same_party (partylist *a, partylist *b);	34	#include <functional>
35	#endif
36		35
37	player *	36	player *
38	find_player (const char *plname)	37	find_player (const char *plname)
39	{	38	{
40	player *pl;	39	for_all_players (pl)
41
42	for (pl = first_player; pl != NULL; pl = pl->next)
43	{
44	if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))	40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
45	return pl;	41	return pl;
46	};	42
47	return NULL;	43	return 0;
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	}	44	}
75		45
76	void	46	void
77	display_motd (const object *op)	47	display_motd (const object *op)
78	{	48	{
…		…
87	return;	57	return;
88		58
89	motd[0] = '\0';	59	motd[0] = '\0';
90	size = 0;	60	size = 0;
91		61
92	while (fgets (buf, MAX_BUF, fp) != NULL)	62	while (fgets (buf, MAX_BUF, fp))
93	{	63	{
94	if (*buf == '#')	64	if (*buf == '#')
95	continue;	65	continue;
96		66
97	strncat (motd + size, buf, HUGE_BUF - size);	67	strncat (motd + size, buf, HUGE_BUF - size);
…		…
116	return;	86	return;
117		87
118	rules[0] = '\0';	88	rules[0] = '\0';
119	size = 0;	89	size = 0;
120		90
121	while (fgets (buf, MAX_BUF, fp) != NULL)	91	while (fgets (buf, MAX_BUF, fp))
122	{	92	{
123	if (*buf == '#')	93	if (*buf == '#')
124	continue;	94	continue;
125		95
126	if (size + strlen (buf) >= HUGE_BUF)	96	if (size + strlen (buf) >= HUGE_BUF)
…		…
184	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,	154	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);	155	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);
186	close_and_delete (fp, comp);	156	close_and_delete (fp, comp);
187	}	157	}
188		158
189	int	159	/* This loads the first map an puts the player on it. */
190	playername_ok (const char *cp)	160	static void
		161	set_first_map (object *op)
191	{	162	{
192	/* Don't allow - or _ as first character in the name */	163	strcpy (op->contr->maplevel, first_map_path);
193	if (*cp == '-' || *cp == '_')	164	op->x = -1;
194	return 0;	165	op->y = -1;
195		166	enter_exit (op, 0);
196	for (; *cp != '\0'; cp++)
197	if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
198	return 0;
199
200	return 1;
201	}	167	}
202		168
203	/* This no longer sets the player map. Also, it now updates	169	// connect the player with a specific client
204	* all the pointers so the caller doesn't need to do that.	170	// also changed, rationalises, and fixes some incorrect settings
205	* Caller is responsible for setting the correct map.	171	void
206	*/	172	player::connect (client *ns)
207
208	/* Redo this to do both get_player_ob and get_player.
209	* Hopefully this will be less bugfree and simpler.
210	* Returns the player structure. If 'p' is null,
211	* we create a new one. Otherwise, we recycle
212	* the one that is passed.
213	*/
214	static player *
215	get_player (player *p)
216	{	173	{
217	object *op = arch_to_object (get_player_archetype (0));	174	this->ns = ns;
218	int i;	175	ns->pl = this;
219		176
220	/* Clears basically the entire player structure except	177	next = first_player;
221	* for next and socket.	178	first_player = this;
		179
		180	ns->update_look = 0;
		181	ns->look_position = 0;
		182
		183	clear_los (ob);
		184
		185	/* make sure he's a player -- needed because of class change. */
		186	ob->type = PLAYER; // we are paranoid
		187	ob->race = ob->arch->clone.race;
		188
		189	if (!legal_range (ob, shoottype))
		190	shoottype = range_none;
		191
		192	ob->carrying = sum_weight (ob);
		193	link_player_skills (ob);
		194
		195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
		196	update_ob_speed (ob);
		197
		198	assign (title, ob->arch->clone.name);
		199
		200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
		201	* from the class, and not race. I don't see any way to get the class information
		202	* to then update this. I don't think this will actually break anything - anyone
		203	* that can use armour should be able to use a shield. What this may 'break'
		204	* are features new characters get, eg, if someone starts up with a Q, they
		205	* should be able to use a shield. However, old Q's won't get that advantage.
222	*/	206	*/
223	p->clear ();	207	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
		208	SET_FLAG (ob, FLAG_USE_SHIELD);
224		209
		210	/* if it's a dragon player, set the correct title here */
		211	if (is_dragon_pl (ob))
		212	{
		213	object *tmp, *abil = 0, *skin = 0;
		214
		215	shstr_cmp dragon_ability_force ("dragon_ability_force");
		216	shstr_cmp dragon_skin_force ("dragon_skin_force");
		217
		218	for (tmp = ob->inv; tmp; tmp = tmp->below)
		219	if (tmp->type == FORCE)
		220	if (tmp->arch->name == dragon_ability_force)
		221	abil = tmp;
		222	else if (tmp->arch->name == dragon_skin_force)
		223	skin = tmp;
		224
		225	set_dragon_name (ob, abil, skin);
		226	}
		227
		228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		229	add_friendly_object (ob);
		230
		231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
		232
		233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
		234	new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
		235
		236	esrv_new_player (this, ob->weight + ob->carrying);
		237
		238	ob->update_stats ();
		239	ns->floorbox_update ();
		240
		241	esrv_send_inventory (ob, ob);
		242	esrv_add_spells (this, 0);
		243
		244	enter_exit (ob, 0);
		245
		246	send_rules (ob);
		247	send_news (ob);
		248	display_motd (ob);
		249	INVOKE_PLAYER (LOGIN, this);
		250	}
		251
		252	void
		253	player::disconnect ()
		254	{
		255	//TODO: don't be so harsh and destroy :)
		256	if (ns)
		257	destroy ();
		258	}
		259
		260	// the need for this function can be explained
		261	// by load_object not returning the object
		262	void
		263	player::set_object (object *op)
		264	{
		265	ob = op;
		266	ob->contr = this; /* this aren't yet in archetype */
		267
		268	ob->speed_left = 0.5;
		269	ob->speed = 1.0;
		270	ob->direction = 5; /* So player faces south */
		271	ob->stats.wc = 2;
		272	ob->run_away = 25; /* Then we panick... */
		273
		274	set_first_map (ob);
		275
		276	ob->roll_stats ();
		277	}
		278
		279	player::player ()
		280	{
225	/* There are some elements we want initialized to non zero value -	281	/* There are some elements we want initialized to non zero value -
226	* we deal with that below this point.	282	* we deal with that below this point.
227	*/	283	*/
228	p->party = NULL;
229	p->outputs_sync = 16; /* Every 2 seconds */	284	outputs_sync = 16; /* Every 2 seconds */
230	p->outputs_count = 8; /* Keeps present behaviour */	285	outputs_count = 8; /* Keeps present behaviour */
231	p->unapply = unapply_nochoice;	286	unapply = unapply_nochoice;
232	p->Swap_First = -1;
233		287
234	#ifdef AUTOSAVE
235	p->last_save_tick = 9999999;
236	#endif
237
238	strcpy (p->savebed_map, first_map_path); /* Init. respawn position */	288	assign (savebed_map, first_map_path); /* Init. respawn position */
239		289
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->ns->monitor_spells; // what a hack
250	p->ns->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
251	roll_stats (op);
252	p->ns->monitor_spells = oldmon;
253	}
254	p->ns->state = ST_ROLL_STAT;
255	clear_los (op);
256
257	p->gen_sp_armour = 10;	290	gen_sp_armour = 10;
258	p->last_speed = -1;	291	last_speed = -1;
259	p->shoottype = range_none;	292	shoottype = range_none;
260	p->bowtype = bow_normal;	293	bowtype = bow_normal;
261	p->petmode = pet_normal;	294	petmode = pet_normal;
262	p->listening = 10;	295	listening = 10;
263	p->usekeys = containers;	296	usekeys = containers;
264	p->last_weapon_sp = -1;	297	last_weapon_sp = -1;
265	p->peaceful = 1; /* default peaceful */	298	peaceful = 1; /* default peaceful */
266	p->do_los = 1;	299	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		300
274	/* we need to clear these to -1 and not zero - otherwise,	301	/* we need to clear these to -1 and not zero - otherwise,
275	* if a player quits and starts a new character, we wont	302	* if a player quits and starts a new character, we wont
276	* send new values to the client, as things like exp start	303	* send new values to the client, as things like exp start
277	* at zero.	304	* at zero.
278	*/	305	*/
279	for (i = 0; i < NUM_SKILLS; i++)	306	for (int i = 0; i < NUM_SKILLS; i++)
280	{
281	p->last_skill_exp[i] = -1;	307	last_skill_exp[i] = -1;
282	p->last_skill_ob[i] = NULL;
283	}
284		308
285	for (i = 0; i < NROFATTACKS; i++)	309	for (int i = 0; i < NROFATTACKS; i++)
286	p->last_resist[i] = -1;	310	last_resist[i] = -1;
287		311
288	p->last_stats.exp = -1;	312	last_stats.exp = -1;
289	p->last_weight = (uint32) - 1;	313	last_weight = (uint32) - 1;
290
291	p->ns->update_look = 0;
292	p->ns->look_position = 0;
293
294	return p;
295	}	314	}
296		315
297	/* This loads the first map an puts the player on it. */	316	void
298	static void	317	player::do_destroy ()
299	set_first_map (object *op)
300	{	318	{
301	strcpy (op->contr->maplevel, first_map_path);	319	attachable::do_destroy ();
302	op->x = -1;
303	op->y = -1;
304	enter_exit (op, 0);
305	}
306		320
		321	save (false);
		322	enable_save = false;
		323
		324	disconnect ();
		325
		326	terminate_all_pets (ob);
		327
		328	if (first_player != this)
		329	{
		330	player *prev = first_player;
		331
		332	while (prev && prev->next && prev->next != this)
		333	prev = prev->next;
		334
		335	if (prev->next != this)
		336	{
		337	LOG (llevError, "Free_player: Can't find previous player.\n");
		338	abort ();
		339	}
		340
		341	prev->next = next;
		342	}
		343	else
		344	first_player = next;
		345
		346	if (ob)
		347	{
		348	ob->destroy_inv (false);
		349	ob->destroy (true);
		350	}
		351
		352	if (ns)
		353	{
		354	client *ns = this->ns;
		355	ns->send_packet ("goodbye");
		356	ns->flush ();
		357	ns->pl = 0;
		358	this->ns = 0;
		359	ns->destroy ();
		360	}
		361	}
		362
		363	player::~player ()
		364	{
		365	/* Clear item stack */
		366	free (stack_items);
		367	}
		368
307	/* Tries to add player on the connection passwd in ns.	369	/* 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	370	* All we can really get in this is some settings like host and display
309	* mode.	371	* mode.
310	*/	372	*/
311		373	player *
312	int	374	player::create ()
313	add_player (client *ns)
314	{	375	{
315	player *p = new player;	376	player *pl = new player;
316		377
317	p->ns = ns;	378	pl->set_object (arch_to_object (get_player_archetype (0)));
318	ns->pl = p;
319		379
320	p->next = first_player;
321	first_player = p;
322
323	p = get_player (p);
324
325	set_first_map (p->ob);
326
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
333	get_name (p->ob);
334
335	return 0;	380	return pl;
336	}	381	}
337		382
338	/*	383	/*
339	* get_player_archetype() return next player archetype from archetype	384	* get_player_archetype() return next player archetype from archetype
340	* list. Not very efficient routine, but used only creating new players.	385	* list. Not very efficient routine, but used only creating new players.
…		…
365		410
366	object *	411	object *
367	get_nearest_player (object *mon)	412	get_nearest_player (object *mon)
368	{	413	{
369	object *op = NULL;	414	object *op = NULL;
370	player *pl = NULL;
371	objectlink *ol;	415	objectlink *ol;
372	unsigned lastdist;	416	unsigned lastdist;
373	rv_vector rv;	417	rv_vector rv;
374		418
375	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	419	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
…		…
407	{	451	{
408	op = ol->ob;	452	op = ol->ob;
409	lastdist = rv.distance;	453	lastdist = rv.distance;
410	}	454	}
411	}	455	}
412	for (pl = first_player; pl != NULL; pl = pl->next)	456
413	{	457	for_all_players (pl)
414	if (can_detect_enemy (mon, pl->ob, &rv))	458	if (can_detect_enemy (mon, pl->ob, &rv))
415	{
416
417	if (lastdist > rv.distance)	459	if (lastdist > rv.distance)
418	{	460	{
419	op = pl->ob;	461	op = pl->ob;
420	lastdist = rv.distance;	462	lastdist = rv.distance;
421	}	463	}
422	}	464
423	}
424	#if 0	465	#if 0
425	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	466	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
426	#endif	467	#endif
427	return op;	468	return op;
428	}	469	}
…		…
446	* circling behaviour. Unfortunately, this function is also used to determined	487	* circling behaviour. Unfortunately, this function is also used to determined
447	* if the creature should cast a spell, so returning a direction in that case	488	* if the creature should cast a spell, so returning a direction in that case
448	* is probably not a good thing.	489	* is probably not a good thing.
449	*/	490	*/
450	#define MAX_SPACES 50	491	#define MAX_SPACES 50
451
452		492
453	/*	493	/*
454	* Returns the direction to the player, if valid. Returns 0 otherwise.	494	* Returns the direction to the player, if valid. Returns 0 otherwise.
455	* modified to verify there is a path to the player. Does this by stepping towards	495	* modified to verify there is a path to the player. Does this by stepping towards
456	* player and if path is blocked then see if blockage is close enough to player that	496	* player and if path is blocked then see if blockage is close enough to player that
…		…
695	/* Need to set up the skill pointers */	735	/* Need to set up the skill pointers */
696	link_player_skills (pl);	736	link_player_skills (pl);
697	}	737	}
698		738
699	void	739	void
700	get_name (object *op)
701	{
702	op->contr->write_buf[0] = '\0';
703	op->contr->ns->state = ST_GET_NAME;
704	send_query (op->contr->ns, 0, "What is your name?\n:");
705	}
706
707	void
708	get_password (object *op)
709	{
710	op->contr->write_buf[0] = '\0';
711	op->contr->ns->state = ST_GET_PASSWORD;
712	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is your password?\n:");
713	}
714
715	void
716	play_again (object *op)
717	{
718	op->contr->ns->state = ST_PLAY_AGAIN;
719	op->chosen_skill = NULL;
720	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
721	/* a bit of a hack, but there are various places early in th
722	* player creation process that a user can quit (eg, roll
723	* stats) that isn't removing the player. Taking a quick
724	* look, there are many places that call play_again without
725	* removing the player - it probably makes more sense
726	* to leave it to play_again to remove the object in all
727	* cases.
728	*/
729	if (!QUERY_FLAG (op, FLAG_REMOVED))
730	op->remove ();
731
732	/* Need to set this to null - otherwise, it could point to garbage,
733	* and draw() doesn't check to see if the player is removed, only if
734	* the map is null or not swapped out.
735	*/
736	op->map = NULL;
737	}
738
739	int
740	receive_play_again (object *op, char key)
741	{
742	if (key == 'q' || key == 'Q')
743	{
744	remove_friendly_object (op);
745	leave (op->contr, 0); /* ericserver will draw the message */
746	return 2;
747	}
748	else if (key == 'a' || key == 'A')
749	{
750	player *pl = op->contr;
751	shstr name = op->name;
752
753	op->contr = 0;
754	op->type = 0;
755	op->destroy (1);
756	pl = get_player (pl);
757	op = pl->ob;
758	add_friendly_object (op);
759	op->contr->password[0] = '~';
760	op->name = op->name_pl = 0;
761	/* Lets put a space in here */
762	new_draw_info (NDI_UNIQUE, 0, op, "\n");
763	get_name (op);
764	op->name = op->name_pl = name;
765	set_first_map (op);
766	}
767	else
768	/* user pressed something else so just ask again... */
769	play_again (op);
770
771	return 0;
772	}
773
774	void
775	confirm_password (object *op)
776	{
777
778	op->contr->write_buf[0] = '\0';
779	op->contr->ns->state = ST_CONFIRM_PASSWORD;
780	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
781	}
782
783	void
784	get_party_password (object *op, partylist *party)	740	get_party_password (object *op, partylist *party)
785	{	741	{
786	if (party == NULL)	742	if (party == NULL)
787	{	743	{
788	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	744	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
789	return;	745	return;
790	}	746	}
		747
791	op->contr->write_buf[0] = '\0';	748	op->contr->write_buf[0] = '\0';
792	op->contr->ns->state = ST_GET_PARTY_PASSWORD;	749	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
793	op->contr->party_to_join = party;	750	op->contr->party_to_join = party;
794	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	751	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
795	}	752	}
796		753
797
798	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	754	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
799	int	755	static int
800	roll_stat (void)	756	roll_stat (void)
801	{	757	{
802	int a[4], i, j, k;	758	int a[4], i, j, k;
803		759
804	for (i = 0; i < 4; i++)	760	for (i = 0; i < 4; i++)
…		…
807	for (i = 0, j = 0, k = 7; i < 4; i++)	763	for (i = 0, j = 0, k = 7; i < 4; i++)
808	if (a[i] < k)	764	if (a[i] < k)
809	k = a[i], j = i;	765	k = a[i], j = i;
810		766
811	for (i = 0, k = 0; i < 4; i++)	767	for (i = 0, k = 0; i < 4; i++)
812	{
813	if (i != j)	768	if (i != j)
814	k += a[i];	769	k += a[i];
815	}	770
816	return k;	771	return k;
817	}	772	}
818		773
819	void	774	void
820	roll_stats (object *op)	775	object::roll_stats ()
821	{	776	{
822	int sum = 0;
823	int i = 0, j = 0;
824	int statsort[7];	777	int statsort [7];
825		778
826	do	779	for (;;)
827	{
828	op->stats.Str = roll_stat ();
829	op->stats.Dex = roll_stat ();
830	op->stats.Int = roll_stat ();
831	op->stats.Con = roll_stat ();
832	op->stats.Wis = roll_stat ();
833	op->stats.Pow = roll_stat ();
834	op->stats.Cha = roll_stat ();
835	sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
836	}	780	{
837	while (sum < 82 || sum > 116);	781	int sum = 0;
		782	for (int i = 7; i--; )
		783	sum += statsort [i] = roll_stat ();
838		784
		785	if (sum >= 82 && sum <= 116)
		786	break;
		787	}
		788
839	/* Sort the stats so that rerolling is easier... */	789	// Sort the stats so that rerolling is easier...
840	statsort[0] = op->stats.Str;	790	std::sort (statsort, statsort + 7, std::greater<int>());
841	statsort[1] = op->stats.Dex;
842	statsort[2] = op->stats.Int;
843	statsort[3] = op->stats.Con;
844	statsort[4] = op->stats.Wis;
845	statsort[5] = op->stats.Pow;
846	statsort[6] = op->stats.Cha;
847		791
848	/* a quick and dirty bubblesort? */
849	do
850	{
851	if (statsort[i] < statsort[i + 1])
852	{
853	j = statsort[i];
854	statsort[i] = statsort[i + 1];
855	statsort[i + 1] = j;
856	i = 0;
857	}
858	else
859	{
860	i++;
861	}
862	}
863	while (i < 6);
864
865	op->stats.Str = statsort[0];	792	stats.Str = statsort[0];
866	op->stats.Dex = statsort[1];	793	stats.Dex = statsort[1];
867	op->stats.Con = statsort[2];	794	stats.Con = statsort[2];
868	op->stats.Int = statsort[3];	795	stats.Int = statsort[3];
869	op->stats.Wis = statsort[4];	796	stats.Wis = statsort[4];
870	op->stats.Pow = statsort[5];	797	stats.Pow = statsort[5];
871	op->stats.Cha = statsort[6];	798	stats.Cha = statsort[6];
872		799
873
874	op->contr->orig_stats.Str = op->stats.Str;
875	op->contr->orig_stats.Dex = op->stats.Dex;
876	op->contr->orig_stats.Int = op->stats.Int;
877	op->contr->orig_stats.Con = op->stats.Con;
878	op->contr->orig_stats.Wis = op->stats.Wis;
879	op->contr->orig_stats.Pow = op->stats.Pow;
880	op->contr->orig_stats.Cha = op->stats.Cha;
881
882	op->level = 1;
883	op->stats.exp = 0;	800	stats.exp = 0;
884	op->stats.ac = 0;	801	stats.ac = 0;
885		802
886	op->contr->levhp[1] = 9;
887	op->contr->levsp[1] = 6;
888	op->contr->levgrace[1] = 3;
889
890	fix_player (op);
891	op->stats.hp = op->stats.maxhp;	803	stats.hp = stats.maxhp;
892	op->stats.sp = op->stats.maxsp;	804	stats.sp = stats.maxsp;
893	op->stats.grace = op->stats.maxgrace;	805	stats.grace = stats.maxgrace;
		806
		807	if (contr)
		808	{
		809	contr->levhp[1] = 9;
		810	contr->levsp[1] = 6;
		811	contr->levgrace[1] = 3;
		812
894	op->contr->orig_stats = op->stats;	813	contr->orig_stats = stats;
		814	}
895	}	815	}
896		816
897	void	817	void
898	Roll_Again (object *op)	818	object::swap_stats (int a, int b)
899	{	819	{
900	esrv_new_player (op->contr, 0);
901	send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
902	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
903	}
904
905	void
906	Swap_Stat (object *op, int Swap_Second)
907	{
908	signed char tmp;
909	char buf[MAX_BUF];
910
911	if (op->contr->Swap_First == -1)
912	{
913	new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
914	new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
915	new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
916	return;
917	}
918
919	tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);	820	int tmp = get_attr_value (&contr->orig_stats, a);
920
921	set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));	821	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
922
923	set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);	822	set_attr_value (&contr->orig_stats, b, tmp);
924		823
925	sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
926	new_draw_info (NDI_UNIQUE, 0, op, buf);
927	op->stats.Str = op->contr->orig_stats.Str;	824	stats.Str = contr->orig_stats.Str;
928	op->stats.Dex = op->contr->orig_stats.Dex;	825	stats.Dex = contr->orig_stats.Dex;
929	op->stats.Con = op->contr->orig_stats.Con;	826	stats.Con = contr->orig_stats.Con;
930	op->stats.Int = op->contr->orig_stats.Int;	827	stats.Int = contr->orig_stats.Int;
931	op->stats.Wis = op->contr->orig_stats.Wis;	828	stats.Wis = contr->orig_stats.Wis;
932	op->stats.Pow = op->contr->orig_stats.Pow;	829	stats.Pow = contr->orig_stats.Pow;
933	op->stats.Cha = op->contr->orig_stats.Cha;	830	stats.Cha = contr->orig_stats.Cha;
		831
		832	//TODO: the following code looks so borked and should, at the very least,
		833	// be merged with the similar code in roll_stats
934	op->stats.ac = 0;	834	stats.ac = 0;
935		835
936	op->level = 1;	836	level = 1;
937	op->stats.exp = 0;	837	stats.exp = 0;
938	op->stats.ac = 0;	838	stats.ac = 0;
939		839
940	op->contr->levhp[1] = 9;
941	op->contr->levsp[1] = 6;
942	op->contr->levgrace[1] = 3;
943
944	fix_player (op);
945	op->stats.hp = op->stats.maxhp;	840	stats.hp = stats.maxhp;
946	op->stats.sp = op->stats.maxsp;	841	stats.sp = stats.maxsp;
947	op->stats.grace = op->stats.maxgrace;	842	stats.grace = stats.maxgrace;
		843
		844	if (contr)
		845	{
		846	contr->levhp[1] = 9;
		847	contr->levsp[1] = 6;
		848	contr->levgrace[1] = 3;
		849
948	op->contr->orig_stats = op->stats;	850	contr->orig_stats = stats;
949	op->contr->Swap_First = -1;
950	}
951
952
953	/* This code has been greatly reduced, because with set_attr_value
954	* and get_attr_value, the stats can be accessed just numeric
955	* ids. stat_trans is a table that translate the number entered
956	* into the actual stat. It is needed because the order the stats
957	* are displayed in the stat window is not the same as how
958	* the number's access that stat. The table does that translation.
959	*/
960	int
961	key_roll_stat (object *op, char key)
962	{
963	int keynum = key - '0';
964	char buf[MAX_BUF];
965	static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
966
967	if (keynum > 0 && keynum <= 7)
968	{	851	}
969	if (op->contr->Swap_First == -1)
970	{
971	op->contr->Swap_First = stat_trans[keynum];
972	sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
973	new_draw_info (NDI_UNIQUE, 0, op, buf);
974	}
975	else
976	Swap_Stat (op, stat_trans[keynum]);
977
978	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
979	return 1;
980	}
981	switch (key)
982	{
983	case 'n':
984	case 'N':
985	{
986	SET_FLAG (op, FLAG_WIZ);
987	if (op->map == NULL)
988	{
989	LOG (llevError, "Map == NULL in state 2\n");
990	break;
991	}
992
993	#if 0
994	/* So that enter_exit will put us at startx/starty */
995	op->x = -1;
996
997	enter_exit (op, NULL);
998	#endif
999	SET_ANIMATION (op, 2); /* So player faces south */
1000	/* Enter exit adds a player otherwise */
1001	add_statbonus (op);
1002	send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
1003	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1004	op->contr->ns->state = ST_CHANGE_CLASS;
1005	if (op->msg)
1006	new_draw_info (NDI_BLUE, 0, op, op->msg);
1007	return 0;
1008	}
1009	case 'y':
1010	case 'Y':
1011	roll_stats (op);
1012	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
1013	return 1;
1014
1015	case 'q':
1016	case 'Q':
1017	play_again (op);
1018	return 1;
1019
1020	default:
1021	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1022	return 0;
1023	}
1024	return 0;
1025	}	852	}
1026		853
1027	/* This function takes the key that is passed, and does the	854	/* This function takes the key that is passed, and does the
1028	* appropriate action with it (change race, or other things).	855	* appropriate action with it (change race, or other things).
1029	* The function name is for historical reasons - now we have	856	* The function name is for historical reasons - now we have
1030	* separate race and class; this actually changes the RACE,	857	* separate race and class; this actually changes the RACE,
1031	* not the class.	858	* not the class.
1032	*/	859	*/
1033
1034	int	860	int
1035	key_change_class (object *op, char key)	861	key_change_class (object *op, char key)
1036	{	862	{
1037	int tmp_loop;	863	int tmp_loop;
1038		864
1039	if (key == 'q' || key == 'Q')
1040	{
1041	op->remove ();
1042	play_again (op);
1043	return 0;
1044	}
1045	if (key == 'd' || key == 'D')	865	if (key == 'd' || key == 'D')
1046	{	866	{
1047	char buf[MAX_BUF];	867	char buf[MAX_BUF];
1048		868
1049	/* this must before then initial items are given */	869	/* this must before then initial items are given */
…		…
1073	start_info (op);	893	start_info (op);
1074	CLEAR_FLAG (op, FLAG_WIZ);	894	CLEAR_FLAG (op, FLAG_WIZ);
1075	give_initial_items (op, op->randomitems);	895	give_initial_items (op, op->randomitems);
1076	link_player_skills (op);	896	link_player_skills (op);
1077	esrv_send_inventory (op, op);	897	esrv_send_inventory (op, op);
1078	fix_player (op);	898	op->update_stats ();
1079		899
1080	/* This moves the player to a different start map, if there	900	/* This moves the player to a different start map, if there
1081	* is one for this race	901	* is one for this race
1082	*/	902	*/
1083	if (*first_map_ext_path)	903	if (*first_map_ext_path)
…		…
1109	while (!tmp_loop)	929	while (!tmp_loop)
1110	{	930	{
1111	shstr name = op->name;	931	shstr name = op->name;
1112	int x = op->x, y = op->y;	932	int x = op->x, y = op->y;
1113		933
1114	remove_statbonus (op);	934	op->remove_statbonus ();
1115	op->remove ();	935	op->remove ();
1116	op->arch = get_player_archetype (op->arch);	936	op->arch = get_player_archetype (op->arch);
1117	op->arch->clone.copy_to (op);	937	op->arch->clone.copy_to (op);
1118	op->instantiate ();	938	op->instantiate ();
1119	op->stats = op->contr->orig_stats;	939	op->stats = op->contr->orig_stats;
…		…
1121	op->x = x;	941	op->x = x;
1122	op->y = y;	942	op->y = y;
1123	SET_ANIMATION (op, 2); /* So player faces south */	943	SET_ANIMATION (op, 2); /* So player faces south */
1124	insert_ob_in_map (op, op->map, op, 0);	944	insert_ob_in_map (op, op->map, op, 0);
1125	assign (op->contr->title, op->arch->clone.name);	945	assign (op->contr->title, op->arch->clone.name);
1126	add_statbonus (op);	946	op->add_statbonus ();
1127	tmp_loop = allowed_class (op);	947	tmp_loop = allowed_class (op);
1128	}	948	}
1129		949
1130	update_object (op, UP_OBJ_FACE);	950	update_object (op, UP_OBJ_FACE);
1131	esrv_update_item (UPD_FACE, op, op);	951	esrv_update_item (UPD_FACE, op, op);
1132	fix_player (op);	952	op->update_stats ();
1133	op->stats.hp = op->stats.maxhp;	953	op->stats.hp = op->stats.maxhp;
1134	op->stats.sp = op->stats.maxsp;	954	op->stats.sp = op->stats.maxsp;
1135	op->stats.grace = 0;	955	op->stats.grace = 0;
1136		956
1137	if (op->msg)	957	if (op->msg)
…		…
1142	}	962	}
1143		963
1144	int	964	int
1145	key_confirm_quit (object *op, char key)	965	key_confirm_quit (object *op, char key)
1146	{	966	{
1147	char buf[MAX_BUF];
1148
1149	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')	967	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1150	{	968	{
1151	op->contr->ns->state = ST_PLAYING;	969	op->contr->ns->state = ST_PLAYING;
1152	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");	970	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1153	return 1;	971	return 1;
1154	}	972	}
1155		973
1156	INVOKE_PLAYER (LOGOUT, op->contr);	974	INVOKE_PLAYER (LOGOUT, op->contr);
1157	INVOKE_PLAYER (QUIT, op->contr);	975	INVOKE_PLAYER (QUIT, op->contr);
		976
		977	op->contr->enable_save = false;
1158		978
1159	terminate_all_pets (op);	979	terminate_all_pets (op);
1160	leave_map (op);	980	leave_map (op);
1161	op->direction = 0;	981	op->direction = 0;
1162	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);	982	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1163		983
1164	strcpy (op->contr->killer, "quit");	984	strcpy (op->contr->killer, "quit");
1165	check_score (op);	985	check_score (op);
1166	op->contr->party = NULL;	986	op->contr->party = 0;
1167	if (settings.set_title == TRUE)
1168	op->contr->own_title[0] = '\0';	987	op->contr->own_title[0] = '\0';
1169		988
1170	if (!QUERY_FLAG (op, FLAG_WAS_WIZ))	989	object_ptr ob = op;
1171	{
1172	maptile *mp, *next;
1173		990
1174	/* We need to hunt for any per player unique maps in memory and	991	/* We need to hunt for any per player unique maps in memory and
1175	* get rid of them. The trailing slash in the path is intentional,	992	* get rid of them. The trailing slash in the path is intentional,
1176	* so that players named 'Ab' won't match against players 'Abe' pathname	993	* so that players named 'Ab' won't match against players 'Abe' pathname
1177	*/	994	*/
		995	char buf[MAX_BUF];
1178	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);	996	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1179	for (mp = first_map; mp != NULL; mp = next)	997
1180	{	998	for (maptile *next, *mp = first_map; mp; mp = next)
		999	{
1181	next = mp->next;	1000	next = mp->next;
		1001
1182	if (!strncmp (mp->path, buf, strlen (buf)))	1002	if (!strncmp (mp->path, buf, strlen (buf)))
1183	delete_map (mp);	1003	delete_map (mp);
1184	}	1004	}
1185		1005
1186	delete_character (op->name, 1);	1006	delete_character (ob->name, 1);
1187	}	1007	ob->contr->destroy ();
1188		1008
1189	play_again (op);
1190	return 1;	1009	return 1;
1191	}	1010	}
1192		1011
1193	void	1012	void
1194	flee_player (object *op)	1013	flee_player (object *op)
…		…
1332	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1151	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1333	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1152	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1334	else	1153	else
1335	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1154	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1336	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1155	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1156
1337	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1157	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1338
1339	sprintf (putstring, "...flags: ");
1340	for (k = 0; k < 4; k++)
1341	{
1342	for (j = 0; j < 32; j++)
1343	{
1344	if ((tmp->flags[k] >> j) & 0x01)
1345	{
1346	sprintf (tmpstr, "%d ", k * 32 + j);
1347	strcat (putstring, tmpstr);
1348	}
1349	}
1350	}
1351	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1352
1353	#if 0
1354	/* print the flags too */
1355	for (k = 0; k < 4; k++)
1356	{
1357	fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1358	for (j = 0; j < 32; j++)
1359	{
1360	fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1361	if (!((j + 1) % 4))
1362	fprintf (stderr, " ");
1363	}
1364	fprintf (stderr, " [%d]\n", k * 32);
1365	}
1366	#endif
1367	}	1158	}
		1159
1368	/* philosophy:	1160	/* philosophy:
1369	* It's easy to grab an item type from a pile, as long as it's	1161	* It's easy to grab an item type from a pile, as long as it's
1370	* generic. This takes no game-time. For more detailed pickups	1162	* generic. This takes no game-time. For more detailed pickups
1371	* and selections, select-items shoul dbe used. This is a	1163	* and selections, select-items should be used. This is a
1372	* grab-as-you-run type mode that's really useful for arrows for	1164	* grab-as-you-run type mode that's really useful for arrows for
1373	* example.	1165	* example.
1374	* The drawback: right now it has no frontend, so you need to	1166	* The drawback: right now it has no frontend, so you need to
1375	* stick the bits you want into a calculator in hex mode and then	1167	* stick the bits you want into a calculator in hex mode and then
1376	* convert to decimal and then 'pickup <#>	1168	* convert to decimal and then 'pickup <#>
…		…
1884	arrow->y = sy;	1676	arrow->y = sy;
1885		1677
1886	if (op->type == PLAYER)	1678	if (op->type == PLAYER)
1887	{	1679	{
1888	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1680	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1889	fix_player (op);	1681	op->update_stats ();
1890	}	1682	}
1891		1683
1892	SET_ANIMATION (arrow, arrow->direction);	1684	SET_ANIMATION (arrow, arrow->direction);
1893	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1685	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1894	arrow->stats.hp = arrow->stats.dam;	1686	arrow->stats.hp = arrow->stats.dam;
…		…
2603	op->stats.hp = op->stats.maxhp;	2395	op->stats.hp = op->stats.maxhp;
2604		2396
2605	if (op->stats.food < 0)	2397	if (op->stats.food < 0)
2606	op->stats.food = 999;	2398	op->stats.food = 999;
2607		2399
2608	fix_player (op);	2400	op->update_stats ();
2609	return 1;	2401	return 1;
2610	}	2402	}
2611		2403
2612	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2404	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2613	CLEAR_FLAG (op, FLAG_LIFESAVE);	2405	CLEAR_FLAG (op, FLAG_LIFESAVE);
…		…
2643	remove_unpaid_objects (op->inv, env);	2435	remove_unpaid_objects (op->inv, env);
2644		2436
2645	op = next;	2437	op = next;
2646	}	2438	}
2647	}	2439	}
2648
2649		2440
2650	/*	2441	/*
2651	* Returns pointer a static string containing gravestone text	2442	* Returns pointer a static string containing gravestone text
2652	* Moved from apply.c to player.c - player.c is what	2443	* Moved from apply.c to player.c - player.c is what
2653	* actually uses this function. player.c may not be quite the	2444	* actually uses this function. player.c may not be quite the
…		…
2687	strncat (buf2, " ", 20 - strlen (buf) / 2);	2478	strncat (buf2, " ", 20 - strlen (buf) / 2);
2688	strcat (buf2, buf);	2479	strcat (buf2, buf);
2689		2480
2690	return buf2;	2481	return buf2;
2691	}	2482	}
2692
2693
2694		2483
2695	void	2484	void
2696	do_some_living (object *op)	2485	do_some_living (object *op)
2697	{	2486	{
2698	int last_food = op->stats.food;	2487	int last_food = op->stats.food;
…		…
2707	const int max_grace = 1;	2496	const int max_grace = 1;
2708		2497
2709	if (op->contr->outputs_sync)	2498	if (op->contr->outputs_sync)
2710	{	2499	{
2711	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2500	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2712	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2501	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2713	flush_output_element (op, &op->contr->outputs[i]);	2502	flush_output_element (op, &op->contr->outputs[i]);
2714	}	2503	}
2715		2504
2716	if (op->contr->ns->state == ST_PLAYING)	2505	if (op->contr->ns->state == ST_PLAYING)
2717	{	2506	{
2718
2719	/* these next three if clauses make it possible to SLOW DOWN	2507	/* these next three if clauses make it possible to SLOW DOWN
2720	hp/grace/spellpoint regeneration. */	2508	hp/grace/spellpoint regeneration. */
2721	if (op->contr->gen_hp >= 0)	2509	if (op->contr->gen_hp >= 0)
2722	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2510	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2723	else	2511	else
2724	{	2512	{
2725	gen_hp = op->stats.maxhp;	2513	gen_hp = op->stats.maxhp;
2726	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2514	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2727	}	2515	}
		2516
2728	if (op->contr->gen_sp >= 0)	2517	if (op->contr->gen_sp >= 0)
2729	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2518	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2730	else	2519	else
2731	{	2520	{
2732	gen_sp = op->stats.maxsp;	2521	gen_sp = op->stats.maxsp;
2733	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2522	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2734	}	2523	}
		2524
2735	if (op->contr->gen_grace >= 0)	2525	if (op->contr->gen_grace >= 0)
2736	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2526	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2737	else	2527	else
2738	{	2528	{
2739	gen_grace = op->stats.maxgrace;	2529	gen_grace = op->stats.maxgrace;
…		…
2755	op->stats.food += op->contr->digestion;	2545	op->stats.food += op->contr->digestion;
2756	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2546	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2757	op->stats.food = last_food;	2547	op->stats.food = last_food;
2758	}	2548	}
2759	}	2549	}
		2550
2760	if (max_sp > 1)	2551	if (max_sp > 1)
2761	{	2552	{
2762	over_sp = (gen_sp + 10) / rate_sp;	2553	over_sp = (gen_sp + 10) / rate_sp;
2763	if (over_sp > 0)	2554	if (over_sp > 0)
2764	{	2555	{
2765	if (op->stats.sp < op->stats.maxsp)	2556	if (op->stats.sp < op->stats.maxsp)
2766	{	2557	{
2767	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2558	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2559
2768	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2560	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2769	op->stats.sp--;	2561	op->stats.sp--;
		2562
2770	if (op->stats.sp > op->stats.maxsp)	2563	if (op->stats.sp > op->stats.maxsp)
2771	op->stats.sp = op->stats.maxsp;	2564	op->stats.sp = op->stats.maxsp;
2772	}	2565	}
2773	op->last_sp = 0;	2566	op->last_sp = 0;
2774	}	2567	}
2775	else	2568	else
2776	{
2777	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2569	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2778	}
2779	}	2570	}
2780	else	2571	else
2781	{
2782	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2572	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2783	}
2784	}	2573	}
2785		2574
2786	/* Regenerate Grace */	2575	/* Regenerate Grace */
2787	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2576	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2788	if (--op->last_grace < 0)	2577	if (--op->last_grace < 0)
2789	{	2578	{
2790	if (op->stats.grace < op->stats.maxgrace / 2)	2579	if (op->stats.grace < op->stats.maxgrace / 2)
2791	op->stats.grace++; /* no penalty in food for regaining grace */	2580	op->stats.grace++; /* no penalty in food for regaining grace */
		2581
2792	if (max_grace > 1)	2582	if (max_grace > 1)
2793	{	2583	{
2794	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2584	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2795	if (over_grace > 0)	2585	if (over_grace > 0)
2796	{	2586	{
…		…
2824	op->stats.food += op->contr->digestion;	2614	op->stats.food += op->contr->digestion;
2825	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2615	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2826	op->stats.food = last_food;	2616	op->stats.food = last_food;
2827	}	2617	}
2828	}	2618	}
		2619
2829	if (max_hp > 1)	2620	if (max_hp > 1)
2830	{	2621	{
2831	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2622	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2832	if (over_hp > 0)	2623	if (over_hp > 0)
2833	{	2624	{
…		…
2857		2648
2858	if (op->contr->gen_hp > 0)	2649	if (op->contr->gen_hp > 0)
2859	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2650	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2860	else	2651	else
2861	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2652	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2653
2862	/* dms do not consume food */	2654	/* dms do not consume food */
2863	if (!QUERY_FLAG (op, FLAG_WIZ))	2655	if (!QUERY_FLAG (op, FLAG_WIZ))
2864	op->stats.food--;	2656	op->stats.food--;
2865	}	2657	}
2866	}
2867		2658
2868	if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2659	if (op->stats.food < 0 && op->stats.hp >= 0)
2869	{	2660	{
2870	object *tmp, *flesh = NULL;	2661	object *tmp, *flesh = 0;
2871		2662
2872	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2663	for (tmp = op->inv; tmp; tmp = tmp->below)
2873	{	2664	{
2874	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2665	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2875	{
2876	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2877	{	2666	{
		2667	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2668	{
2878	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2669	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2879	manual_apply (op, tmp, 0);	2670	manual_apply (op, tmp, 0);
2880	if (op->stats.food >= 0 || op->stats.hp < 0)	2671	if (op->stats.food >= 0 || op->stats.hp < 0)
2881	break;	2672	break;
2882	}	2673	}
2883	else if (tmp->type == FLESH)	2674	else if (tmp->type == FLESH)
2884	flesh = tmp;	2675	flesh = tmp;
2885	} /* End if paid for object */	2676	} /* End if paid for object */
2886	} /* end of for loop */	2677	} /* end of for loop */
		2678
2887	/* If player is still starving, it means they don't have any food, so	2679	/* If player is still starving, it means they don't have any food, so
2888	* eat flesh instead.	2680	* eat flesh instead.
2889	*/	2681	*/
2890	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2682	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2891	{	2683	{
2892	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2684	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2893	manual_apply (op, flesh, 0);	2685	manual_apply (op, flesh, 0);
2894	}	2686	}
2895	} /* end if player is starving */	2687	}
2896		2688
2897	while (op->stats.food < 0 && op->stats.hp > 0)	2689	while (op->stats.food < 0 && op->stats.hp >= 0)
2898	op->stats.food++, op->stats.hp--;	2690	op->stats.food++, op->stats.hp--;
2899		2691
2900	if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))	2692	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2901	kill_player (op);	2693	kill_player (op);
		2694	}
2902	}	2695	}
2903
2904
2905		2696
2906	/* If the player should die (lack of hp, food, etc), we call this.	2697	/* If the player should die (lack of hp, food, etc), we call this.
2907	* op is the player in jeopardy. If the player can not be saved (not	2698	* op is the player in jeopardy. If the player can not be saved (not
2908	* permadeath, no lifesave), this will take care of removing the player	2699	* permadeath, no lifesave), this will take care of removing the player
2909	* file.	2700	* file.
…		…
3016	x = op->x;	2807	x = op->x;
3017	y = op->y;	2808	y = op->y;
3018	map = op->map;	2809	map = op->map;
3019		2810
3020		2811
3021	if (settings.not_permadeth == TRUE)
3022	{
3023	/* NOT_PERMADEATH code. This basically brings the character back to	2812	/* NOT_PERMADEATH code. This basically brings the character back to
3024	* life if they are dead - it takes some exp and a random stat.	2813	* life if they are dead - it takes some exp and a random stat.
3025	* See the config.h file for a little more in depth detail about this.	2814	* See the config.h file for a little more in depth detail about this.
3026	*/	2815	*/
3027		2816
3028	/* Basically two ways to go - remove a stat permanently, or just	2817	/* Basically two ways to go - remove a stat permanently, or just
3029	* make it depletion. This bunch of code deals with that aspect	2818	* make it depletion. This bunch of code deals with that aspect
3030	* of death.	2819	* of death.
3031	*/	2820	*/
3032	#ifndef COZY_SERVER	2821	#ifndef COZY_SERVER
3033	if (settings.balanced_stat_loss)	2822	if (settings.balanced_stat_loss)
3034	{	2823	{
3035	/* If stat loss is permanent, lose one stat only. */	2824	/* If stat loss is permanent, lose one stat only. */
3036	/* Lower level chars don't lose as many stats because they suffer	2825	/* Lower level chars don't lose as many stats because they suffer
3037	more if they do. */	2826	more if they do. */
3038	/* Higher level characters can afford things such as potions of	2827	/* Higher level characters can afford things such as potions of
3039	restoration, or better, stat potions. So we slug them that	2828	restoration, or better, stat potions. So we slug them that
3040	little bit harder. */	2829	little bit harder. */
3041	/* GD */	2830	/* GD */
3042	if (settings.stat_loss_on_death)	2831	if (settings.stat_loss_on_death)
3043	num_stats_lose = 1;	2832	num_stats_lose = 1;
3044	else
3045	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3046	}
3047	else	2833	else
3048	{	2834	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2835	}
		2836	else
		2837	{
3049	num_stats_lose = 1;	2838	num_stats_lose = 1;
3050	}	2839	}
3051	lost_a_stat = 0;	2840	lost_a_stat = 0;
3052		2841
3053	for (z = 0; z < num_stats_lose; z++)	2842	for (z = 0; z < num_stats_lose; z++)
3054	{	2843	{
3055	i = RANDOM () % NUM_STATS;	2844	i = RANDOM () % NUM_STATS;
3056		2845
3057	if (settings.stat_loss_on_death)	2846	if (settings.stat_loss_on_death)
3058	{	2847	{
3059	/* Pick a random stat and take a point off it. Tell the player	2848	/* Pick a random stat and take a point off it. Tell the player
3060	* what he lost.	2849	* what he lost.
3061	*/	2850	*/
3062	change_attr_value (&(op->stats), i, -1);	2851	change_attr_value (&(op->stats), i, -1);
3063	check_stat_bounds (&(op->stats));	2852	check_stat_bounds (&(op->stats));
3064	change_attr_value (&(op->contr->orig_stats), i, -1);	2853	change_attr_value (&(op->contr->orig_stats), i, -1);
3065	check_stat_bounds (&(op->contr->orig_stats));	2854	check_stat_bounds (&(op->contr->orig_stats));
3066	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2855	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3067	lost_a_stat = 1;	2856	lost_a_stat = 1;
		2857	}
		2858	else
		2859	{
		2860	/* deplete a stat */
		2861	archetype *deparch = archetype::find ("depletion");
		2862	object *dep;
		2863
		2864	dep = present_arch_in_ob (deparch, op);
		2865	if (!dep)
		2866	{
		2867	dep = arch_to_object (deparch);
		2868	insert_ob_in_ob (dep, op);
3068	}	2869	}
3069	else	2870	lose_this_stat = 1;
		2871	if (settings.balanced_stat_loss)
3070	{	2872	{
3071	/* deplete a stat */	2873	/* GD */
3072	archetype *deparch = archetype::find ("depletion");	2874	/* Get the stat that we're about to deplete. */
3073	object *dep;	2875	this_stat = get_attr_value (&(dep->stats), i);
3074		2876	if (this_stat < 0)
3075	dep = present_arch_in_ob (deparch, op);
3076	if (!dep)
3077	{	2877	{
3078	dep = arch_to_object (deparch);	2878	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3079	insert_ob_in_ob (dep, op);	2879	int keep_chance = this_stat * this_stat;
3080	}	2880
3081	lose_this_stat = 1;	2881	/* Yes, I am paranoid. Sue me. */
3082	if (settings.balanced_stat_loss)
3083	{
3084	/* GD */
3085	/* Get the stat that we're about to deplete. */
3086	this_stat = get_attr_value (&(dep->stats), i);
3087	if (this_stat < 0)	2882	if (keep_chance < 1)
		2883	keep_chance = 1;
		2884
		2885	/* There is a maximum depletion total per level. */
		2886	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3088	{	2887	{
3089	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3090	int keep_chance = this_stat * this_stat;
3091
3092	/* Yes, I am paranoid. Sue me. */
3093	if (keep_chance < 1)
3094	keep_chance = 1;
3095
3096	/* There is a maximum depletion total per level. */
3097	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3098	{
3099	lose_this_stat = 0;	2888	lose_this_stat = 0;
3100	/* Take loss chance vs keep chance to see if we	2889	/* Take loss chance vs keep chance to see if we
3101	retain the stat. */	2890	retain the stat. */
3102	}
3103	else
3104	{
3105	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3106	lose_this_stat = 0;
3107	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3108	this_stat, keep_chance, loss_chance,
3109	lose_this_stat?"LOSE":"KEEP"); */
3110	}
3111	}	2891	}
3112	}
3113
3114	if (lose_this_stat)
3115	{
3116	this_stat = get_attr_value (&(dep->stats), i);
3117	/* We could try to do something clever like find another
3118	* stat to reduce if this fails. But chances are, if
3119	* stats have been depleted to -50, all are pretty low
3120	* and should be roughly the same, so it shouldn't make a
3121	* difference.
3122	*/	2892	else
3123	if (this_stat >= -50)
3124	{	2893	{
3125	change_attr_value (&(dep->stats), i, -1);	2894	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3126	SET_FLAG (dep, FLAG_APPLIED);
3127	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3128	fix_player (op);
3129	lost_a_stat = 1;	2895	lose_this_stat = 0;
		2896	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2897	this_stat, keep_chance, loss_chance,
		2898	lose_this_stat?"LOSE":"KEEP"); */
3130	}	2899	}
3131	}	2900	}
3132	}	2901	}
		2902
		2903	if (lose_this_stat)
		2904	{
		2905	this_stat = get_attr_value (&(dep->stats), i);
		2906	/* We could try to do something clever like find another
		2907	* stat to reduce if this fails. But chances are, if
		2908	* stats have been depleted to -50, all are pretty low
		2909	* and should be roughly the same, so it shouldn't make a
		2910	* difference.
		2911	*/
		2912	if (this_stat >= -50)
		2913	{
		2914	change_attr_value (&(dep->stats), i, -1);
		2915	SET_FLAG (dep, FLAG_APPLIED);
		2916	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2917	op->update_stats ();
		2918	lost_a_stat = 1;
		2919	}
3133	}	2920	}
		2921	}
		2922	}
3134	/* If no stat lost, tell the player. */	2923	/* If no stat lost, tell the player. */
3135	if (!lost_a_stat)	2924	if (!lost_a_stat)
3136	{	2925	{
3137	/* determine_god() seems to not work sometimes... why is this?	2926	/* determine_god() seems to not work sometimes... why is this?
3138	Should I be using something else? GD */	2927	Should I be using something else? GD */
3139	const char *god = determine_god (op);	2928	const char *god = determine_god (op);
3140		2929
3141	if (god && (strcmp (god, "none")))	2930	if (god && (strcmp (god, "none")))
3142	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2931	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3143	else	2932	else
3144	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2933	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3145	}	2934	}
3146	#else	2935	#else
3147	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2936	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3148	#endif	2937	#endif
3149		2938
3150	/* Put a gravestone up where the character 'almost' died. List the	2939	/* Put a gravestone up where the character 'almost' died. List the
3151	* exp loss on the stone.	2940	* exp loss on the stone.
3152	*/	2941	*/
3153	tmp = arch_to_object (archetype::find ("gravestone"));	2942	tmp = arch_to_object (archetype::find ("gravestone"));
3154	sprintf (buf, "%s's gravestone", &op->name);	2943	sprintf (buf, "%s's gravestone", &op->name);
3155	tmp->name = buf;	2944	tmp->name = buf;
3156	sprintf (buf, "%s's gravestones", &op->name);	2945	sprintf (buf, "%s's gravestones", &op->name);
3157	tmp->name_pl = buf;	2946	tmp->name_pl = buf;
3158	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);	2947	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);
3159	tmp->msg = buf;	2948	tmp->msg = buf;
3160	tmp->x = op->x, tmp->y = op->y;	2949	tmp->x = op->x, tmp->y = op->y;
3161	insert_ob_in_map (tmp, op->map, NULL, 0);	2950	insert_ob_in_map (tmp, op->map, NULL, 0);
3162		2951
3163	/**************************************/	2952	/**************************************/
3164	/* */	2953	/* */
3165	/* Subtract the experience points, */	2954	/* Subtract the experience points, */
3166	/* if we died cause of food, give us */	2955	/* if we died cause of food, give us */
3167	/* food, and reset HP's... */	2956	/* food, and reset HP's... */
3168	/* */	2957	/* */
3169	/**************************************/	2958	/**************************************/
3170		2959
3171	/* remove any poisoning and confusion the character may be suffering. */	2960	/* remove any poisoning and confusion the character may be suffering. */
3172	/* restore player */	2961	/* restore player */
3173	at = archetype::find ("poisoning");	2962	at = archetype::find ("poisoning");
3174	tmp = present_arch_in_ob (at, op);	2963	tmp = present_arch_in_ob (at, op);
3175		2964
3176	if (tmp)	2965	if (tmp)
3177	{	2966	{
3178	tmp->destroy ();	2967	tmp->destroy ();
3179	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2968	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3180	}	2969	}
3181		2970
3182	at = archetype::find ("confusion");	2971	at = archetype::find ("confusion");
3183	tmp = present_arch_in_ob (at, op);	2972	tmp = present_arch_in_ob (at, op);
3184	if (tmp)	2973	if (tmp)
3185	{	2974	{
3186	tmp->destroy ();	2975	tmp->destroy ();
3187	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2976	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3188	}	2977	}
3189		2978
3190	cure_disease (op, 0); /* remove any disease */	2979	cure_disease (op, 0); /* remove any disease */
3191		2980
3192	/*add_exp(op, (op->stats.exp * -0.20)); */	2981	/*add_exp(op, (op->stats.exp * -0.20)); */
3193	apply_death_exp_penalty (op);	2982	apply_death_exp_penalty (op);
3194	if (op->stats.food < 100)	2983	if (op->stats.food < 100)
3195	op->stats.food = 900;	2984	op->stats.food = 900;
3196	op->stats.hp = op->stats.maxhp;	2985	op->stats.hp = op->stats.maxhp;
3197	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2986	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3198	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2987	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3199		2988
3200	/*	2989	/*
3201	* Check to see if the player is in a shop. IF so, then check to see if	2990	* Check to see if the player is in a shop. IF so, then check to see if
3202	* the player has any unpaid items. If so, remove them and put them back	2991	* the player has any unpaid items. If so, remove them and put them back
3203	* in the map.	2992	* in the map.
3204	*/	2993	*/
3205		2994
3206	if (is_in_shop (op))	2995	if (is_in_shop (op))
3207	remove_unpaid_objects (op->inv, op);	2996	remove_unpaid_objects (op->inv, op);
3208		2997
3209	/****************************************/	2998	/****************************************/
3210	/* */	2999	/* */
3211	/* Move player to his current respawn- */	3000	/* Move player to his current respawn- */
3212	/* position (usually last savebed) */	3001	/* position (usually last savebed) */
3213	/* */	3002	/* */
3214	/****************************************/	3003	/****************************************/
3215		3004
3216	enter_player_savebed (op);	3005	enter_player_savebed (op);
3217		3006
3218	/* Save the player before inserting the force to reduce	3007	/* Save the player before inserting the force to reduce
3219	* chance of abuse.	3008	* chance of abuse.
3220	*/	3009	*/
3221	op->contr->braced = 0;	3010	op->contr->braced = 0;
3222	save_player (op, 1);	3011	op->contr->save ();
3223		3012
3224	/* it is possible that the player has blown something up	3013	/* it is possible that the player has blown something up
3225	* at his savebed location, and that can have long lasting	3014	* at his savebed location, and that can have long lasting
3226	* spell effects. So first see if there is a spell effect	3015	* spell effects. So first see if there is a spell effect
3227	* on the space that might harm the player.	3016	* on the space that might harm the player.
3228	*/	3017	*/
3229	will_kill_again = 0;	3018	will_kill_again = 0;
3230	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)	3019	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3231	if (tmp->type == SPELL_EFFECT)	3020	if (tmp->type == SPELL_EFFECT)
3232	will_kill_again |= tmp->attacktype;	3021	will_kill_again |= tmp->attacktype;
3233		3022
3234	if (will_kill_again)	3023	if (will_kill_again)
3235	{	3024	{
3236	object *force;	3025	object *force;
3237	int at;	3026	int at;
3238		3027
3239	force = get_archetype (FORCE_NAME);	3028	force = get_archetype (FORCE_NAME);
3240	/* 50 ticks should be enough time for the spell to abate */	3029	/* 50 ticks should be enough time for the spell to abate */
3241	force->speed = 0.1;	3030	force->speed = 0.1;
3242	force->speed_left = -5.0;	3031	force->speed_left = -5.0;
3243	SET_FLAG (force, FLAG_APPLIED);	3032	SET_FLAG (force, FLAG_APPLIED);
3244	for (at = 0; at < NROFATTACKS; at++)	3033	for (at = 0; at < NROFATTACKS; at++)
3245	if (will_kill_again & (1 << at))	3034	if (will_kill_again & (1 << at))
3246	force->resist[at] = 100;	3035	force->resist[at] = 100;
3247		3036
3248	insert_ob_in_ob (force, op);	3037	insert_ob_in_ob (force, op);
3249	fix_player (op);	3038	op->update_stats ();
3250		3039
3251	}	3040	}
3252		3041
3253	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	3042	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3254	return;
3255	} /* NOT_PERMADETH */
3256	else
3257	{
3258	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3259	* should probably be embedded in an else statement.
3260	*/
3261
3262	op->contr->party = NULL;
3263	if (settings.set_title == TRUE)
3264	op->contr->own_title[0] = '\0';
3265	new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3266	check_score (op);
3267
3268	if (op->contr->ranges[range_golem])
3269	{
3270	remove_friendly_object (op->contr->ranges[range_golem]);
3271	op->contr->ranges[range_golem]->destroy ();
3272	op->contr->ranges[range_golem] = 0;
3273	}
3274
3275	loot_object (op); /* Remove some of the items for good */
3276	op->remove ();
3277	op->direction = 0;
3278
3279	if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3280	{
3281	delete_character (op->name, 0);
3282	if (settings.resurrection == TRUE)
3283	{
3284	/* save playerfile sans equipment when player dies
3285	** then save it as player.pl.dead so that future resurrection
3286	** type spells will work on them nicely
3287	*/
3288	delete_character (op->name, 0);
3289	op->stats.hp = op->stats.maxhp;
3290	op->stats.food = 999;
3291
3292	/* set the location of where the person will reappear when */
3293	/* maybe resurrection code should fix map also */
3294	strcpy (op->contr->maplevel, settings.emergency_mapname);
3295	if (op->map != NULL)
3296	op->map = NULL;
3297	op->x = settings.emergency_x;
3298	op->y = settings.emergency_y;
3299	save_player (op, 0);
3300	op->map = map;
3301	/* please see resurrection.c: peterm */
3302	dead_player (op);
3303	}
3304	else
3305	delete_character (op->name, 1);
3306	}
3307
3308	play_again (op);
3309
3310	/* peterm: added to create a corpse at deathsite. */
3311	tmp = arch_to_object (archetype::find ("corpse_pl"));
3312	sprintf (buf, "%s", &op->name);
3313	tmp->name = tmp->name_pl = buf;
3314	tmp->level = op->level;
3315	tmp->x = x;
3316	tmp->y = y;
3317	tmp->msg = gravestone_text (op);
3318	SET_FLAG (tmp, FLAG_UNIQUE);
3319	insert_ob_in_map (tmp, map, NULL, 0);
3320	}
3321	}	3043	}
3322
3323		3044
3324	void	3045	void
3325	loot_object (object *op)	3046	loot_object (object *op)
3326	{ /* Grab and destroy some treasure */	3047	{ /* Grab and destroy some treasure */
3327	object *tmp, *tmp2, *next;	3048	object *tmp, *tmp2, *next;
3328		3049
3329	if (op->container)	3050	if (op->container)
3330	{ /* close open sack first */
3331	esrv_apply_container (op, op->container);	3051	esrv_apply_container (op, op->container); /* close open sack first */
3332	}
3333		3052
3334	for (tmp = op->inv; tmp != NULL; tmp = next)	3053	for (tmp = op->inv; tmp; tmp = next)
3335	{	3054	{
3336	next = tmp->below;	3055	next = tmp->below;
		3056
3337	if (tmp->invisible)	3057	if (tmp->invisible)
3338	continue;	3058	continue;
		3059
3339	tmp->remove ();	3060	tmp->remove ();
3340	tmp->x = op->x, tmp->y = op->y;	3061	tmp->x = op->x, tmp->y = op->y;
3341	if (tmp->type == CONTAINER)	3062	if (tmp->type == CONTAINER)
3342	{ /* empty container to ground */	3063	{ /* empty container to ground */
3343	loot_object (tmp);	3064	loot_object (tmp);
…		…
3365	*/	3086	*/
3366		3087
3367	void	3088	void
3368	fix_weight (void)	3089	fix_weight (void)
3369	{	3090	{
3370	player *pl;	3091	for_all_players (pl)
3371
3372	for (pl = first_player; pl != NULL; pl = pl->next)
3373	{	3092	{
3374	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3093	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3375		3094
3376	if (old == sum)	3095	if (old == sum)
3377	continue;	3096	continue;
3378	fix_player (pl->ob);	3097	pl->ob->update_stats ();
3379	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	3098	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3380	}	3099	}
3381	}	3100	}
3382		3101
3383	void	3102	void
3384	fix_luck (void)	3103	fix_luck (void)
3385	{	3104	{
3386	player *pl;	3105	for_all_players (pl)
3387
3388	for (pl = first_player; pl != NULL; pl = pl->next)
3389	if (!pl->ob->contr->ns->state)	3106	if (!pl->ob->contr->ns->state)
3390	change_luck (pl->ob, 0);	3107	pl->ob->change_luck (0);
3391	}	3108	}
3392
3393		3109
3394	/* cast_dust() - handles op throwing objects of type 'DUST'.	3110	/* cast_dust() - handles op throwing objects of type 'DUST'.
3395	* This is much simpler in the new spell code - we basically	3111	* This is much simpler in the new spell code - we basically
3396	* just treat this as any other spell casting object.	3112	* just treat this as any other spell casting object.
3397	*/	3113	*/
3398
3399	void	3114	void
3400	cast_dust (object *op, object *throw_ob, int dir)	3115	cast_dust (object *op, object *throw_ob, int dir)
3401	{	3116	{
3402	object *skop, *spob;	3117	object *skop, *spob;
3403		3118

Diff Legend

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