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.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.117 by root, Sun Apr 29 21:44:35 2007 UTC

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

Diff Legend

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