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.12 by elmex, Tue Aug 29 10:51:43 2006 UTC vs.
Revision 1.224 by root, Thu Jan 1 16:05:13 2009 UTC

1	/*	1	/*
2	* static char *rcsid_player_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	* "$Id: player.C,v 1.12 2006/08/29 10:51:43 elmex Exp $";	3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
		6	* Copyright (©) 1992,2007 Frank Tore Johansen
		7	*
		8	* Deliantra is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* The authors can be reached via e-mail to <support@deliantra.net>
4	*/	22	*/
5		23
6	/*
7	CrossFire, A Multiplayer game for X-windows
8
9	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen
11
12	This program is free software; you can redistribute it and/or modify
13	it under the terms of the GNU General Public License as published by
14	the Free Software Foundation; either version 2 of the License, or
15	(at your option) any later version.
16
17	This program is distributed in the hope that it will be useful,
18	but WITHOUT ANY WARRANTY; without even the implied warranty of
19	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20	GNU General Public License for more details.
21
22	You should have received a copy of the GNU General Public License
23	along with this program; if not, write to the Free Software
24	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26	The author can be reached via e-mail to crossfire-devel@real-time.com
27	*/
28
29	#include <global.h>	24	#include <global.h>
30	#ifndef WIN32 /* ---win32 remove headers */
31	#include <pwd.h>
32	#endif
33	#ifndef __CEXTRACT__
34	#include <sproto.h>	25	#include <sproto.h>
35	#endif
36	#include <sounds.h>	26	#include <sounds.h>
37	#include <living.h>	27	#include <living.h>
38	#include <object.h>	28	#include <object.h>
39	#include <spells.h>	29	#include <spells.h>
40	#include <skills.h>	30	#include <skills.h>
41	#include <newclient.h>
42		31
43	#ifdef COZY_SERVER	32	#include <algorithm>
44	extern int same_party (partylist *a, partylist *b);	33	#include <functional>
45	#endif
46		34
47	player *find_player(const char *plname)	35	playervec players;
		36
		37	void
		38	display_motd (const object *op)
48	{	39	{
49	player *pl;	40	char buf[MAX_BUF];
50	for(pl=first_player;pl!=NULL;pl=pl->next)	41	char motd[HUGE_BUF];
51	{	42	FILE *fp;
52	if(pl->ob != NULL && !strcmp(query_name(pl->ob),plname))	43	int comp;
		44	int size;
		45
		46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
		47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
53	return pl;	48	return;
54	};
55	return NULL;
56	}
57		49
58	player* find_player_partial_name( const char* plname )	50	motd[0] = '\0';
		51	size = 0;
		52
		53	while (fgets (buf, MAX_BUF, fp))
59	{	54	{
60	player* pl;	55	if (*buf == '#')
61	player* found = NULL;
62	size_t namelen = strlen( plname );
63	for ( pl = first_player; pl != NULL; pl = pl->next )
64	{
65	if ( strlen( pl->ob->name ) < namelen )
66	continue;	56	continue;
67		57
68	if ( !strcmp( pl->ob->name, plname) )	58	strncat (motd + size, buf, HUGE_BUF - size);
69	return pl;	59	size += strlen (buf);
		60	}
70		61
71	if ( !strncasecmp( pl->ob->name, plname, namelen ) )	62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
		63	close_and_delete (fp, comp);
		64	}
		65
		66	void
		67	send_rules (const object *op)
		68	{
		69	char buf[MAX_BUF];
		70	char rules[HUGE_BUF];
		71	FILE *fp;
		72	int comp;
		73	int size;
		74
		75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
		76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
		77	return;
		78
		79	rules[0] = '\0';
		80	size = 0;
		81
		82	while (fgets (buf, MAX_BUF, fp))
		83	{
		84	if (*buf == '#')
		85	continue;
		86
		87	if (size + strlen (buf) >= HUGE_BUF)
		88	{
		89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
		90	break;
		91	}
		92
		93	strncat (rules + size, buf, HUGE_BUF - size);
		94	size += strlen (buf);
		95	}
		96
		97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
		98	close_and_delete (fp, comp);
		99	}
		100
		101	void
		102	send_news (const object *op)
		103	{
		104	char buf[MAX_BUF];
		105	char news[HUGE_BUF];
		106	char subject[MAX_BUF];
		107	FILE *fp;
		108	int comp;
		109	int size;
		110
		111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
		112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
		113	return;
		114
		115	news[0] = '\0';
		116	subject[0] = '\0';
		117	size = 0;
		118
		119	while (fgets (buf, MAX_BUF, fp))
		120	{
		121	if (*buf == '#')
		122	continue;
		123
		124	if (*buf == '%')
		125	{ /* send one news */
		126	if (size > 0)
		127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
		128	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
		129	"INFORMATION: %s\n%s", (char *)"%s\n%s",
		130	subject, news); /*send previously read news */
		131
		132	strcpy (subject, buf + 1);
		133	strip_endline (subject);
		134	size = 0;
		135	news[0] = '\0';
		136	}
		137	else
		138	{
		139	if (size + strlen (buf) >= HUGE_BUF)
72	{	140	{
73	if ( found )	141	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
74	return NULL;	142	break;
75
76	found = pl;
77	}	143	}
		144	strncat (news + size, buf, HUGE_BUF - size);
		145	size += strlen (buf);
78	}	146	}
79	return found;
80	}
81
82	void display_motd(const object *op) {
83	char buf[MAX_BUF];
84	char motd[HUGE_BUF];
85	FILE *fp;
86	int comp;
87	int size;
88		147	}
89	sprintf(buf, "%s/%s", settings.confdir, settings.motd);	148
90	if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {	149	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
91	return;	150	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
92	}
93	motd[0]='\0';
94	size=0;
95	while (fgets(buf, MAX_BUF, fp) != NULL) {
96	if( *buf == '#')
97	continue;
98	strncat(motd+size,buf,HUGE_BUF-size);
99	size+=strlen(buf);
100	}
101	draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
102	close_and_delete(fp, comp);	151	close_and_delete (fp, comp);
103	}	152	}
104		153
105	void send_rules(const object *op) {	154	/* This loads the first map an puts the player on it. */
106	char buf[MAX_BUF];	155	static void
107	char rules[HUGE_BUF];	156	set_first_map (object *op)
108	FILE *fp;	157	{
109	int comp;	158	op->contr->maplevel = first_map_path;
110	int size;	159	op->x = -1;
111		160	op->y = -1;
112	sprintf(buf, "%s/%s", settings.confdir, settings.rules);	161	}
113	if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {	162
		163	void
		164	player::activate ()
		165	{
		166	if (active)
114	return;	167	return;
		168
		169	players.insert (this);
		170	ob->remove ();
		171	ob->map = 0;
		172	ob->activate_recursive ();
		173	CLEAR_FLAG (ob, FLAG_FRIENDLY);
		174	add_friendly_object (ob);
		175	}
		176
		177	void
		178	player::deactivate ()
		179	{
		180	if (!active)
		181	return;
		182
		183	terminate_all_pets (ob);
		184	remove_friendly_object (ob);
		185	ob->deactivate_recursive ();
		186
		187	if (ob->map)
		188	maplevel = ob->map->path;
		189
		190	ob->remove ();
		191	ob->enemy = 0; // sometimes keeps an extra refcount on itself
		192	ob->map = 0;
		193	party = 0;
		194
		195	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
		196
		197	players.erase (this);
		198	}
		199
		200	// connect the player with a specific client
		201	// also changes, rationalises, and fixes some incorrect settings
		202	void
		203	player::connect (client *ns)
		204	{
		205	this->ns = ns;
		206	ns->pl = this;
		207
		208	run_on = 0;
		209	fire_on = 0;
		210	ob->close_container (); //TODO: client-specific
		211
		212	ns->update_look = 0;
		213	ns->look_position = 0;
		214
		215	clear_los ();
		216
		217	ns->reset_stats ();
		218
		219	/* make sure he's a player -- needed because of class change. */
		220	ob->type = PLAYER; // we are paranoid
		221	ob->race = ob->arch->race;
		222
		223	ob->update_weight ();
		224	link_skills ();
		225
		226	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
		227
		228	assign (title, ob->arch->object::name);
		229
		230	/* if it's a dragon player, set the correct title here */
		231	if (is_dragon_pl (ob))
115	}	232	{
116	rules[0]='\0';	233	object *tmp, *abil = 0, *skin = 0;
117	size=0;	234
118	while (fgets(buf, MAX_BUF, fp) != NULL) {	235	for (tmp = ob->inv; tmp; tmp = tmp->below)
119	if( *buf == '#')	236	if (tmp->type == FORCE)
120	continue;	237	if (tmp->arch->archname == shstr_dragon_ability_force)
121	if (size + strlen(buf)>=HUGE_BUF)	238	abil = tmp;
		239	else if (tmp->arch->archname == shstr_dragon_skin_force)
		240	skin = tmp;
		241
		242	set_dragon_name (ob, abil, skin);
		243	}
		244
		245	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
		246
		247	esrv_new_player (this);
		248
		249	ob->update_stats ();
		250
		251	ns->floorbox_update ();
		252	esrv_send_inventory (ob, ob);
		253	esrv_add_spells (this, 0);
		254
		255	activate ();
		256
		257	send_rules (ob);
		258	send_news (ob);
		259	display_motd (ob);
		260
		261	INVOKE_PLAYER (CONNECT, this);
		262	INVOKE_PLAYER (LOGIN, this);
		263	}
		264
		265	void
		266	player::disconnect ()
		267	{
		268	if (ob)
		269	{
		270	ob->close_container (); //TODO: client-specific
		271	ob->drop_unpaid_items ();
		272	}
		273
		274	if (ns)
		275	{
		276	if (active)
		277	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		278
		279	INVOKE_PLAYER (DISCONNECT, this);
		280
		281	ns->reset_stats ();
		282	ns->pl = 0;
		283	ns = 0;
		284	}
		285
		286	observe = ob;
		287
		288	deactivate ();
		289	}
		290
		291	// the need for this function can be explained
		292	// by load_object not returning the object
		293	void
		294	player::set_object (object *op)
		295	{
		296	ob = observe = op;
		297	ob->contr = this; /* this aren't yet in archetype */
		298
		299	ob->speed = 1.0f;
		300	ob->speed_left = 0.5f;
		301
		302	ob->direction = 5; /* So player faces south */
		303
		304	ob->flag [FLAG_READY_WEAPON] = false;
		305	ob->flag [FLAG_READY_SKILL] = false;
		306	ob->flag [FLAG_READY_BOW] = false;
		307
		308	for (object *op = ob->inv; op; op = op->below)
		309	if (op->flag [FLAG_APPLIED])
		310	switch (op->type)
122	{	311	{
123	LOG(llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);	312	case SKILL:
124	break;	313	ob->flag [FLAG_APPLIED] = false;
125	}
126	strncat(rules+size,buf,HUGE_BUF-size);
127	size+=strlen(buf);
128	}
129	draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
130	close_and_delete(fp, comp);
131	}
132
133	void send_news(const object *op) {
134	char buf[MAX_BUF];
135	char news[HUGE_BUF];
136	char subject[MAX_BUF];
137	FILE *fp;
138	int comp;
139	int size;
140
141	sprintf(buf, "%s/%s", settings.confdir, settings.news);
142	if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL)
143	return;
144	news[0]='\0';
145	subject[0]='\0';
146	size=0;
147	while (fgets(buf, MAX_BUF, fp) != NULL) {
148	if( *buf == '#')
149	continue;
150	if ( *buf =='%'){ /* send one news */
151	if (size>0)
152	draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op,
153	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
154	"INFORMATION: %s\n%s",
155	"%s\n%s",
156	subject, news); /*send previously read news*/
157	strcpy(subject,buf+1);
158	strip_endline(subject);
159	size=0;
160	news[0]='\0';
161	}
162	else{
163	if (size + strlen(buf)>=HUGE_BUF)
164	{
165	LOG(llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
166	break;	314	break;
167	}	315
168	strncat(news+size,buf,HUGE_BUF-size);	316	case WAND:
169	size+=strlen(buf);	317	case ROD:
		318	case HORN:
		319	case BOW:
		320	ranged_ob = op;
		321	break;
		322
		323	case WEAPON:
		324	combat_ob = op;
		325	break;
170	}	326	}
171	}
172
173	draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op,
174	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
175	"INFORMATION: %s\n%s\n",
176	"%s\n%s",
177	subject, news);
178	close_and_delete(fp, comp);
179	}
180		327
181	int playername_ok(const char *cp) {	328	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
182	/* Don't allow - or _ as first character in the name */	329	ob->deactivate (); // change_weapon activates, fix this better
183	if (*cp == '-' || *cp == '_') return 0;
184
185	for(;*cp!='\0';cp++)
186	if(!((*cp>='a'&&*cp<='z')||(*cp>='A'&&*cp<='Z'))&&*cp!='-'&&*cp!='_')
187	return 0;
188	return 1;
189	}	330	}
190		331
191	/* This no longer sets the player map. Also, it now updates	332	void
192	* all the pointers so the caller doesn't need to do that.	333	player::set_observe (object *op)
193	* Caller is responsible for setting the correct map.	334	{
194	*/	335	observe = op ? op : ob;
		336	do_los = 1;
		337	}
195		338
196	/* Redo this to do both get_player_ob and get_player.	339	player::player ()
197	* Hopefully this will be less bugfree and simpler.	340	{
198	* Returns the player structure. If 'p' is null,
199	* we create a new one. Otherwise, we recycle
200	* the one that is passed.
201	*/
202	static player* get_player(player *p) {
203	object *op=arch_to_object(get_player_archetype(NULL));
204	int i;
205
206	if (!p) {
207	p = (player *) malloc(sizeof(player));
208	if(p==NULL)
209	fatal(OUT_OF_MEMORY);
210
211	/* This adds the player in the linked list. There is extra
212	* complexity here because we want to add the new player at the
213	* end of the list - there is in fact no compelling reason that
214	* that needs to be done except for things like output of
215	* 'who'.
216	*/
217	player *tmp = first_player;
218	while(tmp!=NULL&&tmp->next!=NULL)
219	tmp=tmp->next;
220	if(tmp!=NULL)
221	tmp->next=p;
222	else
223	first_player=p;
224
225	p->next = NULL;
226	}
227
228	/* Clears basically the entire player structure except
229	* for next and socket.
230	*/
231	memset (static_cast<player_memset *>(p), 0, sizeof (player_memset));
232	p->attachable_init (); //HACK
233
234	/* There are some elements we want initialized to non zero value -	341	/* There are some elements we want initialised to non zero value -
235	* we deal with that below this point.	342	* we deal with that below this point.
236	*/	343	*/
237	p->party=NULL;	344	outputs_sync = 4;
238	p->outputs_sync=16; /* Every 2 seconds */	345	outputs_count = 4;
239	p->outputs_count=1; /* Keeps present behaviour */
240	p->unapply = unapply_nochoice;	346	unapply = unapply_nochoice;
241	p->Swap_First = -1;
242		347
243	#ifdef AUTOSAVE	348	savebed_map = first_map_path; /* Init. respawn position */
244	p->last_save_tick = 9999999;	349
245	#endif	350	gen_sp_armour = 10;
		351	bowtype = bow_normal;
		352	petmode = pet_normal;
		353	usekeys = containers;
		354	peaceful = 1; /* default peaceful */
		355	do_los = 1;
		356
		357	weapon_sp = 1.0f;
		358	weapon_sp_left = 0.5f;
		359	}
		360
		361	void
		362	player::do_destroy ()
		363	{
		364	disconnect ();
		365
		366	attachable::do_destroy ();
		367
		368	if (ob)
246		369	{
247	strcpy(p->savebed_map, first_map_path); /* Init. respawn position */	370	ob->destroy_inv (false);
		371	ob->destroy ();
248		372	}
249	op->contr=p; /* this aren't yet in archetype */
250	p->ob = op;
251	op->speed_left=0.5;
252	op->speed=1.0;
253	op->direction=5; /* So player faces south */
254	op->stats.wc=2;
255	op->run_away = 25; /* Then we panick... */
256	p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
257		373
258	roll_stats(op);	374	ob = observe = 0;
259	p->state=ST_ROLL_STAT;
260	clear_los(op);
261
262	p->gen_sp_armour=10;
263	p->last_speed= -1;
264	p->shoottype=range_none;
265	p->bowtype=bow_normal;
266	p->petmode=pet_normal;
267	p->listening=10;
268	p->usekeys=containers;
269	p->last_weapon_sp= -1;
270	p->peaceful=1; /* default peaceful */
271	p->do_los=1;
272	p->explore=0;
273	p->no_shout=0; /* default can shout */
274
275	strncpy(p->title, op->arch->clone.name, sizeof(p->title)-1);
276	p->title[sizeof(p->title)-1] = '\0';
277	op->race = add_string (op->arch->clone.race);
278
279	CLEAR_FLAG(op,FLAG_READY_SKILL);
280
281	/* we need to clear these to -1 and not zero - otherwise,
282	* if a player quits and starts a new character, we wont
283	* send new values to the client, as things like exp start
284	* at zero.
285	*/
286	for (i=0; i < NUM_SKILLS; i++) {
287	p->last_skill_exp[i] = -1;
288	p->last_skill_ob[i] = NULL;
289	}
290	for (i=0; i < NROFATTACKS; i++) {
291	p->last_resist[i] = -1;
292	}
293	p->last_stats.exp = -1;
294	p->last_weight = (uint32)-1;
295
296	p->socket.update_look=0;
297	p->socket.look_position=0;
298	return p;
299	}	375	}
300		376
301		377	player::~player ()
302	/* This loads the first map an puts the player on it. */
303	static void set_first_map(object *op)
304	{	378	{
305	strcpy(op->contr->maplevel, first_map_path);	379	/* Clear item stack */
306	op->x = -1;	380	free (stack_items);
307	op->y = -1;
308	enter_exit(op, NULL);
309	}	381	}
310		382
311	/* Tries to add player on the connection passwd in ns.	383	/* Tries to add player on the connection passed in ns.
312	* All we can really get in this is some settings like host and display	384	* All we can really get in this is some settings like host and display
313	* mode.	385	* mode.
314	*/	386	*/
		387	player *
		388	player::create ()
		389	{
		390	player *pl = new player;
315		391
316	int add_player(NewSocket *ns) {	392	pl->set_object (arch_to_object (get_player_archetype (0)));
317	player *p;
318		393
319	p=get_player(NULL);	394	pl->ob->roll_stats ();
320	p->socket = *ns;	395	pl->ob->stats.wc = 2;
321	p->socket.faces_sent = (uint8*) malloc(p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));	396	pl->ob->run_away = 25; /* Then we panick... */
322	if(p->socket.faces_sent == NULL)	397
323	fatal(OUT_OF_MEMORY);
324	memcpy(p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len*sizeof(*p->socket.faces_sent));
325	/* Needed because the socket we just copied over needs to be cleared.
326	* Note that this can result in a client reset if there is partial data
327	* on the uncoming socket.
328	*/
329	p->socket.inbuf.len = 0;
330	set_first_map(p->ob);	398	set_first_map (pl->ob);
331		399
332	CLEAR_FLAG(p->ob, FLAG_FRIENDLY);
333	add_friendly_object(p->ob);
334	send_rules(p->ob);
335	send_news(p->ob);
336	display_motd(p->ob);
337	get_name(p->ob);
338	return 0;	400	return pl;
339	}	401	}
340		402
341	/*	403	/*
342	* get_player_archetype() return next player archetype from archetype	404	* get_player_archetype() return next player archetype from archetype
343	* list. Not very efficient routine, but used only creating new players.	405	* list. Not very efficient routine, but used only creating new players.
344	* Note: there MUST be at least one player archetype!	406	* Note: there MUST be at least one player archetype!
345	*/	407	*/
		408	archetype *
346	archetype *get_player_archetype(archetype* at)	409	get_player_archetype (archetype *at)
347	{	410	{
348	archetype *start = at;	411	// archetypes could have been reloaded
		412	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		413
		414	if (!nat)
		415	return at;
		416
		417	archvec::iterator i = archetypes.find (nat);
		418
349	for (;;) {	419	for (;;)
350	if (at==NULL || at->next==NULL)
351	at=first_archetype;
352	else
353	at=at->next;
354	if(at->clone.type==PLAYER)
355	return at;
356	if (at == start) {
357	LOG (llevError, "No Player archetypes\n");
358	exit (-1);
359	}
360	}	420	{
361	}	421	if (++i == archetypes.end ())
		422	i = archetypes.begin ();
		423	else if (*i == at)
		424	cleanup ("not a single player archetype found");
362		425
		426	if ((*i)->type == PLAYER)
		427	return *i;
		428	}
		429	}
363		430
		431	object *
364	object *get_nearest_player(object *mon) {	432	get_nearest_player (object *mon)
		433	{
365	object *op = NULL;	434	object *op = NULL;
366	player *pl = NULL;
367	objectlink *ol;	435	objectlink *ol;
368	unsigned lastdist;	436	unsigned lastdist;
369	rv_vector rv;	437	rv_vector rv;
370		438
371	for(ol=first_friendly_object,lastdist=1000;ol!=NULL;ol=ol->next) {	439	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
372	/* We should not find free objects on this friendly list, but it	440	{
373	* does periodically happen. Given that, lets deal with it.
374	* While unlikely, it is possible the next object on the friendly
375	* list is also free, so encapsulate this in a while loop.
376	*/
377	while (QUERY_FLAG(ol->ob, FLAG_FREED) || !QUERY_FLAG(ol->ob, FLAG_FRIENDLY)) {
378	object *tmp=ol->ob;
379
380	/* Can't do much more other than log the fact, because the object
381	* itself will have been cleared.
382	*/
383	LOG(llevDebug,"get_nearest_player: Found free/non friendly object on friendly list\n");
384	ol = ol->next;
385	remove_friendly_object(tmp);
386	if (!ol) return op;
387	}
388
389	/* Remove special check for player from this. First, it looks to cause
390	* some crashes (ol->ob->contr not set properly?), but secondly, a more
391	* complicated method of state checking would be needed in any case -
392	* as it was, a clever player could type quit, and the function would
393	* skip them over while waiting for confirmation. Remove
394	* on_same_map check, as can_detect_enemy also does this
395	*/
396	if (!can_detect_enemy(mon,ol->ob,&rv))	441	if (!can_detect_enemy (mon, ol->ob, &rv))
397	continue;	442	continue;
398		443
399	if(lastdist>rv.distance) {	444	if (lastdist > rv.distance)
		445	{
400	op=ol->ob;	446	op = ol->ob;
401	lastdist=rv.distance;	447	lastdist = rv.distance;
402	}	448	}
403	}	449	}
404	for (pl=first_player; pl != NULL; pl=pl->next) {	450
		451	for_all_players (pl)
405	if (can_detect_enemy(mon, pl->ob,&rv)) {	452	if (can_detect_enemy (mon, pl->ob, &rv))
406
407	if(lastdist>rv.distance) {	453	if (lastdist > rv.distance)
408	op=pl->ob;
409	lastdist=rv.distance;
410	}
411	}	454	{
412	}	455	op = pl->ob;
		456	lastdist = rv.distance;
		457	}
		458
413	#if 0	459	#if 0
414	LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?op->name:"(null)");	460	LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
415	#endif	461	#endif
416	return op;	462	return op;
417	}	463	}
418		464
419	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	465	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
420	* result in a monster paths backtracking. It basically determines how large a	466	* result in a monster paths backtracking. It basically determines how large a
421	* detour a monster will take from the direction path when looking	467	* detour a monster will take from the direction path when looking
…		…
435	* circling behaviour. Unfortunately, this function is also used to determined	481	* circling behaviour. Unfortunately, this function is also used to determined
436	* if the creature should cast a spell, so returning a direction in that case	482	* if the creature should cast a spell, so returning a direction in that case
437	* is probably not a good thing.	483	* is probably not a good thing.
438	*/	484	*/
439	#define MAX_SPACES 50	485	#define MAX_SPACES 50
440
441		486
442	/*	487	/*
443	* Returns the direction to the player, if valid. Returns 0 otherwise.	488	* Returns the direction to the player, if valid. Returns 0 otherwise.
444	* modified to verify there is a path to the player. Does this by stepping towards	489	* modified to verify there is a path to the player. Does this by stepping towards
445	* player and if path is blocked then see if blockage is close enough to player that	490	* player and if path is blocked then see if blockage is close enough to player that
…		…
458	* monster can in fact move one space in that direction.	503	* monster can in fact move one space in that direction.
459	* 3) I'm not sure how good this code will be for moving multipart monsters,	504	* 3) I'm not sure how good this code will be for moving multipart monsters,
460	* since only simple checks to blocked are being called, which could mean the monster	505	* since only simple checks to blocked are being called, which could mean the monster
461	* is blocking itself.	506	* is blocking itself.
462	*/	507	*/
		508	int
463	int path_to_player(object *mon, object *pl, unsigned mindiff) {	509	path_to_player (object *mon, object *pl, unsigned mindiff)
		510	{
464	rv_vector rv;	511	rv_vector rv;
465	sint16 x,y;	512	sint16 x, y;
466	int lastx,lasty,dir,i,diff, firstdir=0,lastdir, max=MAX_SPACES, mflags, blocked;	513	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
467	mapstruct *m ,*lastmap;	514	maptile *m, *lastmap;
468		515
469	get_rangevector(mon, pl, &rv, 0);	516	get_rangevector (mon, pl, &rv, 0);
470		517
471	if (rv.distance<mindiff) return 0;	518	if (rv.distance < mindiff)
		519	return 0;
472		520
473	x=mon->x;	521	x = mon->x;
474	y=mon->y;	522	y = mon->y;
475	m=mon->map;	523	m = mon->map;
476	dir = rv.direction;	524	dir = rv.direction;
477	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	525	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
478	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);	526	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		527
479	/* If we can't solve it within the search distance, return now. */	528	/* If we can't solve it within the search distance, return now. */
480	if (diff>max) return 0;	529	if (diff > max)
		530	return 0;
		531
481	while (diff >1 && max>0) {	532	while (diff > 1 && max > 0)
		533	{
482	lastx = x;	534	lastx = x;
483	lasty = y;	535	lasty = y;
484	lastmap = m;	536	lastmap = m;
485	x = lastx + freearr_x[dir];	537	x = lastx + freearr_x[dir];
486	y = lasty + freearr_y[dir];	538	y = lasty + freearr_y[dir];
487		539
488	mflags = get_map_flags(m, &m, x, y, &x, &y);	540	mflags = get_map_flags (m, &m, x, y, &x, &y);
489	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK(m, x, y);	541	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
490		542
491	/* Space is blocked - try changing direction a little */	543	/* Space is blocked - try changing direction a little */
492	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked) || (mflags&P_BLOCKSVIEW))	544	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))
493	&& (m == mon->map && blocked_link(mon, m, x, y)))) {	545	&& (m == mon->map && blocked_link (mon, m, x, y))))
		546	{
494	/* recalculate direction from last good location. Possible	547	/* recalculate direction from last good location. Possible
495	* we were not traversing ideal location before.	548	* we were not traversing ideal location before.
496	*/	549	*/
497	get_rangevector_from_mapcoord(lastmap, lastx, lasty, pl, &rv, 0);	550	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);
498	if (rv.direction != dir) {	551	if (rv.direction != dir)
		552	{
499	/* OK - says direction should be different - lets reset the	553	/* OK - says direction should be different - lets reset the
500	* the values so it will try again.	554	* the values so it will try again.
501	*/	555	*/
502	x = lastx;	556	x = lastx;
503	y = lasty;	557	y = lasty;
504	m = lastmap;	558	m = lastmap;
505	dir = firstdir = rv.direction;	559	dir = firstdir = rv.direction;
		560	}
506	} else {	561	else
		562	{
507	/* direct path is blocked - try taking a side step to	563	/* direct path is blocked - try taking a side step to
508	* either the left or right.	564	* either the left or right.
509	* Note increase the values in the loop below to be	565	* Note increase the values in the loop below to be
510	* more than -1/1 respectively will mean the monster takes	566	* more than -1/1 respectively will mean the monster takes
511	* bigger detour. Have to be careful about these values getting	567	* bigger detour. Have to be careful about these values getting
512	* too big (3 or maybe 4 or higher) as the monster may just try	568	* too big (3 or maybe 4 or higher) as the monster may just try
513	* stepping back and forth	569	* stepping back and forth
514	*/	570	*/
515	for (i=-DETOUR_AMOUNT; i<=DETOUR_AMOUNT; i++) {	571	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
		572	{
		573	if (i == 0)
516	if (i==0) continue; /* already did this, so skip it */	574	continue; /* already did this, so skip it */
517	/* Use lastdir here - otherwise,	575	/* Use lastdir here - otherwise,
518	* since the direction that the creature should move in	576	* since the direction that the creature should move in
519	* may change, you could get infinite loops.	577	* may change, you could get infinite loops.
520	* ie, player is northwest, but monster can only	578	* ie, player is northwest, but monster can only
521	* move west, so it does that. It goes some distance,	579	* move west, so it does that. It goes some distance,
522	* gets blocked, finds that it should move north,	580	* gets blocked, finds that it should move north,
523	* can't do that, but now finds it can move east, and	581	* can't do that, but now finds it can move east, and
524	* gets back to its original point. lastdir contains	582	* gets back to its original point. lastdir contains
525	* the last direction the creature has successfully	583	* the last direction the creature has successfully
526	* moved.	584	* moved.
527	*/	585	*/
528		586
529	x = lastx + freearr_x[absdir(lastdir+i)];	587	x = lastx + freearr_x[absdir (lastdir + i)];
530	y = lasty + freearr_y[absdir(lastdir+i)];	588	y = lasty + freearr_y[absdir (lastdir + i)];
531	m = lastmap;	589	m = lastmap;
532	mflags = get_map_flags(m, &m, x, y, &x, &y);	590	mflags = get_map_flags (m, &m, x, y, &x, &y);
533	if (mflags & P_OUT_OF_MAP) continue;	591	if (mflags & P_OUT_OF_MAP)
		592	continue;
534	blocked = GET_MAP_MOVE_BLOCK(m, x, y);	593	blocked = GET_MAP_MOVE_BLOCK (m, x, y);
535	if (OB_TYPE_MOVE_BLOCK(mon, blocked)) continue;	594	if (OB_TYPE_MOVE_BLOCK (mon, blocked))
		595	continue;
536	if (mflags & P_BLOCKSVIEW) continue;	596	if (mflags & P_BLOCKSVIEW)
		597	continue;
537		598
538	if (m == mon->map && blocked_link(mon, m, x, y)) break;	599	if (m == mon->map && blocked_link (mon, m, x, y))
		600	break;
539	}	601	}
540	/* go through entire loop without finding a valid	602	/* go through entire loop without finding a valid
541	* sidestep to take - thus, no valid path.	603	* sidestep to take - thus, no valid path.
542	*/	604	*/
543	if (i==(DETOUR_AMOUNT+1))	605	if (i == (DETOUR_AMOUNT + 1))
544	return 0;	606	return 0;
545	diff--;	607	diff--;
546	lastdir=dir;	608	lastdir = dir;
547	max--;	609	max--;
548	if (!firstdir) firstdir = dir+i;	610	if (!firstdir)
		611	firstdir = dir + i;
549	} /* else check alternate directions */	612	} /* else check alternate directions */
550	} /* if blocked */	613	} /* if blocked */
551	else {	614	else
		615	{
552	/* we moved towards creature, so diff is less */	616	/* we moved towards creature, so diff is less */
553	diff--;	617	diff--;
554	max--;	618	max--;
555	lastdir=dir;	619	lastdir = dir;
		620	if (!firstdir)
556	if (!firstdir) firstdir = dir;	621	firstdir = dir;
		622	}
		623
		624	if (diff <= 1)
557	}	625	{
558	if (diff<=1) {
559	/* Recalculate diff (distance) because we may not have actually	626	/* Recalculate diff (distance) because we may not have actually
560	* headed toward player for entire distance.	627	* headed toward player for entire distance.
561	*/	628	*/
562	get_rangevector_from_mapcoord(m, x, y, pl, &rv, 0);	629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
563	diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);	630	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
564	}	631	}
565	if (diff>max) return 0;	632
		633	if (diff > max)
		634	return 0;
566	}	635	}
		636
567	/* If we reached the max, didn't find a direction in time */	637	/* If we reached the max, didn't find a direction in time */
568	if (!max) return 0;	638	if (!max)
		639	return 0;
569		640
570	return firstdir;	641	return firstdir;
571	}	642	}
572		643
		644	void
573	void give_initial_items(object *pl,treasurelist *items) {	645	give_initial_items (object *pl, treasurelist *items)
574	object *op,*next=NULL;	646	{
575
576	if(pl->randomitems!=NULL)	647	if (pl->randomitems)
577	create_treasure(items,pl,GT_STARTEQUIP | GT_ONLY_GOOD,1,0);	648	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
578		649
579	for (op=pl->inv; op; op=next) {	650	for (object *next, *op = pl->inv; op; op = next)
		651	{
580	next = op->below;	652	next = op->below;
581		653
582	/* Forces get applied per default, unless they have the	654	/* Forces get applied per default, unless they have the
583	* flag "neutral" set. Sorry but I can't think of a better way	655	* flag "neutral" set. Sorry but I can't think of a better way
584	*/	656	*/
585	if(op->type==FORCE && !QUERY_FLAG(op, FLAG_NEUTRAL))	657	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))
586	SET_FLAG(op,FLAG_APPLIED);	658	SET_FLAG (op, FLAG_APPLIED);
587		659
588	/* we never give weapons/armour if these cannot be used	660	/* we never give weapons/armour if these cannot be used
589	* by this player due to race restrictions	661	* by this player due to race restrictions
590	*/	662	*/
591	if (pl->type == PLAYER) {	663	if (pl->type == PLAYER)
		664	{
592	if ((!QUERY_FLAG(pl, FLAG_USE_ARMOUR) &&	665	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
		666	&&
593	(op->type == ARMOUR || op->type == BOOTS ||	667	(op->type == ARMOUR || op->type == BOOTS
594	op->type == CLOAK || op->type == HELMET ||	668	|| op->type == CLOAK || op->type == HELMET
595	op->type == SHIELD || op->type == GLOVES ||	669	|| op->type == SHIELD || op->type == GLOVES
596	op->type == BRACERS || op->type == GIRDLE)) ||	670	|| op->type == BRACERS || op->type == GIRDLE))
597	(!QUERY_FLAG(pl, FLAG_USE_WEAPON) && op->type == WEAPON)) {	671	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
598	remove_ob (op);
599	free_object (op);
600	continue;
601	}	672	{
602	}	673	op->destroy ();
603
604	/* This really needs to be better - we should really give
605	* a substitute spellbook. The problem is that we don't really
606	* have a good idea what to replace it with (need something like
607	* a first level treasurelist for each skill.)
608	* remove duplicate skills also
609	*/
610	if(op->type==SPELLBOOK || op->type == SKILL) {
611	object *tmp;
612
613	for (tmp=op->below; tmp; tmp=tmp->below)
614	if (tmp->type == op->type && tmp->name == op->name) break;
615
616	if (tmp) {
617	remove_ob(op);
618	free_object(op);
619	LOG(llevError,"give_initial_items: Removing duplicate object %s\n",
620	tmp->name);
621	continue;	674	continue;
622	}	675	}
623	if (op->nrof > 1) op->nrof = 1;	676	}
		677
		678	/* This really needs to be better - we should really give
		679	* a substitute spellbook. The problem is that we don't really
		680	* have a good idea what to replace it with (need something like
		681	* a first level treasurelist for each skill.)
		682	* remove duplicate skills also
		683	*/
		684	if (op->type == SPELLBOOK || op->type == SKILL)
624	}	685	{
		686	object *tmp;
625		687
		688	for (tmp = op->below; tmp; tmp = tmp->below)
		689	if (tmp->type == op->type && tmp->name == op->name)
		690	break;
		691
		692	if (tmp)
		693	{
		694	op->destroy ();
		695	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
		696	continue;
		697	}
		698
		699	if (op->nrof > 1)
		700	op->nrof = 1;
		701	}
		702
626	if (op->type == SPELLBOOK && op->inv) {	703	if (op->type == SPELLBOOK && op->inv)
627	CLEAR_FLAG(op->inv, FLAG_STARTEQUIP);	704	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
628	}
629		705
630	/* Give starting characters identified, uncursed, and undamned	706	/* Give starting characters identified, uncursed, and undamned
631	* items. Just don't identify gold or silver, or it won't be	707	* items. Just don't identify gold or silver, or it won't be
632	* merged properly.	708	* merged properly.
633	*/	709	*/
634	if (need_identify(op)) {	710	if (need_identify (op))
		711	{
635	SET_FLAG(op, FLAG_IDENTIFIED);	712	SET_FLAG (op, FLAG_IDENTIFIED);
636	CLEAR_FLAG(op, FLAG_CURSED);	713	CLEAR_FLAG (op, FLAG_CURSED);
637	CLEAR_FLAG(op, FLAG_DAMNED);	714	CLEAR_FLAG (op, FLAG_DAMNED);
		715	}
		716
		717	if (op->type == SPELL)
638	}	718	{
639	if(op->type==SPELL) {	719	op->destroy ();
640	remove_ob(op);
641	free_object(op);
642	continue;	720	continue;
		721	}
		722	else if (op->type == SKILL)
643	}	723	{
644	else if(op->type==SKILL) {
645	SET_FLAG(op, FLAG_CAN_USE_SKILL);	724	SET_FLAG (op, FLAG_CAN_USE_SKILL);
646	op->stats.exp = 0;	725	op->stats.exp = 0;
647	op->level = 1;	726	op->level = 1;
648	}	727	}
649	/* lock all 'normal items by default */	728	else /* lock all 'normal items by default */
650	else SET_FLAG(op, FLAG_INV_LOCKED);	729	SET_FLAG (op, FLAG_INV_LOCKED);
651	} /* for loop of objects in player inv */	730	} /* for loop of objects in player inv */
652		731
653	/* Need to set up the skill pointers */	732	/* Need to set up the skill pointers */
654	link_player_skills(pl);	733	pl->contr->link_skills ();
655	}	734	}
656		735
657	void get_name(object *op) {	736	void
658	op->contr->write_buf[0]='\0';
659	op->contr->state=ST_GET_NAME;
660	send_query(&op->contr->socket,0,"What is your name?\n:");
661	}
662
663	void get_password(object *op) {
664	op->contr->write_buf[0]='\0';
665	op->contr->state=ST_GET_PASSWORD;
666	send_query(&op->contr->socket,CS_QUERY_HIDEINPUT, "What is your password?\n:");
667	}
668
669	void play_again(object *op)
670	{
671	op->contr->state=ST_PLAY_AGAIN;
672	op->chosen_skill = NULL;
673	send_query(&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
674	/* a bit of a hack, but there are various places early in th
675	* player creation process that a user can quit (eg, roll
676	* stats) that isn't removing the player. Taking a quick
677	* look, there are many places that call play_again without
678	* removing the player - it probably makes more sense
679	* to leave it to play_again to remove the object in all
680	* cases.
681	*/
682	if (!QUERY_FLAG(op, FLAG_REMOVED))
683	remove_ob(op);
684	/* Need to set this to null - otherwise, it could point to garbage,
685	* and draw() doesn't check to see if the player is removed, only if
686	* the map is null or not swapped out.
687	*/
688	op->map = NULL;
689	}
690
691
692	int receive_play_again(object *op, char key)
693	{
694	if(key=='q'||key=='Q') {
695	remove_friendly_object(op);
696	leave(op->contr,0); /* ericserver will draw the message */
697	return 2;
698	}
699	else if(key=='a'||key=='A') {
700	player *pl = op->contr;
701	const char *name = op->name;
702
703	add_refcount(name);
704	remove_friendly_object(op);
705	free_object(op);
706	pl = get_player(pl);
707	op = pl->ob;
708	add_friendly_object(op);
709	op->contr->password[0]='~';
710	FREE_AND_CLEAR_STR(op->name);
711	FREE_AND_CLEAR_STR(op->name_pl);
712
713	/* Lets put a space in here */
714	new_draw_info(NDI_UNIQUE, 0, op, "\n");
715	get_name(op);
716	op->name = name; /* Alrady added a refcount above */
717	op->name_pl = add_string(name);
718	set_first_map(op);
719	} else {
720	/* user pressed something else so just ask again... */
721	play_again(op);
722	}
723	return 0;
724	}
725
726	void confirm_password(object *op) {
727
728	op->contr->write_buf[0]='\0';
729	op->contr->state=ST_CONFIRM_PASSWORD;
730	send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
731	}
732
733	void get_party_password(object *op, partylist *party) {	737	get_party_password (object *op, partylist *party)
		738	{
734	if (party == NULL) {	739	if (party == NULL)
		740	{
735	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);
736	return;	742	return;
737	}	743	}
		744
738	op->contr->write_buf[0]='\0';	745	op->contr->write_buf[0] = '\0';
739	op->contr->state=ST_GET_PARTY_PASSWORD;	746	op->contr->ns->state = ST_GET_PARTY_PASSWORD;
740	op->contr->party_to_join = party;	747	op->contr->party_to_join = party;
741	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:");
742	}	749	}
743
744		750
745	/* 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. */
		752	static int
746	int roll_stat(void) {	753	roll_stat (void)
		754	{
747	int a[4],i,j,k;	755	int a[4], i, j, k;
748		756
749	for(i=0;i<4;i++)	757	for (i = 0; i < 4; i++)
750	a[i]=(int)RANDOM()%6+1;	758	a[i] = (int) rndm (6) + 1;
751		759
752	for(i=0,j=0,k=7;i<4;i++)	760	for (i = 0, j = 0, k = 7; i < 4; i++)
753	if(a[i]<k)	761	if (a[i] < k)
754	k=a[i],j=i;	762	k = a[i], j = i;
755		763
756	for(i=0,k=0;i<4;i++) {	764	for (i = 0, k = 0; i < 4; i++)
757	if(i!=j)	765	if (i != j)
758	k+=a[i];	766	k += a[i];
759	}	767
760	return k;	768	return k;
761	}	769	}
762		770
763	void roll_stats(object *op) {	771	void
		772	object::roll_stats ()
		773	{
		774	int statsort [NUM_STATS];
		775
		776	for (;;)
		777	{
764	int sum=0;	778	int sum = 0;
765	int i = 0, j = 0;	779	for (int i = NUM_STATS; i--; )
766	int statsort[7];	780	sum += statsort [i] = roll_stat ();
767		781
768	do {	782	if (sum >= 82 && sum <= 116)
769	op->stats.Str=roll_stat();	783	break;
770	op->stats.Dex=roll_stat();	784	}
771	op->stats.Int=roll_stat();
772	op->stats.Con=roll_stat();
773	op->stats.Wis=roll_stat();
774	op->stats.Pow=roll_stat();
775	op->stats.Cha=roll_stat();
776	sum=op->stats.Str+op->stats.Dex+op->stats.Int+
777	op->stats.Con+op->stats.Wis+op->stats.Pow+
778	op->stats.Cha;
779	} while(sum<82||sum>116);
780		785
781	/* Sort the stats so that rerolling is easier... */	786	// Sort the stats so that rerolling is easier...
782	statsort[0] = op->stats.Str;	787	std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
783	statsort[1] = op->stats.Dex;
784	statsort[2] = op->stats.Int;
785	statsort[3] = op->stats.Con;
786	statsort[4] = op->stats.Wis;
787	statsort[5] = op->stats.Pow;
788	statsort[6] = op->stats.Cha;
789		788
790	/* a quick and dirty bubblesort? */	789	for (int i = 0; i < NUM_STATS; ++i)
791	do {
792	if (statsort[i] < statsort[i + 1]) {
793	j = statsort[i];
794	statsort[i] = statsort[i + 1];
795	statsort[i + 1] = j;
796	i = 0;
797	} else {
798	i++;
799	}
800	} while (i < 6);
801
802	op->stats.Str = statsort[0];	790	stats.stat (i) = statsort [i];
803	op->stats.Dex = statsort[1];
804	op->stats.Con = statsort[2];
805	op->stats.Int = statsort[3];
806	op->stats.Wis = statsort[4];
807	op->stats.Pow = statsort[5];
808	op->stats.Cha = statsort[6];
809		791
810
811	op->contr->orig_stats.Str=op->stats.Str;
812	op->contr->orig_stats.Dex=op->stats.Dex;
813	op->contr->orig_stats.Int=op->stats.Int;
814	op->contr->orig_stats.Con=op->stats.Con;
815	op->contr->orig_stats.Wis=op->stats.Wis;
816	op->contr->orig_stats.Pow=op->stats.Pow;
817	op->contr->orig_stats.Cha=op->stats.Cha;
818
819	op->level=1;
820	op->stats.exp=0;	792	stats.exp = 0;
821	op->stats.ac=0;	793	stats.ac = 0;
822		794
		795	stats.hp = stats.maxhp;
		796	stats.sp = stats.maxsp;
		797	stats.grace = stats.maxgrace;
		798
		799	if (contr)
		800	{
823	op->contr->levhp[1] = 9;	801	contr->levhp[1] = 9;
824	op->contr->levsp[1] = 6;	802	contr->levsp[1] = 6;
825	op->contr->levgrace[1] = 3;	803	contr->levgrace[1] = 3;
826		804
827	fix_player(op);	805	contr->orig_stats = stats;
		806	}
		807	}
		808
		809	void
		810	object::swap_stats (int a, int b)
		811	{
		812	swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
		813
		814	for (int i = 0; i < NUM_STATS; ++i)
		815	stats.stat (i) = contr->orig_stats.stat (i);
		816
		817	//TODO: the following code looks so borked and should, at the very least,
		818	// be merged with the similar code in roll_stats
		819	stats.ac = 0;
		820
		821	level = 1;
		822	stats.exp = 0;
		823	stats.ac = 0;
		824
828	op->stats.hp = op->stats.maxhp;	825	stats.hp = stats.maxhp;
829	op->stats.sp = op->stats.maxsp;	826	stats.sp = stats.maxsp;
830	op->stats.grace = op->stats.maxgrace;	827	stats.grace = stats.maxgrace;
		828
		829	if (contr)
		830	{
		831	contr->levhp[1] = 9;
		832	contr->levsp[1] = 6;
		833	contr->levgrace[1] = 3;
		834
831	op->contr->orig_stats=op->stats;	835	contr->orig_stats = stats;
		836	}
832	}	837	}
833		838
834	void Roll_Again(object *op)	839	static void
		840	start_info (object *op)
835	{	841	{
836	esrv_new_player(op->contr, 0);
837	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
838	}
839
840	void Swap_Stat(object *op,int Swap_Second)
841	{
842	signed char tmp;
843	char buf[MAX_BUF];	842	char buf[MAX_BUF];
844		843
845	if ( op->contr->Swap_First == -1 ) {	844	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
846	new_draw_info(NDI_UNIQUE, 0,op,"How the hell did you get here?!?!!!");
847	new_draw_info(NDI_UNIQUE, 0,op,"Error in Swap_Stat code,");
848	new_draw_info(NDI_UNIQUE, 0,op,"mail korg@rdt.monash.edu.au");
849	return;
850	}
851
852	tmp = get_attr_value(&op->contr->orig_stats, op->contr->Swap_First);
853
854	set_attr_value(&op->contr->orig_stats, op->contr->Swap_First,
855	get_attr_value(&op->contr->orig_stats, Swap_Second));
856
857	set_attr_value(&op->contr->orig_stats, Swap_Second, tmp);
858
859	sprintf(buf,"%s done\n", short_stat_name[Swap_Second]);
860	new_draw_info(NDI_UNIQUE, 0,op, buf);	845	new_draw_info (NDI_UNIQUE, 0, op, buf);
861	op->stats.Str = op->contr->orig_stats.Str;
862	op->stats.Dex = op->contr->orig_stats.Dex;
863	op->stats.Con = op->contr->orig_stats.Con;
864	op->stats.Int = op->contr->orig_stats.Int;
865	op->stats.Wis = op->contr->orig_stats.Wis;
866	op->stats.Pow = op->contr->orig_stats.Pow;
867	op->stats.Cha = op->contr->orig_stats.Cha;
868	op->stats.ac=0;
869
870	op->level=1;
871	op->stats.exp=0;
872	op->stats.ac=0;
873
874	op->contr->levhp[1] = 9;
875	op->contr->levsp[1] = 6;
876	op->contr->levgrace[1] = 3;
877
878	fix_player(op);
879	op->stats.hp = op->stats.maxhp;
880	op->stats.sp = op->stats.maxsp;
881	op->stats.grace = op->stats.maxgrace;
882	op->contr->orig_stats=op->stats;
883	op->contr->Swap_First=-1;
884	}
885
886
887	/* This code has been greatly reduced, because with set_attr_value
888	* and get_attr_value, the stats can be accessed just numeric
889	* ids. stat_trans is a table that translate the number entered
890	* into the actual stat. It is needed because the order the stats
891	* are displayed in the stat window is not the same as how
892	* the number's access that stat. The table does that translation.
893	*/
894	int key_roll_stat(object *op, char key)
895	{
896	int keynum = key -'0';
897	char buf[MAX_BUF];
898	static sint8 stat_trans[] = {-1, STR, DEX, CON, INT, WIS, POW, CHA};
899
900	if (keynum>0 && keynum<=7) {
901	if (op->contr->Swap_First==-1) {
902	op->contr->Swap_First=stat_trans[keynum];
903	sprintf(buf,"%s ->", short_stat_name[stat_trans[keynum]]);
904	new_draw_info(NDI_UNIQUE, 0,op,buf);
905	}
906	else
907	Swap_Stat(op,stat_trans[keynum]);
908
909	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");
910	return 1;
911	}
912	switch (key) {
913	case 'n':
914	case 'N': {
915	SET_FLAG(op, FLAG_WIZ);
916	if(op->map==NULL) {
917	LOG(llevError,"Map == NULL in state 2\n");
918	break;
919	}
920
921	#if 0
922	/* So that enter_exit will put us at startx/starty */
923	op->x= -1;
924
925	enter_exit(op,NULL);
926	#endif
927	SET_ANIMATION(op, 2); /* So player faces south */
928	/* Enter exit adds a player otherwise */
929	add_statbonus(op);
930	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
931	op->contr->state = ST_CHANGE_CLASS;
932	if (op->msg)
933	new_draw_info(NDI_BLUE, 0, op, op->msg);
934	return 0;
935	}
936	case 'y':
937	case 'Y':
938	roll_stats(op);
939	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"");
940	return 1;
941
942	case 'q':
943	case 'Q':
944	play_again(op);
945	return 1;
946
947	default:
948	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Yes, No, Quit or 1-6. Roll again?");
949	return 0;
950	}
951	return 0;
952	}	846	}
953		847
954	/* This function takes the key that is passed, and does the	848	/* This function takes the key that is passed, and does the
955	* appropriate action with it (change race, or other things).	849	* appropriate action with it (change race, or other things).
956	* The function name is for historical reasons - now we have	850	* The function name is for historical reasons - now we have
957	* separate race and class; this actually changes the RACE,	851	* separate race and class; this actually changes the RACE,
958	* not the class.	852	* not the class.
959	*/	853	*/
960		854	void
961	int key_change_class(object *op, char key)	855	player::chargen_race_done ()
962	{	856	{
963	int tmp_loop;
964
965	if(key=='q'||key=='Q') {
966	remove_ob(op);
967	play_again(op);
968	return 0;
969	}
970	if(key=='d'||key=='D') {
971	char buf[MAX_BUF];
972
973	/* this must before then initial items are given */	857	/* this must before then initial items are given */
974	esrv_new_player(op->contr, op->weight+op->carrying);	858	esrv_new_player (ob->contr);
975	create_treasure(find_treasurelist("starting_wealth"),op, 0, 0, 0);
976		859
		860	treasurelist *tl = treasurelist::find ("starting_wealth");
		861	if (tl)
		862	create_treasure (tl, ob, 0, 0, 0);
		863
977	INVOKE_PLAYER (BIRTH, op->contr);	864	INVOKE_PLAYER (BIRTH, ob->contr);
978	INVOKE_PLAYER (LOGIN, op->contr);	865	INVOKE_PLAYER (LOGIN, ob->contr);
979		866
980	op->contr->state=ST_PLAYING;	867	ob->contr->ns->state = ST_PLAYING;
981		868
982	if (op->msg) {	869	if (ob->msg)
983	free_string(op->msg);	870	ob->msg = 0;
984	op->msg=NULL;
985	}
986		871
987	/* We create this now because some of the unique maps will need it
988	* to save here.
989	*/
990	sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,op->name);
991	make_path_to_file(buf);
992
993	#ifdef AUTOSAVE
994	op->contr->last_save_tick = pticks;
995	#endif
996	start_info(op);	872	start_info (ob);
997	CLEAR_FLAG(op, FLAG_WIZ);	873	CLEAR_FLAG (ob, FLAG_WIZ);
998	give_initial_items(op,op->randomitems);	874	give_initial_items (ob, ob->randomitems);
999	link_player_skills(op);
1000	esrv_send_inventory(op, op);	875	esrv_send_inventory (ob, ob);
1001	fix_player(op);	876	ob->update_stats ();
1002		877
1003	/* This moves the player to a different start map, if there	878	/* This moves the player to a different start map, if there
1004	* is one for this race	879	* is one for this race
1005	*/	880	*/
1006	if(*first_map_ext_path) {	881	if (*first_map_ext_path)
1007	object *tmp;	882	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
1008	mapstruct *oldmap = op->map;	883	else
1009	char mapname[MAX_BUF];
1010	snprintf(mapname, MAX_BUF-1, "%s/%s",
1011	first_map_ext_path, op->arch->name);
1012	tmp=get_object();
1013	EXIT_PATH(tmp) = add_string(mapname);
1014	EXIT_X(tmp) = op->x;
1015	EXIT_Y(tmp) = op->y;
1016	enter_exit(op,tmp); /* we don't really care if it succeeded;
1017	* if the map isn't there, then stay on the
1018	* default initial map */
1019	free_object(tmp);
1020	} else {
1021	LOG(llevDebug,"first_map_ext_path not set\n");	884	LOG (llevDebug, "first_map_ext_path not set\n");
1022	}	885	}
1023	return 0;
1024	}
1025		886
		887	void
		888	player::chargen_race_next ()
		889	{
1026	/* Following actually changes the race - this is the default command	890	/* Following actually changes the race - this is the default command
1027	* if we don't match with one of the options above.	891	* if we don't match with one of the options above.
1028	*/	892	*/
1029		893
1030	tmp_loop = 0;	894	do
1031	while(!tmp_loop) {	895	{
1032	const char *name = add_string (op->name);	896	shstr name = ob->name;
1033	int x = op->x, y = op->y;	897	int x = ob->x, y = ob->y;
		898
1034	remove_statbonus(op);	899	ob->remove_statbonus ();
1035	remove_ob (op);	900	ob->remove ();
1036	op->arch = get_player_archetype(op->arch);	901	ob->arch = get_player_archetype (ob->arch);
1037	copy_object (&op->arch->clone, op);	902	ob->arch->copy_to (ob);
1038	op->instantiate ();	903	ob->instantiate ();
1039	op->stats = op->contr->orig_stats;	904	ob->stats = ob->contr->orig_stats;
1040	free_string (op->name);	905	ob->name = ob->name_pl = name;
1041	op->name = name;
1042	free_string(op->name_pl);
1043	op->name_pl = add_string(name);
1044	op->x = x;	906	ob->x = x;
1045	op->y = y;	907	ob->y = y;
1046	SET_ANIMATION(op, 2); /* So player faces south */	908	SET_ANIMATION (ob, 2); /* So player faces south */
1047	insert_ob_in_map (op, op->map, op,0);	909	insert_ob_in_map (ob, ob->map, ob, 0);
1048	strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1);	910	assign (ob->contr->title, ob->arch->object::name);
1049	op->contr->title[sizeof(op->contr->title)-1] = '\0';
1050	add_statbonus(op);	911	ob->add_statbonus ();
1051	tmp_loop=allowed_class(op);
1052
1053	if (!strncmp (op->msg, "Edit me", 7)) tmp_loop = 0; // pippijn fucked it up //D//TODO
1054	}	912	}
		913	while (!allowed_class (ob));
		914
1055	update_object(op,UP_OBJ_FACE);	915	update_object (ob, UP_OBJ_FACE);
1056	esrv_update_item(UPD_FACE,op,op);	916	esrv_update_item (UPD_FACE, ob, ob);
1057	fix_player(op);	917	ob->update_stats ();
1058	op->stats.hp=op->stats.maxhp;	918	ob->stats.hp = ob->stats.maxhp;
1059	op->stats.sp=op->stats.maxsp;	919	ob->stats.sp = ob->stats.maxsp;
1060	op->stats.grace=0;	920	ob->stats.grace = 0;
1061	if (op->msg)
1062	new_draw_info(NDI_BLUE, 0, op, op->msg);
1063	send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Press any key for the next race.\nPress `d' to play this race.\n");
1064	return 0;
1065	}	921	}
1066		922
1067	int key_confirm_quit(object *op, char key)	923	void
1068	{
1069	char buf[MAX_BUF];
1070
1071	if(key!='y'&&key!='Y'&&key!='q'&&key!='Q') {
1072	op->contr->state=ST_PLAYING;
1073	new_draw_info(NDI_UNIQUE, 0,op,"OK, continuing to play.");
1074	return 1;
1075	}
1076
1077	INVOKE_PLAYER (LOGOUT, op->contr);
1078	INVOKE_PLAYER (QUIT , op->contr);
1079
1080	terminate_all_pets(op);
1081	leave_map(op);
1082	op->direction=0;
1083	new_draw_info_format(NDI_UNIQUE | NDI_ALL, 5, NULL,
1084	"%s quits the game.",op->name);
1085
1086	strcpy(op->contr->killer,"quit");
1087	check_score(op);
1088	op->contr->party=NULL;
1089	if (settings.set_title == TRUE)
1090	op->contr->own_title[0]='\0';
1091
1092	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)) {
1093	mapstruct *mp, *next;
1094
1095	/* We need to hunt for any per player unique maps in memory and
1096	* get rid of them. The trailing slash in the path is intentional,
1097	* so that players named 'Ab' won't match against players 'Abe' pathname
1098	*/
1099	sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, op->name);
1100	for (mp=first_map; mp!=NULL; mp=next) {
1101	next = mp->next;
1102	if (!strncmp(mp->path, buf, strlen(buf)))
1103	delete_map(mp);
1104	}
1105
1106	delete_character(op->name, 1);
1107	}
1108	play_again(op);
1109	return 1;
1110	}
1111
1112	void flee_player(object *op) {	924	flee_player (object *op)
		925	{
1113	int dir,diff;	926	int dir, diff;
1114	rv_vector rv;	927	rv_vector rv;
1115		928
1116	if(op->stats.hp < 0) {	929	if (op->stats.hp < 0)
		930	{
1117	LOG(llevDebug, "Fleeing player is dead.\n");	931	LOG (llevDebug, "Fleeing player is dead.\n");
1118	CLEAR_FLAG(op, FLAG_SCARED);	932	CLEAR_FLAG (op, FLAG_SCARED);
		933	return;
		934	}
		935
		936	if (!op->enemy)
		937	{
		938	LOG (llevDebug, "Fleeing player had no enemy.\n");
		939	CLEAR_FLAG (op, FLAG_SCARED);
		940	return;
		941	}
		942
		943	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
		944	{
		945	op->enemy = NULL;
		946	CLEAR_FLAG (op, FLAG_SCARED);
		947	return;
		948	}
		949
		950	get_rangevector (op, op->enemy, &rv, 0);
		951
		952	dir = absdir (4 + rv.direction);
		953	for (diff = 0; diff < 3; diff++)
		954	{
		955	int m = 1 - rndm (2) * 2;
		956
		957	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1119	return;	958	return;
1120	}	959	}
1121		960
1122	if(op->enemy==NULL) {
1123	LOG(llevDebug,"Fleeing player had no enemy.\n");
1124	CLEAR_FLAG(op, FLAG_SCARED);
1125	return;
1126	}
1127
1128	/* Seen some crashes here. Since we don't store an
1129	* op->enemy_count, it is possible that something destroys the
1130	* actual enemy, and the object is recycled.
1131	*/
1132	if (op->enemy->map == NULL) {
1133	CLEAR_FLAG(op, FLAG_SCARED);
1134	op->enemy=NULL;
1135	return;
1136	}
1137
1138	if(!(random_roll(0, 4, op, PREFER_LOW)) && did_make_save(op, op->level, 0)) {
1139	op->enemy=NULL;
1140	CLEAR_FLAG(op, FLAG_SCARED);
1141	return;
1142	}
1143	get_rangevector(op, op->enemy, &rv, 0);
1144
1145	dir=absdir(4+rv.direction);
1146	for(diff=0;diff<3;diff++) {
1147	int m=1-(RANDOM()&2);
1148	if(move_ob(op,absdir(dir+diff*m),op)||
1149	(diff==0 && move_ob(op,absdir(dir-diff*m),op))) {
1150	return;
1151	}
1152	}
1153	/* Cornered, get rid of scared */	961	/* Cornered, get rid of scared */
1154	CLEAR_FLAG(op, FLAG_SCARED);	962	CLEAR_FLAG (op, FLAG_SCARED);
1155	op->enemy=NULL;	963	op->enemy = NULL;
1156	}	964	}
1157
1158		965
1159	/* check_pick sees if there is stuff to be picked up/picks up stuff.	966	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1160	* IT returns 1 if the player should keep on moving, 0 if he should	967	* It returns 1 if the player should keep on moving, 0 if he should
1161	* stop.	968	* stop.
1162	*/	969	*/
		970	int
1163	int check_pick(object *op) {	971	check_pick (object *op)
		972	{
1164	object *tmp, *next;	973	object *tmp, *next;
1165	tag_t next_tag=0, op_tag;
1166	int stop = 0;	974	int stop = 0;
1167	int j, k, wvratio;	975	int wvratio;
1168	char putstring[128], tmpstr[16];
1169
1170		976
1171	/* if you're flying, you cna't pick up anything */	977	/* if you're flying, you cna't pick up anything */
1172	if (op->move_type & MOVE_FLYING)	978	if (op->move_type & MOVE_FLYING)
1173	return 1;	979	return 1;
1174		980
1175	op_tag = op->count;
1176
1177	next = op->below;	981	next = op->below;
1178	if (next)	982
1179	next_tag = next->count;	983	int cnt = MAX_ITEM_PER_DROP;
		984	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1180		985
1181	/* loop while there are items on the floor that are not marked as	986	/* loop while there are items on the floor that are not marked as
1182	* destroyed */	987	* destroyed */
1183	while (next && ! was_destroyed (next, next_tag))	988	while (next && !next->destroyed ())
1184	{	989	{
1185	tmp = next;	990	tmp = next;
1186	next = tmp->below;	991	next = tmp->below;
1187	if (next)
1188	next_tag = next->count;
1189		992
1190	if (was_destroyed (op, op_tag))	993	if (cnt <= 0)
		994	{
		995	op->failmsg ("Couldn't pickup all items at once.");
		996	return 0;
		997	}
		998
		999	if (op->destroyed ())
1191	return 0;	1000	return 0;
1192		1001
1193	if ( ! can_pick (op, tmp))	1002	if (!can_pick (op, tmp))
1194	continue;	1003	continue;
1195		1004
1196	if (op->contr->search_str[0]!='\0' && settings.search_items == TRUE)	1005	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1197	{	1006	{
1198	if (item_matched_string (op, tmp, op->contr->search_str))	1007	if (item_matched_string (op, tmp, op->contr->search_str))
1199	pick_up (op, tmp);	1008	CHK_PICK_PICKUP;
		1009
1200	continue;	1010	continue;
1201	}
1202
1203	/* high not bit set? We're using the old autopickup model */
1204	if(!(op->contr->mode & PU_NEWMODE)) {
1205	switch (op->contr->mode) {
1206	case 0: return 1; /* don't pick up */
1207	case 1: pick_up (op, tmp);
1208	return 1;
1209	case 2: pick_up (op, tmp);
1210	return 0;
1211	case 3: return 0; /* stop before pickup */
1212	case 4: pick_up (op, tmp);
1213	break;
1214	case 5: pick_up (op, tmp);
1215	stop = 1;
1216	break;
1217	case 6:
1218	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) &&
1219	! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))
1220	pick_up(op, tmp);
1221	break;
1222
1223	case 7:
1224	if (tmp->type == MONEY || tmp->type == GEM)
1225	pick_up(op, tmp);
1226	break;
1227
1228	default:
1229	/* use value density */
1230	if ( ! QUERY_FLAG (tmp, FLAG_UNPAID)
1231	&& (query_cost (tmp, op, F_TRUE) * 100
1232	/ (tmp->weight * MAX (tmp->nrof, 1)))
1233	>= op->contr->mode)
1234	pick_up(op,tmp);
1235	}	1011	}
1236	}	1012
1237	else { /* old model */
1238	/* NEW pickup handling */	1013	/* pickup handling */
1239	if(op->contr->mode & PU_DEBUG)	1014	if (op->contr->mode & PU_DEBUG)
1240	{	1015	{
1241	/* some debugging code to figure out item information */	1016	/* some debugging code to figure out item information */
1242	if(tmp->name!=NULL)	1017	const char *str = tmp->name
1243	sprintf(putstring,"item name: %s item type: %d weight/value: %d",	1018	? format ("item name: %s item type: %d weight/value: %d",
1244	tmp->name, tmp->type,
1245	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1019	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
1246	else
1247	sprintf(putstring,"item name: %s item type: %d weight/value: %d",	1020	: format ("item name: %s item type: %d weight/value: %d",
1248	tmp->arch->name, tmp->type,
1249	(int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1021	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
		1022
1250	new_draw_info(NDI_UNIQUE, 0,op,putstring);	1023	new_draw_info (NDI_UNIQUE, 0, op, str);
1251
1252	sprintf(putstring,"...flags: ");
1253	for(k=0;k<4;k++)
1254	{
1255	for(j=0;j<32;j++)
1256	{
1257	if((tmp->flags[k]>>j)&0x01)
1258	{
1259	sprintf(tmpstr,"%d ",k*32+j);
1260	strcat(putstring, tmpstr);
1261	}
1262	}	1024	}
1263	}
1264	new_draw_info(NDI_UNIQUE, 0,op,putstring);
1265		1025
1266	#if 0	1026	if (op->contr->mode & PU_INHIBIT)
1267	/* print the flags too */	1027	return 1;
1268	for(k=0;k<4;k++)	1028
1269	{	1029	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
1270	fprintf(stderr,"%d [%d] ", k, k*32+31);	1030	return 1;
1271	for(j=0;j<32;j++)	1031
1272	{
1273	fprintf(stderr,"%d",tmp->flags[k]>>(31-j)&0x01);
1274	if(!((j+1)%4))fprintf(stderr," ");
1275	}
1276	fprintf(stderr," [%d]\n", k*32);
1277	}
1278	#endif
1279	}
1280	/* philosophy:	1032	/* philosophy:
1281	* It's easy to grab an item type from a pile, as long as it's	1033	* It's easy to grab an item type from a pile, as long as it's
1282	* generic. This takes no game-time. For more detailed pickups	1034	* generic. This takes no game-time. For more detailed pickups
1283	* and selections, select-items shoul dbe used. This is a	1035	* and selections, select-items should be used. This is a
1284	* grab-as-you-run type mode that's really useful for arrows for	1036	* grab-as-you-run type mode that's really useful for arrows for
1285	* example.	1037	* example.
1286	* The drawback: right now it has no frontend, so you need to	1038	* The drawback: right now it has no frontend, so you need to
1287	* stick the bits you want into a calculator in hex mode and then	1039	* stick the bits you want into a calculator in hex mode and then
1288	* convert to decimal and then 'pickup <#>	1040	* convert to decimal and then 'pickup <#>
…		…
1291	/* the first two modes are exclusive: if NOTHING we return, if	1043	/* the first two modes are exclusive: if NOTHING we return, if
1292	* STOP then we stop. All the rest are applied sequentially,	1044	* STOP then we stop. All the rest are applied sequentially,
1293	* meaning if any test passes, the item gets picked up. */	1045	* meaning if any test passes, the item gets picked up. */
1294		1046
1295	/* if mode is set to pick nothing up, return */	1047	/* if mode is set to pick nothing up, return */
1296
1297	if(op->contr->mode & PU_NOTHING) return 1;	1048	if (op->contr->mode == PU_NOTHING)
		1049	return 1;
1298		1050
1299	/* if mode is set to stop when encountering objects, return */	1051	/* if mode is set to stop when encountering objects, return */
1300	/* take STOP before INHIBIT since it doesn't actually pick	1052	/* take STOP before INHIBIT since it doesn't actually pick
1301	* anything up */	1053	* anything up */
1302
1303	if(op->contr->mode & PU_STOP) return 0;	1054	if (op->contr->mode & PU_STOP)
		1055	return 0;
1304		1056
1305	/* useful for going into stores and not losing your settings... */	1057	/* useful for going into stores and not losing your settings... */
1306	/* and for battles wher you don't want to get loaded down while	1058	/* and for battles wher you don't want to get loaded down while
1307	* fighting */	1059	* fighting */
1308	if(op->contr->mode & PU_INHIBIT) return 1;	1060	if (op->contr->mode & PU_INHIBIT)
		1061	return 1;
1309		1062
1310	/* prevent us from turning into auto-thieves :) */	1063	/* prevent us from turning into auto-thieves :) */
1311	if (QUERY_FLAG (tmp, FLAG_UNPAID)) continue;	1064	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		1065	continue;
1312		1066
1313	/* ignore known cursed objects */	1067	/* ignore known cursed objects */
1314	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) continue;	1068	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
		1069	continue;
1315		1070
1316	/* all food and drink if desired */	1071	/* all food and drink if desired */
1317	/* question: don't pick up known-poisonous stuff? */	1072	/* question: don't pick up known-poisonous stuff? */
1318	if(op->contr->mode & PU_FOOD)	1073	if (op->contr->mode & PU_FOOD)
1319	if (tmp->type == FOOD)	1074	if (tmp->type == FOOD)
1320	{ pick_up(op, tmp); if(0)fprintf(stderr,"FOOD\n"); continue; }	1075	{
		1076	CHK_PICK_PICKUP;
		1077	continue;
		1078	}
		1079
1321	if(op->contr->mode & PU_DRINK)	1080	if (op->contr->mode & PU_DRINK)
1322	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)))	1081	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1323	{ pick_up(op, tmp); if(0)fprintf(stderr,"DRINK\n"); continue; }	1082	{
		1083	CHK_PICK_PICKUP;
		1084	continue;
		1085	}
1324		1086
1325	if(op->contr->mode & PU_POTION)	1087	if (op->contr->mode & PU_POTION)
1326	if (tmp->type == POTION)	1088	if (tmp->type == POTION)
1327	{ pick_up(op, tmp); if(0)fprintf(stderr,"POTION\n"); continue; }	1089	{
		1090	CHK_PICK_PICKUP;
		1091	continue;
		1092	}
1328		1093
1329	/* spellbooks, skillscrolls and normal books/scrolls */	1094	/* spellbooks, skillscrolls and normal books/scrolls */
1330	if(op->contr->mode & PU_SPELLBOOK)	1095	if (op->contr->mode & PU_SPELLBOOK)
1331	if (tmp->type == SPELLBOOK)	1096	if (tmp->type == SPELLBOOK)
1332	{ pick_up(op, tmp); if(0)fprintf(stderr,"SPELLBOOK\n"); continue; }	1097	{
		1098	CHK_PICK_PICKUP;
		1099	continue;
		1100	}
		1101
1333	if(op->contr->mode & PU_SKILLSCROLL)	1102	if (op->contr->mode & PU_SKILLSCROLL)
1334	if (tmp->type == SKILLSCROLL)	1103	if (tmp->type == SKILLSCROLL)
1335	{ pick_up(op, tmp); if(0)fprintf(stderr,"SKILLSCROLL\n"); continue; }	1104	{
		1105	CHK_PICK_PICKUP;
		1106	continue;
		1107	}
		1108
1336	if(op->contr->mode & PU_READABLES)	1109	if (op->contr->mode & PU_READABLES)
1337	if (tmp->type == BOOK || tmp->type == SCROLL)	1110	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1338	{ pick_up(op, tmp); if(0)fprintf(stderr,"READABLES\n"); continue; }	1111	{
		1112	CHK_PICK_PICKUP;
		1113	continue;
		1114	}
1339		1115
1340	/* wands/staves/rods/horns */	1116	/* wands/staves/rods/horns */
1341	if (op->contr->mode & PU_MAGIC_DEVICE)	1117	if (op->contr->mode & PU_MAGIC_DEVICE)
1342	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1118	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1343	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGIC_DEVICE\n"); continue; }	1119	{
		1120	CHK_PICK_PICKUP;
		1121	continue;
		1122	}
1344		1123
1345	/* pick up all magical items */	1124	/* pick up all magical items */
1346	if(op->contr->mode & PU_MAGICAL)	1125	if (op->contr->mode & PU_MAGICAL)
1347	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && ! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))	1126	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1348	{ pick_up(op, tmp); if(0)fprintf(stderr,"MAGICAL\n"); continue; }	1127	{
		1128	CHK_PICK_PICKUP;
		1129	continue;
		1130	}
1349		1131
1350	if(op->contr->mode & PU_VALUABLES)	1132	if (op->contr->mode & PU_VALUABLES)
1351	{	1133	{
1352	if (tmp->type == MONEY || tmp->type == GEM)	1134	if (tmp->type == MONEY || tmp->type == GEM)
1353	{ pick_up(op, tmp); if(0)fprintf(stderr,"MONEY/GEM\n"); continue; }	1135	{
		1136	CHK_PICK_PICKUP;
		1137	continue;
		1138	}
1354	}	1139	}
1355		1140
1356	/* rings & amulets - talismans seems to be typed AMULET */	1141	/* rings & amulets - talismans seems to be typed AMULET */
1357	if(op->contr->mode & PU_JEWELS)	1142	if (op->contr->mode & PU_JEWELS)
1358	if (tmp->type == RING || tmp->type == AMULET)	1143	if (tmp->type == RING || tmp->type == AMULET)
1359	{ pick_up(op, tmp); if(0)fprintf(stderr,"JEWELS\n"); continue; }	1144	{
		1145	CHK_PICK_PICKUP;
		1146	continue;
		1147	}
		1148
		1149	/* we don't forget dragon food */
		1150	if (op->contr->mode & PU_FLESH)
		1151	if (tmp->type == FLESH)
		1152	{
		1153	CHK_PICK_PICKUP;
		1154	continue;
		1155	}
1360		1156
1361	/* bows and arrows. Bows are good for selling! */	1157	/* bows and arrows. Bows are good for selling! */
1362	if(op->contr->mode & PU_BOW)	1158	if (op->contr->mode & PU_BOW)
1363	if (tmp->type == BOW)	1159	if (tmp->type == BOW)
1364	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOW\n"); continue; }	1160	{
		1161	CHK_PICK_PICKUP;
		1162	continue;
		1163	}
		1164
1365	if(op->contr->mode & PU_ARROW)	1165	if (op->contr->mode & PU_ARROW)
1366	if (tmp->type == ARROW)	1166	if (tmp->type == ARROW)
1367	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARROW\n"); continue; }	1167	{
		1168	CHK_PICK_PICKUP;
		1169	continue;
		1170	}
1368		1171
1369	/* all kinds of armor etc. */	1172	/* all kinds of armor etc. */
1370	if(op->contr->mode & PU_ARMOUR)	1173	if (op->contr->mode & PU_ARMOUR)
1371	if (tmp->type == ARMOUR)	1174	if (tmp->type == ARMOUR)
1372	{ pick_up(op, tmp); if(0)fprintf(stderr,"ARMOUR\n"); continue; }	1175	{
		1176	CHK_PICK_PICKUP;
		1177	continue;
		1178	}
		1179
1373	if(op->contr->mode & PU_HELMET)	1180	if (op->contr->mode & PU_HELMET)
1374	if (tmp->type == HELMET)	1181	if (tmp->type == HELMET)
1375	{ pick_up(op, tmp); if(0)fprintf(stderr,"HELMET\n"); continue; }	1182	{
		1183	CHK_PICK_PICKUP;
		1184	continue;
		1185	}
		1186
1376	if(op->contr->mode & PU_SHIELD)	1187	if (op->contr->mode & PU_SHIELD)
1377	if (tmp->type == SHIELD)	1188	if (tmp->type == SHIELD)
1378	{ pick_up(op, tmp); if(0)fprintf(stderr,"SHIELD\n"); continue; }	1189	{
		1190	CHK_PICK_PICKUP;
		1191	continue;
		1192	}
		1193
1379	if(op->contr->mode & PU_BOOTS)	1194	if (op->contr->mode & PU_BOOTS)
1380	if (tmp->type == BOOTS)	1195	if (tmp->type == BOOTS)
1381	{ pick_up(op, tmp); if(0)fprintf(stderr,"BOOTS\n"); continue; }	1196	{
		1197	CHK_PICK_PICKUP;
		1198	continue;
		1199	}
		1200
1382	if(op->contr->mode & PU_GLOVES)	1201	if (op->contr->mode & PU_GLOVES)
1383	if (tmp->type == GLOVES)	1202	if (tmp->type == GLOVES)
1384	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }	1203	{
		1204	CHK_PICK_PICKUP;
		1205	continue;
		1206	}
		1207
1385	if(op->contr->mode & PU_CLOAK)	1208	if (op->contr->mode & PU_CLOAK)
1386	if (tmp->type == CLOAK)	1209	if (tmp->type == CLOAK)
1387	{ pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; }	1210	{
		1211	CHK_PICK_PICKUP;
		1212	continue;
		1213	}
1388		1214
1389	/* hoping to catch throwing daggers here */	1215	/* hoping to catch throwing daggers here */
1390	if(op->contr->mode & PU_MISSILEWEAPON)	1216	if (op->contr->mode & PU_MISSILEWEAPON)
1391	if(tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_IS_THROWN))	1217	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1392	{ pick_up(op, tmp); if(0)fprintf(stderr,"MISSILEWEAPON\n"); continue; }	1218	{
		1219	CHK_PICK_PICKUP;
		1220	continue;
		1221	}
1393		1222
1394	/* careful: chairs and tables are weapons! */	1223	/* careful: chairs and tables are weapons! */
1395	if(op->contr->mode & PU_ALLWEAPON)	1224	if (op->contr->mode & PU_ALLWEAPON)
1396	{
1397	if(tmp->type == WEAPON && tmp->name!=NULL)
1398	{
1399	if(strstr(tmp->name,"table")==NULL && strstr(tmp->arch->name,"table")==NULL &&
1400	strstr(tmp->name,"chair") && strstr(tmp->arch->name,"chair")==NULL)
1401	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }
1402	}	1225	{
1403	if(tmp->type == WEAPON && tmp->name==NULL)	1226	if (tmp->type == WEAPON)
		1227	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
		1228	{
		1229	CHK_PICK_PICKUP;
		1230	continue;
		1231	}
1404	{	1232	}
1405	if(strstr(tmp->arch->name,"table")==NULL &&
1406	strstr(tmp->arch->name,"chair")==NULL)
1407	{ pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; }
1408	}
1409	}
1410		1233
1411	/* misc stuff that's useful */	1234	/* misc stuff that's useful */
1412	if(op->contr->mode & PU_KEY)	1235	if (op->contr->mode & PU_KEY)
1413	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)	1236	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1414	{ pick_up(op, tmp); if(0)fprintf(stderr,"KEY\n"); continue; }	1237	{
		1238	CHK_PICK_PICKUP;
		1239	continue;
		1240	}
1415		1241
1416	/* any of the last 4 bits set means we use the ratio for value	1242	/* any of the last 4 bits set means we use the ratio for value
1417	* pickups */	1243	* pickups */
1418	if(op->contr->mode & PU_RATIO)	1244	if (op->contr->mode & PU_RATIO)
1419	{	1245	{
1420	/* use value density to decide what else to grab */	1246	/* use value density to decide what else to grab */
1421	/* >=7 was >= op->contr->mode */	1247	/* >=7 was >= op->contr->mode */
1422	/* >=7 is the old standard setting. Now we take the last 4 bits	1248	/* >=7 is the old standard setting. Now we take the last 4 bits
1423	* and multiply them by 5, giving 0..15*5== 5..75 */	1249	*/
1424	wvratio=(op->contr->mode & PU_RATIO) * 5;	1250	wvratio = op->contr->mode & PU_RATIO;
1425	if ((query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof, 1))) >= wvratio)	1251	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1426	{	1252	{
1427	pick_up(op, tmp);
1428	#if 0	1253	#if 0
1429	fprintf(stderr,"HIGH WEIGHT/VALUE [");	1254	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1430	if(tmp->name!=NULL) {	1255	if (tmp->name != NULL)
		1256	{
1431	fprintf(stderr,"%s", tmp->name);	1257	fprintf (stderr, "%s", tmp->name);
1432	}	1258	}
		1259	else
1433	else fprintf(stderr,"%s",tmp->arch->name);	1260	fprintf (stderr, "%s", tmp->arch->archname);
1434	fprintf(stderr,",%d] = ", tmp->type);	1261	fprintf (stderr, ",%d] = ", tmp->type);
1435	fprintf(stderr,"%d\n",(int)(query_cost(tmp,op,F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));	1262	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1436	#endif	1263	#endif
		1264	CHK_PICK_PICKUP;
1437	continue;	1265	continue;
1438	}	1266	}
		1267	} /* the new pickup model */
1439	}	1268	}
1440	} /* the new pickup model */	1269
1441	}
1442	return ! stop;	1270	return !stop;
1443	}	1271	}
1444		1272
1445	/*	1273	/*
1446	* Find an arrow in the inventory and after that	1274	* Find an arrow in the inventory and after that
1447	* in the right type container (quiver). Pointer to the	1275	* in the right type container (quiver). Pointer to the
1448	* found object is returned.	1276	* found object is returned.
1449	*/	1277	*/
		1278	object *
1450	object *find_arrow(object *op, const char *type)	1279	find_arrow (object *op, const char *type)
1451	{	1280	{
1452	object *tmp = NULL;	1281	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1282	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1283	return splay (tmp);
1453		1284
1454	for(op=op->inv; op; op=op->below)	1285	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1455	if(!tmp && op->type==CONTAINER && op->race==type &&	1286	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1456	QUERY_FLAG(op,FLAG_APPLIED))	1287	if (object *arrow = find_arrow (tmp, type))
1457	tmp = find_arrow (op, type);	1288	{
1458	else if (op->type==ARROW && op->race==type)	1289	splay (tmp);
1459	return op;	1290	return arrow;
		1291	}
		1292
1460	return tmp;	1293	return 0;
1461	}	1294	}
1462		1295
1463	/*	1296	/*
1464	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1297	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1465	* against the target. A full test is not performed, simply a basic test	1298	* against the target. A full test is not performed, simply a basic test
1466	* of resistances. The archer is making a quick guess at what he sees down	1299	* of resistances. The archer is making a quick guess at what he sees down
1467	* the hall. Failing that it does it's best to pick the highest plus arrow.	1300	* the hall. Failing that it does it's best to pick the highest plus arrow.
1468	*/	1301	*/
1469		1302	object *
1470	object *find_better_arrow(object *op, object *target, const char *type, int *better)	1303	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1471	{	1304	{
1472	object *tmp = NULL, *arrow, *ntmp;	1305	object *tmp = NULL, *arrow, *ntmp;
1473	int attacknum, attacktype, betterby=0, i;	1306	int attacknum, attacktype, betterby = 0, i;
1474		1307
1475	if (!type)	1308	if (!type)
1476	return NULL;	1309	return NULL;
1477		1310
1478	for (arrow=op->inv; arrow; arrow=arrow->below) {	1311	for (arrow = op->inv; arrow; arrow = arrow->below)
1479	if (arrow->type==CONTAINER && arrow->race==type &&	1312	{
1480	QUERY_FLAG(arrow, FLAG_APPLIED)) {	1313	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
		1314	{
1481	i = 0;	1315	i = 0;
1482	ntmp = find_better_arrow(arrow, target, type, &i);	1316	ntmp = find_better_arrow (arrow, target, type, &i);
		1317
1483	if (i > betterby) {	1318	if (i > betterby)
		1319	{
1484	tmp = ntmp;	1320	tmp = ntmp;
1485	betterby = i;	1321	betterby = i;
1486	}	1322	}
		1323	}
1487	} else if (arrow->type==ARROW && arrow->race==type) {	1324	else if (arrow->type == ARROW && arrow->race == type)
		1325	{
1488	/* allways prefer assasination/slaying */	1326	/* allways prefer assasination/slaying */
1489	if (target->race != NULL && arrow->slaying != NULL &&	1327	if (target->race && arrow->slaying && arrow->slaying.contains (target->race))
1490	strstr(arrow->slaying, target->race)) {	1328	{
1491	if (arrow->attacktype & AT_DEATH) {	1329	if (arrow->attacktype & AT_DEATH)
		1330	{
1492	*better = 100;	1331	*better = 100;
1493	return arrow;	1332	return arrow;
1494	} else {
1495	tmp = arrow;
1496	betterby = (arrow->magic + arrow->stats.dam) * 2;
1497	}	1333	}
1498	} else {	1334	else
1499	for (attacknum=0; attacknum < NROFATTACKS; attacknum++) {
1500	attacktype = 1<<attacknum;
1501	if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)
1502	if (((arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100) > betterby) {
1503	tmp = arrow;
1504	betterby = (arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100;
1505	}
1506	}	1335	{
1507	if ((2 + arrow->magic + arrow->stats.dam) > betterby) {
1508	tmp = arrow;	1336	tmp = arrow;
1509	betterby = 2 + arrow->magic + arrow->stats.dam;	1337	betterby = (arrow->magic + arrow->stats.dam) * 2;
1510	}
1511	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) {
1512	tmp = arrow;
1513	betterby = 1 + arrow->magic + arrow->stats.dam;
1514	}	1338	}
1515	}	1339	}
		1340	else
		1341	{
		1342	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
		1343	{
		1344	attacktype = 1 << attacknum;
		1345	if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
		1346	if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
		1347	{
		1348	tmp = arrow;
		1349	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
		1350	}
		1351	}
		1352
		1353	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
		1354	{
		1355	tmp = arrow;
		1356	betterby = 2 + arrow->magic + arrow->stats.dam;
		1357	}
		1358
		1359	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
		1360	{
		1361	tmp = arrow;
		1362	betterby = 1 + arrow->magic + arrow->stats.dam;
		1363	}
1516	}	1364	}
		1365	}
1517	}	1366	}
		1367
1518	if (tmp == NULL && arrow == NULL)	1368	if (tmp == NULL && arrow == NULL)
1519	return find_arrow(op, type);	1369	return find_arrow (op, type);
1520		1370
1521	*better = betterby;	1371	*better = betterby;
1522	return tmp;	1372	return tmp;
1523	}	1373	}
1524		1374
1525	/* looks in a given direction, finds the first valid target, and calls	1375	/* looks in a given direction, finds the first valid target, and calls
1526	* find_better_arrow to find a decent arrow to use.	1376	* find_better_arrow to find a decent arrow to use.
1527	* op = the shooter	1377	* op = the shooter
1528	* type = bow->race	1378	* type = bow->race
1529	* dir = fire direction	1379	* dir = fire direction
1530	*/	1380	*/
1531		1381	object *
1532	object *pick_arrow_target(object *op, const char *type, int dir)	1382	pick_arrow_target (object *op, shstr_cmp type, int dir)
1533	{	1383	{
1534	object *tmp = NULL;	1384	object *tmp = NULL;
1535	mapstruct *m;	1385	maptile *m;
1536	int i, mflags, found, number;	1386	int i, mflags, found, number;
1537	sint16 x, y;	1387	sint16 x, y;
1538		1388
1539	if (op->map == NULL)	1389	if (op->map == NULL)
1540	return find_arrow(op, type);	1390	return find_arrow (op, type);
1541		1391
1542	/* do a dex check */	1392	/* do a dex check */
1543	number = (die_roll(2, 40, op, PREFER_LOW)-2)/2;	1393	number = (die_roll (2, 40, op, PREFER_LOW) - 2) / 2;
1544	if (number > (op->stats.Dex + (op->chosen_skill?op->chosen_skill->level:op->level)))	1394	if (number > (op->stats.Dex + (op->chosen_skill ? op->chosen_skill->level : op->level)))
1545	return find_arrow(op, type);	1395	return find_arrow (op, type);
1546		1396
1547	m = op->map;	1397	m = op->map;
1548	x = op->x;	1398	x = op->x;
1549	y = op->y;	1399	y = op->y;
1550		1400
1551	/* find the first target */	1401	/* find the first target */
1552	for (i=0, found=0; i<20; i++) {	1402	for (i = 0, found = 0; i < 20; i++)
		1403	{
1553	x += freearr_x[dir];	1404	x += freearr_x[dir];
1554	y += freearr_y[dir];	1405	y += freearr_y[dir];
1555	mflags = get_map_flags(m, &m, x, y, &x, &y);	1406	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1407
1556	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) {	1408	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
		1409	{
1557	tmp = NULL;	1410	tmp = 0;
		1411	break;
		1412	}
		1413	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
		1414	{
		1415	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
		1416	* perhaps a bad assumption.
		1417	*/
		1418	tmp = 0;
		1419	break;
		1420	}
		1421
		1422	if (mflags & P_IS_ALIVE)
		1423	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
		1424	if (QUERY_FLAG (tmp, FLAG_ALIVE))
1558	break;	1425	break;
1559	} else if (GET_MAP_MOVE_BLOCK(m, x, y) == MOVE_FLY_LOW) {
1560	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1561	* perhaps a bad assumption.
1562	*/
1563	tmp = NULL;
1564	break;
1565	}
1566	if (mflags & P_IS_ALIVE) {
1567	for (tmp = GET_MAP_OB(m, x, y); tmp; tmp=tmp->above)
1568	if (QUERY_FLAG(tmp, FLAG_ALIVE)) {
1569	found++;
1570	break;
1571	}
1572	if (found)
1573	break;
1574	}
1575	}	1426	}
1576	if (tmp == NULL)	1427
		1428	if (!tmp)
1577	return find_arrow(op, type);	1429	return find_arrow (op, type);
1578		1430
1579	if (tmp->head)	1431	if (tmp->head)
1580	tmp = tmp->head;	1432	tmp = tmp->head;
1581		1433
1582	return find_better_arrow(op, tmp, type, &i);	1434	return find_better_arrow (op, tmp, type, &i);
1583	}	1435	}
1584		1436
1585	/*	1437	/*
1586	* Creature fires a bow - op can be monster or player. Returns	1438	* Creature fires a bow - op can be monster or player. Returns
1587	* 1 if bow was actually fired, 0 otherwise.	1439	* 1 if bow was actually fired, 0 otherwise.
…		…
1590	* dir is the direction of fire.	1442	* dir is the direction of fire.
1591	* wc_mod is any special modifier to give (used in special player fire modes)	1443	* wc_mod is any special modifier to give (used in special player fire modes)
1592	* sx, sy are coordinates to fire arrow from - also used in some of the special	1444	* sx, sy are coordinates to fire arrow from - also used in some of the special
1593	* player fire modes.	1445	* player fire modes.
1594	*/	1446	*/
		1447	int
1595	int fire_bow(object *op, object *part, object *arrow, int dir, int wc_mod,	1448	fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1596	sint16 sx, sint16 sy)
1597	{	1449	{
1598	object *left, *bow;	1450	object *left, *bow;
1599	tag_t left_tag, tag;	1451	int mflags;
1600	int bowspeed, mflags;	1452	maptile *m;
1601	mapstruct *m;
1602		1453
1603	if (!dir) {	1454	if (!dir)
		1455	{
1604	new_draw_info(NDI_UNIQUE, 0, op, "You can't shoot yourself!");	1456	new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1605	return 0;	1457	return 0;
		1458	}
		1459
		1460	if (op->contr)
		1461	bow = op->current_weapon;
		1462	else
1606	}	1463	{
1607	if (op->type == PLAYER)
1608	bow=op->contr->ranges[range_bow];
1609	else {
1610	for(bow=op->inv; bow; bow=bow->below)	1464	for (bow = op->inv; bow; bow = bow->below)
1611	/* Don't check for applied - monsters don't apply bows - in that way, they	1465	/* Don't check for applied - monsters don't apply bows - in that way, they
1612	* don't need to switch back and forth between bows and weapons.	1466	* don't need to switch back and forth between bows and weapons.
1613	*/	1467	*/
1614	if(bow->type==BOW)	1468	if (bow->type == BOW)
1615	break;	1469	break;
1616		1470
1617	if (!bow) {	1471	if (!bow)
		1472	{
1618	LOG (llevError, "Range: bow without activated bow (%s).\n", op->name);	1473	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1619	return 0;	1474	return 0;
		1475	}
		1476
		1477	// optimisation: move object to top so we will find it quickly again
		1478	if (bow->below)
1620	}	1479	{
		1480	bow->remove ();
		1481	op->insert (bow);
		1482	}
1621	}	1483	}
		1484
1622	if( !bow->race || !bow->skill) {	1485	if (!bow->race || !bow->skill)
		1486	{
1623	new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", bow->name);	1487	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1624	return 0;	1488	return 0;
1625	}	1489	}
1626		1490
1627	bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1628
1629	/* penalize ROF for bestarrow */
1630	if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1631	bowspeed -= dex_bonus[op->stats.Dex] + 5;
1632	if (bowspeed < 1)
1633	bowspeed = 1;
1634
1635	if (arrow == NULL) {	1491	if (arrow == NULL)
		1492	{
1636	if ((arrow=find_arrow(op, bow->race)) == NULL) {	1493	if ((arrow = find_arrow (op, bow->race)) == NULL)
		1494	{
1637	if (op->type == PLAYER)	1495	if (op->type == PLAYER)
1638	new_draw_info_format(NDI_UNIQUE, 0, op,	1496	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1639	"You have no %s left.", bow->race);
1640	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1497	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1641	else	1498	else
1642	CLEAR_FLAG(op, FLAG_READY_BOW);	1499	CLEAR_FLAG (op, FLAG_READY_BOW);
		1500
1643	return 0;	1501	return 0;
1644	}	1502	}
1645	}	1503	}
		1504
1646	mflags = get_map_flags(op->map, &m, sx, sy, &sx, &sy);	1505	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1647	if (mflags & P_OUT_OF_MAP) {	1506	if (mflags & P_OUT_OF_MAP)
1648	return 0;	1507	return 0;
1649	}	1508
1650	if (GET_MAP_MOVE_BLOCK(m, sx, sy) == MOVE_FLY_LOW) {	1509	if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
		1510	{
1651	new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");	1511	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1652	return 0;	1512	return 0;
1653	}	1513	}
1654		1514
1655	/* this should not happen, but sometimes does */	1515	/* this should not happen, but sometimes does */
1656	if (arrow->nrof==0) {	1516	if (arrow->nrof == 0)
1657	remove_ob(arrow);	1517	{
1658	free_object(arrow);	1518	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
		1519	arrow->destroy ();
1659	return 0;	1520	return 0;
1660	}	1521	}
1661		1522
1662	left = arrow; /* these are arrows left to the player */	1523	left = arrow; /* these are arrows left to the player */
1663	left_tag = left->count;	1524	arrow = arrow->split ();
1664	arrow = get_split_ob(arrow, 1);	1525	if (!arrow)
1665	if (arrow == NULL) {	1526	{
1666	new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.",	1527	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1667	bow->race);
1668	return 0;	1528	return 0;
1669	}	1529	}
1670	set_owner(arrow, op);	1530
1671	if (arrow->skill) free_string(arrow->skill);	1531	arrow->set_owner (op);
1672	arrow->skill = add_refcount(bow->skill);	1532	arrow->skill = bow->skill;
1673
1674	arrow->direction=dir;	1533	arrow->direction = dir;
1675	arrow->x = sx;
1676	arrow->y = sy;
1677		1534
1678	if (op->type == PLAYER) {
1679	op->speed_left = 0.01 - (float)FABS(op->speed) * 100 / bowspeed;
1680	fix_player(op);
1681	}
1682
1683	SET_ANIMATION(arrow, arrow->direction);
1684	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1535	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1685	arrow->stats.hp = arrow->stats.dam;	1536	arrow->stats.hp = arrow->stats.dam;
1686	arrow->stats.grace = arrow->attacktype;	1537	arrow->stats.grace = arrow->attacktype;
		1538
1687	if (arrow->slaying != NULL)	1539	if (arrow->slaying)
1688	arrow->spellarg = strdup_local(arrow->slaying);	1540	arrow->spellarg = strdup (arrow->slaying);
1689		1541
1690	/* Note that this was different for monsters - they got their level	1542	#if 0
1691	* added to the damage. I think the strength bonus is more proper.	1543	if (player *pl = op->contr)
1692	*/
1693		1544	{
1694	arrow->stats.dam += (QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?	1545	float speed = pl->weapon_sp;
1695	0 : dam_bonus[op->stats.Str]) +
1696	bow->stats.dam + bow->magic + arrow->magic;
1697		1546
		1547	/* penalize ROF for bestarrow */
		1548	if (pl->bowtype == bow_bestarrow)
		1549	speed *= .9f;
		1550	else
		1551	speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
		1552
		1553	op->speed_left += speed - op->speed;
		1554	}
		1555	#endif
		1556
		1557	SET_ANIMATION (arrow, arrow->direction);
		1558
1698	/* update the speed */	1559	/* update the speed */
1699	arrow->speed = (float)((QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?	1560	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1700	0 : dam_bonus[op->stats.Str]) +
1701	bow->magic + arrow->magic) / 5.0 +
1702	(float)bow->stats.dam / 7.0;	1561	+ bow->stats.dam / 7.f;
1703		1562
1704	if (arrow->speed < 1.0)	1563	arrow->set_speed (max (arrow->speed, 2.f));
1705	arrow->speed = 1.0;
1706	update_ob_speed(arrow);
1707	arrow->speed_left = 0;	1564	arrow->speed_left = 0;
1708		1565
		1566	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1567
1709	if (op->type == PLAYER) {	1568	if (op->type == PLAYER)
1710	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1569	{
1711	(op->chosen_skill?op->chosen_skill->level:op->level) -
1712	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] -
1713	arrow->stats.wc - bow->stats.wc + wc_mod;
1714
1715	arrow->level = op->chosen_skill?op->chosen_skill->level:op->level;	1570	arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1716	} else {	1571	wc -= dex_bonus[op->stats.Dex];
1717	arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic -
1718	arrow->stats.wc + wc_mod;
1719		1572
		1573	if (!arrow->slaying)
		1574	arrow->slaying = op->slaying;
		1575
		1576	arrow->attacktype |= op->attacktype;
		1577	}
		1578	else
		1579	{
1720	arrow->level = op->level;	1580	arrow->level = op->level;
1721	}	1581	arrow->stats.wc -= bow->magic;
1722	if (arrow->attacktype == AT_PHYSICAL)	1582
		1583	if (!arrow->slaying)
		1584	arrow->slaying = bow->slaying;
		1585
1723	arrow->attacktype |= bow->attacktype;	1586	arrow->attacktype |= bow->attacktype;
1724	if (bow->slaying != NULL)	1587	}
1725	arrow->slaying = add_string(bow->slaying);
1726		1588
1727	arrow->map = m;	1589	wc -= arrow->level;
		1590	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
		1591
		1592	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1728	arrow->move_type = MOVE_FLY_LOW;	1593	arrow->move_type = MOVE_FLY_LOW;
1729	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1594	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1730		1595
1731	play_sound_map(op->map, op->x, op->y, SOUND_FIRE_ARROW);	1596	op->play_sound (sound_find ("fire_arrow"));
1732	tag = arrow->count;	1597	m->insert (arrow, sx, sy, op);
1733	insert_ob_in_map(arrow, m, op, 0);
1734		1598
1735	if (!was_destroyed(arrow, tag))	1599	if (!arrow->destroyed ())
1736	move_arrow(arrow);	1600	move_arrow (arrow);
1737		1601
1738	if (op->type == PLAYER) {
1739	if (was_destroyed (left, left_tag))
1740	esrv_del_item(op->contr, left_tag);
1741	else
1742	esrv_send_item(op, left);
1743	}
1744	return 1;	1602	return 1;
1745	}	1603	}
1746		1604
1747	/* Special fire code for players - this takes into	1605	/* Special fire code for players - this takes into
1748	* account the special fire modes players can have	1606	* account the special fire modes players can have
1749	* but monsters can't. Putting that code here	1607	* but monsters can't. Putting that code here
1750	* makes the fire_bow code much cleaner.	1608	* makes the fire_bow code much cleaner.
1751	* this function should only be called if 'op' is a player,	1609	* this function should only be called if 'op' is a player,
1752	* hence the function name.	1610	* hence the function name.
1753	*/	1611	*/
		1612	int
1754	int player_fire_bow(object *op, int dir)	1613	player_fire_bow (object *op, int dir)
1755	{	1614	{
1756	int ret=0, wcmod=0;	1615	int ret;
1757		1616
1758	if (op->contr->bowtype == bow_bestarrow) {	1617	if (op->contr->bowtype == bow_bestarrow)
1759	ret = fire_bow(op, op,	1618	{
1760	pick_arrow_target(op, op->contr->ranges[range_bow]->race, dir),	1619	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1761	dir, 0, op->x, op->y);	1620	}
1762	} else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) {	1621	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
		1622	{
1763	if (!similar_direction(dir, op->contr->bowtype - bow_n + 1))	1623	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1764	wcmod =-1;
1765	ret = fire_bow(op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod,	1624	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1766	op->x, op->y);	1625	}
1767	} else if (op->contr->bowtype == bow_threewide) {	1626	else if (op->contr->bowtype == bow_threewide)
		1627	{
		1628	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
		1629	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
		1630	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
		1631	}
		1632	else if (op->contr->bowtype == bow_spreadshot)
		1633	{
		1634	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
		1635	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
		1636	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
		1637	}
		1638	else
		1639	{
		1640	/* Simple case */
1768	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);	1641	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1769	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir+2)], op->y + freearr_y[absdir(dir+2)]);
1770	ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir-2)], op->y + freearr_y[absdir(dir-2)]);
1771	} else if (op->contr->bowtype == bow_spreadshot) {
1772	ret |= fire_bow(op, op, NULL, dir, 0, op->x, op->y);
1773	ret |= fire_bow(op, op, NULL, absdir(dir-1), -5, op->x, op->y);
1774	ret |= fire_bow(op, op, NULL, absdir(dir+1), -5, op->x, op->y);
1775
1776	} else {
1777	/* Simple case */
1778	ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y);
1779	}	1642	}
		1643
1780	return ret;	1644	return ret;
1781	}	1645	}
1782
1783		1646
1784	/* Fires a misc (wand/rod/horn) object in 'dir'.	1647	/* Fires a misc (wand/rod/horn) object in 'dir'.
1785	* Broken apart from 'fire' to keep it more readable.	1648	* Broken apart from 'fire' to keep it more readable.
1786	*/	1649	*/
		1650	void
1787	void fire_misc_object(object *op, int dir)	1651	fire_misc_object (object *op, int dir)
1788	{	1652	{
1789	object *item;	1653	object *item = op->contr->ranged_ob;
1790		1654
1791	if (!op->contr->ranges[range_misc]) {	1655	if (!item)
		1656	{
1792	new_draw_info(NDI_UNIQUE, 0,op,"You have range item readied.");	1657	new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1793	return;	1658	return;
1794	}	1659	}
1795		1660
1796	item = op->contr->ranges[range_misc];
1797	if (!item->inv) {	1661	if (!item->inv)
		1662	{
1798	LOG(llevError,"Object %s lacks a spell\n", item->name);	1663	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1799	return;	1664	return;
1800	}	1665	}
		1666
		1667	if (!op->change_weapon (item))
		1668	return;
		1669
1801	if (item->type == WAND) {	1670	if (item->type == WAND)
		1671	{
1802	if(item->stats.food<=0) {	1672	if (item->stats.food <= 0)
1803	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);	1673	{
		1674	op->contr->play_sound (sound_find ("wand_poof"));
1804	new_draw_info_format(NDI_UNIQUE, 0,op,"The %s goes poof.", query_base_name(item, 0));	1675	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
		1676
1805	return;	1677	return;
1806	}	1678	}
		1679	}
1807	} else if (item->type == ROD || item->type==HORN) {	1680	else if (item->type == ROD || item->type == HORN)
		1681	{
1808	if(item->stats.hp<MAX(item->inv->stats.sp, item->inv->stats.grace)) {	1682	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1809	play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);	1683
		1684	// using the maximum of the rods charge allows at least one spell cast
		1685	// for a rod or horn, this fixes some broken rods.
		1686	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
		1687	{
		1688	op->contr->play_sound (sound_find ("wand_poof"));
		1689
1810	if (item->type== ROD)	1690	if (item->type == ROD)
1811	new_draw_info_format(NDI_UNIQUE, 0,op,
1812	"The %s whines for a while, but nothing happens.", query_base_name(item,0));	1691	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1813	else	1692	else
1814	new_draw_info_format(NDI_UNIQUE, 0,op,	1693	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1815	"The %s needs more time to charge.", query_base_name(item,0));	1694
1816	return;	1695	return;
1817	}	1696	}
1818	}	1697	}
1819		1698
1820	if(cast_spell(op,item,dir,item->inv,NULL)) {	1699	if (cast_spell (op, item, dir, item->inv, NULL))
		1700	{
1821	SET_FLAG(op, FLAG_BEEN_APPLIED); /* You now know something about it */	1701	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1702
1822	if (item->type == WAND) {	1703	if (item->type == WAND)
		1704	{
1823	if (!(--item->stats.food)) {	1705	if (!(--item->stats.food))
		1706	{
1824	object *tmp;	1707	object *tmp;
		1708
1825	if (item->arch) {	1709	if (item->arch)
		1710	{
1826	CLEAR_FLAG(item, FLAG_ANIMATE);	1711	CLEAR_FLAG (item, FLAG_ANIMATE);
1827	item->face = item->arch->clone.face;	1712	item->face = item->arch->face;
1828	item->speed = 0;	1713	item->set_speed (0);
1829	update_ob_speed(item);
1830	}	1714	}
1831	if ((tmp=is_player_inv(item)))	1715
		1716	if (object *pl = item->visible_to ())
1832	esrv_update_item(UPD_ANIM, tmp, item);	1717	esrv_update_item (UPD_ANIM, pl, item);
1833	}	1718	}
1834	}	1719	}
1835	else if (item->type == ROD || item->type==HORN) {	1720	else if (item->type == ROD || item->type == HORN)
1836	drain_rod_charge(item);	1721	drain_rod_charge (item);
1837	}
1838	}	1722	}
1839	}	1723	}
1840		1724
1841	/* Received a fire command for the player - go and do it.	1725	/* Received a fire command for the player - go and do it.
1842	*/	1726	*/
		1727	bool
1843	void fire(object *op,int dir) {	1728	fire (object *op, int dir)
		1729	{
1844	int spellcost=0;	1730	int spellcost = 0;
1845		1731
		1732	player *pl = op->contr;
		1733
		1734	if (pl->golem)
		1735	{
		1736	control_golem (op->contr->golem, dir);
		1737	return false;
		1738	}
		1739
		1740	object *ob = pl->ranged_ob;
		1741
		1742	if (!ob)
		1743	return false;
		1744
		1745	if (op->speed_left > 0.f)
		1746	--op->speed_left;
		1747	else
		1748	return false;
		1749
		1750	if (!op->change_weapon (ob))
		1751	return false;
		1752
1846	/* check for loss of invisiblity/hide */	1753	/* check for loss of invisiblity/hide */
1847	if (action_makes_visible(op)) make_visible(op);	1754	if (action_makes_visible (op))
		1755	make_visible (op);
1848		1756
1849	switch(op->contr->shoottype) {	1757	switch (ob->type)
1850	case range_none:	1758	{
1851	return;	1759	case BOW:
1852
1853	case range_bow:
1854	player_fire_bow(op, dir);	1760	player_fire_bow (op, dir);
1855	return;	1761	break;
1856		1762
1857	case range_magic: /* Casting spells */	1763	case SPELL:
1858	spellcost=(cast_spell(op,op,dir,op->contr->ranges[range_magic],op->contr->spellparam[0]?op->contr->spellparam:NULL));	1764	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1859	return;	1765	break;
1860		1766
1861	case range_misc:	1767	case BUILDER:
1862	fire_misc_object(op, dir);
1863	return;
1864
1865	case range_golem: /* Control summoned monsters from scrolls */
1866	if(op->contr->ranges[range_golem]==NULL ||
1867	op->contr->golem_count != op->contr->ranges[range_golem]->count) {
1868	op->contr->ranges[range_golem] = NULL;
1869	op->contr->shoottype=range_none;
1870	op->contr->golem_count = 0;
1871	}
1872	else
1873	control_golem(op->contr->ranges[range_golem], dir);
1874	return;
1875
1876	case range_skill:
1877	if(!op->chosen_skill) {
1878	if(op->type==PLAYER)
1879	new_draw_info(NDI_UNIQUE, 0,op,"You have no applicable skill to use.");
1880	return;
1881	}
1882	(void) do_skill(op,op,op->chosen_skill,dir,NULL);
1883	return;
1884	case range_builder:
1885	apply_map_builder( op, dir );	1768	apply_map_builder (op, dir);
1886	return;	1769	break;
		1770
		1771	case SKILL:
		1772	do_skill (op, op, ob, dir, 0);
		1773	break;
		1774
1887	default:	1775	default:
1888	new_draw_info(NDI_UNIQUE, 0,op,"Illegal shoot type.");	1776	fire_misc_object (op, dir);
1889	return;	1777	break;
1890	}	1778	}
1891	}
1892		1779
1893		1780	return true;
		1781	}
1894		1782
1895	/* find_key	1783	/* find_key
1896	* We try to find a key for the door as passed. If we find a key	1784	* We try to find a key for the door as passed. If we find a key
1897	* and successfully use it, we return the key, otherwise NULL	1785	* and successfully use it, we return the key, otherwise NULL
1898	* This function merges both normal and locked door, since the logic	1786	* This function merges both normal and locked door, since the logic
…		…
1900	* pl is the player,	1788	* pl is the player,
1901	* inv is the objects inventory to searched	1789	* inv is the objects inventory to searched
1902	* door is the door we are trying to match against.	1790	* door is the door we are trying to match against.
1903	* This function can be called recursively to search containers.	1791	* This function can be called recursively to search containers.
1904	*/	1792	*/
1905		1793	object *
1906	object * find_key(object *pl, object *container, object *door)	1794	find_key (object *pl, object *container, object *door)
1907	{	1795	{
1908	object *tmp,*key;	1796	object *tmp, *key;
1909		1797
1910	/* Should not happen, but sanity checking is never bad */	1798	/* Should not happen, but sanity checking is never bad */
1911	if (container->inv == NULL) return NULL;	1799	if (!container->inv)
		1800	return 0;
1912		1801
1913	/* First, lets try to find a key in the top level inventory */	1802	/* First, lets try to find a key in the top level inventory */
1914	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {	1803	for (tmp = container->inv; tmp; tmp = tmp->below)
		1804	{
1915	if (door->type==DOOR && tmp->type==KEY) break;	1805	if (door->type == DOOR && tmp->type == KEY)
		1806	break;
1916	/* For sanity, we should really check door type, but other stuff	1807	/* For sanity, we should really check door type, but other stuff
1917	* (like containers) can be locked with special keys	1808	* (like containers) can be locked with special keys
1918	*/	1809	*/
1919	if (tmp->slaying && tmp->type==SPECIAL_KEY &&	1810	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1920	tmp->slaying==door->slaying) break;	1811	break;
1921	}	1812	}
		1813
1922	/* No key found - lets search inventories now */	1814	/* No key found - lets search inventories now */
1923	/* If we find and use a key in an inventory, return at that time.	1815	/* If we find and use a key in an inventory, return at that time.
1924	* otherwise, if we search all the inventories and still don't find	1816	* otherwise, if we search all the inventories and still don't find
1925	* a key, return	1817	* a key, return
1926	*/	1818	*/
1927	if (!tmp) {	1819	if (!tmp)
		1820	{
1928	for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) {	1821	for (tmp = container->inv; tmp; tmp = tmp->below)
		1822	{
1929	/* No reason to search empty containers */	1823	/* No reason to search empty containers */
1930	if (tmp->type==CONTAINER && tmp->inv) {	1824	if (tmp->type == CONTAINER && tmp->inv)
		1825	{
1931	if ((key=find_key(pl, tmp, door))!=NULL) return key;	1826	if ((key = find_key (pl, tmp, door)))
		1827	return key;
1932	}	1828	}
1933	}	1829	}
		1830
		1831	if (!tmp)
1934	if (!tmp) return NULL;	1832	return NULL;
1935	}	1833	}
		1834
1936	/* We get down here if we have found a key. Now if its in a container,	1835	/* We get down here if we have found a key. Now if its in a container,
1937	* see if we actually want to use it	1836	* see if we actually want to use it
1938	*/	1837	*/
1939	if (pl!=container) {	1838	if (pl != container)
		1839	{
1940	/* Only let players use keys in containers */	1840	/* Only let players use keys in containers */
1941	if (!pl->contr) return NULL;	1841	if (!pl->contr)
		1842	return NULL;
1942	/* cases where this fails:	1843	/* cases where this fails:
1943	* If we only search the player inventory, return now since we	1844	* If we only search the player inventory, return now since we
1944	* are not in the players inventory.	1845	* are not in the players inventory.
1945	* If the container is not active, return now since only active	1846	* If the container is not active, return now since only active
1946	* containers can be used.	1847	* containers can be used.
1947	* If we only search keyrings and the container does not have	1848	* If we only search keyrings and the container does not have
1948	* a race/isn't a keyring.	1849	* a race/isn't a keyring.
1949	* No checking for all containers - to fall through past here,	1850	* No checking for all containers - to fall through past here,
1950	* inv must have been an container and must have been active.	1851	* inv must have been an container and must have been active.
1951	*	1852	*
1952	* Change the color so that the message doesn't disappear with	1853	* Change the color so that the message doesn't disappear with
1953	* all the others.	1854	* all the others.
1954	*/	1855	*/
1955	if (pl->contr->usekeys == key_inventory ||	1856	if (pl->contr->usekeys == key_inventory ||
1956	!QUERY_FLAG(container, FLAG_APPLIED) ||	1857	!QUERY_FLAG (container, FLAG_APPLIED) ||
1957	(pl->contr->usekeys == keyrings &&	1858	(pl->contr->usekeys == keyrings && container->race != shstr_keys))
1958	(!container->race || strcmp(container->race, "keys")))	1859	{
1959	) {
1960	new_draw_info_format(NDI_UNIQUE|NDI_BROWN, 0, pl,	1860	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1961	"The %s in your %s vibrates as you approach the door",	1861	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1962	query_name(tmp), query_name(container));
1963	return NULL;	1862	return NULL;
1964	}	1863	}
1965	}	1864	}
		1865
1966	return tmp;	1866	return tmp;
1967	}	1867	}
1968		1868
1969	/* moved door processing out of move_player_attack.	1869	/* moved door processing out of move_player_attack.
1970	* returns 1 if player has opened the door with a key	1870	* returns 1 if player has opened the door with a key
1971	* such that the caller should not do anything more,	1871	* such that the caller should not do anything more,
1972	* 0 otherwise	1872	* 0 otherwise
1973	*/	1873	*/
		1874	static int
1974	static int player_attack_door(object *op, object *door)	1875	player_attack_door (object *op, object *door)
1975	{	1876	{
1976
1977	/* If its a door, try to find a use a key. If we do destroy the door,	1877	/* If its a door, try to find a key. If we do destroy the door,
1978	* might as well return immediately as there is nothing more to do -	1878	* might as well return immediately as there is nothing more to do -
1979	* otherwise, we fall through to the rest of the code.	1879	* otherwise, we fall through to the rest of the code.
1980	*/	1880	*/
1981	object *key=find_key(op, op, door);	1881	object *key = find_key (op, op, door);
1982		1882
1983	/* IF we found a key, do some extra work */	1883	/* If we found a key, do some extra work */
1984	if (key) {	1884	if (key)
		1885	{
1985	object *container=key->env;	1886	object *container = key->env;
1986		1887
1987	play_sound_map(op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988	if(action_makes_visible(op)) make_visible(op);	1888	if (action_makes_visible (op))
		1889	make_visible (op);
		1890
1989	if(door->inv &&(door->inv->type ==RUNE || door->inv->type ==TRAP)) spring_trap(door->inv,op);	1891	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
		1892	spring_trap (door->inv, op);
		1893
1990	if (door->type == DOOR) {	1894	if (door->type == DOOR)
1991	hit_player(door,9998,op,AT_PHYSICAL,1); /* Break through the door */	1895	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992	}
1993	else if(door->type==LOCKED_DOOR) {	1896	else if (door->type == LOCKED_DOOR)
1994	new_draw_info_format(NDI_UNIQUE, NDI_BROWN, op,	1897	{
1995	"You open the door with the %s", query_short_name(key));	1898	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1996	remove_door2(door); /* remove door without violence ;-) */	1899	remove_door2 (door); /* remove door without violence ;-) */
1997	}	1900	}
		1901
1998	/* Do this after we print the message */	1902	/* Do this after we print the message */
1999	decrease_ob(key); /* Use up one of the keys */	1903	key->decrease (); /* Use up one of the keys */
2000	/* Need to update the weight the container the key was in */	1904
2001	if (container != op)
2002	esrv_update_item(UPD_WEIGHT, op, container);
2003	return 1; /* Nothing more to do below */	1905	return 1; /* Nothing more to do below */
		1906	}
2004	} else if (door->type==LOCKED_DOOR) {	1907	else if (door->type == LOCKED_DOOR)
		1908	{
2005	/* Might as well return now - no other way to open this */	1909	/* Might as well return now - no other way to open this */
2006	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1910	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2007	return 1;	1911	return 1;
2008	}	1912	}
		1913
2009	return 0;	1914	return 0;
2010	}	1915	}
2011		1916
2012	/* This function is just part of a breakup from move_player.	1917	/* This function is just part of a breakup from move_player.
2013	* It should keep the code cleaner.	1918	* It should keep the code cleaner.
2014	* When this is called, the players direction has been updated	1919	* When this is called, the players direction has been updated
2015	* (taking into account confusion.) The player is also actually	1920	* (taking into account confusion.) The player is also actually
2016	* going to try and move (not fire weapons).	1921	* going to try and move (not fire weapons).
2017	*/	1922	*/
2018		1923	bool
2019	void move_player_attack(object *op, int dir)	1924	move_player_attack (object *op, int dir)
2020	{	1925	{
2021	object *tmp, *mon;
2022	sint16 nx, ny;
2023	int on_battleground;	1926	int on_battleground;
2024	mapstruct *m;
2025		1927
2026	nx=freearr_x[dir]+op->x;	1928	sint16 nx = freearr_x[dir] + op->x;
2027	ny=freearr_y[dir]+op->y;	1929	sint16 ny = freearr_y[dir] + op->y;
2028		1930
2029	on_battleground = op_on_battleground(op, NULL, NULL);	1931	on_battleground = op_on_battleground (op, 0, 0);
2030		1932
		1933	if (out_of_map (op->map, nx, ny))
		1934	return false;
		1935
		1936	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
		1937	{
		1938	--op->speed_left;
		1939	return true;
		1940	}
		1941
2031	/* If braced, or can't move to the square, and it is not out of the	1942	/* If braced, or can't move to the square, and it is not out of the
2032	* map, attack it. Note order of if statement is important - don't	1943	* map, attack it. Note order of if statement is important - don't
2033	* want to be calling move_ob if braced, because move_ob will move the	1944	* want to be calling move_ob if braced, because move_ob will move the
2034	* player. This is a pretty nasty hack, because if we could	1945	* player. This is a pretty nasty hack, because if we could
2035	* move to some space, it then means that if we are braced, we should	1946	* move to some space, it then means that if we are braced, we should
2036	* do nothing at all. As it is, if we are braced, we go through	1947	* do nothing at all. As it is, if we are braced, we go through
2037	* quite a bit of processing. However, it probably is less than what	1948	* quite a bit of processing. However, it probably is less than what
2038	* move_ob uses.	1949	* move_ob uses.
2039	*/	1950	*/
2040	if ((op->contr->braced || !move_ob(op,dir,op)) && !out_of_map(op->map,nx,ny)) {	1951	maptile *m = op->map->xy_find (nx, ny);
2041	if (OUT_OF_REAL_MAP(op->map, nx, ny)) {
2042	m = get_map_from_coord(op->map, &nx, &ny);
2043	if (!m) return; /* Don't think this should happen */
2044	}
2045	else m =op->map;
2046
2047	if ((tmp=get_map_ob(m,nx,ny))==NULL) {
2048	/* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/
2049	return;
2050	}
2051		1952
2052	mon = NULL;
2053	/* Go through all the objects, and find ones of interest. Only stop if	1953	/* Go through all the objects, and find ones of interest. Only stop if
2054	* we find a monster - that is something we know we want to attack.	1954	* we find a monster - that is something we know we want to attack.
2055	* if its a door or barrel (can roll) see if there may be monsters	1955	* if its a door or barrel (can roll) see if there may be monsters
2056	* on the space	1956	* on the space
		1957	*/
		1958	object *mon;
		1959	for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
		1960	{
		1961	if ((mon->flag [FLAG_ALIVE]
		1962	|| mon->type == LOCKED_DOOR
		1963	|| mon->flag [FLAG_CAN_ROLL])
		1964	&& mon != op)
		1965	break;
		1966	}
		1967
		1968	if (!mon) /* This happens anytime the player tries to move */
		1969	return false; /* into a wall */
		1970
		1971	mon = mon->head_ ();
		1972
		1973	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
		1974	if (op->contr->weapon_sp_left > 0.f)
		1975	if (player_attack_door (op, mon))
2057	*/	1976	{
2058	while (tmp!=NULL) {	1977	--op->contr->weapon_sp_left;
2059	if (tmp == op) {	1978	return true;
2060	tmp=tmp->above;	1979	}
2061	continue;	1980
		1981	/* The following deals with possibly attacking peaceful
		1982	* or friendly creatures. Basically, all players are considered
		1983	* unaggressive. If the moving player has peaceful set, then the
		1984	* object should be pushed instead of attacked. It is assumed that
		1985	* if you are braced, you will not attack friends accidently,
		1986	* and thus will not push them.
		1987	*/
		1988
		1989	/* If the creature is a pet, push it even if the player is not
		1990	* peaceful. Our assumption is the creature is a pet if the
		1991	* player owns it and it is either friendly or unagressive.
		1992	*/
		1993	if (op->type == PLAYER
		1994	&& ((mon->owner && mon->owner->contr
		1995	&& same_party (mon->owner->contr->party, op->contr->party))
		1996	|| mon->owner == op)
		1997	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
		1998	{
		1999	/* If we're braced, we don't want to switch places with it */
		2000	if (op->contr->braced)
		2001	return false;
		2002
		2003	if (op->speed_left > 0.f)
		2004	{
		2005	--op->speed_left;
		2006
		2007	op->play_sound (sound_find ("push_player"));
		2008	push_ob (mon, dir, op);
		2009
		2010	if (action_makes_visible (op))
		2011	make_visible (op);
		2012
		2013	return true;
		2014	}
		2015	else
		2016	return false;
		2017	}
		2018
		2019	/* in certain circumstances, you shouldn't attack friendly
		2020	* creatures. Note that if you are braced, you can't push
		2021	* someone, but put it inside this loop so that you won't
		2022	* attack them either.
		2023	*/
		2024	if ((mon->type == PLAYER || mon->enemy != op)
		2025	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
		2026	&& ((op->contr->peaceful
		2027	|| (mon->type == PLAYER && mon->contr->peaceful))
		2028	&& !on_battleground))
		2029	{
		2030	if (op->speed_left > 0.f)
		2031	{
		2032	--op->speed_left;
		2033
		2034	if (!op->contr->braced)
		2035	{
		2036	op->play_sound (sound_find ("push_player"));
		2037	push_ob (mon, dir, op);
2062	}	2038	}
2063	if (QUERY_FLAG(tmp,FLAG_ALIVE)) {	2039	else
2064	mon = tmp;	2040	op->statusmsg ("You withhold your attack");
2065	break;
2066	}
2067	if (tmp->type==LOCKED_DOOR || QUERY_FLAG(tmp,FLAG_CAN_ROLL))
2068	mon = tmp;
2069	tmp=tmp->above;
2070	}
2071
2072	if (mon==NULL) /* This happens anytime the player tries to move */
2073	return; /* into a wall */
2074		2041
2075	if(mon->head != NULL)	2042	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2076	mon = mon->head;	2043	make_visible (op);
2077		2044
2078	if ((mon->type==DOOR && mon->stats.hp>=0) || (mon->type==LOCKED_DOOR))	2045	return true;
2079	if (player_attack_door(op, mon)) return;
2080
2081	/* The following deals with possibly attacking peaceful
2082	* or frienddly creatures. Basically, all players are considered
2083	* unaggressive. If the moving player has peaceful set, then the
2084	* object should be pushed instead of attacked. It is assumed that
2085	* if you are braced, you will not attack friends accidently,
2086	* and thus will not push them.
2087	*/
2088
2089	/* If the creature is a pet, push it even if the player is not
2090	* peaceful. Our assumption is the creature is a pet if the
2091	* player owns it and it is either friendly or unagressive.
2092	*/
2093	if ((op->type==PLAYER)
2094	#if COZY_SERVER
2095	&&
2096	(
2097	(get_owner(mon) && get_owner(mon)->contr
2098	&& same_party (get_owner(mon)->contr->party, op->contr->party))
2099	|| get_owner(mon) == op
2100	)
2101	#else
2102	&& get_owner(mon)==op
2103	#endif
2104	&& (QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)))
2105	{	2046	}
2106	/* If we're braced, we don't want to switch places with it */	2047	}
2107	if (op->contr->braced) return;
2108	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2109	(void) push_ob(mon,dir,op);
2110	if(op->contr->tmp_invis||op->hide) make_visible(op);
2111	return;
2112	}
2113
2114	/* in certain circumstances, you shouldn't attack friendly
2115	* creatures. Note that if you are braced, you can't push
2116	* someone, but put it inside this loop so that you won't
2117	* attack them either.
2118	*/
2119	if ((mon->type==PLAYER || mon->enemy != op) &&
2120	(mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) &&
2121	(
2122	#ifdef PROHIBIT_PLAYERKILL
2123	(op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) &&
2124	#else
2125	op->contr->peaceful &&
2126	#endif
2127	!on_battleground
2128	)) {
2129	if (!op->contr->braced) {
2130	play_sound_map(op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2131	(void) push_ob(mon,dir,op);
2132	} else {
2133	new_draw_info(0, 0,op,"You withhold your attack");
2134	}
2135	if(op->contr->tmp_invis||op->hide) make_visible(op);
2136	}
2137
2138	/* If the object is a boulder or other rollable object, then	2048	/* If the object is a boulder or other rollable object, then
2139	* roll it if not braced. You can't roll it if you are braced.	2049	* roll it if not braced. You can't roll it if you are braced.
2140	*/	2050	*/
2141	else if(QUERY_FLAG(mon,FLAG_CAN_ROLL)&&(!op->contr->braced)) {	2051	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
		2052	{
		2053	if (op->speed_left > 0.f)
		2054	{
		2055	--op->speed_left;
		2056
2142	recursive_roll(mon,dir,op);	2057	recursive_roll (mon, dir, op);
2143	if(action_makes_visible(op)) make_visible(op);	2058	if (action_makes_visible (op))
2144	}	2059	make_visible (op);
2145		2060
		2061	return true;
		2062	}
		2063	}
2146	/* Any generic living creature. Including things like doors.	2064	/* Any generic living creature. Including things like doors.
2147	* Way it works is like this: First, it must have some hit points	2065	* Way it works is like this: First, it must have some hit points
2148	* and be living. Then, it must be one of the following:	2066	* and be living. Then, it must be one of the following:
2149	* 1) Not a player, 2) A player, but of a different party. Note	2067	* 1) Not a player, 2) A player, but of a different party. Note
2150	* that party_number -1 is no party, so attacks can still happen.	2068	* that party_number -1 is no party, so attacks can still happen.
2151	*/	2069	*/
2152
2153	else if ((mon->stats.hp>=0) && QUERY_FLAG(mon, FLAG_ALIVE) &&	2070	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2154	((mon->type!=PLAYER || op->contr->party==NULL ||	2071	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2155	op->contr->party!=mon->contr->party))) {	2072	{
2156		2073	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2157	/* If the player hasn't hit something this tick, and does
2158	* so, give them speed boost based on weapon speed. Doing
2159	* it here is better than process_players2, which basically
2160	* incurred a 1 tick offset.
2161	*/
2162	if (!op->contr->has_hit) {
2163	op->speed_left += op->speed / op->contr->weapon_sp;
2164
2165	op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2166	}
2167
2168	skill_attack(mon, op, 0, NULL, NULL);
2169
2170	/* If attacking another player, that player gets automatic
2171	* hitback, and doesn't loose luck either.
2172	* Disable hitback on the battleground or if the target is
2173	* the wiz.
2174	*/
2175	if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit &&
2176	!on_battleground && !QUERY_FLAG(mon, FLAG_WIZ)) {
2177	short luck = mon->stats.luck;
2178	mon->contr->has_hit = 1;
2179	skill_attack(op, mon, 0, NULL, NULL);
2180	mon->stats.luck = luck;
2181	}
2182	if(action_makes_visible(op)) make_visible(op);
2183	}	2074	{
2184	} /* if player should attack something */	2075	--op->contr->weapon_sp_left;
2185	}
2186		2076
		2077	skill_attack (mon, op, 0, 0, 0);
		2078
		2079	if (action_makes_visible (op))
		2080	make_visible (op);
		2081
		2082	return true;
		2083	}
		2084	}
		2085
		2086	return false;
		2087	}
		2088
		2089	bool
2187	int move_player(object *op,int dir) {	2090	move_player (object *op, int dir)
		2091	{
2188	int pick;	2092	int pick;
2189		2093
2190	if(op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)	2094	if (!op->map || op->map->in_memory != MAP_ACTIVE)
2191	return 0;
2192
2193	/* Sanity check: make sure dir is valid */
2194	if ( ( dir < 0 ) || ( dir >= 9 ) ) {
2195	LOG( llevError, "move_player: invalid direction %d\n", dir);
2196	return 0;
2197	}
2198
2199	/* peterm: added following line */
2200	if(QUERY_FLAG(op,FLAG_CONFUSED) && dir)
2201	dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2);
2202
2203	op->facing = dir;
2204
2205	if(op->hide) do_hidden_move(op);
2206
2207	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2208	/*nop*/;
2209	else if (op->contr->fire_on)
2210	fire (op, dir);
2211	else
2212	{
2213	move_player_attack (op, dir);
2214	pick = check_pick(op);
2215	}
2216
2217	/* Add special check for newcs players and fire on - this way, the
2218	* server can handle repeat firing.
2219	*/
2220	if (op->contr->fire_on || (op->contr->run_on && pick!=0)) {
2221	op->direction = dir;
2222	} else {
2223	op->direction=0;
2224	}
2225	/* Update how the player looks. Use the facing, so direction may
2226	* get reset to zero. This allows for full animation capabilities
2227	* for players.
2228	*/
2229	animate_object(op, op->facing);
2230	return 0;	2095	return 0;
		2096
		2097	/* Sanity check: make sure dir is valid */
		2098	if ((dir < 0) || (dir >= 9))
		2099	{
		2100	LOG (llevError, "move_player: invalid direction %d\n", dir);
		2101	return 0;
		2102	}
		2103
		2104	/* peterm: added following line */
		2105	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
		2106	dir = absdir (dir + rndm (3) + rndm (3) - 2);
		2107
		2108	op->facing = dir;
		2109
		2110	if (op->flag [FLAG_HIDDEN])
		2111	do_hidden_move (op);
		2112
		2113	bool retval;
		2114
		2115	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
		2116	retval = RESULT_INT (0);
		2117	else if (op->contr->fire_on)
		2118	retval = fire (op, dir);
		2119	else
		2120	{
		2121	retval = move_player_attack (op, dir);
		2122	pick = check_pick (op);
		2123	}
		2124
		2125	/* Add special check for newcs players and fire on - this way, the
		2126	* server can handle repeat firing.
		2127	*/
		2128	if (op->contr->fire_on || (op->contr->run_on && pick != 0))
		2129	op->direction = dir;
		2130	else
		2131	op->direction = 0;
		2132
		2133	/* Update how the player looks. Use the facing, so direction may
		2134	* get reset to zero. This allows for full animation capabilities
		2135	* for players.
		2136	*/
		2137	animate_object (op, op->facing);
		2138
		2139	return retval;
2231	}	2140	}
2232		2141
2233	/* This is similar to handle_player, below, but is only used by the	2142	/* This is similar to handle_player, below, but is only used by the
2234	* new client/server stuff.	2143	* new client/server stuff.
2235	* This is sort of special, in that the new client/server actually uses	2144	* This is sort of special, in that the new client/server actually uses
2236	* the new speed values for commands.	2145	* the new speed values for commands.
2237	*	2146	*
2238	* Returns true if there are more actions we can do.	2147	* Returns true if there are more actions we can do. Should not do
		2148	* many actions in a row, as that would be too unfair to other
		2149	* players.
2239	*/	2150	*/
		2151	bool
2240	int handle_newcs_player(object *op)	2152	handle_newcs_player (object *op)
2241	{	2153	{
2242	if (op->contr->hidden) {
2243	op->invisible = 1000;
2244	/* the socket code flashes the player visible/invisible
2245	* depending on the value of invisible, so we need to
2246	* alternate it here for it to work correctly.
2247	*/
2248	if (pticks & 2) op->invisible--;
2249	}
2250	else if(op->invisible&&!(QUERY_FLAG(op,FLAG_MAKE_INVIS))) {
2251	op->invisible--;
2252	if(!op->invisible) {
2253	make_visible(op);
2254	new_draw_info(NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2255	}
2256	}
2257
2258	if (QUERY_FLAG(op, FLAG_SCARED)) {	2154	if (QUERY_FLAG (op, FLAG_SCARED))
		2155	{
		2156	if (op->speed_left > 0.f)
		2157	{
		2158	--op->speed_left;
2259	flee_player(op);	2159	flee_player (op);
2260	/* If player is still scared, that is his action for this tick */	2160
2261	if (QUERY_FLAG(op, FLAG_SCARED)) {
2262	op->speed_left--;
2263	return 0;	2161	return true;
2264	}	2162	}
		2163	else
		2164	return false;
2265	}	2165	}
2266		2166
2267	/* I've been seeing crashes where the golem has been destroyed, but
2268	* the player object still points to the defunct golem. The code that
2269	* destroys the golem looks correct, and it doesn't always happen, so
2270	* put this in a a workaround to clean up the golem pointer.
2271	*/
2272	if (op->contr->ranges[range_golem] &&
2273	((op->contr->golem_count != op->contr->ranges[range_golem]->count) ||
2274	QUERY_FLAG(op->contr->ranges[range_golem], FLAG_REMOVED))) {
2275	op->contr->ranges[range_golem] = NULL;
2276	op->contr->golem_count = 0;
2277	}
2278
2279	/* call this here - we also will call this in do_ericserver, but	2167	/* call this here - we also will call this in do_ericserver, but
2280	* the players time has been increased when doericserver has been	2168	* the players time has been increased when doericserver has been
2281	* called, so we recheck it here.	2169	* called, so we recheck it here.
2282	*/	2170	*/
2283	HandleClient(&op->contr->socket, op->contr);	2171	if (op->contr->ns->handle_command ())
2284	if (op->speed_left<0) return 0;	2172	return true;
2285		2173
2286	if(op->direction && (op->contr->run_on || op->contr->fire_on)) {	2174	if (op->direction && (op->contr->run_on || op->contr->fire_on))
2287	/* All move commands take 1 tick, at least for now */
2288	op->speed_left--;
2289
2290	/* Instead of all the stuff below, let move_player take care
2291	* of it. Also, some of the skill stuff is only put in
2292	* there, as well as the confusion stuff.
2293	*/
2294	move_player(op, op->direction);	2175	return move_player (op, op->direction);
2295	if (op->speed_left>0) return 1;	2176
2296	else return 0;	2177	return false;
2297	}	2178	}
		2179
		2180	int
		2181	save_life (object *op)
		2182	{
		2183	if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2298	return 0;	2184	return 0;
2299	}
2300		2185
2301	int save_life(object *op) {	2186	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2302	object *tmp;	2187	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
		2188	{
		2189	op->play_sound (sound_find ("ob_evaporate"));
		2190	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2303		2191
		2192	tmp->destroy ();
2304	if(!QUERY_FLAG(op,FLAG_LIFESAVE))	2193	CLEAR_FLAG (op, FLAG_LIFESAVE);
		2194
		2195	if (op->stats.hp < 0)
		2196	op->stats.hp = op->stats.maxhp;
		2197
		2198	if (op->stats.food < 0)
		2199	op->stats.food = 999;
		2200
		2201	op->update_stats ();
2305	return 0;	2202	return 1;
2306
2307	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)
2308	if(QUERY_FLAG(tmp, FLAG_APPLIED)&&QUERY_FLAG(tmp,FLAG_LIFESAVE)) {
2309	play_sound_map(op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2310	new_draw_info_format(NDI_UNIQUE, 0,op,
2311	"Your %s vibrates violently, then evaporates.",
2312	query_name(tmp));
2313	if (op->contr)
2314	esrv_del_item(op->contr, tmp->count);
2315	remove_ob(tmp);
2316	free_object(tmp);
2317	CLEAR_FLAG(op, FLAG_LIFESAVE);
2318	if(op->stats.hp<0)
2319	op->stats.hp = op->stats.maxhp;
2320	if(op->stats.food<0)
2321	op->stats.food = 999;
2322	fix_player(op);
2323	return 1;
2324	}	2203	}
		2204
2325	LOG(llevError,"Error: LIFESAVE set without applied object.\n");	2205	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2326	CLEAR_FLAG(op, FLAG_LIFESAVE);	2206	CLEAR_FLAG (op, FLAG_LIFESAVE);
2327	enter_player_savebed(op); /* bring him home. */	2207	enter_player_savebed (op); /* bring him home. */
2328	return 0;	2208	return 0;
2329	}	2209	}
2330		2210
2331	/* This goes throws the inventory and removes unpaid objects, and puts them	2211	/* This goes throws the inventory and removes unpaid objects, and puts them
2332	* back in the map (location and map determined by values of env). This	2212	* back in the map (location and map determined by values of env). This
2333	* function will descend into containers. op is the object to start the search	2213	* function will descend into containers. op is the object to start the search
2334	* from.	2214	* from.
2335	*/	2215	*/
		2216	static void
2336	void remove_unpaid_objects(object *op, object *env)	2217	drop_unpaid_items (object *op, object *env)
2337	{	2218	{
2338	object *next;
2339
2340	while (op) {	2219	while (op)
		2220	{
2341	next=op->below; /* Make sure we have a good value, in case	2221	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2342	* we remove object 'op'	2222
2343	*/
2344	if (QUERY_FLAG(op, FLAG_UNPAID)) {	2223	if (QUERY_FLAG (op, FLAG_UNPAID))
2345	remove_ob(op);	2224	op->insert_at (env);
2346	op->x = env->x;	2225	else if (op->inv)
2347	op->y = env->y;	2226	drop_unpaid_items (op->inv, env);
2348	if (env->type == PLAYER)	2227
2349	esrv_del_item(env->contr, op->count);
2350	insert_ob_in_map(op, env->map, NULL,0);
2351	}
2352	else if (op->inv) remove_unpaid_objects(op->inv, env);
2353	op=next;	2228	op = next;
2354	}	2229	}
2355	}	2230	}
2356		2231
		2232	void
		2233	object::drop_unpaid_items ()
		2234	{
		2235	if (!flag [FLAG_REMOVED])
		2236	::drop_unpaid_items (inv, this);
		2237	}
2357		2238
2358	/*	2239	/*
2359	* Returns pointer a static string containing gravestone text	2240	* Returns pointer a static string containing gravestone text
2360	* Moved from apply.c to player.c - player.c is what	2241	* Moved from apply.c to player.c - player.c is what
2361	* actually uses this function. player.c may not be quite the	2242	* actually uses this function. player.c may not be quite the
2362	* best, a misc file for object actions is probably better,	2243	* best, a misc file for object actions is probably better,
2363	* but there isn't one in the server directory.	2244	* but there isn't one in the server directory.
2364	*/	2245	*/
		2246	const char *
2365	char *gravestone_text (object *op)	2247	gravestone_text (object *op)
2366	{	2248	{
		2249	static dynbuf_text buf;
		2250
		2251	buf << "---- R.I.P. ----\n\n"
		2252	<< op->name;
		2253
		2254	if (op->type == PLAYER)
		2255	buf << " the " << op->contr->title;
		2256
		2257	buf << "\n\n";
		2258
		2259	buf << "who was level ";
		2260	buf << (sint32)op->level << "\n\n" // OO breakdown
		2261	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
		2262
		2263	if (op->type == PLAYER)
		2264	buf << "by " << op->contr->killer_name () << ".\n\n";
		2265
		2266	{
2367	static char buf2[MAX_BUF];	2267	static char buf2[128];
2368	char buf[MAX_BUF];
2369	time_t now = time (NULL);	2268	time_t now = time (NULL);
2370
2371	strcpy (buf2, " R.I.P.\n\n");
2372	if (op->type == PLAYER)
2373	sprintf (buf, "%s the %s\n", op->name, op->contr->title);
2374	else
2375	sprintf (buf, "%s\n", op->name);
2376	strncat (buf2, " ", 20 - strlen (buf) / 2);
2377	strcat (buf2, buf);
2378	if (op->type == PLAYER)
2379	sprintf (buf, "who was in level %d when killed\n", op->level);
2380	else
2381	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2382	strncat (buf2, " ", 20 - strlen (buf) / 2);
2383	strcat (buf2, buf);
2384	if (op->type == PLAYER) {
2385	sprintf (buf, "by %s.\n\n", op->contr->killer);
2386	strncat (buf2, " ", 21 - strlen (buf) / 2);
2387	strcat (buf2, buf);
2388	}
2389	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));	2269	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2390	strncat (buf2, " ", 20 - strlen (buf) / 2);	2270	buf << buf2;
2391	strcat (buf2, buf);	2271	}
		2272
2392	return buf2;	2273	return buf;
2393	}	2274	}
2394		2275
2395		2276	void
2396
2397	void do_some_living(object *op) {	2277	do_some_living (object *op)
		2278	{
2398	int last_food=op->stats.food;	2279	int last_food = op->stats.food;
2399	int gen_hp, gen_sp, gen_grace;	2280	int gen_hp, gen_sp, gen_grace;
2400	int over_hp, over_sp, over_grace;	2281	int over_hp, over_sp, over_grace;
2401	int i;	2282	int i;
2402	int rate_hp = 1200;	2283	int rate_hp = 1200;
2403	int rate_sp = 2500;	2284	int rate_sp = 2500;
2404	int rate_grace = 2000;	2285	int rate_grace = 2000;
2405	const int max_hp = 1;	2286	const int max_hp = 1;
2406	const int max_sp = 1;	2287	const int max_sp = 1;
2407	const int max_grace = 1;	2288	const int max_grace = 1;
2408		2289
2409	if (op->contr->outputs_sync) {	2290	if (op->contr->hidden)
2410	for (i=0; i<NUM_OUTPUT_BUFS; i++)	2291	{
2411	if (op->contr->outputs[i].buf!=NULL &&	2292	op->invisible = 1000;
2412	(op->contr->outputs[i].first_update+op->contr->outputs_sync)<pticks)	2293	/* the socket code flashes the player visible/invisible
2413	flush_output_element(op, &op->contr->outputs[i]);	2294	* depending on the value of invisible, so we need to
		2295	* alternate it here for it to work correctly.
		2296	*/
		2297	if (pticks & 2)
		2298	op->invisible--;
2414	}	2299	}
		2300	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
		2301	{
		2302	if (!op->invisible--)
		2303	{
		2304	make_visible (op);
		2305	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2306	}
		2307	}
2415		2308
2416	if(op->contr->state==ST_PLAYING) {	2309	if (op->contr->ns->state == ST_PLAYING)
2417		2310	{
2418	/* these next three if clauses make it possible to SLOW DOWN	2311	/* these next three if clauses make it possible to SLOW DOWN
2419	hp/grace/spellpoint regeneration. */	2312	hp/grace/spellpoint regeneration. */
2420	if(op->contr->gen_hp >= 0 )	2313	if (op->contr->gen_hp >= 0)
2421	gen_hp=(op->contr->gen_hp+1)*op->stats.maxhp;	2314	gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2422	else {	2315	else
		2316	{
2423	gen_hp = op->stats.maxhp;	2317	gen_hp = op->stats.maxhp;
2424	rate_hp -= rate_hp/2 * op->contr->gen_hp;	2318	rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2425	}	2319	}
		2320
2426	if(op->contr->gen_sp >= 0 )	2321	if (op->contr->gen_sp >= 0)
2427	gen_sp=(op->contr->gen_sp+1)*op->stats.maxsp;	2322	gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2428	else {	2323	else
		2324	{
2429	gen_sp = op->stats.maxsp;	2325	gen_sp = op->stats.maxsp;
2430	rate_sp -= rate_sp/2 * op->contr->gen_sp;	2326	rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2431	}	2327	}
		2328
2432	if(op->contr->gen_grace >= 0)	2329	if (op->contr->gen_grace >= 0)
2433	gen_grace=(op->contr->gen_grace+1)*op->stats.maxgrace;	2330	gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2434	else {	2331	else
		2332	{
2435	gen_grace = op->stats.maxgrace;	2333	gen_grace = op->stats.maxgrace;
2436	rate_grace -= rate_grace/2 * op->contr->gen_grace;	2334	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2437	}
2438
2439	/* Regenerate Spell Points */
2440	if(op->contr->ranges[range_golem]==NULL && --op->last_sp<0) {
2441	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10? 10 : op->contr->gen_sp_armour);
2442	if(op->stats.sp<op->stats.maxsp) {
2443	op->stats.sp++;
2444	/* dms do not consume food */
2445	if (!QUERY_FLAG(op,FLAG_WIZ)) {
2446	op->stats.food--;
2447	if(op->contr->digestion<0)
2448	op->stats.food+=op->contr->digestion;
2449	else if(op->contr->digestion>0 &&
2450	random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2451	op->stats.food=last_food;
2452	}	2335	}
2453	}
2454	if (max_sp>1) {
2455	over_sp = (gen_sp+10)/rate_sp;
2456	if (over_sp > 0) {
2457	if(op->stats.sp<op->stats.maxsp) {
2458	op->stats.sp += over_sp>max_sp ? max_sp : over_sp;
2459	if(random_roll(0, rate_sp-1, op, PREFER_LOW) > ((gen_sp+10)%rate_sp))
2460	op->stats.sp--;
2461	if(op->stats.sp>op->stats.maxsp)
2462	op->stats.sp=op->stats.maxsp;
2463	}
2464	op->last_sp=0;
2465	} else {
2466	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2467	}
2468	} else {
2469	op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2470	}
2471	}
2472		2336
2473	/* Regenerate Grace */	2337	/* Regenerate Grace */
2474	/* I altered this a little - maximum grace is ony achieved through prayer -b.t.*/	2338	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2475	if(--op->last_grace<0) {	2339	if (--op->last_grace < 0)
		2340	{
2476	if(op->stats.grace<op->stats.maxgrace/2)	2341	if (op->stats.grace < op->stats.maxgrace / 2)
2477	op->stats.grace++; /* no penalty in food for regaining grace */	2342	op->stats.grace++; /* no penalty in food for regaining grace */
		2343
2478	if(max_grace>1) {	2344	if (max_grace > 1)
		2345	{
2479	over_grace = (gen_grace<20 ? 30 : gen_grace+10)/rate_grace;	2346	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2480	if (over_grace > 0) {	2347	if (over_grace > 0)
		2348	{
2481	op->stats.sp += over_grace	2349	op->stats.sp += over_grace
2482	+ (random_roll(0, rate_grace-1, op, PREFER_HIGH) > ((gen_grace<20 ? 30 : gen_grace+10)%rate_grace))? -1 : 0;	2350	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2483	op->last_grace=0;	2351	op->last_grace = 0;
		2352	}
2484	} else {	2353	else
		2354	{
2485	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);	2355	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
		2356	}
2486	}	2357	}
2487	} else {	2358	else
		2359	{
2488	op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10);	2360	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2489	}	2361	}
2490	/* wearing stuff doesn't detract from grace generation. */	2362	/* wearing stuff doesn't detract from grace generation. */
2491	}
2492
2493	/* Regenerate Hit Points */
2494	if(--op->last_heal<0) {
2495	if(op->stats.hp<op->stats.maxhp) {
2496	op->stats.hp++;
2497	/* dms do not consume food */
2498	if (!QUERY_FLAG(op,FLAG_WIZ)) {
2499	op->stats.food--;
2500	if(op->contr->digestion<0)
2501	op->stats.food+=op->contr->digestion;
2502	else if(op->contr->digestion>0 &&
2503	random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2504	op->stats.food=last_food;
2505	}	2363	}
2506	}	2364
2507	if(max_hp>1) {	2365	if (op->stats.food > 0)
2508	over_hp = (gen_hp<20 ? 30 : gen_hp+10)/rate_hp;
2509	if (over_hp > 0) {
2510	op->stats.sp += over_hp
2511	+ (RANDOM()%rate_hp > ((gen_hp<20 ? 30 : gen_hp+10)%rate_hp))? -1 : 0;
2512	op->last_heal=0;
2513	} else {
2514	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);
2515	}	2366	{
2516	} else {	2367	/* Regenerate Spell Points */
2517	op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);	2368	if (!op->contr->golem && --op->last_sp < 0)
2518	}	2369	{
2519	}	2370	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2520		2371
2521	/* Digestion */	2372	if (op->stats.sp < op->stats.maxsp)
2522	if(--op->last_eat<0) {	2373	{
2523	#ifdef COZY_SERVER	2374	op->stats.sp++;
2524	int dg = op->contr->digestion>=0 && op->contr->digestion<2 ? 2 : op->contr->digestion;
2525	int bonus=dg>0?dg:0,
2526	penalty=dg<0?-dg:0;
2527	#else
2528	int bonus=op->contr->digestion>0?op->contr->digestion:0,
2529	penalty=op->contr->digestion<0?-op->contr->digestion:0;
2530	#endif
2531		2375
2532	if(op->contr->gen_hp > 0)
2533	op->last_eat=25*(1+bonus)/(op->contr->gen_hp+penalty+1);
2534	else
2535	op->last_eat=25*(1+bonus)/(penalty +1);
2536	/* dms do not consume food */	2376	/* dms do not consume food */
2537	if (!QUERY_FLAG(op,FLAG_WIZ)) op->stats.food--;
2538	}
2539	}
2540
2541	if(op->contr->state==ST_PLAYING&&op->stats.food<0&&op->stats.hp>=0) {
2542	object *tmp, *flesh=NULL;
2543
2544	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) {
2545	if(!QUERY_FLAG(tmp, FLAG_UNPAID)) {	2377	if (!QUERY_FLAG (op, FLAG_WIZ))
2546	if (tmp->type==FOOD || tmp->type==DRINK || tmp->type==POISON) {
2547	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");
2548	manual_apply(op,tmp,0);
2549	if(op->stats.food>=0||op->stats.hp<0)
2550	break;	2378	{
		2379	op->stats.food--;
		2380
		2381	if (op->contr->digestion < 0)
		2382	op->stats.food += op->contr->digestion;
		2383	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2384	op->stats.food = last_food;
		2385	}
2551	}	2386	}
		2387
		2388	if (max_sp > 1)
		2389	{
		2390	over_sp = (gen_sp + 10) / rate_sp;
		2391	if (over_sp > 0)
		2392	{
		2393	if (op->stats.sp < op->stats.maxsp)
		2394	{
		2395	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2396
		2397	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2398	op->stats.sp--;
		2399
		2400	if (op->stats.sp > op->stats.maxsp)
		2401	op->stats.sp = op->stats.maxsp;
		2402	}
		2403
		2404	op->last_sp = 0;
		2405	}
		2406	else
		2407	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2408	}
		2409	else
		2410	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
		2411	}
		2412
		2413	/* Regenerate Hit Points */
		2414	if (--op->last_heal < 0)
		2415	{
		2416	if (op->stats.hp < op->stats.maxhp)
		2417	{
		2418	op->stats.hp++;
		2419
		2420	/* dms do not consume food */
		2421	if (!QUERY_FLAG (op, FLAG_WIZ))
		2422	{
		2423	op->stats.food--;
		2424
		2425	if (op->contr->digestion < 0)
		2426	op->stats.food += op->contr->digestion;
		2427	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2428	op->stats.food = last_food;
		2429	}
		2430	}
		2431
		2432	if (max_hp > 1)
		2433	{
		2434	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
		2435
		2436	if (over_hp > 0)
		2437	{
		2438	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
		2439	op->last_heal = 0;
		2440	}
		2441	else
		2442	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
		2443	}
		2444	else
		2445	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
		2446	}
		2447	}
		2448
		2449	/* Digestion */
		2450	if (--op->last_eat < 0)
		2451	{
		2452	int bonus = max (0, op->contr->digestion),
		2453	penalty = max (0, -op->contr->digestion);
		2454
		2455	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
		2456
		2457	/* dms do not consume food */
		2458	if (!QUERY_FLAG (op, FLAG_WIZ))
		2459	op->stats.food--;
		2460	}
		2461
		2462	if (op->stats.food < 0 && op->stats.hp >= 0)
		2463	{
		2464	object *flesh = 0;
		2465
		2466	for_inv_removable (op, tmp)
		2467	{
		2468	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		2469	continue;
		2470
		2471	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
		2472	{
		2473	op->statusmsg ("You blindly grab for a bite of food. "
		2474	"H<To prevent you from starving, you ate some random item from your backpack.>");
		2475	manual_apply (op, tmp, 0);
		2476
		2477	if (op->stats.food >= 0 || op->stats.hp < 0)
		2478	break;
		2479	}
2552	else if (tmp->type==FLESH) flesh=tmp;	2480	else if (tmp->type == FLESH)
2553	} /* End if paid for object */	2481	flesh = tmp;
2554	} /* end of for loop */	2482	}
		2483
2555	/* If player is still starving, it means they don't have any food, so	2484	/* If player is still starving, it means they don't have any food, so
2556	* eat flesh instead.	2485	* eat flesh instead.
2557	*/	2486	*/
2558	if (op->stats.food<0 && op->stats.hp>=0 && flesh) {	2487	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2559	new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food.");	2488	{
		2489	op->statusmsg ("You blindly grab for a bite of food. "
		2490	"H<To prevent you from starving, you ate some random item from your backpack.>");
2560	manual_apply(op,flesh,0);	2491	manual_apply (op, flesh, 0);
		2492	}
		2493
		2494	// If player is still starving, alert him!
		2495	if (op->stats.food < 0)
		2496	op->failmsg ("You are starving! "
		2497	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2498	}
		2499
		2500	if (op->stats.food < 0)
2561	}	2501	{
2562	} /* end if player is starving */	2502	op->stats.hp += op->stats.food;
		2503	op->stats.food = 0;
2563		2504
2564	while(op->stats.food<0&&op->stats.hp>0)	2505	if (op->stats.hp < 0)
2565	op->stats.food++,op->stats.hp--;	2506	{
		2507	op->contr->killer = archetype::get ("killer_starvation");
		2508	op->contr->killer->destroy ();
		2509	}
		2510	}
2566		2511
2567	if (!op->contr->state&&!QUERY_FLAG(op,FLAG_WIZ)&&(op->stats.hp<0||op->stats.food<0))	2512	/* killer should be set here already */
		2513	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2568	kill_player(op);	2514	kill_player (op);
		2515	}
2569	}	2516	}
2570
2571
2572		2517
2573	/* If the player should die (lack of hp, food, etc), we call this.	2518	/* If the player should die (lack of hp, food, etc), we call this.
2574	* op is the player in jeopardy. If the player can not be saved (not	2519	* op is the player in jeopardy. If the player can not be saved (not
2575	* permadeath, no lifesave), this will take care of removing the player	2520	* permadeath, no lifesave), this will take care of removing the player
2576	* file.	2521	* file.
2577	*/	2522	*/
		2523	void
2578	void kill_player(object *op)	2524	kill_player (object *op)
2579	{	2525	{
		2526	int x, y;
2580	char buf[MAX_BUF];	2527	char buf[MAX_BUF];
2581	int x,y,i;
2582	mapstruct *map; /* this is for resurrection */	2528	maptile *map; /* this is for resurrection */
2583	int z;
2584	int num_stats_lose;
2585	int lost_a_stat;
2586	int lose_this_stat;
2587	int this_stat;
2588	int will_kill_again;	2529	int will_kill_again;
2589	archetype *at;	2530	archetype *at;
2590	object *tmp;	2531	object *tmp;
2591		2532
2592	if(save_life(op))	2533	if (save_life (op))
2593	return;	2534	return;
2594		2535
		2536	/* restore player */
		2537	at = archetype::find ("poisoning");
		2538	if (object *tmp = present_arch_in_ob (at, op))
		2539	{
		2540	tmp->destroy ();
		2541	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
		2542	}
2595		2543
		2544	at = archetype::find ("confusion");
		2545	if (object *tmp = present_arch_in_ob (at, op))
		2546	{
		2547	tmp->destroy ();
		2548	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
		2549	}
		2550
		2551	cure_disease (op, 0, 0); /* remove any disease */
		2552
		2553	max_it (op->stats.hp , op->stats.maxhp);
		2554	max_it (op->stats.sp , op->stats.maxsp);
		2555	max_it (op->stats.grace, op->stats.maxgrace);
		2556
		2557	if (op->stats.food <= 0)
		2558	op->stats.food = 999;
		2559
		2560	// remove all spell effects that are active
		2561	// to avoid long-term effects such as word-of-recall
		2562	for (object *item = op->inv; item; )
		2563	{
		2564	object *next = item->below;
		2565
		2566	if (item->type == SPELL_EFFECT && item->active)
		2567	item->destroy ();
		2568
		2569	item = next;
		2570	}
		2571
2596	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2572	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2597	* in cities ONLY!!! It is very important that this doesn't get abused.	2573	* in cities ONLY!!! It is very important that this doesn't get abused.
2598	* Look at op_on_battleground() for more info --AndreasV	2574	* Look at op_on_battleground() for more info --AndreasV
2599	*/	2575	*/
2600	if (op_on_battleground(op, &x, &y)) {	2576	if (op_on_battleground (op, &x, &y))
2601	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,	2577	{
2602	"You have been defeated in combat!");	2578	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2603	new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op,	2579	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2604	"Local medics have saved your life...");
2605
2606	/* restore player */
2607	at = find_archetype("poisoning");
2608	tmp=present_arch_in_ob(at,op);
2609	if (tmp) {
2610	remove_ob(tmp);
2611	free_object(tmp);
2612	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");
2613	}
2614		2580
2615	at = find_archetype("confusion");
2616	tmp=present_arch_in_ob(at,op);
2617	if (tmp) {
2618	remove_ob(tmp);
2619	free_object(tmp);
2620	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");
2621	}
2622
2623	cure_disease(op,0); /* remove any disease */
2624	op->stats.hp=op->stats.maxhp;
2625	if (op->stats.food<=0) op->stats.food=999;
2626
2627	/* create a bodypart-trophy to make the winner happy */	2581	/* create a bodypart-trophy to make the winner happy */
2628	tmp=arch_to_object(find_archetype("finger"));	2582	if (object *tmp = arch_to_object (archetype::find ("finger")))
2629	if (tmp != NULL)
2630	{
2631	sprintf(buf,"%s's finger",op->name);
2632	tmp->name = add_string(buf);
2633	sprintf(buf," This finger has been cut off %s\n"
2634	" the %s, when he was defeated at\n level %d by %s.\n",
2635	op->name, op->contr->title, (int)(op->level),
2636	op->contr->killer);
2637	tmp->msg=add_string(buf);
2638	tmp->value=0, tmp->material=0, tmp->type=0;
2639	tmp->materialname = NULL;
2640	tmp->x = op->x, tmp->y = op->y;
2641	insert_ob_in_map(tmp,op->map,op,0);
2642	}	2583	{
		2584	tmp->name = format ("%s's finger" , &op->name);
		2585	tmp->name_pl = format ("%s's fingers", &op->name);
		2586	tmp->msg = format (
		2587	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
		2588	&op->name, op->contr->title,
		2589	(int)op->level,
		2590	op->contr->killer_name ()
		2591	);
		2592	tmp->value = 0, tmp->type = 0;
		2593	tmp->materialname = "organics";
		2594	tmp->insert_at (op, tmp);
2643		2595	}
		2596
2644	/* teleport defeated player to new destination*/	2597	/* teleport defeated player to new destination */
2645	transfer_ob(op, x, y, 0, NULL);	2598	transfer_ob (op, x, y, 0, NULL);
2646	op->contr->braced=0;	2599	op->contr->braced = 0;
2647	return;	2600	return;
2648	}	2601	}
2649		2602
2650	INVOKE_PLAYER (DEATH, op->contr);	2603	INVOKE_PLAYER (DEATH, op->contr);
2651		2604
2652	command_kill_pets (op, 0);	2605	command_kill_pets (op, 0);
2653		2606
2654	if(op->stats.food<0) {	2607	op->contr->play_sound (sound_find ("player_dies"));
2655	if (op->contr->explore) {
2656	new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are");
2657	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
2658	op->stats.food=999;
2659	return;
2660	}
2661	sprintf(buf,"%s starved to death.",op->name);
2662	strcpy(op->contr->killer,"starvation");
2663	}
2664	else {
2665	if (op->contr->explore) {
2666	new_draw_info(NDI_UNIQUE, 0,op,"You would have died, but you are");
2667	new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
2668	op->stats.hp=op->stats.maxhp;
2669	return;
2670	}
2671	sprintf(buf,"%s died.",op->name);
2672	}
2673	play_sound_player_only(op->contr, SOUND_PLAYER_DIES,0,0);
2674		2608
2675	/* save the map location for corpse, gravestone*/	2609	/* save the map location for corpse, gravestone */
2676	x=op->x;y=op->y;map=op->map;	2610	x = op->x;
		2611	y = op->y;
		2612	map = op->map;
2677		2613
2678
2679	if (settings.not_permadeth == TRUE) {
2680	/* NOT_PERMADEATH code. This basically brings the character back to	2614	/* NOT_PERMADEATH code. This basically brings the character back to
2681	* life if they are dead - it takes some exp and a random stat.	2615	* life if they are dead - it takes some exp and a random stat.
2682	* See the config.h file for a little more in depth detail about this.	2616	* See the config.h file for a little more in depth detail about this.
2683	*/	2617	*/
2684		2618
2685	/* Basically two ways to go - remove a stat permanently, or just	2619	/* Basically two ways to go - remove a stat permanently, or just
2686	* make it depletion. This bunch of code deals with that aspect	2620	* make it depletion. This bunch of code deals with that aspect
2687	* of death.	2621	* of death.
2688	*/	2622	*/
2689	#ifndef COZY_SERVER	2623	#ifndef COZY_SERVER
2690	if (settings.balanced_stat_loss) {	2624	if (settings.balanced_stat_loss)
		2625	{
2691	/* If stat loss is permanent, lose one stat only. */	2626	/* If stat loss is permanent, lose one stat only. */
2692	/* Lower level chars don't lose as many stats because they suffer	2627	/* Lower level chars don't lose as many stats because they suffer
2693	more if they do. */	2628	more if they do. */
2694	/* Higher level characters can afford things such as potions of	2629	/* Higher level characters can afford things such as potions of
2695	restoration, or better, stat potions. So we slug them that	2630	restoration, or better, stat potions. So we slug them that
2696	little bit harder. */	2631	little bit harder. */
2697	/* GD */	2632	/* GD */
2698	if (settings.stat_loss_on_death)	2633	if (settings.stat_loss_on_death)
2699	num_stats_lose = 1;
2700	else
2701	num_stats_lose = 1 + op->level/BALSL_NUMBER_LOSSES_RATIO;
2702	} else {
2703	num_stats_lose = 1;	2634	num_stats_lose = 1;
2704	}	2635	else
		2636	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
		2637	}
		2638	else
		2639	num_stats_lose = 1;
		2640
2705	lost_a_stat = 0;	2641	lost_a_stat = 0;
2706		2642
2707	for (z=0; z<num_stats_lose; z++) {	2643	for (z = 0; z < num_stats_lose; z++)
2708	i = RANDOM() % NUM_STATS;	2644	{
		2645	i = rndm (NUM_STATS);
2709		2646
2710	if (settings.stat_loss_on_death) {	2647	if (settings.stat_loss_on_death)
		2648	{
2711	/* Pick a random stat and take a point off it. Tell the player	2649	/* Pick a random stat and take a point off it. Tell the player
2712	* what he lost.	2650	* what he lost.
2713	*/	2651	*/
2714	change_attr_value(&(op->stats), i,-1);	2652	change_attr_value (&(op->stats), i, -1);
2715	check_stat_bounds(&(op->stats));	2653	check_stat_bounds (&(op->stats));
2716	change_attr_value(&(op->contr->orig_stats), i,-1);	2654	change_attr_value (&(op->contr->orig_stats), i, -1);
2717	check_stat_bounds(&(op->contr->orig_stats));	2655	check_stat_bounds (&(op->contr->orig_stats));
2718	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);	2656	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2719	lost_a_stat = 1;	2657	lost_a_stat = 1;
2720	} else {	2658	}
		2659	else
		2660	{
2721	/* deplete a stat */	2661	/* deplete a stat */
2722	archetype *deparch=find_archetype("depletion");	2662	archetype *deparch = archetype::find ("depletion");
2723	object *dep;	2663	object *dep;
		2664
		2665	dep = present_arch_in_ob (deparch, op);
		2666	if (!dep)
2724		2667	{
2725	dep = present_arch_in_ob(deparch,op);
2726	if(!dep) {
2727	dep = arch_to_object(deparch);	2668	dep = arch_to_object (deparch);
2728	insert_ob_in_ob(dep, op);	2669	insert_ob_in_ob (dep, op);
2729	}	2670	}
2730	lose_this_stat = 1;	2671	lose_this_stat = 1;
2731	if (settings.balanced_stat_loss) {	2672	if (settings.balanced_stat_loss)
		2673	{
2732	/* GD */	2674	/* GD */
2733	/* Get the stat that we're about to deplete. */	2675	/* Get the stat that we're about to deplete. */
2734	this_stat = get_attr_value(&(dep->stats), i);	2676	this_stat = get_attr_value (&(dep->stats), i);
2735	if (this_stat < 0) {	2677	if (this_stat < 0)
		2678	{
2736	int loss_chance = 1 + op->level/BALSL_LOSS_CHANCE_RATIO;	2679	int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
2737	int keep_chance = this_stat * this_stat;	2680	int keep_chance = this_stat * this_stat;
		2681
2738	/* Yes, I am paranoid. Sue me. */	2682	/* Yes, I am paranoid. Sue me. */
2739	if (keep_chance < 1)	2683	if (keep_chance < 1)
2740	keep_chance = 1;	2684	keep_chance = 1;
2741		2685
2742	/* There is a maximum depletion total per level. */	2686	/* There is a maximum depletion total per level. */
2743	if (this_stat < -1 - op->level/BALSL_MAX_LOSS_RATIO) {	2687	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
		2688	{
2744	lose_this_stat = 0;	2689	lose_this_stat = 0;
2745	/* Take loss chance vs keep chance to see if we	2690	/* Take loss chance vs keep chance to see if we
2746	retain the stat. */	2691	retain the stat. */
2747	} else {
2748	if (random_roll(0, loss_chance + keep_chance-1,
2749	op, PREFER_LOW) < keep_chance)
2750	lose_this_stat = 0;
2751	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2752	this_stat, keep_chance, loss_chance,
2753	lose_this_stat?"LOSE":"KEEP"); */
2754	}
2755	}	2692	}
2756	}	2693	else
2757
2758	if (lose_this_stat) {
2759	this_stat = get_attr_value(&(dep->stats), i);
2760	/* We could try to do something clever like find another
2761	* stat to reduce if this fails. But chances are, if
2762	* stats have been depleted to -50, all are pretty low
2763	* and should be roughly the same, so it shouldn't make a
2764	* difference.
2765	*/	2694	{
2766	if (this_stat>=-50) {	2695	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
2767	change_attr_value(&(dep->stats), i, -1);
2768	SET_FLAG(dep, FLAG_APPLIED);
2769	new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);
2770	fix_player(op);
2771	lost_a_stat = 1;	2696	lose_this_stat = 0;
		2697	/* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
		2698	this_stat, keep_chance, loss_chance,
		2699	lose_this_stat?"LOSE":"KEEP"); */
2772	}	2700	}
2773	}	2701	}
2774	}	2702	}
2775	}	2703
2776	/* If no stat lost, tell the player. */
2777	if (!lost_a_stat)	2704	if (lose_this_stat)
2778	{	2705	{
2779	/* determine_god() seems to not work sometimes... why is this?	2706	this_stat = get_attr_value (&dep->stats, i);
2780	Should I be using something else? GD */	2707	/* We could try to do something clever like find another
2781	const char *god = determine_god(op);	2708	* stat to reduce if this fails. But chances are, if
2782	if (god && (strcmp(god, "none")))	2709	* stats have been depleted to -50, all are pretty low
2783	new_draw_info_format(NDI_UNIQUE, 0, op, "For a brief "	2710	* and should be roughly the same, so it shouldn't make a
2784	"moment you feel the holy presence of %s protecting"	2711	* difference.
2785	" you.", god);	2712	*/
		2713	if (this_stat >= -50)
2786	else	2714	{
2787	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"	2715	change_attr_value (&(dep->stats), i, -1);
2788	" feel a holy presence protecting you.");	2716	SET_FLAG (dep, FLAG_APPLIED);
		2717	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
		2718	op->update_stats ();
		2719	lost_a_stat = 1;
		2720	}
2789	}	2721	}
		2722	}
		2723	}
		2724
		2725	/* If no stat lost, tell the player. */
		2726	if (!lost_a_stat)
		2727	{
		2728	/* determine_god() seems to not work sometimes... why is this?
		2729	Should I be using something else? GD */
		2730	shstr_tmp god = determine_god (op);
		2731
		2732	if (god != shstr_none)
		2733	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", &god);
		2734	else
		2735	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
		2736	}
		2737	#else
		2738	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2790	#endif	2739	#endif
2791	new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"
2792	" feel a holy presence protecting you from losing yourself completely.");
2793		2740
2794	/* Put a gravestone up where the character 'almost' died. List the	2741	/* Put a gravestone up where the character 'almost' died. List the
2795	* exp loss on the stone.	2742	* exp loss on the stone.
2796	*/	2743	*/
2797	tmp=arch_to_object(find_archetype("gravestone"));	2744	tmp = arch_to_object (archetype::find ("gravestone"));
2798	sprintf(buf,"%s's gravestone",op->name);	2745	tmp->name = format ("%s's gravestone", &op->name);
2799	FREE_AND_COPY(tmp->name, buf);	2746	tmp->name_pl = format ("%s's gravestones", &op->name);
2800	sprintf(buf,"%s's gravestones",op->name);	2747	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2801	FREE_AND_COPY(tmp->name_pl, buf);	2748	&op->name, op->contr->title, op->contr->killer_name ());
2802	sprintf(buf,"RIP\nHere rests the hero %s the %s,\n"
2803	"who was killed\n"
2804	"by %s.\n",
2805	op->name, op->contr->title,
2806	op->contr->killer);
2807	tmp->msg = add_string(buf);
2808	tmp->x=op->x,tmp->y=op->y;	2749	tmp->x = op->x, tmp->y = op->y;
2809	insert_ob_in_map (tmp, op->map, NULL,0);	2750	insert_ob_in_map (tmp, op->map, NULL, 0);
2810		2751
2811	/**************************************/	2752	/**************************************/
2812	/* */	2753	/* */
2813	/* Subtract the experience points, */	2754	/* Subtract the experience points, */
2814	/* if we died cause of food, give us */
2815	/* food, and reset HP's... */
2816	/* */	2755	/* */
2817	/**************************************/	2756	/**************************************/
2818		2757
2819	/* remove any poisoning and confusion the character may be suffering.*/
2820	/* restore player */
2821	at = find_archetype("poisoning");
2822	tmp=present_arch_in_ob(at,op);
2823	if (tmp) {
2824	remove_ob(tmp);
2825	free_object(tmp);
2826	new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed");
2827	}
2828
2829	at = find_archetype("confusion");
2830	tmp=present_arch_in_ob(at,op);
2831	if (tmp) {
2832	remove_ob(tmp);
2833	free_object(tmp);
2834	new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer");
2835	}
2836	cure_disease(op,0); /* remove any disease */
2837
2838	/*add_exp(op, (op->stats.exp * -0.20)); */	2758	/*add_exp(op, (op->stats.exp * -0.20)); */
2839	apply_death_exp_penalty(op);	2759	apply_death_exp_penalty (op);
2840	if(op->stats.food < 100) op->stats.food = 900;
2841	op->stats.hp = op->stats.maxhp;
2842	op->stats.sp = MAX(op->stats.sp, op->stats.maxsp);
2843	op->stats.grace = MAX(op->stats.grace, op->stats.maxgrace);
2844		2760
2845	/*	2761	/*
2846	* Check to see if the player is in a shop. IF so, then check to see if	2762	* Check to see if the player has any unpaid items. If so, remove them
2847	* the player has any unpaid items. If so, remove them and put them back	2763	* and put them back in the map.
2848	* in the map.	2764	*/
2849	*/	2765	op->drop_unpaid_items ();
2850		2766
2851	if (is_in_shop (op))
2852	remove_unpaid_objects(op->inv, op);
2853
2854	/****************************************/	2767	/****************************************/
2855	/* */	2768	/* */
2856	/* Move player to his current respawn- */	2769	/* Move player to his current respawn- */
2857	/* position (usually last savebed) */	2770	/* position (usually last savebed) */
2858	/* */	2771	/* */
2859	/****************************************/	2772	/****************************************/
2860		2773
2861	enter_player_savebed(op);	2774	enter_player_savebed (op);
2862		2775
2863	/* Save the player before inserting the force to reduce
2864	* chance of abuse.
2865	*/
2866	op->contr->braced=0;	2776	op->contr->braced = 0;
2867	save_player(op,1);
2868		2777
2869	/* it is possible that the player has blown something up	2778	/* it is possible that the player has blown something up
2870	* at his savebed location, and that can have long lasting	2779	* at his savebed location, and that can have long lasting
2871	* spell effects. So first see if there is a spell effect	2780	* spell effects. So first see if there is a spell effect
2872	* on the space that might harm the player.	2781	* on the space that might harm the player.
2873	*/	2782	*/
2874	will_kill_again=0;	2783	will_kill_again = 0;
2875	for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) {	2784	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
2876	if (tmp->type ==SPELL_EFFECT)	2785	if (tmp->type == SPELL_EFFECT)
2877	will_kill_again|=tmp->attacktype;	2786	will_kill_again |= tmp->attacktype;
2878	}	2787
2879	if (will_kill_again) {	2788	if (will_kill_again)
		2789	{
2880	object *force;	2790	object *force;
2881	int at;	2791	int at;
2882		2792
2883	force=get_archetype(FORCE_NAME);	2793	force = get_archetype (FORCE_NAME);
2884	/* 50 ticks should be enough time for the spell to abate */	2794	/* 50 ticks should be enough time for the spell to abate */
2885	force->speed=0.1;	2795	force->speed = 0.1f;
2886	force->speed_left=-5.0;	2796	force->speed_left = -5.f;
2887	SET_FLAG(force, FLAG_APPLIED);	2797	SET_FLAG (force, FLAG_APPLIED);
2888	for (at=0; at<NROFATTACKS; at++) {	2798	for (at = 0; at < NROFATTACKS; at++)
2889	if (will_kill_again & (1 << at))	2799	if (will_kill_again & (1 << at))
2890	force->resist[at] = 100;	2800	force->resist[at] = 100;
		2801
		2802	insert_ob_in_ob (force, op);
		2803	op->update_stats ();
		2804	}
		2805
		2806	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
		2807	}
		2808
		2809	void
		2810	loot_object (object *op)
		2811	{ /* Grab and destroy some treasure */
		2812	object *tmp, *tmp2, *next;
		2813
		2814	op->close_container (); /* close open sack first */
		2815
		2816	for (tmp = op->inv; tmp; tmp = next)
		2817	{
		2818	next = tmp->below;
		2819
		2820	if (tmp->invisible)
		2821	continue;
		2822
		2823	tmp->remove ();
		2824	tmp->x = op->x, tmp->y = op->y;
		2825
		2826	if (tmp->type == CONTAINER)
		2827	loot_object (tmp); /* empty container to ground */
		2828
		2829	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
		2830	{
		2831	if (tmp->nrof > 1)
		2832	{
		2833	tmp->decrease (rndm (1, tmp->nrof - 1));
		2834	insert_ob_in_map (tmp, op->map, NULL, 0);
2891	}	2835	}
2892	insert_ob_in_ob(force, op);
2893	fix_player(op);
2894
2895	}
2896	/**************************************/
2897	/* */
2898	/* Repaint the characters inv, and */
2899	/* stats, and show a nasty message ;) */
2900	/* */
2901	/**************************************/
2902
2903	new_draw_info(NDI_UNIQUE, 0,op,"YOU HAVE DIED.");
2904	return;
2905	} /* NOT_PERMADETH */
2906	else {
2907	/* If NOT_PERMADETH is set, then the rest of this is not reachable. This
2908	* should probably be embedded in an else statement.
2909	*/
2910
2911	op->contr->party=NULL;
2912	if (settings.set_title == TRUE)
2913	op->contr->own_title[0]='\0';
2914	new_draw_info(NDI_UNIQUE|NDI_ALL, 0,NULL, buf);
2915	check_score(op);
2916	if(op->contr->ranges[range_golem]!=NULL) {
2917	remove_friendly_object(op->contr->ranges[range_golem]);
2918	remove_ob(op->contr->ranges[range_golem]);
2919	free_object(op->contr->ranges[range_golem]);
2920	op->contr->ranges[range_golem]=NULL;
2921	op->contr->golem_count=0;
2922	}
2923	loot_object(op); /* Remove some of the items for good */
2924	remove_ob(op);
2925	op->direction=0;
2926
2927	if(!QUERY_FLAG(op,FLAG_WAS_WIZ)&&op->stats.exp) {
2928	delete_character(op->name,0);
2929	if (settings.resurrection == TRUE) {
2930	/* save playerfile sans equipment when player dies
2931	** then save it as player.pl.dead so that future resurrection
2932	** type spells will work on them nicely
2933	*/
2934	delete_character(op->name,0);
2935	op->stats.hp = op->stats.maxhp;
2936	op->stats.food = 999;
2937
2938	/* set the location of where the person will reappear when */
2939	/* maybe resurrection code should fix map also */
2940	strcpy(op->contr->maplevel, settings.emergency_mapname);
2941	if(op->map!=NULL)
2942	op->map = NULL;
2943	op->x = settings.emergency_x;
2944	op->y = settings.emergency_y;
2945	save_player(op,0);
2946	op->map = map;
2947	/* please see resurrection.c: peterm */
2948	dead_player(op);
2949	} else {	2836	else
2950	delete_character(op->name,1);	2837	tmp->destroy ();
2951	}	2838	}
2952	}	2839	else
2953	play_again(op);
2954
2955	/* peterm: added to create a corpse at deathsite. */
2956	tmp=arch_to_object(find_archetype("corpse_pl"));
2957	sprintf(buf,"%s", op->name);
2958	FREE_AND_COPY(tmp->name, buf);
2959	FREE_AND_COPY(tmp->name_pl, buf);
2960	tmp->level=op->level;
2961	tmp->x=x;tmp->y=y;
2962	if (tmp->msg)
2963	free_string(tmp->msg);
2964	tmp->msg = add_string (gravestone_text(op));
2965	SET_FLAG (tmp, FLAG_UNIQUE);
2966	insert_ob_in_map (tmp, map, NULL,0);
2967	}
2968	}
2969
2970
2971	void loot_object(object *op) { /* Grab and destroy some treasure */
2972	object *tmp,*tmp2,*next;
2973
2974	if (op->container) { /* close open sack first */
2975	esrv_apply_container (op, op->container);
2976	}
2977
2978	for(tmp=op->inv;tmp!=NULL;tmp=next) {
2979	next=tmp->below;
2980	if (tmp->type==EXPERIENCE || tmp->invisible) continue;
2981	remove_ob(tmp);
2982	tmp->x=op->x,tmp->y=op->y;
2983	if (tmp->type == CONTAINER) { /* empty container to ground */
2984	loot_object(tmp);
2985	}
2986	if(!QUERY_FLAG(tmp, FLAG_UNIQUE) && (QUERY_FLAG(tmp, FLAG_STARTEQUIP)
2987	|| QUERY_FLAG(tmp,FLAG_NO_DROP) || !(RANDOM()%3))) {
2988	if(tmp->nrof>1) {
2989	tmp2=get_split_ob(tmp,1+RANDOM()%(tmp->nrof-1));
2990	free_object(tmp2);
2991	insert_ob_in_map(tmp,op->map,NULL,0);	2840	insert_ob_in_map (tmp, op->map, NULL, 0);
2992	} else
2993	free_object(tmp);
2994	} else
2995	insert_ob_in_map(tmp,op->map,NULL,0);
2996	}	2841	}
2997	}	2842	}
2998		2843
2999	/*	2844	/*
3000	* fix_weight(): Check recursively the weight of all players, and fix	2845	* fix_weight(): Check recursively the weight of all players, and fix
3001	* what needs to be fixed. Refresh windows and fix speed if anything	2846	* what needs to be fixed. Refresh windows and fix speed if anything
3002	* was changed.	2847	* was changed.
3003	*/	2848	*/
3004		2849	void
3005	void fix_weight(void) {	2850	fix_weight (void)
3006	player *pl;	2851	{
3007	for (pl = first_player; pl != NULL; pl = pl->next) {	2852	for_all_players (pl)
3008	int old = pl->ob->carrying, sum = sum_weight(pl->ob);	2853	{
3009	if(old == sum)	2854	sint32 old = pl->ob->carrying;
3010	continue;	2855
3011	fix_player(pl->ob);	2856	pl->ob->update_weight ();
3012	LOG(llevDebug,"Fixed inventory in %s (%d -> %d)\n",	2857
3013	pl->ob->name, old, sum);	2858	if (old != pl->ob->carrying)
		2859	{
		2860	pl->ob->update_stats ();
		2861	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2862	}
3014	}	2863	}
3015	}	2864	}
3016		2865
		2866	void
3017	void fix_luck(void) {	2867	fix_luck (void)
3018	player *pl;	2868	{
3019	for (pl = first_player; pl != NULL; pl = pl->next)	2869	for_all_players (pl)
3020	if (!pl->ob->contr->state)	2870	if (!pl->ob->contr->ns->state)
3021	change_luck(pl->ob, 0);	2871	pl->ob->change_luck (0);
3022	}	2872	}
3023
3024		2873
3025	/* cast_dust() - handles op throwing objects of type 'DUST'.	2874	/* cast_dust() - handles op throwing objects of type 'DUST'.
3026	* This is much simpler in the new spell code - we basically	2875	* This is much simpler in the new spell code - we basically
3027	* just treat this as any other spell casting object.	2876	* just treat this as any other spell casting object.
3028	*/	2877	*/
3029
3030	void	2878	void
3031	cast_dust (object * op, object * throw_ob, int dir)	2879	cast_dust (object *op, object *throw_ob, int dir)
3032	{	2880	{
3033	object *skop, *spob;	2881	object *skop, *spob;
3034		2882
3035	skop = find_skill_by_name (op, throw_ob->skill);	2883	skop = find_skill_by_name (op, throw_ob->skill);
3036		2884
3037	/* casting POTION 'dusts' is really a use_magic_item skill */	2885	/* casting POTION 'dusts' is really a use_magic_item skill */
3038	if (op->type == PLAYER && throw_ob->type == POTION && !skop)	2886	if (op->type == PLAYER && throw_ob->type == POTION && !skop)
3039	{	2887	{
3040	LOG (llevError, "Player %s lacks critical skill use_magic_item!\n",	2888	LOG (llevError, "Player %s lacks critical skill use_magic_item!\n", &op->name);
3041	op->name);
3042	return;	2889	return;
3043	}	2890	}
3044		2891
3045	spob = throw_ob->inv;	2892	spob = throw_ob->inv;
3046		2893
3047	// elmex Tue Aug 15 17:19:46 CEST 2006: Added this check to	2894	// elmex Tue Aug 15 17:19:46 CEST 2006: Added this check to
3048	// not pass NULL to cast_spell (which did indeed check itself, but	2895	// not pass NULL to cast_spell (which did indeed check itself, but
3049	// errors should be reported as early as possible IMHO)	2896	// errors should be reported as early as possible IMHO)
3050	if (!spob)	2897	if (!spob)
3051	{	2898	{
3052	LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!",	2899	LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!", &throw_ob->name, &op->name);
3053	throw_ob->name, op->name);
3054	return;	2900	return;
3055	}	2901	}
3056		2902
3057	if (op->type == PLAYER)	2903	if (op->type == PLAYER)
3058	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", spob->name);	2904	new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3059		2905
3060	cast_spell (op, throw_ob, dir, spob, NULL);	2906	cast_spell (op, throw_ob, dir, spob, NULL);
3061		2907
3062	if (!QUERY_FLAG (throw_ob, FLAG_REMOVED))	2908	throw_ob->destroy ();
3063	remove_ob (throw_ob);
3064	free_object (throw_ob);
3065	}	2909	}
3066		2910
		2911	void
3067	void make_visible (object *op) {	2912	make_visible (object *op)
3068	op->hide = 0;	2913	{
		2914	op->flag [FLAG_HIDDEN] = 0;
3069	op->invisible = 0;	2915	op->invisible = 0;
		2916
3070	if(op->type==PLAYER) {	2917	if (op->type == PLAYER)
		2918	{
3071	op->contr->tmp_invis = 0;	2919	op->contr->tmp_invis = 0;
3072	if (op->contr->invis_race) FREE_AND_CLEAR_STR(op->contr->invis_race);	2920	op->contr->invis_race = 0;
3073	}	2921	}
		2922
3074	update_object(op,UP_OBJ_FACE);	2923	update_object (op, UP_OBJ_CHANGE);
3075	}	2924	}
3076		2925
		2926	int
3077	int is_true_undead(object *op) {	2927	is_true_undead (object *op)
3078	object *tmp=NULL;	2928	{
3079
3080	if(QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD)) return 1;	2929	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
		2930	return 1;
3081		2931
3082	if(op->type==PLAYER)
3083	for(tmp=op->inv;tmp;tmp=tmp->below)
3084	if(tmp->type==EXPERIENCE && tmp->stats.Wis)
3085	if(QUERY_FLAG(tmp,FLAG_UNDEAD)) return 1;
3086	return 0;	2932	return 0;
3087	}	2933	}
3088		2934
3089	/* look at the surrounding terrain to determine	2935	/* look at the surrounding terrain to determine
3090	* the hideability of this object. Positive levels	2936	* the hideability of this object. Positive levels
3091	* indicate greater hideability.	2937	* indicate greater hideability.
3092	*/	2938	*/
3093		2939	int
3094	int hideability(object *ob) {	2940	hideability (object *ob)
		2941	{
3095	int i,level=0, mflag;	2942	int i, level = 0, mflag;
3096	sint16 x,y;	2943	sint16 x, y;
3097		2944
3098	if(!ob||!ob->map) return 0;	2945	if (!ob || !ob->map)
		2946	return 0;
3099		2947
3100	/* so, on normal lighted maps, its hard to hide */	2948	/* so, on normal lighted maps, its hard to hide */
3101	level=ob->map->darkness - 2;	2949	level = ob->map->darklevel () - 2;
3102		2950
3103	/* this also picks up whether the object is glowing.	2951	/* this also picks up whether the object is glowing.
3104	* If you carry a light on a non-dark map, its not	2952	* If you carry a light on a non-dark map, its not
3105	* as bad as carrying a light on a pitch dark map */	2953	* as bad as carrying a light on a pitch dark map */
3106	if(has_carried_lights(ob)) level =- (10 + (2*ob->map->darkness));	2954	if (has_carried_lights (ob))
		2955	level = -(10 + (2 * ob->map->darklevel ()));
3107		2956
3108	/* scan through all nearby squares for terrain to hide in */	2957	/* scan through all nearby squares for terrain to hide in */
3109	for(i=0,x=ob->x,y=ob->y;i<9;i++,x=ob->x+freearr_x[i],y=ob->y+freearr_y[i]) {	2958	for (i = 0, x = ob->x, y = ob->y;
		2959	i <= SIZEOFFREE1;
		2960	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
		2961	{
3110	mflag = get_map_flags(ob->map, NULL, x, y, NULL, NULL);	2962	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3111	if (mflag & P_OUT_OF_MAP) { continue; }	2963	if (mflag & P_OUT_OF_MAP)
		2964	continue;
		2965
3112	if(mflag & P_BLOCKSVIEW) /* something to hide near! */	2966	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3113	level += 2;	2967	level += 2;
3114	else /* open terrain! */	2968	else /* open terrain! */
3115	level -= 1;	2969	level -= 1;
3116	}	2970	}
3117		2971
3118	#if 0	2972	#if 0
3119	LOG(llevDebug,"hideability of %s is %d\n",ob->name,level);	2973	LOG (llevDebug, "hideability of %s is %d\n", ob->name, level);
3120	#endif	2974	#endif
3121	return level;	2975	return level;
3122	}	2976	}
3123		2977
3124	/* For Hidden creatures - a chance of becoming 'unhidden'	2978	/* For Hidden creatures - a chance of becoming 'unhidden'
3125	* every time they move - as we subtract off 'invisibility'	2979	* every time they move - as we subtract off 'invisibility'
3126	* AND, for players, if they move into a ridiculously unhideable	2980	* AND, for players, if they move into a ridiculously unhideable
3127	* spot (surrounded by clear terrain in broad daylight). -b.t.	2981	* spot (surrounded by clear terrain in broad daylight). -b.t.
3128	*/	2982	*/
3129		2983	void
3130	void do_hidden_move (object *op) {	2984	do_hidden_move (object *op)
3131	int hide=0, num=random_roll(0, 19, op, PREFER_LOW);	2985	{
3132	object *skop;	2986	int hide = 0;
3133		2987
3134	if(!op || !op->map) return;	2988	if (!op || !op->map)
		2989	return;
3135		2990
3136	skop = find_obj_by_type_subtype(op, SKILL, SK_HIDING);	2991	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2992	int num = random_roll (0, 19, op, PREFER_LOW);
3137		2993
3138	/* its *extremely* hard to run and sneak/hide at the same time! */	2994	/* its *extremely* hard to run and sneak/hide at the same time! */
3139	if(op->type==PLAYER && op->contr->run_on) {	2995	if (op->type == PLAYER && op->contr->run_on)
3140	if(!skop || num >= skop->level) {	2996	if (!skop || num >= skop->level)
		2997	{
3141	new_draw_info(NDI_UNIQUE,0,op,"You ran too much! You are no longer hidden!");	2998	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3142	make_visible(op);
3143	return;
3144	} else num += 20;
3145	}
3146	num += op->map->difficulty;
3147	hide = hideability(op); /* modify by terrain hidden level */
3148	num -= hide;
3149	if((op->type==PLAYER && hide<-10) || ((op->invisible-=num)<=0)) {
3150	make_visible(op);	2999	make_visible (op);
3151	if(op->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,op,	3000	return;
3152	"You moved out of hiding! You are visible!");
3153	}	3001	}
		3002	else
		3003	num += 20;
		3004
		3005	num += op->map->difficulty;
		3006	hide = hideability (op); /* modify by terrain hidden level */
		3007	num -= hide;
		3008
		3009	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
		3010	{
		3011	make_visible (op);
		3012
		3013	if (op->type == PLAYER)
		3014	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
		3015	}
3154	else if (op->type == PLAYER && skop) {	3016	else if (op->type == PLAYER && skop)
3155	change_exp(op, calc_skill_exp(op, NULL, skop), skop->skill, 0);	3017	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3156	}
3157	}	3018	}
3158		3019
3159	/* determine if who is standing near a hostile creature. */	3020	/* determine if who is standing near a hostile creature. */
3160		3021
		3022	int
3161	int stand_near_hostile( object *who ) {	3023	stand_near_hostile (object *who)
		3024	{
3162	object *tmp=NULL;	3025	object *tmp = NULL;
3163	int i,friendly=0,player=0, mflags;	3026	int i, friendly = 0, player = 0, mflags;
3164	mapstruct *m;	3027	maptile *m;
3165	sint16 x,y;	3028	sint16 x, y;
3166		3029
3167	if(!who) return 0;	3030	if (!who)
		3031	return 0;
3168		3032
3169	if(who->type==PLAYER) player=1;	3033	if (who->type == PLAYER)
		3034	player = 1;
		3035
		3036	else
3170	else friendly = QUERY_FLAG(who,FLAG_FRIENDLY);	3037	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);
3171		3038
3172	/* search adjacent squares */	3039	/* search adjacent squares */
3173	for(i=1;i<9;i++) {	3040	for (i = 1; i < 9; i++)
		3041	{
3174	x = who->x+freearr_x[i];	3042	x = who->x + freearr_x[i];
3175	y = who->y+freearr_y[i];	3043	y = who->y + freearr_y[i];
3176	m = who->map;	3044	m = who->map;
3177	mflags = get_map_flags(m, &m, x, y, &x, &y);	3045	mflags = get_map_flags (m, &m, x, y, &x, &y);
3178	/* space must be blocked if there is a monster. If not	3046	/* space must be blocked if there is a monster. If not
3179	* blocked, don't need to check this space.	3047	* blocked, don't need to check this space.
3180	*/	3048	*/
3181	if (mflags & P_OUT_OF_MAP) continue;	3049	if (mflags & P_OUT_OF_MAP)
		3050	continue;
3182	if (OB_TYPE_MOVE_BLOCK(who, GET_MAP_MOVE_BLOCK(m, x, y))) continue;	3051	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3183		3052	continue;
3184	for(tmp=get_map_ob(m,x,y);tmp;tmp=tmp->above) {	3053
3185	if((player||friendly)	3054	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
		3055	{
3186	&&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE))	3056	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
		3057	return 1;
		3058	else if (tmp->type == PLAYER)
		3059	{
		3060	/*don't let a hidden DM prevent you from hiding */
		3061	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3187	return 1;	3062	return 1;
3188	else if(tmp->type==PLAYER)
3189	{
3190	/*don't let a hidden DM prevent you from hiding*/
3191	if(!QUERY_FLAG(tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3192	return 1;
3193	}	3063	}
3194	}	3064	}
3195	}	3065	}
3196	return 0;	3066	return 0;
3197	}	3067	}
3198		3068
3199	/* check the player los field for viewability of the	3069	/* check the player los field for viewability of the
3200	* object op. This function works fine for monsters,	3070	* object op. This function works fine for monsters,
3201	* but we dont worry if the object isnt the top one in	3071	* but we dont worry if the object isnt the top one in
3202	* a pile (say a coin under a table would return "viewable"	3072	* a pile (say a coin under a table would return "viewable"
3203	* by this routine). Another question, should we be	3073	* by this routine). Another question, should we be
3204	* concerned with the direction the player is looking	3074	* concerned with the direction the player is looking
3205	* in? Realistically, most of use cant see stuff behind	3075	* in? Realistically, most of us can't see stuff behind
3206	* our backs...on the other hand, does the "facing" direction	3076	* our backs...on the other hand, does the "facing" direction
3207	* imply the way your head, or body is facing? Its possible	3077	* imply the way your head, or body is facing? It's possible
3208	* for them to differ. Sigh, this fctn could get a bit more complex.	3078	* for them to differ. Sigh, this fctn could get a bit more complex.
3209	* -b.t.	3079	* -b.t.
3210	* This function is now map tiling safe.	3080	* This function is now map tiling safe.
3211	*/	3081	*/
3212		3082	int
3213	int player_can_view (object *pl,object *op) {	3083	player_can_view (object *pl, object *op)
		3084	{
3214	rv_vector rv;	3085	rv_vector rv;
3215	int dx,dy;	3086	int dx, dy;
3216		3087
3217	if(pl->type!=PLAYER) {	3088	if (pl->type != PLAYER)
		3089	{
3218	LOG(llevError,"player_can_view() called for non-player object\n");	3090	LOG (llevError, "player_can_view() called for non-player object\n");
3219	return -1;	3091	return -1;
3220	}	3092	}
3221	if (!pl || !op) return 0;
3222		3093
3223	if(op->head) { op = op->head; }	3094	if (!pl || !op)
3224	get_rangevector(pl, op, &rv, 0x1);
3225
3226	/* starting with the 'head' part, lets loop
3227	* through the object and find if it has any
3228	* part that is in the los array but isnt on
3229	* a blocked los square.
3230	* we use the archetype to figure out offsets.
3231	*/
3232	while(op) {
3233	dx = rv.distance_x + op->arch->clone.x;
3234	dy = rv.distance_y + op->arch->clone.y;
3235
3236	/* only the viewable area the player sees is updated by LOS
3237	* code, so we need to restrict ourselves to that range of values
3238	* for any meaningful values.
3239	*/
3240	if (FABS(dx) <= (pl->contr->socket.mapx/2) &&
3241	FABS(dy) <= (pl->contr->socket.mapy/2) &&
3242	!pl->contr->blocked_los[dx + (pl->contr->socket.mapx/2)][dy+(pl->contr->socket.mapy/2)] )
3243	return 1;
3244	op = op->more;
3245	}
3246	return 0;	3095	return 0;
		3096
		3097	op = op->head_ ();
		3098
		3099	get_rangevector (pl, op, &rv, 0x1);
		3100
		3101	/* starting with the 'head' part, lets loop
		3102	* through the object and find if it has any
		3103	* part that is in the los array but isn't on
		3104	* a blocked los square.
		3105	* we use the archetype to figure out offsets.
		3106	*/
		3107	while (op)
		3108	{
		3109	dx = rv.distance_x + op->arch->x;
		3110	dy = rv.distance_y + op->arch->y;
		3111
		3112	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
		3113	return 1;
		3114
		3115	op = op->more;
		3116	}
		3117
		3118	return 0;
3247	}	3119	}
3248		3120
3249	/* routine for both players and monsters. We call this when	3121	/* routine for both players and monsters. We call this when
3250	* there is a possibility for our action distrubing our hiding	3122	* there is a possibility for our action distrubing our hiding
3251	* place or invisiblity spell. Artefact invisiblity is not	3123	* place or invisiblity spell. Artefact invisiblity causes
3252	* effected by this. If we arent invisible to begin with, we	3124	* "noise" instead. If we arent invisible to begin with, we
3253	* return 0.	3125	* return 0.
3254	*/	3126	*/
		3127	int
3255	int action_makes_visible (object *op) {	3128	action_makes_visible (object *op)
3256		3129	{
3257	if(op->invisible && QUERY_FLAG(op,FLAG_ALIVE)) {	3130	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
		3131	{
3258	if(QUERY_FLAG(op,FLAG_MAKE_INVIS))	3132	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
		3133	{
		3134	// artefact invisibility is permanent, but we still make noise
		3135	// this is important for game-balance.
		3136	if (op->contr)
		3137	op->make_noise ();
		3138
3259	return 0;	3139	return 0;
		3140	}
3260		3141
3261	if (op->contr && op->contr->tmp_invis == 0) return 0;	3142	if (op->contr && op->contr->tmp_invis == 0)
		3143	return 0;
3262		3144
3263	/* If monsters, they should become visible */	3145	/* If monsters, they should become visible */
3264	if(op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) {	3146	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		3147	{
3265	new_draw_info_format(NDI_UNIQUE, 0,op,"You become %s!",op->hide?"unhidden":"visible");	3148	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3266	return 1;	3149	return 1;
3267	}	3150	}
3268	}	3151	}
		3152
3269	return 0;	3153	return 0;
3270	}	3154	}
3271		3155
3272	/* op_on_battleground - checks if the given object op (usually	3156	/* op_on_battleground - checks if the given object op (usually
3273	* a player) is standing on a valid battleground-tile,	3157	* a player) is standing on a valid battleground-tile,
3274	* function returns TRUE/FALSE. If true x, y returns the battleground	3158	* function returns TRUE/FALSE. If true x, y returns the battleground
3275	* -exit-coord. (and if x, y not NULL)	3159	* -exit-coord. (and if x, y not NULL)
3276	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set	3160	* 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
3277	* and if those are all set and the player has a marker that matches the slaying send them to a different x, y	3161	* and if those are all set and the player has a marker that matches the slaying send them to a different x, y
3278	* Default is to do the same as before, so only people wanting to have different points need worry about this	3162	* Default is to do the same as before, so only people wanting to have different points need worry about this
3279	*/	3163	*/
		3164	int
3280	int op_on_battleground (object *op, int *x, int *y) {	3165	op_on_battleground (object *op, int *x, int *y)
3281	object *tmp;	3166	{
3282
3283	/* A battleground-tile needs the following attributes to be valid:	3167	/* A battleground-tile needs the following attributes to be valid:
3284	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3168	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3285	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3169	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3286	* and the exit-coordinates sp/hp must both be > 0.	3170	* and the exit-coordinates sp/hp must both be > 0.
3287	* => The intention here is to prevent abuse of the battleground-	3171	* => The intention here is to prevent abuse of the battleground-
3288	* feature (like pickable or hidden battleground tiles). */	3172	* feature (like pickable or hidden battleground tiles). */
3289	for (tmp=op->below; tmp!=NULL; tmp=tmp->below) {	3173	for (object *tmp = op->below; tmp; tmp = tmp->below)
		3174	{
3290	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) {	3175	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
		3176	{
3291	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3177	if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3292	strcmp(tmp->name, "battleground")==0 &&	3178	&& tmp->type == BATTLEGROUND
3293	tmp->type == BATTLEGROUND && EXIT_X(tmp) && EXIT_Y(tmp)) {	3179	&& tmp->name == shstr_battleground
		3180	&& EXIT_X (tmp) && EXIT_Y (tmp))
		3181	{
3294	/*before we assign the exit, check if this is a teambattle*/	3182	/* before we assign the exit, check if this is a teambattle */
3295	if ( EXIT_ALT_X(tmp) && EXIT_ALT_Y(tmp) && EXIT_PATH(tmp) ){	3183	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3296	object *invtmp;	3184	{
3297	for(invtmp=op->inv; invtmp != NULL; invtmp=invtmp->below) {	3185	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3186	{
3298	if(invtmp->type==FORCE && invtmp->slaying &&	3187	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3299	!strcmp(EXIT_PATH(tmp), invtmp->slaying)){	3188	{
3300	if (x != NULL && y != NULL)	3189	if (x && y)
3301	*x=EXIT_ALT_X(tmp), *y=EXIT_ALT_Y(tmp);	3190	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3191
3302	return 1;	3192	return 1;
		3193	}
3303	}	3194	}
3304	}	3195	}
3305	}	3196
3306	if (x != NULL && y != NULL)	3197	if (x && y)
3307	*x=EXIT_X(tmp), *y=EXIT_Y(tmp);	3198	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3199
3308	return 1;	3200	return 1;
		3201	}
3309	}	3202	}
3310	}
3311	}	3203	}
		3204
3312	/* If we got here, did not find a battleground */	3205	/* If we got here, did not find a battleground */
3313	return 0;	3206	return 0;
3314	}	3207	}
3315		3208
3316	/*	3209	/*
…		…
3320	* attributes:	3213	* attributes:
3321	* object *who the dragon player	3214	* object *who the dragon player
3322	* int atnr the attack-number of the ability focus	3215	* int atnr the attack-number of the ability focus
3323	* int level ability level	3216	* int level ability level
3324	*/	3217	*/
		3218	void
3325	void dragon_ability_gain(object *who, int atnr, int level) {	3219	dragon_ability_gain (object *who, int atnr, int level)
		3220	{
3326	treasurelist *trlist = NULL; /* treasurelist */	3221	treasurelist *trlist = NULL; /* treasurelist */
3327	treasure *tr; /* treasure */	3222	treasure *tr; /* treasure */
3328	object *tmp,*skop; /* tmp. object */	3223	object *tmp, *skop; /* tmp. object */
3329	object *item; /* treasure object */	3224	object *item; /* treasure object */
3330	char buf[MAX_BUF]; /* tmp. string buffer */	3225	char buf[MAX_BUF]; /* tmp. string buffer */
3331	int i=0, j=0;	3226	int i = 0, j = 0;
3332		3227
3333	/* get the appropriate treasurelist */	3228	/* get the appropriate treasurelist */
3334	if (atnr == ATNR_FIRE)	3229	if (atnr == ATNR_FIRE)
3335	trlist = find_treasurelist("dragon_ability_fire");	3230	trlist = treasurelist::find (shstr_dragon_ability_fire);
3336	else if (atnr == ATNR_COLD)	3231	else if (atnr == ATNR_COLD)
3337	trlist = find_treasurelist("dragon_ability_cold");	3232	trlist = treasurelist::find (shstr_dragon_ability_cold);
3338	else if (atnr == ATNR_ELECTRICITY)	3233	else if (atnr == ATNR_ELECTRICITY)
3339	trlist = find_treasurelist("dragon_ability_elec");	3234	trlist = treasurelist::find (shstr_dragon_ability_elec);
3340	else if (atnr == ATNR_POISON)	3235	else if (atnr == ATNR_POISON)
3341	trlist = find_treasurelist("dragon_ability_poison");	3236	trlist = treasurelist::find (shstr_dragon_ability_poison);
3342		3237
3343	if (trlist == NULL || who->type != PLAYER)	3238	if (trlist == NULL || who->type != PLAYER)
		3239	return;
		3240
		3241	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
		3242
		3243	if (!tr || !tr->item)
		3244	{
		3245	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
		3246	return;
		3247	}
		3248
		3249	/* everything seems okay - now bring on the gift: */
		3250	item = tr->item;
		3251
		3252	if (item->type == SPELL)
		3253	{
		3254	if (check_spell_known (who, item->name))
3344	return;	3255	return;
3345		3256
3346	for (i=0, tr = trlist->items; tr != NULL && i<level-1;	3257	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained the ability of %s", &item->name);
3347	tr = tr->next, i++);	3258	do_learn_spell (who, item, 0);
3348		3259	return;
3349	if (tr == NULL || tr->item == NULL) {	3260	}
3350	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3261
		3262	/* grant direct spell */
		3263	if (item->type == SPELLBOOK)
		3264	{
		3265	if (!item->inv)
		3266	{
		3267	LOG (llevDebug, "dragon_ability_gain: Broken spellbook %s\n", &item->name);
		3268	return;
		3269	}
		3270	if (check_spell_known (who, item->inv->name))
3351	return;	3271	return;
3352	}
3353
3354	/* everything seems okay - now bring on the gift: */
3355	item = &(tr->item->clone);
3356
3357	if (item->type == SPELL) {
3358	if (check_spell_known (who, item->name))
3359	return;
3360
3361	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->name);
3362	do_learn_spell (who, item, 0);
3363	return;
3364	}
3365
3366	/* grant direct spell */
3367	if (item->type == SPELLBOOK) {
3368	if (!item->inv) {
3369	LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n",
3370	item->name);
3371	return;
3372	}
3373	if (check_spell_known (who, item->inv->name))
3374	return;
3375	if (item->invisible) {	3272	if (item->invisible)
		3273	{
3376	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->inv->name);	3274	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained the ability of %s", &item->inv->name);
3377	do_learn_spell (who, item->inv, 0);	3275	do_learn_spell (who, item->inv, 0);
3378	return;	3276	return;
3379	}	3277	}
3380	}	3278	}
3381	else if (item->type == SKILL_TOOL && item->invisible) {	3279	else if (item->type == SKILL_TOOL && item->invisible)
		3280	{
3382	if (item->subtype == SK_CLAWING && (skop=find_skill_by_name(who, item->skill))!=NULL) {	3281	if (item->subtype == SK_CLAWING && (skop = find_skill_by_name (who, item->skill)) != NULL)
		3282	{
3383		3283
3384	/* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ...	3284	/* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ...
3385	* in this way, if the player is missing any of the attacktypes, he gets	3285	* in this way, if the player is missing any of the attacktypes, he gets
3386	* them. As it is now, if the player has any that match the granted skill,	3286	* them. As it is now, if the player has any that match the granted skill,
3387	* but not all of them, he gets nothing.	3287	* but not all of them, he gets nothing.
3388	*/	3288	*/
3389	if (!(skop->attacktype & item->attacktype)) {	3289	if (!(skop->attacktype & item->attacktype))
		3290	{
3390	/* Give new attacktype */	3291	/* Give new attacktype */
3391	skop->attacktype |= item->attacktype;	3292	skop->attacktype |= item->attacktype;
3392		3293
3393	/* always add physical if there's none */	3294	/* always add physical if there's none */
3394	skop->attacktype |= AT_PHYSICAL;	3295	skop->attacktype |= AT_PHYSICAL;
3395		3296
3396	if (item->msg != NULL)	3297	if (item->msg != NULL)
3397	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);	3298	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3398		3299
3399	/* Give player new face */	3300	/* Give player new face */
3400	if (item->animation_id) {	3301	if (item->animation_id)
		3302	{
3401	who->face = skop->face;	3303	who->face = skop->face;
3402	who->animation_id = item->animation_id;	3304	who->animation_id = item->animation_id;
3403	who->anim_speed = item->anim_speed;	3305	who->anim_speed = item->anim_speed;
3404	who->last_anim = 0;	3306	who->last_anim = 0;
3405	who->state = 0;	3307	who->state = 0;
3406	animate_object(who, who->direction);	3308	animate_object (who, who->direction);
3407	}	3309	}
3408	}	3310	}
3409	}	3311	}
3410	}	3312	}
3411	else if (item->type == FORCE) {	3313	else if (item->type == FORCE)
		3314	{
3412	/* forces in the treasurelist can alter the player's stats */	3315	/* forces in the treasurelist can alter the player's stats */
3413	object *skin;	3316	object *skin;
		3317
3414	/* first get the dragon skin force */	3318	/* first get the dragon skin force */
3415	for (skin=who->inv; skin!=NULL && strcmp(skin->arch->name, "dragon_skin_force")!=0;	3319	for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3416	skin=skin->below);	3320	;
3417	if (skin == NULL) return;	3321
3418		3322	if (!skin)
		3323	return;
		3324
3419	/* adding new spellpath attunements */	3325	/* adding new spellpath attunements */
3420	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) {	3326	if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
		3327	{
3421	skin->path_attuned |= item->path_attuned; /* add attunement to skin */	3328	skin->path_attuned |= item->path_attuned; /* add attunement to skin */
3422		3329
3423	/* print message */	3330	/* print message */
3424	sprintf(buf, "You feel attuned to ");	3331	sprintf (buf, "You feel attuned to ");
3425	for(i=0, j=0; i<NRSPELLPATHS; i++) {	3332	for (i = 0, j = 0; i < NRSPELLPATHS; i++)
		3333	{
3426	if(item->path_attuned & (1<<i)) {	3334	if (item->path_attuned & (1 << i))
		3335	{
3427	if (j)	3336	if (j)
3428	strcat(buf," and ");	3337	strcat (buf, " and ");
3429	else	3338	else
3430	j = 1;	3339	j = 1;
3431	strcat(buf, spellpathnames[i]);	3340	strcat (buf, spellpathnames[i]);
3432	}	3341	}
3433	}	3342	}
3434	strcat(buf,".");	3343	strcat (buf, ".");
3435	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, buf);	3344	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3436	}	3345	}
3437		3346
3438	/* evtl. adding flags: */	3347	/* evtl. adding flags: */
3439	if(QUERY_FLAG(item, FLAG_XRAYS))	3348	if (QUERY_FLAG (item, FLAG_XRAYS))
3440	SET_FLAG(skin, FLAG_XRAYS);	3349	SET_FLAG (skin, FLAG_XRAYS);
3441	if(QUERY_FLAG(item, FLAG_STEALTH))	3350	if (QUERY_FLAG (item, FLAG_STEALTH))
3442	SET_FLAG(skin, FLAG_STEALTH);	3351	SET_FLAG (skin, FLAG_STEALTH);
3443	if(QUERY_FLAG(item, FLAG_SEE_IN_DARK))	3352	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))
3444	SET_FLAG(skin, FLAG_SEE_IN_DARK);	3353	SET_FLAG (skin, FLAG_SEE_IN_DARK);
3445		3354
3446	/* print message if there is one */	3355	/* print message if there is one */
3447	if (item->msg != NULL)	3356	if (item->msg != NULL)
3448	new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg);	3357	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
		3358	}
		3359	else
3449	}	3360	{
3450	else {
3451	/* generate misc. treasure */	3361	/* generate misc. treasure */
3452	tmp = arch_to_object (tr->item);	3362	tmp = arch_to_object (tr->item);
3453	new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained %s", query_short_name(tmp));	3363	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3454	tmp = insert_ob_in_ob (tmp, who);	3364	who->insert (tmp);
3455	if (who->type == PLAYER)
3456	esrv_send_item(who, tmp);
3457	}	3365	}
3458	}	3366	}
3459		3367
3460	/**	3368	/**
3461	* Unready an object for a player. This function does nothing if the object was	3369	* Unready an object for a player. This function does nothing if the object was
3462	* not readied.	3370	* not readied.
3463	*/	3371	*/
		3372	void
3464	void player_unready_range_ob(player *pl, object *ob) {	3373	player_unready_range_ob (player *pl, object *ob)
3465	rangetype i;	3374	{
		3375	if (pl->ob->current_weapon == ob)
		3376	pl->ob->current_weapon = 0;
3466		3377
3467	for (i = (rangetype)0; i < range_size; i = (rangetype) ((int)i + 1)) {	3378	if (pl->combat_ob == ob)
3468	if (pl->ranges[i] == ob) {	3379	pl->combat_ob = 0;
3469	pl->ranges[i] = NULL;	3380
3470	if (pl->shoottype == i) {	3381	if (pl->ranged_ob == ob)
3471	pl->shoottype = range_none;	3382	pl->ranged_ob = 0;
3472	}
3473	}
3474	}
3475	}	3383	}
		3384
		3385	sint8
		3386	player::darkness_at (maptile *map, int x, int y) const
		3387	{
		3388	if (!ns)
		3389	return LOS_BLOCKED;
		3390
		3391	int dx, dy;
		3392	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3393	return LOS_BLOCKED;
		3394
		3395	x += dx - ns->current_x;
		3396	y += dy - ns->current_y;
		3397
		3398	return blocked_los (x, y);
		3399	}
		3400
		3401	void
		3402	player::infobox (const char *title, const char *msg, int color)
		3403	{
		3404	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3405	}
		3406
		3407	void
		3408	player::statusmsg (const char *msg, int color)
		3409	{
		3410	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3411	}
		3412
		3413	void
		3414	player::failmsg (const char *msg, int color)
		3415	{
		3416	play_sound (sound_find ("generic_failure"));
		3417	statusmsg (msg, color);
		3418	}
		3419

Diff Legend

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