ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.48 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.68 by root, Tue Dec 26 09:52:40 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	ob->set_speed (ob->speed);
		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->socket->monitor_spells; // what a hack
250	p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
251	roll_stats (op);
252	p->socket->monitor_spells = oldmon;
253	}
254	p->state = ST_ROLL_STAT;
255	clear_los (op);
256
257	p->gen_sp_armour = 10;	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->socket->update_look = 0;
292	p->socket->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	ob->destroy ();
		348
		349	if (ns)
		350	{
		351	client *ns = this->ns;
		352	ns->send_packet ("goodbye");
		353	ns->flush ();
		354	ns->pl = 0;
		355	this->ns = 0;
		356	ns->destroy ();
		357	}
		358	}
		359
		360	player::~player ()
		361	{
		362	/* Clear item stack */
		363	free (stack_items);
		364	}
		365
307	/* Tries to add player on the connection passwd in ns.	366	/* 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	367	* All we can really get in this is some settings like host and display
309	* mode.	368	* mode.
310	*/	369	*/
311		370	player *
312	int	371	player::create ()
313	add_player (client *ns)
314	{	372	{
315	player *p = new player;	373	player *pl = new player;
316		374
317	p->socket = ns;	375	pl->set_object (arch_to_object (get_player_archetype (0)));
318	ns->pl = p;
319		376
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	get_name (p->ob);
333
334	return 0;	377	return pl;
335	}	378	}
336		379
337	/*	380	/*
338	* get_player_archetype() return next player archetype from archetype	381	* get_player_archetype() return next player archetype from archetype
339	* list. Not very efficient routine, but used only creating new players.	382	* list. Not very efficient routine, but used only creating new players.
…		…
364		407
365	object *	408	object *
366	get_nearest_player (object *mon)	409	get_nearest_player (object *mon)
367	{	410	{
368	object *op = NULL;	411	object *op = NULL;
369	player *pl = NULL;
370	objectlink *ol;	412	objectlink *ol;
371	unsigned lastdist;	413	unsigned lastdist;
372	rv_vector rv;	414	rv_vector rv;
373		415
374	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	416	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
…		…
406	{	448	{
407	op = ol->ob;	449	op = ol->ob;
408	lastdist = rv.distance;	450	lastdist = rv.distance;
409	}	451	}
410	}	452	}
411	for (pl = first_player; pl != NULL; pl = pl->next)	453
412	{	454	for_all_players (pl)
413	if (can_detect_enemy (mon, pl->ob, &rv))	455	if (can_detect_enemy (mon, pl->ob, &rv))
414	{
415
416	if (lastdist > rv.distance)	456	if (lastdist > rv.distance)
417	{	457	{
418	op = pl->ob;	458	op = pl->ob;
419	lastdist = rv.distance;	459	lastdist = rv.distance;
420	}	460	}
421	}	461
422	}
423	#if 0	462	#if 0
424	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");	463	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
425	#endif	464	#endif
426	return op;	465	return op;
427	}	466	}
…		…
445	* circling behaviour. Unfortunately, this function is also used to determined	484	* circling behaviour. Unfortunately, this function is also used to determined
446	* if the creature should cast a spell, so returning a direction in that case	485	* if the creature should cast a spell, so returning a direction in that case
447	* is probably not a good thing.	486	* is probably not a good thing.
448	*/	487	*/
449	#define MAX_SPACES 50	488	#define MAX_SPACES 50
450
451		489
452	/*	490	/*
453	* Returns the direction to the player, if valid. Returns 0 otherwise.	491	* Returns the direction to the player, if valid. Returns 0 otherwise.
454	* modified to verify there is a path to the player. Does this by stepping towards	492	* modified to verify there is a path to the player. Does this by stepping towards
455	* player and if path is blocked then see if blockage is close enough to player that	493	* player and if path is blocked then see if blockage is close enough to player that
…		…
694	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
695	link_player_skills (pl);	733	link_player_skills (pl);
696	}	734	}
697		735
698	void	736	void
699	get_name (object *op)
700	{
701	op->contr->write_buf[0] = '\0';
702	op->contr->state = ST_GET_NAME;
703	send_query (op->contr->socket, 0, "What is your name?\n:");
704	}
705
706	void
707	get_password (object *op)
708	{
709	op->contr->write_buf[0] = '\0';
710	op->contr->state = ST_GET_PASSWORD;
711	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
712	}
713
714	void
715	play_again (object *op)
716	{
717	op->contr->state = ST_PLAY_AGAIN;
718	op->chosen_skill = NULL;
719	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
720	/* a bit of a hack, but there are various places early in th
721	* player creation process that a user can quit (eg, roll
722	* stats) that isn't removing the player. Taking a quick
723	* look, there are many places that call play_again without
724	* removing the player - it probably makes more sense
725	* to leave it to play_again to remove the object in all
726	* cases.
727	*/
728	if (!QUERY_FLAG (op, FLAG_REMOVED))
729	op->remove ();
730	/* Need to set this to null - otherwise, it could point to garbage,
731	* and draw() doesn't check to see if the player is removed, only if
732	* the map is null or not swapped out.
733	*/
734	op->map = NULL;
735	}
736
737	int
738	receive_play_again (object *op, char key)
739	{
740	if (key == 'q' || key == 'Q')
741	{
742	remove_friendly_object (op);
743	leave (op->contr, 0); /* ericserver will draw the message */
744	return 2;
745	}
746	else if (key == 'a' || key == 'A')
747	{
748	player *pl = op->contr;
749	shstr name = op->name;
750
751	op->contr = 0;
752	op->type = 0;
753	op->destroy (1);
754	pl = get_player (pl);
755	op = pl->ob;
756	add_friendly_object (op);
757	op->contr->password[0] = '~';
758	op->name = op->name_pl = 0;
759	/* Lets put a space in here */
760	new_draw_info (NDI_UNIQUE, 0, op, "\n");
761	get_name (op);
762	op->name = op->name_pl = name;
763	set_first_map (op);
764	}
765	else
766	/* user pressed something else so just ask again... */
767	play_again (op);
768
769	return 0;
770	}
771
772	void
773	confirm_password (object *op)
774	{
775
776	op->contr->write_buf[0] = '\0';
777	op->contr->state = ST_CONFIRM_PASSWORD;
778	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
779	}
780
781	void
782	get_party_password (object *op, partylist *party)	737	get_party_password (object *op, partylist *party)
783	{	738	{
784	if (party == NULL)	739	if (party == NULL)
785	{	740	{
786	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);	741	LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
787	return;	742	return;
788	}	743	}
		744
789	op->contr->write_buf[0] = '\0';	745	op->contr->write_buf[0] = '\0';
790	op->contr->state = ST_GET_PARTY_PASSWORD;	746	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
791	op->contr->party_to_join = party;	747	op->contr->party_to_join = party;
792	send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");	748	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
793	}	749	}
794
795		750
796	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	751	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
797	int	752	static int
798	roll_stat (void)	753	roll_stat (void)
799	{	754	{
800	int a[4], i, j, k;	755	int a[4], i, j, k;
801		756
802	for (i = 0; i < 4; i++)	757	for (i = 0; i < 4; i++)
…		…
805	for (i = 0, j = 0, k = 7; i < 4; i++)	760	for (i = 0, j = 0, k = 7; i < 4; i++)
806	if (a[i] < k)	761	if (a[i] < k)
807	k = a[i], j = i;	762	k = a[i], j = i;
808		763
809	for (i = 0, k = 0; i < 4; i++)	764	for (i = 0, k = 0; i < 4; i++)
810	{
811	if (i != j)	765	if (i != j)
812	k += a[i];	766	k += a[i];
813	}	767
814	return k;	768	return k;
815	}	769	}
816		770
817	void	771	void
818	roll_stats (object *op)	772	object::roll_stats ()
819	{	773	{
820	int sum = 0;
821	int i = 0, j = 0;
822	int statsort[7];	774	int statsort [7];
823		775
824	do	776	for (;;)
825	{
826	op->stats.Str = roll_stat ();
827	op->stats.Dex = roll_stat ();
828	op->stats.Int = roll_stat ();
829	op->stats.Con = roll_stat ();
830	op->stats.Wis = roll_stat ();
831	op->stats.Pow = roll_stat ();
832	op->stats.Cha = roll_stat ();
833	sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
834	}	777	{
835	while (sum < 82 || sum > 116);	778	int sum = 0;
		779	for (int i = 7; i--; )
		780	sum += statsort [i] = roll_stat ();
836		781
		782	if (sum >= 82 && sum <= 116)
		783	break;
		784	}
		785
837	/* Sort the stats so that rerolling is easier... */	786	// Sort the stats so that rerolling is easier...
838	statsort[0] = op->stats.Str;	787	std::sort (statsort, statsort + 7, std::greater<int>());
839	statsort[1] = op->stats.Dex;
840	statsort[2] = op->stats.Int;
841	statsort[3] = op->stats.Con;
842	statsort[4] = op->stats.Wis;
843	statsort[5] = op->stats.Pow;
844	statsort[6] = op->stats.Cha;
845		788
846	/* a quick and dirty bubblesort? */
847	do
848	{
849	if (statsort[i] < statsort[i + 1])
850	{
851	j = statsort[i];
852	statsort[i] = statsort[i + 1];
853	statsort[i + 1] = j;
854	i = 0;
855	}
856	else
857	{
858	i++;
859	}
860	}
861	while (i < 6);
862
863	op->stats.Str = statsort[0];	789	stats.Str = statsort[0];
864	op->stats.Dex = statsort[1];	790	stats.Dex = statsort[1];
865	op->stats.Con = statsort[2];	791	stats.Con = statsort[2];
866	op->stats.Int = statsort[3];	792	stats.Int = statsort[3];
867	op->stats.Wis = statsort[4];	793	stats.Wis = statsort[4];
868	op->stats.Pow = statsort[5];	794	stats.Pow = statsort[5];
869	op->stats.Cha = statsort[6];	795	stats.Cha = statsort[6];
870		796
871
872	op->contr->orig_stats.Str = op->stats.Str;
873	op->contr->orig_stats.Dex = op->stats.Dex;
874	op->contr->orig_stats.Int = op->stats.Int;
875	op->contr->orig_stats.Con = op->stats.Con;
876	op->contr->orig_stats.Wis = op->stats.Wis;
877	op->contr->orig_stats.Pow = op->stats.Pow;
878	op->contr->orig_stats.Cha = op->stats.Cha;
879
880	op->level = 1;
881	op->stats.exp = 0;	797	stats.exp = 0;
882	op->stats.ac = 0;	798	stats.ac = 0;
883		799
884	op->contr->levhp[1] = 9;
885	op->contr->levsp[1] = 6;
886	op->contr->levgrace[1] = 3;
887
888	fix_player (op);
889	op->stats.hp = op->stats.maxhp;	800	stats.hp = stats.maxhp;
890	op->stats.sp = op->stats.maxsp;	801	stats.sp = stats.maxsp;
891	op->stats.grace = op->stats.maxgrace;	802	stats.grace = stats.maxgrace;
		803
		804	if (contr)
		805	{
		806	contr->levhp[1] = 9;
		807	contr->levsp[1] = 6;
		808	contr->levgrace[1] = 3;
		809
892	op->contr->orig_stats = op->stats;	810	contr->orig_stats = stats;
		811	}
893	}	812	}
894		813
895	void	814	void
896	Roll_Again (object *op)	815	object::swap_stats (int a, int b)
897	{	816	{
898	esrv_new_player (op->contr, 0);
899	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
900	"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
901	}
902
903	void
904	Swap_Stat (object *op, int Swap_Second)
905	{
906	signed char tmp;
907	char buf[MAX_BUF];
908
909	if (op->contr->Swap_First == -1)
910	{
911	new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
912	new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
913	new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
914	return;
915	}
916
917	tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);	817	int tmp = get_attr_value (&contr->orig_stats, a);
918
919	set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));	818	set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
920
921	set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);	819	set_attr_value (&contr->orig_stats, b, tmp);
922		820
923	sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
924	new_draw_info (NDI_UNIQUE, 0, op, buf);
925	op->stats.Str = op->contr->orig_stats.Str;	821	stats.Str = contr->orig_stats.Str;
926	op->stats.Dex = op->contr->orig_stats.Dex;	822	stats.Dex = contr->orig_stats.Dex;
927	op->stats.Con = op->contr->orig_stats.Con;	823	stats.Con = contr->orig_stats.Con;
928	op->stats.Int = op->contr->orig_stats.Int;	824	stats.Int = contr->orig_stats.Int;
929	op->stats.Wis = op->contr->orig_stats.Wis;	825	stats.Wis = contr->orig_stats.Wis;
930	op->stats.Pow = op->contr->orig_stats.Pow;	826	stats.Pow = contr->orig_stats.Pow;
931	op->stats.Cha = op->contr->orig_stats.Cha;	827	stats.Cha = contr->orig_stats.Cha;
		828
		829	//TODO: the following code looks so borked and should, at the very least,
		830	// be merged with the similar code in roll_stats
932	op->stats.ac = 0;	831	stats.ac = 0;
933		832
934	op->level = 1;	833	level = 1;
935	op->stats.exp = 0;	834	stats.exp = 0;
936	op->stats.ac = 0;	835	stats.ac = 0;
937		836
938	op->contr->levhp[1] = 9;
939	op->contr->levsp[1] = 6;
940	op->contr->levgrace[1] = 3;
941
942	fix_player (op);
943	op->stats.hp = op->stats.maxhp;	837	stats.hp = stats.maxhp;
944	op->stats.sp = op->stats.maxsp;	838	stats.sp = stats.maxsp;
945	op->stats.grace = op->stats.maxgrace;	839	stats.grace = stats.maxgrace;
		840
		841	if (contr)
		842	{
		843	contr->levhp[1] = 9;
		844	contr->levsp[1] = 6;
		845	contr->levgrace[1] = 3;
		846
946	op->contr->orig_stats = op->stats;	847	contr->orig_stats = stats;
947	op->contr->Swap_First = -1;
948	}
949
950
951	/* This code has been greatly reduced, because with set_attr_value
952	* and get_attr_value, the stats can be accessed just numeric
953	* ids. stat_trans is a table that translate the number entered
954	* into the actual stat. It is needed because the order the stats
955	* are displayed in the stat window is not the same as how
956	* the number's access that stat. The table does that translation.
957	*/
958	int
959	key_roll_stat (object *op, char key)
960	{
961	int keynum = key - '0';
962	char buf[MAX_BUF];
963	static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
964
965	if (keynum > 0 && keynum <= 7)
966	{	848	}
967	if (op->contr->Swap_First == -1)
968	{
969	op->contr->Swap_First = stat_trans[keynum];
970	sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
971	new_draw_info (NDI_UNIQUE, 0, op, buf);
972	}
973	else
974	Swap_Stat (op, stat_trans[keynum]);
975
976	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
977	return 1;
978	}
979	switch (key)
980	{
981	case 'n':
982	case 'N':
983	{
984	SET_FLAG (op, FLAG_WIZ);
985	if (op->map == NULL)
986	{
987	LOG (llevError, "Map == NULL in state 2\n");
988	break;
989	}
990
991	#if 0
992	/* So that enter_exit will put us at startx/starty */
993	op->x = -1;
994
995	enter_exit (op, NULL);
996	#endif
997	SET_ANIMATION (op, 2); /* So player faces south */
998	/* Enter exit adds a player otherwise */
999	add_statbonus (op);
1000	send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
1001	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1002	op->contr->state = ST_CHANGE_CLASS;
1003	if (op->msg)
1004	new_draw_info (NDI_BLUE, 0, op, op->msg);
1005	return 0;
1006	}
1007	case 'y':
1008	case 'Y':
1009	roll_stats (op);
1010	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1011	return 1;
1012
1013	case 'q':
1014	case 'Q':
1015	play_again (op);
1016	return 1;
1017
1018	default:
1019	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1020	return 0;
1021	}
1022	return 0;
1023	}	849	}
1024		850
1025	/* This function takes the key that is passed, and does the	851	/* This function takes the key that is passed, and does the
1026	* appropriate action with it (change race, or other things).	852	* appropriate action with it (change race, or other things).
1027	* The function name is for historical reasons - now we have	853	* The function name is for historical reasons - now we have
1028	* separate race and class; this actually changes the RACE,	854	* separate race and class; this actually changes the RACE,
1029	* not the class.	855	* not the class.
1030	*/	856	*/
1031
1032	int	857	int
1033	key_change_class (object *op, char key)	858	key_change_class (object *op, char key)
1034	{	859	{
1035	int tmp_loop;	860	int tmp_loop;
1036		861
1037	if (key == 'q' || key == 'Q')
1038	{
1039	op->remove ();
1040	play_again (op);
1041	return 0;
1042	}
1043	if (key == 'd' || key == 'D')	862	if (key == 'd' || key == 'D')
1044	{	863	{
1045	char buf[MAX_BUF];	864	char buf[MAX_BUF];
1046		865
1047	/* this must before then initial items are given */	866	/* this must before then initial items are given */
…		…
1052	create_treasure (tl, op, 0, 0, 0);	871	create_treasure (tl, op, 0, 0, 0);
1053		872
1054	INVOKE_PLAYER (BIRTH, op->contr);	873	INVOKE_PLAYER (BIRTH, op->contr);
1055	INVOKE_PLAYER (LOGIN, op->contr);	874	INVOKE_PLAYER (LOGIN, op->contr);
1056		875
1057	op->contr->state = ST_PLAYING;	876	op->contr->ns->state = ST_PLAYING;
1058		877
1059	if (op->msg)	878	if (op->msg)
1060	op->msg = NULL;	879	op->msg = NULL;
1061		880
1062	/* We create this now because some of the unique maps will need it	881	/* We create this now because some of the unique maps will need it
…		…
1071	start_info (op);	890	start_info (op);
1072	CLEAR_FLAG (op, FLAG_WIZ);	891	CLEAR_FLAG (op, FLAG_WIZ);
1073	give_initial_items (op, op->randomitems);	892	give_initial_items (op, op->randomitems);
1074	link_player_skills (op);	893	link_player_skills (op);
1075	esrv_send_inventory (op, op);	894	esrv_send_inventory (op, op);
1076	fix_player (op);	895	op->update_stats ();
1077		896
1078	/* This moves the player to a different start map, if there	897	/* This moves the player to a different start map, if there
1079	* is one for this race	898	* is one for this race
1080	*/	899	*/
1081	if (*first_map_ext_path)	900	if (*first_map_ext_path)
…		…
1107	while (!tmp_loop)	926	while (!tmp_loop)
1108	{	927	{
1109	shstr name = op->name;	928	shstr name = op->name;
1110	int x = op->x, y = op->y;	929	int x = op->x, y = op->y;
1111		930
1112	remove_statbonus (op);	931	op->remove_statbonus ();
1113	op->remove ();	932	op->remove ();
1114	op->arch = get_player_archetype (op->arch);	933	op->arch = get_player_archetype (op->arch);
1115	op->arch->clone.copy_to (op);	934	op->arch->clone.copy_to (op);
1116	op->instantiate ();	935	op->instantiate ();
1117	op->stats = op->contr->orig_stats;	936	op->stats = op->contr->orig_stats;
…		…
1119	op->x = x;	938	op->x = x;
1120	op->y = y;	939	op->y = y;
1121	SET_ANIMATION (op, 2); /* So player faces south */	940	SET_ANIMATION (op, 2); /* So player faces south */
1122	insert_ob_in_map (op, op->map, op, 0);	941	insert_ob_in_map (op, op->map, op, 0);
1123	assign (op->contr->title, op->arch->clone.name);	942	assign (op->contr->title, op->arch->clone.name);
1124	add_statbonus (op);	943	op->add_statbonus ();
1125	tmp_loop = allowed_class (op);	944	tmp_loop = allowed_class (op);
1126	}	945	}
1127		946
1128	update_object (op, UP_OBJ_FACE);	947	update_object (op, UP_OBJ_FACE);
1129	esrv_update_item (UPD_FACE, op, op);	948	esrv_update_item (UPD_FACE, op, op);
1130	fix_player (op);	949	op->update_stats ();
1131	op->stats.hp = op->stats.maxhp;	950	op->stats.hp = op->stats.maxhp;
1132	op->stats.sp = op->stats.maxsp;	951	op->stats.sp = op->stats.maxsp;
1133	op->stats.grace = 0;	952	op->stats.grace = 0;
1134		953
1135	if (op->msg)	954	if (op->msg)
1136	new_draw_info (NDI_BLUE, 0, op, op->msg);	955	new_draw_info (NDI_BLUE, 0, op, op->msg);
1137		956
1138	send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	957	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1139	return 0;	958	return 0;
1140	}	959	}
1141		960
1142	int	961	int
1143	key_confirm_quit (object *op, char key)	962	key_confirm_quit (object *op, char key)
1144	{	963	{
1145	char buf[MAX_BUF];
1146
1147	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')	964	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1148	{	965	{
1149	op->contr->state = ST_PLAYING;	966	op->contr->ns->state = ST_PLAYING;
1150	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");	967	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1151	return 1;	968	return 1;
1152	}	969	}
1153		970
1154	INVOKE_PLAYER (LOGOUT, op->contr);	971	INVOKE_PLAYER (LOGOUT, op->contr);
1155	INVOKE_PLAYER (QUIT, op->contr);	972	INVOKE_PLAYER (QUIT, op->contr);
		973
		974	op->contr->enable_save = false;
1156		975
1157	terminate_all_pets (op);	976	terminate_all_pets (op);
1158	leave_map (op);	977	leave_map (op);
1159	op->direction = 0;	978	op->direction = 0;
1160	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);	979	new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1161		980
1162	strcpy (op->contr->killer, "quit");	981	strcpy (op->contr->killer, "quit");
1163	check_score (op);	982	check_score (op);
1164	op->contr->party = NULL;	983	op->contr->party = 0;
1165	if (settings.set_title == TRUE)
1166	op->contr->own_title[0] = '\0';	984	op->contr->own_title[0] = '\0';
1167		985
1168	if (!QUERY_FLAG (op, FLAG_WAS_WIZ))	986	object_ptr ob = op;
1169	{
1170	maptile *mp, *next;
1171		987
1172	/* We need to hunt for any per player unique maps in memory and	988	/* We need to hunt for any per player unique maps in memory and
1173	* get rid of them. The trailing slash in the path is intentional,	989	* get rid of them. The trailing slash in the path is intentional,
1174	* so that players named 'Ab' won't match against players 'Abe' pathname	990	* so that players named 'Ab' won't match against players 'Abe' pathname
1175	*/	991	*/
		992	char buf[MAX_BUF];
1176	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);	993	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1177	for (mp = first_map; mp != NULL; mp = next)	994
1178	{	995	for (maptile *next, *mp = first_map; mp; mp = next)
		996	{
1179	next = mp->next;	997	next = mp->next;
		998
1180	if (!strncmp (mp->path, buf, strlen (buf)))	999	if (!strncmp (mp->path, buf, strlen (buf)))
1181	delete_map (mp);	1000	delete_map (mp);
1182	}	1001	}
1183		1002
1184	delete_character (op->name, 1);	1003	delete_character (ob->name, 1);
1185	}	1004	ob->contr->destroy ();
1186		1005
1187	play_again (op);
1188	return 1;	1006	return 1;
1189	}	1007	}
1190		1008
1191	void	1009	void
1192	flee_player (object *op)	1010	flee_player (object *op)
…		…
1223	{	1041	{
1224	op->enemy = NULL;	1042	op->enemy = NULL;
1225	CLEAR_FLAG (op, FLAG_SCARED);	1043	CLEAR_FLAG (op, FLAG_SCARED);
1226	return;	1044	return;
1227	}	1045	}
		1046
1228	get_rangevector (op, op->enemy, &rv, 0);	1047	get_rangevector (op, op->enemy, &rv, 0);
1229		1048
1230	dir = absdir (4 + rv.direction);	1049	dir = absdir (4 + rv.direction);
1231	for (diff = 0; diff < 3; diff++)	1050	for (diff = 0; diff < 3; diff++)
1232	{	1051	{
1233	int m = 1 - (RANDOM () & 2);	1052	int m = 1 - (RANDOM () & 2);
1234		1053
1235	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	1054	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1236	{
1237	return;	1055	return;
1238	}
1239	}	1056	}
		1057
1240	/* Cornered, get rid of scared */	1058	/* Cornered, get rid of scared */
1241	CLEAR_FLAG (op, FLAG_SCARED);	1059	CLEAR_FLAG (op, FLAG_SCARED);
1242	op->enemy = NULL;	1060	op->enemy = NULL;
1243	}	1061	}
1244		1062
…		…
1330	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1148	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1331	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1149	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1332	else	1150	else
1333	sprintf (putstring, "item name: %s item type: %d weight/value: %d",	1151	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1334	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1152	&tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1153
1335	new_draw_info (NDI_UNIQUE, 0, op, putstring);	1154	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1336
1337	sprintf (putstring, "...flags: ");
1338	for (k = 0; k < 4; k++)
1339	{
1340	for (j = 0; j < 32; j++)
1341	{
1342	if ((tmp->flags[k] >> j) & 0x01)
1343	{
1344	sprintf (tmpstr, "%d ", k * 32 + j);
1345	strcat (putstring, tmpstr);
1346	}
1347	}
1348	}
1349	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1350
1351	#if 0
1352	/* print the flags too */
1353	for (k = 0; k < 4; k++)
1354	{
1355	fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1356	for (j = 0; j < 32; j++)
1357	{
1358	fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1359	if (!((j + 1) % 4))
1360	fprintf (stderr, " ");
1361	}
1362	fprintf (stderr, " [%d]\n", k * 32);
1363	}
1364	#endif
1365	}	1155	}
		1156
1366	/* philosophy:	1157	/* philosophy:
1367	* It's easy to grab an item type from a pile, as long as it's	1158	* It's easy to grab an item type from a pile, as long as it's
1368	* generic. This takes no game-time. For more detailed pickups	1159	* generic. This takes no game-time. For more detailed pickups
1369	* and selections, select-items shoul dbe used. This is a	1160	* and selections, select-items should be used. This is a
1370	* grab-as-you-run type mode that's really useful for arrows for	1161	* grab-as-you-run type mode that's really useful for arrows for
1371	* example.	1162	* example.
1372	* The drawback: right now it has no frontend, so you need to	1163	* The drawback: right now it has no frontend, so you need to
1373	* stick the bits you want into a calculator in hex mode and then	1164	* stick the bits you want into a calculator in hex mode and then
1374	* convert to decimal and then 'pickup <#>	1165	* convert to decimal and then 'pickup <#>
…		…
1882	arrow->y = sy;	1673	arrow->y = sy;
1883		1674
1884	if (op->type == PLAYER)	1675	if (op->type == PLAYER)
1885	{	1676	{
1886	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1677	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1887	fix_player (op);	1678	op->update_stats ();
1888	}	1679	}
1889		1680
1890	SET_ANIMATION (arrow, arrow->direction);	1681	SET_ANIMATION (arrow, arrow->direction);
1891	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1682	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1892	arrow->stats.hp = arrow->stats.dam;	1683	arrow->stats.hp = arrow->stats.dam;
…		…
1902		1693
1903	/* update the speed */	1694	/* update the speed */
1904	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1695	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1905	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;	1696	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1906		1697
1907	if (arrow->speed < 1.0)	1698	arrow->set_speed (max (arrow->speed, 1.0));
1908	arrow->speed = 1.0;
1909	update_ob_speed (arrow);
1910	arrow->speed_left = 0;	1699	arrow->speed_left = 0;
1911		1700
1912	if (op->type == PLAYER)	1701	if (op->type == PLAYER)
1913	{	1702	{
1914	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1703	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
2047		1836
2048	if (item->arch)	1837	if (item->arch)
2049	{	1838	{
2050	CLEAR_FLAG (item, FLAG_ANIMATE);	1839	CLEAR_FLAG (item, FLAG_ANIMATE);
2051	item->face = item->arch->clone.face;	1840	item->face = item->arch->clone.face;
2052	item->speed = 0;	1841	item->set_speed (0);
2053	update_ob_speed (item);
2054	}	1842	}
		1843
2055	if ((tmp = is_player_inv (item)))	1844	if ((tmp = item->in_player ()))
2056	esrv_update_item (UPD_ANIM, tmp, item);	1845	esrv_update_item (UPD_ANIM, tmp, item);
2057	}	1846	}
2058	}	1847	}
2059	else if (item->type == ROD || item->type == HORN)	1848	else if (item->type == ROD || item->type == HORN)
2060	{
2061	drain_rod_charge (item);	1849	drain_rod_charge (item);
2062	}
2063	}	1850	}
2064	}	1851	}
2065		1852
2066	/* Received a fire command for the player - go and do it.	1853	/* Received a fire command for the player - go and do it.
2067	*/	1854	*/
…		…
2210	* 0 otherwise	1997	* 0 otherwise
2211	*/	1998	*/
2212	static int	1999	static int
2213	player_attack_door (object *op, object *door)	2000	player_attack_door (object *op, object *door)
2214	{	2001	{
2215
2216	/* If its a door, try to find a use a key. If we do destroy the door,	2002	/* If its a door, try to find a use a key. If we do destroy the door,
2217	* might as well return immediately as there is nothing more to do -	2003	* might as well return immediately as there is nothing more to do -
2218	* otherwise, we fall through to the rest of the code.	2004	* otherwise, we fall through to the rest of the code.
2219	*/	2005	*/
2220	object *key = find_key (op, op, door);	2006	object *key = find_key (op, op, door);
…		…
2258	* It should keep the code cleaner.	2044	* It should keep the code cleaner.
2259	* When this is called, the players direction has been updated	2045	* When this is called, the players direction has been updated
2260	* (taking into account confusion.) The player is also actually	2046	* (taking into account confusion.) The player is also actually
2261	* going to try and move (not fire weapons).	2047	* going to try and move (not fire weapons).
2262	*/	2048	*/
2263
2264	void	2049	void
2265	move_player_attack (object *op, int dir)	2050	move_player_attack (object *op, int dir)
2266	{	2051	{
2267	object *tmp, *mon;	2052	object *tmp, *mon;
2268	sint16 nx, ny;	2053	sint16 nx, ny;
…		…
2270	maptile *m;	2055	maptile *m;
2271		2056
2272	nx = freearr_x[dir] + op->x;	2057	nx = freearr_x[dir] + op->x;
2273	ny = freearr_y[dir] + op->y;	2058	ny = freearr_y[dir] + op->y;
2274		2059
2275	on_battleground = op_on_battleground (op, NULL, NULL);	2060	on_battleground = op_on_battleground (op, 0, 0);
2276		2061
2277	/* If braced, or can't move to the square, and it is not out of the	2062	/* If braced, or can't move to the square, and it is not out of the
2278	* map, attack it. Note order of if statement is important - don't	2063	* map, attack it. Note order of if statement is important - don't
2279	* want to be calling move_ob if braced, because move_ob will move the	2064	* want to be calling move_ob if braced, because move_ob will move the
2280	* player. This is a pretty nasty hack, because if we could	2065	* player. This is a pretty nasty hack, because if we could
…		…
2292	return; /* Don't think this should happen */	2077	return; /* Don't think this should happen */
2293	}	2078	}
2294	else	2079	else
2295	m = op->map;	2080	m = op->map;
2296		2081
2297	if ((tmp = get_map_ob (m, nx, ny)) == NULL)	2082	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2298	{	2083	{
2299	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */	2084	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2300	return;	2085	return;
2301	}	2086	}
2302		2087
2303	mon = NULL;	2088	mon = 0;
2304	/* Go through all the objects, and find ones of interest. Only stop if	2089	/* Go through all the objects, and find ones of interest. Only stop if
2305	* we find a monster - that is something we know we want to attack.	2090	* we find a monster - that is something we know we want to attack.
2306	* if its a door or barrel (can roll) see if there may be monsters	2091	* if its a door or barrel (can roll) see if there may be monsters
2307	* on the space	2092	* on the space
2308	*/	2093	*/
2309	while (tmp != NULL)	2094	while (tmp)
2310	{	2095	{
2311	if (tmp == op)	2096	if (tmp == op)
2312	{	2097	{
2313	tmp = tmp->above;	2098	tmp = tmp->above;
2314	continue;	2099	continue;
…		…
2324	mon = tmp;	2109	mon = tmp;
2325		2110
2326	tmp = tmp->above;	2111	tmp = tmp->above;
2327	}	2112	}
2328		2113
2329	if (mon == NULL) /* This happens anytime the player tries to move */	2114	if (!mon) /* This happens anytime the player tries to move */
2330	return; /* into a wall */	2115	return; /* into a wall */
2331		2116
2332	if (mon->head != NULL)	2117	if (mon->head)
2333	mon = mon->head;	2118	mon = mon->head;
2334		2119
2335	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	2120	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2336	if (player_attack_door (op, mon))	2121	if (player_attack_door (op, mon))
2337	return;	2122	return;
…		…
2374	* attack them either.	2159	* attack them either.
2375	*/	2160	*/
2376	if ((mon->type == PLAYER || mon->enemy != op) &&	2161	if ((mon->type == PLAYER || mon->enemy != op) &&
2377	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (	2162	(mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2378	#ifdef PROHIBIT_PLAYERKILL	2163	#ifdef PROHIBIT_PLAYERKILL
2379	(op->contr->peaceful	2164	(op->contr->peaceful
2380	|| (mon->type == PLAYER	2165	|| (mon->type == PLAYER
2381	&& mon->contr->	2166	&& mon->contr->
2382	peaceful)) &&	2167	peaceful)) &&
2383	#else	2168	#else
2384	op->contr->peaceful &&	2169	op->contr->peaceful &&
2385	#endif	2170	#endif
2386	!on_battleground))	2171	!on_battleground))
2387	{	2172	{
2388	if (!op->contr->braced)	2173	if (!op->contr->braced)
2389	{	2174	{
2390	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2175	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2391	(void) push_ob (mon, dir, op);	2176	(void) push_ob (mon, dir, op);
2392	}	2177	}
2393	else	2178	else
2394	{
2395	new_draw_info (0, 0, op, "You withhold your attack");	2179	new_draw_info (0, 0, op, "You withhold your attack");
2396	}	2180
2397	if (op->contr->tmp_invis || op->hide)	2181	if (op->contr->tmp_invis || op->hide)
2398	make_visible (op);	2182	make_visible (op);
2399	}	2183	}
2400		2184
2401	/* If the object is a boulder or other rollable object, then	2185	/* If the object is a boulder or other rollable object, then
…		…
2429	op->speed_left += op->speed / op->contr->weapon_sp;	2213	op->speed_left += op->speed / op->contr->weapon_sp;
2430		2214
2431	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */	2215	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2432	}	2216	}
2433		2217
2434	skill_attack (mon, op, 0, NULL, NULL);	2218	skill_attack (mon, op, 0, 0, 0);
2435		2219
2436	/* If attacking another player, that player gets automatic	2220	/* If attacking another player, that player gets automatic
2437	* hitback, and doesn't loose luck either.	2221	* hitback, and doesn't loose luck either.
2438	* Disable hitback on the battleground or if the target is	2222	* Disable hitback on the battleground or if the target is
2439	* the wiz.	2223	* the wiz.
…		…
2441	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))	2225	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2442	{	2226	{
2443	short luck = mon->stats.luck;	2227	short luck = mon->stats.luck;
2444		2228
2445	mon->contr->has_hit = 1;	2229	mon->contr->has_hit = 1;
2446	skill_attack (op, mon, 0, NULL, NULL);	2230	skill_attack (op, mon, 0, 0, 0);
2447	mon->stats.luck = luck;	2231	mon->stats.luck = luck;
2448	}	2232	}
		2233
2449	if (action_makes_visible (op))	2234	if (action_makes_visible (op))
2450	make_visible (op);	2235	make_visible (op);
2451	}	2236	}
2452	} /* if player should attack something */	2237	} /* if player should attack something */
2453	}	2238	}
…		…
2488		2273
2489	/* Add special check for newcs players and fire on - this way, the	2274	/* Add special check for newcs players and fire on - this way, the
2490	* server can handle repeat firing.	2275	* server can handle repeat firing.
2491	*/	2276	*/
2492	if (op->contr->fire_on || (op->contr->run_on && pick != 0))	2277	if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2493	{
2494	op->direction = dir;	2278	op->direction = dir;
2495	}
2496	else	2279	else
2497	{
2498	op->direction = 0;	2280	op->direction = 0;
2499	}	2281
2500	/* Update how the player looks. Use the facing, so direction may	2282	/* Update how the player looks. Use the facing, so direction may
2501	* get reset to zero. This allows for full animation capabilities	2283	* get reset to zero. This allows for full animation capabilities
2502	* for players.	2284	* for players.
2503	*/	2285	*/
2504	animate_object (op, op->facing);	2286	animate_object (op, op->facing);
…		…
2557	/* call this here - we also will call this in do_ericserver, but	2339	/* call this here - we also will call this in do_ericserver, but
2558	* the players time has been increased when doericserver has been	2340	* the players time has been increased when doericserver has been
2559	* called, so we recheck it here.	2341	* called, so we recheck it here.
2560	*/	2342	*/
2561	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2343	//TODO: better than handling 8 commands, use some more intelligent rate-limiting
2562	for (int rep = 8; --rep && op->contr->socket->handle_command (); )	2344	for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2563	;	2345	;
2564		2346
2565	if (op->speed_left < 0)	2347	if (op->speed_left < 0)
2566	return 0;	2348	return 0;
2567		2349
…		…
2606	op->stats.hp = op->stats.maxhp;	2388	op->stats.hp = op->stats.maxhp;
2607		2389
2608	if (op->stats.food < 0)	2390	if (op->stats.food < 0)
2609	op->stats.food = 999;	2391	op->stats.food = 999;
2610		2392
2611	fix_player (op);	2393	op->update_stats ();
2612	return 1;	2394	return 1;
2613	}	2395	}
2614		2396
2615	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2397	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2616	CLEAR_FLAG (op, FLAG_LIFESAVE);	2398	CLEAR_FLAG (op, FLAG_LIFESAVE);
…		…
2646	remove_unpaid_objects (op->inv, env);	2428	remove_unpaid_objects (op->inv, env);
2647		2429
2648	op = next;	2430	op = next;
2649	}	2431	}
2650	}	2432	}
2651
2652		2433
2653	/*	2434	/*
2654	* Returns pointer a static string containing gravestone text	2435	* Returns pointer a static string containing gravestone text
2655	* Moved from apply.c to player.c - player.c is what	2436	* Moved from apply.c to player.c - player.c is what
2656	* actually uses this function. player.c may not be quite the	2437	* actually uses this function. player.c may not be quite the
…		…
2690	strncat (buf2, " ", 20 - strlen (buf) / 2);	2471	strncat (buf2, " ", 20 - strlen (buf) / 2);
2691	strcat (buf2, buf);	2472	strcat (buf2, buf);
2692		2473
2693	return buf2;	2474	return buf2;
2694	}	2475	}
2695
2696
2697		2476
2698	void	2477	void
2699	do_some_living (object *op)	2478	do_some_living (object *op)
2700	{	2479	{
2701	int last_food = op->stats.food;	2480	int last_food = op->stats.food;
…		…
2710	const int max_grace = 1;	2489	const int max_grace = 1;
2711		2490
2712	if (op->contr->outputs_sync)	2491	if (op->contr->outputs_sync)
2713	{	2492	{
2714	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2493	for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2715	if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2494	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2716	flush_output_element (op, &op->contr->outputs[i]);	2495	flush_output_element (op, &op->contr->outputs[i]);
2717	}	2496	}
2718		2497
2719	if (op->contr->state == ST_PLAYING)	2498	if (op->contr->ns->state == ST_PLAYING)
2720	{	2499	{
2721
2722	/* these next three if clauses make it possible to SLOW DOWN	2500	/* these next three if clauses make it possible to SLOW DOWN
2723	hp/grace/spellpoint regeneration. */	2501	hp/grace/spellpoint regeneration. */
2724	if (op->contr->gen_hp >= 0)	2502	if (op->contr->gen_hp >= 0)
2725	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;	2503	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2726	else	2504	else
2727	{	2505	{
2728	gen_hp = op->stats.maxhp;	2506	gen_hp = op->stats.maxhp;
2729	rate_hp -= rate_hp / 2 * op->contr->gen_hp;	2507	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2730	}	2508	}
		2509
2731	if (op->contr->gen_sp >= 0)	2510	if (op->contr->gen_sp >= 0)
2732	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;	2511	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2733	else	2512	else
2734	{	2513	{
2735	gen_sp = op->stats.maxsp;	2514	gen_sp = op->stats.maxsp;
2736	rate_sp -= rate_sp / 2 * op->contr->gen_sp;	2515	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2737	}	2516	}
		2517
2738	if (op->contr->gen_grace >= 0)	2518	if (op->contr->gen_grace >= 0)
2739	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;	2519	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2740	else	2520	else
2741	{	2521	{
2742	gen_grace = op->stats.maxgrace;	2522	gen_grace = op->stats.maxgrace;
…		…
2758	op->stats.food += op->contr->digestion;	2538	op->stats.food += op->contr->digestion;
2759	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2539	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2760	op->stats.food = last_food;	2540	op->stats.food = last_food;
2761	}	2541	}
2762	}	2542	}
		2543
2763	if (max_sp > 1)	2544	if (max_sp > 1)
2764	{	2545	{
2765	over_sp = (gen_sp + 10) / rate_sp;	2546	over_sp = (gen_sp + 10) / rate_sp;
2766	if (over_sp > 0)	2547	if (over_sp > 0)
2767	{	2548	{
2768	if (op->stats.sp < op->stats.maxsp)	2549	if (op->stats.sp < op->stats.maxsp)
2769	{	2550	{
2770	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2551	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2552
2771	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))	2553	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2772	op->stats.sp--;	2554	op->stats.sp--;
		2555
2773	if (op->stats.sp > op->stats.maxsp)	2556	if (op->stats.sp > op->stats.maxsp)
2774	op->stats.sp = op->stats.maxsp;	2557	op->stats.sp = op->stats.maxsp;
2775	}	2558	}
2776	op->last_sp = 0;	2559	op->last_sp = 0;
2777	}	2560	}
2778	else	2561	else
2779	{
2780	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2562	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2781	}
2782	}	2563	}
2783	else	2564	else
2784	{
2785	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2565	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2786	}
2787	}	2566	}
2788		2567
2789	/* Regenerate Grace */	2568	/* Regenerate Grace */
2790	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */	2569	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2791	if (--op->last_grace < 0)	2570	if (--op->last_grace < 0)
2792	{	2571	{
2793	if (op->stats.grace < op->stats.maxgrace / 2)	2572	if (op->stats.grace < op->stats.maxgrace / 2)
2794	op->stats.grace++; /* no penalty in food for regaining grace */	2573	op->stats.grace++; /* no penalty in food for regaining grace */
		2574
2795	if (max_grace > 1)	2575	if (max_grace > 1)
2796	{	2576	{
2797	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2577	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2798	if (over_grace > 0)	2578	if (over_grace > 0)
2799	{	2579	{
…		…
2827	op->stats.food += op->contr->digestion;	2607	op->stats.food += op->contr->digestion;
2828	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2608	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2829	op->stats.food = last_food;	2609	op->stats.food = last_food;
2830	}	2610	}
2831	}	2611	}
		2612
2832	if (max_hp > 1)	2613	if (max_hp > 1)
2833	{	2614	{
2834	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2615	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2835	if (over_hp > 0)	2616	if (over_hp > 0)
2836	{	2617	{
…		…
2860		2641
2861	if (op->contr->gen_hp > 0)	2642	if (op->contr->gen_hp > 0)
2862	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);	2643	op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2863	else	2644	else
2864	op->last_eat = 25 * (1 + bonus) / (penalty + 1);	2645	op->last_eat = 25 * (1 + bonus) / (penalty + 1);
		2646
2865	/* dms do not consume food */	2647	/* dms do not consume food */
2866	if (!QUERY_FLAG (op, FLAG_WIZ))	2648	if (!QUERY_FLAG (op, FLAG_WIZ))
2867	op->stats.food--;	2649	op->stats.food--;
2868	}	2650	}
2869	}
2870		2651
2871	if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)	2652	if (op->stats.food < 0 && op->stats.hp >= 0)
2872	{	2653	{
2873	object *tmp, *flesh = NULL;	2654	object *tmp, *flesh = 0;
2874		2655
2875	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2656	for (tmp = op->inv; tmp; tmp = tmp->below)
2876	{	2657	{
2877	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2658	if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2878	{
2879	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2880	{	2659	{
		2660	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2661	{
2881	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2662	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2882	manual_apply (op, tmp, 0);	2663	manual_apply (op, tmp, 0);
2883	if (op->stats.food >= 0 || op->stats.hp < 0)	2664	if (op->stats.food >= 0 || op->stats.hp < 0)
2884	break;	2665	break;
2885	}	2666	}
2886	else if (tmp->type == FLESH)	2667	else if (tmp->type == FLESH)
2887	flesh = tmp;	2668	flesh = tmp;
2888	} /* End if paid for object */	2669	} /* End if paid for object */
2889	} /* end of for loop */	2670	} /* end of for loop */
		2671
2890	/* If player is still starving, it means they don't have any food, so	2672	/* If player is still starving, it means they don't have any food, so
2891	* eat flesh instead.	2673	* eat flesh instead.
2892	*/	2674	*/
2893	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2675	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2894	{	2676	{
2895	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2677	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2896	manual_apply (op, flesh, 0);	2678	manual_apply (op, flesh, 0);
2897	}	2679	}
2898	} /* end if player is starving */	2680	}
2899		2681
2900	while (op->stats.food < 0 && op->stats.hp > 0)	2682	while (op->stats.food < 0 && op->stats.hp >= 0)
2901	op->stats.food++, op->stats.hp--;	2683	op->stats.food++, op->stats.hp--;
2902		2684
2903	if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))	2685	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2904	kill_player (op);	2686	kill_player (op);
		2687	}
2905	}	2688	}
2906
2907
2908		2689
2909	/* If the player should die (lack of hp, food, etc), we call this.	2690	/* If the player should die (lack of hp, food, etc), we call this.
2910	* op is the player in jeopardy. If the player can not be saved (not	2691	* op is the player in jeopardy. If the player can not be saved (not
2911	* permadeath, no lifesave), this will take care of removing the player	2692	* permadeath, no lifesave), this will take care of removing the player
2912	* file.	2693	* file.
…		…
3019	x = op->x;	2800	x = op->x;
3020	y = op->y;	2801	y = op->y;
3021	map = op->map;	2802	map = op->map;
3022		2803
3023		2804
3024	if (settings.not_permadeth == TRUE)
3025	{
3026	/* NOT_PERMADEATH code. This basically brings the character back to	2805	/* NOT_PERMADEATH code. This basically brings the character back to
3027	* life if they are dead - it takes some exp and a random stat.	2806	* life if they are dead - it takes some exp and a random stat.
3028	* See the config.h file for a little more in depth detail about this.	2807	* See the config.h file for a little more in depth detail about this.
3029	*/	2808	*/
3030		2809
3031	/* Basically two ways to go - remove a stat permanently, or just	2810	/* Basically two ways to go - remove a stat permanently, or just
3032	* make it depletion. This bunch of code deals with that aspect	2811	* make it depletion. This bunch of code deals with that aspect
3033	* of death.	2812	* of death.
3034	*/	2813	*/
3035	#ifndef COZY_SERVER	2814	#ifndef COZY_SERVER
3036	if (settings.balanced_stat_loss)	2815	if (settings.balanced_stat_loss)
3037	{	2816	{
3038	/* If stat loss is permanent, lose one stat only. */	2817	/* If stat loss is permanent, lose one stat only. */
3039	/* Lower level chars don't lose as many stats because they suffer	2818	/* Lower level chars don't lose as many stats because they suffer
3040	more if they do. */	2819	more if they do. */
3041	/* Higher level characters can afford things such as potions of	2820	/* Higher level characters can afford things such as potions of
3042	restoration, or better, stat potions. So we slug them that	2821	restoration, or better, stat potions. So we slug them that
3043	little bit harder. */	2822	little bit harder. */
3044	/* GD */	2823	/* GD */
3045	if (settings.stat_loss_on_death)	2824	if (settings.stat_loss_on_death)
3046	num_stats_lose = 1;	2825	num_stats_lose = 1;
3047	else
3048	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3049	}
3050	else	2826	else
3051	{	2827	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2828	}
		2829	else
		2830	{
3052	num_stats_lose = 1;	2831	num_stats_lose = 1;
3053	}	2832	}
3054	lost_a_stat = 0;	2833	lost_a_stat = 0;
3055		2834
3056	for (z = 0; z < num_stats_lose; z++)	2835	for (z = 0; z < num_stats_lose; z++)
3057	{	2836	{
3058	i = RANDOM () % NUM_STATS;	2837	i = RANDOM () % NUM_STATS;
3059		2838
3060	if (settings.stat_loss_on_death)	2839	if (settings.stat_loss_on_death)
3061	{	2840	{
3062	/* Pick a random stat and take a point off it. Tell the player	2841	/* Pick a random stat and take a point off it. Tell the player
3063	* what he lost.	2842	* what he lost.
3064	*/	2843	*/
3065	change_attr_value (&(op->stats), i, -1);	2844	change_attr_value (&(op->stats), i, -1);
3066	check_stat_bounds (&(op->stats));	2845	check_stat_bounds (&(op->stats));
3067	change_attr_value (&(op->contr->orig_stats), i, -1);	2846	change_attr_value (&(op->contr->orig_stats), i, -1);
3068	check_stat_bounds (&(op->contr->orig_stats));	2847	check_stat_bounds (&(op->contr->orig_stats));
3069	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2848	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3070	lost_a_stat = 1;	2849	lost_a_stat = 1;
		2850	}
		2851	else
		2852	{
		2853	/* deplete a stat */
		2854	archetype *deparch = archetype::find ("depletion");
		2855	object *dep;
		2856
		2857	dep = present_arch_in_ob (deparch, op);
		2858	if (!dep)
		2859	{
		2860	dep = arch_to_object (deparch);
		2861	insert_ob_in_ob (dep, op);
3071	}	2862	}
3072	else	2863	lose_this_stat = 1;
		2864	if (settings.balanced_stat_loss)
3073	{	2865	{
3074	/* deplete a stat */	2866	/* GD */
3075	archetype *deparch = archetype::find ("depletion");	2867	/* Get the stat that we're about to deplete. */
3076	object *dep;	2868	this_stat = get_attr_value (&(dep->stats), i);
3077		2869	if (this_stat < 0)
3078	dep = present_arch_in_ob (deparch, op);
3079	if (!dep)
3080	{	2870	{
3081	dep = arch_to_object (deparch);	2871	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3082	insert_ob_in_ob (dep, op);	2872	int keep_chance = this_stat * this_stat;
3083	}	2873
3084	lose_this_stat = 1;	2874	/* Yes, I am paranoid. Sue me. */
3085	if (settings.balanced_stat_loss)
3086	{
3087	/* GD */
3088	/* Get the stat that we're about to deplete. */
3089	this_stat = get_attr_value (&(dep->stats), i);
3090	if (this_stat < 0)	2875	if (keep_chance < 1)
		2876	keep_chance = 1;
		2877
		2878	/* There is a maximum depletion total per level. */
		2879	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3091	{	2880	{
3092	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3093	int keep_chance = this_stat * this_stat;
3094
3095	/* Yes, I am paranoid. Sue me. */
3096	if (keep_chance < 1)
3097	keep_chance = 1;
3098
3099	/* There is a maximum depletion total per level. */
3100	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3101	{
3102	lose_this_stat = 0;	2881	lose_this_stat = 0;
3103	/* Take loss chance vs keep chance to see if we	2882	/* Take loss chance vs keep chance to see if we
3104	retain the stat. */	2883	retain the stat. */
3105	}
3106	else
3107	{
3108	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3109	lose_this_stat = 0;
3110	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3111	this_stat, keep_chance, loss_chance,
3112	lose_this_stat?"LOSE":"KEEP"); */
3113	}
3114	}	2884	}
3115	}
3116
3117	if (lose_this_stat)
3118	{
3119	this_stat = get_attr_value (&(dep->stats), i);
3120	/* We could try to do something clever like find another
3121	* stat to reduce if this fails. But chances are, if
3122	* stats have been depleted to -50, all are pretty low
3123	* and should be roughly the same, so it shouldn't make a
3124	* difference.
3125	*/	2885	else
3126	if (this_stat >= -50)
3127	{	2886	{
3128	change_attr_value (&(dep->stats), i, -1);	2887	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3129	SET_FLAG (dep, FLAG_APPLIED);
3130	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3131	fix_player (op);
3132	lost_a_stat = 1;	2888	lose_this_stat = 0;
		2889	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2890	this_stat, keep_chance, loss_chance,
		2891	lose_this_stat?"LOSE":"KEEP"); */
3133	}	2892	}
3134	}	2893	}
3135	}	2894	}
		2895
		2896	if (lose_this_stat)
		2897	{
		2898	this_stat = get_attr_value (&(dep->stats), i);
		2899	/* We could try to do something clever like find another
		2900	* stat to reduce if this fails. But chances are, if
		2901	* stats have been depleted to -50, all are pretty low
		2902	* and should be roughly the same, so it shouldn't make a
		2903	* difference.
		2904	*/
		2905	if (this_stat >= -50)
		2906	{
		2907	change_attr_value (&(dep->stats), i, -1);
		2908	SET_FLAG (dep, FLAG_APPLIED);
		2909	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2910	op->update_stats ();
		2911	lost_a_stat = 1;
		2912	}
3136	}	2913	}
		2914	}
		2915	}
3137	/* If no stat lost, tell the player. */	2916	/* If no stat lost, tell the player. */
3138	if (!lost_a_stat)	2917	if (!lost_a_stat)
3139	{	2918	{
3140	/* determine_god() seems to not work sometimes... why is this?	2919	/* determine_god() seems to not work sometimes... why is this?
3141	Should I be using something else? GD */	2920	Should I be using something else? GD */
3142	const char *god = determine_god (op);	2921	const char *god = determine_god (op);
3143		2922
3144	if (god && (strcmp (god, "none")))	2923	if (god && (strcmp (god, "none")))
3145	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2924	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3146	else	2925	else
3147	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2926	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3148	}	2927	}
3149	#else	2928	#else
3150	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2929	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
3151	#endif	2930	#endif
3152		2931
3153	/* Put a gravestone up where the character 'almost' died. List the	2932	/* Put a gravestone up where the character 'almost' died. List the
3154	* exp loss on the stone.	2933	* exp loss on the stone.
3155	*/	2934	*/
3156	tmp = arch_to_object (archetype::find ("gravestone"));	2935	tmp = arch_to_object (archetype::find ("gravestone"));
3157	sprintf (buf, "%s's gravestone", &op->name);	2936	sprintf (buf, "%s's gravestone", &op->name);
3158	tmp->name = buf;	2937	tmp->name = buf;
3159	sprintf (buf, "%s's gravestones", &op->name);	2938	sprintf (buf, "%s's gravestones", &op->name);
3160	tmp->name_pl = buf;	2939	tmp->name_pl = buf;
3161	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);	2940	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
3162	tmp->msg = buf;	2941	tmp->msg = buf;
3163	tmp->x = op->x, tmp->y = op->y;	2942	tmp->x = op->x, tmp->y = op->y;
3164	insert_ob_in_map (tmp, op->map, NULL, 0);	2943	insert_ob_in_map (tmp, op->map, NULL, 0);
3165		2944
3166	/**************************************/	2945	/**************************************/
3167	/* */	2946	/* */
3168	/* Subtract the experience points, */	2947	/* Subtract the experience points, */
3169	/* if we died cause of food, give us */	2948	/* if we died cause of food, give us */
3170	/* food, and reset HP's... */	2949	/* food, and reset HP's... */
3171	/* */	2950	/* */
3172	/**************************************/	2951	/**************************************/
3173		2952
3174	/* remove any poisoning and confusion the character may be suffering. */	2953	/* remove any poisoning and confusion the character may be suffering. */
3175	/* restore player */	2954	/* restore player */
3176	at = archetype::find ("poisoning");	2955	at = archetype::find ("poisoning");
3177	tmp = present_arch_in_ob (at, op);	2956	tmp = present_arch_in_ob (at, op);
3178		2957
3179	if (tmp)	2958	if (tmp)
3180	{	2959	{
3181	tmp->destroy ();	2960	tmp->destroy ();
3182	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2961	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3183	}	2962	}
3184		2963
3185	at = archetype::find ("confusion");	2964	at = archetype::find ("confusion");
3186	tmp = present_arch_in_ob (at, op);	2965	tmp = present_arch_in_ob (at, op);
3187	if (tmp)	2966	if (tmp)
3188	{	2967	{
3189	tmp->destroy ();	2968	tmp->destroy ();
3190	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2969	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3191	}	2970	}
3192		2971
3193	cure_disease (op, 0); /* remove any disease */	2972	cure_disease (op, 0); /* remove any disease */
3194		2973
3195	/*add_exp(op, (op->stats.exp * -0.20)); */	2974	/*add_exp(op, (op->stats.exp * -0.20)); */
3196	apply_death_exp_penalty (op);	2975	apply_death_exp_penalty (op);
3197	if (op->stats.food < 100)	2976	if (op->stats.food < 100)
3198	op->stats.food = 900;	2977	op->stats.food = 900;
3199	op->stats.hp = op->stats.maxhp;	2978	op->stats.hp = op->stats.maxhp;
3200	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2979	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3201	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2980	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3202		2981
3203	/*	2982	/*
3204	* Check to see if the player is in a shop. IF so, then check to see if	2983	* Check to see if the player is in a shop. IF so, then check to see if
3205	* the player has any unpaid items. If so, remove them and put them back	2984	* the player has any unpaid items. If so, remove them and put them back
3206	* in the map.	2985	* in the map.
3207	*/	2986	*/
3208		2987
3209	if (is_in_shop (op))	2988	if (is_in_shop (op))
3210	remove_unpaid_objects (op->inv, op);	2989	remove_unpaid_objects (op->inv, op);
3211		2990
3212	/****************************************/	2991	/****************************************/
3213	/* */	2992	/* */
3214	/* Move player to his current respawn- */	2993	/* Move player to his current respawn- */
3215	/* position (usually last savebed) */	2994	/* position (usually last savebed) */
3216	/* */	2995	/* */
3217	/****************************************/	2996	/****************************************/
3218		2997
3219	enter_player_savebed (op);	2998	enter_player_savebed (op);
3220		2999
3221	/* Save the player before inserting the force to reduce	3000	/* Save the player before inserting the force to reduce
3222	* chance of abuse.	3001	* chance of abuse.
3223	*/	3002	*/
3224	op->contr->braced = 0;	3003	op->contr->braced = 0;
3225	save_player (op, 1);	3004	op->contr->save ();
3226		3005
3227	/* it is possible that the player has blown something up	3006	/* it is possible that the player has blown something up
3228	* at his savebed location, and that can have long lasting	3007	* at his savebed location, and that can have long lasting
3229	* spell effects. So first see if there is a spell effect	3008	* spell effects. So first see if there is a spell effect
3230	* on the space that might harm the player.	3009	* on the space that might harm the player.
3231	*/	3010	*/
3232	will_kill_again = 0;	3011	will_kill_again = 0;
3233	for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)	3012	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3234	if (tmp->type == SPELL_EFFECT)	3013	if (tmp->type == SPELL_EFFECT)
3235	will_kill_again |= tmp->attacktype;	3014	will_kill_again |= tmp->attacktype;
3236		3015
3237	if (will_kill_again)	3016	if (will_kill_again)
3238	{	3017	{
3239	object *force;	3018	object *force;
3240	int at;	3019	int at;
3241		3020
3242	force = get_archetype (FORCE_NAME);	3021	force = get_archetype (FORCE_NAME);
3243	/* 50 ticks should be enough time for the spell to abate */	3022	/* 50 ticks should be enough time for the spell to abate */
3244	force->speed = 0.1;	3023	force->speed = 0.1;
3245	force->speed_left = -5.0;	3024	force->speed_left = -5.0;
3246	SET_FLAG (force, FLAG_APPLIED);	3025	SET_FLAG (force, FLAG_APPLIED);
3247	for (at = 0; at < NROFATTACKS; at++)	3026	for (at = 0; at < NROFATTACKS; at++)
3248	if (will_kill_again & (1 << at))	3027	if (will_kill_again & (1 << at))
3249	force->resist[at] = 100;	3028	force->resist[at] = 100;
3250		3029
3251	insert_ob_in_ob (force, op);	3030	insert_ob_in_ob (force, op);
3252	fix_player (op);	3031	op->update_stats ();
3253		3032
3254	}	3033	}
3255		3034
3256	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	3035	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3257	return;
3258	} /* NOT_PERMADETH */
3259	else
3260	{
3261	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3262	* should probably be embedded in an else statement.
3263	*/
3264
3265	op->contr->party = NULL;
3266	if (settings.set_title == TRUE)
3267	op->contr->own_title[0] = '\0';
3268	new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3269	check_score (op);
3270
3271	if (op->contr->ranges[range_golem])
3272	{
3273	remove_friendly_object (op->contr->ranges[range_golem]);
3274	op->contr->ranges[range_golem]->destroy ();
3275	op->contr->ranges[range_golem] = 0;
3276	}
3277
3278	loot_object (op); /* Remove some of the items for good */
3279	op->remove ();
3280	op->direction = 0;
3281
3282	if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3283	{
3284	delete_character (op->name, 0);
3285	if (settings.resurrection == TRUE)
3286	{
3287	/* save playerfile sans equipment when player dies
3288	** then save it as player.pl.dead so that future resurrection
3289	** type spells will work on them nicely
3290	*/
3291	delete_character (op->name, 0);
3292	op->stats.hp = op->stats.maxhp;
3293	op->stats.food = 999;
3294
3295	/* set the location of where the person will reappear when */
3296	/* maybe resurrection code should fix map also */
3297	strcpy (op->contr->maplevel, settings.emergency_mapname);
3298	if (op->map != NULL)
3299	op->map = NULL;
3300	op->x = settings.emergency_x;
3301	op->y = settings.emergency_y;
3302	save_player (op, 0);
3303	op->map = map;
3304	/* please see resurrection.c: peterm */
3305	dead_player (op);
3306	}
3307	else
3308	delete_character (op->name, 1);
3309	}
3310
3311	play_again (op);
3312
3313	/* peterm: added to create a corpse at deathsite. */
3314	tmp = arch_to_object (archetype::find ("corpse_pl"));
3315	sprintf (buf, "%s", &op->name);
3316	tmp->name = tmp->name_pl = buf;
3317	tmp->level = op->level;
3318	tmp->x = x;
3319	tmp->y = y;
3320	tmp->msg = gravestone_text (op);
3321	SET_FLAG (tmp, FLAG_UNIQUE);
3322	insert_ob_in_map (tmp, map, NULL, 0);
3323	}
3324	}	3036	}
3325
3326		3037
3327	void	3038	void
3328	loot_object (object *op)	3039	loot_object (object *op)
3329	{ /* Grab and destroy some treasure */	3040	{ /* Grab and destroy some treasure */
3330	object *tmp, *tmp2, *next;	3041	object *tmp, *tmp2, *next;
3331		3042
3332	if (op->container)	3043	if (op->container)
3333	{ /* close open sack first */
3334	esrv_apply_container (op, op->container);	3044	esrv_apply_container (op, op->container); /* close open sack first */
3335	}
3336		3045
3337	for (tmp = op->inv; tmp != NULL; tmp = next)	3046	for (tmp = op->inv; tmp; tmp = next)
3338	{	3047	{
3339	next = tmp->below;	3048	next = tmp->below;
3340	if (tmp->type == EXPERIENCE || tmp->invisible)	3049
		3050	if (tmp->invisible)
3341	continue;	3051	continue;
		3052
3342	tmp->remove ();	3053	tmp->remove ();
3343	tmp->x = op->x, tmp->y = op->y;	3054	tmp->x = op->x, tmp->y = op->y;
3344	if (tmp->type == CONTAINER)	3055	if (tmp->type == CONTAINER)
3345	{ /* empty container to ground */	3056	{ /* empty container to ground */
3346	loot_object (tmp);	3057	loot_object (tmp);
…		…
3368	*/	3079	*/
3369		3080
3370	void	3081	void
3371	fix_weight (void)	3082	fix_weight (void)
3372	{	3083	{
3373	player *pl;	3084	for_all_players (pl)
3374
3375	for (pl = first_player; pl != NULL; pl = pl->next)
3376	{	3085	{
3377	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	3086	int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3378		3087
3379	if (old == sum)	3088	if (old == sum)
3380	continue;	3089	continue;
3381	fix_player (pl->ob);	3090	pl->ob->update_stats ();
3382	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	3091	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3383	}	3092	}
3384	}	3093	}
3385		3094
3386	void	3095	void
3387	fix_luck (void)	3096	fix_luck (void)
3388	{	3097	{
3389	player *pl;	3098	for_all_players (pl)
3390
3391	for (pl = first_player; pl != NULL; pl = pl->next)
3392	if (!pl->ob->contr->state)	3099	if (!pl->ob->contr->ns->state)
3393	change_luck (pl->ob, 0);	3100	pl->ob->change_luck (0);
3394	}	3101	}
3395
3396		3102
3397	/* cast_dust() - handles op throwing objects of type 'DUST'.	3103	/* cast_dust() - handles op throwing objects of type 'DUST'.
3398	* This is much simpler in the new spell code - we basically	3104	* This is much simpler in the new spell code - we basically
3399	* just treat this as any other spell casting object.	3105	* just treat this as any other spell casting object.
3400	*/	3106	*/
3401
3402	void	3107	void
3403	cast_dust (object *op, object *throw_ob, int dir)	3108	cast_dust (object *op, object *throw_ob, int dir)
3404	{	3109	{
3405	object *skop, *spob;	3110	object *skop, *spob;
3406		3111
…		…
3451	object *tmp = NULL;	3156	object *tmp = NULL;
3452		3157
3453	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3158	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3454	return 1;	3159	return 1;
3455		3160
3456	if (op->type == PLAYER)
3457	for (tmp = op->inv; tmp; tmp = tmp->below)
3458	if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3459	if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3460	return 1;
3461	return 0;	3161	return 0;
3462	}	3162	}
3463		3163
3464	/* look at the surrounding terrain to determine	3164	/* look at the surrounding terrain to determine
3465	* the hideability of this object. Positive levels	3165	* the hideability of this object. Positive levels
…		…
3580	if (mflags & P_OUT_OF_MAP)	3280	if (mflags & P_OUT_OF_MAP)
3581	continue;	3281	continue;
3582	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	3282	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3583	continue;	3283	continue;
3584		3284
3585	for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)	3285	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3586	{	3286	{
3587	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	3287	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3588	return 1;	3288	return 1;
3589	else if (tmp->type == PLAYER)	3289	else if (tmp->type == PLAYER)
3590	{	3290	{
…		…
3644		3344
3645	/* only the viewable area the player sees is updated by LOS	3345	/* only the viewable area the player sees is updated by LOS
3646	* code, so we need to restrict ourselves to that range of values	3346	* code, so we need to restrict ourselves to that range of values
3647	* for any meaningful values.	3347	* for any meaningful values.
3648	*/	3348	*/
3649	if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&	3349	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3650	FABS (dy) <= (pl->contr->socket->mapy / 2) &&	3350	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3651	!pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])	3351	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3652	return 1;	3352	return 1;
3653	op = op->more;	3353	op = op->more;
3654	}	3354	}
3655	return 0;	3355	return 0;
3656	}	3356	}
…		…
3842	{	3542	{
3843	/* forces in the treasurelist can alter the player's stats */	3543	/* forces in the treasurelist can alter the player's stats */
3844	object *skin;	3544	object *skin;
3845		3545
3846	/* first get the dragon skin force */	3546	/* first get the dragon skin force */
		3547	shstr_cmp dragon_skin_force ("dragon_skin_force");
3847	for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);	3548	for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
		3549	;
		3550
3848	if (skin == NULL)	3551	if (!skin)
3849	return;	3552	return;
3850		3553
3851	/* adding new spellpath attunements */	3554	/* adding new spellpath attunements */
3852	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))	3555	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3853	{	3556	{

Diff Legend

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